Cleanup

audition/solo_compare.py

@@ -209,7 +209,7 @@ def run(generated_dir,reference_paths,starts,pitch_convention,output,assets=None
   rows=['<!doctype html><meta charset="utf-8"><title>Solo comparison</title>',
     '<style>body{font:16px system-ui;max-width:1100px;margin:2rem auto}td,th{padding:.5rem;text-align:left}pre{white-space:pre-wrap}</style>',
     '<h1>Completed solos and reference scores</h1><p>Differences are diagnostic. These files do not supply generation inputs or candidate scores. No listening verdict is claimed.</p>',
-    '<p><a href="comparison.json">Exact timing, notes, harmony, annotations, placement, and phrase reports</a> · <a href="analysis/theory.md">Complete musical relationship review</a></p>']
+    '<p><a href="comparison.json">Exact timing, notes, harmony, annotations, placement, and phrase reports</a></p>']
   for role,r in result['solos'].items():
     actual_path=generated_dir/manifest['solos'][role]['file']
     reference_path=Path(reference_paths[role])
@@ -221,10 +221,10 @@ def run(generated_dir,reference_paths,starts,pitch_convention,output,assets=None
     selected=collections.Counter(c['kind'] for c in r['production_phrases'].get('expressions',[]))
     rows.append('<p>Selected, validated production treatments: '+html.escape(str(dict(selected)))+'. Ordinary mapped material remains separate.</p>')
     if r.get('reference_events_after_production_end'):
-      rows.append('<p>Reference material extends beyond the production vocal-protection window: '+str(len(r['reference_events_after_production_end']))+' events. The reference and vocal timing remain unchanged.</p>')
+      rows.append('<p>Reference material extends beyond this exported production allocation: '+str(len(r['reference_events_after_production_end']))+' events. The reference and source timing remain unchanged.</p>')
     funnel=r['production_phrases'].get('selection_trace',{}).get('operation_coverage',{})
     if funnel:
-      stages=('eligible_contexts','proposed','rhythm_valid','complete_routes','valid','finalists','placed','lookahead_valid','selected')
+      stages=tuple(dict.fromkeys(k for counts in funnel.values() for k in counts))
       rows.append('<details><summary>Construction coverage (not similarity scoring)</summary><table><tr><th>Purpose</th>'+''.join('<th>'+k.replace('_',' ')+'</th>' for k in stages)+'</tr>')
       for purpose,counts in sorted(funnel.items()):
         rows.append('<tr><td>'+html.escape(purpose)+'</td>'+''.join('<td>'+str(counts.get(k,0))+'</td>' for k in stages)+'</tr>')
@@ -249,9 +249,15 @@ def main():
   parser.add_argument('--output',type=Path,required=True)
   parser.add_argument('--baseline-dir',type=Path,help='Optional previous completed solo exports; never generation inputs.')
   parser.add_argument('--assets',type=Path,help='Optional completed assets for neutral reference/generated audio with identical backing.')
+  parser.add_argument('--require-exact',action='store_true',help='Fail unless every requested reference has identical complete sounding events and rests.')
   args=parser.parse_args()
-  run(args.generated_dir,dict(x.split('=',1) for x in args.reference),
+  if args.require_exact and not args.reference:
+    parser.error('--require-exact requires at least one explicit --reference')
+  result=run(args.generated_dir,dict(x.split('=',1) for x in args.reference),
     {k:int(v) for k,v in (x.split('=',1) for x in args.form_start)},args.reference_pitch,args.output,args.assets,args.baseline_dir)
+  for role,review in result['solos'].items():
+    print(f'{role}: exact={review["exact_musical_match"]}; matching attacks={review["exact_matching_attacks"]}; differing onsets={len(review["differences"])}; rests differ={review["rest_difference"]}')
+  return 1 if args.require_exact and any(not r['exact_musical_match'] for r in result['solos'].values()) else 0
 
 
-if __name__=='__main__':main()
+if __name__=='__main__':raise SystemExit(main())