Refactor agent loading and execution to utilize AnyAgent class (#45)

* Refactor agent loading and execution to utilize AnyAgent class for improved framework compatibility

* cli fix

* Update CLI to set instructions based on agent framework.

* lint

examples/langchain_single_agent_user_confirmation.yaml

@@ -7,12 +7,13 @@ input_prompt_template: |
   in a {MAX_DRIVING_HOURS} hour driving radius, at {DATE}?
   Find a few options and then discuss it with David de la Iglesia Castro. You should recommend him some choices,
   and then confirm the final selection with him.
+  Once he gives the final selection, save a detailed description of the weather at the chosen location into a file
+  named "final_answer.txt". Also save a file called "history.txt" which has a list of your thought process in the choice.
 
 framework: langchain
 
 main_agent:
-  model_id: gpt-4o
-  # model_id: ollama/llama3.1:latest
+  model_id: openai/gpt-4o
   api_key_var: OPENAI_API_KEY
   tools:
   - "surf_spot_finder.tools.driving_hours_to_meters"
@@ -21,3 +22,17 @@ main_agent:
   - "surf_spot_finder.tools.get_wave_forecast"
   - "surf_spot_finder.tools.get_wind_forecast"
   - "any_agent.tools.send_console_message"
+  - command: "docker"
+    args:
+      - "run"
+      - "-i"
+      - "--rm"
+      - "--mount"
+      - "type=bind,src=/tmp/surf-spot-finder,dst=/projects"
+      - "mcp/filesystem"
+      - "/projects"
+    tools:
+      - "read_file"
+      - "write_file"
+      - "directory_tree"
+      - "list_allowed_directories"

examples/smolagents_single_agent_user_confirmation.yaml

@@ -13,7 +13,6 @@ framework: smolagents
 
 main_agent:
   model_id: openai/gpt-4o
-  # model_id: ollama/llama3.1:latest
   api_key_var: OPENAI_API_KEY
   tools:
   - "surf_spot_finder.tools.driving_hours_to_meters"

src/surf_spot_finder/cli.py

@@ -1,3 +1,4 @@
+from any_agent import AgentFramework, AnyAgent
 import yaml
 from pathlib import Path
 
@@ -7,9 +8,11 @@ from loguru import logger
 from surf_spot_finder.config import (
     Config,
 )
-from any_agent import load_agent, run_agent
 from any_agent.tracing import get_tracer_provider, setup_tracing
 
+from surf_spot_finder.instructions.openai import SINGLE_AGENT_SYSTEM_PROMPT
+from surf_spot_finder.instructions.smolagents import SYSTEM_PROMPT
+
 
 @logger.catch(reraise=True)
 def find_surf_spot(
@@ -25,6 +28,12 @@ def find_surf_spot(
     logger.info(f"Loading {config_file}")
     config = Config.model_validate(yaml.safe_load(Path(config_file).read_text()))
 
+    if not config.main_agent.instructions:
+        if config.main_agent.agent_framework == AgentFramework.SMOLAGENTS:
+            config.main_agent.instructions = SYSTEM_PROMPT
+        elif config.main_agent.agent_framework == AgentFramework.OPENAI:
+            config.main_agent.instructions = SINGLE_AGENT_SYSTEM_PROMPT
+
     logger.info("Setting up tracing")
     tracer_provider, tracing_path = get_tracer_provider(
         project_name="surf-spot-finder", agent_framework=config.framework
@@ -33,9 +42,9 @@ def find_surf_spot(
 
     logger.info(f"Loading {config.framework} agent")
     logger.info(f"{config.managed_agents}")
-    agent = load_agent(
-        framework=config.framework,
-        main_agent=config.main_agent,
+    agent = AnyAgent.create(
+        agent_framework=config.framework,
+        agent_config=config.main_agent,
         managed_agents=config.managed_agents,
     )
 
@@ -45,7 +54,7 @@ def find_surf_spot(
         DATE=config.date,
     )
     logger.info(f"Running agent with query:\n{query}")
-    run_agent(agent, query)
+    agent.run(query)
 
     logger.success("Done!")
 

src/surf_spot_finder/evaluation/evaluate.py

@@ -16,7 +16,7 @@ from surf_spot_finder.evaluation.evaluators import (
     HypothesisEvaluator,
 )
 from surf_spot_finder.evaluation.test_case import TestCase
-from any_agent import load_agent, run_agent
+from any_agent import AnyAgent
 from any_agent.tracing import get_tracer_provider, setup_tracing
 
 logger.remove()
@@ -40,9 +40,9 @@ def run(test_case: TestCase, agent_config_path: str) -> str:
 
     logger.info(f"Loading {config.framework} agent")
     logger.info(f"{config.managed_agents}")
-    agent = load_agent(
-        framework=config.framework,
-        main_agent=config.main_agent,
+    agent = AnyAgent.create(
+        agent_framework=config.framework,
+        agent_config=config.main_agent,
         managed_agents=config.managed_agents,
     )
 
@@ -52,7 +52,7 @@ def run(test_case: TestCase, agent_config_path: str) -> str:
         DATE=config.date,
     )
     logger.info(f"Running agent with query:\n{query}")
-    run_agent(agent, query)
+    agent.run(query)
 
     logger.success("Done!")