Update app.py

app.py

@@ -442,38 +442,50 @@ def run_agent(
 # MAIN INTERFACE FUNCTION
 # =============================================================================
 
-def convert_tuples_to_messages(chatbot_history: List[Tuple]) -> List[Dict]:
-    """Convert Gradio tuple format to messages format for the agent"""
-    messages = []
-    if chatbot_history:
-        for user_msg, bot_msg in chatbot_history:
-            if user_msg:
-                messages.append({"role": "user", "content": user_msg})
-            if bot_msg:
-                messages.append({"role": "assistant", "content": bot_msg})
-    return messages
-
-
-def convert_messages_to_tuples(messages: List[Dict]) -> List[Tuple]:
-    """Convert messages format back to Gradio tuple format"""
-    tuples = []
-    i = 0
-    while i < len(messages):
-        user_msg = ""
-        bot_msg = ""
-        
-        if i < len(messages) and messages[i]["role"] == "user":
-            user_msg = messages[i]["content"]
-            i += 1
+def normalize_history(history) -> List[Dict]:
+    """
+    Convert history to messages format regardless of input format.
+    Handles: None, empty list, tuples format, messages format
+    """
+    if history is None or history == []:
+        return []
+    
+    # Check if it's already in messages format
+    if isinstance(history, list) and len(history) > 0:
+        first_item = history[0]
         
-        if i < len(messages) and messages[i]["role"] == "assistant":
-            bot_msg = messages[i]["content"]
-            i += 1
+        # Messages format: [{"role": "...", "content": "..."}, ...]
+        if isinstance(first_item, dict) and "role" in first_item:
+            return [msg for msg in history if isinstance(msg, dict) and "role" in msg and "content" in msg]
         
-        if user_msg or bot_msg:
-            tuples.append((user_msg, bot_msg))
-    
-    return tuples
+        # Tuple format: [("user msg", "assistant msg"), ...]
+        if isinstance(first_item, (tuple, list)) and len(first_item) == 2:
+            messages = []
+            for item in history:
+                if isinstance(item, (tuple, list)) and len(item) == 2:
+                    user_msg, assistant_msg = item
+                    if user_msg:
+                        messages.append({"role": "user", "content": str(user_msg)})
+                    if assistant_msg:
+                        messages.append({"role": "assistant", "content": str(assistant_msg)})
+            return messages
+    
+    return []
+
+
+def format_history_for_gradio(messages: List[Dict]) -> List[Dict]:
+    """
+    Format messages for Gradio Chatbot (messages format).
+    Ensures all messages have proper structure.
+    """
+    result = []
+    for msg in messages:
+        if isinstance(msg, dict) and "role" in msg and "content" in msg:
+            result.append({
+                "role": str(msg["role"]),
+                "content": str(msg["content"]) if msg["content"] else ""
+            })
+    return result
 
 
 def get_second_opinion(
@@ -482,49 +494,46 @@ def get_second_opinion(
     provider: str,
     model: str,
     api_key: str,
-    chatbot_history: List[Tuple],  # Gradio tuple format
+    chatbot_history,  # Can be any format
     temperature: float = 0.7,
     max_tokens: int = 4000
-) -> Tuple[str, List[Tuple], str]:
+) -> Tuple[str, List[Dict], str]:
     """
     Get a second opinion from the AI agent using MCP tools
     
     Returns:
-        Tuple of (response, updated_history_tuples, tool_log_display)
+        Tuple of (response, updated_history, tool_log_display)
     """
+    # Normalize history to messages format
+    history = normalize_history(chatbot_history)
+    
     if not api_key:
         env_key = LLM_PROVIDERS.get(provider, {}).get("env_key", "")
         api_key = os.environ.get(env_key, "")
         if not api_key:
             error_msg = f"⚠️ API key required. Please enter your {provider} API key or set {env_key} in HuggingFace Spaces Settings."
-            return error_msg, chatbot_history, ""
+            return error_msg, format_history_for_gradio(history), ""
     
     client, error = get_client(provider, api_key)
     if error:
-        return f"⚠️ Error: {error}", chatbot_history, ""
-    
-    # Convert tuple history to messages format for agent
-    messages_history = convert_tuples_to_messages(chatbot_history)
+        return f"⚠️ Error: {error}", format_history_for_gradio(history), ""
     
     # Run the agent
-    response, updated_messages, tool_log = run_agent(
+    response, updated_history, tool_log = run_agent(
         user_input=user_input,
         persona=persona,
         client=client,
         provider=provider,
         model=model,
-        conversation_history=messages_history,
+        conversation_history=history,
         temperature=temperature,
         max_tokens=max_tokens
     )
     
-    # Convert back to tuple format for Gradio
-    updated_tuples = convert_messages_to_tuples(updated_messages)
-    
     # Format tool log for display
     tool_log_display = "\n".join(tool_log) if tool_log else "No tools called"
     
-    return response, updated_tuples, tool_log_display
+    return response, format_history_for_gradio(updated_history), tool_log_display
 
 
 # =============================================================================
@@ -912,7 +921,7 @@ def create_interface():
         def chat_interaction(user_msg, persona, provider, model, api_key, 
                            history, temp, max_tok):
             if not user_msg.strip():
-                return history, "", "No input provided"
+                return format_history_for_gradio(normalize_history(history)), "", "No input provided"
             
             response, updated_history, tool_log = get_second_opinion(
                 user_msg,
@@ -920,16 +929,17 @@ def create_interface():
                 provider,
                 model,
                 api_key,
-                history or [],  # Ensure it's a list
+                history,
                 temperature=temp,
                 max_tokens=max_tok
             )
             
             if response.startswith("⚠️"):
-                # Error occurred - append to history in tuple format
-                error_history = list(history or [])
-                error_history.append((user_msg, response))
-                return error_history, "", tool_log or "Error occurred"
+                # Error occurred - append error to history
+                error_history = normalize_history(history)
+                error_history.append({"role": "user", "content": user_msg})
+                error_history.append({"role": "assistant", "content": response})
+                return format_history_for_gradio(error_history), "", tool_log or "Error occurred"
             
             return updated_history, "", tool_log