fast-agent-mcp 0.2.26__py3-none-any.whl → 0.2.28__py3-none-any.whl

mcp_agent/mcp/sampling.py

@@ -10,6 +10,7 @@ from mcp.types import CreateMessageRequestParams, CreateMessageResult, TextConte
 from mcp_agent.core.agent_types import AgentConfig
 from mcp_agent.llm.sampling_converter import SamplingConverter
 from mcp_agent.logging.logger import get_logger
+from mcp_agent.mcp.helpers.server_config_helpers import get_server_config
 from mcp_agent.mcp.interfaces import AugmentedLLMProtocol
 
 if TYPE_CHECKING:
@@ -78,18 +79,47 @@ async def sample(mcp_ctx: ClientSession, params: CreateMessageRequestParams) ->
     """
     model = None
     try:
-        # Extract model from server config
-        if (
-            hasattr(mcp_ctx, "session")
-            and hasattr(mcp_ctx.session, "server_config")
-            and mcp_ctx.session.server_config
-            and hasattr(mcp_ctx.session.server_config, "sampling")
-            and mcp_ctx.session.server_config.sampling.model
-        ):
-            model = mcp_ctx.session.server_config.sampling.model
+        # Extract model from server config using type-safe helper
+        server_config = get_server_config(mcp_ctx)
+        
+        # First priority: explicitly configured sampling model
+        if server_config and hasattr(server_config, "sampling") and server_config.sampling:
+            model = server_config.sampling.model
+        
+        # Second priority: auto_sampling fallback (if enabled at application level)
+        if model is None:
+            # Check if auto_sampling is enabled
+            auto_sampling_enabled = False
+            try:
+                from mcp_agent.context import get_current_context
+                app_context = get_current_context()
+                if app_context and app_context.config:
+                    auto_sampling_enabled = getattr(app_context.config, 'auto_sampling', True)
+            except Exception as e:
+                logger.debug(f"Could not get application config: {e}")
+                auto_sampling_enabled = True  # Default to enabled
+            
+            if auto_sampling_enabled:
+                # Import here to avoid circular import
+                from mcp_agent.mcp.mcp_agent_client_session import MCPAgentClientSession
+                
+                # Try agent's model first (from the session)
+                if (hasattr(mcp_ctx, 'session') and 
+                    isinstance(mcp_ctx.session, MCPAgentClientSession) and
+                    mcp_ctx.session.agent_model):
+                    model = mcp_ctx.session.agent_model
+                    logger.debug(f"Using agent's model for sampling: {model}")
+                else:
+                    # Fall back to system default model
+                    try:
+                        if app_context and app_context.config and app_context.config.default_model:
+                            model = app_context.config.default_model
+                            logger.debug(f"Using system default model for sampling: {model}")
+                    except Exception as e:
+                        logger.debug(f"Could not get system default model: {e}")
 
         if model is None:
-            raise ValueError("No model configured")
+            raise ValueError("No model configured for sampling (server config, agent model, or system default)")
 
         # Create an LLM instance
         llm = create_sampling_llm(params, model)

mcp_agent/mcp_server_registry.py

@@ -70,9 +70,15 @@ class ServerRegistry:
             config (Settings): The Settings object containing the server configurations.
             config_path (str): Path to the YAML configuration file.
         """
-        self.registry = (
-            self.load_registry_from_file(config_path) if config is None else config.mcp.servers
-        )
+        if config is None:
+            self.registry = self.load_registry_from_file(config_path)
+        elif config.mcp is not None and hasattr(config.mcp, 'servers') and config.mcp.servers is not None:
+            # Ensure config.mcp exists, has a 'servers' attribute, and it's not None
+            self.registry = config.mcp.servers
+        else:
+            # Default to an empty dictionary if config.mcp is None or has no 'servers'
+            self.registry = {}
+
         self.init_hooks: Dict[str, InitHookCallable] = {}
         self.connection_manager = MCPConnectionManager(self)
 
@@ -88,8 +94,13 @@ class ServerRegistry:
         Raises:
             ValueError: If the configuration is invalid.
         """
+        servers = {} 
 
-        servers = get_settings(config_path).mcp.servers or {}
+        settings = get_settings(config_path)
+        
+        if settings.mcp is not None and hasattr(settings.mcp, 'servers') and settings.mcp.servers is not None:
+            return settings.mcp.servers
+        
         return servers
 
     @asynccontextmanager

mcp_agent/tools/tool_definition.py

@@ -0,0 +1,14 @@
+from dataclasses import dataclass, field
+from typing import Any, Dict, Optional
+
+
+@dataclass
+class ToolDefinition:
+    """
+    Represents a definition of a tool available to the agent.
+    """
+
+    name: str
+    description: Optional[str] = None
+    inputSchema: Dict[str, Any] = field(default_factory=dict)
+    # Add other relevant fields if necessary based on how tools are defined in fast-agent