fast-agent-mcp 0.2.12__py3-none-any.whl → 0.2.14__py3-none-any.whl

mcp_agent/llm/augmented_llm.py

@@ -27,6 +27,7 @@ from mcp_agent.core.prompt import Prompt
 from mcp_agent.core.request_params import RequestParams
 from mcp_agent.event_progress import ProgressAction
 from mcp_agent.llm.memory import Memory, SimpleMemory
+from mcp_agent.llm.provider_types import Provider
 from mcp_agent.llm.sampling_format_converter import (
     BasicFormatConverter,
     ProviderFormatConverter,
@@ -64,10 +65,11 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
     selecting appropriate tools, and determining what information to retain.
     """
 
-    provider: str | None = None
+    provider: Provider | None = None
 
     def __init__(
         self,
+        provider: Provider,
         agent: Optional["Agent"] = None,
         server_names: List[str] | None = None,
         instruction: str | None = None,
@@ -104,7 +106,7 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
         self.aggregator = agent if agent is not None else MCPAggregator(server_names or [])
         self.name = agent.name if agent else name
         self.instruction = agent.instruction if agent else instruction
-
+        self.provider = provider
         # memory contains provider specific API types.
         self.history: Memory[MessageParamT] = SimpleMemory[MessageParamT]()
 
@@ -480,3 +482,9 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
             List of PromptMessageMultipart objects representing the conversation history
         """
         return self._message_history
+
+    def _api_key(self):
+        from mcp_agent.llm.provider_key_manager import ProviderKeyManager
+
+        assert self.provider
+        return ProviderKeyManager.get_api_key(self.provider.value, self.context.config)

mcp_agent/llm/augmented_llm_passthrough.py

@@ -9,6 +9,7 @@ from mcp_agent.llm.augmented_llm import (
     MessageParamT,
     RequestParams,
 )
+from mcp_agent.llm.provider_types import Provider
 from mcp_agent.logging.logger import get_logger
 from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
 
@@ -25,9 +26,10 @@ class PassthroughLLM(AugmentedLLM):
     parallel workflow where no fan-in aggregation is needed.
     """
 
-    def __init__(self, name: str = "Passthrough", **kwargs: dict[str, Any]) -> None:
-        super().__init__(name=name, **kwargs)
-        self.provider = "fast-agent"
+    def __init__(
+        self, provider=Provider.FAST_AGENT, name: str = "Passthrough", **kwargs: dict[str, Any]
+    ) -> None:
+        super().__init__(name=name, provider=provider, **kwargs)
         self.logger = get_logger(__name__)
         self._messages = [PromptMessage]
         self._fixed_response: str | None = None

mcp_agent/llm/augmented_llm_playback.py

@@ -3,6 +3,7 @@ from typing import Any, List
 from mcp_agent.core.prompt import Prompt
 from mcp_agent.llm.augmented_llm import RequestParams
 from mcp_agent.llm.augmented_llm_passthrough import PassthroughLLM
+from mcp_agent.llm.provider_types import Provider
 from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
 from mcp_agent.mcp.prompts.prompt_helpers import MessageContent
 
@@ -21,7 +22,7 @@ class PlaybackLLM(PassthroughLLM):
     """
 
     def __init__(self, name: str = "Playback", **kwargs: dict[str, Any]) -> None:
-        super().__init__(name=name, **kwargs)
+        super().__init__(name=name, provider=Provider.FAST_AGENT, **kwargs)
         self._messages: List[PromptMessageMultipart] = []
         self._current_index = -1
         self._overage = -1

mcp_agent/llm/model_factory.py

@@ -1,12 +1,14 @@
-from dataclasses import dataclass
-from enum import Enum, auto
+from enum import Enum
 from typing import Callable, Dict, Optional, Type, Union
 
+from pydantic import BaseModel
+
 from mcp_agent.agents.agent import Agent
 from mcp_agent.core.exceptions import ModelConfigError
 from mcp_agent.core.request_params import RequestParams
 from mcp_agent.llm.augmented_llm_passthrough import PassthroughLLM
 from mcp_agent.llm.augmented_llm_playback import PlaybackLLM
+from mcp_agent.llm.provider_types import Provider
 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
@@ -28,17 +30,6 @@ LLMClass = Union[
 ]
 
 
-class Provider(Enum):
-    """Supported LLM providers"""
-
-    ANTHROPIC = auto()
-    OPENAI = auto()
-    FAST_AGENT = auto()
-    DEEPSEEK = auto()
-    GENERIC = auto()
-    OPENROUTER = auto()
-
-
 class ReasoningEffort(Enum):
     """Optional reasoning effort levels"""
 
@@ -47,8 +38,7 @@ class ReasoningEffort(Enum):
     HIGH = "high"
 
 
-@dataclass
-class ModelConfig:
+class ModelConfig(BaseModel):
     """Configuration for a specific model"""
 
     provider: Provider
@@ -59,16 +49,6 @@ class ModelConfig:
 class ModelFactory:
     """Factory for creating LLM instances based on model specifications"""
 
-    # Mapping of provider strings to enum values
-    PROVIDER_MAP = {
-        "anthropic": Provider.ANTHROPIC,
-        "openai": Provider.OPENAI,
-        "fast-agent": Provider.FAST_AGENT,
-        "deepseek": Provider.DEEPSEEK,
-        "generic": Provider.GENERIC,
-        "openrouter": Provider.OPENROUTER,
-    }
-
     # Mapping of effort strings to enum values
     EFFORT_MAP = {
         "low": ReasoningEffort.LOW,
@@ -156,8 +136,8 @@ class ModelFactory:
         # Check first part for provider
         if len(model_parts) > 1:
             potential_provider = model_parts[0]
-            if potential_provider in cls.PROVIDER_MAP:
-                provider = cls.PROVIDER_MAP[potential_provider]
+            if any(provider.value == potential_provider for provider in Provider):
+                provider = Provider(potential_provider)
                 model_parts = model_parts[1:]
 
         # Join remaining parts as model name

mcp_agent/llm/provider_key_manager.py

@@ -0,0 +1,83 @@
+"""
+Provider API key management for various LLM providers.
+Centralizes API key handling logic to make provider implementations more generic.
+"""
+
+import os
+from typing import Any, Dict
+
+from pydantic import BaseModel
+
+from mcp_agent.core.exceptions import ProviderKeyError
+
+PROVIDER_ENVIRONMENT_MAP: Dict[str, str] = {
+    "anthropic": "ANTHROPIC_API_KEY",
+    "openai": "OPENAI_API_KEY",
+    "deepseek": "DEEPSEEK_API_KEY",
+    "openrouter": "OPENROUTER_API_KEY",
+    "generic": "GENERIC_API_KEY",
+}
+API_KEY_HINT_TEXT = "<your-api-key-here>"
+
+
+class ProviderKeyManager:
+    """
+    Manages API keys for different providers centrally.
+    This class abstracts away the provider-specific key access logic,
+    making the provider implementations more generic.
+    """
+
+    @staticmethod
+    def get_env_var(provider_name: str) -> str | None:
+        return os.getenv(ProviderKeyManager.get_env_key_name(provider_name))
+
+    @staticmethod
+    def get_env_key_name(provider_name: str) -> str:
+        return PROVIDER_ENVIRONMENT_MAP.get(provider_name, f"{provider_name.upper()}_API_KEY")
+
+    @staticmethod
+    def get_config_file_key(provider_name: str, config: Any) -> str | None:
+        api_key = None
+        if isinstance(config, BaseModel):
+            config = config.model_dump()
+        provider_settings = config.get(provider_name)
+        if provider_settings:
+            api_key = provider_settings.get("api_key", API_KEY_HINT_TEXT)
+            if api_key == API_KEY_HINT_TEXT:
+                api_key = None
+
+        return api_key
+
+    @staticmethod
+    def get_api_key(provider_name: str, config: Any) -> str:
+        """
+        Gets the API key for the specified provider.
+
+        Args:
+            provider_name: Name of the provider (e.g., "anthropic", "openai")
+            config: The application configuration object
+
+        Returns:
+            The API key as a string
+
+        Raises:
+            ProviderKeyError: If the API key is not found or is invalid
+        """
+
+        provider_name = provider_name.lower()
+        api_key = ProviderKeyManager.get_config_file_key(provider_name, config)
+        if not api_key:
+            api_key = ProviderKeyManager.get_env_var(provider_name)
+
+        if not api_key and provider_name == "generic":
+            api_key = "ollama"  # Default for generic provider
+
+        if not api_key:
+            raise ProviderKeyError(
+                f"{provider_name.title()} API key not configured",
+                f"The {provider_name.title()} API key is required but not set.\n"
+                f"Add it to your configuration file under {provider_name}.api_key "
+                f"or set the {ProviderKeyManager.get_env_key_name(provider_name)} environment variable.",
+            )
+
+        return api_key

mcp_agent/llm/provider_types.py

@@ -0,0 +1,16 @@
+"""
+Type definitions for LLM providers.
+"""
+
+from enum import Enum
+
+
+class Provider(Enum):
+    """Supported LLM providers"""
+
+    ANTHROPIC = "anthropic"
+    OPENAI = "openai"
+    FAST_AGENT = "fast-agent"
+    DEEPSEEK = "deepseek"
+    GENERIC = "generic"
+    OPENROUTER = "openrouter"

mcp_agent/llm/providers/augmented_llm_anthropic.py

@@ -1,9 +1,9 @@
-import os
 from typing import TYPE_CHECKING, List
 
 from mcp.types import EmbeddedResource, ImageContent, TextContent
 
 from mcp_agent.core.prompt import Prompt
+from mcp_agent.llm.provider_types import Provider
 from mcp_agent.llm.providers.multipart_converter_anthropic import (
     AnthropicConverter,
 )
@@ -51,12 +51,12 @@ class AnthropicAugmentedLLM(AugmentedLLM[MessageParam, Message]):
     """
 
     def __init__(self, *args, **kwargs) -> None:
-        self.provider = "Anthropic"
         # Initialize logger - keep it simple without name reference
         self.logger = get_logger(__name__)
 
-        # Now call super().__init__
-        super().__init__(*args, type_converter=AnthropicSamplingConverter, **kwargs)
+        super().__init__(
+            *args, provider=Provider.ANTHROPIC, type_converter=AnthropicSamplingConverter, **kwargs
+        )
 
     def _initialize_default_params(self, kwargs: dict) -> RequestParams:
         """Initialize Anthropic-specific default parameters"""
@@ -83,7 +83,7 @@ class AnthropicAugmentedLLM(AugmentedLLM[MessageParam, Message]):
         Override this method to use a different LLM.
         """
 
-        api_key = self._api_key(self.context.config)
+        api_key = self._api_key()
         base_url = self._base_url()
         if base_url and base_url.endswith("/v1"):
             base_url = base_url.rstrip("/v1")
@@ -277,27 +277,6 @@ class AnthropicAugmentedLLM(AugmentedLLM[MessageParam, Message]):
 
         return responses
 
-    def _api_key(self, config):
-        api_key = None
-
-        if hasattr(config, "anthropic") and config.anthropic:
-            api_key = config.anthropic.api_key
-            if api_key == "<your-api-key-here>":
-                api_key = None
-
-        if api_key is None:
-            api_key = os.getenv("ANTHROPIC_API_KEY")
-
-        if not api_key:
-            raise ProviderKeyError(
-                "Anthropic API key not configured",
-                "The Anthropic API key is required but not set.\n"
-                "Add it to your configuration file under anthropic.api_key "
-                "or set the ANTHROPIC_API_KEY environment variable.",
-            )
-
-        return api_key
-
     async def generate_messages(
         self,
         message_param,

mcp_agent/llm/providers/augmented_llm_deepseek.py

@@ -1,7 +1,6 @@
-import os
 
-from mcp_agent.core.exceptions import ProviderKeyError
 from mcp_agent.core.request_params import RequestParams
+from mcp_agent.llm.provider_types import Provider
 from mcp_agent.llm.providers.augmented_llm_openai import OpenAIAugmentedLLM
 
 DEEPSEEK_BASE_URL = "https://api.deepseek.com"
@@ -11,7 +10,9 @@ DEFAULT_DEEPSEEK_MODEL = "deepseekchat"  # current Deepseek only has two type mo
 class DeepSeekAugmentedLLM(OpenAIAugmentedLLM):
     def __init__(self, *args, **kwargs) -> None:
         kwargs["provider_name"] = "Deepseek"  # Set provider name in kwargs
-        super().__init__(*args, **kwargs)  # Properly pass args and kwargs to parent
+        super().__init__(
+            *args, provider=Provider.DEEPSEEK, **kwargs
+        )  # Properly pass args and kwargs to parent
 
     def _initialize_default_params(self, kwargs: dict) -> RequestParams:
         """Initialize Deepseek-specific default parameters"""
@@ -25,28 +26,8 @@ class DeepSeekAugmentedLLM(OpenAIAugmentedLLM):
             use_history=True,
         )
 
-    def _api_key(self) -> str:
-        config = self.context.config
-        api_key = None
-
-        if config and config.deepseek:
-            api_key = config.deepseek.api_key
-            if api_key == "<your-api-key-here>":
-                api_key = None
-
-        if api_key is None:
-            api_key = os.getenv("DEEPSEEK_API_KEY")
-
-        if not api_key:
-            raise ProviderKeyError(
-                "DEEPSEEK API key not configured",
-                "The DEEKSEEK API key is required but not set.\n"
-                "Add it to your configuration file under deepseek.api_key\n"
-                "Or set the DEEPSEEK_API_KEY environment variable",
-            )
-        return api_key
-
     def _base_url(self) -> str:
+        base_url = None
         if self.context.config and self.context.config.deepseek:
             base_url = self.context.config.deepseek.base_url
 

mcp_agent/llm/providers/augmented_llm_generic.py

@@ -1,6 +1,7 @@
 import os
 
 from mcp_agent.core.request_params import RequestParams
+from mcp_agent.llm.provider_types import Provider
 from mcp_agent.llm.providers.augmented_llm_openai import OpenAIAugmentedLLM
 
 DEFAULT_OLLAMA_BASE_URL = "http://localhost:11434/v1"
@@ -9,8 +10,7 @@ DEFAULT_OLLAMA_API_KEY = "ollama"
 
 
 class GenericAugmentedLLM(OpenAIAugmentedLLM):
-    def __init__(self, *args, **kwargs) -> None:
-        kwargs["provider_name"] = "GenericOpenAI"
+    def __init__(self, *args, provider=Provider.GENERIC, **kwargs) -> None:
         super().__init__(*args, **kwargs)  # Properly pass args and kwargs to parent
 
     def _initialize_default_params(self, kwargs: dict) -> RequestParams:
@@ -25,20 +25,6 @@ class GenericAugmentedLLM(OpenAIAugmentedLLM):
             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 = os.getenv("GENERIC_BASE_URL", DEFAULT_OLLAMA_BASE_URL)
         if self.context.config and self.context.config.generic:

mcp_agent/llm/providers/augmented_llm_openai.py

@@ -1,4 +1,3 @@
-import os
 from typing import List, Tuple, Type
 
 from mcp.types import (
@@ -29,6 +28,7 @@ from mcp_agent.llm.augmented_llm import (
     ModelT,
     RequestParams,
 )
+from mcp_agent.llm.provider_types import Provider
 from mcp_agent.llm.providers.multipart_converter_openai import OpenAIConverter
 from mcp_agent.llm.providers.sampling_converter_openai import (
     OpenAISamplingConverter,
@@ -49,14 +49,13 @@ class OpenAIAugmentedLLM(AugmentedLLM[ChatCompletionMessageParam, ChatCompletion
     This implementation uses OpenAI's ChatCompletion as the LLM.
     """
 
-    def __init__(self, provider_name: str = "OpenAI", *args, **kwargs) -> None:
+    def __init__(self, provider: Provider = Provider.OPENAI, *args, **kwargs) -> None:
         # Set type_converter before calling super().__init__
         if "type_converter" not in kwargs:
             kwargs["type_converter"] = OpenAISamplingConverter
 
-        super().__init__(*args, **kwargs)
+        super().__init__(*args, provider=provider, **kwargs)
 
-        self.provider = provider_name
         # Initialize logger with name if available
         self.logger = get_logger(f"{__name__}.{self.name}" if self.name else __name__)
 
@@ -90,27 +89,6 @@ class OpenAIAugmentedLLM(AugmentedLLM[ChatCompletionMessageParam, ChatCompletion
             use_history=True,
         )
 
-    def _api_key(self) -> str:
-        config = self.context.config
-        api_key = None
-
-        if hasattr(config, "openai") and config.openai:
-            api_key = config.openai.api_key
-            if api_key == "<your-api-key-here>":
-                api_key = None
-
-        if api_key is None:
-            api_key = os.getenv("OPENAI_API_KEY")
-
-        if not api_key:
-            raise ProviderKeyError(
-                "OpenAI API key not configured",
-                "The OpenAI API key is required but not set.\n"
-                "Add it to your configuration file under openai.api_key\n"
-                "Or set the OPENAI_API_KEY environment variable",
-            )
-        return api_key
-
     def _base_url(self) -> str:
         return self.context.config.openai.base_url if self.context.config.openai else None
 
@@ -371,7 +349,7 @@ class OpenAIAugmentedLLM(AugmentedLLM[ChatCompletionMessageParam, ChatCompletion
             The parsed response as a Pydantic model, or None if parsing fails
         """
 
-        if not "OpenAI" == self.provider:
+        if not Provider.OPENAI == self.provider:
             return await super().structured(prompt, model, request_params)
 
         logger = get_logger(__name__)

mcp_agent/llm/providers/augmented_llm_openrouter.py

@@ -1,19 +1,19 @@
 import os
 
-from mcp_agent.core.exceptions import ProviderKeyError
 from mcp_agent.core.request_params import RequestParams
+from mcp_agent.llm.provider_types import Provider
 from mcp_agent.llm.providers.augmented_llm_openai import OpenAIAugmentedLLM
 
 DEFAULT_OPENROUTER_BASE_URL = "https://openrouter.ai/api/v1"
 # No single default model for OpenRouter, users must specify full path
-DEFAULT_OPENROUTER_MODEL = None 
+DEFAULT_OPENROUTER_MODEL = None
 
 
 class OpenRouterAugmentedLLM(OpenAIAugmentedLLM):
     """Augmented LLM provider for OpenRouter, using an OpenAI-compatible API."""
+
     def __init__(self, *args, **kwargs) -> None:
-        kwargs["provider_name"] = "OpenRouter"  # Set provider name
-        super().__init__(*args, **kwargs)
+        super().__init__(*args, provider=Provider.OPENROUTER, **kwargs)
 
     def _initialize_default_params(self, kwargs: dict) -> RequestParams:
         """Initialize OpenRouter-specific default parameters."""
@@ -21,58 +21,30 @@ class OpenRouterAugmentedLLM(OpenAIAugmentedLLM):
         # The model should be passed in the 'model' kwarg during factory creation.
         chosen_model = kwargs.get("model", DEFAULT_OPENROUTER_MODEL)
         if not chosen_model:
-             # Unlike Deepseek, OpenRouter *requires* a model path in the identifier.
-             # The factory should extract this before calling the constructor.
-             # We rely on the model being passed correctly via kwargs.
-             # If it's still None here, it indicates an issue upstream (factory or user input).
-             # However, the base class _get_model handles the error if model is None.
-             pass
-
+            # Unlike Deepseek, OpenRouter *requires* a model path in the identifier.
+            # The factory should extract this before calling the constructor.
+            # We rely on the model being passed correctly via kwargs.
+            # If it's still None here, it indicates an issue upstream (factory or user input).
+            # However, the base class _get_model handles the error if model is None.
+            pass
 
         return RequestParams(
-            model=chosen_model, # Will be validated by base class
+            model=chosen_model,  # Will be validated by base class
             systemPrompt=self.instruction,
-            parallel_tool_calls=True, # Default based on OpenAI provider
-            max_iterations=10,      # Default based on OpenAI provider
-            use_history=True,       # Default based on OpenAI provider
+            parallel_tool_calls=True,  # Default based on OpenAI provider
+            max_iterations=10,  # Default based on OpenAI provider
+            use_history=True,  # Default based on OpenAI provider
         )
 
-    def _api_key(self) -> str:
-        """Retrieve the OpenRouter API key from config or environment variables."""
-        config = self.context.config
-        api_key = None
-
-        # Check config file first
-        if config and hasattr(config, 'openrouter') and config.openrouter:
-            api_key = getattr(config.openrouter, 'api_key', None)
-            if api_key == "<your-openrouter-api-key-here>" or not api_key:
-                api_key = None
-
-        # Fallback to environment variable
-        if api_key is None:
-            api_key = os.getenv("OPENROUTER_API_KEY")
-
-        if not api_key:
-            raise ProviderKeyError(
-                "OpenRouter API key not configured",
-                "The OpenRouter API key is required but not set.\n"
-                "Add it to your configuration file under openrouter.api_key\n"
-                "Or set the OPENROUTER_API_KEY environment variable.",
-            )
-        return api_key
-
     def _base_url(self) -> str:
         """Retrieve the OpenRouter base URL from config or use the default."""
         base_url = os.getenv("OPENROUTER_BASE_URL", DEFAULT_OPENROUTER_BASE_URL)  # Default
         config = self.context.config
-        
+
         # Check config file for override
-        if config and hasattr(config, 'openrouter') and config.openrouter:
-            config_base_url = getattr(config.openrouter, 'base_url', None)
+        if config and hasattr(config, "openrouter") and config.openrouter:
+            config_base_url = getattr(config.openrouter, "base_url", None)
             if config_base_url:
                 base_url = config_base_url
 
         return base_url
-
-    # Other methods like _get_model, _send_request etc., are inherited from OpenAIAugmentedLLM
-    # We may override them later if OpenRouter deviates significantly or offers unique features. 

mcp_agent/mcp/interfaces.py

@@ -26,6 +26,7 @@ from mcp import ClientSession
 from mcp.types import GetPromptResult, Prompt, PromptMessage, ReadResourceResult
 from pydantic import BaseModel
 
+from mcp_agent.core.agent_types import AgentType
 from mcp_agent.core.request_params import RequestParams
 from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
 
@@ -137,7 +138,7 @@ class AgentProtocol(AugmentedLLMProtocol, Protocol):
     name: str
 
     @property
-    def agent_type(self) -> str:
+    def agent_type(self) -> AgentType:
         """Return the type of this agent"""
         ...