Simplify classes

Author: jakubno

packages/python-sdk/e2b/sandbox/main.py

@@ -8,7 +8,7 @@
 from httpx import Limits
 
 
-class SandboxSetup:
+class SandboxBase:
     _limits = Limits(
         max_keepalive_connections=40,
         max_connections=40,

packages/python-sdk/e2b/sandbox/sandbox_api.py

@@ -1,10 +1,7 @@
-from abc import ABC
 from dataclasses import dataclass
 from typing import Optional, Dict
 from datetime import datetime
 
-from httpx import Limits
-
 from e2b.api.client.models import SandboxState
 
 
@@ -81,11 +78,3 @@ class SandboxMetrics:
     """Memory used in bytes."""
     timestamp: datetime
     """Timestamp of the metric entry."""
-
-
-class SandboxApiBase(ABC):
-    _limits = Limits(
-        max_keepalive_connections=10,
-        max_connections=20,
-        keepalive_expiry=20,
-    )

packages/python-sdk/e2b/sandbox_async/main.py

@@ -11,7 +11,6 @@
 from e2b.connection_config import ConnectionConfig, ApiParams
 from e2b.envd.api import ENVD_API_HEALTH_ROUTE, ahandle_envd_api_exception
 from e2b.exceptions import format_request_timeout_error, SandboxException
-from e2b.sandbox.main import SandboxSetup
 from e2b.sandbox.sandbox_api import SandboxMetrics
 from e2b.sandbox.utils import class_method_variant
 from e2b.sandbox_async.filesystem.filesystem import Filesystem
@@ -46,7 +45,7 @@ class AsyncSandboxOpts(TypedDict):
     connection_config: ConnectionConfig
 
 
-class AsyncSandbox(SandboxSetup, SandboxApi):
+class AsyncSandbox(SandboxApi):
     """
     E2B cloud sandbox is a secure and isolated cloud environment.
 
@@ -195,7 +194,7 @@ async def create(
             envd_version = None
             envd_access_token = None
         else:
-            response = await SandboxApi._create_sandbox(
+            response = await cls._create_sandbox(
                 template=template or cls.default_template,
                 timeout=timeout or cls.default_sandbox_timeout,
                 metadata=metadata,
@@ -251,7 +250,7 @@ async def connect(
         # Another code block
         same_sandbox = await AsyncSandbox.connect(sandbox_id)
         """
-        response = await SandboxApi._cls_get_info(sandbox_id, **opts)
+        response = await cls._cls_get_info(sandbox_id, **opts)
 
         sandbox_headers = {}
         envd_access_token = response._envd_access_token
@@ -314,7 +313,7 @@ async def kill(
 
         :return: `True` if the sandbox was killed, `False` if the sandbox was not found
         """
-        return await SandboxApi._cls_kill(
+        return await self._cls_kill(
             sandbox_id=self.sandbox_id,
             **self.connection_config.get_api_params(**opts),
         )
@@ -370,7 +369,7 @@ async def set_timeout(  # type: ignore
 
         :param timeout: Timeout for the sandbox in **seconds**
         """
-        await SandboxApi._cls_set_timeout(
+        await self._cls_set_timeout(
             sandbox_id=self.sandbox_id,
             timeout=timeout,
             **self.connection_config.get_api_params(**opts),
@@ -413,7 +412,7 @@ async def get_info(
         :return: Sandbox info
         """
 
-        return await SandboxApi._cls_get_info(
+        return await self._cls_get_info(
             sandbox_id=self.sandbox_id,
             **self.connection_config.get_api_params(**opts),
         )

packages/python-sdk/e2b/sandbox_async/sandbox_api.py

@@ -5,9 +5,9 @@
 from packaging.version import Version
 from typing_extensions import Unpack
 
+from e2b.sandbox.main import SandboxBase
 from e2b.sandbox.sandbox_api import (
     SandboxInfo,
-    SandboxApiBase,
     SandboxQuery,
     ListedSandbox,
     SandboxMetrics,
@@ -31,7 +31,7 @@
 from e2b.api import handle_api_exception
 
 
-class SandboxApi(SandboxApiBase):
+class SandboxApi(SandboxBase):
     @classmethod
     async def list(
         cls,
@@ -59,7 +59,7 @@ async def list(
 
         async with AsyncApiClient(
             config,
-            limits=SandboxApiBase._limits,
+            limits=cls._limits,
         ) as api_client:
             res = await get_sandboxes.asyncio_detailed(
                 client=api_client,
@@ -105,7 +105,7 @@ async def _cls_get_info(
 
         async with AsyncApiClient(
             config,
-            limits=SandboxApiBase._limits,
+            limits=cls._limits,
         ) as api_client:
             res = await get_sandboxes_sandbox_id.asyncio_detailed(
                 sandbox_id,
@@ -146,7 +146,7 @@ async def _cls_kill(
 
         async with AsyncApiClient(
             config,
-            limits=SandboxApiBase._limits,
+            limits=cls._limits,
         ) as api_client:
             res = await delete_sandboxes_sandbox_id.asyncio_detailed(
                 sandbox_id,
@@ -176,7 +176,7 @@ async def _cls_set_timeout(
 
         async with AsyncApiClient(
             config,
-            limits=SandboxApiBase._limits,
+            limits=cls._limits,
         ) as api_client:
             res = await post_sandboxes_sandbox_id_timeout.asyncio_detailed(
                 sandbox_id,
@@ -202,7 +202,7 @@ async def _create_sandbox(
 
         async with AsyncApiClient(
             config,
-            limits=SandboxApiBase._limits,
+            limits=cls._limits,
         ) as api_client:
             res = await post_sandboxes.asyncio_detailed(
                 body=NewSandbox(

packages/python-sdk/e2b/sandbox_sync/main.py

@@ -11,7 +11,6 @@
 from e2b.connection_config import ConnectionConfig, ApiParams
 from e2b.envd.api import ENVD_API_HEALTH_ROUTE, handle_envd_api_exception
 from e2b.exceptions import SandboxException, format_request_timeout_error
-from e2b.sandbox.main import SandboxSetup
 from e2b.sandbox.sandbox_api import SandboxMetrics
 from e2b.sandbox.utils import class_method_variant
 from e2b.sandbox_sync.filesystem.filesystem import Filesystem
@@ -38,7 +37,7 @@ def pool(self):
         return self._pool
 
 
-class Sandbox(SandboxSetup, SandboxApi):
+class Sandbox(SandboxApi):
     """
     E2B cloud sandbox is a secure and isolated cloud environment.
 
@@ -124,7 +123,7 @@ def __init__(
         if debug:
             _sandbox_id = "debug_sandbox_id"
         elif _sandbox_id is not None:
-            response = SandboxApi._cls_get_info(
+            response = self._cls_get_info(
                 _sandbox_id,
                 **opts,
             )
@@ -140,7 +139,7 @@ def __init__(
         else:
             template = template or self.default_template
             timeout = timeout or self.default_sandbox_timeout
-            response = SandboxApi._create_sandbox(
+            response = self._create_sandbox(
                 template=template,
                 timeout=timeout,
                 metadata=metadata,
@@ -307,7 +306,7 @@ def kill(
 
         :return: `True` if the sandbox was killed, `False` if the sandbox was not found
         """
-        return SandboxApi._cls_kill(
+        return self._cls_kill(
             sandbox_id=self.sandbox_id,
             **self.connection_config.get_api_params(**opts),
         )
@@ -365,7 +364,7 @@ def set_timeout(
 
         """
 
-        SandboxApi._cls_set_timeout(
+        self._cls_set_timeout(
             sandbox_id=self.sandbox_id,
             timeout=timeout,
             **self.connection_config.get_api_params(**opts),
@@ -408,7 +407,7 @@ def get_info(
 
         :return: Sandbox info
         """
-        return SandboxApi._cls_get_info(
+        return self._cls_get_info(
             sandbox_id=self.sandbox_id,
             **self.connection_config.get_api_params(**opts),
         )

packages/python-sdk/e2b/sandbox_sync/sandbox_api.py

@@ -7,11 +7,11 @@
 
 from e2b.sandbox.sandbox_api import (
     SandboxInfo,
-    SandboxApiBase,
     SandboxQuery,
     ListedSandbox,
     SandboxMetrics,
 )
+from e2b.sandbox.main import SandboxBase
 from e2b.exceptions import TemplateException, SandboxException
 from e2b.api import ApiClient, SandboxCreateResponse
 from e2b.api.client.models import (
@@ -31,7 +31,7 @@
 from e2b.api import handle_api_exception
 
 
-class SandboxApi(SandboxApiBase):
+class SandboxApi(SandboxBase):
     @classmethod
     def list(
         cls,
@@ -59,7 +59,7 @@ def list(
 
         with ApiClient(
             config,
-            limits=SandboxApiBase._limits,
+            limits=cls._limits,
         ) as api_client:
             res = get_sandboxes.sync_detailed(client=api_client, metadata=metadata)
 
@@ -102,7 +102,7 @@ def _cls_get_info(
 
         with ApiClient(
             config,
-            limits=SandboxApiBase._limits,
+            limits=cls._limits,
         ) as api_client:
             res = get_sandboxes_sandbox_id.sync_detailed(
                 sandbox_id,
@@ -143,7 +143,7 @@ def _cls_kill(
 
         with ApiClient(
             config,
-            limits=SandboxApiBase._limits,
+            limits=cls._limits,
         ) as api_client:
             res = delete_sandboxes_sandbox_id.sync_detailed(
                 sandbox_id,
@@ -173,7 +173,7 @@ def _cls_set_timeout(
 
         with ApiClient(
             config,
-            limits=SandboxApiBase._limits,
+            limits=cls._limits,
         ) as api_client:
             res = post_sandboxes_sandbox_id_timeout.sync_detailed(
                 sandbox_id,
@@ -197,7 +197,7 @@ def _create_sandbox(
     ) -> SandboxCreateResponse:
         config = ConnectionConfig(**opts)
 
-        with ApiClient(config, limits=SandboxApiBase._limits) as api_client:
+        with ApiClient(config, limits=cls._limits) as api_client:
             res = post_sandboxes.sync_detailed(
                 body=NewSandbox(
                     template_id=template,