fast-agent-mcp 0.2.30__tar.gz → 0.2.31__tar.gz

{fast_agent_mcp-0.2.30 → fast_agent_mcp-0.2.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.2.30
+Version: 0.2.31
 Summary: Define, Prompt and Test MCP enabled Agents and Workflows
 Author-email: Shaun Smith <fastagent@llmindset.co.uk>
 License:                                  Apache License
@@ -216,7 +216,7 @@ Requires-Dist: azure-identity>=1.14.0
 Requires-Dist: deprecated>=1.2.18
 Requires-Dist: fastapi>=0.115.6
 Requires-Dist: google-genai
-Requires-Dist: mcp==1.9.3
+Requires-Dist: mcp==1.9.4
 Requires-Dist: openai>=1.63.2
 Requires-Dist: opentelemetry-distro>=0.50b0
 Requires-Dist: opentelemetry-exporter-otlp-proto-http>=1.29.0
@@ -599,7 +599,7 @@ agent["greeter"].send("Good Evening!")          # Dictionary access is supported
   use_history=False,                     # orchestrator doesn't maintain chat history (no effect).
   human_input=False,                     # whether orchestrator can request human input
   plan_type="full",                      # planning approach: "full" or "iterative"
-  max_iterations=5,                      # maximum number of full plan attempts, or iterations
+  plan_iterations=5,                     # maximum number of full plan attempts, or iterations
 )
 ```
 

{fast_agent_mcp-0.2.30 → fast_agent_mcp-0.2.31}/README.md

@@ -350,7 +350,7 @@ agent["greeter"].send("Good Evening!")          # Dictionary access is supported
   use_history=False,                     # orchestrator doesn't maintain chat history (no effect).
   human_input=False,                     # whether orchestrator can request human input
   plan_type="full",                      # planning approach: "full" or "iterative"
-  max_iterations=5,                      # maximum number of full plan attempts, or iterations
+  plan_iterations=5,                     # maximum number of full plan attempts, or iterations
 )
 ```
 

fast_agent_mcp-0.2.31/examples/custom-agents/agent.py

@@ -0,0 +1,25 @@
+import asyncio
+
+from mcp_agent.agents.base_agent import BaseAgent
+from mcp_agent.core.fastagent import FastAgent
+
+# Create the application
+fast = FastAgent("fast-agent example")
+
+
+class MyAgent(BaseAgent):
+    async def initialize(self):
+        await super().initialize()
+        print("it's a-me!...Mario!")
+
+
+# Define the agent
+@fast.custom(MyAgent, instruction="You are a helpful AI Agent")
+async def main():
+    # use the --model command line switch or agent arguments to change model
+    async with fast.run() as agent:
+        await agent.interactive()
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

fast_agent_mcp-0.2.31/examples/custom-agents/fastagent.config.yaml

@@ -0,0 +1,24 @@
+# Please edit this configuration file to match your environment (on Windows).
+# Examples in comments below - check/change the paths.
+#
+#
+
+execution_engine: asyncio
+logger:
+  type: file
+  level: error
+  truncate_tools: true
+
+mcp:
+  servers:
+    filesystem:
+      # On windows update the command and arguments to use `node` and the absolute path to the server.
+      # Use `npm i -g @modelcontextprotocol/server-filesystem` to install the server globally.
+      # Use `npm -g root` to find the global node_modules path.`
+      # command: "node"
+      # args: ["c:/Program Files/nodejs/node_modules/@modelcontextprotocol/server-filesystem/dist/index.js","."]
+      command: "npx"
+      args: ["-y", "@modelcontextprotocol/server-filesystem", "."]
+    fetch:
+      command: "uvx"
+      args: ["mcp-server-fetch"]

