Adding a bi-agent system.

agents/generator_and_critic.py

@@ -0,0 +1,100 @@
+from __future__ import annotations
+import os
+from typing import List, Optional
+from smolagents import CodeAgent, ToolCallingAgent
+import smolagents.models
+
+
+# ---------------- Agent Prompts ----------------
+GENERATOR_INSTRUCTIONS = """
+You are the Generator/Refiner.
+
+Goal
+- Produce a concise draft that strictly satisfies the caller's constraints.
+- Use the managed agent named "critic_agent" to validate your draft.
+- Repeat: draft → call critic_agent → if ok, return draft; else revise and re-check.
+- Output ONLY the final draft text (no JSON, no commentary).
+
+Constraints to enforce in every revision:
+- Respect the maximum word count.
+- Use bullet points where appropriate (lines starting with '-' or '•').
+- Include all required phrases verbatim.
+- End with a line starting with 'Next steps:'.
+
+Implementation guidance (you write/run the code):
+- Use a small loop with a bounded number of rounds provided by the caller.
+- Call critic_agent with a single string payload that contains:
+  - the DRAFT
+  - the list of required phrases
+  - the word limit
+  - any other constraints you need
+- critic_agent returns a JSON object with keys: ok (bool), violations (list[str]), suggestions (str).
+- If ok == true, immediately return the current draft (and stop).
+- Otherwise, revise the draft to fix ALL violations, then re-check.
+
+Important:
+- Do NOT print anything except the final draft at the end.
+- Avoid verbose interleaved logs; keep code minimal.
+"""
+
+CRITIC_INSTRUCTIONS = """
+You are the Critic.
+
+Input
+- A single string payload that includes:
+  - DRAFT text
+  - explicit constraints (e.g., max_words, must_include list, bullets rule, ending 'Next steps:')
+
+Task
+- Evaluate the DRAFT against the constraints and general quality (clarity, correctness, structure, tone).
+- Return ONLY compact JSON (no text outside JSON) with shape:
+{
+  "ok": true|false,
+  "violations": ["short, concrete issues..."],
+  "suggestions": "one short paragraph of actionable guidance"
+}
+
+Rules
+- ok=true ONLY if all constraints are satisfied AND the draft reads clearly.
+- Keep violations terse and actionable.
+- Keep suggestions short and prescriptive.
+"""
+
+
+# ---------------- Factory ----------------
+def generate_generator_with_managed_critic(
+    *,
+    gen_max_steps: int = 12,
+    crt_max_steps: int = 2,
+) -> CodeAgent:
+    """
+    Returns a CodeAgent (generator) that manages a critic sub-agent.
+    The critic is exposed to the generator as a managed agent (callable like a tool).
+    """
+
+    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"),
+    )
+
+    critic_agent = ToolCallingAgent(
+        tools=[],  # critic needs no tools; it just returns JSON text
+        model=model,
+        name="critic_agent",
+        description="Evaluates drafts against constraints and returns a compact JSON report.",
+        instructions=CRITIC_INSTRUCTIONS,
+        add_base_tools=False,
+        max_steps=crt_max_steps,
+    )
+
+    generator = CodeAgent(
+        tools=[],  # keep toolbox minimal
+        model=model,
+        name="generator_with_managed_critic",
+        managed_agents=[critic_agent],  # <-- critic attached here
+        instructions=GENERATOR_INSTRUCTIONS,
+        add_base_tools=False,
+        max_steps=gen_max_steps,
+    )
+    return generator

agents/json_tool_calling_agents.py

@@ -7,7 +7,7 @@ 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.
+    Create a JSON tool-calling agent with specified tools.
     """
     if tools is None:
         tools = []
@@ -27,14 +27,7 @@ def generate_tool_calling_agent_with_tools(
     )
 
 
-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():
+def generate_tool_calling_agent_with_search_and_code():
     """
     Create a code-writing agent without any extra tools.
     """

proxy.py

@@ -25,10 +25,11 @@ from agents.code_writing_agents import (
 )
 
 from agents.json_tool_calling_agents import (
-    generate_code_writing_agent_with_search_and_code,
-    generate_self_critiquing_agent,
+    generate_tool_calling_agent_with_search_and_code,
 )
 
+from agents.generator_and_critic import generate_generator_with_managed_critic
+
 # Logging setup
 logging.basicConfig(level=os.getenv("LOG_LEVEL", "INFO").upper())
 log = logging.getLogger(__name__)
@@ -620,7 +621,7 @@ async def list_models():
         "object": "list",
         "data": [
             {
-                "id": "self-critiquing-agent",
+                "id": "generator-with-managed-critic",
                 "object": "model",
                 "created": now,
                 "owned_by": "you",
@@ -717,11 +718,9 @@ async def chat_completions(req: fastapi.Request):
         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()
+            agent_for_request = generate_tool_calling_agent_with_search_and_code()
+        elif model_name == "generator-with-managed-critic":
+            agent_for_request = generate_generator_with_managed_critic()
         else:
             # Emit error for unknown model
             return fastapi.responses.JSONResponse(