Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Fix python sdk for python 3.8

Jakub Novak02d41605ddbb
diff --git a/.changeset/lemon-cups-hide.md b/.changeset/lemon-cups-hide.md
new file mode 100644
index 000000000..2a02b1538
--- /dev/null
+++ b/.changeset/lemon-cups-hide.md
@@ -0,0 +1,5 @@
+---
+"@e2b/python-sdk": patch
+---
+
+Fix bug in shutdown executor in Python 3.8
diff --git a/packages/python-sdk/e2b/session/session_connection.py b/packages/python-sdk/e2b/session/session_connection.py
index 22d125e97..c337210d6 100644
--- a/packages/python-sdk/e2b/session/session_connection.py
+++ b/packages/python-sdk/e2b/session/session_connection.py
@@ -17,6 +17,7 @@ from e2b.session.exception import (
from e2b.session.session_rpc import Notification, SessionRpc
from e2b.utils.future import DeferredFuture, run_async_func_in_new_loop
from e2b.utils.noop import noop
+from e2b.utils.threads import shutdown_executor
from pydantic import BaseModel
logger = logging.getLogger(__name__)
@@ -161,9 +162,7 @@ class SessionConnection:
)
self._process_cleanup.append(self._refreshing_task.cancel)
- self._process_cleanup.append(
- lambda: executor.shutdown(wait=False, cancel_futures=True)
- )
+ self._process_cleanup.append(lambda: shutdown_executor(executor))
async def refresh_cleanup():
try:
diff --git a/packages/python-sdk/e2b/session/session_rpc.py b/packages/python-sdk/e2b/session/session_rpc.py
index 910729cb3..32319cb1d 100644
--- a/packages/python-sdk/e2b/session/session_rpc.py
+++ b/packages/python-sdk/e2b/session/session_rpc.py
@@ -11,6 +11,7 @@ from typing import Any, Callable, Dict, Iterator, List, Union
from e2b.session.exception import RpcException
from e2b.session.websocket_client import WebSocket
from e2b.utils.future import DeferredFuture, run_async_func_in_new_loop
+from e2b.utils.threads import shutdown_executor
from janus import Queue as JanusQueue
from jsonrpcclient import Error, Ok, request_json
from jsonrpcclient.id_generators import decimal as decimal_id_generator
@@ -86,9 +87,7 @@ class SessionRpc(BaseModel):
)
self._process_cleanup.append(stopped.set)
self._process_cleanup.append(websocket_task.cancel)
- self._process_cleanup.append(
- lambda: executor.shutdown(wait=False, cancel_futures=True)
- )
+ self._process_cleanup.append(lambda: shutdown_executor(executor))
self._process_cleanup.append(task.cancel)
while not started.is_set():
await asyncio.sleep(0)
diff --git a/packages/python-sdk/e2b/utils/threads.py b/packages/python-sdk/e2b/utils/threads.py
new file mode 100644
index 000000000..a10de93cb
--- /dev/null
+++ b/packages/python-sdk/e2b/utils/threads.py
@@ -0,0 +1,28 @@
+import queue
+import sys
+
+
+def shutdown_executor(executor):
+ py_version = sys.version_info
+ if (py_version.major == 3) and (py_version.minor < 9):
+ # py versions less than 3.9
+ # Executor#shutdown does not accept
+ # cancel_futures keyword
+ # manually shutdown
+ # code taken from https://github.com/python/cpython/blob/3.9/Lib/concurrent/futures/thread.py#L216
+
+ # prevent new tasks from being submitted
+ executor.shutdown(wait=False)
+ while True:
+ # cancel all waiting tasks
+ try:
+ work_item = executor._work_queue.get_nowait()
+
+ except queue.Empty:
+ break
+
+ if work_item is not None:
+ work_item.future.cancel()
+
+ else:
+ executor.shutdown(wait=False, cancel_futures=True)