Skip to content

Secure, Fast, and Extensible Sandbox runtime for AI agents.

refactor(sdk-python): extract extra create kwargs helper

Aling331541b63f8f0f
diff --git a/sdks/sandbox/python/src/opensandbox/pool_async.py b/sdks/sandbox/python/src/opensandbox/pool_async.py
index 791998cb7..d25295967 100644
--- a/sdks/sandbox/python/src/opensandbox/pool_async.py
+++ b/sdks/sandbox/python/src/opensandbox/pool_async.py
@@ -23,7 +23,6 @@ import math
import time
from collections.abc import Awaitable, Callable
from datetime import timedelta
-from typing import Any
from opensandbox._async_pool_reconciler import run_async_reconcile_tick
from opensandbox._async_pool_store import InMemoryAsyncPoolStateStore
@@ -62,6 +61,7 @@ from opensandbox.pool_types import (
PoolLifecycleState,
PoolSnapshot,
PoolState,
+ _extra_create_kwargs,
effective_max_idle_attempts,
policy_falls_through_to_direct_create,
)
@@ -913,9 +913,7 @@ class SandboxPoolAsync:
)
spec = self._creation_spec
- extra_create_kwargs: dict[str, Any] = {}
- if spec.credential_proxy is not None:
- extra_create_kwargs["credential_proxy"] = spec.credential_proxy
+ create_kwargs = _extra_create_kwargs(spec)
return await self._sandbox_factory.create(
spec.image,
timeout=self._config.idle_timeout,
@@ -924,7 +922,7 @@ class SandboxPoolAsync:
metadata=spec.metadata,
resource=spec.resource,
network_policy=spec.network_policy,
- **extra_create_kwargs,
+ **create_kwargs,
platform=spec.platform,
extensions=spec.extensions,
secure_access=spec.secure_access,
@@ -957,9 +955,7 @@ class SandboxPoolAsync:
return sandbox
spec = self._creation_spec
- extra_create_kwargs: dict[str, Any] = {}
- if spec.credential_proxy is not None:
- extra_create_kwargs["credential_proxy"] = spec.credential_proxy
+ create_kwargs = _extra_create_kwargs(spec)
sandbox = await self._sandbox_factory.create(
spec.image,
timeout=self._config.idle_timeout,
@@ -968,7 +964,7 @@ class SandboxPoolAsync:
metadata=spec.metadata,
resource=spec.resource,
network_policy=spec.network_policy,
- **extra_create_kwargs,
+ **create_kwargs,
platform=spec.platform,
extensions=spec.extensions,
secure_access=spec.secure_access,
diff --git a/sdks/sandbox/python/src/opensandbox/pool_types.py b/sdks/sandbox/python/src/opensandbox/pool_types.py
index e77e247b6..16b3bf590 100644
--- a/sdks/sandbox/python/src/opensandbox/pool_types.py
+++ b/sdks/sandbox/python/src/opensandbox/pool_types.py
@@ -21,7 +21,7 @@ from collections.abc import Callable
from dataclasses import dataclass, replace
from datetime import datetime, timedelta
from enum import Enum
-from typing import TYPE_CHECKING, Protocol, cast
+from typing import TYPE_CHECKING, Any, Protocol, cast
from uuid import uuid4
from opensandbox.config.connection_sync import ConnectionConfigSync
@@ -325,6 +325,20 @@ class PoolCreationSpec:
credential_proxy: CredentialProxyConfig | None = None
+def _extra_create_kwargs(spec: PoolCreationSpec) -> dict[str, Any]:
+ """Forward a spec field to ``create`` only when it is set.
+
+ Legacy custom factories declare the pre-existing pool keywords instead of
+ ``**kwargs``, so an unset field has to be omitted rather than passed as
+ ``None``. Keeping the rule here stops the four create paths from drifting
+ when the next optional spec field is added.
+ """
+ kwargs: dict[str, Any] = {}
+ if spec.credential_proxy is not None:
+ kwargs["credential_proxy"] = spec.credential_proxy
+ return kwargs
+
+
@dataclass(frozen=True)
class PoolConfig:
"""Configuration for a client-side sandbox pool."""
diff --git a/sdks/sandbox/python/src/opensandbox/sync/pool.py b/sdks/sandbox/python/src/opensandbox/sync/pool.py
index 79bb0558b..97f0de0a9 100644
--- a/sdks/sandbox/python/src/opensandbox/sync/pool.py
+++ b/sdks/sandbox/python/src/opensandbox/sync/pool.py
@@ -25,7 +25,7 @@ import time
from collections.abc import Callable
from concurrent.futures import CancelledError, Future, ThreadPoolExecutor
from datetime import timedelta
-from typing import Any, TypeVar
+from typing import TypeVar
from opensandbox._pool_reconciler import ReconcileState, run_reconcile_tick
from opensandbox.config.connection_sync import ConnectionConfigSync
@@ -60,6 +60,7 @@ from opensandbox.pool_types import (
PoolLifecycleState,
PoolSnapshot,
PoolState,
+ _extra_create_kwargs,
effective_max_idle_attempts,
policy_falls_through_to_direct_create,
)
@@ -1133,9 +1134,7 @@ class SandboxPoolSync:
)
spec = self._creation_spec
- extra_create_kwargs: dict[str, Any] = {}
- if spec.credential_proxy is not None:
- extra_create_kwargs["credential_proxy"] = spec.credential_proxy
+ create_kwargs = _extra_create_kwargs(spec)
return self._sandbox_factory.create(
spec.image,
timeout=self._config.idle_timeout,
@@ -1144,7 +1143,7 @@ class SandboxPoolSync:
metadata=spec.metadata,
resource=spec.resource,
network_policy=spec.network_policy,
- **extra_create_kwargs,
+ **create_kwargs,
platform=spec.platform,
extensions=spec.extensions,
secure_access=spec.secure_access,
@@ -1188,9 +1187,7 @@ class SandboxPoolSync:
return sandbox
spec = self._creation_spec
- extra_create_kwargs: dict[str, Any] = {}
- if spec.credential_proxy is not None:
- extra_create_kwargs["credential_proxy"] = spec.credential_proxy
+ create_kwargs = _extra_create_kwargs(spec)
sandbox = self._sandbox_factory.create(
spec.image,
timeout=self._config.idle_timeout,
@@ -1199,7 +1196,7 @@ class SandboxPoolSync:
metadata=spec.metadata,
resource=spec.resource,
network_policy=spec.network_policy,
- **extra_create_kwargs,
+ **create_kwargs,
platform=spec.platform,
extensions=spec.extensions,
secure_access=spec.secure_access,