Scale Patterns

generator/arrange/generate.py

@@ -15,14 +15,17 @@ import generator.model
 import generator.musicxml
 import generator.parts
 import generator.rhythm
+import generator.scales.library
+import generator.scales.mapping
+import generator.scales.timeline
 import generator.score
 
 FINAL_SECTION_INDEX = 6
 
-def arrange_document(document: dict, part_type: str, *, rhythms: generator.rhythm.Library) -> dict:
+def arrange_document(document: dict, part_type: str, *, rhythms: generator.rhythm.Library, scales: generator.scales.library.Library | None = None) -> dict:
   document = generator.parts.prepare_document(document)
   plans = plan_arrangement(document, rhythms) if part_type != 'vocal' else {}
-  return _arrange_document(document, part_type, plans)
+  return _arrange_document(document, part_type, plans, scales=scales)
 
 def section_source(source: list[dict], section, next_section=None) -> list[dict]:
   result = copy.deepcopy(source)
@@ -48,13 +51,14 @@ def plan_arrangement(document: dict, rhythms: generator.rhythm.Library) -> dict[
     result[section.section_index] = generator.accompaniment.plan_section(measures[start:start + section.measure_count], rhythms, initial=previous[start], electric=section.section_index in (1, 5, 6))
   return result
 
-def _arrange_document(document: dict, part_type: str, plans: dict[int, generator.accompaniment.Plan]) -> dict:
+def _arrange_document(document: dict, part_type: str, plans: dict[int, generator.accompaniment.Plan], *, scales: generator.scales.library.Library | None = None, reports: list[str] | None = None, source_name: str = '') -> dict:
   if part_type not in generator.parts.PART_TYPES:
     raise ValueError(f'unknown arrangement part: {part_type}')
   staff = generator.score.source_staff(document)
   source = staff['measures']
   sections = generator.arrange.form.full_arrangement_sections(source, part_type)
   output, tuplets, octave_shifts, voicing_origins = [], [], [], []
+  solos = []
   absolute = fractions.Fraction()
   source_starts = []
   source_time = fractions.Fraction()
@@ -76,6 +80,8 @@ def _arrange_document(document: dict, part_type: str, plans: dict[int, generator
       if part_type == 'electric' and section.role in ('melody', 'accompaniment'):
         voicing_origins.append(generator.electric.MeasureOrigin(source_starts[si], section.role, result))
     segment_length = sum((generator.model.fraction(m['duration']) for m in segment), fractions.Fraction())
+    if section.role == 'slash':
+      solos.append(generator.scales.timeline.Solo(absolute, absolute + segment_length, section.label))
     if section.role in ('vocal', 'melody'):
       start = source_starts[section.source_measure_index]
       for shift in staff.get('octave_shifts', []):
@@ -112,9 +118,13 @@ def _arrange_document(document: dict, part_type: str, plans: dict[int, generator
       generator.guitar.place_guitar(result)
     generator.electric.reuse_voicings(voicing_links)
     generator.acoustic.combine(result)
+  if scales and solos:
+    report = generator.scales.mapping.annotate(result, solos, scales, source_name or document['metadata']['title'])
+    if reports is not None:
+      reports.append(report)
   return result
 
-def generate_performance_scores(source_dir: pathlib.Path, output_dir: pathlib.Path, *, rhythms: generator.rhythm.Library) -> int:
+def generate_performance_scores(source_dir: pathlib.Path, output_dir: pathlib.Path, *, rhythms: generator.rhythm.Library, scales: generator.scales.library.Library | None = None) -> int:
   count = 0
   for path in generator.parts.source_paths(source_dir):
     try:
@@ -122,10 +132,15 @@ def generate_performance_scores(source_dir: pathlib.Path, output_dir: pathlib.Pa
       plans = plan_arrangement(document, rhythms)
     except ValueError as error:
       raise ValueError(f'{path}: {error}') from error
+    reports = []
     for part in generator.parts.PART_TYPES:
       try:
-        generator.score.write_json(output_dir / f'{generator.score.slugify(path.stem)}-{part}.json', _arrange_document(document, part, plans))
+        generator.score.write_json(output_dir / f'{generator.score.slugify(path.stem)}-{part}.json', _arrange_document(document, part, plans, scales=scales, reports=reports, source_name=path.name))
       except ValueError as error:
         raise ValueError(f'{path}, part {part}: {error}') from error
       count += 1
+    if reports:
+      report_path = output_dir.parent / 'analysis' / f'{generator.score.slugify(path.stem)}.txt'
+      report_path.parent.mkdir(parents=True, exist_ok=True)
+      report_path.write_text(document['metadata']['title'] + '\nSource: ' + path.name + '\n\n' + '\n'.join(reports), encoding='utf-8')
   return count