blaxel 0.2.4__tar.gz → 0.2.5__tar.gz

{blaxel-0.2.4 → blaxel-0.2.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blaxel
-Version: 0.2.4
+Version: 0.2.5
 Summary: Blaxel - AI development platform SDK
 Project-URL: Homepage, https://blaxel.ai
 Project-URL: Documentation, https://docs.blaxel.ai

{blaxel-0.2.4 → blaxel-0.2.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "blaxel"
-version = "0.2.4"
+version = "0.2.5"
 description = "Blaxel - AI development platform SDK"
 readme = "README.md"
 authors = [{ name = "cploujoux", email = "cploujoux@blaxel.ai" }]

{blaxel-0.2.4 → blaxel-0.2.5}/src/blaxel/core/sandbox/__init__.py

@@ -7,6 +7,7 @@ from .sandbox import (
 )
 from .types import (
     CopyResponse,
+    ProcessRequestWithLog,
     SandboxConfiguration,
     SandboxCreateConfiguration,
     SandboxFilesystemFile,
@@ -28,4 +29,5 @@ __all__ = [
     "SandboxFileSystem",
     "SandboxPreviews",
     "SandboxProcess",
+    "ProcessRequestWithLog",
 ]

{blaxel-0.2.4 → blaxel-0.2.5}/src/blaxel/core/sandbox/process.py

@@ -7,7 +7,7 @@ from ..common.settings import settings
 from .action import SandboxAction
 from .client.models import ProcessResponse, SuccessResponse
 from .client.models.process_request import ProcessRequest
-from .types import SandboxConfiguration
+from .types import ProcessRequestWithLog, SandboxConfiguration
 
 
 class SandboxProcess(SandboxAction):
@@ -76,11 +76,17 @@ class SandboxProcess(SandboxAction):
         return {"close": close}
 
     async def exec(
-        self,
-        process: Union[ProcessRequest, Dict[str, Any]],
-        on_log: Optional[Callable[[str], None]] = None,
+        self, process: Union[ProcessRequest, ProcessRequestWithLog, Dict[str, Any]]
     ) -> ProcessResponse:
+        on_log = None
+        if isinstance(process, ProcessRequestWithLog):
+            on_log = process.on_log
+            process = process.to_dict()
+
         if isinstance(process, dict):
+            if "on_log" in process:
+                on_log = process["on_log"]
+                del process["on_log"]
             process = ProcessRequest.from_dict(process)
 
         # Store original wait_for_completion setting

{blaxel-0.2.4 → blaxel-0.2.5}/src/blaxel/core/sandbox/types.py

@@ -1,8 +1,11 @@
 from datetime import datetime
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Callable, Dict, List, Optional, Union
+
+from attrs import define as _attrs_define
 
 from ..client.models import Port, Sandbox
 from ..client.types import UNSET
+from .client.models.process_request import ProcessRequest
 
 
 class SessionCreateOptions:
@@ -164,9 +167,18 @@ class SandboxCreateConfiguration:
             if isinstance(env, dict):
                 # Validate that the dict has the required keys
                 if "name" not in env or "value" not in env:
-                    raise ValueError(f"Environment variable dict must have 'name' and 'value' keys: {env}")
+                    raise ValueError(
+                        f"Environment variable dict must have 'name' and 'value' keys: {env}"
+                    )
                 env_objects.append({"name": env["name"], "value": env["value"]})
             else:
-                raise ValueError(f"Invalid env type: {type(env)}. Expected dict with 'name' and 'value' keys.")
+                raise ValueError(
+                    f"Invalid env type: {type(env)}. Expected dict with 'name' and 'value' keys."
+                )
 
         return env_objects
+
+
+@_attrs_define
+class ProcessRequestWithLog(ProcessRequest):
+    on_log: Callable[[str], None] = None

{blaxel-0.2.4 → blaxel-0.2.5}/tests/integration/sandbox/process.py

@@ -3,7 +3,7 @@ from logging import getLogger
 
 from utils import create_or_get_sandbox
 
-from blaxel.core.sandbox import SandboxInstance
+from blaxel.core.sandbox import ProcessRequestWithLog, SandboxInstance
 from blaxel.core.sandbox.client.models.process_request import ProcessRequest
 
 logger = getLogger(__name__)
@@ -60,12 +60,13 @@ async def test_on_log_callback(sandbox: SandboxInstance):
         print(f"   📝 Log received: {message!r}")  # Show repr to see exact content
 
     # Create a process that outputs logs over time
-    process_request = ProcessRequest(
-        command='sh -c "echo First message; sleep 1; echo Second message; sleep 1; echo Third message"'
+    process_request = ProcessRequestWithLog(
+        command='sh -c "echo First message; sleep 1; echo Second message; sleep 1; echo Third message"',
+        on_log=log_collector,
     )
 
     # Execute with on_log callback (name will be auto-generated)
-    response = await sandbox.process.exec(process_request, on_log=log_collector)
+    response = await sandbox.process.exec(process_request)
 
     # Check that a name was generated
     assert response.name is not None
@@ -104,14 +105,15 @@ async def test_combined_features(sandbox: SandboxInstance):
         realtime_logs.append(message)
 
     # Create a process with a specific name
-    process_request = ProcessRequest(
+    process_request = ProcessRequestWithLog(
         name="combined-test",
         command='sh -c "echo Starting combined test; sleep 1; echo Middle of test; sleep 1; echo Test completed"',
         wait_for_completion=True,
+        on_log=realtime_collector,
     )
 
     # Execute with both features
-    response = await sandbox.process.exec(process_request, on_log=realtime_collector)
+    response = await sandbox.process.exec(process_request)
 
     # Check the response
     assert response.name == "combined-test"
@@ -150,10 +152,10 @@ async def test_on_log_without_name(sandbox: SandboxInstance):
         log_count += 1
 
     # Process without name
-    process_dict = {"command": "echo 'Testing auto name generation'"}
+    process_dict = {"command": "echo 'Testing auto name generation'", "on_log": count_logs}
 
     # Execute with on_log (should auto-generate name)
-    response = await sandbox.process.exec(process_dict, on_log=count_logs)
+    response = await sandbox.process.exec(process_dict)
 
     # Check that name was generated
     assert response.name is not None

{blaxel-0.2.4 → blaxel-0.2.5}/tests/integration/sandbox/utils.py

@@ -163,11 +163,21 @@ async def check_usage(sandbox: SandboxInstance) -> None:
 
     # Check disk space
     disk_space = await sandbox.process.exec(
-        name="disk-space", command="df -m", working_dir="/home/user"
+        {
+            "name": "disk-space",
+            "command": "df -m",
+            "working_dir": "/home/user",
+        }
     )
 
     # Check memory usage
-    memory = await sandbox.process.exec(name="memory", command="free -m", working_dir="/home/user")
+    memory = await sandbox.process.exec(
+        {
+            "name": "memory",
+            "command": "free -m",
+            "working_dir": "/home/user",
+        }
+    )
 
     # Get logs
     memory_logs = await sandbox.process.logs(memory.pid, "all")