Cleanup

generator/production.py

@@ -78,7 +78,7 @@ def windows(document, part):
 
 
 def dependencies(role, resources):
-  names = ('grammar', 'harmony', 'lead_ins', 'rhythms', 'melodic_vocabulary') if role.endswith('_solo') else ('rhythms',) if role.endswith('_accompaniment') else ()
+  names = ('solo', 'harmony', 'lead_ins', 'rhythms') if role.endswith('_solo') else ('rhythms',) if role.endswith('_accompaniment') else ()
   return {'roles': {'role': resources['roles']['roles'][role], 'difficulty': resources['roles']['difficulty']},
     **{name: resources[name] for name in names}}
 
@@ -181,7 +181,7 @@ def _generate_role(source, role, data_dir, settings=None, cache_dir=None):
   trace={'source':source.musical_key,'role':role,'production_resources':inputs['catalogs'],
     'vocabulary':vocabulary.fingerprint(inputs['vocabulary']),'settings':settings,'algorithm':algorithm,'code':inputs['code'],'cache_key':key}
   seed=vocabulary.fingerprint({'source':source.musical_key,'role':role,'settings':settings,'data':inputs['vocabulary'],'version':algorithm})
-  details={}; solo_report=''
+  details={}; solo_report=''; composition_timings={}
   with vocabulary.using(resources,role,settings|{'choice_seed':seed}):
     if role.endswith('_solo'):
       result=generate._arrange_document(document,part,{},owned={'slash'})
@@ -198,7 +198,8 @@ def _generate_role(source, role, data_dir, settings=None, cache_dir=None):
       scale_library,sequence_library,rhythm_library=_solo_libraries(data_dir,tuple(sorted(inputs['catalogs'].items())))
       solo=composer.compose(analysis.analyze(document),template,part,end,
         initial=initial,scales=scale_library,sequences=sequence_library,rhythms=rhythm_library,
-        enclosures_enabled=vocabulary.role().get('expressions',True))
+        expressions_enabled=vocabulary.role().get('expressions',True))
+      composition_timings={k:v for k,v in solo.diagnostics.items() if k.endswith('_seconds')}
       output=notation.measures(result['staves'][0]['measures'][first:first+count],solo.notes(),'solo_'+part)
       notation.replace_region(result,first,output);annotate(result,solo,offset)
       details=report.structure(solo)
@@ -217,7 +218,7 @@ def _generate_role(source, role, data_dir, settings=None, cache_dir=None):
   staff['tuplets']=score.reidentify(staff['measures'],staff.get('tuplets',[]))
   if part!='vocal':result['staves'][0]['tablature']=True
   model.validate_document(result);fretboard.validate_document(result)
-  value={'role':role,'document':result,'trace':trace,'details':details,'report':solo_report,'seconds':time.monotonic()-started,'cache_hit':False}
+  value={'role':role,'document':result,'trace':trace,'details':details,'report':solo_report,'seconds':time.monotonic()-started,'composition_timings':composition_timings,'cache_hit':False}
   # Sidecar diagnostics use the same rational-safe representation as reports.
   # Identical insertion order after cold generation and cache loading also
   # keeps serialized scores and the catalog byte-for-byte reproducible.
@@ -275,7 +276,7 @@ def generate_tree(source_dir, output_dir, *, jobs=2, cache_dir=None, progress=Fa
   results={p:{} for p in sources}
   def accept(path,role,value):
     results[path][role]=value
-    if timings is not None:timings.append({'source':str(path),'role':role,'seconds':value['seconds'],'cache_hit':value['cache_hit'],'observed_reads':value.get('observed_reads',[])})
+    if timings is not None:timings.append({'source':str(path),'role':role,'seconds':value['seconds'],'cache_hit':value['cache_hit'],'composition_timings':value.get('composition_timings',{}),'observed_reads':value.get('observed_reads',[])})
     if progress:print(f'Composition: {path.stem}/{role}: '+('cached' if value['cache_hit'] else f'{value["seconds"]:.1f}s'),flush=True)
   if jobs==1:
     for path,role,args in requests:
@@ -296,6 +297,6 @@ def generate_tree(source_dir, output_dir, *, jobs=2, cache_dir=None, progress=Fa
     analysis_dir=output_dir.parent/'analysis';analysis_dir.mkdir(parents=True,exist_ok=True)
     (analysis_dir/(score.slugify(path.stem)+'.txt')).write_text('\n'.join(results[path][r]['report'] for r in ROLES))
     # Not a score file: diagnostics are deliberately outside the songs schema.
-    stable={role:{k:v for k,v in value.items() if k not in ('seconds','cache_hit','observed_reads')} for role,value in results[path].items()}
+    stable={role:{k:v for k,v in value.items() if k not in ('seconds','composition_timings','cache_hit','observed_reads')} for role,value in results[path].items()}
     (analysis_dir/(score.slugify(path.stem)+'.roles')).write_text(json.dumps(stable,sort_keys=True,indent=2))
   return len(sources)*3