Sepearate Generation

generator/solo/arrangement.py

@@ -40,6 +40,9 @@ def annotate(document, solo, offset):
 
 def apply(source, parts, *, rhythms, scales, sequences, solos=None, revise=True, contexts=None, references=(), stage='elaborated', enclosures_enabled=True):
   """Compose once per song, replacing only already-placed solo section windows."""
+  if references:
+    raise ValueError('Audition references are not production composition inputs')
+  from generator.arrange import generate
   analysis = generator.solo.analysis.analyze(source)
   sections = regions(source)
   source_measures = generator.score.source_staff(source)['measures']
@@ -47,8 +50,11 @@ def apply(source, parts, *, rhythms, scales, sequences, solos=None, revise=True,
   requests = {}
   for section_index, part in ((3, 'acoustic'), (4, 'electric')):
     first, count, offset, length = sections[section_index]
-    initial = generator.accompaniment.carried_chords(parts[part]['staves'][0]['measures'])[first]
-    template = copy.deepcopy(parts[part]['staves'][0]['measures'][first:first + count])
+    form = generator.arrange.form.full_arrangement_sections(source_measures, part)
+    section = form[section_index]
+    effective = generate.section_source(source_measures, section, form[section_index+1])
+    initial = generator.accompaniment.carried_chords(effective)[section.source_measure_index]
+    template = copy.deepcopy(effective[section.source_measure_index:section.source_measure_index+count])
     cutoff = length
     if part == 'electric' and generator.score.body_start_measure_index(source_measures):
       pickup = source_measures[0]