Update services/analytics_handlers.py

services/analytics_handlers.py

@@ -224,13 +224,9 @@ class AnalyticsHandlers:
         clicked_plot_config = next((p for p in self.plot_configs if p["id"] == plot_id_clicked), None)
         if not clicked_plot_config:
             logging.error(f"Config not found for plot_id {plot_id_clicked}")
-            # Construct a list of gr.update() of the correct length
             num_outputs = len(self._get_action_panel_outputs_list())
             error_updates = [gr.update()] * num_outputs
-            # Try to preserve existing state values if possible by updating specific indices
-            # This part is tricky without knowing the exact order and meaning of each output.
-            # For simplicity, returning all gr.update() might be safer if an error occurs early.
-            # Or, more robustly, identify which states need to be passed through.
+            # Preserve existing state values if possible
             # Indices for states in action_panel_outputs_list:
             # active_panel_action_state is at index 11
             # current_chat_plot_id_st is at index 12
@@ -240,7 +236,8 @@ class AnalyticsHandlers:
             error_updates[12] = current_chat_plot_id
             error_updates[13] = current_chat_histories
             error_updates[14] = current_explored_plot_id
-            return tuple(error_updates)
+            yield tuple(error_updates) # Use yield instead of return <value>
+            return # Explicitly return to end the generator function
 
         clicked_plot_label = clicked_plot_config["label"]
         clicked_plot_section = clicked_plot_config["section"]
@@ -331,15 +328,11 @@ class AnalyticsHandlers:
 
                 if not history: # First time opening insights for this plot (or after a refresh)
                     prompt, sugg = get_initial_insight_prompt_and_suggestions(plot_id_clicked, clicked_plot_label, summary_for_plot)
-                    # Gradio's chatbot expects a list of lists/tuples: [[user_msg, None], [None, assistant_msg]]
-                    # Our generate_llm_response and history uses: [{"role": "user", "content": prompt}, {"role": "assistant", "content": resp}]
-                    # We need to adapt. For now, let's assume generate_llm_response takes our format and returns a string.
-                    # The history for Gradio Chatbot component needs to be [[user_msg, assistant_msg], ...]
-                    # Let's build history for LLM first
                     llm_history_for_generation = [{"role": "user", "content": prompt}]
                     
                     # Display "Thinking..." or similar
                     chatbot_content_update = gr.update(value=[[prompt, "Sto pensando..."]])
+                    # Yield intermediate update
                     yield tuple(self._assemble_panel_action_updates(action_col_visible_update, insights_chatbot_visible_update, chatbot_content_update, 
                                                               insights_chat_input_visible_update, insights_suggestions_row_visible_update, 
                                                               s1_upd, s2_upd, s3_upd, formula_display_visible_update, formula_content_update, 
@@ -351,9 +344,7 @@ class AnalyticsHandlers:
 
                     resp_text = await generate_llm_response(prompt, plot_id_clicked, clicked_plot_label, llm_history_for_generation, summary_for_plot)
                     
-                    # Gradio chatbot history format
                     new_gr_history_for_plot = [[prompt, resp_text]]
-                    # Internal history format for re-sending to LLM
                     new_internal_history_for_plot = [
                         {"role": "user", "content": prompt},
                         {"role": "assistant", "content": resp_text}
@@ -362,18 +353,7 @@ class AnalyticsHandlers:
                     chatbot_content_update = gr.update(value=new_gr_history_for_plot)
                 else: # History exists, just display it
                     _, sugg = get_initial_insight_prompt_and_suggestions(plot_id_clicked, clicked_plot_label, summary_for_plot) # Get fresh suggestions
-                    # Convert internal history to Gradio format for display
-                    gr_history_to_display = []
-                    # Assuming history is [{"role":"user", "content":"..."}, {"role":"assistant", "content":"..."}]
-                    # We need to pair them up. If an odd number, the last user message might not have a pair yet.
-                    temp_hist = history[:] # Make a copy
-                    while temp_hist:
-                        user_turn = temp_hist.pop(0)
-                        assistant_turn = None
-                        if temp_hist and temp_hist[0]["role"] == "assistant":
-                            assistant_turn = temp_hist.pop(0)
-                        gr_history_to_display.append([user_turn["content"], assistant_turn["content"] if assistant_turn else None])
-
+                    gr_history_to_display = self._convert_internal_to_gradio_chat_history(history)
                     chatbot_content_update = gr.update(value=gr_history_to_display)
 
                 s1_upd = gr.update(value=sugg[0] if sugg and len(sugg) > 0 else "N/A")
@@ -404,7 +384,7 @@ class AnalyticsHandlers:
             generated_panel_vis_updates, generated_bomb_btn_updates, 
             generated_formula_btn_updates, generated_explore_btn_updates, section_title_vis_updates
         )
-        logging.debug(f"handle_panel_action returning {len(final_updates_tuple)} updates.")
+        logging.debug(f"handle_panel_action yielding final updates. Count: {len(final_updates_tuple)}")
         yield final_updates_tuple
 
 
@@ -497,7 +477,7 @@ class AnalyticsHandlers:
         if thinking and gradio_history and gradio_history[-1][1] is None: # If last message was user and we are in 'thinking' mode
              gradio_history[-1][1] = "Sto pensando..." # Replace None with "Thinking..."
         elif thinking and not gradio_history: # Should not happen if user_message was added
-            pass
+            pass # Or log an error, but it implies user_message wasn't added to internal_history_for_plot before calling
 
 
         return gradio_history