modal 1.5.4.dev12__tar.gz → 1.5.4.dev13__tar.gz

{modal-1.5.4.dev12 → modal-1.5.4.dev13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.5.4.dev12
+Version: 1.5.4.dev13
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0

{modal-1.5.4.dev12 → modal-1.5.4.dev13}/modal/cli/shell.py

@@ -17,7 +17,7 @@ from ..functions import Function
 from ..image import Image
 from ..mount import _Mount
 from ..runner import interactive_shell
-from ..sandbox import _MAIN_CONTAINER_NAME, Sandbox, _container_exec, _is_v2_sandbox_id
+from ..sandbox import _MAIN_CONTAINER_NAME, Sandbox, SandboxVersion, _container_exec, _get_sandbox_version
 from ..secret import Secret
 from ..stream_type import StreamType
 from ..volume import Volume
@@ -144,7 +144,7 @@ def _start_shell_in_running_container(ref: str, cmd: str, pty: bool) -> None:
             raise ClickException(f"Sandbox '{sandbox_id}' not found (is it still running?)")
         except Exception as e:
             raise ClickException(f"Error connecting to Sandbox '{sandbox_id}': {str(e)}")
-        if _is_v2_sandbox_id(sandbox_id):
+        if _get_sandbox_version(sandbox_id) == SandboxVersion.V2:
             sandbox_id_v2 = sandbox_id
 
     assert _is_valid_modal_id(ref, "ta-")

{modal-1.5.4.dev12 → modal-1.5.4.dev13}/modal/client.pyi

@@ -37,7 +37,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.4.dev12",
+        version: str = "1.5.4.dev13",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -207,7 +207,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.4.dev12",
+        version: str = "1.5.4.dev13",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.5.4.dev12 → modal-1.5.4.dev13}/modal/functions.pyi

@@ -546,7 +546,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER:
             """Calls the function remotely, executing it with the given arguments and returning the execution's result.
 
@@ -571,7 +571,7 @@ class Function(
             """
             ...
 
-    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
+    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -621,7 +621,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """[Experimental] Calls the function with the given arguments, without waiting for the results.
 
@@ -654,7 +654,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -662,7 +662,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """Calls the function with the given arguments, without waiting for the results.
 
@@ -695,7 +695,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function.

{modal-1.5.4.dev12 → modal-1.5.4.dev13}/modal/sandbox.py

@@ -154,7 +154,6 @@ def _ttl_to_wire_ttl(ttl: int | None) -> int:
 
 
 _V1_SANDBOX_ID_ALPHABET = frozenset("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz")
-_ULID_ALPHABET = frozenset("0123456789ABCDEFGHJKMNPQRSTVWXYZ")
 _CUSTOMER_SUPPLIED_ENCRYPTION_KEY_MIN_LENGTH = 16
 _CUSTOMER_SUPPLIED_ENCRYPTION_KEY_MAX_LENGTH = 512
 
@@ -196,23 +195,13 @@ def _is_v1_sandbox_id(sandbox_id: str) -> bool:
     )
 
 
-def _is_v2_sandbox_id(sandbox_id: str) -> bool:
-    prefix, separator, suffix = sandbox_id.partition("-")
-    return (
-        prefix == "sb"
-        and separator == "-"
-        and len(suffix) == 26
-        and suffix[0] in "01234567"
-        and all(ch in _ULID_ALPHABET for ch in suffix)
-    )
-
-
 def _get_sandbox_version(sandbox_id: str) -> SandboxVersion:
-    if _is_v2_sandbox_id(sandbox_id):
-        return SandboxVersion.V2
+    # IDs that don't match the V1 shape are assumed to be V2, so that Sandbox
+    # IDs minted in newer formats route to the newer backend instead of
+    # failing client-side.
     if _is_v1_sandbox_id(sandbox_id):
         return SandboxVersion.V1
-    raise InvalidError(f"Invalid Sandbox ID: {sandbox_id!r}")
+    return SandboxVersion.V2
 
 
 def _result_returncode(result: api_pb2.GenericResult | None) -> int | None:
@@ -237,6 +226,31 @@ def _validate_exec_args(args: Sequence[str]) -> None:
         )
 
 
