Cleanup

generator/train.py

@@ -3,26 +3,25 @@ from __future__ import annotations
 import argparse
 import collections
 import dataclasses
+import fractions
 import hashlib
 import json
 import os
 import pathlib
+import shutil
 import tempfile
 import time
-import fractions
+
+import generator.fretboard
+import generator.harmonic_time
 import generator.harmony
-import generator.model
 import generator.musicxml
 import generator.parts
+import generator.solo.authored
+import generator.solo.learned
+import generator.source
 import generator.training_io
 import generator.vocabulary
-import generator.harmonic_time
-import generator.solo.analysis
-import generator.solo.learned
-import shutil
-import generator.production
-import generator.solo.authored
-import generator.fretboard
 
 @dataclasses.dataclass(frozen=True)
 class Span:
@@ -57,8 +56,8 @@ def load_examples(manifest):
     if not source.is_relative_to((manifest.parent.parent / 'songs').resolve()):
       raise ValueError('Training sources must be inside data/songs')
     document = generator.parts.prepare_document(generator.musicxml.load_musicxml(source))
-    a = generator.solo.analysis.analyze(document)
-    pair = (generator.production.SourceAnalysis.read(document).musical_key, entry['slot'])
+    a = generator.source.analyze(document)
+    pair = (generator.source.SourceAnalysis.read(document).musical_key, entry['slot'])
     if pair in pairs:
       raise ValueError('Duplicate source music and solo slot')
     pairs.add(pair)