Update app.py

app.py

@@ -18,7 +18,8 @@ from config import (
     BUBBLE_API_ENDPOINT_ENV_VAR
 )
 
-from services.analytics_tab_module import AnalyticsTab
+# analytics_tab_module is now imported locally inside ui/ui_enhancements.py's build_main_app_ui
+# from services.analytics_tab_module import AnalyticsTab # REMOVED global import here
 
 # UPDATED: Using the new data loading function from the refactored state manager
 from services.state_manager import load_data_from_bubble
@@ -36,7 +37,7 @@ from ui.analytics_plot_generator import update_analytics_plots_figures, create_p
 from formulas import PLOT_FORMULAS
 
 # NEW: Import UI enhancements from the new module
-from ui.ui_main_page_enhancements import build_main_app_ui, update_report_display_enhanced
+from ui.ui_enhancements import build_main_app_ui, update_report_display_enhanced
 
 # --- CHATBOT MODULE IMPORTS ---
 from features.chatbot.chatbot_prompts import get_initial_insight_prompt_and_suggestions
@@ -114,57 +115,28 @@ def initial_data_load_sequence(url_token, org_urn_val, current_state):
         status_msg = f"🔄 {status_msg}"
     return status_msg, new_state
 
-# Instantiate AnalyticsTab (needs to be done before building UI if its methods are called)
-analytics_icons = {'bomb': BOMB_ICON, 'explore': EXPLORE_ICON, 'formula': FORMULA_ICON, 'active': ACTIVE_ICON}
-analytics_tab_instance = AnalyticsTab(
-    # These states are created within build_main_app_ui, but AnalyticsTab needs references.
-    # We will set them after build_main_app_ui returns them. For now, pass placeholders.
-    token_state=None, # Will be updated after build_main_app_ui
-    chat_histories_st=None, # Will be updated after build_main_app_ui
-    current_chat_plot_id_st=None, # Will be updated after build_main_app_ui
-    plot_data_for_chatbot_st=None, # Will be updated after build_main_app_ui
-    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,
-    fn_update_plot_figures=update_analytics_plots_figures,
-    fn_create_placeholder_plot=create_placeholder_plot,
-    fn_get_initial_insight=get_initial_insight_prompt_and_suggestions,
-    fn_generate_llm_response=generate_llm_response
-)
-
-
 # Build the main UI using the function from ui_enhancements
 (app, url_user_token_display, org_urn_display, status_box,
  token_state, reconstruction_cache_st, enhanced_okr_display_html,
  tabs, report_selector_dd, agentic_display_outputs,
- analytics_tab_instance_returned, chat_histories_st_returned, format_report_for_display_func_passed) = \
+ analytics_tab_instance, chat_histories_st_returned,
+ current_chat_plot_id_st_returned, plot_data_for_chatbot_st_returned, # Receive these returned states
+ format_report_for_display_func_passed) = \
     build_main_app_ui(
-        analytics_tab_instance=analytics_tab_instance, # Pass the instantiated object
-        AGENTIC_MODULES_LOADED=AGENTIC_MODULES_LOADED,
+        PLOT_ID_TO_FORMULA_KEY_MAP=PLOT_ID_TO_FORMULA_KEY_MAP,
+        PLOT_FORMULAS=PLOT_FORMULAS,
+        BOMB_ICON=BOMB_ICON, EXPLORE_ICON=EXPLORE_ICON, FORMULA_ICON=FORMULA_ICON, ACTIVE_ICON=ACTIVE_ICON,
+        build_analytics_tab_plot_area_func=build_analytics_tab_plot_area,
+        update_analytics_plots_figures_func=update_analytics_plots_figures,
+        create_placeholder_plot_func=create_placeholder_plot,
+        get_initial_insight_prompt_and_suggestions_func=get_initial_insight_prompt_and_suggestions,
+        generate_llm_response_func=generate_llm_response,
         build_home_tab_ui_func=build_home_tab_ui,
         create_enhanced_report_tab_func=create_enhanced_report_tab,
         create_enhanced_okr_tab_func=create_enhanced_okr_tab,
         format_report_for_display_func=format_report_for_display # Pass the imported function
     )
 
-# Now, update the analytics_tab_instance with the actual state components from the built UI
-# This is crucial because analytics_tab_instance was instantiated before the gr.State components existed.
-analytics_tab_instance.token_state = token_state
-analytics_tab_instance.chat_histories_st = chat_histories_st_returned
-analytics_tab_instance.current_chat_plot_id_st = agentic_display_outputs[9] # This is current_chat_plot_id_st
-analytics_tab_instance.plot_data_for_chatbot_st = agentic_display_outputs[11] # This is actionable_okrs_data_st, which is incorrect. Should be plot_data_for_chatbot_st
-
-# Corrected update for analytics_tab_instance state components.
-# Need to know the exact index of each state in agentic_display_outputs or pass them directly.
-# Given the `build_main_app_ui` returns specific components, let's use those directly.
-# The original code for `chat_histories_st`, `current_chat_plot_id_st`, `plot_data_for_chatbot_st`
-# are defined within `build_main_app_ui`'s scope.
-# The returned `chat_histories_st_returned` and the other states are the correct references.
-# So, no need to access them via `agentic_display_outputs` for the analytics_tab_instance.
-# The parameters `chat_histories_st_returned` (which is `chat_histories_st` inside `build_main_app_ui`)
-# and others are the correct references.
-
 # Event handlers (re-establishing them now that components are defined)
 app.load(fn=get_url_user_token, inputs=None, outputs=[url_user_token_display, org_urn_display], api_name="get_url_params", show_progress=False)
 
@@ -186,9 +158,9 @@ initial_load_event = org_urn_display.change(
 
 # Chain the loading events
 initial_load_event.then(
-    fn=analytics_tab_instance.refresh_analytics_graphs_ui, # Using the corrected method name (assuming this exists)
+    fn=analytics_tab_instance.refresh_analytics_graphs_ui,
     inputs=[token_state, analytics_tab_instance.date_filter_selector, analytics_tab_instance.custom_start_date_picker,
-            analytics_tab_instance.custom_end_date_picker, chat_histories_st_returned], # Using returned chat_histories_st
+            analytics_tab_instance.custom_end_date_picker, chat_histories_st_returned],
     outputs=analytics_tab_instance.graph_refresh_outputs_list,
     show_progress="full"
 ).then(