Update state.py

state.py

@@ -55,6 +55,7 @@ def init_session_state():
         "speakerSegments":  {},   # {filename: {speaker: [(start,end), ...]}}
         "speakerWaveforms": {},   # {filename: (waveform_tensor, sample_rate)}
         "globalRenames":    [],   # [{"name": str, "speakers": ["file: SPEAKER_##", ...]}]
+        "globally_tracked_tokens": set(),  # tokens ever assigned via globalRenames
         "analyzeAllToggle": False,
     }
     for key, value in defaults.items():
@@ -145,37 +146,32 @@ def _global_rename_key(index):
 def applyGlobalRenames():
     """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.
+    Uses `globally_tracked_tokens` as a graveyard: any token ever assigned
+    via globalRenames is recorded there.  On each call:
+      - token currently assigned  → rename to the entry's name
+      - token in graveyard but NOT currently assigned → revert to raw label
+      - token never touched by globalRenames → leave speakerRenames untouched
+                                               (inline-only rename)
     """
-    # Build a map of token -> display_name from globalRenames
+    # Build map of currently-assigned token -> name
     token_to_name: dict = {}
     for entry in st.session_state.globalRenames:
         for token in entry["speakers"]:
             token_to_name[token] = entry["name"]
 
-    # 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"]
-    }
+    # Update the graveyard with any newly assigned tokens
+    st.session_state.globally_tracked_tokens.update(token_to_name.keys())
 
-    # 1. Update speakerRenames for files already tracked
+    # 1. Update speakerRenames for tokens already in the graveyard
     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:
+                # Currently assigned — apply the name
                 renames[sp] = token_to_name[token]
-            elif token in all_global_tokens:
-                # Was globally tracked but now unassigned — revert to raw label
+            elif token in st.session_state.globally_tracked_tokens:
+                # Was global but is now unassigned — revert to raw label
                 del renames[sp]
             # else: purely inline rename — leave untouched
 
@@ -187,8 +183,7 @@ def applyGlobalRenames():
         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.
+    # 3. Sync inline-tab widget keys so Rename Speaker tab reflects changes
     for fname, renames in st.session_state.speakerRenames.items():
         results = st.session_state.results.get(fname)
         if not results or len(results) != 2:
@@ -266,6 +261,9 @@ def apply_inline_rename(currFile, raw_sp, new_name):
         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
+        # Record this token as globally tracked so applyGlobalRenames can
+        # revert it if it's ever removed from globalRenames.
+        st.session_state.globally_tracked_tokens.add(token)
         # 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:
@@ -280,6 +278,9 @@ def apply_inline_rename(currFile, raw_sp, new_name):
         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}"] = ""
+        # Remove from graveyard so a future inline rename on the same speaker
+        # is treated as a fresh inline-only rename (not subject to global revert).
+        st.session_state.globally_tracked_tokens.discard(token)
 
 
 # ---------------------------------------------------------------------------