Update app.py

app.py

@@ -96,8 +96,8 @@ def updateCategoryOptions(resultIndex):
     #st.info(f"Updating result {resultIndex}")
     #st.info(f"In update: {st.session_state.categorySelect}")
     # Handle 
-    currResults = st.session_state.results[resultIndex][1]
-    speakerNames = [sp for sp in currResults["speakers"].keys()]
+    _, currAnnotation, _ = st.session_state.results[currFileIndex]
+    speakerNames = currAnnotation.labels()
 
     # Handle speaker category sidebars
     unusedSpeakers = copy.deepcopy(speakerNames)
@@ -223,7 +223,7 @@ def analyze(inFileName):
             st.session_state.summaries[currFileIndex]["speakers_times"] = speakers_times
 
             df2_dict = {
-                "values":[100*t/currResults["duration"] for t in df4_dict["values"]],
+                "values":[100*t/currTotalTime for t in df4_dict["values"]],
                 "names":df4_dict["names"]
             }
             df2 = pd.DataFrame(df2_dict)
@@ -397,6 +397,7 @@ try:
     st.session_state.resetResult = False
     currFileIndex = file_names.index(currFile)
     if len(st.session_state.results) > currFileIndex and len(st.session_state.summaries) > currFileIndex and len(st.session_state.results[currFileIndex]) > 0:
+        st.info("Displaying current file results")
         # Handle 
         currSpeakerList, currAnnotation, currTotalTime = st.session_state.results[currFileIndex]
         speakerNames = currAnnotation.labels()
@@ -413,6 +414,7 @@ try:
                                     on_change=updateCategoryOptions,
                                     args=(currFileIndex,))
             st.sidebar.button(f"Remove {category}",key=f"remove_{category}",on_click=removeCategory,args=(i,))
+        st.info("Displaying current file results1")
 
        
         newCategory = st.sidebar.text_input('Add category', key='categoryInput',on_change=addCategory)   
@@ -429,6 +431,7 @@ try:
         for sp in unusedSpeakers:
             extraNames.append(sp)
             extraValues.append(su.sumTimes(currAnnotation.subset([sp])))
+        st.info("Displaying current file results2")
         
         df4_dict = {
                 "names": nameList+extraNames,
@@ -491,6 +494,7 @@ try:
         st.plotly_chart(fig2, use_container_width=True)
         st.plotly_chart(fig3_1, use_container_width=True)
         st.plotly_chart(fig3, use_container_width=True)
+        st.info("Displaying current file results3")
 
         fig_la = px.timeline(speakers_dataFrame, x_start="Start", x_end="Finish", y="Resource", color="Resource")
         fig_la.update_yaxes(autorange="reversed") 
@@ -533,12 +537,14 @@ try:
             ])
         )
         st.plotly_chart(fig2_la, use_container_width=True)
+        st.info("Displaying current file results4")
 except ValueError:
     pass
 
 if len(st.session_state.results) > 0:
+    st.info("In full summary results")
     with st.spinner(text='Processing summary results...'):
-        fileNames = []
+        fileNames = st.session_state.file_names
         results = []
         indices = []
         for i, resultTuple in enumerate(st.session_state.results):
@@ -546,6 +552,7 @@ if len(st.session_state.results) > 0:
                 fileNames.append(resultTuple[0])
                 results.append(resultTuple[1])
                 indices.append(i)
+        st.info("In full summary results1")
         if len(indices) > 1:
             
             df6_dict = {
@@ -553,14 +560,15 @@ if len(st.session_state.results) > 0:
             }
             allCategories = copy.deepcopy(st.session_state.categories)
             for i in indices:
-                currResult = st.session_state.results[i][1]
+                currSpeakerList, currAnnotation, currTotalTime = st.session_state.results[i]
                 categorySelections = st.session_state["categorySelect"][i]
-                catSummary,extraCats = calcCategories(currResult["speakers"],categorySelections)
+                catSummary,extraCats = calcCategories(currAnnotation,categorySelections)
                 st.session_state.summaries[i]["categories"] = (catSummary,extraCats)
                 for extra in extraCats:
                     df6_dict[extra] = []
                     if extra not in allCategories:
                         allCategories.append(extra)
+            st.info("In full summary results2")
         
             for category in st.session_state.categories:
                 df6_dict[category] = []
@@ -568,17 +576,18 @@ if len(st.session_state.results) > 0:
                 summary, extras = st.session_state.summaries[i]["categories"]
                 theseCategories = st.session_state.categories + extras
                 for j, timeSlots in enumerate(summary):
-                    df6_dict[theseCategories[j]].append(sumTimes([t for _,t in timeSlots])/st.session_state.results[i][1]['duration'])
+                    df6_dict[theseCategories[j]].append(sumTimes([t for _,t in timeSlots])/st.session_state.results[i][2])
                 for category in allCategories:
                     if category not in theseCategories:
                         df6_dict[category].append(0)
             df6 = pd.DataFrame(df6_dict)
             summFig = px.bar(df6, x="files", y=allCategories)
             st.plotly_chart(summFig, use_container_width=True)
+            st.info("In full summary results3")
         
             voiceNames = ["No Voice","One Voice","Multi Voice"]
             df7_dict = {
-                "files":[fileName for fileName,_ in st.session_state.results],
+                "files":fileNames,
             }
             for category in voiceNames:
                 df7_dict[category] = []