Skip to content

armgit / E2B

Public Imported from GitHub
0

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

Move refreshing and message processing to daemon threads in Python SDK (#286)

Jakub Novák923f9aa24cd2
diff --git a/.changeset/seven-peas-beg.md b/.changeset/seven-peas-beg.md
new file mode 100644
index 000000000..581fcb52f
--- /dev/null
+++ b/.changeset/seven-peas-beg.md
@@ -0,0 +1,5 @@
+---
+"@e2b/python-sdk": patch
+---
+
+Change refreshing and message processing to daemon threads
diff --git a/packages/python-sdk/e2b/sandbox/sandbox_connection.py b/packages/python-sdk/e2b/sandbox/sandbox_connection.py
index 2be5aea7c..3d70b0a68 100644
--- a/packages/python-sdk/e2b/sandbox/sandbox_connection.py
+++ b/packages/python-sdk/e2b/sandbox/sandbox_connection.py
@@ -1,8 +1,8 @@
import functools
import logging
+import threading
import traceback
import warnings
-from concurrent.futures import ThreadPoolExecutor, Future
from os import getenv
from time import sleep
from typing import Any, Callable, List, Literal, Optional, Union
@@ -29,7 +29,7 @@ from e2b.sandbox.exception import (
from e2b.sandbox.sandbox_rpc import Notification, SandboxRpc
from e2b.utils.future import DeferredFuture
from e2b.utils.str import camel_case_to_snake_case
-from e2b.utils.threads import shutdown_executor
+
logger = logging.getLogger(__name__)
@@ -109,7 +109,6 @@ class SandboxConnection:
self._is_open = False
self._process_cleanup: List[Callable[[], Any]] = []
- self._refreshing_task: Optional[Future] = None
self._subscribers = {}
self._rpc: Optional[SandboxRpc] = None
self._finished = DeferredFuture(self._process_cleanup)
@@ -316,13 +315,12 @@ class SandboxConnection:
self._rpc.connect(timeout=timeout)
def _start_refreshing(self):
- executor = ThreadPoolExecutor(thread_name_prefix="e2b-refresh")
- self._refreshing_task = executor.submit(
- self._refresh, self._sandbox.instance_id
- )
-
- self._process_cleanup.append(self._refreshing_task.cancel)
- self._process_cleanup.append(lambda: shutdown_executor(executor))
+ threading.Thread(
+ target=self._refresh,
+ args=(self._sandbox.instance_id,),
+ daemon=True,
+ name="e2b-sandbox-refresh",
+ ).start()
def _call(
self,
diff --git a/packages/python-sdk/e2b/sandbox/sandbox_rpc.py b/packages/python-sdk/e2b/sandbox/sandbox_rpc.py
index 593924b9a..270c7ac21 100644
--- a/packages/python-sdk/e2b/sandbox/sandbox_rpc.py
+++ b/packages/python-sdk/e2b/sandbox/sandbox_rpc.py
@@ -3,6 +3,7 @@ from __future__ import annotations
import asyncio
import json
import logging
+import threading
from concurrent.futures import ThreadPoolExecutor, TimeoutError
from queue import Queue
@@ -21,7 +22,6 @@ from e2b.utils.future import DeferredFuture, run_async_func_in_loop
from e2b.utils.threads import shutdown_executor
logger = logging.getLogger(__name__)
-STOP_SIGN = object()
class Notification(BaseModel):
@@ -63,13 +63,11 @@ class SandboxRpc(BaseModel):
_queue_in: Queue = PrivateAttr(default_factory=Queue)
_queue_out: Queue = PrivateAttr(default_factory=Queue)
_process_cleanup: List[Callable[[], Any]] = PrivateAttr(default_factory=list)
+ _websocket_task: Optional[threading.Thread] = PrivateAttr(default=None)
def process_messages(self):
while True:
data = self._queue_out.get()
- if data == STOP_SIGN:
- logger.debug("WebSocket received sign to stop.")
- break
logger.debug(f"WebSocket received message: {data}".strip())
self._receive_message(data)
self._queue_out.task_done()
@@ -80,14 +78,11 @@ class SandboxRpc(BaseModel):
stopped = Event()
self._process_cleanup.append(stopped.set)
- messages_executor = ThreadPoolExecutor(
- thread_name_prefix="e2b-process-messages"
- )
- task = messages_executor.submit(self.process_messages)
- self._process_cleanup.append(lambda: self._queue_out.put(STOP_SIGN))
- self._process_cleanup.append(task.cancel)
- self._process_cleanup.append(lambda: shutdown_executor(messages_executor))
+ threading.Thread(
+ target=self.process_messages, daemon=True, name="e2b-process-messages"
+ ).start()
+ # Keep the websocket running as non daemon thread, so it can close websocket properly
executor = ThreadPoolExecutor(thread_name_prefix="e2b-websocket")
loop = asyncio.new_event_loop()
websocket_task = executor.submit(