blaxel 0.2.1rc72__py3-none-any.whl → 0.2.1rc73__py3-none-any.whl

blaxel/core/sandbox/process.py

@@ -10,6 +10,21 @@ from .client.models.process_request import ProcessRequest
 from .types import SandboxConfiguration
 
 
+class ProcessResponseWithLogs(ProcessResponse):
+    """Extended ProcessResponse that adds a logs property."""
+
+    logs: Optional[str] = None
+
+    @classmethod
+    def from_process_response(cls, process_response: ProcessResponse, logs: Optional[str] = None):
+        """Create ProcessResponseWithLogs from an existing ProcessResponse."""
+        # Create a new instance from the dict representation
+        instance = cls.from_dict(process_response.to_dict())
+        # Add the logs
+        instance.logs = logs
+        return instance
+
+
 class SandboxProcess(SandboxAction):
     def __init__(self, sandbox_config: SandboxConfiguration):
         super().__init__(sandbox_config)
@@ -75,16 +90,56 @@ class SandboxProcess(SandboxAction):
 
         return {"close": close}
 
-    async def exec(self, process: Union[ProcessRequest, Dict[str, Any]]) -> ProcessResponse:
+    async def exec(
+        self,
+        process: Union[ProcessRequest, Dict[str, Any]],
+        on_log: Optional[Callable[[str], None]] = None,
+    ) -> ProcessResponseWithLogs:
         if isinstance(process, dict):
             process = ProcessRequest.from_dict(process)
 
         async with self.get_client() as client_instance:
             response = await client_instance.post("/process", json=process.to_dict())
-            self.handle_response_error(
-                response, response.json() if response.content else None, None
-            )
-            return ProcessResponse.from_dict(response.json())
+
+            # Parse JSON response only once, with better error handling
+            response_data = None
+            if response.content:
+                try:
+                    response_data = response.json()
+                except Exception:
+                    # If JSON parsing fails, check the response first
+                    self.handle_response_error(response, None, None)
+                    raise
+
+            self.handle_response_error(response, response_data, None)
+            result = ProcessResponse.from_dict(response_data)
+
+            # Setup log streaming if on_log is provided
+            stream_control = None
+            if on_log is not None:
+                stream_control = self.stream_logs(result.pid, {"on_log": on_log})
+
+            # Wait for completion if requested
+            logs = None
+            if process.wait_for_completion:
+                try:
+                    # Wait for process to complete
+                    result = await self.wait(result.pid)
+
+                    # Get the logs
+                    logs = await self.logs(result.pid, "all")
+                except Exception as e:
+                    # If waiting fails, still try to return what we have
+                    if stream_control:
+                        stream_control["close"]()
+                    raise e
+
+            # Close stream if it was opened and we're done
+            if stream_control and process.wait_for_completion:
+                stream_control["close"]()
+
+            # Return wrapped response with logs
+            return ProcessResponseWithLogs.from_process_response(result, logs)
 
     async def wait(
         self, identifier: str, max_wait: int = 60000, interval: int = 1000

{blaxel-0.2.1rc72.dist-info → blaxel-0.2.1rc73.dist-info}/METADATA

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

{blaxel-0.2.1rc72.dist-info → blaxel-0.2.1rc73.dist-info}/RECORD

@@ -309,7 +309,7 @@ blaxel/core/sandbox/action.py,sha256=9Zjkco7YkLzBThD3N2Hr5SpeEiqU_-Ktk8HlKpkpiAg
 blaxel/core/sandbox/filesystem.py,sha256=dyIvDdlPZO0ijD6mXXX8Yl0t75VijQ6_uMz_9rJd-_4,11317
 blaxel/core/sandbox/network.py,sha256=P5jLd4AAg1zgyIK4qGWvZaDZ5BzIcxRx2ffz_JLsLMI,357
 blaxel/core/sandbox/preview.py,sha256=M6FulOxPghUBpb5fLxu1Rd3ekLeCbZ_dgt4s1X2Cneo,5354
-blaxel/core/sandbox/process.py,sha256=FahDx-FOqXPV3ajVI6aKdXqx4Oi4fK3egojHjTGy8ro,6705
+blaxel/core/sandbox/process.py,sha256=jgOPL5yLzhd98CLO7nBUABIAPFK5S5z34h6L_TyXsuU,8753
 blaxel/core/sandbox/sandbox.py,sha256=tsRGvkb2dnGM5pmOiIxWvOmT42P9BDXWtW3h6_CIffI,5802
 blaxel/core/sandbox/session.py,sha256=4SH1tyXcQ9UqJx4lMwxAlp7x9Te_anDrdSEG6AlNkvU,4496
 blaxel/core/sandbox/types.py,sha256=gmNAt8x7PrJZHpw2_2aWWDE5uG6H-uEgdIKTYIw4G0g,2981
@@ -402,7 +402,7 @@ blaxel/telemetry/instrumentation/map.py,sha256=PCzZJj39yiYVYJrxLBNP-NW-tjjYyTijw
 blaxel/telemetry/instrumentation/utils.py,sha256=KInMYZH-mu9_wvetmf0EmgrfN3Sw8IWk2Y95v2u90_U,1901
 blaxel/telemetry/log/log.py,sha256=RvQByRjZMoP_dRaAZu8oK6DTegsHs-xV4W-UIqis6CA,2461
 blaxel/telemetry/log/logger.py,sha256=NPAS3g82ryROjvc_DEZaTIfrcehoLEZoP-JkLxADxc0,4113
-blaxel-0.2.1rc72.dist-info/METADATA,sha256=_s4a8QbC9FoAHIggS4-uyWKl6YFP9GbEDmTuaWV4Yks,9879
-blaxel-0.2.1rc72.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-blaxel-0.2.1rc72.dist-info/licenses/LICENSE,sha256=p5PNQvpvyDT_0aYBDgmV1fFI_vAD2aSV0wWG7VTgRis,1069
-blaxel-0.2.1rc72.dist-info/RECORD,,
+blaxel-0.2.1rc73.dist-info/METADATA,sha256=7M9mgqu97Tyk403KOchTBU9BzUlFHr8VXZ6JkuC0riM,9879
+blaxel-0.2.1rc73.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+blaxel-0.2.1rc73.dist-info/licenses/LICENSE,sha256=p5PNQvpvyDT_0aYBDgmV1fFI_vAD2aSV0wWG7VTgRis,1069
+blaxel-0.2.1rc73.dist-info/RECORD,,