Cleanup

generator/compose.py

@@ -1,24 +1,27 @@
 """Explicit single-role build. Does not publish or consume an existing ensemble."""
 import argparse
 import json
-import time
 import pathlib
+import time
+
+import generator.composition
+import generator.composition_types
 import generator.musicxml
 import generator.parts
-import generator.production
+import generator.source
 
 def main():
   parser = argparse.ArgumentParser(description=__doc__)
   parser.add_argument('--song', type=pathlib.Path, required=True)
-  parser.add_argument('--role', choices=generator.production.ROLES, required=True)
+  parser.add_argument('--role', choices=generator.composition_types.ROLES, required=True)
   parser.add_argument('--data-dir', type=pathlib.Path, default=pathlib.Path('data'))
   parser.add_argument('--output', type=pathlib.Path, required=True)
   parser.add_argument('--cache-dir', type=pathlib.Path)
   parser.add_argument('--settings', type=pathlib.Path)
   args = parser.parse_args()
-  source = generator.production.SourceAnalysis.read(generator.parts.prepare_document(generator.musicxml.load_musicxml(args.song)))
+  source = generator.source.SourceAnalysis.read(generator.parts.prepare_document(generator.musicxml.load_musicxml(args.song)))
   start = time.monotonic()
-  result = generator.production.generate_role(source, args.role, args.data_dir, json.loads(args.settings.read_text()) if args.settings else {}, args.cache_dir)
+  result = generator.composition.generate_role(source, args.role, args.data_dir, json.loads(args.settings.read_text()) if args.settings else {}, args.cache_dir)
   args.output.parent.mkdir(parents=True, exist_ok=True)
   args.output.write_text(json.dumps(result, indent=2))
   print(f'{args.role}: {time.monotonic() - start:.2f}s wall; cached={result["cache_hit"]}; role generation/cache lookup {result["seconds"]:.2f}s')