Update app.py

app.py

@@ -740,40 +740,52 @@ with gr.Blocks(theme=gr.themes.Soft(primary_hue="blue", secondary_hue="sky"),
                         logging.info(f"Agent response: text='{str(agent_text_response)[:100]}...', image_path='{agent_image_path}'")
     
                         if agent_image_path and os.path.exists(agent_image_path):
-                            # If there's an image, display it. Text can accompany it or be None.
-                            # Ensure text_response is a string or None for the tuple.
-                            text_for_display = agent_text_response if isinstance(agent_text_response, str) else None
-                            if not text_for_display and agent_text_response is not None: # e.g. if text_response was empty string
-                                 text_for_display = str(agent_text_response)
+                        text_for_display = str(agent_text_response) if agent_text_response is not None else ""
+                        
+                            if text_for_display.strip(): # If there's actual text, add it as the first bot message
+                                bot_response_list_for_history.append(text_for_display)
+                                logging.info(f"Adding text message to chat: '{text_for_display[:100]}...'")
+                            
+                            # Add the image as a second bot message (or first if no text)
+                            # Using a simple caption for the image tuple
+                            bot_response_list_for_history.append(( "📊 Generated Chart", agent_image_path))
+                            logging.info(f"Adding image message to chat: {agent_image_path}")
+                            status_update_msg = "Stato Agente: Risposta con grafico ricevuta."
     
-                            bot_message_for_display = (text_for_display, agent_image_path)
-                            logging.info(f"Displaying image: {agent_image_path} with text: {text_for_display}")
-                        elif agent_text_response is not None: # Text only, or image path was invalid
-                            bot_message_for_display = agent_text_response
-                            if agent_image_path: # Log if image path was given but not valid
+                        elif agent_text_response is not None: 
+                            bot_response_list_for_history.append(str(agent_text_response))
+                            if agent_image_path: 
                                 logging.warning(f"Agent provided image_path '{agent_image_path}' but it does not exist or was not used.")
+                            status_update_msg = "Stato Agente: Risposta testuale ricevuta."
                         else:
-                            bot_message_for_display = "L'agente ha risposto, ma il contenuto non è visualizzabile."
+                            bot_response_list_for_history.append("L'agente ha risposto, ma il contenuto non è visualizzabile.")
                             logging.warning(f"AI response dict issue. Text: {agent_text_response}, Image Path: {agent_image_path}")
+                            status_update_msg = "Stato Agente: Risposta con problemi."
                     
                     elif isinstance(ai_response_dict, str): 
-                        bot_message_for_display = ai_response_dict
+                        bot_response_list_for_history.append(ai_response_dict)
                         logging.warning(f"AI response was a plain string: {ai_response_dict}")
+                        status_update_msg = "Stato Agente: Risposta testuale ricevuta."
                     else: 
-                        bot_message_for_display = f"Error: Agent returned an unexpected data type: {type(ai_response_dict)}."
+                        bot_response_list_for_history.append(f"Error: Agent returned an unexpected data type: {type(ai_response_dict)}.")
                         logging.error(f"Unexpected AI response type: {type(ai_response_dict)}, content: {ai_response_dict}")
+                        status_update_msg = "Stato Agente: Errore nella risposta."
+    
+                    # Construct the final history
+                    # pending_history already has [user_message, None]
+                    # We replace the None with the first bot response, then append any subsequent bot responses
+                    final_updated_history = pending_history[:-1] # Remove the [user_message, None]
+                    final_updated_history.append([user_message, bot_response_list_for_history[0] if bot_response_list_for_history else "No response content."])
+                    if len(bot_response_list_for_history) > 1:
+                        for bot_msg_item in bot_response_list_for_history[1:]:
+                            final_updated_history.append([None, bot_msg_item]) # Subsequent messages from bot have None for user part
                     
-                    # Use pending_history which already has the user message with None for bot response
-                    updated_history = pending_history[:-1] + [[user_message, bot_message_for_display]]
-                    
-                    status_update_msg = "Stato Agente: Risposta ricevuta."
-                    yield updated_history, updated_history, gr.update(value=""), gr.update(value=status_update_msg), gr.update(value=schemas_text_for_display)
+                    yield final_updated_history, final_updated_history, gr.update(value=""), gr.update(value=status_update_msg), gr.update(value=schemas_text_for_display)
                     return
-                    
+                
                 except Exception as e:
                     logging.error(f"Error during EB Agent processing: {e}", exc_info=True)
                     error_msg_for_chat = f"# Errore dell'Agente AI:\n{type(e).__name__}: {str(e)}"
-                    # Use pending_history which already has the user message
                     updated_history = pending_history[:-1] + [[user_message, error_msg_for_chat]]
                     status_update_msg = f"Stato Agente: Errore - {type(e).__name__}"
                     yield updated_history, updated_history, gr.update(value=""), gr.update(value=status_update_msg), gr.update(value=schemas_text_for_display)