e2b-code-interpreter 2.1.1__tar.gz → 2.2.1__tar.gz

{e2b_code_interpreter-2.1.1 → e2b_code_interpreter-2.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: e2b-code-interpreter
-Version: 2.1.1
+Version: 2.2.1
 Summary: E2B Code Interpreter - Stateful code execution
 Home-page: https://e2b.dev/
 License: MIT
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: attrs (>=21.3.0)
-Requires-Dist: e2b (>=2.2.1,<3.0.0)
+Requires-Dist: e2b (>=2.3.0,<3.0.0)
 Requires-Dist: httpx (>=0.20.0,<1.0.0)
 Project-URL: Bug Tracker, https://github.com/e2b-dev/code-interpreter/issues
 Project-URL: Repository, https://github.com/e2b-dev/code-interpreter/tree/main/python

{e2b_code_interpreter-2.1.1 → e2b_code_interpreter-2.2.1}/e2b_code_interpreter/code_interpreter_async.py

@@ -20,8 +20,8 @@ from e2b_code_interpreter.models import (
     Context,
     Result,
     aextract_exception,
-    parse_output,
-    OutputHandler,
+    OutputHandlerWithAsync,
+    async_parse_output,
     OutputMessage,
 )
 from e2b_code_interpreter.exceptions import (
@@ -69,10 +69,10 @@ class AsyncSandbox(BaseAsyncSandbox):
         self,
         code: str,
         language: Union[Literal["python"], None] = None,
-        on_stdout: Optional[OutputHandler[OutputMessage]] = None,
-        on_stderr: Optional[OutputHandler[OutputMessage]] = None,
-        on_result: Optional[OutputHandler[Result]] = None,
-        on_error: Optional[OutputHandler[ExecutionError]] = None,
+        on_stdout: Optional[OutputHandlerWithAsync[OutputMessage]] = None,
+        on_stderr: Optional[OutputHandlerWithAsync[OutputMessage]] = None,
+        on_result: Optional[OutputHandlerWithAsync[Result]] = None,
+        on_error: Optional[OutputHandlerWithAsync[ExecutionError]] = None,
         envs: Optional[Dict[str, str]] = None,
         timeout: Optional[float] = None,
         request_timeout: Optional[float] = None,
@@ -103,10 +103,10 @@ class AsyncSandbox(BaseAsyncSandbox):
         self,
         code: str,
         language: Optional[str] = None,
-        on_stdout: Optional[OutputHandler[OutputMessage]] = None,
-        on_stderr: Optional[OutputHandler[OutputMessage]] = None,
-        on_result: Optional[OutputHandler[Result]] = None,
-        on_error: Optional[OutputHandler[ExecutionError]] = None,
+        on_stdout: Optional[OutputHandlerWithAsync[OutputMessage]] = None,
+        on_stderr: Optional[OutputHandlerWithAsync[OutputMessage]] = None,
+        on_result: Optional[OutputHandlerWithAsync[Result]] = None,
+        on_error: Optional[OutputHandlerWithAsync[ExecutionError]] = None,
         envs: Optional[Dict[str, str]] = None,
         timeout: Optional[float] = None,
         request_timeout: Optional[float] = None,
@@ -138,10 +138,10 @@ class AsyncSandbox(BaseAsyncSandbox):
         self,
         code: str,
         context: Optional[Context] = None,
-        on_stdout: Optional[OutputHandler[OutputMessage]] = None,
-        on_stderr: Optional[OutputHandler[OutputMessage]] = None,
-        on_result: Optional[OutputHandler[Result]] = None,
-        on_error: Optional[OutputHandler[ExecutionError]] = None,
+        on_stdout: Optional[OutputHandlerWithAsync[OutputMessage]] = None,
+        on_stderr: Optional[OutputHandlerWithAsync[OutputMessage]] = None,
+        on_result: Optional[OutputHandlerWithAsync[Result]] = None,
+        on_error: Optional[OutputHandlerWithAsync[ExecutionError]] = None,
         envs: Optional[Dict[str, str]] = None,
         timeout: Optional[float] = None,
         request_timeout: Optional[float] = None,
@@ -172,10 +172,10 @@ class AsyncSandbox(BaseAsyncSandbox):
         code: str,
         language: Optional[str] = None,
         context: Optional[Context] = None,
-        on_stdout: Optional[OutputHandler[OutputMessage]] = None,
-        on_stderr: Optional[OutputHandler[OutputMessage]] = None,
-        on_result: Optional[OutputHandler[Result]] = None,
-        on_error: Optional[OutputHandler[ExecutionError]] = None,
+        on_stdout: Optional[OutputHandlerWithAsync[OutputMessage]] = None,
+        on_stderr: Optional[OutputHandlerWithAsync[OutputMessage]] = None,
+        on_result: Optional[OutputHandlerWithAsync[Result]] = None,
+        on_error: Optional[OutputHandlerWithAsync[ExecutionError]] = None,
         envs: Optional[Dict[str, str]] = None,
         timeout: Optional[float] = None,
         request_timeout: Optional[float] = None,
@@ -215,7 +215,7 @@ class AsyncSandbox(BaseAsyncSandbox):
                 execution = Execution()
 
                 async for line in response.aiter_lines():
-                    parse_output(
+                    await async_parse_output(
                         execution,
                         line,
                         on_stdout=on_stdout,

{e2b_code_interpreter-2.1.1 → e2b_code_interpreter-2.2.1}/e2b_code_interpreter/models.py

@@ -1,3 +1,4 @@
+import inspect
 import json
 import logging
 
@@ -20,8 +21,10 @@ from httpx import Response
 from .charts import Chart, _deserialize_chart
 
 T = TypeVar("T")
-OutputHandler = Union[
-    Callable[[T], Any],
+OutputHandler = Union[Callable[[T], Any],]
+
+OutputHandlerWithAsync = Union[
+    OutputHandler[T],
     Callable[[T], Awaitable[Any]],
 ]
 
@@ -422,6 +425,32 @@ def parse_output(
     on_result: Optional[OutputHandler[Result]] = None,
     on_error: Optional[OutputHandler[ExecutionError]] = None,
 ):
+    _parse_output(execution, output, on_stdout, on_stderr, on_result, on_error)
+
+
+async def async_parse_output(
+    execution: Execution,
+    output: str,
+    on_stdout: Optional[OutputHandlerWithAsync[OutputMessage]] = None,
+    on_stderr: Optional[OutputHandlerWithAsync[OutputMessage]] = None,
+    on_result: Optional[OutputHandlerWithAsync[Result]] = None,
+    on_error: Optional[OutputHandlerWithAsync[ExecutionError]] = None,
+):
+    none_or_awaitable = _parse_output(
+        execution, output, on_stdout, on_stderr, on_result, on_error
+    )
+    if inspect.isawaitable(none_or_awaitable):
+        await none_or_awaitable
+
+
+def _parse_output(
+    execution: Execution,
+    output: str,
+    on_stdout: Optional[OutputHandler[OutputMessage]] = None,
+    on_stderr: Optional[OutputHandler[OutputMessage]] = None,
+    on_result: Optional[OutputHandler[Result]] = None,
+    on_error: Optional[OutputHandler[ExecutionError]] = None,
+) -> Union[None, Awaitable[Any]]:
     data = json.loads(output)
     data_type = data.pop("type")
 
@@ -429,22 +458,24 @@ def parse_output(
         result = Result(**data)
         execution.results.append(result)
         if on_result:
-            on_result(result)
+            return on_result(result)
     elif data_type == "stdout":
         execution.logs.stdout.append(data["text"])
         if on_stdout:
-            on_stdout(OutputMessage(data["text"], data["timestamp"], False))
+            return on_stdout(OutputMessage(data["text"], data["timestamp"], False))
     elif data_type == "stderr":
         execution.logs.stderr.append(data["text"])
         if on_stderr:
-            on_stderr(OutputMessage(data["text"], data["timestamp"], True))
+            return on_stderr(OutputMessage(data["text"], data["timestamp"], True))
     elif data_type == "error":
         execution.error = ExecutionError(data["name"], data["value"], data["traceback"])
         if on_error:
-            on_error(execution.error)
+            return on_error(execution.error)
     elif data_type == "number_of_executions":
         execution.execution_count = data["execution_count"]
 
+    return None
+
 
 @dataclass
 class Context:

{e2b_code_interpreter-2.1.1 → e2b_code_interpreter-2.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "e2b-code-interpreter"
-version = "2.1.1"
+version = "2.2.1"
 description = "E2B Code Interpreter - Stateful code execution"
 authors = ["e2b <hello@e2b.dev>"]
 license = "MIT"
@@ -14,7 +14,7 @@ python = "^3.9"
 
 httpx = ">=0.20.0, <1.0.0"
 attrs = ">=21.3.0"
-e2b = "^2.2.1"
+e2b = "^2.3.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^7.4.0"