+def _build_outbound_network_access(
+    block_network: bool,
+    outbound_cidr_allowlist: Sequence[str] | None,
+    outbound_domain_allowlist: Sequence[str] | None,
+) -> api_pb2.NetworkAccess:
+    """Build the outbound `NetworkAccess` for the given params.
+
+    Shared by `Sandbox.create` and the sidecar create path. When nothing is
+    specified, defaults to open network access.
+    """
+    if block_network:
+        if outbound_cidr_allowlist is not None:
+            raise InvalidError("`outbound_cidr_allowlist` cannot be used when `block_network` is enabled")
+        if outbound_domain_allowlist is not None:
+            raise InvalidError("`outbound_domain_allowlist` cannot be used when `block_network` is enabled")
+        return api_pb2.NetworkAccess(network_access_type=api_pb2.NetworkAccess.NetworkAccessType.BLOCKED)
+    if outbound_cidr_allowlist is None and outbound_domain_allowlist is None:
+        return api_pb2.NetworkAccess(network_access_type=api_pb2.NetworkAccess.NetworkAccessType.OPEN)
+    return api_pb2.NetworkAccess(
+        network_access_type=api_pb2.NetworkAccess.NetworkAccessType.ALLOWLIST,
+        allowed_cidrs=list(outbound_cidr_allowlist or []),
+        allowed_domains=list(outbound_domain_allowlist or []),
+    )
+
+
 class DefaultSandboxNameOverride(str):
     """A singleton class that represents the default sandbox name override.
 
@@ -439,27 +453,11 @@ class _Sandbox(_Object, type_prefix="sb"):
                 ]
             )
 
-            if block_network:
-                if outbound_cidr_allowlist is not None:
-                    raise InvalidError("`outbound_cidr_allowlist` cannot be used when `block_network` is enabled")
-                if outbound_domain_allowlist is not None:
-                    raise InvalidError("`outbound_domain_allowlist` cannot be used when `block_network` is enabled")
-                if inbound_cidr_allowlist is not None:
-                    raise InvalidError("`inbound_cidr_allowlist` cannot be used when `block_network` is enabled")
-                network_access = api_pb2.NetworkAccess(
-                    network_access_type=api_pb2.NetworkAccess.NetworkAccessType.BLOCKED,
-                )
-            else:
-                if outbound_domain_allowlist is None and outbound_cidr_allowlist is None:
-                    network_access = api_pb2.NetworkAccess(
-                        network_access_type=api_pb2.NetworkAccess.NetworkAccessType.OPEN,
-                    )
-                else:
-                    network_access = api_pb2.NetworkAccess(
-                        network_access_type=api_pb2.NetworkAccess.NetworkAccessType.ALLOWLIST,
-                        allowed_cidrs=list(outbound_cidr_allowlist or []),
-                        allowed_domains=list(outbound_domain_allowlist or []),
-                    )
+            if block_network and inbound_cidr_allowlist is not None:
+                raise InvalidError("`inbound_cidr_allowlist` cannot be used when `block_network` is enabled")
+            network_access = _build_outbound_network_access(
+                block_network, outbound_cidr_allowlist, outbound_domain_allowlist
+            )
 
             ephemeral_disk = None  # Ephemeral disk requests not supported on Sandboxes.
             definition = api_pb2.Sandbox(
@@ -1128,7 +1126,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         self._command_router_client = None
         self._init_command_router_access = None
         self._filesystem = None
-        self._is_v2 = _is_v2_sandbox_id(self.object_id)
+        self._is_v2 = _get_sandbox_version(self.object_id) == SandboxVersion.V2
         if self._is_v2:
             self._hydrate_metadata_v2()
 
@@ -2796,6 +2794,8 @@ class _SidecarManager:
         secrets: Collection[_Secret] | None = None,
         workdir: str | None = None,
         volumes: dict[str | os.PathLike, _Volume] | None = None,
+        outbound_cidr_allowlist: Sequence[str] | None = None,
+        outbound_domain_allowlist: Sequence[str] | None = None,
     ) -> _SidecarContainer:
         """Create a sidecar container running alongside the Sandbox's main container.
 
@@ -2803,6 +2803,12 @@ class _SidecarManager:
         can be used to run auxiliary processes, such as a database or a service the main container
         depends on.
 
+        The sidecar's outbound network policy is independent of the main container's and defaults to
+        open network access. To restrict it, pass `outbound_cidr_allowlist` and/or
+        `outbound_domain_allowlist`. To block all external egress while keeping connectivity to the
+        main container, pass an empty allowlist (`outbound_cidr_allowlist=[]`); a fully network-blocked
+        sidecar is not supported because it would have no IP and could not reach the main container.
+
         Args:
             *args: Command and arguments to run inside the sidecar container.
             name: Unique name for the sidecar container. The name ``"main"`` is reserved.
@@ -2811,6 +2817,11 @@ class _SidecarManager:
             secrets: Secrets to inject as environment variables in the sidecar container.
             workdir: Working directory for the command; must be absolute if set.
             volumes: Mapping of mount paths to `Volume` objects to mount in the sidecar container.
+            outbound_cidr_allowlist: If set, restrict the sidecar's outbound traffic to these CIDR
+                blocks. An empty list blocks all external egress while preserving connectivity to the
+                main container.
+            outbound_domain_allowlist: If set, restrict the sidecar's outbound TLS connections (port
+                443) to these SNI domains. Supports wildcards like ``*.example.com``.
 
         Returns:
             A `SidecarContainer` handle for the running container.
