fast-agent-mcp 0.2.5__tar.gz → 0.2.6__tar.gz

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/.gitignore

@@ -190,3 +190,4 @@ tests/integration/workflow/orchestrator/fastagent.jsonl
 fastagent.jsonl
 tests/integration/resources/fastagent.jsonl
 fastagent.jsonl
+tests/e2e/workflow/weather_location.txt

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.2.5
+Version: 0.2.6
 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.5 → fast_agent_mcp-0.2.6}/pyproject.toml

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

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/src/mcp_agent/agents/agent.py

@@ -66,7 +66,7 @@ class Agent(BaseAgent):
         agent_name_str = str(self.name)
 
         # Create agent_types dictionary with just this agent
-        agent_types = {agent_name_str: getattr(self.config, "agent_type", "Agent")}
+        agent_types = {agent_name_str: self.agent_type}
 
         # Create the interactive prompt
         prompt = InteractivePrompt(agent_types=agent_types)

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/src/mcp_agent/agents/base_agent.py

@@ -622,6 +622,18 @@ class BaseAgent(MCPAggregator, AgentProtocol):
         response = await self.generate(prompts, request_params)
         return response.first_text()
 
+    @property
+    def agent_type(self) -> str:
+        """
+        Return the type of this agent. 
+        
+        This is used for display purposes in the interactive prompt and other UI elements.
+        
+        Returns:
+            String representing the agent type
+        """
+        return self.config.agent_type
+        
     @property
     def message_history(self) -> List[PromptMessageMultipart]:
         """

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/src/mcp_agent/agents/workflow/chain_agent.py

@@ -9,8 +9,9 @@ from typing import Any, List, Optional, Tuple, Type
 
 from mcp.types import TextContent
 
-from mcp_agent.agents.agent import Agent, AgentConfig
+from mcp_agent.agents.agent import Agent
 from mcp_agent.agents.base_agent import BaseAgent
+from mcp_agent.core.agent_types import AgentConfig, AgentType
 from mcp_agent.core.prompt import Prompt
 from mcp_agent.core.request_params import RequestParams
 from mcp_agent.mcp.interfaces import ModelT
@@ -22,6 +23,11 @@ class ChainAgent(BaseAgent):
     A chain agent that processes requests through a series of specialized agents in sequence.
     Passes the output of each agent to the next agent in the chain.
     """
