fast-agent-mcp 0.2.54__tar.gz → 0.2.56__tar.gz

{fast_agent_mcp-0.2.54 → fast_agent_mcp-0.2.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.2.54
+Version: 0.2.56
 Summary: Define, Prompt and Test MCP enabled Agents and Workflows
 Author-email: Shaun Smith <fastagent@llmindset.co.uk>
 License:                                  Apache License
@@ -211,15 +211,15 @@ Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.13
 Requires-Dist: a2a-sdk>=0.3.0
 Requires-Dist: aiohttp>=3.11.13
-Requires-Dist: anthropic>=0.59.0
+Requires-Dist: anthropic>=0.63.0
 Requires-Dist: azure-identity>=1.14.0
 Requires-Dist: boto3>=1.35.0
 Requires-Dist: deprecated>=1.2.18
 Requires-Dist: email-validator>=2.2.0
 Requires-Dist: fastapi>=0.115.6
 Requires-Dist: google-genai>=1.27.0
-Requires-Dist: mcp==1.12.1
-Requires-Dist: openai>=1.97.1
+Requires-Dist: mcp==1.12.4
+Requires-Dist: openai>=1.99.9
 Requires-Dist: opentelemetry-distro>=0.55b0
 Requires-Dist: opentelemetry-exporter-otlp-proto-http>=1.7.0
 Requires-Dist: opentelemetry-instrumentation-anthropic>=0.43.1; python_version >= '3.10' and python_version < '4.0'
@@ -234,20 +234,6 @@ Requires-Dist: pyyaml>=6.0.2
 Requires-Dist: rich>=14.1.0
 Requires-Dist: tensorzero>=2025.7.5
 Requires-Dist: typer>=0.15.1
-Provides-Extra: azure
-Requires-Dist: azure-identity>=1.14.0; extra == 'azure'
-Provides-Extra: dev
-Requires-Dist: anthropic>=0.42.0; extra == 'dev'
-Requires-Dist: pre-commit>=4.0.1; extra == 'dev'
-Requires-Dist: pydantic>=2.10.4; extra == 'dev'
-Requires-Dist: pytest-asyncio>=0.21.1; extra == 'dev'
-Requires-Dist: pytest-cov; extra == 'dev'
-Requires-Dist: pytest>=7.4.0; extra == 'dev'
-Requires-Dist: pyyaml>=6.0.2; extra == 'dev'
-Requires-Dist: ruff>=0.8.4; extra == 'dev'
-Requires-Dist: tomli>=2.2.1; extra == 'dev'
-Provides-Extra: openai
-Requires-Dist: openai>=1.58.1; extra == 'openai'
 Description-Content-Type: text/markdown
 
 <p align="center">

{fast_agent_mcp-0.2.54 → fast_agent_mcp-0.2.56}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fast-agent-mcp"
-version = "0.2.54"
+version = "0.2.56"
 description = "Define, Prompt and Test MCP enabled Agents and Workflows"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -15,7 +15,7 @@ classifiers = [
 requires-python = ">=3.13"
 dependencies = [
     "fastapi>=0.115.6",
-    "mcp==1.12.1",
+    "mcp==1.12.4",
     "opentelemetry-distro>=0.55b0",
     "opentelemetry-exporter-otlp-proto-http>=1.7.0",
     "pydantic-settings>=2.7.0",
@@ -23,8 +23,8 @@ dependencies = [
     "pyyaml>=6.0.2",
     "rich>=14.1.0",
     "typer>=0.15.1",
-    "anthropic>=0.59.0",
-    "openai>=1.97.1",
+    "anthropic>=0.63.0",
+    "openai>=1.99.9",
     "azure-identity>=1.14.0",
     "boto3>=1.35.0",
     "prompt-toolkit>=3.0.51",
@@ -41,10 +41,6 @@ dependencies = [
     "pyperclip>=1.9.0",
 ]
 
-[project.optional-dependencies]
-openai = [
-    "openai>=1.58.1",
-]
 # For Azure OpenAI with DefaultAzureCredential support, install with: pip install fast-agent-mcp[azure]
 azure = [
     "azure-identity>=1.14.0"

{fast_agent_mcp-0.2.54 → fast_agent_mcp-0.2.56}/src/mcp_agent/agents/base_agent.py

@@ -364,12 +364,15 @@ class BaseAgent(MCPAggregator, AgentProtocol):
         if self.config.tools is not None:
             filtered_tools = []
             for tool in result.tools:
-                # Extract server name from tool name (e.g., "mathematics-add" -> "mathematics")
-                if "-" in tool.name:
-                    server_name = tool.name.split("-", 1)[0]
-
-                    # Check if this server has tool filters
-                    if server_name in self.config.tools:
+                # Extract server name from tool name, handling server names with hyphens
+                server_name = None
+                for configured_server in self.config.tools.keys():
+                    if tool.name.startswith(f"{configured_server}-"):
+                        server_name = configured_server
+                        break
+
+                # Check if this server has tool filters
+                if server_name and server_name in self.config.tools:
                         # Check if tool matches any pattern for this server
                         for pattern in self.config.tools[server_name]:
                             if self._matches_pattern(tool.name, pattern, server_name):
@@ -783,6 +786,60 @@ class BaseAgent(MCPAggregator, AgentProtocol):
 
         return result
 
+    async def list_mcp_tools(self, server_name: str | None = None) -> Mapping[str, List[Tool]]:
+        """
+        List all tools available to this agent, grouped by server and filtered by configuration.
+
+        Args:
+            server_name: Optional server name to list tools from
+
+        Returns:
+            Dictionary mapping server names to lists of Tool objects (with original names, not namespaced)
+        """
+        if not self.initialized:
+            await self.initialize()
+
+        # Get all tools from the parent class
+        result = await super().list_mcp_tools(server_name)
+
+        # Apply filtering if tools are specified in config
+        if self.config.tools is not None:
+            filtered_result = {}
+            for server, tools in result.items():
+                # Check if this server has tool filters
+                if server in self.config.tools:
+                    filtered_tools = []
+                    for tool in tools:
+                        # Check if tool matches any pattern for this server
+                        for pattern in self.config.tools[server]:
+                            if self._matches_pattern(tool.name, pattern, server):
+                                filtered_tools.append(tool)
+                                break
+                    if filtered_tools:
+                        filtered_result[server] = filtered_tools
+            result = filtered_result
+
+        # Add human input tool to a special server if human input is configured
+        if self.human_input_callback:
+            from mcp.server.fastmcp.tools import Tool as FastTool
+
+            human_input_tool: FastTool = FastTool.from_function(self.request_human_input)
+            special_server_name = "__human_input__"
+            
+            # If the special server doesn't exist in result, create it
+            if special_server_name not in result:
+                result[special_server_name] = []
+            
+            result[special_server_name].append(
+                Tool(
+                    name=HUMAN_INPUT_TOOL_NAME,
+                    description=human_input_tool.description,
+                    inputSchema=human_input_tool.parameters,
+                )
+            )
+
+        return result
+
     @property
     def agent_type(self) -> AgentType:
         """

{fast_agent_mcp-0.2.54 → fast_agent_mcp-0.2.56}/src/mcp_agent/cli/commands/go.py

@@ -121,9 +121,9 @@ async def _run_agent(
                     print(response)
                 elif prompt_file:
                     prompt = load_prompt_multipart(Path(prompt_file))
-                    response = await agent.generate(prompt)
-                    # Print the response text and exit
-                    print(response.last_text())
+                    response = await agent.agent.generate(prompt)
+                    print(f"\nLoaded {len(prompt)} messages from prompt file '{prompt_file}'")
+                    await agent.interactive()
                 else:
                     await agent.interactive()
 

{fast_agent_mcp-0.2.54 → fast_agent_mcp-0.2.56}/src/mcp_agent/core/enhanced_prompt.py

@@ -585,6 +585,7 @@ async def get_enhanced_input(
             ("Ctrl+Y", "Copy"),
             ("Ctrl+L", "Clear"),
             ("↑/↓", "History"),
+            ("EXIT", "Exit")
         ]
 
         newline = "Ctrl+<Enter>:Submit" if in_multiline_mode else "<Enter>:Submit"

{fast_agent_mcp-0.2.54 → fast_agent_mcp-0.2.56}/src/mcp_agent/llm/model_database.py

@@ -91,7 +91,10 @@ class ModelDatabase:
     )
 
     QWEN_STANDARD = ModelParameters(
-        context_window=32000, max_output_tokens=8192, tokenizes=QWEN_MULTIMODAL
+        context_window=32000,
+        max_output_tokens=8192,
+        tokenizes=QWEN_MULTIMODAL,
+        json_mode="object",
     )
     QWEN3_REASONER = ModelParameters(
         context_window=131072,

{fast_agent_mcp-0.2.54 → fast_agent_mcp-0.2.56}/src/mcp_agent/llm/providers/augmented_llm_aliyun.py

@@ -1,24 +1,26 @@
 from mcp_agent.core.request_params import RequestParams
 from mcp_agent.llm.provider_types import Provider
+from mcp_agent.llm.providers.augmented_llm_groq import GroqAugmentedLLM
 from mcp_agent.llm.providers.augmented_llm_openai import OpenAIAugmentedLLM
 
 ALIYUN_BASE_URL = "https://dashscope.aliyuncs.com/compatible-mode/v1"
 DEFAULT_QWEN_MODEL = "qwen-turbo"
 
 
-class AliyunAugmentedLLM(OpenAIAugmentedLLM):
+class AliyunAugmentedLLM(GroqAugmentedLLM):
     def __init__(self, *args, **kwargs) -> None:
-        super().__init__(*args, provider=Provider.ALIYUN, **kwargs)
+        OpenAIAugmentedLLM.__init__(self, *args, provider=Provider.ALIYUN, **kwargs)
 
     def _initialize_default_params(self, kwargs: dict) -> RequestParams:
         """Initialize Aliyun-specific default parameters"""
         # Get base defaults from parent (includes ModelDatabase lookup)
         base_params = super()._initialize_default_params(kwargs)
-        
+
         # Override with Aliyun-specific settings
         chosen_model = kwargs.get("model", DEFAULT_QWEN_MODEL)
         base_params.model = chosen_model
-        
+        base_params.parallel_tool_calls = True
+
         return base_params
 
     def _base_url(self) -> str:
@@ -27,3 +29,4 @@ class AliyunAugmentedLLM(OpenAIAugmentedLLM):
             base_url = self.context.config.aliyun.base_url
 
         return base_url if base_url else ALIYUN_BASE_URL
+

{fast_agent_mcp-0.2.54 → fast_agent_mcp-0.2.56}/src/mcp_agent/llm/providers/augmented_llm_bedrock.py

@@ -86,6 +86,7 @@ class BedrockAugmentedLLM(AugmentedLLM[BedrockMessageParam, BedrockMessage]):
             r"^cohere\..*",  # Cohere models
             r"^ai21\..*",  # AI21 models
             r"^stability\..*",  # Stability AI models
+            r"^openai\..*",  # OpenAI models
         ]
 
         import re

{fast_agent_mcp-0.2.54 → fast_agent_mcp-0.2.56}/src/mcp_agent/llm/providers/augmented_llm_groq.py

@@ -46,38 +46,25 @@ class GroqAugmentedLLM(OpenAIAugmentedLLM):
         assert self.default_request_params
         llm_model = self.default_request_params.model or DEFAULT_GROQ_MODEL
         json_mode: str | None = ModelDatabase.get_json_mode(llm_model)
-        if "json_object" == json_mode:
+        if "object" == json_mode:
             request_params.response_format = {"type": "json_object"}
 
-        # Get the full schema and extract just the properties
-        full_schema = model.model_json_schema()
-        properties = full_schema.get("properties", {})
-        required_fields = full_schema.get("required", [])
-
-        # Create a cleaner format description
-        format_description = "{\n"
-        for field_name, field_info in properties.items():
-            field_type = field_info.get("type", "string")
-            description = field_info.get("description", "")
-            format_description += f'  "{field_name}": "{field_type}"'
-            if description:
-                format_description += f"  // {description}"
-            if field_name in required_fields:
-                format_description += "  // REQUIRED"
-            format_description += "\n"
-        format_description += "}"
-
-        multipart_messages[-1].add_text(
-            f"""YOU MUST RESPOND WITH A JSON OBJECT IN EXACTLY THIS FORMAT:
-            {format_description}
-
-            IMPORTANT RULES:
-            - Respond ONLY with the JSON object, no other text
-            - Do NOT include "properties" or "schema" wrappers
-            - Do NOT use code fences or markdown
-            - The response must be valid JSON that matches the format above
-            - All required fields must be included"""
-        )
+            # Create a cleaner format description from full schema
+            full_schema = model.model_json_schema()
+            format_description = self._schema_to_json_object(
+                full_schema, full_schema.get("$defs")
+            )
+
+            multipart_messages[-1].add_text(
+                f"""YOU MUST RESPOND WITH A JSON OBJECT IN EXACTLY THIS FORMAT:
+{format_description}
+
+IMPORTANT RULES:
+- Respond ONLY with the JSON object, no other text
+- Do NOT include "properties" or "schema" wrappers
+- Do NOT use code fences or markdown
+- The response must be valid JSON that matches the format above
+- All required fields must be included""")
 
         result: PromptMessageMultipart = await self._apply_prompt_provider_specific(
             multipart_messages, request_params
@@ -101,3 +88,45 @@ class GroqAugmentedLLM(OpenAIAugmentedLLM):
             base_url = self.context.config.groq.base_url
 
         return base_url if base_url else GROQ_BASE_URL
+
+    def _schema_to_json_object(
+        self, schema: dict, defs: dict | None = None, visited: set | None = None
+    ) -> str:
+        visited = visited or set()
+
+        if id(schema) in visited:
+            return '"<recursive>"'
+        visited.add(id(schema))
+
+        if "$ref" in schema:
+            ref = schema.get("$ref", "")
+            if ref.startswith("#/$defs/"):
+                target = ref.split("/")[-1]
+                if defs and target in defs:
+                    return self._schema_to_json_object(defs[target], defs, visited)
+            return f'"<ref:{ref}>"'
+
+        schema_type = schema.get("type")
+        description = schema.get("description", "")
+        required = schema.get("required", [])
+
+        if schema_type == "object":
+            props = schema.get("properties", {})
+            result = "{\n"
+            for prop_name, prop_schema in props.items():
+                is_required = prop_name in required
+                prop_str = self._schema_to_json_object(prop_schema, defs, visited)
+                if is_required:
+                    prop_str += " // REQUIRED"
+                result += f'  "{prop_name}": {prop_str},\n'
+            result += "}"
+            return result
+        elif schema_type == "array":
+            items = schema.get("items", {})
+            items_str = self._schema_to_json_object(items, defs, visited)
+            return f"[{items_str}]"
+        elif schema_type:
+            comment = f" // {description}" if description else ""
+            return f'"{schema_type}"' + comment
+
+        return '"<unknown>"'

{fast_agent_mcp-0.2.54 → fast_agent_mcp-0.2.56}/src/mcp_agent/llm/providers/augmented_llm_openai.py

@@ -171,7 +171,6 @@ class OpenAIAugmentedLLM(AugmentedLLM[ChatCompletionMessageParam, ChatCompletion
     async def _process_stream_manual(self, stream, model: str):
         """Manual stream processing for providers like Ollama that may not work with ChatCompletionStreamState."""
         from openai.types.chat import ChatCompletionMessageToolCall
-        from openai.types.chat.chat_completion_message_tool_call import Function
 
         # Track estimated output tokens by counting text chunks
         estimated_tokens = 0
@@ -249,10 +248,10 @@ class OpenAIAugmentedLLM(AugmentedLLM[ChatCompletionMessageParam, ChatCompletion
                         ChatCompletionMessageToolCall(
                             id=tool_call_data["id"],
                             type=tool_call_data["type"],
-                            function=Function(
-                                name=tool_call_data["function"]["name"],
-                                arguments=tool_call_data["function"]["arguments"],
-                            ),
+                            function={
+                                "name": tool_call_data["function"]["name"],
+                                "arguments": tool_call_data["function"]["arguments"],
+                            },
                         )
                     )
 
@@ -333,8 +332,8 @@ class OpenAIAugmentedLLM(AugmentedLLM[ChatCompletionMessageParam, ChatCompletion
         ]
 
         if not available_tools:
-            if self.provider == Provider.DEEPSEEK:
-                available_tools = None  # deepseek does not allow empty array
+            if self.provider in [Provider.DEEPSEEK, Provider.ALIYUN]:
+                available_tools = None  # deepseek/aliyun does not allow empty array
             else:
                 available_tools = []
 

{fast_agent_mcp-0.2.54 → fast_agent_mcp-0.2.56}/src/mcp_agent/mcp/interfaces.py

@@ -25,7 +25,7 @@ from a2a.types import AgentCard
 from anyio.streams.memory import MemoryObjectReceiveStream, MemoryObjectSendStream
 from deprecated import deprecated
 from mcp import ClientSession
-from mcp.types import GetPromptResult, Prompt, PromptMessage, ReadResourceResult
+from mcp.types import GetPromptResult, Prompt, PromptMessage, ReadResourceResult, Tool
 from pydantic import BaseModel
 
 from mcp_agent.core.agent_types import AgentType
@@ -203,6 +203,8 @@ class AgentProtocol(AugmentedLLMProtocol, Protocol):
 
     async def list_resources(self, server_name: str | None = None) -> Mapping[str, List[str]]: ...
 
+    async def list_mcp_tools(self, server_name: str | None = None) -> Mapping[str, List[Tool]]: ...
+
     async def get_resource(
         self, resource_uri: str, server_name: str | None = None
     ) -> ReadResourceResult:

{fast_agent_mcp-0.2.54 → fast_agent_mcp-0.2.56}/src/mcp_agent/mcp/mcp_aggregator.py

@@ -572,14 +572,13 @@ class MCPAggregator(ContextDependent):
 
         # Next, attempt to interpret as a namespaced name
         if is_namespaced_name(name):
-            parts = name.split(SEP, 1)
-            server_name, local_name = parts[0], parts[1]
+            # Try to match against known server names, handling server names with hyphens
+            for server_name in self.server_names:
+                if name.startswith(f"{server_name}{SEP}"):
+                    local_name = name[len(server_name) + len(SEP):]
+                    return server_name, local_name
 
-            # Validate that the parsed server actually exists
-            if server_name in self.server_names:
-                return server_name, local_name
-
-            # If the server name doesn't exist, it might be a tool with a hyphen in its name
+            # If no server name matched, it might be a tool with a hyphen in its name
             # Fall through to the next checks
 
         # For tools, search all servers for the tool by exact name match
@@ -1232,3 +1231,55 @@ class MCPAggregator(ContextDependent):
                 logger.error(f"Error fetching resources from {s_name}: {e}")
 
         return results
+
+    async def list_mcp_tools(self, server_name: str | None = None) -> Dict[str, List[Tool]]:
+        """
+        List available tools from one or all servers, grouped by server name.
+        
+        Args:
+            server_name: Optional server name to list tools from. If not provided,
+                        lists tools from all servers.
+        
+        Returns:
+            Dictionary mapping server names to lists of Tool objects (with original names, not namespaced)
+        """
+        if not self.initialized:
+            await self.load_servers()
+
+        results: Dict[str, List[Tool]] = {}
+
+        # Get the list of servers to check  
+        servers_to_check = [server_name] if server_name else self.server_names
+
+        # For each server, try to list its tools
+        for s_name in servers_to_check:
+            if s_name not in self.server_names:
+                logger.error(f"Server '{s_name}' not found")
+                continue
+
+            # Initialize empty list for this server
+            results[s_name] = []
+
+            # Check if server supports tools capability
+            if not await self.server_supports_feature(s_name, "tools"):
+                logger.debug(f"Server '{s_name}' does not support tools")
+                continue
+
+            try:
+                # Use the _execute_on_server method to call list_tools on the server
+                result = await self._execute_on_server(
+                    server_name=s_name,
+                    operation_type="tools-list",
+                    operation_name="",
+                    method_name="list_tools",
+                    method_args={},
+                )
+
+                # Get tools from result (these have original names, not namespaced)
+                tools = getattr(result, "tools", [])
+                results[s_name] = tools
+
+            except Exception as e:
+                logger.error(f"Error fetching tools from {s_name}: {e}")
+
+        return results