Skip to content

armgit / E2B

Public Imported from GitHub
0

Open-source, secure environment with real-world tools for enterprise-grade agents.

Fix API problems; Add agent deployment on frontend [WIP]

Tomas Valenta2d5a8d864bde
diff --git a/api-client/api/schema.gen.ts b/api-client/api/schema.gen.ts
index 2314a6be0..a7679f7a9 100644
--- a/api-client/api/schema.gen.ts
+++ b/api-client/api/schema.gen.ts
@@ -9,7 +9,7 @@ export interface paths {
/** List Deployments */
get: operations["list_deployments_deployments_get"];
/** Create Agent Deployment */
- post: operations["create_agent_deployment_deployments_post"];
+ put: operations["create_agent_deployment_deployments_put"];
};
"/deployments/{id}": {
/** Delete Agent Deployment */
@@ -85,7 +85,7 @@ export interface operations {
};
};
/** Create Agent Deployment */
- create_agent_deployment_deployments_post: {
+ create_agent_deployment_deployments_put: {
parameters: {
query: {
project_id: string;
@@ -120,11 +120,7 @@ export interface operations {
};
responses: {
/** @description Successful Response */
- 200: {
- content: {
- "application/json": Record<string, never>;
- };
- };
+ 204: never;
/** @description Validation Error */
422: {
content: {
diff --git a/api-service/agent/base.py b/api-service/agent/base.py
index efbb0943b..43592d354 100644
--- a/api-service/agent/base.py
+++ b/api-service/agent/base.py
@@ -64,8 +64,5 @@ class AgentBase(ABC):
pass
@abstractmethod
- async def interaction(
- self,
- interaction: AgentInteraction,
- ) -> Any:
+ async def interaction(self, interaction: AgentInteraction) -> Any:
pass
diff --git a/api-service/agent/basic_agent.py b/api-service/agent/basic_agent.py
index 6bdc83ca3..0b79e7cf0 100644
--- a/api-service/agent/basic_agent.py
+++ b/api-service/agent/basic_agent.py
@@ -147,10 +147,7 @@ class BasicAgent(AgentBase):
messages=messages,
)
- async def _run(
- self,
- instructions: Any,
- ):
+ async def _run(self, instructions: Any):
playground = None
try:
# -----
diff --git a/api-service/agent/json_rpc.py b/api-service/agent/json_rpc.py
index 0576b3681..f66a0d523 100644
--- a/api-service/agent/json_rpc.py
+++ b/api-service/agent/json_rpc.py
@@ -68,7 +68,7 @@ class JsonRpcAgent:
)
)
return {"result": result}
- case default:
+ case _:
raise Exception(f"Method {method} not found")
except Exception as e:
print(f"Error calling {method} via JSONRPC", e)
diff --git a/api-service/app.py b/api-service/app.py
index 78c5ba1eb..ba58623cf 100644
--- a/api-service/app.py
+++ b/api-service/app.py
@@ -1,8 +1,9 @@
+import uuid
+
from typing import Any
from fastapi import FastAPI, WebSocket
from fastapi.middleware.cors import CORSMiddleware
from contextlib import asynccontextmanager
-
from pydantic import BaseModel
from agent.base import AgentInteraction
@@ -11,16 +12,6 @@ from agent.json_rpc import JsonRpcAgent
from agent.basic_agent import BasicAgent
from database.base import db
-# TODO: Fix proxying - https://fastapi.tiangolo.com/advanced/behind-a-proxy/
-app = FastAPI(title="e2b-api")
-app.add_middleware(
- CORSMiddleware,
- allow_origins=["*"],
- allow_credentials=True,
- allow_methods=["*"],
- allow_headers=["*"],
-)
-
deployment_manager = InMemoryDeploymentManager(agent_factory=BasicAgent.create)
@@ -29,13 +20,27 @@ async def lifespan(app: FastAPI):
deployments = await db.get_deployments()
for deployment in deployments:
if deployment["enabled"]:
- await deployment_manager.create_deployment(
- deployment["config"],
- project_id=deployment["project_id"],
- )
+ if deployment.get("config", None) and deployment.get("project_id", None):
+ print("Restarting deployment", deployment["id"])
+ await deployment_manager.create_deployment(
+ deployment["id"],
+ deployment["project_id"],
+ deployment["config"],
+ )
yield
+# TODO: Fix proxying - https://fastapi.tiangolo.com/advanced/behind-a-proxy/
+app = FastAPI(title="e2b-api", lifespan=lifespan)
+app.add_middleware(
+ CORSMiddleware,
+ allow_origins=["*"],
+ allow_credentials=True,
+ allow_methods=["*"],
+ allow_headers=["*"],
+)
+
+
@app.websocket("/dev/agent")
async def ws_agent_run(websocket: WebSocket, project_id: str):
await websocket.accept()
@@ -60,22 +65,34 @@ class CreateDeploymentBody(BaseModel):
@app.get("/deployments")
async def list_deployments():
deployments = await deployment_manager.list_deployments()
- return {"deployments": deployments}
+ return {"deployments": [{"id": deployment.id} for deployment in deployments]}
[email protected]("/deployments")
[email protected]("/deployments")
async def create_agent_deployment(body: CreateDeploymentBody, project_id: str):
- deployment = await deployment_manager.create_deployment(
- body.config,
- project_id,
- )
- return {"id": deployment.id}
+ db_deployment = await db.get_deployment(project_id)
+
+ print("test", db_deployment)
+ if db_deployment:
+ deployment = await deployment_manager.update_deployment(
+ db_deployment["id"],
+ project_id,
+ body.config,
+ )
+ return {"id": deployment.id}
+ else:
+ id = str(uuid.uuid4())
+ deployment = await deployment_manager.create_deployment(
+ id,
+ project_id,
+ body.config,
+ )
+ return {"id": deployment.id}
[email protected]("/deployments/{id}")
[email protected]("/deployments/{id}", status_code=204)
async def delete_agent_deployment(id: str):
await deployment_manager.remove_deployment(id)
- return {}
@app.post("/deployments/{id}/interactions")
@@ -84,10 +101,7 @@ async def interact_with_agent_deployment(id: str, body: AgentInteraction):
result = await deployment.agent.interaction(body)
if body.interaction_id:
- deployment.event_handler.remove_interaction_request(
- body.interaction_id,
- )
-
+ deployment.event_handler.remove_interaction_request(body.interaction_id)
return result
diff --git a/api-service/database/database.py b/api-service/database/database.py
index 2ff6c1fb0..49c3da448 100644
--- a/api-service/database/database.py
+++ b/api-service/database/database.py
@@ -1,6 +1,6 @@
-from typing import Any, Dict, List
-from agent.output.output_stream_parser import Step
+from typing import Any, List
+from agent.output.output_stream_parser import Step
from database.client import Client
from session.env import EnvVar
@@ -12,6 +12,17 @@ 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 get_deployment(self, project_id: str):
+ response = (
+ await self.client.table(TABLE_DEPLOYMENTS)
+ .select("*")
+ .eq("project_id", project_id)
+ .limit(1)
+ .maybe_single()
+ .execute()
+ )
+ return response.data
+
async def get_deployments(self):
response = (
await self.client.table(TABLE_DEPLOYMENTS)
@@ -21,26 +32,40 @@ class Database:
)
return response.data
- async def upsert_deployment(
+ async def update_deployment_logs(
self,
id: str,
- project_id: str | None = None,
- logs: List[Step] | None = None,
- enabled: bool | None = True,
- ) -> None:
- update: Dict[str, Any] = {
- "id": id,
- "enabled": enabled,
- }
-
- if project_id:
- update["project_id"] = project_id
+ logs: List[Step],
+ ):
+ await self.client.table(TABLE_DEPLOYMENTS).update(
+ {
+ "logs": logs,
+ }
+ ).eq("id", id).execute()
- if logs:
- update["logs"] = logs
+ async def update_deployment(self, id: str, enabled: bool) -> None:
+ await self.client.table(TABLE_DEPLOYMENTS).update(
+ {
+ "enabled": enabled,
+ }
+ ).eq(
+ "id",
+ id,
+ ).execute()
+ async def create_deployment(
+ self,
+ id: str,
+ project_id: str,
+ config: Any,
+ ) -> None:
await self.client.table(TABLE_DEPLOYMENTS).upsert(
- update,
+ {
+ "id": id,
+ "enabled": True,
+ "project_id": project_id,
+ "config": config,
+ },
on_conflict="id",
).execute()
diff --git a/api-service/deployment/in_memory.py b/api-service/deployment/in_memory.py
index f0a474bd2..56991c3d1 100644
--- a/api-service/deployment/in_memory.py
+++ b/api-service/deployment/in_memory.py
@@ -4,26 +4,27 @@ from database.base import db
from deployment.manager import AgentDeploymentManager, AgentDeployment, AgentFactory
+# TODO: Interemediate step between implementing the FC agent deployment
+# can be improving the in-memory deployment manager to use the processes instead of threads.
class InMemoryDeploymentManager(AgentDeploymentManager):
- def __init__(
- self,
- agent_factory: AgentFactory,
- ):
+ def __init__(self, agent_factory: AgentFactory):
self._agent_factory = agent_factory
self._deployments: Dict[str, AgentDeployment] = {}
async def create_deployment(
self,
- config: Any,
+ id: str,
project_id: str,
+ config: Any,
):
deployment = await AgentDeployment.from_factory(
+ id,
self._agent_factory,
project_id,
config,
)
try:
- await db.upsert_deployment(deployment.id, project_id)
+ await db.create_deployment(deployment.id, project_id, config)
except:
await deployment.agent.stop()
raise
@@ -31,10 +32,23 @@ class InMemoryDeploymentManager(AgentDeploymentManager):
self._deployments[deployment.id] = deployment
return deployment
+ async def update_deployment(
+ self,
+ id: str,
+ project_id: str,
+ config: Any,
+ ):
+ try:
+ await self.remove_deployment(id)
+ except:
+ print("Failed to remove deployment", id)
+ pass
+ return await self.create_deployment(id, project_id, config)
+
async def remove_deployment(self, id: str):
deployment = await self.get_deployment(id)
await deployment.agent.stop()
- await db.upsert_deployment(deployment.id, enabled=False)
+ await db.update_deployment(deployment.id, enabled=False)
del self._deployments[deployment.id]
async def get_deployment(self, id: str):
diff --git a/api-service/deployment/manager.py b/api-service/deployment/manager.py
index fc548c3e0..78038caf7 100644
--- a/api-service/deployment/manager.py
+++ b/api-service/deployment/manager.py
@@ -1,5 +1,3 @@
-import uuid
-
from typing import Any, Callable, Coroutine, List
from abc import abstractmethod, ABC
@@ -19,12 +17,14 @@ AgentFactory = Callable[
class AgentEvents:
- def __init__(self) -> None:
+ def __init__(self, id: str) -> None:
+ self.id = id
self.logs: List[Any] = []
self.interaction_requests: List[AgentInteractionRequest] = []
async def overwrite_logs(self, logs: List[Any]):
self.logs = logs
+ await db.update_deployment_logs(self.id, logs)
async def add_interaction_request(
self, interaction_request: AgentInteractionRequest
@@ -40,21 +40,27 @@ class AgentEvents:
class AgentDeployment:
- def __init__(self, agent: AgentBase, event_handler: AgentEvents):
- self.id = str(uuid.uuid4())
+ def __init__(self, id, agent: AgentBase, event_handler: AgentEvents):
+ self.id = id
self.agent = agent
self.event_handler = event_handler
@classmethod
- async def from_factory(cls, factory: AgentFactory, project_id: str, config: Any):
- event_handler = AgentEvents()
+ async def from_factory(
+ cls,
+ deployment_id: str,
+ factory: AgentFactory,
+ project_id: str,
+ config: Any,
+ ):
+ event_handler = AgentEvents(deployment_id)
agent = await factory(
config,
lambda: db.get_env_vars(project_id),
event_handler.overwrite_logs,
event_handler.add_interaction_request,
)
- return cls(agent, event_handler)
+ return cls(deployment_id, agent, event_handler)
class AgentDeploymentManager(ABC):
@@ -84,3 +90,12 @@ class AgentDeploymentManager(ABC):
@abstractmethod
async def list_deployments(self) -> List[AgentDeployment]:
pass
+
+ @abstractmethod
+ async def update_deployment(
+ self,
+ id: str,
+ config: Any,
+ **kwargs,
+ ) -> AgentDeployment:
+ pass
diff --git a/api-service/openapi.json b/api-service/openapi.json
index 402438f37..edce96100 100644
--- a/api-service/openapi.json
+++ b/api-service/openapi.json
@@ -20,9 +20,9 @@
}
}
},
- "post": {
+ "put": {
"summary": "Create Agent Deployment",
- "operationId": "create_agent_deployment_deployments_post",
+ "operationId": "create_agent_deployment_deployments_put",
"parameters": [
{
"required": true,
@@ -82,13 +82,8 @@
}
],
"responses": {
- "200": {
- "description": "Successful Response",
- "content": {
- "application/json": {
- "schema": {}
- }
- }
+ "204": {
+ "description": "Successful Response"
},
"422": {
"description": "Validation Error",
diff --git a/api-service/session/playground/base.py b/api-service/session/playground/base.py
index f582eab90..94c605d8f 100644
--- a/api-service/session/playground/base.py
+++ b/api-service/session/playground/base.py
@@ -1,6 +1,7 @@
-import time
import math
+
from typing import Any
+from asyncio import sleep
from playground_client.models.list_filesystem_dir_response import (
ListFilesystemDirResponse,
@@ -73,7 +74,7 @@ class Playground(Session):
if response.finished:
return response
- time.sleep(1 / self.run_command_timeout_frequency)
+ await sleep(1 / self.run_command_timeout_frequency)
if not response.finished:
thread: Any = self.api.stop_process(
@@ -163,7 +164,7 @@ class Playground(Session):
for _ in range(self.max_port_checks):
if await self.is_port_open(port):
break
- time.sleep(self.port_check_interval)
+ await sleep(self.port_check_interval)
request_result = await self.run_command(cmd=request_cmd, rootdir=rootdir)
server_result = await self.stop_process(server_process_id)
diff --git a/api-service/start.sh b/api-service/start.sh
index e7bebd93e..0411d6565 100755
--- a/api-service/start.sh
+++ b/api-service/start.sh
@@ -4,7 +4,7 @@
cd /playground && exec node lib/server.js &
# Start python app
-cd /app && exec poetry run gunicorn --bind 0.0.0.0:$PORT --workers 1 --threads 8 --timeout 0 app:app -k uvicorn.workers.UvicornWorker &
+cd /app && exec poetry run gunicorn --bind 0.0.0.0:$PORT --workers 1 --threads 12 --timeout 0 app:app -k uvicorn.workers.UvicornWorker &
# Wait for any process to exit
wait -n
diff --git a/components/Editor/Sidebar/Deploy.tsx b/components/Editor/Sidebar/Deploy.tsx
new file mode 100644
index 000000000..f595bbe63
--- /dev/null
+++ b/components/Editor/Sidebar/Deploy.tsx
@@ -0,0 +1,88 @@
+import { memo } from 'react'
+
+import api from 'api-client/api'
+import Text from 'components/Text'
+import { projects } from 'db/prisma'
+import { useStateStore } from 'state/StoreProvider'
+import { evaluatePrompt } from 'state/prompt'
+import useModelProviderArgs from 'hooks/useModelProviderArgs'
+import { getModelArgs } from 'state/model'
+
+
+const createDeployment = api.path('/deployments').method('put').create({
+ project_id: true,
+})
+
+export interface Props {
+ project: projects
+}
+
+function Deploy({ project }: Props) {
+ const [selectors] = useStateStore()
+ const modelConfig = selectors.use.getSelectedModelConfig()()
+
+ const [creds] = useModelProviderArgs()
+
+ async function deployAgent() {
+ if (!modelConfig) {
+ console.error('Cannot get model config')
+ return
+ }
+ const {
+ references: promptReferences,
+ prompt: evaluatedPrompt,
+ } = evaluatePrompt(modelConfig.prompt)
+
+ createDeployment({
+ // TODO: Add current envs vars and save them on backend
+ project_id: project.id,
+ config: {
+ name: modelConfig.name,
+ provider: modelConfig.provider,
+ args: getModelArgs(modelConfig, creds) as any,
+ prompt: evaluatedPrompt,
+ // TODO: Handle prompt references
+ prompt_references: promptReferences,
+ } as any,
+ })
+ }
+
+ return (
+ <div className="
+ flex
+ flex-col
+ ">
+ <div className="
+ flex
+ bg-slate-50
+ items-center
+ justify-between
+ border-b
+ py-3.5
+ pr-4
+ ">
+ <Text
+ text="Deploy"
+ size={Text.size.S2}
+ className="
+ uppercase
+ text-slate-400
+ font-semibold
+ px-4
+ "
+ />
+ </div>
+ <div className="
+ flex
+ flex-col
+ p-4
+ space-y-4
+ "
+ >
+
+ </div>
+ </div>
+ )
+}
+
+export default memo(Deploy)
diff --git a/components/Editor/Sidebar/index.tsx b/components/Editor/Sidebar/index.tsx
index b84df1733..0f9d9153e 100644
--- a/components/Editor/Sidebar/index.tsx
+++ b/components/Editor/Sidebar/index.tsx
@@ -4,7 +4,6 @@ import { projects } from '@prisma/client'
import { useStateStore } from 'state/StoreProvider'
import { getModelArgs } from 'state/model'
import useModelProviderArgs from 'hooks/useModelProviderArgs'
-import { evaluatePrompt } from 'state/prompt'
import { Step } from 'api-client/AgentConnection'
import useAgent from 'hooks/useAgent'
@@ -13,6 +12,8 @@ import Envs from './Envs'
import Model from './Model'
import Prompt from './Prompt'
import { MenuSection } from '../SidebarMenu'
+import Deploy from './Deploy'
+import { evaluateInstructions, evaluatePrompt } from 'state/prompt'
export interface Props {
@@ -46,22 +47,32 @@ function Sidebar({
}
const {
- instructions: transformedInstructions,
- prompt,
- } = evaluatePrompt(
+ references: promptReferences,
+ prompt: evaluatedPrompt,
+ } = evaluatePrompt(modelConfig.prompt)
+ const {
+ references: instructionsReferences,
+ instructions: evaluatedInstructions,
+ } = evaluateInstructions(
instructions,
instructionsTransform,
- modelConfig.prompt,
)
+
await run(
{
name: modelConfig.name,
provider: modelConfig.provider,
args: getModelArgs(modelConfig, creds) as any,
- prompt,
+ prompt: evaluatedPrompt
+ },
+ {
+ References: [
+ ...promptReferences,
+ ...instructionsReferences,
+ ],
+ ...evaluatedInstructions
},
- transformedInstructions
)
}
@@ -82,6 +93,9 @@ function Sidebar({
{activeMenuSection === MenuSection.Model &&
<Model />
}
+ {activeMenuSection === MenuSection.Deploy &&
+ <Deploy project={project} />
+ }
{activeMenuSection === MenuSection.Prompt &&
<Prompt />
}
diff --git a/components/Editor/SidebarMenu.tsx b/components/Editor/SidebarMenu.tsx
index 891736dba..54314aa28 100644
--- a/components/Editor/SidebarMenu.tsx
+++ b/components/Editor/SidebarMenu.tsx
@@ -1,11 +1,12 @@
import clsx from 'clsx'
-import { Code, Lock, Cpu, WholeWord } from 'lucide-react'
+import { Code, Lock, Cpu, WholeWord, Server } from 'lucide-react'
export enum MenuSection {
Agent = 'Agent',
Envs = 'Envs',
Model = 'Model',
Prompt = 'Prompt',
+ Deploy = 'Deploy',
}
const menuIconSize = '18px'
@@ -20,6 +21,8 @@ function getMenuSelectionIcon(selection: MenuSection) {
return <Lock size={menuIconSize} />
case MenuSection.Model:
return <Cpu size={menuIconSize} />
+ case MenuSection.Deploy:
+ return <Server size={menuIconSize} />
}
}
diff --git a/package.json b/package.json
index aa4db807a..8e9c79ae3 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,7 @@
"lint:fix": "next lint --fix",
"db:generate": "prisma generate",
"db:pull": "prisma db pull",
- "supabase:dump": "supabase db dump -f supabase/migrations/1680452567_name.sql",
+ "supabase:dump": "npx --yes [email protected] db dump -f supabase/migrations/1680452567_name.sql",
"supabase:generate": "supabase gen types typescript --project-id \"ntjfcwpzsxugrykskdgi\" --schema public > db/supabase.ts",
"postinstall": "npm run db:generate",
"db:start": "npx --yes supabase start -x imgproxy,storage-api,studio,inbucket,edge-runtime,logflare,postgres-meta,deno-relay,pgadmin-schema-diff,vector,migra",
diff --git a/state/prompt.ts b/state/prompt.ts
index d543c98f0..8faca71fe 100644
--- a/state/prompt.ts
+++ b/state/prompt.ts
@@ -27,11 +27,12 @@ export interface PromptFragment {
content: string
}
-export function evaluatePrompt(
+
+export function evaluateInstructions(
instructions: Instructions,
instructionsTransform: InstructionsTransform,
- prompt: PromptFragment[],
) {
+
const references: Reference[] = []
const instructionsView = transformInstructions(
@@ -43,6 +44,17 @@ export function evaluatePrompt(
return markdown
})
+ return {
+ references,
+ instructions: instructionsView,
+ }
+}
+
+export function evaluatePrompt(
+ prompt: PromptFragment[],
+) {
+ const references: Reference[] = []
+
const textualPrompt = prompt
.map(p => {
const [markdown, references] = html2markdown(p.content)
@@ -52,27 +64,9 @@ export function evaluatePrompt(
content: markdown,
}
})
- // .map(p => {
- // return {
- // ...p,
- // content: Mustache.render(p.content, {
- // // TODO: Use the references to build context
- // References: references,
- // ...instructionsView,
- // }, undefined, {
- // escape: identity,
- // }),
- // }
- // })
-
- console.log('Prompt:', textualPrompt)
- console.log('Instructions view:', instructionsView)
return {
prompt: textualPrompt,
- instructions: {
- ...instructionsView,
- References: references,
- }
+ references,
}
}