Update chat_handler.py

chat_handler.py

@@ -21,7 +21,7 @@ class ChatHandler:
     def __init__(self, mcp_client: UniversalMCPClient):
         self.mcp_client = mcp_client
     
-    def process_multimodal_message(self, message: Dict[str, Any], history: List[ChatMessage]) -> Tuple[List[ChatMessage], Dict[str, Any]]:
+    def process_multimodal_message(self, message: Dict[str, Any], history: List) -> Tuple[List[ChatMessage], Dict[str, Any]]:
         """Enhanced MCP chat function with multimodal input support and ChatMessage formatting"""
         
         if not self.mcp_client.anthropic_client:
@@ -47,6 +47,31 @@ class ChatHandler:
             logger.info(f"💬 Processing multimodal message:")
             logger.info(f"  📝 Text: {user_text}")
             logger.info(f"  📁 Files: {len(user_files)} files uploaded")
+            logger.info(f"  📋 History type: {type(history)}, length: {len(history)}")
+            
+            # Convert history to ChatMessage objects if needed
+            converted_history = []
+            for i, msg in enumerate(history):
+                try:
+                    if isinstance(msg, dict):
+                        # Convert dict to ChatMessage for internal processing
+                        logger.info(f"  📝 Converting dict message {i}: {msg.get('role', 'unknown')}")
+                        converted_history.append(ChatMessage(
+                            role=msg.get('role', 'assistant'),
+                            content=msg.get('content', ''),
+                            metadata=msg.get('metadata', None)
+                        ))
+                    else:
+                        # Already a ChatMessage
+                        logger.info(f"  ✅ ChatMessage {i}: {getattr(msg, 'role', 'unknown')}")
+                        converted_history.append(msg)
+                except Exception as conv_error:
+                    logger.error(f"Error converting message {i}: {conv_error}")
+                    logger.error(f"Message content: {msg}")
+                    # Skip problematic messages
+                    continue
+            
+            history = converted_history
             
             # Add uploaded files to chat history first
             for file_path in user_files:
@@ -87,15 +112,24 @@ class ChatHandler:
             history.append(ChatMessage(role="assistant", content=error_msg))
             return history, gr.MultimodalTextbox(value=None, interactive=False)
     
-    def _prepare_claude_messages(self, history: List[ChatMessage]) -> List[Dict[str, Any]]:
-        """Convert ChatMessage history to Claude API format"""
+    def _prepare_claude_messages(self, history: List) -> List[Dict[str, Any]]:
+        """Convert history (ChatMessage or dict) to Claude API format"""
         messages = []
         
         # Convert history to Claude API format (text only for context)
         recent_history = history[-16:] if len(history) > 16 else history
         for msg in recent_history:
-            if msg.role in ["user", "assistant"]:
+            # Handle both ChatMessage objects and dictionary format for backward compatibility
+            if hasattr(msg, 'role'):  # ChatMessage object
+                role = msg.role
                 content = msg.content
+            elif isinstance(msg, dict) and 'role' in msg:  # Dictionary format
+                role = msg.get('role')
+                content = msg.get('content')
+            else:
+                continue  # Skip invalid messages
+                
+            if role in ["user", "assistant"]:
                 
                 # Convert any non-string content to string description for context
                 if isinstance(content, dict):
@@ -120,7 +154,7 @@ class ChatHandler:
                     content = str(content)
                 
                 messages.append({
-                    "role": msg.role, 
+                    "role": role, 
                     "content": content
                 })