Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Add action decorator; Fix types [WIP]

Tomas Valenta420cc430cc42
diff --git a/packages/python-sdk/e2b/sandbox/main.py b/packages/python-sdk/e2b/sandbox/main.py
index b21d10ab1..c991f8b64 100644
--- a/packages/python-sdk/e2b/sandbox/main.py
+++ b/packages/python-sdk/e2b/sandbox/main.py
@@ -3,7 +3,7 @@ import urllib.parse
import requests
from os import path
-from typing import Any, Callable, List, Literal, Optional, IO
+from typing import Any, Callable, Dict, List, Literal, Optional, IO, Tuple, Union
from e2b.constants import TIMEOUT, ENVD_PORT, FILE_ROUTE
from e2b.sandbox.code_snippet import CodeSnippetManager, OpenPort
@@ -110,6 +110,35 @@ class Sandbox(SandboxConnection):
on_close=self._close_services,
timeout=timeout,
)
+ self._actions: Dict[str, Action] = {}
+
+ def register_action(self, name: str, action: "Action"):
+ self._actions[name] = action
+
+ return self
+
+ def unregister_action(self, name: str):
+ del self._actions[name]
+
+ return self
+
+ @property
+ def actions(self) -> List[Tuple[str, "Action"]]:
+ return [(name, action) for name, action in self._actions.items()]
+
+ def action(self, name: Union[str, None] = None):
+ def _action(action: Action):
+ self.register_action(name or action.__name__, action)
+
+ return action
+
+ return _action
+
+ @property
+ def openai(self):
+ from e2b.templates.openai import OpenAI, Assistant
+
+ return OpenAI(Assistant(self))
def _open(self, timeout: Optional[float] = TIMEOUT) -> None:
"""
@@ -190,3 +219,6 @@ class Sandbox(SandboxConnection):
def __exit__(self, exc_type, exc_value, traceback):
self.close()
+
+
+Action = Callable[[Sandbox, Dict[str, Any]], str]
diff --git a/packages/python-sdk/e2b/templates/openai.py b/packages/python-sdk/e2b/templates/openai.py
index 2b5026ede..6a225f22e 100644
--- a/packages/python-sdk/e2b/templates/openai.py
+++ b/packages/python-sdk/e2b/templates/openai.py
@@ -1,70 +1,21 @@
import json
-from typing import Callable, Dict, Any, List, Literal, Optional, TYPE_CHECKING
+from typing import (
+ List,
+ TYPE_CHECKING,
+)
-from e2b.constants import TIMEOUT
-from e2b.sandbox.code_snippet import OpenPort
-from e2b.sandbox.env_vars import EnvVars
from e2b.sandbox.main import Sandbox
-from e2b.sandbox.process import ProcessMessage
if TYPE_CHECKING:
from openai.types.beta.threads.run_submit_tool_outputs_params import ToolOutput
from openai.types.beta.threads.run import Run
-Action = Callable[[Sandbox, Dict[str, Any]], str]
-
-
class Assistant:
- def __init__(self, sandbox: "ActionSandbox"):
+ def __init__(self, sandbox: "Sandbox"):
self._sandbox = sandbox
- def run(self, run: "Run"):
- return self._sandbox._run(run)
-
-
-class OpenAI:
- def __init__(self, assistant: Assistant):
- self._assistant = assistant
-
- @property
- def assistant(self):
- return self._assistant
-
-
-class ActionSandbox(Sandbox):
- def __init__(
- self,
- id: str = "base",
- api_key: Optional[str] = None,
- cwd: Optional[str] = None,
- env_vars: Optional[EnvVars] = None,
- on_scan_ports: Optional[Callable[[List[OpenPort]], Any]] = None,
- on_stdout: Optional[Callable[[ProcessMessage], Any]] = None,
- on_stderr: Optional[Callable[[ProcessMessage], Any]] = None,
- on_exit: Optional[Callable[[int], Any]] = None,
- timeout: Optional[float] = TIMEOUT,
- _debug_hostname: Optional[str] = None,
- _debug_port: Optional[int] = None,
- _debug_dev_env: Optional[Literal["remote", "local"]] = None,
- ):
- super().__init__(
- id=id,
- api_key=api_key,
- cwd=cwd,
- env_vars=env_vars,
- on_scan_ports=on_scan_ports,
- on_stdout=on_stdout,
- on_stderr=on_stderr,
- on_exit=on_exit,
- timeout=timeout,
- _debug_hostname=_debug_hostname,
- _debug_port=_debug_port,
- _debug_dev_env=_debug_dev_env,
- )
- self._actions: Dict[str, Action] = {}
-
def _run(self, run: "Run") -> List["ToolOutput"]:
if run.status != "requires_action":
return []
@@ -75,7 +26,7 @@ class ActionSandbox(Sandbox):
outputs = []
for tool_call in run.required_action.submit_tool_outputs.tool_calls:
- action = self._actions.get(tool_call.function.name)
+ action = self._sandbox._actions.get(tool_call.function.name)
if not action:
continue
@@ -91,11 +42,11 @@ class ActionSandbox(Sandbox):
return outputs
- def register_action(self, name: str, action: Action):
- self._actions[name] = action
- return self
+class OpenAI:
+ def __init__(self, assistant: Assistant):
+ self._assistant = assistant
@property
- def openai(self) -> OpenAI:
- return OpenAI(Assistant(self))
+ def assistant(self):
+ return self._assistant