blaxel 0.2.1rc77__py3-none-any.whl → 0.2.2__py3-none-any.whl

blaxel/core/sandbox/sandbox.py

@@ -10,6 +10,7 @@ from ..client.api.compute.get_sandbox import asyncio as get_sandbox
 from ..client.api.compute.list_sandboxes import asyncio as list_sandboxes
 from ..client.client import client
 from ..client.models import Metadata, Runtime, Sandbox, SandboxSpec
+from ..client.types import UNSET
 from .filesystem import SandboxFileSystem
 from .network import SandboxNetwork
 from .preview import SandboxPreviews
@@ -76,13 +77,20 @@ class SandboxInstance:
         default_image = "blaxel/prod-base:latest"
         default_memory = 4096
 
-        # Handle SandboxCreateConfiguration or simple dict with name/image/memory keys
-        if sandbox is None or isinstance(sandbox, (SandboxCreateConfiguration, dict)) and (
-            not isinstance(sandbox, Sandbox) and (
-                sandbox is None or
-                'name' in (sandbox if isinstance(sandbox, dict) else sandbox.__dict__) or
-                'image' in (sandbox if isinstance(sandbox, dict) else sandbox.__dict__) or
-                'memory' in (sandbox if isinstance(sandbox, dict) else sandbox.__dict__)
+        # Handle SandboxCreateConfiguration or simple dict with name/image/memory/ports/envs keys
+        if (
+            sandbox is None
+            or isinstance(sandbox, SandboxCreateConfiguration | dict)
+            and (
+                not isinstance(sandbox, Sandbox)
+                and (
+                    sandbox is None
+                    or "name" in (sandbox if isinstance(sandbox, dict) else sandbox.__dict__)
+                    or "image" in (sandbox if isinstance(sandbox, dict) else sandbox.__dict__)
+                    or "memory" in (sandbox if isinstance(sandbox, dict) else sandbox.__dict__)
+                    or "ports" in (sandbox if isinstance(sandbox, dict) else sandbox.__dict__)
+                    or "envs" in (sandbox if isinstance(sandbox, dict) else sandbox.__dict__)
+                )
             )
         ):
             if sandbox is None:
@@ -94,11 +102,15 @@ class SandboxInstance:
             name = sandbox.name or default_name
             image = sandbox.image or default_image
             memory = sandbox.memory or default_memory
+            ports = sandbox._normalize_ports() or UNSET
+            envs = sandbox._normalize_envs() or UNSET
 
             # Create full Sandbox object
             sandbox = Sandbox(
                 metadata=Metadata(name=name),
-                spec=SandboxSpec(runtime=Runtime(image=image, memory=memory, generation="mk3"))
+                spec=SandboxSpec(
+                    runtime=Runtime(image=image, memory=memory, ports=ports, envs=envs, generation="mk3")
+                ),
             )
         else:
             # Handle existing Sandbox object or dict conversion
@@ -107,7 +119,7 @@ class SandboxInstance:
 
             # Set defaults for missing fields
             if not sandbox.metadata:
-                sandbox.metadata = Metadata(name=uuid.uuid4().hex.replace('-', ''))
+                sandbox.metadata = Metadata(name=uuid.uuid4().hex.replace("-", ""))
             if not sandbox.spec:
                 sandbox.spec = SandboxSpec(runtime=Runtime(image=default_image))
             if not sandbox.spec.runtime:
@@ -154,10 +166,10 @@ class SandboxInstance:
             if isinstance(sandbox, SandboxCreateConfiguration):
                 name = sandbox.name
             elif isinstance(sandbox, dict):
-                if 'name' in sandbox:
-                    name = sandbox['name']
-                elif 'metadata' in sandbox and isinstance(sandbox['metadata'], dict):
-                    name = sandbox['metadata'].get('name')
+                if "name" in sandbox:
+                    name = sandbox["name"]
+                elif "metadata" in sandbox and isinstance(sandbox["metadata"], dict):
+                    name = sandbox["metadata"].get("name")
                 else:
                     # If no name provided, we can't check if it exists, so create new
                     return await cls.create(sandbox)

blaxel/core/sandbox/types.py

@@ -1,7 +1,8 @@
 from datetime import datetime
-from typing import Any, Dict, Optional
+from typing import Any, Dict, List, Optional, Union
 
-from ..client.models import Sandbox
+from ..client.models import Port, Sandbox
+from ..client.types import UNSET
 
 
 class SessionCreateOptions:
@@ -105,15 +106,20 @@ class CopyResponse:
 
 class SandboxCreateConfiguration:
     """Simplified configuration for creating sandboxes with default values."""
+
     def __init__(
         self,
         name: Optional[str] = None,
         image: Optional[str] = None,
         memory: Optional[int] = None,
+        ports: Optional[Union[List[Port], List[Dict[str, Any]]]] = None,
+        envs: Optional[List[Dict[str, str]]] = None,
     ):
         self.name = name
         self.image = image
         self.memory = memory
+        self.ports = ports
+        self.envs = envs
 
     @classmethod
     def from_dict(cls, data: Dict[str, Any]) -> "SandboxCreateConfiguration":
@@ -121,4 +127,46 @@ class SandboxCreateConfiguration:
             name=data.get("name"),
             image=data.get("image"),
             memory=data.get("memory"),
+            ports=data.get("ports"),
+            envs=data.get("envs"),
         )
+
+    def _normalize_ports(self) -> Optional[List[Port]]:
+        """Convert ports to Port objects with default protocol HTTP if not specified."""
+        if not self.ports:
+            return None
+
+        port_objects = []
+        for port in self.ports:
+            if isinstance(port, Port):
+                # If it's already a Port object, ensure protocol defaults to HTTP
+                if port.protocol is UNSET or not port.protocol:
+                    port.protocol = "HTTP"
+                port_objects.append(port)
+            elif isinstance(port, dict):
+                # Convert dict to Port object with HTTP as default protocol
+                port_dict = port.copy()
+                if "protocol" not in port_dict or not port_dict["protocol"]:
+                    port_dict["protocol"] = "HTTP"
+                port_objects.append(Port.from_dict(port_dict))
+            else:
+                raise ValueError(f"Invalid port type: {type(port)}. Expected Port object or dict.")
+
+        return port_objects
+
+    def _normalize_envs(self) -> Optional[List[Dict[str, str]]]:
+        """Convert envs to list of dicts with name and value keys."""
+        if not self.envs:
+            return None
+
+        env_objects = []
+        for env in self.envs:
+            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}")
+                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.")
+
+        return env_objects

