Skip to content

armgit / E2B

Public Imported from GitHub
0

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

commit

Vasek Mlejnsky5053a09d7601
diff --git a/api-service/app.py b/api-service/app.py
index 682ee9b51..a6d2e60a1 100644
--- a/api-service/app.py
+++ b/api-service/app.py
@@ -12,7 +12,6 @@ from database import Database, DeploymentState
url = os.environ.get("SUPABASE_URL")
key = os.environ.get("SUPABASE_KEY")
-
db = Database(url, key)
app = Flask(__name__)
@@ -79,7 +78,7 @@ def generate():
)
db.update_state(run_id=run_id, state=DeploymentState.Deploying)
- # url = playground.deploy(project_id, envs)
+ url = playground.deploy(project_id, envs)
db.finish_deployment(run_id=run_id, url=url)
return {}
diff --git a/api-service/codegen/codegen.py b/api-service/codegen/codegen.py
index 0f2500fca..896decdf3 100644
--- a/api-service/codegen/codegen.py
+++ b/api-service/codegen/codegen.py
@@ -5,7 +5,7 @@ from typing import (
Dict,
ClassVar,
)
-from codegen.tools.human.ask import create_ask_human_tool
+
from langchain.agents import AgentExecutor
from pydantic import BaseModel, PrivateAttr
from langchain.chat_models import ChatOpenAI
@@ -13,10 +13,12 @@ from langchain.callbacks.base import CallbackManager
from langchain.callbacks.streaming_stdout import StreamingStdOutCallbackHandler
from langchain.tools import BaseTool
+from codegen.tools.human.ask import create_ask_human_tool
from session.playground import NodeJSPlayground
from session.env import EnvVar
from database import Database
from codegen.agent import CodegenAgent, CodegenAgentExecutor
+from codegen.callbacks.logs import LogsCallbackHandler
from codegen.prompt import (
PREFIX,
SUFFIX,
@@ -24,7 +26,6 @@ from codegen.prompt import (
HUMAN_INSTRUCTIONS_PREFIX,
HUMAN_INSTRUCTIONS_SUFFIX,
)
-from codegen.callbacks.logs import LogsCallbackHandler
# class OutputFinalCode(BaseTool):
# name = "OutputFinalCode"
@@ -149,7 +150,6 @@ class Codegen(BaseModel):
method: str,
blocks: List[Dict],
):
- print("Added handler")
self._callback_manager.add_handler(
LogsCallbackHandler(database=self._database, run_id=run_id)
)
diff --git a/api-service/database/client.py b/api-service/database/client.py
new file mode 100644
index 000000000..3ec4f8735
--- /dev/null
+++ b/api-service/database/client.py
@@ -0,0 +1,64 @@
+import os
+from typing import Any, Coroutine, Dict
+
+from postgrest._async.client import AsyncPostgrestClient
+from postgrest._async.request_builder import (
+ AsyncFilterRequestBuilder,
+ AsyncRequestBuilder,
+)
+from supabase.lib.client_options import ClientOptions
+from supabase import Client as SyncClient
+
+
+class Client(SyncClient):
+ def __init__(
+ self,
+ supabase_url: str,
+ supabase_key: str,
+ options: ClientOptions = ClientOptions(),
+ ):
+ super().__init__(
+ supabase_url=supabase_url,
+ supabase_key=supabase_key,
+ # options=options
+ )
+ self.postgrest: AsyncPostgrestClient = self._init_postgrest_client(
+ rest_url=self.rest_url,
+ supabase_key=self.supabase_key,
+ headers=options.headers,
+ schema=options.schema,
+ )
+
+ def table(self, table_name: str) -> AsyncRequestBuilder:
+ return self.from_(table_name)
+
+ def from_(self, table_name: str) -> AsyncRequestBuilder:
+ return self.postgrest.from_(table_name)
+
+ def rpc(
+ self, fn: str, params: Dict[Any, Any]
+ ) -> Coroutine[None, None, AsyncFilterRequestBuilder]:
+ return self.postgrest.rpc(fn, params)
+
+ @staticmethod
+ def _init_postgrest_client(
+ rest_url: str, supabase_key: str, headers: Dict[str, str], schema: str
+ ) -> AsyncPostgrestClient:
+ """Private helper for creating an instance of the Postgrest client."""
+ client = AsyncPostgrestClient(rest_url, headers=headers, schema=schema)
+ client.auth(token=supabase_key)
+ return client
+
+
+def create_client(
+ supabase_url: str,
+ supabase_key: str,
+ options: ClientOptions = ClientOptions(),
+) -> Client:
+ return Client(supabase_url=supabase_url, supabase_key=supabase_key, options=options)
+
+
+# instantiate like this
+# url: str = os.getenv("SUPABASEURL")
+# key: str = os.getenv("SUPABASEKEY")
+# supabase: Client = create_client(url, key)
diff --git a/api-service/database/database.py b/api-service/database/database.py
index 679a2d3cb..fa2f598d3 100644
--- a/api-service/database/database.py
+++ b/api-service/database/database.py
@@ -1,6 +1,9 @@
from typing import List, Dict
from enum import Enum
-from supabase.client import create_client
+
+# from supabase.client import create_client
+
+from database.client import create_client
class DeploymentState(Enum):
diff --git a/api-service/poetry.lock b/api-service/poetry.lock
index 43b4417ac..8783eef5c 100644
--- a/api-service/poetry.lock
+++ b/api-service/poetry.lock
@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.4.0 and should not be changed by hand.
[[package]]
name = "aenum"
@@ -170,6 +170,20 @@ files = [
{file = "async_timeout-4.0.2-py3-none-any.whl", hash = "sha256:8ca1e4fcf50d07413d66d1a5e416e42cfdf5851c981d679a09851a6853383b3c"},
]
+[[package]]
+name = "asyncio"
+version = "3.4.3"
+description = "reference implementation of PEP 3156"
+category = "main"
+optional = false
+python-versions = "*"
+files = [
+ {file = "asyncio-3.4.3-cp33-none-win32.whl", hash = "sha256:b62c9157d36187eca799c378e572c969f0da87cd5fc42ca372d92cdb06e7e1de"},
+ {file = "asyncio-3.4.3-cp33-none-win_amd64.whl", hash = "sha256:c46a87b48213d7464f22d9a497b9eef8c1928b68320a2fa94240f969f6fec08c"},
+ {file = "asyncio-3.4.3-py3-none-any.whl", hash = "sha256:c4d18b22701821de07bd6aea8b53d21449ec0ec5680645e5317062ea21817d2d"},
+ {file = "asyncio-3.4.3.tar.gz", hash = "sha256:83360ff8bc97980e4ff25c964c7bd3923d333d177aa4f7fb736b019f26c7cb41"},
+]
+
[[package]]
name = "attrs"
version = "22.2.0"
@@ -1515,6 +1529,24 @@ httpx = ">=0.23.0,<0.24.0"
pydantic = ">=1.9.0,<2.0.0"
strenum = ">=0.4.9,<0.5.0"
+[[package]]
+name = "postgrest-py"
+version = "0.10.6"
+description = "PostgREST client for Python. This library provides an ORM interface to PostgREST."
+category = "main"
+optional = false
+python-versions = ">=3.8,<4.0"
+files = [
+ {file = "postgrest_py-0.10.6-py3-none-any.whl", hash = "sha256:434acf3a3eeb196a575e6a4db65072222ca6d60d665cf9a1f4c4a84489b47a44"},
+ {file = "postgrest_py-0.10.6.tar.gz", hash = "sha256:106adc046546165798e4a380585f66bbf1bbcdcbbe094abbea7aaabfef37f2d1"},
+]
+
+[package.dependencies]
+deprecation = ">=2.1.0,<3.0.0"
+httpx = ">=0.23.0,<0.24.0"
+pydantic = ">=1.9.0,<2.0.0"
+strenum = ">=0.4.9,<0.5.0"
+
[[package]]
name = "pycparser"
version = "2.21"
@@ -1988,7 +2020,7 @@ files = [
]
[package.dependencies]
-greenlet = {version = "!=0.4.17", markers = "python_version >= \"3\" and (platform_machine == \"aarch64\" or platform_machine == \"ppc64le\" or platform_machine == \"x86_64\" or platform_machine == \"amd64\" or platform_machine == \"AMD64\" or platform_machine == \"win32\" or platform_machine == \"WIN32\")"}
+greenlet = {version = "!=0.4.17", markers = "python_version >= \"3\" and platform_machine == \"aarch64\" or python_version >= \"3\" and platform_machine == \"ppc64le\" or python_version >= \"3\" and platform_machine == \"x86_64\" or python_version >= \"3\" and platform_machine == \"amd64\" or python_version >= \"3\" and platform_machine == \"AMD64\" or python_version >= \"3\" and platform_machine == \"win32\" or python_version >= \"3\" and platform_machine == \"WIN32\""}
[package.extras]
aiomysql = ["aiomysql", "greenlet (!=0.4.17)"]
@@ -2441,4 +2473,4 @@ testing = ["big-O", "flake8 (<5)", "jaraco.functools", "jaraco.itertools", "more
[metadata]
lock-version = "2.0"
python-versions = ">=3.8.1,<4.0"
-content-hash = "308077a95224be41a2a8514e32565b9a850723ba7c1869fc6db3179285a8a6ef"
+content-hash = "74f63cc1631aab2dd3314c05254b654e9f6f802eae2335729cee9eda5d6f51ae"
diff --git a/api-service/pyproject.toml b/api-service/pyproject.toml
index e686379db..fb730a1a0 100644
--- a/api-service/pyproject.toml
+++ b/api-service/pyproject.toml
@@ -8,7 +8,7 @@ authors = ["Devbook <[email protected]>"]
python = ">=3.8.1,<4.0"
gunicorn = "^20.1.0"
langchain = "^0.0.117"
-supabase = "^1.0.1"
+supabase = "^1.0.2"
flask-cors = "^3.0.10"
python-dateutil = "^2.8.2"
urllib3 = "^1.26.14"
@@ -20,6 +20,8 @@ pytest = "^7.2.2"
lxml = "^4.9.2"
cchardet = "^2.1.7"
flask = "^2.2.3"
+asyncio = "^3.4.3"
+postgrest-py = "^0.10.6"
[build-system]
requires = ["poetry-core>=1.3.0"]