Speakr is a personal, self-hosted web application designed for transcribing audio recordings
Python
Union prompt variables across all merged sources (they ride with the unioned tags), with the reference recording winning key conflicts, kept regardless of the notes choice
Murtaza Nasir99170f1f207d
diff --git a/src/services/recording_merge.py b/src/services/recording_merge.pyindex 482905b8..77864b59 100644--- a/src/services/recording_merge.py+++ b/src/services/recording_merge.py@@ -192,7 +192,19 @@ def create_merge_recording(user, recording_ids, title=None, delete_originals=Falreference = next((r for r in recordings if r.id == notes_source_id), first)merged_notes = reference.notes if reference else None- merged_prompt_variables = (reference.prompt_variables or None) if reference else None++ # Prompt variables travel with the unioned tags — their names usually come+ # from tag prompts — so union them across ALL sources (kept regardless of the+ # notes choice). On a key collision the reference source wins, e.g. two+ # recordings on the same default prompt with the same variable set to+ # different values keep the reference recording's value.+ merged_prompt_variables = {}+ for rec in recordings:+ if rec.prompt_variables:+ merged_prompt_variables.update(rec.prompt_variables)+ if reference and reference.prompt_variables:+ merged_prompt_variables.update(reference.prompt_variables)+ merged_prompt_variables = merged_prompt_variables or None# Participants are additive across a merge — union them so none are lost.merged_participants = _union_participants(recordings)diff --git a/tests/test_merge_export_features.py b/tests/test_merge_export_features.pyindex 738b9290..d5f993b8 100644--- a/tests/test_merge_export_features.py+++ b/tests/test_merge_export_features.py@@ -531,35 +531,47 @@ def test_merge_endpoint_passes_notes_source_id():assert merged.notes == "beta"-def test_merge_prompt_variables_follow_notes_source():+def test_merge_prompt_variables_union_keeps_all_keys():from src.services.recording_merge import create_merge_recordingwith app.app_context():user = _mk_user()- a = _mk_recording(user, title="A", notes="a", prompt_variables={"agenda": "AAA"})- b = _mk_recording(user, title="B", notes="b", prompt_variables={"agenda": "BBB"})+ a = _mk_recording(user, title="A", prompt_variables={"agenda": "AAA"})+ b = _mk_recording(user, title="B", prompt_variables={"attendees": "BBB"})+ with _endpoint_mocks():+ merged = create_merge_recording(user, [a.id, b.id])+ assert merged.prompt_variables == {"agenda": "AAA", "attendees": "BBB"}+++def test_merge_prompt_variables_conflict_reference_wins():+ from src.services.recording_merge import create_merge_recording+ with app.app_context():+ user = _mk_user()+ a = _mk_recording(user, title="A", prompt_variables={"agenda": "AAA"})+ b = _mk_recording(user, title="B", prompt_variables={"agenda": "BBB"})with _endpoint_mocks():merged = create_merge_recording(user, [a.id, b.id], notes_source_id=b.id)- assert merged.notes == "b"assert merged.prompt_variables == {"agenda": "BBB"}-def test_merge_prompt_variables_default_first_source():+def test_merge_prompt_variables_conflict_default_reference_is_first():from src.services.recording_merge import create_merge_recordingwith app.app_context():user = _mk_user()a = _mk_recording(user, title="A", prompt_variables={"agenda": "AAA"})b = _mk_recording(user, title="B", prompt_variables={"agenda": "BBB"})with _endpoint_mocks():- merged = create_merge_recording(user, [a.id, b.id])+ merged = create_merge_recording(user, [a.id, b.id]) # default reference = firstassert merged.prompt_variables == {"agenda": "AAA"}-def test_merge_prompt_variables_dropped_when_no_notes():+def test_merge_prompt_variables_kept_even_when_notes_dropped():from src.services.recording_merge import create_merge_recordingwith app.app_context():user = _mk_user()- a = _mk_recording(user, title="A", prompt_variables={"agenda": "AAA"})+ a = _mk_recording(user, title="A", notes="a", prompt_variables={"agenda": "AAA"})b = _mk_recording(user, title="B")with _endpoint_mocks():+ # "keep no notes" still unions prompt variables (they ride with tags).merged = create_merge_recording(user, [a.id, b.id], notes_source_id=None)- assert merged.prompt_variables is None+ assert merged.notes is None+ assert merged.prompt_variables == {"agenda": "AAA"}