{fast_agent_mcp-0.2.30 → fast_agent_mcp-0.2.31}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fast-agent-mcp"
-version = "0.2.30"
+version = "0.2.31"
 description = "Define, Prompt and Test MCP enabled Agents and Workflows"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -15,7 +15,7 @@ classifiers = [
 requires-python = ">=3.10"
 dependencies = [
     "fastapi>=0.115.6",
-    "mcp==1.9.3",
+    "mcp==1.9.4",
     "opentelemetry-distro>=0.50b0",
     "opentelemetry-exporter-otlp-proto-http>=1.29.0",
     "pydantic-settings>=2.7.0",

{fast_agent_mcp-0.2.30 → fast_agent_mcp-0.2.31}/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=agent_name, default_prompt=default_prompt)
+        return await self.interactive(agent_name=agent_name, default_prompt=default_prompt)
 
     async def send(
         self,
@@ -97,6 +97,10 @@ class AgentApp:
                 raise ValueError(f"Agent '{agent_name}' not found")
             return self._agents[agent_name]
 
+        for agent in self._agents.values():
+            if agent.config.default:
+                return agent
+
         return next(iter(self._agents.values()))
 
     async def apply_prompt(
@@ -226,9 +230,9 @@ class AgentApp:
         """
         Deprecated - use interactive() instead.
         """
-        return await self.interactive(agent=agent_name, default_prompt=default_prompt)
+        return await self.interactive(agent_name=agent_name, default_prompt=default_prompt)
 
-    async def interactive(self, agent: str | None = None, default_prompt: str = "") -> str:
+    async def interactive(self, agent_name: str | None = None, default_prompt: str = "") -> str:
         """
         Interactive prompt for sending messages with advanced features.
 
@@ -241,14 +245,21 @@ class AgentApp:
         """
 
         # Get the default agent name if none specified
-        if agent:
+        if agent_name:
             # Validate that this agent exists
-            if agent not in self._agents:
-                raise ValueError(f"Agent '{agent}' not found")
-            target_name = agent
+            if agent_name not in self._agents:
+                raise ValueError(f"Agent '{agent_name}' not found")
+            target_name = agent_name
         else:
-            # Use the first agent's name as default
-            target_name = next(iter(self._agents.keys()))
+            target_name = None
+            for agent in self._agents.values():
+                if agent.config.default:
+                    target_name = agent.config.name
+                    break
+
+            if not target_name:
+                # Use the first agent's name as default
+                target_name = next(iter(self._agents.keys()))
 
         # Don't delegate to the agent's own prompt method - use our implementation
         # The agent's prompt method doesn't fully support switching between agents

{fast_agent_mcp-0.2.30 → fast_agent_mcp-0.2.31}/src/mcp_agent/core/agent_types.py

@@ -15,6 +15,7 @@ class AgentType(Enum):
     """Enumeration of supported agent types."""
 
     BASIC = "agent"
+    CUSTOM = "custom"
     ORCHESTRATOR = "orchestrator"
     PARALLEL = "parallel"
     EVALUATOR_OPTIMIZER = "evaluator_optimizer"
@@ -33,6 +34,7 @@ class AgentConfig(BaseModel):
     default_request_params: RequestParams | None = None
     human_input: bool = False
     agent_type: AgentType = AgentType.BASIC
+    default: bool = False
 
     @model_validator(mode="after")
     def ensure_default_request_params(self) -> "AgentConfig":

{fast_agent_mcp-0.2.30 → fast_agent_mcp-0.2.31}/src/mcp_agent/core/direct_decorators.py

@@ -90,6 +90,7 @@ def _decorator_impl(
     use_history: bool = True,
     request_params: RequestParams | None = None,
     human_input: bool = False,
+    default: bool = False,
     **extra_kwargs,
 ) -> Callable[[AgentCallable[P, R]], DecoratedAgentProtocol[P, R]]:
     """
@@ -104,6 +105,7 @@ def _decorator_impl(
         use_history: Whether to maintain conversation history
         request_params: Additional request parameters for the LLM
         human_input: Whether to enable human input capabilities
+        default: Whether to mark this as the default agent
         **extra_kwargs: Additional agent/workflow-specific parameters
     """
 
@@ -132,6 +134,7 @@ def _decorator_impl(
             model=model,
             use_history=use_history,
             human_input=human_input,
+            default=default,
         )
 
         # Update request params if provided
@@ -174,6 +177,7 @@ def agent(
     use_history: bool = True,
     request_params: RequestParams | None = None,
     human_input: bool = False,
+    default: bool = False,
 ) -> Callable[[AgentCallable[P, R]], DecoratedAgentProtocol[P, R]]:
     """
     Decorator to create and register a standard agent with type-safe signature.
@@ -187,6 +191,7 @@ def agent(
         use_history: Whether to maintain conversation history
         request_params: Additional request parameters for the LLM
         human_input: Whether to enable human input capabilities
+        default: Whether to mark this as the default agent
 
     Returns:
         A decorator that registers the agent with proper type annotations
@@ -203,12 +208,60 @@ def agent(
         use_history=use_history,
         request_params=request_params,
         human_input=human_input,
+        default=default,
+    )
+
+
+def custom(
+    self,
+    cls,
+    name: str = "default",
+    instruction_or_kwarg: Optional[str] = None,
+    *,
+    instruction: str = "You are a helpful agent.",
+    servers: List[str] = [],
+    model: Optional[str] = None,
+    use_history: bool = True,
+    request_params: RequestParams | None = None,
+    human_input: bool = False,
+    default: bool = False,
+) -> Callable[[AgentCallable[P, R]], DecoratedAgentProtocol[P, R]]:
+    """
+    Decorator to create and register a standard agent with type-safe signature.
+
+    Args:
+        name: Name of the agent
+        instruction_or_kwarg: Optional positional parameter for instruction
+        instruction: Base instruction for the agent (keyword arg)
+        servers: List of server names the agent should connect to
+        model: Model specification string
+        use_history: Whether to maintain conversation history
+        request_params: Additional request parameters for the LLM
+        human_input: Whether to enable human input capabilities
+
+    Returns:
+        A decorator that registers the agent with proper type annotations
+    """
+    final_instruction = instruction_or_kwarg if instruction_or_kwarg is not None else instruction
+
+    return _decorator_impl(
+        self,
+        AgentType.CUSTOM,
+        name=name,
+        instruction=final_instruction,
+        servers=servers,
+        model=model,
+        use_history=use_history,
+        request_params=request_params,
+        human_input=human_input,
+        agent_class=cls,
+        default=default,
     )
 
 
 DEFAULT_INSTRUCTION_ORCHESTRATOR = """
-You are an expert planner. Given an objective task and a list of Agents 
-(which are collections of capabilities), your job is to break down the objective 
+You are an expert planner. Given an objective task and a list of Agents
+(which are collections of capabilities), your job is to break down the objective
 into a series of steps, which can be performed by these agents.
 """
 
@@ -225,6 +278,7 @@ def orchestrator(
     human_input: bool = False,
     plan_type: Literal["full", "iterative"] = "full",
     plan_iterations: int = 5,
+    default: bool = False,
 ) -> Callable[[AgentCallable[P, R]], DecoratedOrchestratorProtocol[P, R]]:
     """
     Decorator to create and register an orchestrator agent with type-safe signature.
@@ -238,13 +292,14 @@ def orchestrator(
         request_params: Additional request parameters for the LLM
         human_input: Whether to enable human input capabilities
         plan_type: Planning approach - "full" or "iterative"
-        max_iterations: Maximum number of planning iterations
+        plan_iterations: Maximum number of planning iterations
+        default: Whether to mark this as the default agent
 
     Returns:
         A decorator that registers the orchestrator with proper type annotations
     """
 
-    # Create final request params with max_iterations
+    # Create final request params with plan_iterations
 
     return cast(
         "Callable[[AgentCallable[P, R]], DecoratedOrchestratorProtocol[P, R]]",
@@ -261,6 +316,7 @@ def orchestrator(
             child_agents=agents,
             plan_type=plan_type,
             plan_iterations=plan_iterations,
+            default=default,
         ),
     )
 
@@ -276,6 +332,7 @@ def router(
     use_history: bool = False,
     request_params: RequestParams | None = None,
     human_input: bool = False,
+    default: bool = False,
 ) -> Callable[[AgentCallable[P, R]], DecoratedRouterProtocol[P, R]]:
     """
     Decorator to create and register a router agent with type-safe signature.
@@ -288,6 +345,7 @@ def router(
         use_history: Whether to maintain conversation history
         request_params: Additional request parameters for the LLM
         human_input: Whether to enable human input capabilities
+        default: Whether to mark this as the default agent
 
     Returns:
         A decorator that registers the router with proper type annotations
@@ -309,6 +367,7 @@ def router(
             use_history=use_history,
             request_params=request_params,
             human_input=human_input,
+            default=default,
             router_agents=agents,
         ),
     )
@@ -321,6 +380,7 @@ def chain(
     sequence: List[str],
     instruction: Optional[str] = None,
     cumulative: bool = False,
+    default: bool = False,
 ) -> Callable[[AgentCallable[P, R]], DecoratedChainProtocol[P, R]]:
     """
     Decorator to create and register a chain agent with type-safe signature.
@@ -330,6 +390,7 @@ def chain(
         sequence: List of agent names in the chain, executed in sequence
         instruction: Base instruction for the chain
         cumulative: Whether to use cumulative mode (each agent sees all previous responses)
+        default: Whether to mark this as the default agent
 
     Returns:
         A decorator that registers the chain with proper type annotations
@@ -354,6 +415,7 @@ def chain(
             instruction=instruction or default_instruction,
             sequence=sequence,
             cumulative=cumulative,
+            default=default,
         ),
     )
 
@@ -366,6 +428,7 @@ def parallel(
     fan_in: str | None = None,
     instruction: Optional[str] = None,
     include_request: bool = True,
+    default: bool = False,
 ) -> Callable[[AgentCallable[P, R]], DecoratedParallelProtocol[P, R]]:
     """
     Decorator to create and register a parallel agent with type-safe signature.
@@ -376,12 +439,13 @@ def parallel(
         fan_in: Agent to aggregate results
         instruction: Base instruction for the parallel agent
         include_request: Whether to include the original request when aggregating
+        default: Whether to mark this as the default agent
 
     Returns:
         A decorator that registers the parallel agent with proper type annotations
     """
     default_instruction = """
-    You are a parallel processor that executes multiple agents simultaneously 
+    You are a parallel processor that executes multiple agents simultaneously
     and aggregates their results.
     """
 
@@ -396,6 +460,7 @@ def parallel(
             fan_in=fan_in,
             fan_out=fan_out,
             include_request=include_request,
+            default=default,
         ),
     )
 
@@ -409,6 +474,7 @@ def evaluator_optimizer(
     instruction: Optional[str] = None,
     min_rating: str = "GOOD",
     max_refinements: int = 3,
+    default: bool = False,
 ) -> Callable[[AgentCallable[P, R]], DecoratedEvaluatorOptimizerProtocol[P, R]]:
     """
     Decorator to create and register an evaluator-optimizer agent with type-safe signature.
@@ -420,6 +486,7 @@ def evaluator_optimizer(
         instruction: Base instruction for the evaluator-optimizer
         min_rating: Minimum acceptable quality rating (EXCELLENT, GOOD, FAIR, POOR)
         max_refinements: Maximum number of refinement iterations
+        default: Whether to mark this as the default agent
 
     Returns:
         A decorator that registers the evaluator-optimizer with proper type annotations
@@ -442,5 +509,6 @@ def evaluator_optimizer(
             evaluator=evaluator,
             min_rating=min_rating,
             max_refinements=max_refinements,
+            default=default,
         ),
     )

{fast_agent_mcp-0.2.30 → fast_agent_mcp-0.2.31}/src/mcp_agent/core/direct_factory.py

@@ -153,6 +153,21 @@ async def create_agents_by_type(
                 await agent.attach_llm(llm_factory, request_params=config.default_request_params)
                 result_agents[name] = agent
 
+            elif agent_type == AgentType.CUSTOM:
+                # Get the class to instantiate
+                cls = agent_data["agent_class"]
+                # Create the custom agent
+                agent = cls(
+                    config=config,
+                    context=app_instance.context,
+                )
+                await agent.initialize()
+
+                # Attach LLM to the agent
+                llm_factory = model_factory_func(model=config.model)
+                await agent.attach_llm(llm_factory, request_params=config.default_request_params)
+                result_agents[name] = agent
+
             elif agent_type == AgentType.ORCHESTRATOR:
                 # Get base params configured with model settings
                 base_params = (
@@ -356,6 +371,21 @@ async def create_agents_in_dependency_order(
             )
             active_agents.update(basic_agents)
 
+        # Create custom agents first
+        if AgentType.CUSTOM.value in [agents_dict[name]["type"] for name in group]:
+            basic_agents = await create_agents_by_type(
+                app_instance,
+                {
+                    name: agents_dict[name]
+                    for name in group
+                    if agents_dict[name]["type"] == AgentType.CUSTOM.value
+                },
+                AgentType.CUSTOM,
+                active_agents,
+                model_factory_func,
+            )
+            active_agents.update(basic_agents)
+
         # Create parallel agents
         if AgentType.PARALLEL.value in [agents_dict[name]["type"] for name in group]:
             parallel_agents = await create_agents_by_type(

{fast_agent_mcp-0.2.30 → fast_agent_mcp-0.2.31}/src/mcp_agent/core/fastagent.py

@@ -25,6 +25,9 @@ from mcp_agent.core.direct_decorators import (
 from mcp_agent.core.direct_decorators import (
     chain as chain_decorator,
 )
+from mcp_agent.core.direct_decorators import (
+    custom as custom_decorator,
+)
 from mcp_agent.core.direct_decorators import (
     evaluator_optimizer as evaluator_optimizer_decorator,
 )
@@ -221,6 +224,7 @@ class FastAgent:
 
     # Decorator methods with type-safe implementations
     agent = agent_decorator
+    custom = custom_decorator
     orchestrator = orchestrator_decorator
     router = router_decorator
     chain = chain_decorator

{fast_agent_mcp-0.2.30 → fast_agent_mcp-0.2.31}/src/mcp_agent/llm/model_factory.py

@@ -85,6 +85,7 @@ class ModelFactory:
         "o1-mini": Provider.OPENAI,
         "o1": Provider.OPENAI,
         "o1-preview": Provider.OPENAI,
+        "o3": Provider.OPENAI,
         "o3-mini": Provider.OPENAI,
         "claude-3-haiku-20240307": Provider.ANTHROPIC,
         "claude-3-5-haiku-20241022": Provider.ANTHROPIC,

{fast_agent_mcp-0.2.30 → fast_agent_mcp-0.2.31}/src/mcp_agent/llm/providers/augmented_llm_google_native.py

@@ -29,15 +29,6 @@ from mcp_agent.mcp.prompt_message_multipart import PromptMessageMultipart
 # Define default model and potentially other Google-specific defaults
 DEFAULT_GOOGLE_MODEL = "gemini-2.0-flash"
 
-# Suppress this warning for now
-# TODO: Find out where we're passing null
-# warnings.filterwarnings(
-#     "ignore",
-#     message="null is not a valid Type",
-#     category=UserWarning,
-#     module="google.genai._common",
-# )
-
 
 class GoogleNativeAugmentedLLM(AugmentedLLM[types.Content, types.Content]):
     """
@@ -55,6 +46,32 @@ class GoogleNativeAugmentedLLM(AugmentedLLM[types.Content, types.Content]):
         """
         import json
 
+        # Check if the last message is from assistant
+        if multipart_messages and multipart_messages[-1].role == "assistant":
+            last_message = multipart_messages[-1]
+
+            # Extract text content from the assistant message
+            assistant_text = last_message.first_text()
+
+            if assistant_text:
+                try:
+                    json_data = json.loads(assistant_text)
+                    validated_model = model.model_validate(json_data)
+
+                    # Update history with all messages including the assistant message
+                    self.history.extend(multipart_messages, is_prompt=False)
+
+                    # Return the validated model and the assistant message
+                    return validated_model, last_message
+
+                except (json.JSONDecodeError, Exception) as e:
+                    self.logger.warning(
+                        f"Failed to parse assistant message as structured response: {e}"
+                    )
+                    # Return None and the assistant message on failure
+                    self.history.extend(multipart_messages, is_prompt=False)
+                    return None, last_message
+
         # Prepare request params
         request_params = self.get_request_params(request_params)
         # Convert Pydantic model to schema dict for Gemini