Update services/analytics_tab_module.py

services/analytics_tab_module.py

@@ -3,7 +3,7 @@ import gradio as gr
 import pandas as pd
 import logging
 import time
-from datetime import datetime, timedelta
+from datetime import datetime, date, timedelta
 import numpy as np
 from collections import OrderedDict, defaultdict
 import asyncio
@@ -99,6 +99,29 @@ class AnalyticsTab:
         is_custom = selection == "Intervallo Personalizzato"
         return gr.update(visible=is_custom), gr.update(visible=is_custom)
 
+    # --- NEW HELPER FUNCTION ---
+    # This function handles the conversion from a date object (from gr.Date)
+    # to a datetime object, which the plotting function likely expects.
+    def _handle_date_input(self, date_val):
+        """Converts various date inputs to a timezone-aware datetime object."""
+        if date_val is None:
+            return None
+        if isinstance(date_val, datetime):
+            return date_val # Already a datetime object
+        if isinstance(date_val, date):
+            # Combine the date with the beginning of the day to create a datetime object
+            return datetime.combine(date_val, datetime.min.time())
+        # Add handling for string if necessary, though gr.Date usually returns date/datetime objects
+        if isinstance(date_val, str):
+            try:
+                # Attempt to parse a date string like 'YYYY-MM-DD'
+                parsed_date = datetime.strptime(date_val, '%Y-%m-%d').date()
+                return datetime.combine(parsed_date, datetime.min.time())
+            except ValueError:
+                logging.warning(f"Could not parse date string: {date_val}")
+                return None
+        return None
+
     async def _handle_panel_action(
         self, plot_id_clicked: str, action_type: str, current_active_action_from_state: dict,
         current_chat_histories: dict, current_chat_plot_id: str,
@@ -228,19 +251,19 @@ class AnalyticsTab:
 
         # Order of updates must match self.action_panel_outputs_list
         final_updates = [
-            action_col_visible_update,        # global_actions_column_ui
-            insights_chatbot_visible_update,    # insights_chatbot_ui (visibility)
-            chatbot_content_update,             # insights_chatbot_ui (content)
+            action_col_visible_update,       # global_actions_column_ui
+            insights_chatbot_visible_update,   # insights_chatbot_ui (visibility)
+            chatbot_content_update,            # insights_chatbot_ui (content)
             insights_chat_input_visible_update, # insights_chat_input_ui
             insights_suggestions_row_visible_update, # insights_suggestions_row_ui
-            s1_upd, s2_upd, s3_upd,              # suggestion buttons
-            formula_display_visible_update,     # formula_display_markdown_ui (visibility)
-            formula_content_update,             # formula_display_markdown_ui (content)
-            formula_close_hint_visible_update,  # formula_close_hint_md
-            new_active_action_state_to_set,     # active_panel_action_state
-            new_current_chat_plot_id,           # current_chat_plot_id_st
-            updated_chat_histories,             # chat_histories_st
-            new_explored_plot_id_to_set         # explored_plot_id_state
+            s1_upd, s2_upd, s3_upd,             # suggestion buttons
+            formula_display_visible_update,    # formula_display_markdown_ui (visibility)
+            formula_content_update,            # formula_display_markdown_ui (content)
+            formula_close_hint_visible_update, # formula_close_hint_md
+            new_active_action_state_to_set,    # active_panel_action_state
+            new_current_chat_plot_id,          # current_chat_plot_id_st
+            updated_chat_histories,            # chat_histories_st
+            new_explored_plot_id_to_set        # explored_plot_id_state
         ]
         final_updates.extend(generated_panel_vis_updates) # Plot panel visibilities
         final_updates.extend(generated_bomb_btn_updates)    # Bomb button icons
@@ -370,30 +393,26 @@ class AnalyticsTab:
         logging.info("Refreshing analytics graph UI elements and resetting actions/chat (within module).")
         start_time = time.time()
 
-        plot_gen_results = self.update_analytics_plots_figures(current_token_state_val, date_filter_val, custom_start_val, custom_end_val, PLOT_CONFIGS)
+        # --- MODIFICATION: Use the helper function to convert date inputs ---
+        # This ensures that the `update_analytics_plots_figures` function receives a consistent datetime format.
+        start_date_dt = self._handle_date_input(custom_start_val)
+        end_date_dt = self._handle_date_input(custom_end_val)
+
+        plot_gen_results = self.update_analytics_plots_figures(current_token_state_val, date_filter_val, start_date_dt, end_date_dt, PLOT_CONFIGS)
         
-        # --- NEW FIX STARTS HERE ---
-        # The error "too many values to unpack (expected 3)" and "received 21 elements" confirms the function
-        # returns a flat tuple/list of (status, fig1, fig2, ..., fig19, summary_dict).
-        # This revised unpacking logic handles that specific structure by slicing.
         try:
-            # Check if we got the expected number of results (status + 19 plots + summary)
             expected_count = len(PLOT_CONFIGS) + 2
             if len(plot_gen_results) == expected_count:
                 status_msg = plot_gen_results[0]
-                # Gather all middle elements (the figures) into a list using slicing
                 gen_figs = list(plot_gen_results[1:-1]) 
                 new_summaries_for_chatbot = plot_gen_results[-1]
             else:
-                # This will handle cases where the number of returned items is unexpected
                 raise ValueError(f"Expected {expected_count} elements, but got {len(plot_gen_results)}")
         except (ValueError, TypeError, IndexError) as e:
             logging.error(f"Could not unpack results from update_analytics_plots_figures. Error: {e}")
-            # Fallback to error state
             status_msg = f"Errore: L'aggiornamento dei grafici non è riuscito a causa di un formato di dati imprevisto."
             gen_figs = [self.create_placeholder_plot("Error", f"Dati non validi {i}") for i in range(len(PLOT_CONFIGS))]
             new_summaries_for_chatbot = {}
-        # --- FIX ENDS HERE ---
 
         all_updates = []
         # 1. Status Markdown
@@ -431,7 +450,7 @@ class AnalyticsTab:
                 gr.update(value=self.BOMB_ICON),    # bomb_button
                 gr.update(value=self.FORMULA_ICON), # formula_button
                 gr.update(value=self.EXPLORE_ICON), # explore_button
-                gr.update(visible=True)           # panel_component (plot visibility itself)
+                gr.update(visible=True)            # panel_component (plot visibility itself)
             ])
 
         # 6. Explored Plot ID State Reset (1 state)
@@ -604,8 +623,10 @@ class AnalyticsTab:
                     label="Seleziona Intervallo Date per Grafici", value="Sempre", scale=3
                 )
                 with gr.Column(scale=2):
-                    self.custom_start_date_picker = gr.DateTime(label="Data Inizio", visible=False, include_time=False, type="datetime")
-                    self.custom_end_date_picker = gr.DateTime(label="Data Fine", visible=False, include_time=False, type="datetime")
+                    # Using gr.Date to ensure the calendar popup appears reliably.
+                    # The conversion to a datetime object is handled in the _refresh_analytics_graphs_ui method.
+                    self.custom_start_date_picker = gr.Date(label="Data Inizio", visible=False)
+                    self.custom_end_date_picker = gr.Date(label="Data Fine", visible=False)
 
             self.apply_filter_btn = gr.Button("🔍 Applica Filtro & Aggiorna Grafici", variant="primary")