fast-agent-mcp 0.1.3__py3-none-any.whl → 0.1.5__py3-none-any.whl

mcp_agent/workflows/llm/augmented_llm_openai.py

@@ -1,7 +1,7 @@
 import json
 import os
 from typing import Iterable, List, Type
-
+from mcp.types import PromptMessage
 import instructor
 from openai import OpenAI, AuthenticationError
 from openai.types.chat import (
@@ -38,6 +38,7 @@ from mcp_agent.core.exceptions import ProviderKeyError
 from mcp_agent.logging.logger import get_logger
 from rich.text import Text
 
+_logger = get_logger(__name__)
 
 DEFAULT_OPENAI_MODEL = "gpt-4o"
 DEFAULT_REASONING_EFFORT = "medium"
@@ -53,6 +54,10 @@ class OpenAIAugmentedLLM(
     """
 
     def __init__(self, *args, **kwargs):
+        # Set type_converter before calling super().__init__
+        if "type_converter" not in kwargs:
+            kwargs["type_converter"] = MCPOpenAITypeConverter
+
         super().__init__(*args, **kwargs)
 
         self.provider = "OpenAI"
@@ -147,8 +152,9 @@ class OpenAIAugmentedLLM(
                 ChatCompletionSystemMessageParam(role="system", content=system_prompt)
             )
 
-        if params.use_history:
-            messages.extend(self.history.get())
+        # Always include prompt messages, but only include conversation history 
+        # if use_history is True
+        messages.extend(self.history.get(include_history=params.use_history))
 
         if isinstance(message, str):
             messages.append(
@@ -323,8 +329,17 @@ class OpenAIAugmentedLLM(
                     await self.show_assistant_message(message_text, "")
                 break
 
+        # Only save the new conversation messages to history if use_history is true
+        # Keep the prompt messages separate
         if params.use_history:
-            self.history.set(messages)
+            # Get current prompt messages
+            prompt_messages = self.history.get(include_history=False)
+            
+            # Calculate new conversation messages (excluding prompts)
+            new_messages = messages[len(prompt_messages):]
+            
+            # Update conversation history
+            self.history.set(new_messages)
 
         self._log_chat_finished(model=model)
 
@@ -584,6 +599,39 @@ class MCPOpenAITypeConverter(
                 f"Unexpected role: {param.role}, MCP only supports 'assistant', 'user', 'tool', 'system', 'developer', and 'function'"
             )
 
+    @classmethod
+    def from_mcp_prompt_message(
+        cls, message: PromptMessage
+    ) -> ChatCompletionMessageParam:
+        """Convert an MCP PromptMessage to an OpenAI ChatCompletionMessageParam."""
+
+        # Extract content
+        content = None
+        if hasattr(message.content, "text"):
+            content = message.content.text
+        else:
+            content = str(message.content)
+
+        # Extract extras
+        extras = message.model_dump(exclude={"role", "content"})
+
+        if message.role == "user":
+            return ChatCompletionUserMessageParam(
+                role="user", content=content, **extras
+            )
+        elif message.role == "assistant":
+            return ChatCompletionAssistantMessageParam(
+                role="assistant", content=content, **extras
+            )
+        else:
+            # Fall back to user for any unrecognized role, including "system"
+            _logger.warning(
+                f"Unsupported role '{message.role}' in PromptMessage. Falling back to 'user' role."
+            )
+            return ChatCompletionUserMessageParam(
+                role="user", content=f"[{message.role.upper()}] {content}", **extras
+            )
+
 
 def mcp_content_to_openai_content(
     content: TextContent | ImageContent | EmbeddedResource,