Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Filter actions with incomplete tool names; Cleanup
Tomas Valentaf599ff4c321b
diff --git a/api-service/app.py b/api-service/app.pyindex ea76c0ea8..aada94dcd 100644--- a/api-service/app.py+++ b/api-service/app.py@@ -64,8 +64,11 @@ async def generate():# Create a new instance of code generatorcg = Codegen.from_playground_and_database(- playground_tools=playground_tools,- human_tools=human_tools,+ # The order in which we pass tools HAS an effect on the LLM behaviour.+ custom_tools=[+ *playground_tools,+ *human_tools,+ ],database=db,)@@ -74,7 +77,6 @@ async def generate():await cg.generate(run_id=run_id,route=route,- envs=envs,method=method,blocks=blocks,)diff --git a/api-service/codegen/callbacks/log_parser.py b/api-service/codegen/callbacks/log_parser.pyindex c84668373..8324de303 100644--- a/api-service/codegen/callbacks/log_parser.py+++ b/api-service/codegen/callbacks/log_parser.py@@ -5,7 +5,6 @@ from typing import Dict, Listfrom codegen.agent.base import parse_action_string, separate_thought_and_action-class LogStreamParser:"""We receive a stream of tokens and want to parse this stream of tokens to thought and tool logs@@ -50,7 +49,9 @@ class LogStreamParser:and the buffered can be flushed to finished logs when we receive output for the last tool in the buffered logs."""- def __init__(self) -> None:+ def __init__(self, tool_names: List[str]) -> None:+ self._tool_names = tool_names+# All "finished" logs that the parser saved.self._logs: List[Dict[str, str]] = []@@ -78,7 +79,7 @@ class LogStreamParser:"tool_input": action.text or "",}for action in parse_action_string(action_string)- if action.attrib.get("tool", False)+ if action.attrib.get("tool", None) in self._tool_names]# Update tools' logs with the information from ingested tools' outputs.diff --git a/api-service/codegen/callbacks/logs.py b/api-service/codegen/callbacks/logs.pyindex 6f3720e16..d5a0322f5 100644--- a/api-service/codegen/callbacks/logs.py+++ b/api-service/codegen/callbacks/logs.py@@ -13,11 +13,11 @@ class LogsCallbackHandler(AsyncCallbackHandler):_run_id: str = PrivateAttr()_raw_logs: str = ""- def __init__(self, database: Database, run_id: str, **kwargs: Any):+ def __init__(self, database: Database, run_id: str, tool_names: List[str], **kwargs: Any):super().__init__(**kwargs)self._database = databaseself._run_id = run_id- self._parser = LogStreamParser()+ self._parser = LogStreamParser(tool_names=tool_names)self._log_queue = LogQueue()self._raw_log_queue = LogQueue()diff --git a/api-service/codegen/codegen.py b/api-service/codegen/codegen.pyindex efaa17601..7b79becf5 100644--- a/api-service/codegen/codegen.py+++ b/api-service/codegen/codegen.py@@ -82,11 +82,13 @@ class Codegen(BaseModel):callback_manager=self._callback_manager,)+ def tool_names(self):+ return [tool.name for tool in self._tools]+@classmethoddef from_playground_and_database(cls,- playground_tools: List[BaseTool],- human_tools: List[BaseTool],+ custom_tools: List[BaseTool],database: Database,):callback_manager = AsyncCallbackManager(@@ -96,23 +98,10 @@ class Codegen(BaseModel):])- # Assign custom callback manager to all playground tools- for tool in playground_tools:- tool.callback_manager = callback_manager-- # Assign custom callback manager to all human tools- for tool in human_tools:+ # Assign custom callback manager to custom tools+ for tool in custom_tools:tool.callback_manager = callback_manager- # Prepare tools for Codegen- tools = [- # InvalidTool(),- # OutputFinalCode(),- *playground_tools,- *human_tools,- # WriteCodeToFile(callback_manager=callback_manager),- # DeployCode(callback_manager=callback_manager),- ]# Create the LLMllm = ChatOpenAI(@@ -126,7 +115,7 @@ class Codegen(BaseModel):# Create CodegenAgentagent = CodegenAgent.from_llm_and_tools(llm=llm,- tools=tools,+ tools=custom_tools,prefix=SYSTEM_PREFIX,suffix=SYSTEM_SUFFIX,format_instructions=SYSTEM_FORMAT_INSTRUCTIONS,@@ -137,21 +126,20 @@ class Codegen(BaseModel):return cls(database=database,callback_manager=callback_manager,- tools=tools,+ tools=custom_tools,llm=llm,agent=agent,)async def generate(self,- envs: List[EnvVar],run_id: str,route: str,method: str,blocks: List[Dict],):self._callback_manager.add_handler(- LogsCallbackHandler(database=self._database, run_id=run_id)+ LogsCallbackHandler(database=self._database, run_id=run_id, tool_names=self.tool_names()))input_vars = {