Update app.py

app.py

@@ -25,9 +25,8 @@ from ui.ui_generators import (
     create_enhanced_report_tab, # NEW: Import the function to build the enhanced Report tab UI
     BOMB_ICON, EXPLORE_ICON, FORMULA_ICON, ACTIVE_ICON
 )
-# NEW: Import the OKR UI generator functions
-from ui.okr_ui_generator import create_enhanced_okr_tab, format_okrs_for_enhanced_display, get_empty_okr_state
-
+# NEW: Import the new OKR UI functions
+from ui.okr_ui_generator import create_enhanced_okr_tab, format_okrs_for_enhanced_display, get_initial_okr_display
 from ui.analytics_plot_generator import update_analytics_plots_figures, create_placeholder_plot
 from formulas import PLOT_FORMULAS
 
@@ -43,17 +42,18 @@ try:
     from services.report_data_handler import fetch_and_reconstruct_data_from_bubble
     # UI formatting functions
     from ui.insights_ui_generator import (
-        format_report_for_display # This will now return header HTML and body Markdown
+        format_report_for_display, # This will now return header HTML and body Markdown
+        # REMOVED: extract_key_results_for_selection, - Moved to okr_ui_generator (implicitly)
+        # REMOVED: format_single_okr_for_display - Moved to okr_ui_generator (implicitly)
     )
-    # The functions below are no longer needed due to the new OKR display approach and are removed from insights_ui_generator.py
-    # from ui.insights_ui_generator import extract_key_results_for_selection, format_single_okr_for_display
     AGENTIC_MODULES_LOADED = True
 except ImportError as e:
     logging.error(f"Could not import agentic pipeline display modules: {e}. Tabs 3 and 4 will be disabled.")
     AGENTIC_MODULES_LOADED = False
     # Placeholder functions to prevent app from crashing if imports fail
     def load_and_display_agentic_results(*args, **kwargs):
-        # NOTE: This return signature MUST match agentic_display_outputs length (now 8 values)
+        # NOTE: This return signature MUST match agentic_display_outputs
+        # Adjusted return values for the new split report display components and the new OKR HTML
         empty_header_html = """
         <div class="report-title">📊 Comprehensive Analysis Report</div>
         <div class="report-subtitle">AI-Generated Insights from Your LinkedIn Data</div>
@@ -68,22 +68,32 @@ except ImportError as e:
             </div>
         </div>
         """
-        # Placeholder should return sensible defaults for all outputs
+        # The load_and_display_agentic_results function returns many values.
+        # Ensure the placeholder returns the correct number of gr.update components
+        # matching the `outputs` in the .then() call later.
         return (
-            gr.update(value="Modules not loaded."), # 0: agentic_pipeline_status_md
-            gr.update(choices=[], value=None),       # 1: report_selector_dd
-            None, # 2: orchestration_raw_results_st - Placeholder should return None or an empty dict if it's the source for OKR display
-            [],                                      # 3: selected_key_result_ids_st (internal state, not UI)
-            [],                                      # 4: key_results_for_selection_st (internal state, not UI)
-            gr.update(value=empty_header_html),      # 5: report_header_html_display
-            gr.update(value=empty_body_markdown),    # 6: report_body_markdown_display
-            {}                                       # 7: reconstruction_cache_st
+            gr.update(value="Modules not loaded."), # agentic_pipeline_status_md (0)
+            gr.update(choices=[], value=None),      # report_selector_dd (1)
+            gr.update(choices=[], value=[]),        # key_results_cbg (2) - KEPT HIDDEN for compatibility
+            gr.update(value="Modules not loaded."), # okr_detail_display_md (3) - KEPT HIDDEN for compatibility
+            None,                                   # orchestration_raw_results_st (4)
+            [],                                     # selected_key_result_ids_st (5) - KEPT HIDDEN for compatibility
+            [],                                     # key_results_for_selection_st (6) - KEPT HIDDEN for compatibility
+            gr.update(value=empty_header_html),     # report_header_html_display (7)
+            gr.update(value=empty_body_markdown),   # report_body_markdown_display (8)
+            {},                                     # reconstruction_cache_st (9)
+            gr.update(value=get_initial_okr_display()) # NEW: enhanced_okr_display_html (10)
         )
     def fetch_and_reconstruct_data_from_bubble(*args, **kwargs):
         return None, {}
     def format_report_for_display(report_data):
         # Placeholder for when modules are not loaded, returns structure matching the new design
         return {'header_html': '<h1>Agentic modules not loaded.</h1>', 'body_markdown': 'Report display unavailable.'}
