Playback

generator/solo/export.py

@@ -3,11 +3,12 @@ from __future__ import annotations
 
 import copy
 import json
-from pathlib import Path
-from fractions import Fraction as F
-
-from generator import model, musicxml_writer, score
+import pathlib
+import fractions
 
+import generator.model
+import generator.musicxml_writer
+import generator.score
 
 def region(document, part):
   measures = document['staves'][0]['measures']
@@ -15,7 +16,6 @@ def region(document, part):
   end = next((i for i in range(first + 1, len(measures)) if measures[i].get('section_label')), len(measures))
   return first, end - first
 
-
 def excerpt(document, first, count):
   result = copy.deepcopy(document)
   staff = result['staves'][0]
@@ -23,7 +23,7 @@ def excerpt(document, first, count):
   staff['measures'] = original[first:first + count]
   if not staff['measures']:
     raise ValueError('Empty solo export region')
-  notes = [n for m in staff['measures'] for n in score.measure_notes(m)]
+  notes = [n for m in staff['measures'] for n in generator.score.measure_notes(m)]
   identities = {p['id'] for n in notes for p in n['pitches']}
   events = {n['id'] for n in notes}
   for note in notes:
@@ -36,16 +36,15 @@ def excerpt(document, first, count):
   for note in notes:
     if 'tuplet_ids' in note:
       note['tuplet_ids'] = [i for i in note['tuplet_ids'] if i in tuplets]
-  offset = sum((model.fraction(m['duration']) for m in original[:first]), F())
-  end = offset + sum((model.fraction(m['duration']) for m in staff['measures']), F())
+  offset = sum((generator.model.fraction(m['duration']) for m in original[:first]), fractions.Fraction())
+  end = offset + sum((generator.model.fraction(m['duration']) for m in staff['measures']), fractions.Fraction())
   for key in ('scale_spans', 'octave_shifts'):
-    staff[key] = [{**s, 'start': model.rational(max(offset, model.fraction(s['start'])) - offset),
-      'end': model.rational(min(end, model.fraction(s['end'])) - offset)} for s in staff.get(key, [])
-      if model.fraction(s['start']) < end and model.fraction(s['end']) > offset]
-  model.validate_document(result)
+    staff[key] = [{**s, 'start': generator.model.rational(max(offset, generator.model.fraction(s['start'])) - offset),
+      'end': generator.model.rational(min(end, generator.model.fraction(s['end'])) - offset)} for s in staff.get(key, [])
+      if generator.model.fraction(s['start']) < end and generator.model.fraction(s['end']) > offset]
+  generator.model.validate_document(result)
   return result
 
-
 def write_role(result, path):
   role = result['role']
   if role not in ('acoustic_solo', 'electric_solo'):
@@ -53,25 +52,25 @@ def write_role(result, path):
   part = role.split('_')[0]
   document = result['document']
   first, count = region(document, part)
-  leadin=int(result.get('details',{}).get('allocation',{}).get('lead_in_measures',0))
-  first-=leadin;count+=leadin
+  leadin = int(result.get('details', {}).get('allocation', {}).get('lead_in_measures', 0))
+  first -= leadin
+  count += leadin
   selected = excerpt(document, first, count)
   numbers = [m['number'] for m in selected['staves'][0]['measures']]
   for i, measure in enumerate(selected['staves'][0]['measures'], 1):
     measure['number'] = str(i)
-  path = Path(path)
+  path = pathlib.Path(path)
   path.parent.mkdir(parents=True, exist_ok=True)
-  musicxml_writer.write_musicxml(path, selected, tablature=True)
-  return {'role': role, 'file': path.name, 'form_start_measure': 1+leadin,
+  generator.musicxml_writer.write_musicxml(path, selected, tablature=True)
+  return {'role': role, 'file': path.name, 'form_start_measure': 1 + leadin,
     'measure_count': count, 'arrangement_measures': numbers,
-    'arrangement_start_beat': str(sum((model.fraction(m['duration']) for m in document['staves'][0]['measures'][:first]), F())),
+    'arrangement_start_beat': str(sum((generator.model.fraction(m['duration']) for m in document['staves'][0]['measures'][:first]), fractions.Fraction())),
     'pitch_convention': 'guitar-written; explicit octave transposition -1',
     'trace': result['trace'], 'phrase_report': result.get('details', {})}
 
-
 def export_tree(assets, output=None):
-  assets = Path(assets)
-  output = Path(output) if output else assets / 'solo_xml'
+  assets = pathlib.Path(assets)
+  output = pathlib.Path(output) if output else assets / 'solo_xml'
   output.mkdir(parents=True, exist_ok=True)
   entries = {}
   for path in sorted((assets / 'analysis').glob('*.roles')):