@@ -2865,6 +2876,7 @@ class _SidecarManager:
             workdir=workdir or "",
             secret_ids=[secret.object_id for secret in secrets],
             volume_mounts=volume_mounts,
+            network_access=_build_outbound_network_access(False, outbound_cidr_allowlist, outbound_domain_allowlist),
         )
         create_resp = await command_router_client.container_create(create_req)
         container_id = create_resp.container_id

{modal-1.5.4.dev12 → modal-1.5.4.dev13}/modal/sandbox.pyi

@@ -54,10 +54,20 @@ class SandboxVersion(enum.Enum):
     V2 = 2
 
 def _is_v1_sandbox_id(sandbox_id: str) -> bool: ...
-def _is_v2_sandbox_id(sandbox_id: str) -> bool: ...
 def _get_sandbox_version(sandbox_id: str) -> SandboxVersion: ...
 def _result_returncode(result: typing.Optional[modal_proto.api_pb2.GenericResult]) -> typing.Optional[int]: ...
 def _validate_exec_args(args: collections.abc.Sequence[str]) -> None: ...
+def _build_outbound_network_access(
+    block_network: bool,
+    outbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]],
+    outbound_domain_allowlist: typing.Optional[collections.abc.Sequence[str]],
+) -> modal_proto.api_pb2.NetworkAccess:
+    """Build the outbound `NetworkAccess` for the given params.
+
+    Shared by `Sandbox.create` and the sidecar create path. When nothing is
+    specified, defaults to open network access.
+    """
+    ...
 
 class DefaultSandboxNameOverride(str):
     """A singleton class that represents the default sandbox name override.
@@ -1134,6 +1144,8 @@ class _SidecarManager:
         secrets: typing.Optional[collections.abc.Collection[modal.secret._Secret]] = None,
         workdir: typing.Optional[str] = None,
         volumes: typing.Optional[dict[typing.Union[str, os.PathLike], modal.volume._Volume]] = None,
+        outbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
+        outbound_domain_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
     ) -> _SidecarContainer:
         """Create a sidecar container running alongside the Sandbox's main container.
 
@@ -1141,6 +1153,12 @@ class _SidecarManager:
         can be used to run auxiliary processes, such as a database or a service the main container
         depends on.
 
+        The sidecar's outbound network policy is independent of the main container's and defaults to
+        open network access. To restrict it, pass `outbound_cidr_allowlist` and/or
+        `outbound_domain_allowlist`. To block all external egress while keeping connectivity to the
+        main container, pass an empty allowlist (`outbound_cidr_allowlist=[]`); a fully network-blocked
+        sidecar is not supported because it would have no IP and could not reach the main container.
+
         Args:
             *args: Command and arguments to run inside the sidecar container.
             name: Unique name for the sidecar container. The name ``"main"`` is reserved.
@@ -1149,6 +1167,11 @@ class _SidecarManager:
             secrets: Secrets to inject as environment variables in the sidecar container.
             workdir: Working directory for the command; must be absolute if set.
             volumes: Mapping of mount paths to `Volume` objects to mount in the sidecar container.
+            outbound_cidr_allowlist: If set, restrict the sidecar's outbound traffic to these CIDR
+                blocks. An empty list blocks all external egress while preserving connectivity to the
+                main container.
+            outbound_domain_allowlist: If set, restrict the sidecar's outbound TLS connections (port
+                443) to these SNI domains. Supports wildcards like ``*.example.com``.
 
         Returns:
             A `SidecarContainer` handle for the running container.
@@ -1374,6 +1397,8 @@ class SidecarManager:
             secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
             workdir: typing.Optional[str] = None,
             volumes: typing.Optional[dict[typing.Union[str, os.PathLike], modal.volume.Volume]] = None,
