Revert "Update app.py"

This reverts commit 3616a8397b71c359a2d2dc5c76315c25708fe406.

app.py

@@ -814,14 +814,22 @@ def create_ui() -> gr.Blocks:
                 with gr.Row():
                     extract_analyze_btn = gr.Button("🎯 Extract Keywords & Analyze Now", variant="secondary", size="lg")
 
-                # Status info (auto-updated, no manual buttons needed)
+                # Status and extracted info (auto-updated, no manual buttons needed)
                 with gr.Row():
-                    chat_status = gr.Textbox(
-                        label="🎯 Chat Status", 
-                        interactive=False,
-                        lines=2,
-                        info="Conversation progress and auto-actions"
-                    )
+                    with gr.Column():
+                        chat_status = gr.Textbox(
+                            label="🎯 Chat Status", 
+                            interactive=False,
+                            lines=2,
+                            info="Conversation progress and auto-actions"
+                        )
+                    with gr.Column():
+                        extracted_keywords_output = gr.Textbox(
+                            label="🏷️ Auto-Extracted Keywords", 
+                            interactive=False, 
+                            show_copy_button=True,
+                            info="Keywords automatically extracted and used for search"
+                        )
 
             # --- Smart Search Tab (moved to second) ---
             with gr.TabItem("📝 Smart Search", id="input_tab"):
@@ -879,9 +887,9 @@ def create_ui() -> gr.Blocks:
                         wrap=True,
                         interactive=False
                     )
-                
+                    
                     # Quick links for top repositories
-                with gr.Row():
+                    with gr.Row():
                         top_repo_links = gr.HTML(
                             value="",
                             label="🔗 Quick Links",
@@ -912,7 +920,7 @@ def create_ui() -> gr.Blocks:
                     wrap=True,
                     interactive=False
                 )
