Playback

generator/arrange/generate.py

@@ -19,16 +19,18 @@ import generator.musicxml
 import generator.parts
 import generator.score
 import generator.solo.arrangement
+import generator.comping
+import generator.vocabulary
+import generator.production
 
-FINAL_SECTION_INDEX = 6
+FINAL_SECTION_INDEX = 5
 
 def arrange_document(document: dict, part_type: str) -> dict:
   """Canonical source-only template; solos are inserted by production roles."""
-  from generator import comping, vocabulary
-  document=generator.parts.prepare_document(document)
-  with vocabulary.using(vocabulary.load(),part_type+'_accompaniment'):
-    backing=comping.Canonical(document,part_type,'canonical') if part_type!='vocal' else None
-    return _arrange_document(document,part_type,accompaniment=backing)
+  document = generator.parts.prepare_document(document)
+  with generator.vocabulary.using(generator.vocabulary.load(), part_type + '_accompaniment'):
+    backing = generator.comping.Canonical(document, part_type, 'canonical') if part_type != 'vocal' else None
+    return _arrange_document(document, part_type, accompaniment=backing)
 
 def section_source(source: list[dict], section, next_section=None) -> list[dict]:
   result = copy.deepcopy(source)
@@ -115,5 +117,4 @@ def _arrange_document(document: dict, part_type: str, plans=None, *, owned=None,
   return result
 
 def generate_performance_scores(source_dir: pathlib.Path, output_dir: pathlib.Path, *, composition_jobs=2, cache_dir=None, progress=False, timings=None) -> int:
-  from generator.production import generate_tree
-  return generate_tree(source_dir, output_dir, jobs=composition_jobs, cache_dir=cache_dir, progress=progress,timings=timings)
+  return generator.production.generate_tree(source_dir, output_dir, jobs=composition_jobs, cache_dir=cache_dir, progress=progress, timings=timings)