fast-agent-mcp 0.2.1__tar.gz → 0.2.3__tar.gz

{fast_agent_mcp-0.2.1 → fast_agent_mcp-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.2.1
+Version: 0.2.3
 Summary: Define, Prompt and Test MCP enabled Agents and Workflows
 Author-email: Shaun Smith <fastagent@llmindset.co.uk>, Sarmad Qadri <sarmad@lastmileai.dev>
 License:                                  Apache License

{fast_agent_mcp-0.2.1 → fast_agent_mcp-0.2.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fast-agent-mcp"
-version = "0.2.1"
+version = "0.2.3"
 description = "Define, Prompt and Test MCP enabled Agents and Workflows"
 readme = "README.md"
 license = { file = "LICENSE" }

{fast_agent_mcp-0.2.1 → fast_agent_mcp-0.2.3}/src/mcp_agent/config.py

@@ -136,6 +136,18 @@ class DeepSeekSettings(BaseModel):
     model_config = ConfigDict(extra="allow", arbitrary_types_allowed=True)
 
 
+class GenericSettings(BaseModel):
+    """
+    Settings for using OpenAI models in the fast-agent application.
+    """
+
+    api_key: str | None = None
+
+    base_url: str | None = None
+
+    model_config = ConfigDict(extra="allow", arbitrary_types_allowed=True)
+
+
 class TemporalSettings(BaseModel):
     """
     Temporal settings for the fast-agent application.
@@ -250,6 +262,9 @@ class Settings(BaseSettings):
     deepseek: DeepSeekSettings | None = None
     """Settings for using DeepSeek models in the fast-agent application"""
 
+    generic: GenericSettings | None = None
+    """Settings for using Generic models in the fast-agent application"""
+
     logger: LoggerSettings | None = LoggerSettings()
     """Logger settings for the fast-agent application"""
 

{fast_agent_mcp-0.2.1 → fast_agent_mcp-0.2.3}/src/mcp_agent/llm/model_factory.py

@@ -9,6 +9,7 @@ from mcp_agent.llm.augmented_llm_passthrough import PassthroughLLM
 from mcp_agent.llm.augmented_llm_playback import PlaybackLLM
 from mcp_agent.llm.providers.augmented_llm_anthropic import AnthropicAugmentedLLM
 from mcp_agent.llm.providers.augmented_llm_deepseek import DeepSeekAugmentedLLM
+from mcp_agent.llm.providers.augmented_llm_generic import GenericAugmentedLLM
 from mcp_agent.llm.providers.augmented_llm_openai import OpenAIAugmentedLLM
 from mcp_agent.mcp.interfaces import AugmentedLLMProtocol
 
@@ -32,6 +33,7 @@ class Provider(Enum):
     OPENAI = auto()
     FAST_AGENT = auto()
     DEEPSEEK = auto()
+    GENERIC = auto()
 
 
 class ReasoningEffort(Enum):
@@ -60,6 +62,7 @@ class ModelFactory:
         "openai": Provider.OPENAI,
         "fast-agent": Provider.FAST_AGENT,
         "deepseek": Provider.DEEPSEEK,
+        "generic": Provider.GENERIC,
     }
 
     # Mapping of effort strings to enum values
@@ -116,6 +119,7 @@ class ModelFactory:
         Provider.OPENAI: OpenAIAugmentedLLM,
         Provider.FAST_AGENT: PassthroughLLM,
         Provider.DEEPSEEK: DeepSeekAugmentedLLM,
+        Provider.GENERIC: GenericAugmentedLLM,
     }
 
     # Mapping of special model names to their specific LLM classes

fast_agent_mcp-0.2.3/src/mcp_agent/llm/providers/augmented_llm_generic.py

@@ -0,0 +1,47 @@
+import os
+
+from mcp_agent.core.request_params import RequestParams
+from mcp_agent.llm.providers.augmented_llm_openai import OpenAIAugmentedLLM
+
+DEFAULT_OLLAMA_BASE_URL = "http://localhost:11434/v1"
+DEFAULT_OLLAMA_MODEL = "llama3.2:latest"
+DEFAULT_OLLAMA_API_KEY = "ollama"
+
+
+class GenericAugmentedLLM(OpenAIAugmentedLLM):
+    def __init__(self, *args, **kwargs) -> None:
+        kwargs["provider_name"] = "GenericOpenAI"
+        super().__init__(*args, **kwargs)  # Properly pass args and kwargs to parent
+
+    def _initialize_default_params(self, kwargs: dict) -> RequestParams:
+        """Initialize Generic  parameters"""
+        chosen_model = kwargs.get("model", DEFAULT_OLLAMA_MODEL)
+
+        return RequestParams(
+            model=chosen_model,
+            systemPrompt=self.instruction,
+            parallel_tool_calls=True,
+            max_iterations=10,
+            use_history=True,
+        )
+
+    def _api_key(self) -> str:
+        config = self.context.config
+        api_key = None
+
+        if config and config.generic:
+            api_key = config.generic.api_key
+            if api_key == "<your-api-key-here>":
+                api_key = None
+
+        if api_key is None:
+            api_key = os.getenv("GENERIC_API_KEY")
+
+        return api_key or "ollama"
+
+    def _base_url(self) -> str:
+        base_url = None
+        if self.context.config and self.context.config.generic:
+            base_url = self.context.config.generic.base_url
+
+        return base_url if base_url else DEFAULT_OLLAMA_BASE_URL

{fast_agent_mcp-0.2.1 → fast_agent_mcp-0.2.3}/src/mcp_agent/llm/providers/augmented_llm_openai.py

@@ -115,7 +115,6 @@ class OpenAIAugmentedLLM(AugmentedLLM[ChatCompletionMessageParam, ChatCompletion
         self,
         message,
         request_params: RequestParams | None = None,
-        response_model: Type[ModelT] | None = None,
     ) -> List[ChatCompletionMessage]:
         """
         Process a query using an LLM and available tools.
@@ -192,16 +191,9 @@ class OpenAIAugmentedLLM(AugmentedLLM[ChatCompletionMessageParam, ChatCompletion
             self.logger.debug(f"{arguments}")
             self._log_chat_progress(self.chat_turn(), model=model)
 
-            if response_model is None:
-                executor_result = await self.executor.execute(
-                    openai_client.chat.completions.create, **arguments
-                )
-            else:
-                executor_result = await self.executor.execute(
-                    openai_client.beta.chat.completions.parse,
-                    **arguments,
-                    response_format=response_model,
-                )
+            executor_result = await self.executor.execute(
+                openai_client.chat.completions.create, **arguments
+            )
 
             response = executor_result[0]