Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Fix static overload; [WIP] Tests

Tomas Valentae87b4091e758
diff --git a/packages/js-sdk/tests/api/kill.test.mts b/packages/js-sdk/tests/api/kill.test.mts
index e69de29bb..9b7b3ab5c 100644
--- a/packages/js-sdk/tests/api/kill.test.mts
+++ b/packages/js-sdk/tests/api/kill.test.mts
@@ -0,0 +1,12 @@
+import { assert } from 'vitest'
+
+import { sandboxTest } from '../setup.mjs'
+import { Sandbox } from '../../src'
+
+sandboxTest.skipIf(process.env.E2B_DEBUG)('kill existing sandbox', async ({ sandbox }) => {
+ assert.doesNotThrow(() => Sandbox.kill(sandbox.sandboxID))
+})
+
+sandboxTest.skipIf(process.env.E2B_DEBUG)('kill non-existing sandbox', async () => {
+ assert.throws(() => Sandbox.kill('non-existing-sandbox'))
+})
diff --git a/packages/js-sdk/tests/api/list.test.mts b/packages/js-sdk/tests/api/list.test.mts
index e69de29bb..b18499551 100644
--- a/packages/js-sdk/tests/api/list.test.mts
+++ b/packages/js-sdk/tests/api/list.test.mts
@@ -0,0 +1,10 @@
+import { assert } from 'vitest'
+
+import { Sandbox } from '../../src'
+import { sandboxTest } from '../setup.mjs'
+
+sandboxTest.skipIf(process.env.E2B_DEBUG)('list sandboxes', async ({ sandbox }) => {
+ const sandboxes = await Sandbox.list()
+ assert.isAtLeast(sandboxes.length, 1)
+ assert.include(sandboxes.map((s) => s.sandboxID), sandbox.sandboxID)
+})
diff --git a/packages/js-sdk/tests/sandbox/kill.test.mts b/packages/js-sdk/tests/sandbox/kill.test.mts
new file mode 100644
index 000000000..e25978a0c
--- /dev/null
+++ b/packages/js-sdk/tests/sandbox/kill.test.mts
@@ -0,0 +1,9 @@
+import { assert } from 'vitest'
+
+import { sandboxTest } from '../setup.mjs'
+
+sandboxTest('kill', async ({ sandbox }) => {
+ await sandbox.kill()
+
+ assert.throws(() => sandbox.isRunning())
+})
diff --git a/packages/python-sdk/e2b/envd/api.py b/packages/python-sdk/e2b/envd/api.py
index ea0f520ac..735acb1c6 100644
--- a/packages/python-sdk/e2b/envd/api.py
+++ b/packages/python-sdk/e2b/envd/api.py
@@ -1,5 +1,4 @@
import httpx
-import json
from e2b.exceptions import (
SandboxException,
diff --git a/packages/python-sdk/e2b/sandbox/main.py b/packages/python-sdk/e2b/sandbox/main.py
index 21c7ed6dd..fbca00e8d 100644
--- a/packages/python-sdk/e2b/sandbox/main.py
+++ b/packages/python-sdk/e2b/sandbox/main.py
@@ -1,9 +1,9 @@
import urllib.parse
+from e2b.sandbox.utils import class_method_variant
import httpcore
import httpx
-import requests
-from typing import Optional, Dict, Literal
+from typing import Optional, Dict, Literal, overload
from e2b.sandbox.filesystem.filesystem import Filesystem
from e2b.sandbox.process.main import Process
@@ -95,8 +95,8 @@ class Sandbox(SandboxApi):
return f"{port}-{self.sandbox_id}.{self._connection_config.domain}"
def is_running(self, request_timeout: Optional[float] = None) -> Literal[True]:
- r = requests.get(
- self._envd_api_url + ENVD_API_HEALTH_ROUTE,
+ r = self._envd_api.get(
+ ENVD_API_HEALTH_ROUTE,
timeout=self._connection_config.get_request_timeout(request_timeout),
)
@@ -121,28 +121,9 @@ class Sandbox(SandboxApi):
debug=debug,
)
- def set_timeout(
- self,
- timeout: int,
- request_timeout: Optional[float] = None,
- ) -> None:
- SandboxApi.set_timeout(
- sandbox_id=self.sandbox_id,
- timeout=timeout,
- **self._connection_config.__dict__,
- request_timeout=request_timeout,
- )
-
- def kill(self, request_timeout: Optional[float] = None) -> None:
- SandboxApi.kill(
- sandbox_id=self.sandbox_id,
- **self._connection_config.__dict__,
- request_timeout=request_timeout,
- )
-
@property
def upload_url(self) -> str:
- url = urllib.parse.urljoin(self._envd_api_url, f"/{ENVD_API_FILES_ROUTE}?")
+ url = urllib.parse.urljoin(self._envd_api_url, f"{ENVD_API_FILES_ROUTE}?")
params = urllib.parse.urlencode(
{"username": urllib.parse.quote("user")},
)
@@ -155,3 +136,55 @@ class Sandbox(SandboxApi):
def __exit__(self, exc_type, exc_value, traceback):
self.kill()
+
+ @overload
+ @staticmethod
+ def kill(
+ sandbox_id: str,
+ api_key: Optional[str] = None,
+ domain: Optional[str] = None,
+ debug: Optional[bool] = None,
+ request_timeout: Optional[float] = None,
+ ) -> None: ...
+
+ @overload
+ def kill(self, request_timeout: Optional[float] = None) -> None: ...
+
+ @class_method_variant("_cls_kill")
+ def kill(self, request_timeout: Optional[float] = None) -> None: # type: ignore
+ SandboxApi._cls_kill(
+ sandbox_id=self.sandbox_id,
+ **self._connection_config.__dict__,
+ request_timeout=request_timeout,
+ )
+
+ @overload
+ @staticmethod
+ def set_timeout(
+ sandbox_id: str,
+ timeout: int,
+ api_key: Optional[str] = None,
+ domain: Optional[str] = None,
+ debug: Optional[bool] = None,
+ request_timeout: Optional[float] = None,
+ ) -> None: ...
+
+ @overload
+ def set_timeout(
+ self,
+ timeout: int,
+ request_timeout: Optional[float] = None,
+ ) -> None: ...
+
+ @class_method_variant("_cls_set_timeout")
+ def set_timeout( # type: ignore
+ self,
+ timeout: int,
+ request_timeout: Optional[float] = None,
+ ) -> None:
+ SandboxApi._cls_set_timeout(
+ sandbox_id=self.sandbox_id,
+ timeout=timeout,
+ **self._connection_config.__dict__,
+ request_timeout=request_timeout,
+ )
diff --git a/packages/python-sdk/e2b/sandbox/sandbox_api.py b/packages/python-sdk/e2b/sandbox/sandbox_api.py
index 74db7addf..e40703913 100644
--- a/packages/python-sdk/e2b/sandbox/sandbox_api.py
+++ b/packages/python-sdk/e2b/sandbox/sandbox_api.py
@@ -24,8 +24,9 @@ class SandboxInfo:
class SandboxApi:
- @staticmethod
+ @classmethod
def list(
+ cls,
api_key: Optional[str] = None,
domain: Optional[str] = None,
debug: Optional[bool] = None,
@@ -58,8 +59,9 @@ class SandboxApi:
except exceptions.ApiException as e:
raise handle_api_exception(e)
- @staticmethod
- def kill(
+ @classmethod
+ def _cls_kill(
+ cls,
sandbox_id: str,
api_key: Optional[str] = None,
domain: Optional[str] = None,
@@ -82,8 +84,9 @@ class SandboxApi:
except exceptions.ApiException as e:
raise handle_api_exception(e)
- @staticmethod
- def set_timeout(
+ @classmethod
+ def _cls_set_timeout(
+ cls,
sandbox_id: str,
timeout: int,
api_key: Optional[str] = None,
@@ -108,8 +111,9 @@ class SandboxApi:
except exceptions.ApiException as e:
raise handle_api_exception(e)
- @staticmethod
+ @classmethod
def _create_sandbox(
+ cls,
template: str,
metadata: Optional[Dict[str, str]] = None,
timeout: Optional[int] = None,
diff --git a/packages/python-sdk/e2b/sandbox/utils.py b/packages/python-sdk/e2b/sandbox/utils.py
new file mode 100644
index 000000000..daf9d4a8b
--- /dev/null
+++ b/packages/python-sdk/e2b/sandbox/utils.py
@@ -0,0 +1,34 @@
+from typing import TypeVar, Any, cast, Optional, Type
+import functools
+
+T = TypeVar("T")
+
+
+class class_method_variant(object):
+ def __init__(self, class_method_name):
+ self.class_method_name = class_method_name
+
+ method: Any
+
+ def __call__(self, method: T) -> T:
+ self.method = method
+ return cast(T, self)
+
+ def __get__(self, obj, objtype: Optional[Type[Any]] = None):
+ @functools.wraps(self.method)
+ def _wrapper(*args, **kwargs):
+ if obj is not None:
+ # Method was called as an instance method, e.g.
+ # instance.method(...)
+ return self.method(obj, *args, **kwargs)
+ elif len(args) > 0 and objtype is not None and isinstance(args[0], objtype):
+ # Method was called as a class method with the instance as the
+ # first argument, e.g. Class.method(instance, ...) which in
+ # Python is the same thing as calling an instance method
+ return self.method(args[0], *args[1:], **kwargs)
+ else:
+ # Method was called as a class method, e.g. Class.method(...)
+ class_method = getattr(objtype, self.class_method_name)
+ return class_method(*args, **kwargs)
+
+ return _wrapper
diff --git a/packages/python-sdk/tests/api/test_kill.py b/packages/python-sdk/tests/api/test_kill.py
index e69de29bb..5fc60e763 100644
--- a/packages/python-sdk/tests/api/test_kill.py
+++ b/packages/python-sdk/tests/api/test_kill.py
@@ -0,0 +1,14 @@
+import os
+import pytest
+
+from e2b import Sandbox
+
+
[email protected](os.getenv("E2B_DEBUG") is not None)
+def test_kill_existing_sandbox(sandbox: Sandbox):
+ Sandbox.kill(sandbox.sandbox_id)
+
+
+def test_kill_non_existing_sandbox():
+ with pytest.raises(RuntimeError):
+ Sandbox.kill("non-existing-sandbox")
diff --git a/packages/python-sdk/tests/sandbox/test_kill.py b/packages/python-sdk/tests/sandbox/test_kill.py
new file mode 100644
index 000000000..5ba2b222c
--- /dev/null
+++ b/packages/python-sdk/tests/sandbox/test_kill.py
@@ -0,0 +1,9 @@
+import pytest
+
+from e2b.sandbox.main import Sandbox
+
+
+def test_kill(sandbox: Sandbox):
+ sandbox.kill()
+ with pytest.raises(Exception):
+ sandbox.is_running()