Update state.py

state.py

@@ -108,24 +108,22 @@ def build_all_csv_zip():
                 annotation, _ = result
                 currDF, _ = su.annotationToSimpleDataFrame(annotation)
 
-                # Apply speaker renames
-                renames = st.session_state.speakerRenames.get(fname, {})
-                currDF = currDF.copy()
-                if "Resource" in currDF.columns:
-                    currDF["Resource"] = currDF["Resource"].apply(
-                        lambda s: renames.get(s, s)
-                    )
-
-                # Add Role column (raw speaker -> role, before rename applied above,
-                # so look up by renamed value since we already applied renames)
+                # Add Role column against raw SPEAKER_## labels BEFORE renames
                 raw_to_role = {
-                    renames.get(token.split(": ", 1)[1], token.split(": ", 1)[1]):
-                        st.session_state.categories[i]
+                    token.split(": ", 1)[1]: st.session_state.categories[i]
                     for i, tokens in enumerate(st.session_state.categorySelect)
                     for token in tokens
                     if token.startswith(f"{fname}: ")
                 }
+                currDF = currDF.copy()
                 currDF["Role"] = currDF["Resource"].map(raw_to_role).fillna("")
+
+                # Apply speaker renames after Role is set
+                renames = st.session_state.speakerRenames.get(fname, {})
+                if "Resource" in currDF.columns:
+                    currDF["Resource"] = currDF["Resource"].apply(
+                        lambda s: renames.get(s, s)
+                    )
                 currDF = currDF.drop(columns=["Task"], errors="ignore")
                 currDF = currDF.rename(columns={"Resource": "Speaker"})
                 if "Start" in currDF.columns: