Revert "Adding a second agent"

This reverts commit dcdf0b5d9d3d0ad2168ef2ca6438949dade7f97a.

Dockerfile

@@ -15,7 +15,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
 RUN python3 -m pip install --no-cache-dir --upgrade pip && \
     pip3 install --no-cache-dir \
       fastapi uvicorn httpx[http2] \
-      smolagents[toolkit] litellm \
+      smolagents litellm \
       "pydantic>=2,<3"
 
 # MongoDB

agents/{code_writing_agent_without_tools.py → code_writing_agent.py}

@@ -3,7 +3,7 @@ import smolagents
 import smolagents.models
 
 
-def generate_code_writing_agent_without_tools() -> smolagents.CodeAgent:
+def create_code_writing_agent():
     return smolagents.CodeAgent(
         name="code_writing_agent_without_tools",
         model=smolagents.models.OpenAIServerModel(

agents/code_writing_agent_with_tools.py

@@ -1,23 +0,0 @@
-import os
-import smolagents
-import smolagents.models
-
-
-def generate_code_writing_agent_with_tools() -> smolagents.CodeAgent:
-    return smolagents.CodeAgent(
-        name="code_writing_agent_with_tools",
-        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=[
-            smolagents.DuckDuckGoSearchTool(max_results=5),
-            smolagents.VisitWebpageTool(max_output_length=5000),
-        ],  # no extra tools
-        add_base_tools=False,
-        max_steps=4,
-        verbosity_level=int(
-            os.getenv("AGENT_VERBOSITY", "1")
-        ),  # quieter by default; override via env
-    )

proxy.py

@@ -2,14 +2,14 @@
 OpenAI-compatible FastAPI proxy that wraps a smolagents CodeAgent
 """
 
-import os
-import re
-import json
-import time
-import asyncio
-import typing
-import logging
-import threading
+import os  # For dealing with env vars
+import re  # For tag stripping
+import json  # For JSON handling
+import time  # For timestamps and sleeps
+import asyncio  # For async operations
+import typing  # For type annotations
+import logging  # For logging
+import threading  # For threading operations
 
 import fastapi
 import fastapi.responses
@@ -19,13 +19,7 @@ import contextlib
 # Upstream pass-through
 import httpx
 
-from agents.code_writing_agent_without_tools import (
-    generate_code_writing_agent_without_tools,
-)
-
-from agents.code_writing_agent_with_tools import (
-    generate_code_writing_agent_with_tools,
-)
+from agents.code_writing_agent import create_code_writing_agent
 
 # Logging setup
 logging.basicConfig(level=os.getenv("LOG_LEVEL", "INFO").upper())
@@ -393,6 +387,7 @@ async def run_agent_stream(task: str, agent_obj: typing.Optional[typing.Any] = N
     """
     loop = asyncio.get_running_loop()
     q: asyncio.Queue = asyncio.Queue()
+    agent_to_use = agent_obj or create_code_writing_agent()
 
     stop_evt = threading.Event()
 
@@ -411,8 +406,8 @@ async def run_agent_stream(task: str, agent_obj: typing.Optional[typing.Any] = N
                 except Exception:
                     # Fallbacks: different names across versions
                     steps = (
-                        getattr(agent_obj, "steps", [])
-                        or getattr(agent_obj, "memory", [])
+                        getattr(agent_to_use, "steps", [])
+                        or getattr(agent_to_use, "memory", [])
                         or []
                     )
                 if steps is None:
@@ -440,9 +435,11 @@ async def run_agent_stream(task: str, agent_obj: typing.Optional[typing.Any] = N
                 qwriter
             ):
                 used_iterable = False
-                if hasattr(agent_obj, "run") and callable(getattr(agent_obj, "run")):
+                if hasattr(agent_to_use, "run") and callable(
+                    getattr(agent_to_use, "run")
+                ):
                     try:
-                        res = agent_obj.run(task, stream=True)
+                        res = agent_to_use.run(task, stream=True)
                         if hasattr(res, "__iter__") and not isinstance(
                             res, (str, bytes)
                         ):
@@ -469,7 +466,7 @@ async def run_agent_stream(task: str, agent_obj: typing.Optional[typing.Any] = N
                         "stream_run",
                         "run_with_callback",
                     ):
-                        fn = getattr(agent_obj, name, None)
+                        fn = getattr(agent_to_use, name, None)
                         if callable(fn):
                             try:
                                 res = fn(task)
@@ -502,16 +499,16 @@ async def run_agent_stream(task: str, agent_obj: typing.Optional[typing.Any] = N
 
                 if final_result is None and not used_iterable:
                     # Last resort: synchronous run()/generate()/callable
-                    if hasattr(agent_obj, "run") and callable(
-                        getattr(agent_obj, "run")
+                    if hasattr(agent_to_use, "run") and callable(
+                        getattr(agent_to_use, "run")
                     ):
-                        final_result = agent_obj.run(task)
-                    elif hasattr(agent_obj, "generate") and callable(
-                        getattr(agent_obj, "generate")
+                        final_result = agent_to_use.run(task)
+                    elif hasattr(agent_to_use, "generate") and callable(
+                        getattr(agent_to_use, "generate")
                     ):
-                        final_result = agent_obj.generate(task)
-                    elif callable(agent_obj):
-                        final_result = agent_obj(task)
+                        final_result = agent_to_use.generate(task)
+                    elif callable(agent_to_use):
+                        final_result = agent_to_use(task)
 
         except Exception as e:
             try:
@@ -692,14 +689,17 @@ async def chat_completions(req: fastapi.Request):
     # Per-request agent override if a custom model id was provided (different from defaults)
     agent_for_request = None
     if model_name not in (
+        "code-writing-agent-without-tools",
         AGENT_MODEL,
         AGENT_MODEL + "-nothink",
     ) and isinstance(model_name, str):
-        if model_name is "code-writing-agent-with-tools":
-            agent_for_request = generate_code_writing_agent_with_tools()
-
-        if model_name is "code-writing-agent-without-tools":
-            agent_for_request = generate_code_writing_agent_without_tools()
+        try:
+            agent_for_request = create_code_writing_agent()
+        except Exception:
+            log.exception(
+                "Failed to construct agent for model '%s'; using default", model_name
+            )
+            agent_for_request = None
 
     try:
         if stream: