Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Fix custom exported types from Python SDK

Tomas Valenta0663859b05d0
diff --git a/packages/js-sdk/src/index.ts b/packages/js-sdk/src/index.ts
index ca5e35302..a726f3d7c 100644
--- a/packages/js-sdk/src/index.ts
+++ b/packages/js-sdk/src/index.ts
@@ -19,7 +19,7 @@ export {
export type { Logger } from './logs'
export type { ConnectionOpts, Username } from './connectionConfig'
-export type { FilesystemEvent, WatchHandle, FilesystemEventType, } from './sandbox/filesystem/watchHandle'
+export type { FilesystemEvent, WatchHandle, FilesystemEventType } from './sandbox/filesystem/watchHandle'
export type {
EntryInfo,
} from './sandbox/filesystem'
diff --git a/packages/python-sdk/e2b/__init__.py b/packages/python-sdk/e2b/__init__.py
index 1448dddf4..5ec902b31 100644
--- a/packages/python-sdk/e2b/__init__.py
+++ b/packages/python-sdk/e2b/__init__.py
@@ -24,4 +24,13 @@ from .sandbox.process.process_handle import (
Stdout,
ProcessExitException,
)
-from .sandbox.filesystem.watch_handle import WatchHandle
+from .sandbox.process.main import ProcessInfo
+
+from .sandbox.filesystem.watch_handle import (
+ WatchHandle,
+ FilesystemEvent,
+ FilesystemEventType,
+)
+from .sandbox.filesystem.filesystem import EntryInfo, FileType
+
+from .sandbox.main import Sandbox
diff --git a/packages/python-sdk/e2b/envd/api.py b/packages/python-sdk/e2b/envd/api.py
index 3c786a8b6..5f6eda189 100644
--- a/packages/python-sdk/e2b/envd/api.py
+++ b/packages/python-sdk/e2b/envd/api.py
@@ -1,4 +1,5 @@
import requests
+
from e2b.exceptions import (
SandboxException,
InvalidUserException,
@@ -12,7 +13,6 @@ from e2b.exceptions import (
ENVD_API_FILES_ROUTE = "/files"
-# TODO: Improve the messages
def handle_envd_api_exception(res: requests.Response):
if res.status_code == 400:
return InvalidUserException(res.json().get("message"))
diff --git a/packages/python-sdk/e2b/sandbox/filesystem/filesystem.py b/packages/python-sdk/e2b/sandbox/filesystem/filesystem.py
index 3a4da0c3b..a4a59d839 100644
--- a/packages/python-sdk/e2b/sandbox/filesystem/filesystem.py
+++ b/packages/python-sdk/e2b/sandbox/filesystem/filesystem.py
@@ -3,6 +3,8 @@ import requests
import urllib.parse
import httpcore
+from enum import Enum
+from dataclasses import dataclass
from io import IOBase
from typing import (
Iterator,
@@ -29,6 +31,17 @@ from e2b.envd.permissions.permissions_pb2 import User
from e2b.envd.api import ENVD_API_FILES_ROUTE
+class FileType(Enum):
+ FILE = "file"
+ DIR = "dir"
+
+
+@dataclass
+class EntryInfo:
+ name: str
+ type: FileType
+
+
class Filesystem:
def __init__(
self,
@@ -125,7 +138,7 @@ class Filesystem:
path: str,
user: Username = "user",
request_timeout: Optional[float] = None,
- ) -> List[filesystem_pb2.EntryInfo]:
+ ) -> List[EntryInfo]:
try:
res = self._rpc.list_dir(
filesystem_pb2.ListDirRequest(
@@ -135,7 +148,10 @@ class Filesystem:
timeout=self._connection_config.get_request_timeout(request_timeout),
)
- return [entry for entry in res.entries]
+ return [
+ EntryInfo(name=entry.name, type=FileType(entry.name))
+ for entry in res.entries
+ ]
except Exception as e:
raise handle_rpc_exception(e)
diff --git a/packages/python-sdk/e2b/sandbox/filesystem/watch_handle.py b/packages/python-sdk/e2b/sandbox/filesystem/watch_handle.py
index a1207780d..e4545bf3b 100644
--- a/packages/python-sdk/e2b/sandbox/filesystem/watch_handle.py
+++ b/packages/python-sdk/e2b/sandbox/filesystem/watch_handle.py
@@ -1,9 +1,23 @@
from typing import Any, Generator
+from dataclasses import dataclass
+from enum import Enum
from e2b.envd.rpc import handle_rpc_exception
from e2b.envd.filesystem.filesystem_pb2 import WatchDirResponse
-# TODO: Export custom types
+
+class FilesystemEventType(Enum):
+ CHMOD = "chmod"
+ CREATE = "create"
+ REMOVE = "remove"
+ RENAME = "rename"
+ WRITE = "write"
+
+
+@dataclass
+class FilesystemEvent:
+ name: str
+ type: FilesystemEventType
class WatchHandle(Generator):
@@ -23,7 +37,10 @@ class WatchHandle(Generator):
try:
for event in self._events:
if event.HasField("filesystem"):
- yield event.filesystem
+ yield FilesystemEvent(
+ name=event.filesystem.name,
+ type=FilesystemEventType(event.filesystem.type),
+ )
except Exception as e:
raise handle_rpc_exception(e)
finally: