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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.2.44
+Version: 0.2.45
 Summary: Define, Prompt and Test MCP enabled Agents and Workflows
 Author-email: Shaun Smith <fastagent@llmindset.co.uk>
 License:                                  Apache License
@@ -222,10 +222,10 @@ Requires-Dist: mcp==1.12.0
 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.45}/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.45}/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.45}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fast-agent-mcp"
-version = "0.2.44"
+version = "0.2.45"
 description = "Define, Prompt and Test MCP enabled Agents and Workflows"
 readme = "README.md"
 license = { file = "LICENSE" }
@@ -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",

{fast_agent_mcp-0.2.44 → fast_agent_mcp-0.2.45}/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.45}/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.45}/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.44 → fast_agent_mcp-0.2.45}/src/mcp_agent/core/direct_decorators.py

@@ -23,6 +23,9 @@ from typing import (
 from mcp.client.session import ElicitationFnT
 
 from mcp_agent.agents.agent import AgentConfig
+from mcp_agent.agents.workflow.router_agent import (
+    ROUTING_SYSTEM_INSTRUCTION,
+)
 from mcp_agent.core.agent_types import AgentType
 from mcp_agent.core.request_params import RequestParams
 
@@ -397,10 +400,6 @@ def router(
     Returns:
         A decorator that registers the router with proper type annotations
     """
-    default_instruction = """
-    You are a router that determines which specialized agent should handle a given query.
-    Analyze the query and select the most appropriate agent to handle it.
-    """
 
     return cast(
         "Callable[[AgentCallable[P, R]], DecoratedRouterProtocol[P, R]]",
@@ -408,7 +407,7 @@ def router(
             self,
             AgentType.ROUTER,
             name=name,
-            instruction=instruction or default_instruction,
+            instruction=instruction or ROUTING_SYSTEM_INSTRUCTION,
             servers=servers,
             model=model,
             use_history=use_history,

{fast_agent_mcp-0.2.44 → fast_agent_mcp-0.2.45}/src/mcp_agent/core/enhanced_prompt.py

@@ -511,13 +511,12 @@ def create_keybindings(on_toggle_multiline=None, app=None, agent_provider=None,
                             rich_print("\n[green]✓ Copied to clipboard[/green]")
                             return
 
-                    rich_print("\n[yellow]No assistant messages found[/yellow]")
                 else:
-                    rich_print("\n[yellow]No message history available[/yellow]")
-            except Exception as e:
-                rich_print(f"\n[red]Error copying: {e}[/red]")
+                    pass
+            except Exception:
+                pass
         else:
-            rich_print("[yellow]Clipboard copy not available in this context[/yellow]")
+            pass
 
     return kb
 

{fast_agent_mcp-0.2.44 → fast_agent_mcp-0.2.45}/src/mcp_agent/human_input/elicitation_form.py

@@ -5,6 +5,7 @@ from typing import Any, Dict, Optional
 
 from mcp.types import ElicitRequestedSchema
 from prompt_toolkit import Application
+from prompt_toolkit.application.current import get_app
 from prompt_toolkit.buffer import Buffer
 from prompt_toolkit.filters import Condition
 from prompt_toolkit.formatted_text import FormattedText
@@ -272,29 +273,32 @@ class ElicitationForm:
             keep_focused_window_visible=True,
         )
 
-        # Create title bar manually
-        title_bar = Window(
-            FormattedTextControl(FormattedText([("class:title", "Elicitation Request")])),
-            height=1,
-            style="class:dialog.title",
-        )
-
-        # Combine title, sticky headers, and scrollable content
+        # Combine sticky headers and scrollable content (no separate title bar needed)
         full_content = HSplit(
             [
-                title_bar,
-                Window(height=1),  # Spacing after title
+                Window(height=1),  # Top spacing
                 sticky_headers,  # Headers stay fixed at top
                 scrollable_content,  # Form fields can scroll
             ]
         )
 
-        # Create dialog frame manually to avoid Dialog's internal scrolling
+        # Create dialog frame with title
         dialog = Frame(
             body=full_content,
+            title="Elicitation Request",
             style="class:dialog",
         )
 
+        # Apply width constraints by putting Frame in VSplit with flexible spacers
+        # This prevents console display interference and constrains the Frame border
+        constrained_dialog = VSplit(
+            [
+                Window(width=10),  # Smaller left spacer
+                dialog,
+                Window(width=10),  # Smaller right spacer
+            ]
+        )
+
         # Key bindings
         kb = KeyBindings()
 
@@ -370,7 +374,7 @@ class ElicitationForm:
         # Add toolbar to the layout
         root_layout = HSplit(
             [
-                dialog,  # The main dialog
+                constrained_dialog,  # The width-constrained dialog
                 self._toolbar_window,
             ]
         )
@@ -588,7 +592,6 @@ class ElicitationForm:
 
     def _is_in_multiline_field(self) -> bool:
         """Check if currently focused field is a multiline field."""
-        from prompt_toolkit.application.current import get_app
 
         focused = get_app().layout.current_control
 

{fast_agent_mcp-0.2.44 → fast_agent_mcp-0.2.45}/src/mcp_agent/llm/augmented_llm.py

@@ -212,8 +212,6 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
         # note - check changes here are mirrored in structured(). i've thought hard about
         # a strategy to reduce duplication etc, but aiming for simple but imperfect for the moment
 
-        # We never expect this for structured() calls - this is for interactive use - developers
-        # can do this programatically
         # TODO -- create a "fast-agent" control role rather than magic strings
 
         if multipart_messages[-1].first_text().startswith("***SAVE_HISTORY"):
@@ -235,6 +233,7 @@ class AugmentedLLM(ContextDependent, AugmentedLLMProtocol, Generic[MessageParamT
 
         # add generic error and termination reason handling/rollback
         self._message_history.append(assistant_response)
+
         return assistant_response
 
     @abstractmethod

{fast_agent_mcp-0.2.44 → fast_agent_mcp-0.2.45}/src/mcp_agent/llm/augmented_llm_passthrough.py

@@ -164,15 +164,10 @@ class PassthroughLLM(AugmentedLLM):
         request_params: RequestParams | None = None,
         is_template: bool = False,
     ) -> PromptMessageMultipart:
-        print(
-            f"DEBUG: PassthroughLLM _apply_prompt_provider_specific called with {len(multipart_messages)} messages, is_template={is_template}"
-        )
-
         # Add messages to history with proper is_prompt flag
         self.history.extend(multipart_messages, is_prompt=is_template)
 
         last_message = multipart_messages[-1]
-        print(f"DEBUG: Last message role: {last_message.role}, text: '{last_message.first_text()}'")
 
         if self.is_tool_call(last_message):
             result = Prompt.assistant(await self.generate_str(last_message.first_text()))
@@ -209,14 +204,8 @@ class PassthroughLLM(AugmentedLLM):
         else:
             # TODO -- improve when we support Audio/Multimodal gen models e.g. gemini . This should really just return the input as "assistant"...
             concatenated: str = "\n".join(message.all_text() for message in multipart_messages)
-            print(
-                f"DEBUG: PassthroughLLM generating response: '{concatenated}' (is_template={is_template})"
-            )
             await self.show_assistant_message(concatenated)
             result = Prompt.assistant(concatenated)
-            print(f"DEBUG: PassthroughLLM created result: {result}")
-            print(f"DEBUG: Result first_text(): {result.first_text()}")
-            print(f"DEBUG: Result content: {result.content}")
 
         # Track usage for this passthrough "turn"
         try: