Update app.py

app.py

@@ -25,6 +25,9 @@ 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
+
 from ui.analytics_plot_generator import update_analytics_plots_figures, create_placeholder_plot
 from formulas import PLOT_FORMULAS
 
@@ -40,18 +43,17 @@ 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
-        extract_key_results_for_selection,
-        format_single_okr_for_display
+        format_report_for_display # This will now return header HTML and body Markdown
     )
+    # 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
-        # Adjusted return values for the new split report display components
+        # NOTE: This return signature MUST match agentic_display_outputs length (now 8 values)
         empty_header_html = """
         <div class="report-title">📊 Comprehensive Analysis Report</div>
         <div class="report-subtitle">AI-Generated Insights from Your LinkedIn Data</div>
@@ -66,30 +68,22 @@ except ImportError as e:
             </div>
         </div>
         """
-        # 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.
+        # Placeholder should return sensible defaults for all outputs
         return (
-            gr.update(value="Modules not loaded."), # agentic_pipeline_status_md
-            gr.update(choices=[], value=None),      # report_selector_dd
-            gr.update(choices=[], value=[]),        # key_results_cbg
-            gr.update(value="Modules not loaded."), # okr_detail_display_md
-            None, # orchestration_raw_results_st
-            [], # selected_key_result_ids_st
-            [], # key_results_for_selection_st
-            gr.update(value=empty_header_html), # report_header_html_display
-            gr.update(value=empty_body_markdown), # report_body_markdown_display
-            {} # reconstruction_cache_st
+            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
         )
     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.'}
-    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 ---
@@ -128,7 +122,9 @@ 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)
-    key_results_for_selection_st = gr.State([])
+    # 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([]) 
     selected_key_result_ids_st = gr.State([])
     
     # --- NEW: Session-specific cache for reconstructed OKR data ---
@@ -232,6 +228,14 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
             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 ---
@@ -259,48 +263,13 @@ 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):
-            gr.Markdown("## 🎯 AI Generated OKRs and Actionable Tasks (from Bubble.io)")
-            gr.Markdown("Basato sull'analisi AI, l'agente ha proposto i seguenti OKR. Seleziona i Key Results per dettagli.")
-            if not AGENTIC_MODULES_LOADED:
-                gr.Markdown("🔴 **Error:** Agentic modules could not be loaded.")
-            with gr.Row():
-                with gr.Column(scale=1):
-                    gr.Markdown("### Suggested Key Results")
-                    key_results_cbg = gr.CheckboxGroup(label="Select Key Results", choices=[], value=[], interactive=True)
-                with gr.Column(scale=3):
-                    gr.Markdown("### Detailed OKRs and Tasks")
-                    okr_detail_display_md = gr.Markdown("I dettagli OKR appariranno qui.")
-
-            def update_okr_display_on_selection(selected_kr_ids: list, raw_results: dict, all_krs: list):
-                if not raw_results or not AGENTIC_MODULES_LOADED:
-                    return gr.update(value="Nessun dato di analisi caricato.")
-                actionable_okrs = raw_results.get("actionable_okrs")
-                if not actionable_okrs or not isinstance(actionable_okrs.get("okrs"), list):
-                    return gr.update(value="Nessun OKR trovato.")
-                okrs_list, kr_id_map = actionable_okrs["okrs"], {kr['unique_kr_id']: (kr['okr_index'], kr['kr_index']) for kr in all_krs}
-                selected_krs_by_okr_idx = defaultdict(list)
-                if selected_kr_ids:
-                    for kr_id in selected_kr_ids:
-                        if kr_id in kr_id_map:
-                            okr_idx, kr_idx = kr_id_map[kr_id]
-                            selected_krs_by_okr_idx[okr_idx].append(kr_idx)
-                output_parts = []
-                for okr_idx, okr in enumerate(okrs_list):
-                    if not selected_kr_ids:
-                        output_parts.append(format_single_okr_for_display(okr, okr_main_index=okr_idx))
-                    elif okr_idx in selected_krs_by_okr_idx:
-                        accepted_indices = selected_krs_by_okr_idx.get(okr_idx)
-                        output_parts.append(format_single_okr_for_display(okr, accepted_kr_indices=accepted_indices, okr_main_index=okr_idx))
-                final_md = "\n\n---\n\n".join(output_parts) if output_parts else "Nessun OKR corrisponde alla selezione."
-                return gr.update(value=final_md)
-
-            if AGENTIC_MODULES_LOADED:
-                key_results_cbg.change(
-                    fn=update_okr_display_on_selection,
-                    inputs=[key_results_cbg, orchestration_raw_results_st, key_results_for_selection_st],
-                    outputs=[okr_detail_display_md]
-                )
-    
+            # NEW: Call the new function to create the enhanced OKR tab UI
+            okr_display_html = create_enhanced_okr_tab()
+
+            # 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 AGENTIC_MODULES_LOADED:
         report_selector_dd.change(
             fn=update_report_display, # This now calls the enhanced function
@@ -312,17 +281,16 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
 
     # 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
-        key_results_cbg,                # 2: Checkbox group for OKRs
-        okr_detail_display_md,          # 3: Markdown for detailed OKR display
-        orchestration_raw_results_st,   # 4: Raw results state
-        selected_key_result_ids_st,     # 5: Selected KR IDs state
-        key_results_for_selection_st,   # 6: All KRs for selection state
-        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
+        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
     ]
 
     initial_load_event = org_urn_display.change(
@@ -341,11 +309,18 @@ 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: Updated outputs to match all components returned by load_and_display_agentic_results
+        # MODIFIED: Outputs list updated to remove okr_display_html
         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],
+        show_progress="minimal"
     )
 
+
 if __name__ == "__main__":
     if not os.environ.get(LINKEDIN_CLIENT_ID_ENV_VAR):
         logging.warning(f"WARNING: '{LINKEDIN_CLIENT_ID_ENV_VAR}' is not set.")
@@ -357,4 +332,3 @@ if __name__ == "__main__":
         logging.warning("WARNING: 'GEMINI_API_KEY' is not set.")
 
     app.launch(server_name="0.0.0.0", server_port=int(os.environ.get("PORT", 7860)), debug=True)
-