Solo

generator/solo/lead_audition.py

@@ -79,12 +79,12 @@ def controls(song, libraries):
   return result
 
 def render(root):
-  baseline = json.loads((root / 'baseline/snapshot.json').read_text())
+  baseline = json.loads((root / 'paraphrase_baseline/snapshot.json').read_text())
   current = json.loads((root / 'elaborated/snapshot.json').read_text())
   cache, clips = {}, []
   gain = 0.4  # Shared audition gain; every mixed clip is checked for clipping.
-  manifest = {'implementation': current['implementation'], 'baseline_implementation': baseline['implementation'], 'policy': current['policy'], 'shared_gain': gain, 'clips': clips, 'stage_semantics': 'Initial is the selected plain tune; refined adds complete diatonic runs; elaborated adds validated chromatic approaches. All stages share the same underlying selected tune.'}
-  body = ['<!doctype html><html lang="en"><meta charset="utf-8"><title>Lead melody comparisons</title><style>body{font:16px system-ui;max-width:1500px;margin:2rem auto;padding:1rem}table{border-collapse:collapse}td,th{padding:.6rem;border-bottom:1px solid #ccc;text-align:left}audio{width:240px}small{display:block}</style><h1>Lead melody comparisons</h1><p>Compare the plain tune, its diatonic runs, and its chromatic approaches. All fixed mixes use the original backing, identical tempo and one shared gain. Solo-only clips remove the backing. Initial/refined exports follow the selected production branches; they are not independent searches.</p><p>These metrics verify behavior, not musical quality. Listen for a recognizable tune, prepared destinations, and runs that belong to the tune. <a href="manifest.json">Diagnostics manifest</a>.</p>']
+  manifest = {'implementation': current['implementation'], 'baseline_implementation': baseline['implementation'], 'policy': current['policy'], 'shared_gain': gain, 'clips': clips, 'stage_semantics': 'Source is the original head, close paraphrase is the preserved previous plain theme, refined is the newly recomposed theme, and elaborated includes optional in-scale runs. The selected production branch supplies both new stages.'}
+  body = ['<!doctype html><html lang="en"><meta charset="utf-8"><title>Lead melody comparisons</title><style>body{font:16px system-ui;max-width:1500px;margin:2rem auto;padding:1rem}table{border-collapse:collapse}td,th{padding:.6rem;border-bottom:1px solid #ccc;text-align:left}audio{width:240px}small{display:block}</style><h1>Lead melody comparisons</h1><p>Compare the original head, the previous close paraphrase, the new solo theme, and its optional in-scale runs. Source controls may contain original harmonic tensions that production explicitly adapts. All fixed mixes use the original backing, identical tempo and one shared gain. Solo-only clips remove the backing. Initial/refined exports follow the selected production branches; they are not independent searches.</p><p>These metrics verify behavior, not musical quality. Listen for a recognizable tune, prepared destinations, and runs that belong to the tune. <a href="manifest.json">Diagnostics manifest</a>.</p>']
 
   def clip(prefix, foreground, tempo, backing=()):
     path = root / (prefix + '.wav')
@@ -103,13 +103,13 @@ def render(root):
       raise ValueError(name + ': source changed during comparison')
     for part, solo in song['solos'].items():
       other = 'electric' if part == 'acoustic' else 'acoustic'
-      body.append('<h2>' + html.escape(name.replace('_', ' ').title() + ' — ' + part) + '</h2><table><tr><th>Excerpt</th><th>Baseline</th><th>Plain lead</th><th>Diatonic runs</th><th>Chromatic approaches</th></tr>')
+      body.append('<h2>' + html.escape(name.replace('_', ' ').title() + ' — ' + part) + '</h2><table><tr><th>Excerpt</th><th>Song source</th><th>Previous close paraphrase</th><th>New theme</th><th>Theme with runs</th></tr>')
       for window, offset, count in (('opening8', 0, 8), ('closing4', solo['count'] - 4, 4), ('full', 0, solo['count'])):
         first = solo['first'] + offset
         backing = tuple(audition.excerpt(old['parts'][p], first, count) for p in (other, 'vocal'))
         body.append('<tr><th>' + window + '</th>')
-        for stage in ('baseline', 'initial', 'refined', 'elaborated'):
-          foreground = audition.excerpt((old if stage == 'baseline' else song)['parts'][part], first, count) if stage in ('baseline', 'elaborated') else audition.excerpt(solo['lead_stages'][stage]['document'], offset, count)
+        for stage in ('initial', 'close_paraphrase', 'refined', 'elaborated'):
+          foreground = audition.excerpt(song['parts'][part], first, count) if stage=='elaborated' else audition.excerpt(old['solos'][part]['lead_stages']['refined']['document'] if stage=='close_paraphrase' else solo['lead_stages'][stage]['document'], offset, count)
           prefix = f'{stage}/{name}_{part}_{window}'
           path = clip(prefix + '_fixed', foreground, F(solo['tempo']), backing)
           solo_path = clip(prefix + '_solo', foreground, F(solo['tempo']))
@@ -119,6 +119,7 @@ def render(root):
             clip(prefix + '_responsive', foreground, F(solo['tempo']), tuple(audition.excerpt(song['parts'][p], first, count) for p in (other, 'vocal')))
         body.append('</tr>')
       body.append('</table>')
+      body.append(f'<p><a href="paraphrase_baseline/{name}_{part}_full_solo.wav">Previous complete production solo</a></p>')
       prefix = f'elaborated/{name}_{part}'
       (root / (prefix + '.txt')).write_text(solo['report'])
       (root / (prefix + '.json')).write_text(json.dumps(solo['structure'], indent=2) + '\n')
@@ -141,7 +142,7 @@ def render(root):
 
 def main():
   parser = argparse.ArgumentParser(description=__doc__)
-  parser.add_argument('--output', type=pathlib.Path, default=pathlib.Path('build/solo_lead_melody_auditions'))
+  parser.add_argument('--output', type=pathlib.Path, default=pathlib.Path('build/solo_melody_auditions'))
   action = parser.add_mutually_exclusive_group(required=True)
   action.add_argument('--capture', action='store_true')
   action.add_argument('--render', action='store_true')