Update ui/ui_main_page_enhancements.py

ui/ui_main_page_enhancements.py

@@ -1,4 +1,3 @@
-#ui_main_page_enhancements.py
 import gradio as gr
 import pandas as pd # Needed for state variables that hold DataFrames
 
@@ -202,7 +201,7 @@ input:focus, textarea:focus, select:focus {
 }
 
 .card:hover {
-    box-shadow: var(--shadow-medium);
+    box_shadow: var(--shadow-medium);
     transform: translateY(-2px);
 }
 
@@ -522,8 +521,14 @@ def update_report_display_enhanced(selected_report_id: str, current_token_state:
     )
 
 def build_main_app_ui(
-    analytics_tab_instance,
-    AGENTIC_MODULES_LOADED,
+    PLOT_ID_TO_FORMULA_KEY_MAP,
+    PLOT_FORMULAS,
+    BOMB_ICON, EXPLORE_ICON, FORMULA_ICON, ACTIVE_ICON,
+    build_analytics_tab_plot_area_func,
+    update_analytics_plots_figures_func,
+    create_placeholder_plot_func,
+    get_initial_insight_prompt_and_suggestions_func,
+    generate_llm_response_func,
     build_home_tab_ui_func,
     create_enhanced_report_tab_func,
     create_enhanced_okr_tab_func,
@@ -533,12 +538,8 @@ def build_main_app_ui(
     Builds the main Gradio application UI with enhanced styling and structure.
 
     Args:
-        analytics_tab_instance (AnalyticsTab): An instance of the AnalyticsTab class.
-        AGENTIC_MODULES_LOADED (bool): Flag indicating if agentic modules are loaded.
-        build_home_tab_ui_func (callable): Function to build the Home tab UI.
-        create_enhanced_report_tab_func (callable): Function to create the enhanced Report tab.
-        create_enhanced_okr_tab_func (callable): Function to create the enhanced OKR tab.
-        format_report_for_display_func (callable): Function to format report data for display.
+        (All necessary functions and constants are passed as arguments to ensure self-containment
+         within the UI module without direct imports of non-UI related logic)
 
     Returns:
         tuple: A tuple containing:
@@ -622,6 +623,25 @@ def build_main_app_ui(
                 )
                 gr.HTML('</div>')
 
+        # Instantiate AnalyticsTab here, after all its required gr.State components are defined
+        from services.analytics_tab_module import AnalyticsTab # Local import to ensure it's loaded within context
+
+        analytics_icons = {'bomb': BOMB_ICON, 'explore': EXPLORE_ICON, 'formula': FORMULA_ICON, 'active': ACTIVE_ICON}
+        analytics_tab_instance = AnalyticsTab(
+            token_state=token_state,
+            chat_histories_st=chat_histories_st,
+            current_chat_plot_id_st=current_chat_plot_id_st,
+            plot_data_for_chatbot_st=plot_data_for_chatbot_st,
+            plot_id_to_formula_map=PLOT_ID_TO_FORMULA_KEY_MAP,
+            plot_formulas_data=PLOT_FORMULAS,
+            icons=analytics_icons,
+            fn_build_plot_area=build_analytics_tab_plot_area_func,
+            fn_update_plot_figures=update_analytics_plots_figures_func,
+            fn_create_placeholder_plot=create_placeholder_plot_func,
+            fn_get_initial_insight=get_initial_insight_prompt_and_suggestions_func,
+            fn_generate_llm_response=generate_llm_response_func
+        )
+
         with gr.Tabs(elem_classes=["tab-nav"]) as tabs:
             # --- HOME TAB ---
             with gr.TabItem("🏠 Home", id="tab_home", elem_classes=["tabitem"]):
@@ -638,13 +658,13 @@ def build_main_app_ui(
             analytics_tab_instance.create_tab_ui() # This is the "Graphs" tab, assuming its ID is "tab_analytics_module"
 
             # --- AGENTIC ANALYSIS REPORT TAB ---
-            with gr.TabItem("📊 Analysis Reports", id="tab_agentic_report", visible=AGENTIC_MODULES_LOADED, elem_classes=["tabitem"]):
+            with gr.TabItem("📊 Analysis Reports", id="tab_agentic_report", visible=True, elem_classes=["tabitem"]): # Set visible to True to allow `create_enhanced_report_tab_func` to return components
                 # The create_enhanced_report_tab function handles the CSS and HTML structure
                 agentic_pipeline_status_md, report_selector_dd, report_header_html_display, report_body_markdown_display = \
-                    create_enhanced_report_tab_func(AGENTIC_MODULES_LOADED)
+                    create_enhanced_report_tab_func(True) # Pass True to create elements
 
             # --- AGENTIC OKRS TAB ---
-            with gr.TabItem("🎯 OKRs & Tasks", id="tab_agentic_okrs", visible=AGENTIC_MODULES_LOADED, elem_classes=["tabitem"]):
+            with gr.TabItem("🎯 OKRs & Tasks", id="tab_agentic_okrs", visible=True, elem_classes=["tabitem"]): # Set visible to True to allow components to be created
                 gr.HTML("""
                 <div class="card">
                     <div class="card-header">
@@ -656,7 +676,9 @@ def build_main_app_ui(
                 </div>
                 """)
 
-                if not AGENTIC_MODULES_LOADED:
+                # The `AGENTIC_MODULES_LOADED` check should control visibility from app.py, not prevent creation here
+                # to avoid NoneType errors during UI building.
+                if not AGENTIC_MODULES_LOADED: # This check is for conditional display, not creation
                     gr.HTML("""
                     <div class="card" style="text-align: center; padding: 2rem;">
                         <div style="font-size: 2rem; margin-bottom: 1rem;">🔴</div>
@@ -664,16 +686,16 @@ def build_main_app_ui(
                         <p>Agentic modules could not be loaded. This tab is currently unavailable.</p>
                     </div>
                     """)
+                else:
+                    # 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.")
 
-                # 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_func()
+                    # NEW: Add the enhanced OKR display HTML component
+                    enhanced_okr_display_html = create_enhanced_okr_tab_func()
 
         # Add footer with enhanced styling
         gr.HTML("""
@@ -687,18 +709,19 @@ def build_main_app_ui(
     
     # Ensure agentic_display_outputs correctly maps to the newly created components
     # This list must match the outputs of load_and_display_agentic_results
+    # These variables are now defined within the `with app:` block
     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 (kept hidden)
-        okr_detail_display_md,                 # 3: Markdown for detailed OKR display (kept hidden)
+        key_results_cbg if AGENTIC_MODULES_LOADED else gr.State([]), # Ensure it's a component or dummy state
+        okr_detail_display_md if AGENTIC_MODULES_LOADED else gr.State(None), # Ensure it's a component or dummy state
         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
+        enhanced_okr_display_html if AGENTIC_MODULES_LOADED else gr.State(get_initial_okr_display()), # NEW: The enhanced HTML display for OKRs
         actionable_okrs_data_st                # 11: NEW: The actionable_okrs dictionary state
     ]
 
@@ -706,4 +729,5 @@ def build_main_app_ui(
             token_state, reconstruction_cache_st, enhanced_okr_display_html,
             tabs, report_selector_dd, agentic_display_outputs,
             analytics_tab_instance, chat_histories_st,
+            current_chat_plot_id_st, plot_data_for_chatbot_st, # Return these as well
             format_report_for_display_func) # Return format_report_for_display_func as well