blaxel 0.2.36__py3-none-any.whl → 0.2.38__py3-none-any.whl

blaxel/core/sandbox/default/system.py

@@ -0,0 +1,71 @@
+from typing import Union
+
+from ...common.settings import settings
+from ..client.api.system.get_health import asyncio as get_health
+from ..client.api.system.post_upgrade import asyncio as post_upgrade
+from ..client.client import Client
+from ..client.models import ErrorResponse, HealthResponse, SuccessResponse, UpgradeRequest
+from ..types import SandboxConfiguration
+from .action import SandboxAction
+
+
+class SandboxSystem(SandboxAction):
+    """System operations for sandbox including upgrade functionality."""
+
+    def __init__(self, sandbox_config: SandboxConfiguration):
+        super().__init__(sandbox_config)
+
+    async def upgrade(
+        self,
+        version: str | None = None,
+        base_url: str | None = None,
+    ) -> SuccessResponse:
+        """Upgrade the sandbox-api to a new version.
+
+        Triggers an upgrade of the sandbox-api process. Returns immediately before upgrading.
+        The upgrade will: download the specified binary from GitHub releases, validate it, and restart.
+        All running processes will be preserved across the upgrade.
+
+        Args:
+            version: Version to upgrade to - "develop" (default), "main", "latest",
+                     or specific tag like "v1.0.0"
+            base_url: Base URL for releases (useful for forks, defaults to
+                      https://github.com/blaxel-ai/sandbox/releases)
+
+        Returns:
+            SuccessResponse with status information
+        """
+        request = UpgradeRequest(version=version, base_url=base_url)
+
+        client = Client(
+            base_url=self.url,
+            headers={**settings.headers, **self.sandbox_config.headers},
+        )
+
+        async with client:
+            response = await post_upgrade(client=client, body=request)
+            if response is None:
+                raise Exception("Failed to upgrade sandbox")
+            if isinstance(response, ErrorResponse):
+                raise Exception(f"Upgrade failed: {response.error}")
+            return response
+
+    async def health(self) -> HealthResponse:
+        """Get health status and system information.
+
+        Returns health status and system information including upgrade count and binary details.
+        Also includes last upgrade attempt status with detailed error information if available.
+
+        Returns:
+            HealthResponse with system status information
+        """
+        client = Client(
+            base_url=self.url,
+            headers={**settings.headers, **self.sandbox_config.headers},
+        )
+
+        async with client:
+            response = await get_health(client=client)
+            if response is None:
+                raise Exception("Failed to get health status")
+            return response

blaxel/core/sandbox/sync/__init__.py

@@ -6,6 +6,7 @@ from .sandbox import (
     SyncSandboxPreviews,
     SyncSandboxProcess,
 )
+from .system import SyncSandboxSystem
 
 __all__ = [
     "SyncSandboxInstance",
@@ -13,5 +14,6 @@ __all__ = [
     "SyncSandboxPreviews",
     "SyncSandboxProcess",
     "SyncSandboxCodegen",
+    "SyncSandboxSystem",
     "SyncCodeInterpreter",
 ]

blaxel/core/sandbox/sync/filesystem.py

@@ -14,6 +14,7 @@ from ..types import (
     SandboxConfiguration,
     SandboxFilesystemFile,
     WatchEvent,
+    WatchHandle,
 )
 from .action import SyncSandboxAction
 
@@ -162,7 +163,23 @@ class SyncSandboxFileSystem(SyncSandboxAction):
         path: str,
         callback: Callable[[WatchEvent], None],
         options: Dict[str, Any] | None = None,
-    ) -> Dict[str, Callable]:
+    ) -> WatchHandle:
+        """Watch for file system changes.
+
+        Returns a WatchHandle that can be used as a context manager:
+
+            with sandbox.fs.watch(path, callback) as handle:
+                # do something
+            # handle is automatically closed
+
+        Or manually:
+
+            handle = sandbox.fs.watch(path, callback)
+            try:
+                # do something
+            finally:
+                handle.close()
+        """
         path = self.format_path(path)
         closed = threading.Event()
         if options is None:
@@ -226,7 +243,7 @@ class SyncSandboxFileSystem(SyncSandboxAction):
         def close():
             closed.set()
 
-        return {"close": close}
+        return WatchHandle(close)
 
     def format_path(self, path: str) -> str:
         return path

blaxel/core/sandbox/sync/preview.py

@@ -1,3 +1,4 @@
+import time
 from dataclasses import dataclass
 from datetime import datetime
 from typing import Any, Dict, List, Union
@@ -11,6 +12,9 @@ from ...client.api.compute.delete_sandbox_preview import sync as delete_sandbox_
 from ...client.api.compute.delete_sandbox_preview_token import (
     sync as delete_sandbox_preview_token,
 )
+from ...client.api.compute.get_sandbox_preview import (
+    sync_detailed as get_sandbox_preview_detailed,
+)
 from ...client.api.compute.get_sandbox_preview import sync as get_sandbox_preview
 from ...client.api.compute.list_sandbox_preview_tokens import (
     sync as list_sandbox_preview_tokens,
@@ -188,9 +192,52 @@ class SyncSandboxPreviews:
             preview_name,
             client=client,
         )
-        if response:
-            return response
-        raise errors.UnexpectedStatus(400, b"Failed to delete preview")
+        if not response:
+            raise errors.UnexpectedStatus(400, b"Failed to delete preview")
+
+        # If the preview is in DELETING state, wait for it to be fully deleted
+        if response.status == "DELETING":
+            self._wait_for_deletion(preview_name)
+
+        return response
+
+    def _wait_for_deletion(self, preview_name: str, timeout_ms: int = 10000) -> None:
+        """Wait for a preview to be fully deleted.
+
+        Args:
+            preview_name: Name of the preview to wait for
+            timeout_ms: Timeout in milliseconds (default: 10000)
+
+        Raises:
+            Exception: If the preview is still in DELETING state after timeout
+        """
+        print(f"Waiting for preview deletion: {preview_name}")
+        poll_interval = 0.5  # Poll every 500ms
+        elapsed = 0.0
+        timeout_seconds = timeout_ms / 1000.0
+
+        while elapsed < timeout_seconds:
+            try:
+                response = get_sandbox_preview_detailed(
+                    self.sandbox_name,
+                    preview_name,
+                    client=client,
+                )
+                if response.status_code == 404:
+                    return
+            except errors.UnexpectedStatus as e:
+                # 404 means the preview is deleted
+                if e.status_code == 404:
+                    return
+                raise
+            # Preview still exists, wait and retry
+            time.sleep(poll_interval)
+            elapsed += poll_interval
+
+        # Timeout reached, but deletion was initiated
+        raise Exception(
+            f"Preview deletion timeout: {preview_name} is still in DELETING state after {timeout_ms}ms"
+        )
 
 
 def to_utc_z(dt: datetime) -> str:

blaxel/core/sandbox/sync/process.py

@@ -7,7 +7,12 @@ import httpx
 from ...common.settings import settings
 from ..client.models import ProcessResponse, SuccessResponse
 from ..client.models.process_request import ProcessRequest
-from ..types import ProcessRequestWithLog, ProcessResponseWithLog, SandboxConfiguration
+from ..types import (
+    ProcessRequestWithLog,
+    ProcessResponseWithLog,
+    SandboxConfiguration,
+    StreamHandle,
+)
 from .action import SyncSandboxAction
 
 
@@ -19,19 +24,35 @@ class SyncSandboxProcess(SyncSandboxAction):
         self,
         process_name: str,
         options: Dict[str, Callable[[str], None]] | None = None,
-    ) -> Dict[str, Callable[[], None]]:
+    ) -> StreamHandle:
+        """Stream logs from a process with automatic reconnection and deduplication.
+
+        Returns a StreamHandle that can be used as a context manager:
+
+            with sandbox.process.stream_logs(name, options) as handle:
+                # do something
+            # handle is automatically closed
+
+        Or manually:
+
+            handle = sandbox.process.stream_logs(name, options)
+            try:
+                # do something
+            finally:
+                handle.close()
+        """
         if options is None:
             options = {}
         reconnect_interval = 30
         is_running = threading.Event()
         is_running.set()
         seen_logs = set()