+    # REMOVED from insights_ui_generator.py, so also remove placeholder if not needed by other direct calls
+    # def extract_key_results_for_selection(okr_data):
+    #     return []
+    # def format_single_okr_for_display(okr_data, **kwargs):
+    #     return "Agentic modules not loaded. OKR display unavailable."
 
 
 # --- ANALYTICS TAB MODULE IMPORT ---
@@ -122,11 +132,10 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
 
     # States for agentic results display
     orchestration_raw_results_st = gr.State(None)
-    # The following states are no longer directly used for UI display, but might be kept for
-    # internal logic if needed by other parts of the agentic pipeline that are not UI-related.
-    key_results_for_selection_st = gr.State([]) 
+    # KEPT for compatibility with load_and_display_agentic_results signature
+    key_results_for_selection_st = gr.State([])
     selected_key_result_ids_st = gr.State([])
-    
+
     # --- NEW: Session-specific cache for reconstructed OKR data ---
     reconstruction_cache_st = gr.State({})
 
@@ -162,7 +171,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
         fn_get_initial_insight=get_initial_insight_prompt_and_suggestions,
         fn_generate_llm_response=generate_llm_response
     )
-    
+
     def update_report_display(selected_report_id: str, current_token_state: dict):
         """
         Updates the report header and body display when a new report is selected.
@@ -206,7 +215,7 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
         if not selected_report_id:
             # When no report is selected, update both header and body
             return gr.update(value=empty_header_html), gr.update(value=empty_body_markdown_no_selection)
-        
+
         agentic_df = current_token_state.get("bubble_agentic_analysis_data")
         if agentic_df is None or agentic_df.empty:
             # When no data is available, update both header and body
@@ -216,26 +225,18 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
         if selected_report_series_df.empty:
             # When report is not found, update both header and body
             return gr.update(value=empty_header_html), gr.update(value=empty_body_markdown_not_found(selected_report_id))
-        
+
         selected_report_series = selected_report_series_df.iloc[0]
-        
+
         # Call the format_report_for_display, which now returns a dict
         formatted_content_parts = format_report_for_display(selected_report_series)
-        
+
         # Update the two separate Gradio components
         return (
             gr.update(value=formatted_content_parts['header_html']),
             gr.update(value=formatted_content_parts['body_markdown'])
         )
 
-    # NEW: Function to update the enhanced OKR display
-    def update_okr_tab_display(raw_results: dict):
-        """
-        Updates the enhanced OKR HTML display based on the raw agentic results.
-        This replaces the old update_okr_display_on_selection which used a checkbox group.
-        """
-        return gr.update(value=format_okrs_for_enhanced_display(raw_results))
-
 
     with gr.Tabs() as tabs:
         # --- NEW HOME TAB ---
@@ -263,34 +264,48 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
 
 
         with gr.TabItem("4️⃣ Agentic OKRs & Tasks", id="tab_agentic_okrs", visible=AGENTIC_MODULES_LOADED):
-            # NEW: Call the new function to create the enhanced OKR tab UI
-            okr_display_html = create_enhanced_okr_tab()
+            gr.Markdown("## 🎯 AI Generated OKRs and Actionable Tasks (from Bubble.io)")
+            gr.Markdown("Basato sull'analisi AI, l'agente ha proposto i seguenti OKR.")
 
-            # The old UI components key_results_cbg and okr_detail_display_md are removed
-            # No need for individual KR selection anymore, the whole structure is displayed.
+            if not AGENTIC_MODULES_LOADED:
+                gr.Markdown("🔴 **Error:** Agentic modules could not be loaded.")
 
+            # Keep the old components but make them invisible to maintain load_and_display_agentic_results signature
+            with gr.Column(visible=False):
+                gr.Markdown("### Suggested Key Results (OLD UI - HIDDEN)")
+                key_results_cbg = gr.CheckboxGroup(label="Select Key Results", choices=[], value=[], interactive=True)
+                gr.Markdown("### Detailed OKRs and Tasks (OLD UI - HIDDEN)")
+                okr_detail_display_md = gr.Markdown("I dettagli OKR appariranno qui.")
+
+            # NEW: Add the enhanced OKR display HTML component
+            enhanced_okr_display_html = create_enhanced_okr_tab()
+
+            # REMOVED: The old update_okr_display_on_selection function and its change event
+            # as the new UI handles display dynamically from raw_results_st
 
     if AGENTIC_MODULES_LOADED:
         report_selector_dd.change(
             fn=update_report_display, # This now calls the enhanced function
             # MODIFIED: Updated outputs to match the two new display components
             inputs=[report_selector_dd, token_state],
-            outputs=[report_header_html_display, report_body_markdown_display], 
+            outputs=[report_header_html_display, report_body_markdown_display],
             show_progress="minimal"
         )
 
     # Ensure agentic_display_outputs correctly maps to the newly created components
     # This list must match the outputs of load_and_display_agentic_results
-    # REMOVED: okr_display_html from this list, as it's updated separately
     agentic_display_outputs = [
-        agentic_pipeline_status_md,       # 0: Status Markdown (hidden)
-        report_selector_dd,               # 1: Dropdown for selecting reports
-        orchestration_raw_results_st,     # 2: Raw results state (source for OKR display)
-        selected_key_result_ids_st,       # 3: Selected KR IDs state (internal state)
-        key_results_for_selection_st,     # 4: All KRs for selection state (internal state)
-        report_header_html_display,       # 5: New HTML output for report header
-        report_body_markdown_display,     # 6: New Markdown output for report body
-        reconstruction_cache_st,          # 7: Reconstruction cache state
+        agentic_pipeline_status_md,         # 0: Status Markdown (hidden)
+        report_selector_dd,                 # 1: Dropdown for selecting reports
+        key_results_cbg,                    # 2: Checkbox group for OKRs (kept hidden)
+        okr_detail_display_md,              # 3: Markdown for detailed OKR display (kept hidden)
+        orchestration_raw_results_st,       # 4: Raw results state
+        selected_key_result_ids_st,         # 5: Selected KR IDs state (kept hidden)
+        key_results_for_selection_st,       # 6: All KRs for selection state (kept hidden)
+        report_header_html_display,         # 7: New HTML output for header
+        report_body_markdown_display,       # 8: New Markdown output for body
+        reconstruction_cache_st,            # 9: Reconstruction cache state
+        enhanced_okr_display_html           # 10: NEW: The enhanced HTML display for OKRs
     ]
 
     initial_load_event = org_urn_display.change(
@@ -309,14 +324,13 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
     ).then(
         fn=load_and_display_agentic_results,
         inputs=[token_state, reconstruction_cache_st],
-        # MODIFIED: Outputs list updated to remove okr_display_html
+        # MODIFIED: Updated outputs to match all components returned by load_and_display_agentic_results
         outputs=agentic_display_outputs,
         show_progress="minimal"
-    ).then(
-        # NEW: Call the update function for the enhanced OKR tab display, now as the only source for okr_display_html
-        fn=update_okr_tab_display,
-        inputs=[orchestration_raw_results_st], # Use the raw results state
-        outputs=[okr_display_html],
+    ).then( # NEW CHAIN: Update the enhanced OKR display after load_and_display_agentic_results runs
+        fn=format_okrs_for_enhanced_display,
+        inputs=[orchestration_raw_results_st], # Take the raw results as input
+        outputs=[enhanced_okr_display_html],
         show_progress="minimal"
     )