fast-agent-mcp 0.2.44__tar.gz → 0.2.46__tar.gz

{fast_agent_mcp-0.2.44 → fast_agent_mcp-0.2.46}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.2.44
+Version: 0.2.46
 Summary: Define, Prompt and Test MCP enabled Agents and Workflows
 Author-email: Shaun Smith <fastagent@llmindset.co.uk>
 License:                                  Apache License
@@ -218,14 +218,14 @@ Requires-Dist: deprecated>=1.2.18
 Requires-Dist: email-validator>=2.2.0
 Requires-Dist: fastapi>=0.115.6
 Requires-Dist: google-genai
-Requires-Dist: mcp==1.12.0
+Requires-Dist: mcp==1.12.1
 Requires-Dist: openai>=1.93.0
 Requires-Dist: opentelemetry-distro>=0.50b0
 Requires-Dist: opentelemetry-exporter-otlp-proto-http>=1.29.0
-Requires-Dist: opentelemetry-instrumentation-anthropic>=0.40.14; python_version >= '3.10' and python_version < '4.0'
+Requires-Dist: opentelemetry-instrumentation-anthropic>=0.42.0; python_version >= '3.10' and python_version < '4.0'
 Requires-Dist: opentelemetry-instrumentation-google-genai>=0.2b0
-Requires-Dist: opentelemetry-instrumentation-mcp>=0.40.14; python_version >= '3.10' and python_version < '4.0'
-Requires-Dist: opentelemetry-instrumentation-openai>=0.40.14; python_version >= '3.10' and python_version < '4.0'
+Requires-Dist: opentelemetry-instrumentation-mcp>=0.42.0; python_version >= '3.10' and python_version < '4.0'
+Requires-Dist: opentelemetry-instrumentation-openai>=0.42.0; python_version >= '3.10' and python_version < '4.0'
 Requires-Dist: prompt-toolkit>=3.0.50
 Requires-Dist: pydantic-settings>=2.7.0
 Requires-Dist: pydantic>=2.10.4

{fast_agent_mcp-0.2.44/src/mcp_agent/resources → fast_agent_mcp-0.2.46}/examples/workflows/evaluator.py

@@ -18,7 +18,7 @@ fast = FastAgent("Evaluator-Optimizer")
     candidate details, and company information. Tailor the response to the company and job requirements.
     """,
     servers=["fetch"],
-    model="haiku3",
+    model="gpt-4.1-nano",
     use_history=True,
 )
 # Define evaluator agent
@@ -40,7 +40,7 @@ fast = FastAgent("Evaluator-Optimizer")
     Summarize your evaluation as a structured response with:
     - Overall quality rating.
     - Specific feedback and areas for improvement.""",
