Update app.py

app.py

@@ -179,13 +179,15 @@ def updateCategoryOptions(fileName):
         return
     currAnnotation, _ = st.session_state.results[fileName]
     speakerNames = list(currAnnotation.labels())
-    # Build reverse map: display name -> original SPEAKER_## label
-    renames = st.session_state.speakerRenames.get(fileName, {})
-    display_to_raw = {v: k for k, v in renames.items()}
+    # Build reverse map from live rename widget keys: display name -> SPEAKER_##
+    display_to_raw = {}
+    for sp in speakerNames:
+        wk = f"rename_{fileName}_{sp}"
+        live = st.session_state.get(wk, "").strip()
+        display_to_raw[live if live else sp] = sp
     unusedSpeakers = copy.deepcopy(speakerNames)
     for i, category in enumerate(st.session_state['categories']):
-        # Widget stores display names; reverse-map back to SPEAKER_## for storage
-        display_choices = copy.deepcopy(st.session_state[f'multiselect_{category}'])
+        display_choices = list(st.session_state[f'multiselect_{category}'])
         raw_choices = [display_to_raw.get(d, d) for d in display_choices]
         st.session_state["categorySelect"][fileName][i] = raw_choices
         for sp in raw_choices:
@@ -198,12 +200,18 @@ def updateCategoryOptions(fileName):
 def updateMultiSelect():
     fileName = st.session_state["select_currFile"]
     st.session_state.resetResult = True
-    renames = st.session_state.speakerRenames.get(fileName, {})
-    for i, category in enumerate(st.session_state['categories']):
-        # categorySelect stores SPEAKER_## — convert to display names for the widget
-        raw_choices = st.session_state['categorySelect'][fileName][i]
-        display_choices = [renames.get(sp, sp) for sp in raw_choices]
-        st.session_state[f'multiselect_{category}'] = display_choices
+    result = st.session_state.results.get(fileName)
+    if result:
+        currAnnotation, _ = result
+        speakerNames = list(currAnnotation.labels())
+        raw_to_display = {}
+        for sp in speakerNames:
+            wk = f"rename_{fileName}_{sp}"
+            live = st.session_state.get(wk, "").strip()
+            raw_to_display[sp] = live if live else sp
+        for i, category in enumerate(st.session_state['categories']):
+            raw_choices = st.session_state['categorySelect'][fileName][i]
+            st.session_state[f'multiselect_{category}'] = [raw_to_display.get(sp, sp) for sp in raw_choices]
     
 def analyze(inFileName):
     try:
@@ -593,17 +601,23 @@ try:
 
         unusedSpeakers = st.session_state.unusedSpeakers[currFile]
         categorySelections = st.session_state["categorySelect"][currFile]
-        renames = st.session_state.speakerRenames.get(currFile, {})
-        # All speaker labels as display names for the multiselect options
-        all_speakers_raw = speakerNames  # always SPEAKER_## from annotations
-        all_speakers_display = [renames.get(sp, sp) for sp in all_speakers_raw]
+        # Build live raw->display map from rename widget keys (always current)
+        raw_to_display = {}
+        for sp in speakerNames:
+            wk = f"rename_{currFile}_{sp}"
+            live = st.session_state.get(wk, "").strip()
+            raw_to_display[sp] = live if live else sp
+        all_speakers_display = [raw_to_display[sp] for sp in speakerNames]
         for i,category in enumerate(st.session_state.categories):
-            speakerSet = categorySelections[i]  # stored as SPEAKER_##
-            default_display = [renames.get(sp, sp) for sp in speakerSet]
+            ms_key = f"multiselect_{category}"
+            speakerSet = categorySelections[i]  # SPEAKER_## internally
+            default_display = [raw_to_display.get(sp, sp) for sp in speakerSet]
+            # Seed widget state once with display names; omit default= to let Streamlit own state
+            if ms_key not in st.session_state:
+                st.session_state[ms_key] = default_display
             st.sidebar.multiselect(category,
                                     all_speakers_display,
-                                    default=default_display,
-                                    key=f"multiselect_{category}",
+                                    key=ms_key,
                                     on_change=updateCategoryOptions,
                                     args=(currFile,))
             st.sidebar.button(f"Remove {category}",key=f"remove_{category}",on_click=removeCategory,args=(i,))