Update app.py

app.py

@@ -327,7 +327,8 @@ def create_ui() -> gr.Blocks:
             """)
             chatbot = gr.Chatbot(
                 label="Chat with Assistant",
-                height=400
+                height=400,
+                type="messages"
             )
             msg = gr.Textbox(
                 label="Message",
@@ -393,12 +394,47 @@ def create_ui() -> gr.Blocks:
             outputs=[start_page, input_page, analysis_page, chatbot_page, results_page, help_page, comparison_page, history_page]
         )
         
+        # Modified event handlers with loading states
+        def process_repo_input_with_loading(text: str, state: AppState) -> Tuple[pd.DataFrame, gr.update]:
+            """Process repo input with loading state."""
+            return process_repo_input(text, state), gr.update(visible=False)
+            
+        def keyword_search_with_loading(keyword: str, state: AppState) -> Tuple[pd.DataFrame, gr.update]:
+            """Search keywords with loading state."""
+            return keyword_search_and_update(keyword, state), gr.update(visible=False)
+            
+        def analyze_with_loading(state: AppState) -> Tuple[str, str, pd.DataFrame, gr.update]:
+            """Analyze with loading state."""
+            return *show_combined_repo_and_llm(state), gr.update(visible=False)
+            
+        def send_message_with_loading(user_message: str, history: List[Dict[str, str]], state: AppState) -> Tuple[List[Dict[str, str]], str, gr.update]:
+            """Send message with loading state."""
+            if not user_message:
+                return history, "", gr.update(visible=False)
+            history.append({"role": "user", "content": user_message})
+            response = chat_with_user(user_message, history, CHATBOT_SYSTEM_PROMPT)
+            history.append({"role": "assistant", "content": response})
+            return history, "", gr.update(visible=False)
+            
+        def end_chat_with_loading(history: List[Dict[str, str]], state: AppState) -> Tuple[List[str], gr.update, gr.update]:
+            """End chat and extract keywords."""
+            if not history:
+                return [], gr.update(visible=True), gr.update(visible=False)
+            keywords = extract_keywords_from_conversation(history)
+            state.generated_keywords = keywords
+            return keywords, gr.update(visible=True), gr.update(visible=False)
+            
+        def export_with_loading(df: pd.DataFrame) -> Tuple[str, gr.update]:
+            """Export with loading state."""
+            return export_results(df), gr.update(visible=False)
+            
+        # Update event handlers with loading states
         submit_btn.click(
             fn=lambda: gr.update(visible=True),
             inputs=[],
             outputs=[submit_loading]
         ).then(
-            fn=process_repo_input,
+            fn=process_repo_input_with_loading,
             inputs=[repo_id_input, state],
             outputs=[df_output, submit_loading]
         )
@@ -408,50 +444,21 @@ def create_ui() -> gr.Blocks:
             inputs=[],
             outputs=[search_loading]
         ).then(
-            fn=keyword_search_and_update,
+            fn=keyword_search_with_loading,
             inputs=[keyword_input, state],
             outputs=[df_output, search_loading]
         )
         
-        analyze_btn.click(
-            fn=lambda: navigate_to("analysis"),
-            inputs=[],
-            outputs=[start_page, input_page, analysis_page, chatbot_page, results_page]
-        )
-        
         next_btn.click(
             fn=lambda: gr.update(visible=True),
             inputs=[],
             outputs=[next_loading]
         ).then(
-            fn=show_combined_repo_and_llm,
+            fn=analyze_with_loading,
             inputs=[state],
             outputs=[content_output, summary_output, df_output, next_loading]
         )
         
-        finish_btn.click(
-            fn=lambda: navigate_to("results"),
-            inputs=[],
-            outputs=[start_page, input_page, analysis_page, chatbot_page, results_page]
-        )
-        
-        def user_send(user_message: str, history: List[Tuple[str, str]], state: AppState) -> Tuple[List[Tuple[str, str]], str]:
-            """Handle user message in chatbot."""
-            if not user_message:
-                return history, ""
-            history.append((user_message, ""))
-            response = chat_with_user(user_message, history, CHATBOT_SYSTEM_PROMPT)
-            history[-1] = (user_message, response)
-            return history, ""
-            
-        def end_chat(history: List[Tuple[str, str]], state: AppState) -> Tuple[List[str], List[gr.update]]:
-            """End chat and extract keywords."""
-            if not history:
-                return [], navigate_to("results")
-            keywords = extract_keywords_from_conversation(history)
-            state.generated_keywords = keywords
-            return keywords, navigate_to("results")
-            
         send_btn.click(
             fn=lambda: gr.update(visible=True),
             inputs=[],
@@ -469,7 +476,17 @@ def create_ui() -> gr.Blocks:
         ).then(
             fn=end_chat_with_loading,
             inputs=[chatbot, state],
-            outputs=[gr.Textbox(label="Extracted Keywords"), [start_page, input_page, analysis_page, chatbot_page, results_page, help_page, comparison_page, history_page], end_chat_loading]
+            outputs=[gr.Textbox(label="Extracted Keywords"), results_page, end_chat_loading]
+        )
+        
+        export_btn.click(
+            fn=lambda: gr.update(visible=True),
+            inputs=[],
+            outputs=[export_loading]
+        ).then(
+            fn=export_with_loading,
+            inputs=[results_df],
+            outputs=[gr.Textbox(label="Export Status"), export_loading]
         )
         
         restart_btn.click(
@@ -514,16 +531,6 @@ def create_ui() -> gr.Blocks:
                 logger.error(f"Error saving to history: {e}")
                 
         # Add new event handlers for new features
-        export_btn.click(
-            fn=lambda: gr.update(visible=True),
-            inputs=[],
-            outputs=[export_loading]
-        ).then(
-            fn=export_with_loading,
-            inputs=[results_df],
-            outputs=[gr.Textbox(label="Export Status"), export_loading]
-        )
-        
         history_btn.click(
             fn=lambda: (load_history(), navigate_to("history")),
             inputs=[],