Open-source, secure environment with real-world tools for enterprise-grade agents.
Python agentaiai-agentai-agentscode-interpretercopilotdevelopmentdevtoolsgptgpt-4javascriptllmnextjsopenaipythonreactsoftwaretypescript
[WIP] Fix python timeout
Tomas Valenta3e010c4173a7
diff --git a/packages/python-sdk/connect/client.py b/packages/python-sdk/connect/client.pyindex 7ddec0c3b..cec29860f 100644--- a/packages/python-sdk/connect/client.py+++ b/packages/python-sdk/connect/client.py@@ -4,7 +4,7 @@ import structimport httpcorefrom enum import Flag, Enum-+from typing import Optionalfrom google.protobuf import json_format@@ -119,6 +119,7 @@ class Client:compressor=None,json=False,headers=None,+ timeout=None,):if headers is None:headers = {}@@ -130,21 +131,22 @@ class Client:self._compressor = compressorself._headers = {**{"user-agent": "connect-python"}, **headers}- def call_unary(self, req, timeout=None, **opts):+ def call_unary(self, req, request_timeout=None, **opts):data = self._codec.encode(req)if self._compressor is not None:data = self._compressor.compress(data)- # extensions = {}- # if timeout is not None:- # extensions["timeout"] = timeout+ extensions = {}++ if request_timeout is not None:+ extensions = {"timeout": request_timeout}http_resp = self.pool.request("POST",self.url,content=data,- # extensions=extensions,+ extensions=extensions,headers={**self._headers,**opts.get("headers", {}),@@ -170,18 +172,27 @@ class Client:msg_type=self._response_type,)- def call_server_stream(self, req, timeout=None, **opts):+ def _create_stream_timeout(self, timeout: Optional[int]):+ if timeout is not None:+ return {"connect-timeout-ms": str(timeout * 1000)}+ return {}++ def call_server_stream(self, req, request_timeout=None, timeout=None, **opts):data = self._codec.encode(req)flags = EnvelopeFlags(0)- # extensions = {}- # if timeout is not None:- # extensions["timeout"] = timeout+ extensions = {}+ if request_timeout is not None:+ extensions = {+ "timeout": {"connect": request_timeout, "pool": request_timeout}+ }if self._compressor is not None:data = self._compressor.compress(data)flags |= EnvelopeFlags.compressed+ stream_timeout = self._create_stream_timeout(timeout)+with self.pool.stream("POST",self.url,@@ -189,9 +200,11 @@ class Client:flags=flags,data=data,),+ extensions=extensions,headers={**self._headers,**opts.get("headers", {}),+ **stream_timeout,"connect-protocol-version": "1","connect-content-encoding": ("identity" if self._compressor is None else self._compressor.namediff --git a/packages/python-sdk/e2b/sandbox/filesystem/filesystem.py b/packages/python-sdk/e2b/sandbox/filesystem/filesystem.pyindex a4a59d839..3aaeb952a 100644--- a/packages/python-sdk/e2b/sandbox/filesystem/filesystem.py+++ b/packages/python-sdk/e2b/sandbox/filesystem/filesystem.py@@ -145,7 +145,7 @@ class Filesystem:path=path,user=User(username=user),),- timeout=self._connection_config.get_request_timeout(request_timeout),+ request_timeout=self._connection_config.get_request_timeout(request_timeout),)return [@@ -167,7 +167,7 @@ class Filesystem:path=path,user=User(username=user),),- timeout=self._connection_config.get_request_timeout(request_timeout),+ request_timeout=self._connection_config.get_request_timeout(request_timeout),)return True@@ -189,7 +189,7 @@ class Filesystem:path=path,user=User(username=user),),- timeout=self._connection_config.get_request_timeout(request_timeout),+ request_timeout=self._connection_config.get_request_timeout(request_timeout),)except Exception as e:raise handle_rpc_exception(e)@@ -208,7 +208,7 @@ class Filesystem:destination=new_path,user=User(username=user),),- timeout=self._connection_config.get_request_timeout(request_timeout),+ request_timeout=self._connection_config.get_request_timeout(request_timeout),)except Exception as e:raise handle_rpc_exception(e)@@ -225,7 +225,7 @@ class Filesystem:path=path,user=User(username=user),),- timeout=self._connection_config.get_request_timeout(request_timeout),+ request_timeout=self._connection_config.get_request_timeout(request_timeout),)return True@@ -240,17 +240,15 @@ class Filesystem:path: str,user: Username = "user",request_timeout: Optional[float] = None,- timeout: Optional[float] = None,+ timeout: Optional[float] = 60,):events = self._rpc.watch_dir(filesystem_pb2.WatchDirRequest(path=path,user=User(username=user),),- timeout=(- self._connection_config.get_request_timeout(request_timeout),- timeout,- ),+ request_timeout=self._connection_config.get_request_timeout(request_timeout),+ timeout=timeout,)try:diff --git a/packages/python-sdk/e2b/sandbox/process/main.py b/packages/python-sdk/e2b/sandbox/process/main.pyindex f84ee8672..76e008c18 100644--- a/packages/python-sdk/e2b/sandbox/process/main.py+++ b/packages/python-sdk/e2b/sandbox/process/main.py@@ -46,7 +46,9 @@ class Process:try:res = self._rpc.list(process_pb2.ListRequest(),- timeout=self._connection_config.get_request_timeout(request_timeout),+ request_timeout=self._connection_config.get_request_timeout(+ request_timeout+ ),)return [ProcessInfo(@@ -73,7 +75,9 @@ class Process:process=process_pb2.ProcessSelector(pid=pid),signal=process_pb2.Signal.SIGNAL_SIGKILL,),- timeout=self._connection_config.get_request_timeout(request_timeout),+ request_timeout=self._connection_config.get_request_timeout(+ request_timeout+ ),)except Exception as e:raise handle_rpc_exception(e)@@ -92,7 +96,9 @@ class Process:stdin=data.encode(),),),- timeout=self._connection_config.get_request_timeout(request_timeout),+ request_timeout=self._connection_config.get_request_timeout(+ request_timeout+ ),)except Exception as e:raise handle_rpc_exception(e)@@ -107,7 +113,7 @@ class Process:cwd: Optional[str] = None,on_stdout: Optional[Callable[[str], None]] = None,on_stderr: Optional[Callable[[str], None]] = None,- timeout: Optional[float] = None,+ timeout: Optional[float] = 60,request_timeout: Optional[float] = None,) -> ProcessResult: ...@@ -121,7 +127,7 @@ class Process:cwd: Optional[str] = None,on_stdout: Optional[Callable[[str], None]] = None,on_stderr: Optional[Callable[[str], None]] = None,- timeout: Optional[float] = None,+ timeout: Optional[float] = 60,request_timeout: Optional[float] = None,) -> ProcessHandle: ...@@ -134,7 +140,7 @@ class Process:cwd: Optional[str] = None,on_stdout: Optional[Callable[[str], None]] = None,on_stderr: Optional[Callable[[str], None]] = None,- timeout: Optional[float] = None,+ timeout: Optional[float] = 60,request_timeout: Optional[float] = None,):proc = self._start(@@ -161,7 +167,7 @@ class Process:envs: Optional[Dict[str, str]] = {},user: Username = "user",cwd: Optional[str] = None,- timeout: Optional[float] = None,+ timeout: Optional[float] = 60,request_timeout: Optional[float] = None,):events = self._rpc.start(@@ -174,9 +180,9 @@ class Process:cwd=cwd,),),- timeout=(- self._connection_config.get_request_timeout(request_timeout),- timeout,+ timeout=timeout,+ request_timeout=self._connection_config.get_request_timeout(+ request_timeout),)@@ -197,16 +203,16 @@ class Process:def connect(self,pid: int,- timeout: Optional[float] = None,+ timeout: Optional[float] = 60,request_timeout: Optional[float] = None,):events = self._rpc.connect(process_pb2.ConnectRequest(process=process_pb2.ProcessSelector(pid=pid),),- timeout=(- self._connection_config.get_request_timeout(request_timeout),- timeout,+ timeout=timeout,+ request_timeout=self._connection_config.get_request_timeout(+ request_timeout),)