fix bug rename speaker and rename multiple speakers

state.py

@@ -55,7 +55,6 @@ def init_session_state():
         "speakerSegments":  {},   # {filename: {speaker: [(start,end), ...]}}
         "speakerWaveforms": {},   # {filename: (waveform_tensor, sample_rate)}
         "globalRenames":    [],   # [{"name": str, "speakers": ["file: SPEAKER_##", ...]}]
-        "inlineRenames":    {},   # {filename: {speaker: name}} — set by Rename Speaker tab only
         "analyzeAllToggle": False,
     }
     for key, value in defaults.items():
@@ -144,36 +143,58 @@ def _global_rename_key(index):
 
 
 def applyGlobalRenames():
-    """Rebuild speakerRenames from two independent sources:
-      1. globalRenames  — sidebar assignments (always authoritative for tokens it covers)
-      2. inlineRenames  — Rename Speaker tab assignments (used only when globalRenames
-                          has no claim on that token)
-    Any speaker not covered by either source gets cleared.
+    """Sync speakerRenames (and inline tab widget keys) from globalRenames.
+
+    Strategy:
+    - Speakers assigned in globalRenames → rename to the entry's name.
+    - Speakers whose token appears in NO globalRenames entry but whose raw_sp
+      is not in speakerRenames for any other reason → clear the rename.
+    - Speakers with a speakerRenames entry that was set purely inline (never
+      tracked in globalRenames) → left untouched.
+    After updating speakerRenames, we re-seed every rename_{fname}_{sp} widget
+    key so the Rename Speaker tab immediately reflects the change.
     """
-    # Build token->name map from globalRenames
+    # Build a map of token -> display_name from globalRenames
     token_to_name: dict = {}
     for entry in st.session_state.globalRenames:
         for token in entry["speakers"]:
             token_to_name[token] = entry["name"]
 
-    # Rebuild speakerRenames for every file from scratch
-    for fname in st.session_state.speakerRenames:
-        new_renames = {}
-        inline = st.session_state.inlineRenames.get(fname, {})
-        # Check every known speaker for this file
-        result = st.session_state.results.get(fname)
-        if not result or len(result) != 2:
-            continue
-        for sp in result[0].labels():
+    # Every token that has EVER appeared in globalRenames (used to detect removal)
+    all_global_tokens: set = {
+        token
+        for entry in st.session_state.globalRenames
+        for token in entry["speakers"]
+    }
+
+    # 1. Update speakerRenames for files already tracked
+    for fname in list(st.session_state.speakerRenames.keys()):
+        renames = st.session_state.speakerRenames[fname]
+        for sp in list(renames.keys()):
             token = f"{fname}: {sp}"
             if token in token_to_name:
-                # Sidebar assignment wins
-                new_renames[sp] = token_to_name[token]
-            elif sp in inline:
-                # Tab assignment used only when sidebar has no claim
-                new_renames[sp] = inline[sp]
-            # else: no assignment — omit (raw label will be used)
-        st.session_state.speakerRenames[fname] = new_renames
+                renames[sp] = token_to_name[token]
+            elif token in all_global_tokens:
+                # Was globally tracked but now unassigned — revert to raw label
+                del renames[sp]
+            # else: purely inline rename — leave untouched
+
+    # 2. Apply newly assigned tokens not yet in speakerRenames
+    for token, name in token_to_name.items():
+        if ": " not in token:
+            continue
+        fname, raw_sp = token.split(": ", 1)
+        if fname in st.session_state.speakerRenames:
+            st.session_state.speakerRenames[fname][raw_sp] = name
+
+    # 3. Sync the inline-tab widget keys (rename_{fname}_{sp}) for every
+    #    analyzed file so the Rename Speaker tab shows the updated names.
+    for fname, renames in st.session_state.speakerRenames.items():
+        results = st.session_state.results.get(fname)
+        if not results or len(results) != 2:
+            continue
+        for sp in results[0].labels():
+            st.session_state[f"rename_{fname}_{sp}"] = renames.get(sp, "")
 
 
 def enforceGlobalRenameExclusivity(changed_idx):
@@ -185,6 +206,7 @@ def enforceGlobalRenameExclusivity(changed_idx):
         new_speakers = [t for t in entry["speakers"] if t not in changed_tokens]
         if new_speakers != entry["speakers"]:
             entry["speakers"] = new_speakers
+            # Clear widget key so it re-seeds from updated entry data on next render
             st.session_state.pop(_global_rename_key(idx), None)
     applyGlobalRenames()
 
@@ -202,7 +224,11 @@ def addGlobalRename():
 def removeGlobalRename(index):
     entry = st.session_state.globalRenames[index]
     st.toast(f"Removing rename '{entry['name']}'")
+    # Clear the widget key for the deleted entry so Streamlit doesn't try to
+    # render it after it no longer exists in globalRenames.
+    st.session_state.pop(_global_rename_key(index), None)
     del st.session_state.globalRenames[index]
+    # Shift remaining widget keys down by one position
     for i in range(index, len(st.session_state.globalRenames)):
         st.session_state[_global_rename_key(i)] = list(
             st.session_state.globalRenames[i]["speakers"]
@@ -211,22 +237,42 @@ def removeGlobalRename(index):
 
 
 def apply_inline_rename(currFile, raw_sp, new_name):
-    """Write a tab-originated rename into inlineRenames, then sync speakerRenames.
+    """Write a single inline rename into both speakerRenames and globalRenames.
 
-    inlineRenames is the sole record of tab renames. applyGlobalRenames() merges
-    inlineRenames with globalRenames every time it runs, so sidebar assignments
-    always win and tab assignments fill the rest.
+    Keeps the sidebar global-rename list in sync so applyGlobalRenames()
+    won't overwrite the change on the next rerun.  Also syncs the inline-tab
+    widget key so the Rename Speaker tab reflects the result immediately.
     """
     new_name = new_name.strip()
+    token = f"{currFile}: {raw_sp}"
+
+    # Remove this token from every existing globalRenames entry first — a token
+    # must belong to at most one name.  Clear the sidebar widget key so it
+    # re-seeds from the updated entry data on the next render pass.
+    for idx, entry in enumerate(st.session_state.globalRenames):
+        if token in entry["speakers"]:
+            entry["speakers"].remove(token)
+            st.session_state.pop(_global_rename_key(idx), None)
 
-    inline = st.session_state.inlineRenames.setdefault(currFile, {})
     if new_name:
-        inline[raw_sp] = new_name
+        # Write into speakerRenames immediately
+        st.session_state.speakerRenames.setdefault(currFile, {})[raw_sp] = new_name
+        # Sync the inline-tab text widget so the tab shows the confirmed name
+        st.session_state[f"rename_{currFile}_{raw_sp}"] = new_name
+        # Find an existing globalRenames entry for this name, or create one
+        for idx, entry in enumerate(st.session_state.globalRenames):
+            if entry["name"] == new_name:
+                entry["speakers"].append(token)
+                st.session_state.pop(_global_rename_key(idx), None)
+                return
+        # No existing entry — create a new one; don't pre-set widget key,
+        # the render loop will seed it from entry["speakers"] on the next pass.
+        st.session_state.globalRenames.append({"name": new_name, "speakers": [token]})
     else:
-        inline.pop(raw_sp, None)
-
-    # Immediately reflect in speakerRenames (sidebar may override on next run)
-    applyGlobalRenames()
+        # Empty name — revert this speaker back to its raw label.
+        st.session_state.speakerRenames.setdefault(currFile, {}).pop(raw_sp, None)
+        # Clear the inline-tab text widget so the tab shows the raw SPEAKER_## label
+        st.session_state[f"rename_{currFile}_{raw_sp}"] = ""
 
 
 # ---------------------------------------------------------------------------
@@ -290,7 +336,6 @@ def register_file(fname):
     while len(st.session_state.categorySelect) < len(st.session_state.categories):
         st.session_state.categorySelect.append([])
     st.session_state.speakerRenames.setdefault(fname, {})
-    st.session_state.inlineRenames.setdefault(fname, {})
     st.session_state.speakerClips.setdefault(fname, {})
     if fname not in st.session_state.file_names:
         st.session_state.file_names.append(fname)