Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
Fix library deploy problems [WIP]
Tomas Valentafc13ccf6acfa
diff --git a/api-client/AgentConnection.ts b/api-client/AgentConnection.tsindex 90895c0ff..21c85835f 100644--- a/api-client/AgentConnection.ts+++ b/api-client/AgentConnection.ts@@ -29,7 +29,6 @@ export interface Opts {export class AgentConnection {private readonly rpc = new RpcWebSocketClient()- runID?: stringconstructor(private readonly url: string, private readonly opts: Opts) {this.rpc.onNotification.push(this.handleNotification.bind(this))@@ -63,17 +62,15 @@ export class AgentConnection {}async start(projectID: string, modelConfig: ModelConfig) {- const { run_id } = await this.rpc.call('start', {+ await this.rpc.call('start', {'project_id': projectID,'model_config': modelConfig,- }) as { run_id: string }+ })- this.runID = run_idthis.opts.onStateChange(AgentRunState.Running)}private async interaction(type: string, data?: any) {- if (!this.runID) returnawait this.rpc.call('interaction', { type, data })}@@ -88,7 +85,6 @@ export class AgentConnection {}async cancelRun() {- if (!this.runID) returnawait this.rpc.call('stop')this.opts.onStateChange(AgentRunState.None)}diff --git a/api-service/agent/base.py b/api-service/agent/base.pyindex 27263f5e5..400238a4e 100644--- a/api-service/agent/base.py+++ b/api-service/agent/base.py@@ -1,5 +1,5 @@from abc import abstractmethod, ABC-from typing import Coroutine, Dict, Literal, Optional, Callable+from typing import Any, Coroutine, Dict, Literal, Optional, Callablefrom pydantic import BaseModel, Json@@ -44,12 +44,21 @@ class AgentInteractionRequest(BaseModel):data: DataType-class AgentConfig(BaseModel):- data: Optional[DataType] = None- on_log: Callable[[AgentLog], Coroutine[None, None, None]]- on_interaction_request: Callable[- [AgentInteractionRequest], Coroutine[None, None, None]- ]+class AgentConfig:+ def __init__(+ self,+ data: DataType,+ on_log: Callable[[AgentLog], Coroutine[None, None, None]],+ on_interaction_request: Callable[+ [AgentInteractionRequest], Coroutine[None, None, None]+ ],+ on_close: Callable[[], Coroutine[None, None, None]],+ ):+ self.data = data+ self.on_log = on_log+ self.data = data+ self.on_interaction_request = on_interaction_request+ self.on_close = on_closeclass AgentBase(ABC):diff --git a/api-service/agent/basic_agent.py b/api-service/agent/basic_agent.pyindex b7e527d15..1cd3aa83f 100644--- a/api-service/agent/basic_agent.py+++ b/api-service/agent/basic_agent.py@@ -1,5 +1,4 @@import asyncio-import uuidfrom abc import abstractmethodfrom typing import Any, Dict, List, Literal, cast@@ -24,7 +23,6 @@ from langchain.prompts.chat import (from langchain.agents.tools import InvalidToolfrom agent.tools.base import create_tools-from database.database import DeploymentStatefrom models.base import ModelConfig, PromptPart, get_modelfrom agent.base import AgentBase, AgentConfigfrom database import db@@ -117,20 +115,10 @@ class BasicAgent(AgentBase):async def _run(self,- run_id: str,project_id: str,model_config: ModelConfig,):- async def change_state(state: DeploymentState) -> None:- print(f"Run '{run_id}'", state.value, flush=True)- await db.upsert_deployment_state(- run_id=run_id,- project_id=project_id,- state=state,- )-playground = None- await change_state(DeploymentState.Generating)try:# -----# Initialize callback manager and handler for controlling token stream@@ -142,12 +130,7 @@ class BasicAgent(AgentBase):# Create tools# Create playground for code toolsplayground = NodeJSPlayground(get_envs=lambda: db.get_env_vars(project_id))- tools = list(- create_tools(- run_id=run_id,- playground=playground,- )- )+ tools = list(create_tools(playground=playground))self.tool_names = [tool.name for tool in tools]tool_map = {tool.name: tool for tool in tools}@@ -166,20 +149,12 @@ class BasicAgent(AgentBase):# -----# Create log handlers# Used for sending logs to db/frontend without blocking- ws_streamer = WorkQueue[List[Step]](- on_workload=lambda steps: self._notify("steps", {"steps": steps})- )- db_streamer = WorkQueue[List[Step]](- on_workload=lambda steps: db.upsert_deployment_steps(- run_id=self.run_id,- steps=steps,- project_id=project_id,- )+ steps_streamer = WorkQueue[List[Step]](+ on_workload=lambda steps: self.config.on_log({"logs": steps}))def stream_steps(steps: List[Step]):- db_streamer.schedule(steps)- ws_streamer.schedule(steps)+ steps_streamer.schedule(steps)# Used for parsing token stream into logs+actionsself._output_parser = OutputStreamParser(tool_names=self.tool_names)@@ -189,7 +164,6 @@ class BasicAgent(AgentBase):def get_agent_scratchpad():steps = self._output_parser.get_steps()- print("stps >><<", steps)if (len(steps) == 0or len(steps) == 1@@ -273,14 +247,12 @@ class BasicAgent(AgentBase):print("REWRITING")continue- await change_state(DeploymentState.Finished)except:- await change_state(DeploymentState.Error)raisefinally:if playground is not None:playground.close()- await self._close()+ await self.config.on_close()async def _check_interrupt(self):if self.canceled:@@ -294,26 +266,15 @@ class BasicAgent(AgentBase):self.rewriting_steps = Falseraise RewriteStepsException()- @abstractmethod- async def _notify(self, method: str, params: Dict[str, Any]):- pass-- @abstractmethod- async def _close():- pass-async def start(self, project_id: str, model_config: Dict[str, Any]):print("Start agent run")self.project_id = project_id- self.run_id = str(uuid.uuid4())asyncio.create_task(self._run(- run_id=self.run_id,project_id=project_id,model_config=ModelConfig(**model_config),))- return {"run_id": self.run_id}async def interaction(self, interaction: AgentInteraction):print("Agent interaction")@@ -340,7 +301,7 @@ class BasicAgent(AgentBase):self.canceled = Trueif self.llm_generation:self.llm_generation.cancel()- await self._close()+ await self.config.on_close()async def _rewrite_steps(self, steps: List[Step]):print("Rewrite agent run steps")diff --git a/api-service/agent/json_rpc_connector.py b/api-service/agent/json_rpc_connector.pyindex 193514ffa..e92130279 100644--- a/api-service/agent/json_rpc_connector.py+++ b/api-service/agent/json_rpc_connector.py@@ -78,15 +78,18 @@ class JsonRpcAgentConnector(BaseModel):await self.agent.stop()async def handle(self):+ async def handle_log(logs: )++self.agent = await self.agent_factory(AgentConfig(- on_log=lambda log: self._notify("log", {"log": log}),+ on_log=lambda project_id, log: self._notify("log", {"log": log}),on_interaction_request=lambda request: self._notify("interaction_request", {"request": request}),+ on_close=lambda: self.close,))- print("agenr", self.agent)async for data in self.iter_json():await self._call(diff --git a/api-service/agent/tools/base.py b/api-service/agent/tools/base.pyindex b72bbc596..875caf38a 100644--- a/api-service/agent/tools/base.py+++ b/api-service/agent/tools/base.py@@ -8,7 +8,6 @@ from .playground.tools.code import create_code_toolsdef create_tools(- run_id: str,playground: NodeJSPlayground,) -> Generator[BaseTool, None, None]:# Ensure that the function is a generator even if no tools are yielded@@ -28,5 +27,5 @@ def create_tools()yield from playground_tools- human_tools = create_human_tools(run_id, playground)+ human_tools = create_human_tools()yield from human_toolsdiff --git a/api-service/agent/tools/human/tools.py b/api-service/agent/tools/human/tools.pyindex db621ae3e..926585647 100644--- a/api-service/agent/tools/human/tools.py+++ b/api-service/agent/tools/human/tools.py@@ -2,19 +2,15 @@ from collections.abc import Generatorfrom typing import Anyfrom agent.tools.async_tool import async_tool-from playground_client.models.tools_log_output import ToolsLogOutputfrom session.playground.base import Playground-def create_human_tools(- run_id: str,- playground: Playground,-) -> Generator[Any, None, None]:+def create_human_tools() -> Generator[Any, None, None]:# Ensure that the function is a generator even if no tools are yieldedyield from ()@async_tool("LetHumanChoose")- async def let_human_choose(options: str) -> str:+ async def let_human_choose(options: str):"""Let a human choose from one of the options. Sometimes there might be multiple viable paths forward. For example, when the human did not specify implementation details like a third party service, library, or an algorithm.Instead of you choosing the path forward, use this tool to present up to 5 best options forward for the human to choose from.The input should be a question for the human and possible options. Provide a 1-3 sentence long summary for each option. Example usage:@@ -28,25 +24,15 @@ def create_human_tools(print(options)print("--- OPTIONS")- thread: Any = playground.api.wait_for_log_output(- run_id=run_id,- async_req=True,- )-- response: ToolsLogOutput = thread.get()- return response.response+ # TODO: Handle ask human via the WS/interaction request API+ pass# yield let_human_choose@async_tool("AskHuman")- async def ask_human(question: str) -> str:+ async def ask_human(question: str):"""You can ask a human for guidance when you think you got stuck or you are not sure what to do next. The input should be a question."""- thread: Any = playground.api.wait_for_log_output(- run_id=run_id,- async_req=True,- )-- response: ToolsLogOutput = thread.get()- return response.response+ # TODO: Handle ask human via the WS/interaction request API+ pass# yield ask_humandiff --git a/api-service/app.py b/api-service/app.pyindex b3c84bf01..49b810817 100644--- a/api-service/app.py+++ b/api-service/app.py@@ -38,18 +38,21 @@ async def ws_agent_run(websocket: WebSocket):await connector.close()[email protected]("/agent")-async def create_agent(body: AgentConfig):- deployment = await deployment_manager.create_deployment(body)[email protected]("/deployment")+async def create_agent_deployment(body: AgentConfig, project_id: str):+ deployment = await deployment_manager.create_deployment(+ body,+ project_id=project_id,+ )return {"id": deployment.id}-class AgentStatusBody(BaseModel):+class AgentDeploymentStatusBody(BaseModel):status: Literal["running", "stopped"][email protected]("/agent/{id}/status")-async def change_agent_status(id: str, body: AgentStatusBody):[email protected]("/deployment/{id}/status")+async def change_agent_deployment_status(id: str, body: AgentDeploymentStatusBody):deployment = await deployment_manager.get_deployment(id)if body.status == "running":await deployment.start()@@ -57,14 +60,14 @@ async def change_agent_status(id: str, body: AgentStatusBody):await deployment.stop()[email protected]("/agent/{id}/interaction")-async def interact_with_agent(id: str, body: AgentInteraction):[email protected]("/deployment/{id}/interaction")+async def interact_with_agent_deployment(id: str, body: AgentInteraction):deployment = await deployment_manager.get_deployment(id)result = await deployment.agent.interaction(body)return result[email protected]("/agent/{id}/status")-async def get_agent_status(id: str):[email protected]("/deployment/{id}/status")+async def get_agent__deployment_status(id: str):deployment = await deployment_manager.get_deployment(id)return {"status": deployment.status}diff --git a/api-service/database/database.py b/api-service/database/database.pyindex 7ba0d3d20..abc8a9f0b 100644--- a/api-service/database/database.py+++ b/api-service/database/database.py@@ -1,19 +1,9 @@-from typing import List-from enum import Enum+from typing import Any, Dict, Listfrom agent.output.output_stream_parser import Step-from agent.output.parse_output import ThoughtLog, ToolLogfrom database.client import Clientfrom session.env import EnvVar--class DeploymentState(Enum):- Generating = "generating"- Deploying = "deploying"- Finished = "finished"- Error = "error"--TABLE_DEPLOYMENTS = "deployments"TABLE_PROJECTS = "projects"@@ -22,50 +12,39 @@ class Database:def __init__(self, supabase_url: str, supabase_key: str) -> None:self.client = Client(supabase_url=supabase_url, supabase_key=supabase_key)- async def push_logs(self, run_id: str, logs: list[ToolLog | ThoughtLog]) -> None:- if len(logs) > 0:- await self.client.table(TABLE_DEPLOYMENTS).update(- {- "logs": logs,- }- ).eq("id", run_id).execute()-- async def push_raw_logs(self, run_id: str, logs_raw: str) -> None:- if logs_raw:- await self.client.table(TABLE_DEPLOYMENTS).update(- {- "logs_raw": logs_raw,- }- ).eq("id", run_id).execute()-- async def upsert_deployment_steps(+ async def upsert_deployment(self,- run_id: str,- project_id: str,- steps: List[Step],+ id: str,+ project_id: str | None = None,+ logs: List[Step] | None = None,) -> None:+ update: Dict[str, Any] = {+ "id": id,+ }++ if project_id:+ update["project_id"] = project_id++ if logs:+ update["logs"] = logs+await self.client.table(TABLE_DEPLOYMENTS).upsert(- {- "id": run_id,- "logs": steps,- "project_id": project_id,- },+ update,on_conflict="id",).execute()- async def upsert_deployment_state(+ async def update_project_developent_logs(self,- run_id: str,- project_id: str,- state: DeploymentState,+ id: str,+ logs: List[Step],) -> None:- await self.client.table(TABLE_DEPLOYMENTS).upsert(+ await self.client.table(TABLE_PROJECTS).update({- "id": run_id,- "state": state.value,- "project_id": project_id,- },- on_conflict="id",+ "development_logs": logs,+ }+ ).eq(+ "id",+ id,).execute()async def get_env_vars(self, project_id: str) -> List[EnvVar]:diff --git a/api-service/deployment/in_memory.py b/api-service/deployment/in_memory.pyindex 6bf4a5c54..c3488bcf9 100644--- a/api-service/deployment/in_memory.py+++ b/api-service/deployment/in_memory.py@@ -1,9 +1,10 @@+from re import DEBUGimport uuidfrom typing import Callable, Coroutine, Dict-from pydantic import PrivateAttr+from database.base import dbfrom deployment.manager import AgentDeploymentManager, AgentDeploymentfrom agent.base import AgentBase, AgentConfig@@ -12,19 +13,24 @@ class InMemoryDeploymentManager(AgentDeploymentManager):agent_factory: Callable[[AgentConfig], Coroutine[None, None, AgentBase]]_deployments: Dict[str, AgentDeployment] = PrivateAttr(default={})- async def create_deployment(self, config: AgentConfig):+ async def create_deployment(+ self,+ config: AgentConfig,+ project_id: str,+ ):agent = await self.agent_factory(config)deployment = AgentDeployment(id=str(uuid.uuid4()),agent=agent,)+ await db.upsert_deployment(deployment.id, project_id)+self._deployments[deployment.id] = deployment+return deploymentasync def remove_deployment(self, id: str):deployment = await self.get_deployment(id)- if deployment is None:- returnawait deployment.agent.stop()del self._deployments[deployment.id]diff --git a/api-service/deployment/manager.py b/api-service/deployment/manager.pyindex a488b8813..104a3938a 100644--- a/api-service/deployment/manager.py+++ b/api-service/deployment/manager.py@@ -34,7 +34,7 @@ class AgentDeploymentManager(BaseModel):"""@abstractmethod- async def create_deployment(self, config: AgentConfig) -> AgentDeployment:+ async def create_deployment(self, config: AgentConfig, **kwargs) -> AgentDeployment:pass@abstractmethoddiff --git a/api-service/poetry.lock b/api-service/poetry.lockindex 22ca61ce4..b64b68cb3 100644--- a/api-service/poetry.lock+++ b/api-service/poetry.lock@@ -1283,6 +1283,20 @@ files = [{file = "priority-2.0.0.tar.gz", hash = "sha256:c965d54f1b8d0d0b19479db3924c7c36cf672dbf2aec92d43fbdaf4492ba18c0"},]+[[package]]+name = "pybars3"+version = "0.9.7"+description = "Handlebars.js templating for Python 3 and 2"+category = "main"+optional = false+python-versions = "*"+files = [+ {file = "pybars3-0.9.7.tar.gz", hash = "sha256:6ac847e905e53b9c5b936af112c910475e27bf767f79f4528c16f9af1ec0e252"},+]++[package.dependencies]+PyMeta3 = ">=0.5.1"+[[package]]name = "pydantic"version = "1.10.7"@@ -1336,6 +1350,17 @@ typing-extensions = ">=4.2.0"dotenv = ["python-dotenv (>=0.10.4)"]email = ["email-validator (>=1.0.3)"]+[[package]]+name = "pymeta3"+version = "0.5.1"+description = "Pattern-matching language based on OMeta for Python 3 and 2"+category = "main"+optional = false+python-versions = "*"+files = [+ {file = "PyMeta3-0.5.1.tar.gz", hash = "sha256:18bda326d9a9bbf587bfc0ee0bc96864964d78b067288bcf55d4d98681d05bcb"},+]+[[package]]name = "pytest"version = "7.3.1"@@ -2100,4 +2125,4 @@ multidict = ">=4.0"[metadata]lock-version = "2.0"python-versions = ">=3.10,<4.0"-content-hash = "8100077e4dde43817d31746c514de965d5bc31ff8a297d64c61519edd03b197b"+content-hash = "dae29ad8349fd512858c5f27e2de61b03415a7a560d32f610824ed54e453f3b2"diff --git a/api-service/pyproject.toml b/api-service/pyproject.tomlindex e96d95a59..d455b49d7 100644--- a/api-service/pyproject.toml+++ b/api-service/pyproject.toml@@ -20,6 +20,7 @@ anthropic = "^0.2.6"langchain = "^0.0.141"banana-dev = "4.0.2"fastapi = "^0.95.1"+pybars3 = "^0.9.7"[tool.poetry.group.dev]optional = true