Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Update env vars before calling tools

Tomas Valenta4fa2e06071b6
diff --git a/api-service/app.py b/api-service/app.py
index 74295e218..70b92fd60 100644
--- a/api-service/app.py
+++ b/api-service/app.py
@@ -1,16 +1,15 @@
import os
import uuid
-from codegen.tools.human.tools import create_human_tools
from dotenv import load_dotenv
from typing import List
from quart import Quart, request
from quart_cors import cors
-from session.env import EnvVar
from codegen import Codegen
from codegen.tools.playground import create_playground_tools
from database import Database, DeploymentState
+from codegen.tools.human.tools import create_human_tools
load_dotenv()
@@ -51,11 +50,11 @@ async def generate():
await db.create_deployment(run_id=run_id, project_id=project_id, route_id=route_id)
playground = None
+
try:
# Create playground for the LLM
- envs = await db.get_env_vars(project_id)
playground_tools, playground = create_playground_tools(
- envs=envs,
+ get_envs=lambda:db.get_env_vars(project_id),
route=route,
method=method,
request_body_template=get_request_body_template(blocks),
@@ -83,7 +82,7 @@ async def generate():
)
await db.update_state(run_id=run_id, state=DeploymentState.Deploying)
- url = playground.deploy(project_id, envs)
+ url = playground.deploy(project_id)
await db.finish_deployment(run_id=run_id, url=url)
return {}
diff --git a/api-service/codegen/tools/playground/main.py b/api-service/codegen/tools/playground/main.py
index 7f179ac75..a98905d7e 100644
--- a/api-service/codegen/tools/playground/main.py
+++ b/api-service/codegen/tools/playground/main.py
@@ -1,10 +1,9 @@
from typing import Any, List, Tuple
-
from langchain.tools import BaseTool
-from session.env import EnvVar
from session.playground.nodejs import NodeJSPlayground
from codegen.tools.playground.mock.request import MockRequestFactory
+from session.session import GetEnvs
from .tools.filesystem import create_filesystem_tools
from .tools.process import create_process_tools
@@ -12,12 +11,12 @@ from .tools.code import create_code_tools
def create_playground_tools(
- envs: List[EnvVar],
method: str,
route: str,
request_body_template: str | None,
+ get_envs: GetEnvs,
) -> Tuple[List[BaseTool], NodeJSPlayground]:
- playground = NodeJSPlayground(envs)
+ playground = NodeJSPlayground(get_envs)
mock = MockRequestFactory(
method=method,
diff --git a/api-service/codegen/tools/playground/tools/code.py b/api-service/codegen/tools/playground/tools/code.py
index 01c1c8c70..05daf10b2 100644
--- a/api-service/codegen/tools/playground/tools/code.py
+++ b/api-service/codegen/tools/playground/tools/code.py
@@ -39,6 +39,7 @@ def create_code_tools(playground: NodeJSPlayground, mock: MockRequestFactory, **
console.log('hello world')
</action>
```"""
+ await playground.update_envs()
nonlocal last_javascript_code
last_javascript_code = code
@@ -64,6 +65,8 @@ def create_code_tools(playground: NodeJSPlayground, mock: MockRequestFactory, **
# <action tool="CurlJavaScriptServer">
# </action>
# ```"""
+ await playground.update_envs()
+
nonlocal last_javascript_code
if last_javascript_code is None:
return "Cannot curl, you need to run code first"
diff --git a/api-service/codegen/tools/playground/tools/process.py b/api-service/codegen/tools/playground/tools/process.py
index 04bdbebba..1d09629e1 100644
--- a/api-service/codegen/tools/playground/tools/process.py
+++ b/api-service/codegen/tools/playground/tools/process.py
@@ -38,6 +38,7 @@ def create_process_tools(playground: NodeJSPlayground, **kwargs):
The input should be a a valid terminal command.
The returned result will be the output and errors returned when running the command.
"""
+ await playground.update_envs()
output = playground.run_command(command)
result = encode_command_output(output)
diff --git a/api-service/session/playground/base.py b/api-service/session/playground/base.py
index 7c44e4ce0..89abd370f 100644
--- a/api-service/session/playground/base.py
+++ b/api-service/session/playground/base.py
@@ -1,9 +1,7 @@
import time
import math
-from typing import List
-from session.env import EnvVar, format_env_vars
-from session.session import Session
+from session.session import GetEnvs, Session
from playground_client.models.create_mock_body_data_request import (
CreateMockBodyDataRequest,
)
@@ -21,9 +19,8 @@ class Playground(Session):
mock_data_filename = "index.ts"
- def __init__(self, env_id: str, envs: List[EnvVar]):
- super().__init__(env_id)
- self.env_vars = format_env_vars(envs)
+ def __init__(self, env_id: str, get_envs: GetEnvs):
+ super().__init__(env_id, get_envs)
def get_open_ports(self):
response = self.api.get_session(self.id)
@@ -42,6 +39,7 @@ class Playground(Session):
rootdir=rootdir,
timeout: float | None = None,
):
+ print("NEW ENV VARS", self.env_vars)
response = self.api.start_process(
self.id,
playground_client.StartProcessParams(
diff --git a/api-service/session/playground/nodejs.py b/api-service/session/playground/nodejs.py
index 81689c9ff..d9fecde9e 100644
--- a/api-service/session/playground/nodejs.py
+++ b/api-service/session/playground/nodejs.py
@@ -1,10 +1,7 @@
-import pprint
import os
-from typing import List
-
-from session.env import EnvVar
from session.playground import Playground
+from session.session import GetEnvs
class NodeJSPlayground(Playground):
@@ -13,8 +10,8 @@ class NodeJSPlayground(Playground):
default_javascript_code_file = os.path.join(rootdir, "index.mjs")
run_code_timeout = 3 # 3s
- def __init__(self, envs: List[EnvVar]):
- super().__init__(NodeJSPlayground.node_js_env_id, envs)
+ def __init__(self, get_envs: GetEnvs):
+ super().__init__(NodeJSPlayground.node_js_env_id, get_envs)
def run_javascript_code(self, code: str):
# print(f"Running javascript code...")
diff --git a/api-service/session/session.py b/api-service/session/session.py
index 732082a2d..f5dcbd6e2 100644
--- a/api-service/session/session.py
+++ b/api-service/session/session.py
@@ -1,4 +1,4 @@
-from typing import List
+from typing import Callable, Coroutine, List, Any
import playground_client
@@ -14,9 +14,10 @@ configuration.verify_ssl = False
configuration.ssl_ca_cert = None
configuration.cert_file = None
+GetEnvs = Callable[[], Coroutine[Any, Any, List[EnvVar]]]
class Session:
- def __init__(self, env_id: str):
+ def __init__(self, env_id: str, get_envs: GetEnvs):
self.client = playground_client.ApiClient(configuration)
self.api = playground_client.DefaultApi(self.client)
@@ -25,21 +26,31 @@ class Session:
)
self.id = result.id
self.is_closed = False
+ self.env_vars = {}
+ self.get_envs = get_envs
def __del__(self):
self.close()
+ async def update_envs(self):
+ """
+ Run this each time you want to ensure the envs vars for this class are up to date.
+ The self.env_vars are then used in for children methods like run_javascript_code, etc.
+ """
+ result = await self.get_envs()
+ self.env_vars = format_env_vars(result)
+
def close(self):
if not self.is_closed:
self.api.delete_session(self.id)
self.is_closed = True
self.client.close()
- def deploy(self, project_id: str, envs: List[EnvVar]):
+ def deploy(self, project_id: str):
return self.api.create_deployment(
project_id=project_id,
session_id=self.id,
create_deployment_request=playground_client.CreateDeploymentRequest(
- envVars=format_env_vars(envs),
+ envVars=self.env_vars,
),
).url