+    
+    @property
+    def agent_type(self) -> str:
+        """Return the type of this agent."""
+        return AgentType.CHAIN.value
 
     def __init__(
         self,

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/src/mcp_agent/agents/workflow/evaluator_optimizer.py

@@ -14,6 +14,7 @@ from pydantic import BaseModel, Field
 
 from mcp_agent.agents.agent import Agent
 from mcp_agent.agents.base_agent import BaseAgent
+from mcp_agent.core.agent_types import AgentType
 from mcp_agent.core.exceptions import AgentConfigError
 from mcp_agent.core.prompt import Prompt
 from mcp_agent.core.request_params import RequestParams
@@ -63,6 +64,11 @@ class EvaluatorOptimizerAgent(BaseAgent):
     for refinement, continuing until a quality threshold is reached or a maximum
     number of refinement cycles is completed.
     """
+    
+    @property
+    def agent_type(self) -> str:
+        """Return the type of this agent."""
+        return AgentType.EVALUATOR_OPTIMIZER.value
 
     def __init__(
         self,

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/src/mcp_agent/agents/workflow/orchestrator_agent.py

@@ -27,7 +27,7 @@ from mcp_agent.agents.workflow.orchestrator_prompts import (
     SYNTHESIZE_PLAN_PROMPT_TEMPLATE,
     TASK_PROMPT_TEMPLATE,
 )
-from mcp_agent.core.agent_types import AgentConfig
+from mcp_agent.core.agent_types import AgentConfig, AgentType
 from mcp_agent.core.exceptions import AgentConfigError
 from mcp_agent.core.prompt import Prompt
 from mcp_agent.core.request_params import RequestParams
@@ -46,6 +46,11 @@ class OrchestratorAgent(BaseAgent):
     to specialized worker agents, synthesizing their results into a cohesive output.
     Supports both full planning and iterative planning modes.
     """
+    
+    @property
+    def agent_type(self) -> str:
+        """Return the type of this agent."""
+        return AgentType.ORCHESTRATOR.value
 
     def __init__(
         self,

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/src/mcp_agent/agents/workflow/parallel_agent.py

@@ -3,8 +3,9 @@ from typing import Any, List, Optional, Tuple
 
 from mcp.types import TextContent
 
-from mcp_agent.agents.agent import Agent, AgentConfig
+from mcp_agent.agents.agent import Agent
 from mcp_agent.agents.base_agent import BaseAgent
+from mcp_agent.core.agent_types import AgentConfig, AgentType
 from mcp_agent.core.request_params import RequestParams
 from mcp_agent.mcp.interfaces import ModelT
 from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
@@ -17,6 +18,11 @@ class ParallelAgent(BaseAgent):
     This workflow performs both the fan-out and fan-in operations using LLMs.
     From the user's perspective, an input is specified and the output is returned.
     """
+    
+    @property
+    def agent_type(self) -> str:
+        """Return the type of this agent."""
+        return AgentType.PARALLEL.value
 
     def __init__(
         self,

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/src/mcp_agent/agents/workflow/router_agent.py

@@ -12,7 +12,7 @@ from pydantic import BaseModel
 
 from mcp_agent.agents.agent import Agent
 from mcp_agent.agents.base_agent import BaseAgent
-from mcp_agent.core.agent_types import AgentConfig
+from mcp_agent.core.agent_types import AgentConfig, AgentType
 from mcp_agent.core.exceptions import AgentConfigError
 from mcp_agent.core.prompt import Prompt
 from mcp_agent.core.request_params import RequestParams
@@ -53,7 +53,7 @@ You are a highly accurate request router that directs incoming requests to the m
 Your task is to analyze the request and determine the most appropriate agent from the options above.
 
 <fastagent:instruction>
-Respond in JSON format. NEVER include Code Fences:
+Respond in JSON format. ONLY include JSON (no explanation). NEVER include Code Fences:
 {{
     "agent": "<agent name>",
     "confidence": "<high, medium or low>",
@@ -87,6 +87,11 @@ class RouterAgent(BaseAgent):
     A simplified router that uses an LLM to determine the best agent for a request,
     then dispatches the request to that agent and returns the response.
     """
+    
+    @property
+    def agent_type(self) -> str:
+        """Return the type of this agent."""
+        return AgentType.ROUTER.value
 
     def __init__(
         self,

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/src/mcp_agent/cli/commands/setup.py

@@ -73,7 +73,7 @@ mcp:
 
 GITIGNORE_TEMPLATE = """
 # FastAgent secrets file
-fastagent-secrets.yaml
+fastagent.secrets.yaml
 
 # Python
 __pycache__/
@@ -215,7 +215,7 @@ def init(
         if "fastagent.secrets.yaml" in created:
             console.print("\n[yellow]Important:[/yellow] Remember to:")
             console.print(
-                "1. Add your API keys to fastagent-secrets.yaml or set OPENAI_API_KEY and ANTHROPIC_API_KEY environment variables"
+                "1. Add your API keys to fastagent.secrets.yaml or set OPENAI_API_KEY and ANTHROPIC_API_KEY environment variables"
             )
             console.print(
                 "2. Keep fastagent.secrets.yaml secure and never commit it to version control"

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/src/mcp_agent/core/agent_app.py

@@ -69,7 +69,7 @@ class AgentApp:
         if message:
             return await self._agent(agent_name).send(message)
 
-        return await self.interactive(agent_name=agent_name, default_prompt=default_prompt)
+        return await self.interactive(agent=agent_name, default_prompt=default_prompt)
 
     async def send(
         self,
@@ -220,9 +220,9 @@ class AgentApp:
         """
         Deprecated - use interactive() instead.
         """
-        return await self.interactive(agent_name=agent_name, default_prompt=default_prompt)
+        return await self.interactive(agent=agent_name, default_prompt=default_prompt)
 
-    async def interactive(self, agent_name: str | None = None, default_prompt: str = "") -> str:
+    async def interactive(self, agent: str | None = None, default_prompt: str = "") -> str:
         """
         Interactive prompt for sending messages with advanced features.
 
@@ -235,11 +235,11 @@ class AgentApp:
         """
 
         # Get the default agent name if none specified
-        if agent_name:
+        if agent:
             # Validate that this agent exists
-            if agent_name not in self._agents:
-                raise ValueError(f"Agent '{agent_name}' not found")
-            target_name = agent_name
+            if agent not in self._agents:
+                raise ValueError(f"Agent '{agent}' not found")
+            target_name = agent
         else:
             # Use the first agent's name as default
             target_name = next(iter(self._agents.keys()))
@@ -248,18 +248,7 @@ class AgentApp:
         # The agent's prompt method doesn't fully support switching between agents
 
         # Create agent_types dictionary mapping agent names to their types
-        agent_types = {}
-        for name, agent in self._agents.items():
-            # Determine agent type if possible
-            agent_type = "Agent"  # Default type
-
-            # Try to get the type from the agent directly
-            if hasattr(agent, "agent_type"):
-                agent_type = agent.agent_type
-            elif hasattr(agent, "config") and hasattr(agent.config, "agent_type"):
-                agent_type = agent.config.agent_type
-
-            agent_types[name] = agent_type
+        agent_types = {name: agent.agent_type for name, agent in self._agents.items()}
 
         # Create the interactive prompt
         prompt = InteractivePrompt(agent_types=agent_types)

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/src/mcp_agent/core/agent_types.py

@@ -33,6 +33,7 @@ class AgentConfig:
     use_history: bool = True
     default_request_params: RequestParams | None = None
     human_input: bool = False
+    agent_type: str = AgentType.BASIC.value
 
     def __post_init__(self) -> None:
         """Ensure default_request_params exists with proper history setting"""

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/src/mcp_agent/core/direct_decorators.py

@@ -269,6 +269,7 @@ def router(
     *,
     agents: List[str],
     instruction: Optional[str] = None,
+    servers: List[str] = [],
     model: Optional[str] = None,
     use_history: bool = False,
     request_params: RequestParams | None = None,
@@ -301,7 +302,7 @@ def router(
             AgentType.ROUTER,
             name=name,
             instruction=instruction or default_instruction,
-            servers=[],  # Routers don't connect to servers directly
+            servers=servers,
             model=model,
             use_history=use_history,
             request_params=request_params,

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/src/mcp_agent/core/direct_factory.py

@@ -236,7 +236,7 @@ async def create_agents_by_type(
                     config=config,
                     context=app_instance.context,
                     agents=router_agents,
-                    routing_instruction=agent_data.get("routing_instruction"),
+                    routing_instruction=agent_data.get("instruction"),
                 )
                 await router.initialize()
 

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/src/mcp_agent/core/interactive_prompt.py

@@ -77,7 +77,7 @@ class InteractivePrompt:
         if agent not in available_agents:
             raise ValueError(f"No agent named '{agent}'")
 
-        # Create agent_types dictionary if not provided
+        # Ensure we track available agents in a set for fast lookup
         available_agents_set = set(available_agents)
 
         result = ""

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/src/mcp_agent/llm/augmented_llm.py

@@ -147,7 +147,7 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
         """Apply the prompt and return the result as a Pydantic model, or None if coercion fails"""
         try:
             result: PromptMessageMultipart = await self.generate(prompt, request_params)
-            json_data = from_json(result.first_text(), allow_partial=True)
+            json_data = from_json(result.first_text().strip(), allow_partial=True)
             validated_model = model.model_validate(json_data)
             return cast("ModelT", validated_model), Prompt.assistant(json_data)
         except Exception as e:

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/src/mcp_agent/mcp/interfaces.py

@@ -136,6 +136,11 @@ class AgentProtocol(AugmentedLLMProtocol, Protocol):
 
     name: str
 
+    @property
+    def agent_type(self) -> str:
+        """Return the type of this agent"""
+        ...
+
     async def __call__(self, message: Union[str, PromptMessage, PromptMessageMultipart]) -> str:
         """Make the agent callable for sending messages directly."""
         ...

{fast_agent_mcp-0.2.5 → fast_agent_mcp-0.2.6}/src/mcp_agent/mcp_server/agent_server.py

@@ -38,7 +38,7 @@ class AgentMCPServer:
 
         # Basic send message tool
         @self.mcp_server.tool(
-            name=f"{agent_name}.send",
+            name=f"{agent_name}_send",
             description=f"Send a message to the {agent_name} agent",
         )
         async def send_message(message: str, ctx: MCPContext) -> str:
@@ -58,23 +58,23 @@ class AgentMCPServer:
                 return await execute_send()
 
         # Register a history prompt for this agent
-        @self.mcp_server.prompt(name=f"{agent_name}.history", description=f"Conversation history for the {agent_name} agent")
+        @self.mcp_server.prompt(
+            name=f"{agent_name}_history",
+            description=f"Conversation history for the {agent_name} agent",
+        )
         async def get_history_prompt() -> list:
             """Return the conversation history as MCP messages."""
             # Get the conversation history from the agent's LLM
             if not hasattr(agent, "_llm") or agent._llm is None:
                 return []
-                
+
             # Convert the multipart message history to standard PromptMessages
             multipart_history = agent._llm.message_history
             prompt_messages = mcp_agent.core.prompt.Prompt.from_multipart(multipart_history)
-            
+
             # In FastMCP, we need to return the raw list of messages
             # that matches the structure that FastMCP expects (list of dicts with role/content)
-            return [
-                {"role": msg.role, "content": msg.content}
-                for msg in prompt_messages
-            ]
+            return [{"role": msg.role, "content": msg.content} for msg in prompt_messages]
 
     def run(self, transport: str = "sse", host: str = "0.0.0.0", port: int = 8000) -> None:
         """Run the MCP server."""