Adding more agents

agents/{code_writing_agent.py → code_writing_agents.py}

@@ -3,14 +3,16 @@ import smolagents
 import smolagents.models
 
 
-def generate_code_writing_agent_with_tools(tools=None):
+def generate_code_writing_agent_with_tools(
+    tools=None, name: str = "code_writing_agent_without_tools"
+):
     """
     Create a code-writing agent without any extra tools.
     """
     if tools is None:
         tools = []
     return smolagents.CodeAgent(
-        name="code_writing_agent_without_tools",
+        name=name,
         model=smolagents.models.OpenAIServerModel(
             model_id=os.getenv("AGENT_MODEL", ""),
             api_base=os.getenv("UPSTREAM_OPENAI_BASE", "").rstrip("/"),
@@ -37,4 +39,6 @@ def generate_code_writing_agent_with_search():
     Create a code-writing agent without any extra tools.
     """
     tools = [smolagents.WebSearchTool(max_results=5)]
-    return generate_code_writing_agent_with_tools(tools)
+    return generate_code_writing_agent_with_tools(
+        tools, name="code_writing_agent_with_search"
+    )

agents/json_tool_calling_agents.py

@@ -0,0 +1,47 @@
+import os
+import smolagents
+import smolagents.models
+
+
+def generate_tool_calling_agent_with_tools(
+    tools=None, name: str = "tool_calling_agent_without_tools"
+):
+    """
+    Create a code-writing agent without any extra tools.
+    """
+    if tools is None:
+        tools = []
+    return smolagents.ToolCallingAgent(
+        name=name,
+        model=smolagents.models.OpenAIServerModel(
+            model_id=os.getenv("AGENT_MODEL", ""),
+            api_base=os.getenv("UPSTREAM_OPENAI_BASE", "").rstrip("/"),
+            api_key=os.getenv("OPENAI_API_KEY"),
+        ),
+        tools=tools,
+        add_base_tools=False,
+        max_steps=4,
+        verbosity_level=int(
+            os.getenv("AGENT_VERBOSITY", "1")
+        ),  # quieter by default; override via env
+    )
+
+
+def generate_self_critiquing_agent():
+    """
+    Create a code-writing agent without any extra tools.
+    """
+    return generate_tool_calling_agent_with_tools(name="self_critiquing_agent")
+
+
+def generate_code_writing_agent_with_search_and_code():
+    """
+    Create a code-writing agent without any extra tools.
+    """
+    tools = [
+        smolagents.WebSearchTool(max_results=5),
+        smolagents.PythonInterpreterTool(),
+    ]
+    return generate_tool_calling_agent_with_tools(
+        tools, name="tool_calling_agent_with_search_and_code"
+    )

proxy.py

@@ -19,11 +19,16 @@ import contextlib
 # Upstream pass-through
 import httpx
 
-from agents.code_writing_agent import (
+from agents.code_writing_agents import (
     generate_code_writing_agent_without_tools,
     generate_code_writing_agent_with_search,
 )
 
+from agents.json_tool_calling_agents import (
+    generate_code_writing_agent_with_search_and_code,
+    generate_self_critiquing_agent,
+)
+
 # Logging setup
 logging.basicConfig(level=os.getenv("LOG_LEVEL", "INFO").upper())
 log = logging.getLogger(__name__)
@@ -620,12 +625,23 @@ async def list_models():
     return {
         "object": "list",
         "data": [
+            {
+                "id": "self-critiquing-agent",
+                "object": "model",
+                "created": now,
+                "owned_by": "you",
+            },
+            {
+                "id": "tool-calling-agent-with-search-and-code",
+                "object": "model",
+                "created": now,
+                "owned_by": "you",
+            },
             {
                 "id": "code-writing-agent-without-tools",
                 "object": "model",
                 "created": now,
                 "owned_by": "you",
-                "logoUrl": "https://cmccomb.com/assets/images/headshot_optimized_square.jpg",
             },
             {
                 "id": "code-writing-agent-with-search",
@@ -706,6 +722,12 @@ async def chat_completions(req: fastapi.Request):
             agent_for_request = generate_code_writing_agent_without_tools()
         elif model_name == "code-writing-agent-with-search":
             agent_for_request = generate_code_writing_agent_with_search()
+        elif model_name == "tool-calling-agent-with-search-and-code":
+
+            agent_for_request = generate_code_writing_agent_with_search_and_code()
+        elif model_name == "self-critiquing-agent":
+
+            agent_for_request = generate_self_critiquing_agent()
         else:
             # Emit error for unknown model
             return fastapi.responses.JSONResponse(