Validation

generator/solo/authored.py

@@ -11,7 +11,25 @@ import json
 from pathlib import Path
 from fractions import Fraction as F
 from generator import musicxml,parts,training_io,harmonic_time
-from generator.solo import analysis,types,placement,profiles
+from generator.solo import analysis,types,placement,profiles,harmonic
+
+
+def sounding(evidence,offset=F()):
+  result=[]
+  for i,event in enumerate(evidence['sounding_events']):
+    p=event['pitch'];number=F(event['sounding_midi'])
+    if number.denominator!=1:raise ValueError('Microtonal guitar solo is unsupported')
+    pitch=types.Pitch(p['step'].lower(),F(p['alter']),p['octave']+(int(number)-int(F(event['encoded_midi'])))//12)
+    result.append(types.Note(F(event['start'])-offset,F(event['end'])-offset,pitch,role='authored',event_id=f'authored_{i}'))
+  return tuple(result)
+
+
+def validate_evidence(document,evidence):
+  """Training uses the same source-form harmonic context as solo playback."""
+  h=harmonic.Harmony(harmonic_time.solo_source(document['staves'][0]))
+  checked=h.evaluate(sounding(evidence),complete=True)
+  if not checked.valid:raise ValueError('Unsupported harmonic relationship in authored solo: '+checked.error)
+  return checked
 
 
 def lookup(source,role,data_dir):
@@ -41,23 +59,20 @@ def realize(entry,source_analysis,measures,part,start,end,initial=None):
   if evidence['discrepancies']:raise ValueError(entry['id']+': invalid authored timing/ties: '+str(evidence['discrepancies']))
   expected=[(a,b-a) for a,b in zip(source_analysis.boundaries,source_analysis.boundaries[1:])]
   if [(F(m['start']),F(m['duration'])) for m in evidence['measures']]!=expected:raise ValueError(entry['id']+': source/solo forms differ; register and retrain the correct pair')
-  notes=[]
-  for i,event in enumerate(evidence['sounding_events']):
-    a,b=F(event['start'])-source_analysis.body_offset,F(event['end'])-source_analysis.body_offset
-    if a<start or b>end:raise ValueError(f'{entry["id"]}: authored event {a}–{b} conflicts with arrangement window {start}–{end}; no clipping applied')
-    p=event['pitch'];number=F(event['sounding_midi'])
-    if number.denominator!=1:raise ValueError('Microtonal guitar solo is unsupported')
-    pitch=types.Pitch(p['step'].lower(),F(p['alter']),p['octave']+(int(number)-int(F(event['encoded_midi'])))//12)
-    notes.append(types.Note(a,b,pitch,('authored:'+entry['id'],),'authored',event_id=f'authored_{i}'))
+  notes=sounding(evidence,source_analysis.body_offset)
+  for n in notes:
+    if n.start<start or n.end>end:raise ValueError(f'{entry["id"]}: authored event {n.start}–{n.end} conflicts with arrangement window {start}–{end}; no clipping applied')
   profile=profiles.for_part(part,source_analysis)
   illegal=next((n for n in notes if not placement.positions(n.pitch.number(),profile)),None)
   if illegal:raise ValueError(f'{entry["id"]}: {illegal.pitch.label()} at {illegal.start} is outside strings 1–6/frets 1–12; authored solo left unchanged')
   placed=placement.place(tuple(notes),source_analysis.tempo,profile=profile)
   if placed is None:raise ValueError(entry['id']+': no legal complete guitar placement')
   spans=tuple(dataclasses.replace(s,start=s.start+start,end=s.end+start) for s in harmonic_time.read({'measures':measures},initial=initial))
-  phrase=types.Phrase('authored',start,end,placed[1],'authored','authored','handoff',theme=entry['id'])
+  checked=harmonic.Harmony(spans).evaluate(placed[1],complete=True)
+  if not checked.valid:raise ValueError(entry['id']+': '+checked.error)
+  phrase=types.Phrase('authored',start,end,placed[1],'authored','authored','handoff',theme=entry['id'],expressions=checked.contracts)
   return types.Solo(part,spans,(phrase,),source_analysis.tempo,end,
     {'construction':'authored_repertoire','authored_id':entry['id'],'authored_sha256':entry['sha256'],
       'pitch_convention':entry['pitch_convention'],'exact_sounding_events':True,
-      'note':'Authored music is preserved, not reclassified as generated harmonic exceptions.',
+      'note':'Authored music is preserved and passes automatic contextual harmonic validation.',
       'annotations':evidence['annotations']},profile,start)