-    model="gpt-4.1",
+    model="sonnet",
 )
 # Define the evaluator-optimizer workflow
 @fast.evaluator_optimizer(

{fast_agent_mcp-0.2.44/src/mcp_agent/resources → fast_agent_mcp-0.2.46}/examples/workflows/router.py

@@ -43,7 +43,7 @@ SAMPLE_REQUESTS = [
 )
 @fast.router(
     name="route",
-    model="sonnet",
+    model="gpt-4.1",
     agents=["code_expert", "general_assistant", "fetcher"],
 )
 async def main() -> None:

{fast_agent_mcp-0.2.44 → fast_agent_mcp-0.2.46}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fast-agent-mcp"
-version = "0.2.44"
+version = "0.2.46"
 description = "Define, Prompt and Test MCP enabled Agents and Workflows"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -15,7 +15,7 @@ classifiers = [
 requires-python = ">=3.12"
 dependencies = [
     "fastapi>=0.115.6",
-    "mcp==1.12.0",
+    "mcp==1.12.1",
     "opentelemetry-distro>=0.50b0",
     "opentelemetry-exporter-otlp-proto-http>=1.29.0",
     "pydantic-settings>=2.7.0",
@@ -29,9 +29,9 @@ dependencies = [
     "boto3>=1.35.0",
     "prompt-toolkit>=3.0.50",
     "aiohttp>=3.11.13",
-    "opentelemetry-instrumentation-openai>=0.40.14; python_version >= '3.10' and python_version < '4.0'",
-    "opentelemetry-instrumentation-anthropic>=0.40.14; python_version >= '3.10' and python_version < '4.0'",
-    "opentelemetry-instrumentation-mcp>=0.40.14; python_version >= '3.10' and python_version < '4.0'",
+    "opentelemetry-instrumentation-openai>=0.42.0; python_version >= '3.10' and python_version < '4.0'",
+    "opentelemetry-instrumentation-anthropic>=0.42.0; python_version >= '3.10' and python_version < '4.0'",
+    "opentelemetry-instrumentation-mcp>=0.42.0; python_version >= '3.10' and python_version < '4.0'",
     "google-genai",
     "opentelemetry-instrumentation-google-genai>=0.2b0",
     "tensorzero>=2025.6.3",
@@ -75,6 +75,7 @@ include = [
     "src/mcp_agent/**/*.csv",
     "src/mcp_agent/**/*.txt",    
     "src/mcp_agent/**/*.example",
+    "src/mcp_agent/py.typed",
     "examples/**/*",
 ]
 

{fast_agent_mcp-0.2.44 → fast_agent_mcp-0.2.46}/src/mcp_agent/__init__.py

@@ -31,9 +31,32 @@ from mcp_agent.core.direct_decorators import (
 # FastAgent components
 from mcp_agent.core.fastagent import FastAgent
 
+# MCP content creation utilities
+from mcp_agent.core.mcp_content import (
+    Assistant,
+    MCPFile,
+    MCPImage,
+    MCPPrompt,
+    MCPText,
+    User,
+    create_message,
+)
+
 # Request configuration
 from mcp_agent.core.request_params import RequestParams
 
+# MCP content helpers
+from mcp_agent.mcp.helpers import (
+    get_image_data,
+    get_resource_text,
+    get_resource_uri,
+    get_text,
+    is_image_content,
+    is_resource_content,
+    is_resource_link,
+    is_text_content,
+)
+
 # Core protocol interfaces
 from mcp_agent.mcp.interfaces import AgentProtocol, AugmentedLLMProtocol
 from mcp_agent.mcp.mcp_aggregator import MCPAggregator
@@ -71,4 +94,21 @@ __all__ = [
     "evaluator_optimizer",
     # Request configuration
     "RequestParams",
+    # MCP content helpers
+    "get_text",
+    "get_image_data",
+    "get_resource_uri",
+    "is_text_content",
+    "is_image_content",
+    "is_resource_content",
+    "is_resource_link",
+    "get_resource_text",
+    # MCP content creation utilities
+    "MCPText",
+    "MCPImage",
+    "MCPFile",
+    "MCPPrompt",
+    "User",
+    "Assistant",
+    "create_message",
 ]

{fast_agent_mcp-0.2.44 → fast_agent_mcp-0.2.46}/src/mcp_agent/agents/workflow/evaluator_optimizer.py

@@ -33,16 +33,14 @@ class QualityRating(str, Enum):
     GOOD = "GOOD"  # Minor improvements possible
     EXCELLENT = "EXCELLENT"  # No improvements needed
 
-    # Map string values to integer values for comparisons
-    @property
-    def value(self) -> int:
-        """Convert string enum values to integers for comparison."""
-        return {
-            "POOR": 0,
-            "FAIR": 1,
-            "GOOD": 2,
-            "EXCELLENT": 3,
-        }[self._value_]
+
+# Separate mapping for quality ratings to numerical values
+QUALITY_RATING_VALUES = {
+    QualityRating.POOR: 0,
+    QualityRating.FAIR: 1,
+    QualityRating.GOOD: 2,
+    QualityRating.EXCELLENT: 3,
+}
 
 
 class EvaluationResult(BaseModel):
@@ -140,7 +138,7 @@ class EvaluatorOptimizerAgent(BaseAgent):
 
             # Evaluate current response
             eval_prompt = self._build_eval_prompt(
-                request=request, response=response.all_text(), iteration=refinement_count
+                request=request, response=response.last_text(), iteration=refinement_count
             )
 
             # Create evaluation message and get structured evaluation result
@@ -171,7 +169,7 @@ class EvaluatorOptimizerAgent(BaseAgent):
             logger.debug(f"Evaluation result: {evaluation_result.rating}")
 
             # Track best response based on rating
-            if evaluation_result.rating.value > best_rating.value:
+            if QUALITY_RATING_VALUES[evaluation_result.rating] > QUALITY_RATING_VALUES[best_rating]:
                 best_rating = evaluation_result.rating
                 best_response = response
                 logger.debug(f"New best response (rating: {best_rating})")
@@ -183,14 +181,17 @@ class EvaluatorOptimizerAgent(BaseAgent):
                 best_response = response
                 break
 
-            if evaluation_result.rating.value >= self.min_rating.value:
+            if (
+                QUALITY_RATING_VALUES[evaluation_result.rating]
+                >= QUALITY_RATING_VALUES[self.min_rating]
+            ):
                 logger.debug(f"Acceptable quality reached ({evaluation_result.rating})")
                 break
 
             # Generate refined response
             refinement_prompt = self._build_refinement_prompt(
                 request=request,
-                response=response.all_text(),
+                response=response.last_text(),  ## only if there is no history?
                 feedback=evaluation_result,
                 iteration=refinement_count,
             )
@@ -270,48 +271,21 @@ class EvaluatorOptimizerAgent(BaseAgent):
         return f"""
 You are an expert evaluator for content quality. Your task is to evaluate a response against the user's original request.
 
-Evaluate the response for iteration {iteration + 1} and provide structured feedback on its quality and areas for improvement.
+Evaluate the response for iteration {iteration + 1} and provide feedback on its quality and areas for improvement.
 
+```
 <fastagent:data>
-<fastagent:request>
+    <fastagent:request>
 {request}
-</fastagent:request>
+    </fastagent:request>
 
-<fastagent:response>
+    <fastagent:response>
 {response}
-</fastagent:response>
+    </fastagent:response>
 </fastagent:data>
 
-<fastagent:instruction>
-Your response MUST be valid JSON matching this exact format (no other text, markdown, or explanation):
-
-{{
-  "rating": "RATING",
-  "feedback": "DETAILED FEEDBACK",
-  "needs_improvement": BOOLEAN,
-  "focus_areas": ["FOCUS_AREA_1", "FOCUS_AREA_2", "FOCUS_AREA_3"]
-}}
-
-Where:
-- RATING: Must be one of: "EXCELLENT", "GOOD", "FAIR", or "POOR"
-  - EXCELLENT: No improvements needed
-  - GOOD: Only minor improvements possible
-  - FAIR: Several improvements needed
-  - POOR: Major improvements needed
-- DETAILED FEEDBACK: Specific, actionable feedback (as a single string)
-- BOOLEAN: true or false (lowercase, no quotes) indicating if further improvement is needed
-- FOCUS_AREAS: Array of 1-3 specific areas to focus on (empty array if no improvement needed)
-
-Example of valid response (DO NOT include the triple backticks in your response):
-{{
-  "rating": "GOOD",
-  "feedback": "The response is clear but could use more supporting evidence.",
-  "needs_improvement": true,
-  "focus_areas": ["Add more examples", "Include data points"]
-}}
-
-IMPORTANT: Your response should be ONLY the JSON object without any code fences, explanations, or other text.
-</fastagent:instruction>
+```
+
 """
 
     def _build_refinement_prompt(
@@ -333,28 +307,27 @@ IMPORTANT: Your response should be ONLY the JSON object without any code fences,
         Returns:
             Formatted refinement prompt
         """
-        focus_areas = ", ".join(feedback.focus_areas) if feedback.focus_areas else "None specified"
+
+        # Format focus areas as bulleted list with each item on a separate line
+        if feedback.focus_areas:
+            focus_areas = "\n".join(f"      * {area}" for area in feedback.focus_areas)
+        else:
+            focus_areas = "None specified"
 
         return f"""
-You are tasked with improving a response based on expert feedback. This is iteration {iteration + 1} of the refinement process.
+You are tasked with improving your previous response based on expert feedback. This is iteration {iteration + 1} of the refinement process.
 
 Your goal is to address all feedback points while maintaining accuracy and relevance to the original request.
 
-<fastagent:data>
-<fastagent:request>
-{request}
-</fastagent:request>
-
-<fastagent:previous-response>
-{response}
-</fastagent:previous-response>
+```
 
 <fastagent:feedback>
-<rating>{feedback.rating}</rating>
-<details>{feedback.feedback}</details>
-<focus-areas>{focus_areas}</focus-areas>
+    <rating>{feedback.rating.name}</rating>
+    <details>{feedback.feedback}</details>
+    <focus-areas>
+{focus_areas}
+    </focus-areas>
 </fastagent:feedback>
-</fastagent:data>
 
 <fastagent:instruction>
 Create an improved version of the response that:
@@ -365,4 +338,7 @@ Create an improved version of the response that:
 
 Provide your complete improved response without explanations or commentary.
 </fastagent:instruction>
+
+```
+
 """

{fast_agent_mcp-0.2.44 → fast_agent_mcp-0.2.46}/src/mcp_agent/agents/workflow/router_agent.py

@@ -39,7 +39,7 @@ Follow these guidelines:
 """
 
 # Default routing instruction with placeholders for context (AgentCard JSON)
-DEFAULT_ROUTING_INSTRUCTION = """
+ROUTING_AGENT_INSTRUCTION = """
 Select from the following agents to handle the request:
 <fastagent:agents>
 [
@@ -100,7 +100,7 @@ class RouterAgent(BaseAgent):
         self.routing_instruction = routing_instruction
         self.agent_map = {agent.name: agent for agent in agents}
 
-        # Set up base router request parameters
+        # Set up base router request parameters with just the base instruction for now
         base_params = {"systemPrompt": ROUTING_SYSTEM_INSTRUCTION, "use_history": False}
 
         if default_request_params:
@@ -120,6 +120,18 @@ class RouterAgent(BaseAgent):
                 if not getattr(agent, "initialized", False):
                     await agent.initialize()
 
+            complete_routing_instruction = await self._generate_routing_instruction(
+                self.agents, self.routing_instruction
+            )
+
+            # Update the system prompt to include the routing instruction with agent cards
+            combined_system_prompt = (
+                ROUTING_SYSTEM_INSTRUCTION + "\n\n" + complete_routing_instruction
+            )
+            self._default_request_params.systemPrompt = combined_system_prompt
+            self.instruction = combined_system_prompt
+            self._routing_instruction_generated = True
+
             self.initialized = True
 
     async def shutdown(self) -> None:
@@ -133,6 +145,36 @@ class RouterAgent(BaseAgent):
             except Exception as e:
                 logger.warning(f"Error shutting down agent: {str(e)}")
 
+    @staticmethod
+    async def _generate_routing_instruction(
+        agents: List[Agent], routing_instruction: Optional[str] = None
+    ) -> str:
+        """
+        Generate the complete routing instruction with agent cards.
+
+        Args:
+            agents: List of agents to include in routing instruction
+            routing_instruction: Optional custom routing instruction template
+
+        Returns:
+            Complete routing instruction with agent cards formatted
+        """
+        # Generate agent descriptions
+        agent_descriptions = []
+        for agent in agents:
+            agent_card: AgentCard = await agent.agent_card()
+            agent_descriptions.append(
+                agent_card.model_dump_json(
+                    include={"name", "description", "skills"}, exclude_none=True
+                )
+            )
+
+        context = ",\n".join(agent_descriptions)
+
+        # Format the routing instruction
+        instruction_template = routing_instruction or ROUTING_AGENT_INSTRUCTION
+        return instruction_template.format(context=context)
+
     async def attach_llm(
         self,
         llm_factory: type[AugmentedLLMProtocol] | Callable[..., AugmentedLLMProtocol],
@@ -227,27 +269,10 @@ class RouterAgent(BaseAgent):
                 agent=self.agents[0].name, confidence="high", reasoning="Only one agent available"
             ), None
 
-        # Generate agent descriptions for the context
-        agent_descriptions = []
-        for agent in self.agents:
-            agent_card: AgentCard = await agent.agent_card()
-            agent_descriptions.append(
-                agent_card.model_dump_json(
-                    include={"name", "description", "skills"}, exclude_none=True
-                )
-            )
-
-        context = ",\n".join(agent_descriptions)
-
-        # Format the routing prompt
-        routing_instruction = self.routing_instruction or DEFAULT_ROUTING_INSTRUCTION
-        routing_instruction = routing_instruction.format(context=context)
-
         assert self._llm
-        mutated = message.model_copy(deep=True)
-        mutated.add_text(routing_instruction)
+        # No need to add routing instruction here - it's already in the system prompt
         response, _ = await self._llm.structured(
-            [mutated],
+            [message],
             RoutingResponse,
             self._default_request_params,
         )

{fast_agent_mcp-0.2.44 → fast_agent_mcp-0.2.46}/src/mcp_agent/cli/commands/go.py

@@ -259,8 +259,8 @@ def run_async_agent(
 def go(
     ctx: typer.Context,
     name: str = typer.Option("FastAgent CLI", "--name", help="Name for the agent"),
-    instruction: str = typer.Option(
-        "You are a helpful AI Agent.", "--instruction", "-i", help="Instruction for the agent"
+    instruction: Optional[str] = typer.Option(
+        None, "--instruction", "-i", help="Path to file or URL containing instruction for the agent"
     ),
     config_path: Optional[str] = typer.Option(
         None, "--config-path", "-c", help="Path to config file"
@@ -297,7 +297,8 @@ def go(
     Run an interactive agent directly from the command line.
 
     Examples:
-        fast-agent go --model=haiku --instruction="You are a coding assistant" --servers=fetch,filesystem
+        fast-agent go --model=haiku --instruction=./instruction.md --servers=fetch,filesystem
+        fast-agent go --instruction=https://raw.githubusercontent.com/user/repo/prompt.md
         fast-agent go --message="What is the weather today?" --model=haiku
         fast-agent go --prompt-file=my-prompt.txt --model=haiku
         fast-agent go --url=http://localhost:8001/mcp,http://api.example.com/sse
@@ -335,9 +336,29 @@ def go(
     if stdio:
         stdio_commands.append(stdio)
 
+    # Resolve instruction from file/URL or use default
+    resolved_instruction = "You are a helpful AI Agent."  # Default
+    if instruction:
+        try:
+            from pathlib import Path
+
+            from pydantic import AnyUrl
+
+            from mcp_agent.core.direct_decorators import _resolve_instruction
+
+            # Check if it's a URL
+            if instruction.startswith(("http://", "https://")):
+                resolved_instruction = _resolve_instruction(AnyUrl(instruction))
+            else:
+                # Treat as file path
+                resolved_instruction = _resolve_instruction(Path(instruction))
+        except Exception as e:
+            typer.echo(f"Error loading instruction from {instruction}: {e}", err=True)
+            raise typer.Exit(1)
+
     run_async_agent(
         name=name,
-        instruction=instruction,
+        instruction=resolved_instruction,
         config_path=config_path,
         servers=servers,
         urls=urls,

{fast_agent_mcp-0.2.44 → fast_agent_mcp-0.2.46}/src/mcp_agent/context.py

@@ -10,7 +10,11 @@ from typing import TYPE_CHECKING, Any, Optional, Union
 from mcp import ServerSession
 from opentelemetry import trace
 from opentelemetry.exporter.otlp.proto.http.trace_exporter import OTLPSpanExporter
+
+# from opentelemetry.instrumentation.anthropic import AnthropicInstrumentor
 from opentelemetry.instrumentation.google_genai import GoogleGenAiSdkInstrumentor
+
+# from opentelemetry.instrumentation.mcp import McpInstrumentor
 from opentelemetry.instrumentation.openai import OpenAIInstrumentor
 from opentelemetry.propagate import set_global_textmap
 from opentelemetry.sdk.resources import Resource

fast_agent_mcp-0.2.46/src/mcp_agent/core/__init__.py

@@ -0,0 +1,26 @@
+"""
+Core components and utilities for MCP Agent.
+"""
+
+from .mcp_content import (
+    Assistant,
+    MCPContentType,
+    MCPFile,
+    MCPImage,
+    MCPPrompt,
+    MCPText,
+    User,
+    create_message,
+)
+
+__all__ = [
+    # MCP content creation functions
+    "MCPText",
+    "MCPImage",
+    "MCPFile",
+    "MCPPrompt",
+    "User",
+    "Assistant",
+    "create_message",
+    "MCPContentType",
+]