-
+                
                 # Quick links section for all repositories
                 with gr.Row():
                     all_repo_links = gr.HTML(
@@ -991,10 +999,10 @@ def create_ui() -> gr.Blocks:
                 history.append({"role": "user", "content": user_message})
             return history, ""
 
-        def handle_bot_response(history: List[Dict[str, str]]) -> Tuple[List[Dict[str, str]], str, str, List[str], int, pd.DataFrame, Any]:
+        def handle_bot_response(history: List[Dict[str, str]]) -> Tuple[List[Dict[str, str]], str, str, str, List[str], int, pd.DataFrame, Any]:
             """Generates bot response and automatically extracts keywords if conversation is ready."""
             if not history or history[-1]["role"] != "user":
-                return history, "", "", [], 0, pd.DataFrame(), gr.update()
+                return history, "", "", "", [], 0, pd.DataFrame(), gr.update()
             
             user_message = history[-1]["content"]
             # Convert all messages *before* the last user message into tuples for the API
@@ -1028,11 +1036,11 @@ def create_ui() -> gr.Blocks:
                     write_repos_to_csv(unique_repo_ids)
                     df = format_dataframe_for_display(read_csv_to_dataframe())
                     
-                    chat_status = f"🎉 Extracted keywords → Found {len(unique_repo_ids)} repositories → Analysis complete!"
+                    chat_status = f"🎯 Auto-extracted keywords and found {len(unique_repo_ids)} repositories. Analysis starting automatically..."
                     
-                    return history, chat_status, user_requirements, unique_repo_ids, 0, df, gr.update(selected="analysis_tab")
+                    return history, chat_status, final_keywords_str, user_requirements, unique_repo_ids, 0, df, gr.update(selected="analysis_tab")
             
-            return history, "💬 Conversation continuing...", "", [], 0, pd.DataFrame(), gr.update()
+            return history, "💬 Conversation continuing...", "", "", [], 0, pd.DataFrame(), gr.update()
 
         def handle_dataframe_select(evt: gr.SelectData, df_data) -> Tuple[str, Any, str]:
             """Handle dataframe row selection - show modal for repo ID (column 0) clicks."""
@@ -1125,15 +1133,15 @@ def create_ui() -> gr.Blocks:
                 return f'<div style="margin: 10px 0; padding: 15px; background: rgba(255, 255, 255, 0.1); border-radius: 12px; backdrop-filter: blur(10px);">{"".join(html_links)}</div>'
             return ""
 
-        def handle_extract_and_analyze(history: List[Dict[str, str]]) -> Tuple[str, str, List[str], int, pd.DataFrame, Any, pd.DataFrame, str, Any, str, str]:
+        def handle_extract_and_analyze(history: List[Dict[str, str]]) -> Tuple[str, str, str, List[str], int, pd.DataFrame, Any, pd.DataFrame, str, Any, str, str]:
             """Extract keywords from chat, search repositories, and immediately start analysis."""
             if not history:
-                return "❌ No conversation to extract from.", "", [], 0, pd.DataFrame(), gr.update(), pd.DataFrame(), "", gr.update(visible=False), "", ""
+                return "❌ No conversation to extract from.", "", "", [], 0, pd.DataFrame(), gr.update(), pd.DataFrame(), "", gr.update(visible=False), "", ""
             
             # Convert the full, valid history for the extraction logic
             tuple_history = convert_messages_to_tuples(history)
             if not tuple_history:
-                return "❌ No completed conversations to analyze.", "", [], 0, pd.DataFrame(), gr.update(), pd.DataFrame(), "", gr.update(visible=False), "", ""
+                return "❌ No completed conversations to analyze.", "", "", [], 0, pd.DataFrame(), gr.update(), pd.DataFrame(), "", gr.update(visible=False), "", ""
                 
             # Get raw keywords string from the LLM
             raw_keywords_str = extract_keywords_from_conversation(tuple_history)
@@ -1143,7 +1151,7 @@ def create_ui() -> gr.Blocks:
             cleaned_keywords = [kw.strip() for kw in cleaned_keywords if kw.strip()]
             
             if not cleaned_keywords:
-                return f"❌ Could not extract valid keywords. Raw output: '{raw_keywords_str}'", "", [], 0, pd.DataFrame(), gr.update(), pd.DataFrame(), "", gr.update(visible=False), "", ""
+                return f"❌ Could not extract valid keywords. Raw output: '{raw_keywords_str}'", "", "", [], 0, pd.DataFrame(), gr.update(), pd.DataFrame(), "", gr.update(visible=False), "", ""
 
             # Join them into a clean, comma-separated string
             final_keywords_str = ", ".join(cleaned_keywords)
@@ -1159,7 +1167,7 @@ def create_ui() -> gr.Blocks:
             unique_repo_ids = list(dict.fromkeys(repo_ids))
             
             if not unique_repo_ids:
-                return f"❌ No repositories found for keywords: {final_keywords_str}", user_requirements, [], 0, pd.DataFrame(), gr.update(), pd.DataFrame(), "", gr.update(visible=False), "", ""
+                return f"❌ No repositories found for keywords: {final_keywords_str}", final_keywords_str, user_requirements, [], 0, pd.DataFrame(), gr.update(), pd.DataFrame(), "", gr.update(visible=False), "", ""
             
             write_repos_to_csv(unique_repo_ids)
             df = format_dataframe_for_display(read_csv_to_dataframe())
@@ -1170,12 +1178,12 @@ def create_ui() -> gr.Blocks:
                 
                 chat_status = f"🎉 Extracted keywords → Found {len(unique_repo_ids)} repositories → Analysis complete!"
                 
-                return chat_status, user_requirements, unique_repo_ids, 0, analyzed_df, gr.update(selected="analysis_tab"), top_repos, analysis_status, top_section_update, all_links, top_links
+                return chat_status, final_keywords_str, user_requirements, unique_repo_ids, 0, analyzed_df, gr.update(selected="analysis_tab"), top_repos, analysis_status, top_section_update, all_links, top_links
                 
             except Exception as e:
                 logger.error(f"Error during extract and analyze: {e}")
                 error_status = f"✅ Found {len(unique_repo_ids)} repositories, but analysis failed: {e}"
-                return error_status, user_requirements, unique_repo_ids, 0, df, gr.update(selected="analysis_tab"), pd.DataFrame(), "", gr.update(visible=False), "", ""
+                return error_status, final_keywords_str, user_requirements, unique_repo_ids, 0, df, gr.update(selected="analysis_tab"), pd.DataFrame(), "", gr.update(visible=False), "", ""
 
         def extract_user_requirements_from_chat(history: List[Dict[str, str]]) -> str:
             """Extract user requirements from chatbot conversation."""
@@ -1318,7 +1326,7 @@ def create_ui() -> gr.Blocks:
                 error_status = f"❌ Batch analysis failed: {e}"
                 return format_dataframe_for_display(read_csv_to_dataframe()), error_status, pd.DataFrame(), gr.update(visible=False), "", ""
 
-        def handle_reset_everything() -> Tuple[List[str], int, str, pd.DataFrame, pd.DataFrame, Any, List[Dict[str, str]], str, str]:
+        def handle_reset_everything() -> Tuple[List[str], int, str, pd.DataFrame, pd.DataFrame, Any, List[Dict[str, str]], str, str, str]:
             """Reset everything to initial state - clear all data, CSV, and UI components."""
             try:
                 # Clear the CSV file
@@ -1339,6 +1347,7 @@ def create_ui() -> gr.Blocks:
                 
                 # Reset UI components
                 current_requirements_reset = "No requirements extracted yet."
+                extracted_keywords_reset = ""
                 
                 # Reset chatbot to initial message
                 chatbot_reset = [{"role": "assistant", "content": CHATBOT_INITIAL_MESSAGE}]
@@ -1354,7 +1363,8 @@ def create_ui() -> gr.Blocks:
                     gr.update(visible=False), # top_repos_section
                     chatbot_reset,            # chatbot
                     status_reset,             # status_box_input
-                    current_requirements_reset # current_requirements_display
+                    current_requirements_reset, # current_requirements_display
+                    extracted_keywords_reset  # extracted_keywords_output
                 )
                 
             except Exception as e:
