fast-agent-mcp 0.0.15__py3-none-any.whl → 0.0.16__py3-none-any.whl

{fast_agent_mcp-0.0.15.dist-info → fast_agent_mcp-0.0.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fast-agent-mcp
-Version: 0.0.15
+Version: 0.0.16
 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
@@ -259,14 +259,17 @@ Prompts and configurations that define your Agent Applications are stored in sim
 
 Chat with individual Agents and Components before, during and after workflow execution to tune and diagnose your application.
 
-Simple model selection makes testing Model <-> MCP Server interaction painless.
+Simple model selection makes testing Model <-> MCP Server interaction painless. You can read more about the motivation behind this project [here](https://llmindset.co.uk/resources/fast-agent/)
+
+![fast-agent](https://github.com/user-attachments/assets/3e692103-bf97-489a-b519-2d0fee036369)
 
 ## Get started:
 
 Start by installing the [uv package manager](https://docs.astral.sh/uv/) for Python. Then:
 
 ```bash
-uv pip install fast-agent-mcp       # install fast-agent
+uv pip install fast-agent-mcp       # install fast-agent!
+
 fast-agent setup                    # create an example agent and config files
 uv run agent.py                     # run your first agent
 uv run agent.py --model=o3-mini.low # specify a model
@@ -275,6 +278,7 @@ fast-agent bootstrap workflow       # create "building effective agents" example
 
 Other bootstrap examples include a Researcher Agent (with Evaluator-Optimizer workflow) and Data Analysis Agent (similar to the ChatGPT experience), demonstrating MCP Roots support.
 
+> [!TIP]
 > Windows Users - there are a couple of configuration changes needed for the Filesystem and Docker MCP Servers - necessary changes are detailed within the configuration files.
 
 ### Basic Agents
@@ -354,7 +358,7 @@ async def main():
         )
 ```
 
-All Agents and Workflows respond to `.send("message")` and `.prompt()` to begin a chat session.
+All Agents and Workflows respond to `.send("message")` or `.prompt()` to begin a chat session.
 
 Saved as `social.py` we can now run this workflow from the command line with:
 
@@ -362,7 +366,7 @@ Saved as `social.py` we can now run this workflow from the command line with:
 uv run social.py --agent social_media --message "<url>"
 ```
 
-Add the `--quiet` switch to only return the final response.
+Add the `--quiet` switch to only return the final response, which is useful for simple automations.
 
 ## Workflows
 
@@ -383,7 +387,7 @@ async with fast.run() as agent:
 
 ```
 
-This starts an interactive session, which produces a short social media post for a given URL. If a _chain_ is prompted, by default it returns to a chat with last Agent in the chain.
+This starts an interactive session, which produces a short social media post for a given URL. If a _chain_ is prompted it returns to a chat with last Agent in the chain. You can switch the agent to prompt by typing `@agent-name`.
 
 Chains can be incorporated in other workflows, or contain other workflow elements (including other Chains). You can set an `instruction` to precisely describe it's capabilities to other workflow steps if needed.
 
@@ -407,9 +411,9 @@ The Parallel Workflow sends the same message to multiple Agents simultaneously (
 )
 ```
 
-Look at the `parallel.py` workflow example for more examples. If you don't specify a `fan-in` agent, the `parallel` returns Agent results verbatim.
+Look at the `parallel.py` workflow example for more examples. If you don't specify a `fan-in` agent, the `parallel` returns the combined Agent results verbatim.
 
-The Parallel is also useful to ensemble ideas from different LLMs.
+`parallel` is also useful to ensemble ideas from different LLMs.
 
 ### Evaluator-Optimizer
 
@@ -458,20 +462,107 @@ See `orchestrator.py` in the workflow examples.
 
 ## Agent Features
 
+### Calling Agents
+
+All definitions allow omitting the name and instructions arguments for brevity:
+
+```python
+@fast.agent("You are a helpful agent")          # Create an agent with a default name.
+@fast.agent("greeter","Respond cheerfully!")    # Create an agent with the name "greeter"
+
+moon_size = await agent("the moon")             # Call the default (first defined agent) with a message
+
+result = await agent.greeter("Good morning!")   # Send a message to an agent by name using dot notation
+result = await agent.greeter.send("Hello!")     # You can call 'send' explicitly
+
+await agent.greeter()                           # If no message is specified, a chat session will open
+await agent.greeter.prompt()                    # that can be made more explicit
+await agent.greeter.prompt(default_prompt="OK") # and supports setting a default prompt
+
+agent["greeter"].send("Good Evening!")          # Dictionary access is supported if preferred
+```
+
+### Defining Agents
+
+#### Basic Agent
+
 ```python
 @fast.agent(
-  name="agent",
-  instructions="instructions",
-  servers=["filesystem"],     # list of MCP Servers for the agent, configured in fastagent.config.yaml
-  model="o3-mini.high",       # specify a model for the agent
-  use_history=True,           # agent can maintain chat history
-  human_input=True,           # agent can request human input
+  name="agent",                          # name of the agent
+  instruction="You are a helpful Agent", # base instruction for the agent
+  servers=["filesystem"],                # list of MCP Servers for the agent
+  model="o3-mini.high",                  # specify a model for the agent
+  use_history=True,                      # agent maintains chat history
+  request_params={"temperature": 0.7},   # additional parameters for the LLM (or RequestParams())
+  human_input=True,                      # agent can request human input
+)
+```
+
+#### Chain
+
+```python
+@fast.chain(
+  name="chain",                          # name of the chain
+  sequence=["agent1", "agent2", ...],    # list of agents in execution order
+  instruction="instruction",             # instruction to describe the chain for other workflows
+  continue_with_final=True,              # open chat with agent at end of chain after prompting
 )
 ```
 
-### Human Input
+#### Parallel
+
+```python
+@fast.parallel(
+  name="parallel",                       # name of the parallel workflow
+  fan_out=["agent1", "agent2"],          # list of agents to run in parallel
+  fan_in="aggregator",                   # name of agent that combines results (optional)
+  instruction="instruction",             # instruction to describe the parallel for other workflows
+  include_request=True,                  # include original request in fan-in message
+)
+```
 
-When `human_input` is set to true for an Agent, it is presented with the option to prompt the User for input.
+#### Evaluator-Optimizer
+
+```python
+@fast.evaluator_optimizer(
+  name="researcher",                     # name of the workflow
+  generator="web_searcher",              # name of the content generator agent
+  evaluator="quality_assurance",         # name of the evaluator agent
+  min_rating="GOOD",                     # minimum acceptable quality (EXCELLENT, GOOD, FAIR, POOR)
+  max_refinements=3,                     # maximum number of refinement iterations
+)
+```
+
+#### Router
+
+```python
+@fast.router(
+  name="route",                          # name of the router
+  agents=["agent1", "agent2", "agent3"], # list of agent names router can delegate to
+  model="o3-mini.high",                  # specify routing model
+  use_history=True,                      # router maintains chat history
+  human_input=False,                     # whether router can request human input
+)
+```
+
+#### Orchestrator
+
+```python
+@fast.orchestrator(
+  name="orchestrator",                   # name of the orchestrator
+  instruction="instruction",             # base instruction for the orchestrator
+  agents=["agent1", "agent2"],           # list of agent names this orchestrator can use
+  model="o3-mini.high",                  # specify orchestrator planning model
+  use_history=False,                     # orchestrator doesn't maintain chat history by default
+  human_input=False,                     # whether orchestrator can request human input
+  plan_type="full",                      # planning approach: "full" or "iterative"
+)
+```
+
+### Secrets File
+
+> [!TIP]
+> fast-agent will look recursively for a fastagent.secrets.yaml file, so you only need to manage this at the root folder of your agent definitions.
 
 ## Project Notes
 
@@ -479,8 +570,11 @@ When `human_input` is set to true for an Agent, it is presented with the option
 
 ### llmindset.co.uk fork:
 
+- Remove instructor use for Orchestrator
+- Improved handling of Parallel/Fan-In and respose option
+- XML based generated prompts
 - "FastAgent" style prototyping, with per-agent models
-- Api keys through Environment Variables
+- API keys through Environment Variables
 - Warm-up / Post-Workflow Agent Interactions
 - Quick Setup
 - Interactive Prompt Mode
@@ -493,7 +587,12 @@ When `human_input` is set to true for an Agent, it is presented with the option
 - OpenAI o1/o3-mini support with reasoning level
 - Enhanced Human Input Messaging and Handling
 - Declarative workflows
+- Numerous defect fixes
 
 ### Features to add.
 
 - Chat History Clear.
+
+```
+
+```

{fast_agent_mcp-0.0.15.dist-info → fast_agent_mcp-0.0.16.dist-info}/RECORD

@@ -1,6 +1,6 @@
 mcp_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/app.py,sha256=0_C1xmNZlk9qZoewnNI_mC7sSfO9oJgkOyiKkQ62MHU,10606
-mcp_agent/config.py,sha256=mShpoyIAGeyQKMH9gUCAXBZ2HNF3SM2KoMjSMpPQnmg,10210
+mcp_agent/config.py,sha256=OpPTsk9gNm2IA1laUomAMkGA-pAlp5uILQpEPBjavQs,10644
 mcp_agent/console.py,sha256=Gjf2QLFumwG1Lav__c07X_kZxxEUSkzV-1_-YbAwcwo,813
 mcp_agent/context.py,sha256=qzwUrexZXVBzFiNkYI4xjztdGxuuiDWZbWrQgVhA-vE,8126
 mcp_agent/context_dependent.py,sha256=TGqRLzYCOnsWGoaD1HtrliYtWo8MeaWCQk6ePUmyYCw,1446
@@ -10,7 +10,7 @@ mcp_agent/progress_display.py,sha256=GeJU9VUt6qKsFVymG688hCMVCsAygG9ifiiEb5IcbN4
 mcp_agent/agents/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/agents/agent.py,sha256=losanPSdZXZzmeiX-J6ctOinLlkhNZsxwi3Swr8lnxA,11482
 mcp_agent/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_agent/cli/__main__.py,sha256=bhxe66GYqy0q78OQhi7dkuubY1Tn0bQL6hU5Nn47E34,73
+mcp_agent/cli/__main__.py,sha256=AVZ7tQFhU_sDOGuUGJq8ujgKtcxsYJBJwHbVaaiRDlI,166
 mcp_agent/cli/main.py,sha256=cqRxYTpeZ656lzf9qLR3LPnQXrFVDxlWm5gRuqyzUQg,2456
 mcp_agent/cli/terminal.py,sha256=5fqrKlJvIpKEuvpvZ653OueQSYFFktBEbosjr2ucMUc,1026
 mcp_agent/cli/commands/bootstrap.py,sha256=z1wZSy8vO_GZPGLrFGzG3EKFQgAHC08jiIdVyylo-58,10778
@@ -20,7 +20,7 @@ mcp_agent/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/core/agent_app.py,sha256=2gnORb52cpWYGjRDNTJ9lVCEEc11c7Xi874ho7bbYVQ,6097
 mcp_agent/core/agent_types.py,sha256=yKiMbv9QO2dduq4zXmoMZlOZpXJZhM4oNwIq1-134FE,318
 mcp_agent/core/agent_utils.py,sha256=yUJ-qvw5TblqqOsB1vj0Qvcz9mass9awPA6UNNvuw0A,1738
-mcp_agent/core/enhanced_prompt.py,sha256=0V5q0xcCk8PBwtc0p62B8JJ1VvqxN_wuJiXC2QPqv1M,12750
+mcp_agent/core/enhanced_prompt.py,sha256=ka-uuGNW7XggaGzXZQFB9T4azej455VPcgO66Q_7jnY,13008
 mcp_agent/core/error_handling.py,sha256=D3HMW5odrbJvaKqcpCGj6eDXrbFcuqYaCZz7fyYiTu4,623
 mcp_agent/core/exceptions.py,sha256=a2-JGRwFFRoQEPuAq0JC5PhAJ5TO3xVJfdS4-VN29cw,2225
 mcp_agent/core/fastagent.py,sha256=MLMdQ4_Cjb2svWyGVWLGf8EzI3dSFCl4BS5qq8UrKgg,56966
@@ -54,7 +54,7 @@ mcp_agent/mcp/mcp_agent_server.py,sha256=xP09HZTeguJi4Fq0p3fjLBP55uSYe5AdqM90xCg
 mcp_agent/mcp/mcp_aggregator.py,sha256=RVsgNnSJ1IPBkqKgF_Gp-Cpv97FVBIdppPey6FRoHB0,14751
 mcp_agent/mcp/mcp_connection_manager.py,sha256=WLli0w3TVcsszyD9M7zP7vLKPetnQLTf_0PGhvMm9YM,13145
 mcp_agent/mcp/stdio.py,sha256=tW075R5rQ-UlflXWFKIFDgCbWbuhKqxhiYolWvyEkFs,3985
-mcp_agent/resources/examples/data-analysis/analysis.py,sha256=Sp-umPPfwVjG3yNrHdQA6blGtG6jc5of1e_0oS4njYc,1379
+mcp_agent/resources/examples/data-analysis/analysis.py,sha256=1Ce68epq8j6yjgxkJeTtnLR4l5yq8ANGEZ2k1sIf6dw,2292
 mcp_agent/resources/examples/data-analysis/fastagent.config.yaml,sha256=eTKGbjnTHhDTeNRPQvG_fr9OQpEZ5Y9v7X2NyCj0V70,530
 mcp_agent/resources/examples/data-analysis/mount-point/WA_Fn-UseC_-HR-Employee-Attrition.csv,sha256=pcMeOL1_r8m8MziE6xgbBrQbjl5Ijo98yycZn7O-dlk,227977
 mcp_agent/resources/examples/internal/agent.py,sha256=f-jTgYabV3nWCQm0ZP9NtSEWjx3nQbRngzArRufcELg,384
@@ -66,11 +66,11 @@ mcp_agent/resources/examples/researcher/researcher-eval.py,sha256=kNPjIU-JwE0oIB
 mcp_agent/resources/examples/researcher/researcher.py,sha256=jPRafm7jbpHKkX_dQiYGG3Sw-e1Dm86q-JZT-WZDhM0,1425
 mcp_agent/resources/examples/workflows/agent_build.py,sha256=vdjS02rZR88RU53WYzXxPscfFNEFFe_niHYE_i49I8Q,2396
 mcp_agent/resources/examples/workflows/chaining.py,sha256=1G_0XBcFkSJCOXb6N_iXWlSc_oGAlhENR0k_CN1vJKI,1208
-mcp_agent/resources/examples/workflows/evaluator.py,sha256=FZy-ciZafdqSHUW67LKdHw0t9rvX6X67waMOoeIN3GY,3147
+mcp_agent/resources/examples/workflows/evaluator.py,sha256=aUotC9-soTjWgw5GAf9m74BKAHzwxRPBdnSb5ga3lY8,3072
 mcp_agent/resources/examples/workflows/fastagent.config.yaml,sha256=k2AiapOcK42uqG2nWDVvnSLqN4okQIQZK0FTbZufBpY,809
 mcp_agent/resources/examples/workflows/human_input.py,sha256=c8cBdLEPbaMXddFwsfN3Z7RFs5PZXsdrjANfvq1VTPM,605
 mcp_agent/resources/examples/workflows/orchestrator.py,sha256=pRJqB-ok79_iEj8aG4FysHyXz6wAHLUX-5tS8khUI7k,2574
-mcp_agent/resources/examples/workflows/parallel.py,sha256=dowCw6i8mVaWFWqLvyEEJz1kZDQqdeiltcM-hEz38iY,3222
+mcp_agent/resources/examples/workflows/parallel.py,sha256=pLbQrtXfbdYqMVddxtg5dZnBnm5Wo2mXlIa1Vf2F1FQ,3096
 mcp_agent/resources/examples/workflows/router.py,sha256=XT_ewCrxPxdUTMCYQGw34qZQ3GGu8TYY_v5Lige8By4,1707
 mcp_agent/telemetry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/telemetry/usage_tracking.py,sha256=ePujKMSjPxB7k6X34DGaVlnsV1728mcWZq38OqahiCU,501
@@ -80,7 +80,7 @@ mcp_agent/workflows/embedding/embedding_base.py,sha256=-c20ggQ8s7XhMxRX-WEhOgHE7
 mcp_agent/workflows/embedding/embedding_cohere.py,sha256=OKTJvKD_uEafd4c2uhR5tBjprea1nyvlJOO-3FDqOnk,1540
 mcp_agent/workflows/embedding/embedding_openai.py,sha256=dntjJ5P-FSMGYuyPZC8MuCU_ehwjXw9wDfzZZuSQN1E,1480
 mcp_agent/workflows/evaluator_optimizer/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_agent/workflows/evaluator_optimizer/evaluator_optimizer.py,sha256=r0ATtuc8JouBZz6iPc_dQ6g5oUZc7JXfbI9adKd2Wg8,13572
+mcp_agent/workflows/evaluator_optimizer/evaluator_optimizer.py,sha256=NsRaRte0_zbGPrvwAZadvcgSpY3d5ugbfVHooHOcJfc,15706
 mcp_agent/workflows/intent_classifier/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/workflows/intent_classifier/intent_classifier_base.py,sha256=zTbOmq6EY_abOlme4zl28HM4RWNNS6bbHl3tF7SshJ0,4004
 mcp_agent/workflows/intent_classifier/intent_classifier_embedding.py,sha256=_bWZGukc_q9LdA_Q18UoAMSzhN8tt4K_bRHNUhy7Crw,3997
@@ -91,30 +91,31 @@ mcp_agent/workflows/intent_classifier/intent_classifier_llm_anthropic.py,sha256=
 mcp_agent/workflows/intent_classifier/intent_classifier_llm_openai.py,sha256=zj76WlTYnSCYjBQ_IDi5vFBQGmNwYaoUq1rT730sY98,1940
 mcp_agent/workflows/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/workflows/llm/augmented_llm.py,sha256=Hyx-jwgbMjE_WQ--YjIUvdj6HAgX36IvXBesGy6uic0,25884
-mcp_agent/workflows/llm/augmented_llm_anthropic.py,sha256=4hyC8xI8zTLm7NgbyQRoWRu2ycoTP4Qu6bnPXR1p9ow,22473
-mcp_agent/workflows/llm/augmented_llm_openai.py,sha256=5PwTh0QJSQ29EtK0UuiltgX6snRSBoau75C35S4xQcQ,24477
+mcp_agent/workflows/llm/augmented_llm_anthropic.py,sha256=iHfbn7bwC-ICTajEhGwg9vP-UEj681kNmZ9Cv6H05s4,22968
+mcp_agent/workflows/llm/augmented_llm_openai.py,sha256=a95Q4AFiVw36bXMgYNLFrC2zyDmHERWwkjxJFHlL6JU,25061
 mcp_agent/workflows/llm/llm_selector.py,sha256=G7pIybuBDwtmyxUDov_QrNYH2FoI0qFRu2JfoxWUF5Y,11045
 mcp_agent/workflows/llm/model_factory.py,sha256=7zTJrO2ReHa_6dfh_gY6xO8dTySqGFCKlOG9-AMJ-i8,6920
+mcp_agent/workflows/llm/prompt_utils.py,sha256=EY3eddqnmc_YDUQJFysPnpTH6hr4r2HneeEmX76P8TQ,4948
 mcp_agent/workflows/orchestrator/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_agent/workflows/orchestrator/orchestrator.py,sha256=Fn5r0uUGNAiUq5NLFDjaJ04t19MnGEgr9iknbUj0DSA,14733
-mcp_agent/workflows/orchestrator/orchestrator_models.py,sha256=UWn7_HFLcqFGlcjZ1Rn2SYQfm5k9seS6QJN_FRST5Kc,4513
-mcp_agent/workflows/orchestrator/orchestrator_prompts.py,sha256=-ogkjDoCXBDOyYE9yk3qhjqq0LofsSpRvRZfWVzrVTE,4396
+mcp_agent/workflows/orchestrator/orchestrator.py,sha256=dmj7CwTEHj0f8bTakijjvaOfJJ8ShgWwOWaCmFRiX7s,21933
+mcp_agent/workflows/orchestrator/orchestrator_models.py,sha256=xTl2vUIqdLPvDAnqA485Hf_A3DD48TWhAbo-jfGrmRE,7182
+mcp_agent/workflows/orchestrator/orchestrator_prompts.py,sha256=eJSQThfd6Jvr1jTDx104sJI5R684yE55L_edCiWERsQ,6153
 mcp_agent/workflows/parallel/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/workflows/parallel/fan_in.py,sha256=EivpUL5-qftctws-tlfwmYS1QeSwr07POIbBUbwvwOk,13184
 mcp_agent/workflows/parallel/fan_out.py,sha256=J-yezgjzAWxfueW_Qcgwoet4PFDRIh0h4m48lIbFA4c,7023
 mcp_agent/workflows/parallel/parallel_llm.py,sha256=fk88DhBRAI41Ph0spe_yBtrMTSj0g47yoA-ozuOxZhE,5807
 mcp_agent/workflows/router/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-mcp_agent/workflows/router/router_base.py,sha256=1Qr3Fx9_KxpotMV-eaNT79etayAxWuQOmanDfk1qjtI,10250
+mcp_agent/workflows/router/router_base.py,sha256=S-UxofpdW9e7ZQXaZcSE8zBY--6W0m5qc0lw6BZi0ug,14336
 mcp_agent/workflows/router/router_embedding.py,sha256=wEU49li9OqTX-Xucm0HDUFLZjlND1WuewOcQVAo0s2E,7944
 mcp_agent/workflows/router/router_embedding_cohere.py,sha256=aKZVzzQfBuz0by9k0zWLAA0Db_unDIMYL4ynVzzx8C4,1975
 mcp_agent/workflows/router/router_embedding_openai.py,sha256=KqW2IFLdQoAJ2lIz1X18WQJFjXF-YSFSTtsqVnp1JeI,1975
-mcp_agent/workflows/router/router_llm.py,sha256=xRLzFt8UvJT9PZNHIVDr8DguWqHFi-MJ-uGALL5Ahzw,10639
+mcp_agent/workflows/router/router_llm.py,sha256=jnOK5NHK7zUk-80kJ7HS4p7CGKe3vUA1aZ8-MMflUSA,11030
 mcp_agent/workflows/swarm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mcp_agent/workflows/swarm/swarm.py,sha256=-lAIeSWDqbGHGRPTvjiP9nIKWvxxy9DAojl9yQzO1Pw,11050
 mcp_agent/workflows/swarm/swarm_anthropic.py,sha256=pW8zFx5baUWGd5Vw3nIDF2oVOOGNorij4qvGJKdYPcs,1624
 mcp_agent/workflows/swarm/swarm_openai.py,sha256=wfteywvAGkT5bLmIxX_StHJq8144whYmCRnJASAjOes,1596
-fast_agent_mcp-0.0.15.dist-info/METADATA,sha256=KL03PExGMGz9tQ9E72MKAnDS6Fi6rSGjoqyYAV3JLd4,22779
-fast_agent_mcp-0.0.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fast_agent_mcp-0.0.15.dist-info/entry_points.txt,sha256=2IXtSmDK9XjWN__RWuRIJTgWyW17wJnJ_h-pb0pZAxo,174
-fast_agent_mcp-0.0.15.dist-info/licenses/LICENSE,sha256=cN3FxDURL9XuzE5mhK9L2paZo82LTfjwCYVT7e3j0e4,10939
-fast_agent_mcp-0.0.15.dist-info/RECORD,,
+fast_agent_mcp-0.0.16.dist-info/METADATA,sha256=8lvkk2i0uitUQtc30LcOd7Wdak4uflU0aXO_Ve37X1Y,26857
+fast_agent_mcp-0.0.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+fast_agent_mcp-0.0.16.dist-info/entry_points.txt,sha256=2IXtSmDK9XjWN__RWuRIJTgWyW17wJnJ_h-pb0pZAxo,174
+fast_agent_mcp-0.0.16.dist-info/licenses/LICENSE,sha256=cN3FxDURL9XuzE5mhK9L2paZo82LTfjwCYVT7e3j0e4,10939
+fast_agent_mcp-0.0.16.dist-info/RECORD,,

mcp_agent/cli/__main__.py

@@ -1,4 +1,7 @@
 from mcp_agent.cli.main import app
 
+# This must be here for the console entry points defined in pyproject.toml
+# DO NOT REMOVE!
+
 if __name__ == "__main__":
     app()

mcp_agent/config.py

@@ -313,17 +313,25 @@ def get_settings(config_path: str | None = None) -> Settings:
             with open(config_file, "r", encoding="utf-8") as f:
                 yaml_settings = yaml.safe_load(f) or {}
                 merged_settings = yaml_settings
-
-            # Look for secrets file in the same directory
-            for secrets_file in [
-                config_file.parent / "mcp-agent.secrets.yaml",
-                config_file.parent / "mcp_agent.secrets.yaml",
-                config_file.parent / "fastagent.secrets.yaml",
-            ]:
-                if secrets_file.exists():
-                    with open(secrets_file, "r", encoding="utf-8") as f:
-                        yaml_secrets = yaml.safe_load(f) or {}
-                        merged_settings = deep_merge(merged_settings, yaml_secrets)
+            # Look for secrets files recursively up the directory tree
+            # but stop after finding the first one
+            current_dir = config_file.parent
+            found_secrets = False
+            while current_dir != current_dir.parent and not found_secrets:
+                for secrets_filename in [
+                    "mcp-agent.secrets.yaml",
+                    "mcp_agent.secrets.yaml",
+                    "fastagent.secrets.yaml",
+                ]:
+                    secrets_file = current_dir / secrets_filename
+                    if secrets_file.exists():
+                        with open(secrets_file, "r", encoding="utf-8") as f:
+                            yaml_secrets = yaml.safe_load(f) or {}
+                            merged_settings = deep_merge(merged_settings, yaml_secrets)
+                            found_secrets = True
+                            break
+                if not found_secrets:
+                    current_dir = current_dir.parent
 
             _settings = Settings(**merged_settings)
             return _settings

mcp_agent/core/enhanced_prompt.py

@@ -3,6 +3,7 @@ Enhanced prompt functionality with advanced prompt_toolkit features.
 """
 
 from typing import List
+from importlib.metadata import version
 from prompt_toolkit import PromptSession
 from prompt_toolkit.formatted_text import HTML
 from prompt_toolkit.history import InMemoryHistory
@@ -15,6 +16,12 @@ from rich import print as rich_print
 
 from mcp_agent.core.exceptions import PromptExitError
 
+# Get the application version
+try:
+    app_version = version("fast-agent-mcp")
+except:  # noqa: E722
+    app_version = "unknown"
+
 # Map of agent names to their history
 agent_histories = {}
 
@@ -204,7 +211,7 @@ async def get_enhanced_input(
 
         shortcut_text = " | ".join(f"{key}:{action}" for key, action in shortcuts)
         return HTML(
-            f" <{toolbar_color}> {agent_name} </{toolbar_color}> | <b>Mode:</b> <{mode_style}> {mode_text} </{mode_style}> {newline} | {shortcut_text}"
+            f" <{toolbar_color}> {agent_name} </{toolbar_color}> | <b>Mode:</b> <{mode_style}> {mode_text} </{mode_style}> {newline} | {shortcut_text} | <dim>v{app_version}</dim>"
         )
 
     # Create session with history and completions
@@ -318,7 +325,8 @@ async def handle_special_commands(command, agent_app=None):
         rich_print(
             "  Enter          - Submit (normal mode) / New line (multiline mode)"
         )
-        rich_print("  Ctrl+Enter      - Always submit (even in multiline mode)")
+        rich_print("  \\ + Enter     - Insert new line in normal mode")
+        rich_print("  Ctrl+Enter      - Always submit (in any mode)")
         rich_print("  Ctrl+T         - Toggle multiline mode")
         rich_print("  Ctrl+L         - Clear input")
         rich_print("  Up/Down        - Navigate history")

mcp_agent/resources/examples/data-analysis/analysis.py

@@ -1,6 +1,7 @@
 import asyncio
 
 from mcp_agent.core.fastagent import FastAgent
+from mcp_agent.workflows.llm.augmented_llm import RequestParams
 
 # Create the application
 fast = FastAgent("Data Analysis (Roots)")
@@ -16,18 +17,43 @@ Data files are accessible from the /mnt/data/ directory (this is the current wor
 Visualisations should be saved as .png files in the current working directory.
 """,
     servers=["interpreter"],
+    request_params=RequestParams(maxTokens=8192),
+)
+@fast.agent(
+    "evaluator",
+    """You are collaborating with a Data Analysis tool that has the capability to analyse data and produce visualisations.
+    You must make sure that the tool has:
+     - Considered the best way for a Human to interpret the data
+     - Produced insightful visualasions.
+     - Provided a high level summary report for the Human.
+     - Has had its findings challenged, and justified
+    """,
+    request_params=RequestParams(maxTokens=8192),
+)
+@fast.evaluator_optimizer(
+    "analysis_tool",
+    generator="data_analysis",
+    evaluator="evaluator",
+    max_refinements=3,
+    min_rating="EXCELLENT",
+)
+@fast.passthrough(
+    "sample",
 )
 async def main():
     # Use the app's context manager
     async with fast.run() as agent:
-        await agent(
-            "There is a csv file in the current directory. "
-            "Analyse the file, produce a detailed description of the data, and any patterns it contains.",
-        )
-        await agent(
-            "Consider the data, and how to usefully group it for presentation to a Human. Find insights, using the Python Interpreter as needed.\n"
-            "Use MatPlotLib to produce insightful visualisations. Save them as '.png' files in the current directory. Be sure to run the code and save the files.\n"
-            "Produce a summary with major insights to the data",
+        # await agent(
+        #     "There is a csv file in the current directory. "
+        #     "Analyse the file, produce a detailed description of the data, and any patterns it contains.",
+        # )
+        # await agent(
+        #     "Consider the data, and how to usefully group it for presentation to a Human. Find insights, using the Python Interpreter as needed.\n"
+        #     "Use MatPlotLib to produce insightful visualisations. Save them as '.png' files in the current directory. Be sure to run the code and save the files.\n"
+        #     "Produce a summary with major insights to the data",
+        # )
+        await agent.analysis_tool.prompt(
+            "Analyse the CSV File in the working directory"
         )
 
 

mcp_agent/resources/examples/workflows/evaluator.py

@@ -38,8 +38,6 @@ fast = FastAgent("Evaluator-Optimizer")
     Summarize your evaluation as a structured response with:
     - Overall quality rating.
     - Specific feedback and areas for improvement.""",
-    # instructor doesn't seem to work for sonnet37
-    # model="sonnet35",
 )
 # Define the evaluator-optimizer workflow
 @fast.evaluator_optimizer(

mcp_agent/resources/examples/workflows/parallel.py

@@ -60,10 +60,6 @@ and whispers of a hidden agenda linger among the villagers.
     and give an overall grade based on the feedback.""",
     model="o3-mini.low",
 )
-@fast.agent(
-    name="cats-to-dogs",
-    instruction="you should take any text, and change references about cats to dogs",
-)
 @fast.parallel(
     fan_out=["proofreader", "fact_checker", "style_enforcer"],
     fan_in="grader",

mcp_agent/workflows/evaluator_optimizer/evaluator_optimizer.py

@@ -316,23 +316,50 @@ class EvaluatorOptimizerLLM(AugmentedLLM[MessageParamT, MessageT]):
     ) -> str:
         """Build the evaluation prompt for the evaluator"""
         return f"""
-        Evaluate the following response based on these criteria:
-        {self.evaluator.instruction}
-
-        Original Request: {original_request}
-        Current Response (Iteration {iteration + 1}): {current_response}
-
-        Provide your evaluation as a structured response with:
-        1. A quality rating (EXCELLENT, GOOD, FAIR, or POOR)
-        2. Specific feedback and suggestions
-        3. Whether improvement is needed (true/false)
-        4. Focus areas for improvement
-
-        Rate as EXCELLENT only if no improvements are needed.
-        Rate as GOOD if only minor improvements are possible.
-        Rate as FAIR if several improvements are needed.
-        Rate as POOR if major improvements are needed.
-        """
+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.
+
+<fastagent:data>
+<fastagent:request>
+{original_request}
+</fastagent:request>
+
+<fastagent:response>
+{current_response}
+</fastagent:response>
+
+<fastagent:evaluation-criteria>
+{self.evaluator.instruction}
+</fastagent:evaluation-criteria>
+</fastagent:data>
+
+<fastagent:instruction>
+Provide a structured evaluation with the following components:
+
+<rating>
+Choose one: EXCELLENT, GOOD, FAIR, or POOR
+- EXCELLENT: No improvements needed
+- GOOD: Only minor improvements possible
+- FAIR: Several improvements needed
+- POOR: Major improvements needed
+</rating>
+
+<details>
+Provide specific, actionable feedback and suggestions for improvement.
+Be precise about what works well and what could be improved.
+</details>
+
+<needs_improvement>
+Indicate true/false whether further improvement is needed.
+</needs_improvement>
+
+<focus-areas>
+List 1-3 specific areas to focus on in the next iteration.
+Be concrete and actionable in your recommendations.
+</focus-areas>
+</fastagent:instruction>
+"""
 
     def _build_refinement_prompt(
         self,
@@ -342,17 +369,71 @@ class EvaluatorOptimizerLLM(AugmentedLLM[MessageParamT, MessageT]):
         iteration: int,
     ) -> str:
         """Build the refinement prompt for the optimizer"""
-        return f"""
-        Improve your previous response based on the evaluation feedback.
-        
-        Original Request: {original_request}
-        
-        Previous Response (Iteration {iteration + 1}): 
-        {current_response}
-        
-        Quality Rating: {feedback.rating}
-        Feedback: {feedback.feedback}
-        Areas to Focus On: {", ".join(feedback.focus_areas)}
-        
-        Generate an improved version addressing the feedback while maintaining accuracy and relevance.
-        """
+        history_enabled = hasattr(self, "history") and self.history
+
+        # Start with clear non-delimited instructions
+        prompt = f"""
+You are tasked with improving a 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.
+"""
+
+        # Add data section with all relevant information
+        prompt += """
+<fastagent:data>
+"""
+
+        # Add request
+        prompt += f"""
+<fastagent:request>
+{original_request}
+</fastagent:request>
+"""
+
+        # Only include previous response if history is not enabled
+        if not history_enabled:
+            prompt += f"""
+<fastagent:previous-response>
+{current_response}
+</fastagent:previous-response>
+"""
+
+        # Always include the feedback
+        prompt += f"""
+<fastagent:feedback>
+<rating>{feedback.rating}</rating>
+<details>{feedback.feedback}</details>
+<focus-areas>{", ".join(feedback.focus_areas) if feedback.focus_areas else "None specified"}</focus-areas>
+</fastagent:feedback>
+</fastagent:data>
+"""
+
+        # Customize instruction based on history availability
+        if not history_enabled:
+            prompt += """
+<fastagent:instruction>
+Create an improved version of the response that:
+1. Directly addresses each point in the feedback
+2. Focuses on the specific areas mentioned for improvement
+3. Maintains all the strengths of the original response
+4. Remains accurate and relevant to the original request
+
+Provide your complete improved response without explanations or commentary.
+</fastagent:instruction>
+"""
+        else:
+            prompt += """
+<fastagent:instruction>
+Your previous response is available in your conversation history.
+
+Create an improved version that:
+1. Directly addresses each point in the feedback
+2. Focuses on the specific areas mentioned for improvement
+3. Maintains all the strengths of your original response
+4. Remains accurate and relevant to the original request
+
+Provide your complete improved response without explanations or commentary.
+</fastagent:instruction>
+"""
+
+        return prompt