blaxel/googleadk/tools.py

@@ -69,4 +69,3 @@ async def bl_tools(tools_names: list[str], **kwargs: Any) -> list[BaseTool]:
     tools = bl_tools_core(tools_names, **kwargs)
     await tools.initialize()
     return [GoogleADKTool(tool) for tool in tools.get_tools()]
-    return [GoogleADKTool(tool) for tool in tools.get_tools()]

{blaxel-0.2.1rc77.dist-info → blaxel-0.2.2.dist-info}/METADATA

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

{blaxel-0.2.1rc77.dist-info → blaxel-0.2.2.dist-info}/RECORD

@@ -310,9 +310,9 @@ blaxel/core/sandbox/filesystem.py,sha256=dyIvDdlPZO0ijD6mXXX8Yl0t75VijQ6_uMz_9rJ
 blaxel/core/sandbox/network.py,sha256=P5jLd4AAg1zgyIK4qGWvZaDZ5BzIcxRx2ffz_JLsLMI,357
 blaxel/core/sandbox/preview.py,sha256=M6FulOxPghUBpb5fLxu1Rd3ekLeCbZ_dgt4s1X2Cneo,5354
 blaxel/core/sandbox/process.py,sha256=7zEngDTs2XiNsMm9TZ4lEDUiRpS3af8dw60pEvRuHDY,8357
-blaxel/core/sandbox/sandbox.py,sha256=4sG_i_VcuGx_cKEGMY-2eUUuGmtQBYMNIToL7YDuluM,8151
+blaxel/core/sandbox/sandbox.py,sha256=y6mV2-i6TsSZGQsvBBGptR514OfgvhV0hXBMEsOBcsY,8648
 blaxel/core/sandbox/session.py,sha256=4SH1tyXcQ9UqJx4lMwxAlp7x9Te_anDrdSEG6AlNkvU,4496
-blaxel/core/sandbox/types.py,sha256=yaKkp5Sn0b4Ri2_ZbdEjXuA-rjo2_DfDIHYz-cueZCA,3564
+blaxel/core/sandbox/types.py,sha256=nsbvZLUxvDZkg2oExE3HdXx2qIpPaaoa7_lGYBzQ8Xk,5638
 blaxel/core/sandbox/client/__init__.py,sha256=N26bD5o1jsTb48oExow6Rgivd8ylaU9jaWZfZsVilP8,128
 blaxel/core/sandbox/client/client.py,sha256=tcP8cJ4Q3dV9aB3yQ01dDXO-ekfsa3WGGFz4DQAEf8I,7079
 blaxel/core/sandbox/client/errors.py,sha256=gO8GBmKqmSNgAg-E5oT-oOyxztvp7V_6XG7OUTT15q0,546
@@ -365,7 +365,7 @@ blaxel/crewai/tools.py,sha256=wMMZvSrmhuoFRFux2j31PeSVMbElhs5e49jtvRNxZxY,848
 blaxel/googleadk/__init__.py,sha256=WfYZvtkh5IF042qWLaiWjbDarJZCX9ghHGiTrat8eps,127
 blaxel/googleadk/model.py,sha256=ZSBGapgcrhRogc1kBFKfuLS36UUkcQL6nZD22yVUEJM,2236
 blaxel/googleadk/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-blaxel/googleadk/tools.py,sha256=mgHYc25A82VKYx4VUhV2Nn3XnjSdMgwlBpHJvvq5oEY,2328
+blaxel/googleadk/tools.py,sha256=cyV_vRSYYBNw-5zdXQYTeb62ElyCrdGPTj3yUu6pMwU,2265
 blaxel/langgraph/__init__.py,sha256=lw9d7bl5TsYbemToCtus5P6XnhzR4SAcBWM-1Pffc_U,126
 blaxel/langgraph/model.py,sha256=B0onMzIRZEc5P6oa3SxLcI42M5_736NLez64lng61DU,2286
 blaxel/langgraph/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -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.1rc77.dist-info/METADATA,sha256=9D6p3AVPoW5CdCJ_o1C7F1Py1QxYnPDS3ecVoOba-KQ,9879
-blaxel-0.2.1rc77.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-blaxel-0.2.1rc77.dist-info/licenses/LICENSE,sha256=p5PNQvpvyDT_0aYBDgmV1fFI_vAD2aSV0wWG7VTgRis,1069
-blaxel-0.2.1rc77.dist-info/RECORD,,
+blaxel-0.2.2.dist-info/METADATA,sha256=PH7unMpL-kREYXRqTdJwkNB7Xkb2sbRh6e2Y09c0BWk,9875
+blaxel-0.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+blaxel-0.2.2.dist-info/licenses/LICENSE,sha256=p5PNQvpvyDT_0aYBDgmV1fFI_vAD2aSV0wWG7VTgRis,1069
+blaxel-0.2.2.dist-info/RECORD,,