@@ -1369,7 +1379,8 @@ def create_ui() -> gr.Blocks:
                     gr.update(visible=False), # top_repos_section
                     [{"role": "assistant", "content": CHATBOT_INITIAL_MESSAGE}], # chatbot
                     error_status,             # status_box_input
-                    "No requirements extracted yet." # current_requirements_display
+                    "No requirements extracted yet.", # current_requirements_display
+                    ""                        # extracted_keywords_output
                 )
 
         # --- Component Event Wiring ---
@@ -1426,7 +1437,7 @@ def create_ui() -> gr.Blocks:
         ).then(
             fn=handle_bot_response,
             inputs=[chatbot],
-            outputs=[chatbot, chat_status, user_requirements_state, repo_ids_state, current_repo_idx_state, df_output, tabs]
+            outputs=[chatbot, chat_status, extracted_keywords_output, user_requirements_state, repo_ids_state, current_repo_idx_state, df_output, tabs]
         ).then(
             # Update requirements display when they change
             fn=lambda req: req if req.strip() else "No specific requirements extracted from conversation.",
@@ -1446,7 +1457,7 @@ def create_ui() -> gr.Blocks:
         ).then(
             fn=handle_bot_response,
             inputs=[chatbot],
-            outputs=[chatbot, chat_status, user_requirements_state, repo_ids_state, current_repo_idx_state, df_output, tabs]
+            outputs=[chatbot, chat_status, extracted_keywords_output, user_requirements_state, repo_ids_state, current_repo_idx_state, df_output, tabs]
         ).then(
             # Update requirements display when they change
             fn=lambda req: req if req.strip() else "No specific requirements extracted from conversation.",
@@ -1463,7 +1474,7 @@ def create_ui() -> gr.Blocks:
         extract_analyze_btn.click(
             fn=handle_extract_and_analyze,
             inputs=[chatbot],
-            outputs=[chat_status, user_requirements_state, repo_ids_state, current_repo_idx_state, df_output, tabs, top_repos_df, status_box_analysis, top_repos_section, all_repo_links, top_repo_links]
+            outputs=[chat_status, extracted_keywords_output, user_requirements_state, repo_ids_state, current_repo_idx_state, df_output, tabs, top_repos_df, status_box_analysis, top_repos_section, all_repo_links, top_repo_links]
         ).then(
             # Update requirements display when they change
             fn=lambda req: req if req.strip() else "No specific requirements extracted from conversation.",
@@ -1532,7 +1543,7 @@ def create_ui() -> gr.Blocks:
         # Reset button event
         reset_all_btn.click(
             fn=handle_reset_everything,
-            outputs=[repo_ids_state, current_repo_idx_state, user_requirements_state, df_output, top_repos_df, top_repos_section, chatbot, status_box_input, current_requirements_display]
+            outputs=[repo_ids_state, current_repo_idx_state, user_requirements_state, df_output, top_repos_df, top_repos_section, chatbot, status_box_input, current_requirements_display, extracted_keywords_output]
         )
         
         # Help modal events