+            outbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
+            outbound_domain_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
         ) -> SidecarContainer:
             """Create a sidecar container running alongside the Sandbox's main container.
 
@@ -1381,6 +1406,12 @@ class SidecarManager:
             can be used to run auxiliary processes, such as a database or a service the main container
             depends on.
 
+            The sidecar's outbound network policy is independent of the main container's and defaults to
+            open network access. To restrict it, pass `outbound_cidr_allowlist` and/or
+            `outbound_domain_allowlist`. To block all external egress while keeping connectivity to the
+            main container, pass an empty allowlist (`outbound_cidr_allowlist=[]`); a fully network-blocked
+            sidecar is not supported because it would have no IP and could not reach the main container.
+
             Args:
                 *args: Command and arguments to run inside the sidecar container.
                 name: Unique name for the sidecar container. The name ``"main"`` is reserved.
@@ -1389,6 +1420,11 @@ class SidecarManager:
                 secrets: Secrets to inject as environment variables in the sidecar container.
                 workdir: Working directory for the command; must be absolute if set.
                 volumes: Mapping of mount paths to `Volume` objects to mount in the sidecar container.
+                outbound_cidr_allowlist: If set, restrict the sidecar's outbound traffic to these CIDR
+                    blocks. An empty list blocks all external egress while preserving connectivity to the
+                    main container.
+                outbound_domain_allowlist: If set, restrict the sidecar's outbound TLS connections (port
+                    443) to these SNI domains. Supports wildcards like ``*.example.com``.
 
             Returns:
                 A `SidecarContainer` handle for the running container.
@@ -1405,6 +1441,8 @@ class SidecarManager:
             secrets: typing.Optional[collections.abc.Collection[modal.secret.Secret]] = None,
             workdir: typing.Optional[str] = None,
             volumes: typing.Optional[dict[typing.Union[str, os.PathLike], modal.volume.Volume]] = None,
+            outbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
+            outbound_domain_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
         ) -> SidecarContainer:
             """Create a sidecar container running alongside the Sandbox's main container.
 
@@ -1412,6 +1450,12 @@ class SidecarManager:
             can be used to run auxiliary processes, such as a database or a service the main container
             depends on.
 
+            The sidecar's outbound network policy is independent of the main container's and defaults to
+            open network access. To restrict it, pass `outbound_cidr_allowlist` and/or
+            `outbound_domain_allowlist`. To block all external egress while keeping connectivity to the
+            main container, pass an empty allowlist (`outbound_cidr_allowlist=[]`); a fully network-blocked
+            sidecar is not supported because it would have no IP and could not reach the main container.
+
             Args:
                 *args: Command and arguments to run inside the sidecar container.
                 name: Unique name for the sidecar container. The name ``"main"`` is reserved.
@@ -1420,6 +1464,11 @@ class SidecarManager:
                 secrets: Secrets to inject as environment variables in the sidecar container.
                 workdir: Working directory for the command; must be absolute if set.
                 volumes: Mapping of mount paths to `Volume` objects to mount in the sidecar container.
+                outbound_cidr_allowlist: If set, restrict the sidecar's outbound traffic to these CIDR
+                    blocks. An empty list blocks all external egress while preserving connectivity to the
+                    main container.
+                outbound_domain_allowlist: If set, restrict the sidecar's outbound TLS connections (port
+                    443) to these SNI domains. Supports wildcards like ``*.example.com``.
 
             Returns:
                 A `SidecarContainer` handle for the running container.

{modal-1.5.4.dev12 → modal-1.5.4.dev13}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.5.4.dev12
+Version: 1.5.4.dev13
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0

{modal-1.5.4.dev12 → modal-1.5.4.dev13}/modal_proto/api_grpc.py

@@ -123,10 +123,6 @@ class ModalClientBase(abc.ABC):
     async def AuthTokenGet(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.AuthTokenGetRequest, modal_proto.api_pb2.AuthTokenGetResponse]') -> None:
         pass
 
-    @abc.abstractmethod
-    async def AutoscalerOverrideHistory(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.AutoscalerOverrideHistoryRequest, modal_proto.api_pb2.AutoscalerOverrideHistoryResponse]') -> None:
-        pass
-
     @abc.abstractmethod
     async def BlobCreate(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.BlobCreateRequest, modal_proto.api_pb2.BlobCreateResponse]') -> None:
         pass
@@ -1121,12 +1117,6 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.AuthTokenGetRequest,
                 modal_proto.api_pb2.AuthTokenGetResponse,
             ),
-            '/modal.client.ModalClient/AutoscalerOverrideHistory': grpclib.const.Handler(
-                self.AutoscalerOverrideHistory,
-                grpclib.const.Cardinality.UNARY_UNARY,
-                modal_proto.api_pb2.AutoscalerOverrideHistoryRequest,
-                modal_proto.api_pb2.AutoscalerOverrideHistoryResponse,
-            ),
             '/modal.client.ModalClient/BlobCreate': grpclib.const.Handler(
                 self.BlobCreate,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2543,12 +2533,6 @@ class ModalClientStub:
             modal_proto.api_pb2.AuthTokenGetRequest,
             modal_proto.api_pb2.AuthTokenGetResponse,
         )
-        self.AutoscalerOverrideHistory = grpclib.client.UnaryUnaryMethod(
-            channel,
-            '/modal.client.ModalClient/AutoscalerOverrideHistory',
-            modal_proto.api_pb2.AutoscalerOverrideHistoryRequest,
-            modal_proto.api_pb2.AutoscalerOverrideHistoryResponse,
-        )
         self.BlobCreate = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/BlobCreate',