-        current_close = {"fn": None}
+        current_stream: StreamHandle | None = None
         timer_lock = threading.Lock()
-        reconnect_timer = {"t": None}
+        reconnect_timer: dict[str, threading.Timer | None] = {"t": None}
 
         def start_stream():
-            nonlocal current_close
+            nonlocal current_stream
             log_counter = [0]
 
             def make_dedup(cb_key: str):
@@ -52,9 +73,9 @@ class SyncSandboxProcess(SyncSandboxAction):
                 wrapped_options["on_stdout"] = make_dedup("on_stdout")
             if "on_stderr" in options:
                 wrapped_options["on_stderr"] = make_dedup("on_stderr")
-            if current_close["fn"]:
-                current_close["fn"]()
-            current_close["fn"] = self._stream_logs(process_name, wrapped_options)["close"]
+            if current_stream:
+                current_stream.close()
+            current_stream = self._stream_logs(process_name, wrapped_options)
 
             def schedule():
                 if is_running.is_set():
@@ -71,23 +92,25 @@ class SyncSandboxProcess(SyncSandboxAction):
         start_stream()
 
         def close():
+            nonlocal current_stream
             is_running.clear()
             with timer_lock:
                 if reconnect_timer["t"]:
                     reconnect_timer["t"].cancel()
                     reconnect_timer["t"] = None
-            if current_close["fn"]:
-                current_close["fn"]()
-                current_close["fn"] = None
+            if current_stream:
+                current_stream.close()
+                current_stream = None
             seen_logs.clear()
 
-        return {"close": close}
+        return StreamHandle(close)
 
     def _stream_logs(
         self,
         identifier: str,
         options: Dict[str, Callable[[str], None]] | None = None,
-    ) -> Dict[str, Callable[[], None]]:
+    ) -> StreamHandle:
+        """Private method to stream logs from a process with callbacks for different output types."""
         if options is None:
             options = {}
         closed = threading.Event()
@@ -136,7 +159,7 @@ class SyncSandboxProcess(SyncSandboxAction):
         def close():
             closed.set()
 
-        return {"close": close}
+        return StreamHandle(close)
 
     def exec(
         self,
@@ -191,7 +214,7 @@ class SyncSandboxProcess(SyncSandboxAction):
                     )
                     return ProcessResponseWithLog(
                         result,
-                        lambda: stream_control["close"]() if stream_control else None,
+                        lambda: stream_control.close() if stream_control else None,
                     )
 
                 return result

blaxel/core/sandbox/sync/sandbox.py

@@ -8,7 +8,13 @@ from ...client.api.compute.get_sandbox import sync as get_sandbox
 from ...client.api.compute.list_sandboxes import sync as list_sandboxes
 from ...client.api.compute.update_sandbox import sync as update_sandbox
 from ...client.client import client
-from ...client.models import Metadata, Sandbox, SandboxLifecycle, SandboxRuntime, SandboxSpec
+from ...client.models import (
+    Metadata,
+    Sandbox,
+    SandboxLifecycle,
+    SandboxRuntime,
+    SandboxSpec,
+)
 from ...client.models.error import Error
 from ...client.models.sandbox_error import SandboxError
 from ...client.types import UNSET
@@ -26,6 +32,7 @@ from .network import SyncSandboxNetwork
 from .preview import SyncSandboxPreviews
 from .process import SyncSandboxProcess
 from .session import SyncSandboxSessions
+from .system import SyncSandboxSystem
 
 logger = logging.getLogger(__name__)
 
@@ -73,6 +80,7 @@ class SyncSandboxInstance:
         self.sessions = SyncSandboxSessions(self.config)
         self.network = SyncSandboxNetwork(self.config)
         self.codegen = SyncSandboxCodegen(self.config)
+        self.system = SyncSandboxSystem(self.config)
 
     @property
     def metadata(self):
@@ -90,6 +98,14 @@ class SyncSandboxInstance:
     def spec(self):
         return self.sandbox.spec
 
+    @property
+    def last_used_at(self):
+        return self.sandbox.last_used_at
+
+    @property
+    def expires_in(self):
+        return self.sandbox.expires_in
+
     def wait(self, max_wait: int = 60000, interval: int = 1000) -> "SyncSandboxInstance":
         logger.warning(
             "⚠️  Warning: sandbox.wait() is deprecated. You don't need to wait for the sandbox to be deployed anymore."
@@ -159,17 +175,26 @@ class SyncSandboxInstance:
                     volumes=volumes,
                 ),
             )
-            if ttl:
+            if ttl and sandbox.spec.runtime:
                 sandbox.spec.runtime.ttl = ttl
-            if expires:
+            if expires and sandbox.spec.runtime:
                 sandbox.spec.runtime.expires = expires.isoformat()
             if region:
                 sandbox.spec.region = region
             if lifecycle:
-                sandbox.spec.lifecycle = lifecycle
+                if type(lifecycle) is dict:
+                    lifecycle = SandboxLifecycle.from_dict(lifecycle)
+                    assert lifecycle is not None
+                    sandbox.spec.lifecycle = lifecycle
+                elif type(lifecycle) is SandboxLifecycle:
+                    sandbox.spec.lifecycle = lifecycle
+                else:
+                    raise ValueError(f"Invalid lifecycle type: {type(lifecycle)}")
         else:
             if isinstance(sandbox, dict):
                 sandbox = Sandbox.from_dict(sandbox)
+            assert isinstance(sandbox, Sandbox)
+
             if not sandbox.metadata:
                 sandbox.metadata = Metadata(name=default_name)
             if not sandbox.spec:

blaxel/core/sandbox/sync/system.py

@@ -0,0 +1,71 @@
+from typing import Union
+
+from ...common.settings import settings
+from ..client.api.system.get_health import sync as get_health
+from ..client.api.system.post_upgrade import sync as post_upgrade
+from ..client.client import Client
+from ..client.models import ErrorResponse, HealthResponse, SuccessResponse, UpgradeRequest
+from ..types import SandboxConfiguration
+from .action import SyncSandboxAction
+
+
+class SyncSandboxSystem(SyncSandboxAction):
+    """System operations for sandbox including upgrade functionality (sync version)."""
+
+    def __init__(self, sandbox_config: SandboxConfiguration):
+        super().__init__(sandbox_config)
+
+    def upgrade(
+        self,
+        version: str | None = None,
+        base_url: str | None = None,
+    ) -> SuccessResponse:
+        """Upgrade the sandbox-api to a new version.
+
+        Triggers an upgrade of the sandbox-api process. Returns immediately before upgrading.
+        The upgrade will: download the specified binary from GitHub releases, validate it, and restart.
+        All running processes will be preserved across the upgrade.
+
+        Args:
+            version: Version to upgrade to - "develop" (default), "main", "latest",
+                     or specific tag like "v1.0.0"
+            base_url: Base URL for releases (useful for forks, defaults to
+                      https://github.com/blaxel-ai/sandbox/releases)
+
+        Returns:
+            SuccessResponse with status information
+        """
+        request = UpgradeRequest(version=version, base_url=base_url)
+
+        client = Client(
+            base_url=self.url,
+            headers={**settings.headers, **self.sandbox_config.headers},
+        )
+
+        with client:
+            response = post_upgrade(client=client, body=request)
+            if response is None:
+                raise Exception("Failed to upgrade sandbox")
+            if isinstance(response, ErrorResponse):
+                raise Exception(f"Upgrade failed: {response.error}")
+            return response
+
+    def health(self) -> HealthResponse:
+        """Get health status and system information.
+
+        Returns health status and system information including upgrade count and binary details.
+        Also includes last upgrade attempt status with detailed error information if available.
+
+        Returns:
+            HealthResponse with system status information
+        """
+        client = Client(
+            base_url=self.url,
+            headers={**settings.headers, **self.sandbox_config.headers},
+        )
+
+        with client:
+            response = get_health(client=client)
+            if response is None:
+                raise Exception("Failed to get health status")
+            return response