modal 1.4.3.dev25__tar.gz → 1.4.3.dev26__tar.gz

{modal-1.4.3.dev25 → modal-1.4.3.dev26}/PKG-INFO

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

{modal-1.4.3.dev25 → modal-1.4.3.dev26}/modal/cli/cluster.py

@@ -94,7 +94,19 @@ async def shell(cluster_id: str, rank: int = 0):
     await command_router_client.exec_start(start_req)
 
     if pty:
-        await _ContainerProcess(process_id, task_id, client, command_router_client=command_router_client).attach()
+        # PTY output is raw terminal bytes (control sequences, mouse events,
+        # glyphs in non-UTF-8 locales, etc.) — not text. Strict UTF-8 decode on
+        # this stream crashes the shell as soon as anything emits a byte that
+        # isn't valid UTF-8, e.g. vim drawing a Latin-1 file under LC_CTYPE=C.
+        # Pass bytes through unmodified; `attach()` writes them straight to the
+        # local fd.
+        await _ContainerProcess(
+            process_id,
+            task_id,
+            client,
+            command_router_client=command_router_client,
+            text=False,
+        ).attach()
     else:
         await _ContainerProcess(
             process_id,

{modal-1.4.3.dev25 → modal-1.4.3.dev26}/modal/cli/container.py

@@ -294,7 +294,19 @@ async def _exec_impl(
     await command_router_client.exec_start(start_req)
 
     if pty:
-        await _ContainerProcess(process_id, container_id, client, command_router_client=command_router_client).attach()
+        # PTY output is raw terminal bytes (control sequences, mouse events,
+        # glyphs in non-UTF-8 locales, etc.) — not text. Strict UTF-8 decode on
+        # this stream crashes the shell as soon as anything emits a byte that
+        # isn't valid UTF-8, e.g. vim drawing a Latin-1 file under LC_CTYPE=C.
+        # Pass bytes through unmodified; `attach()` writes them straight to the
+        # local fd.
+        await _ContainerProcess(
+            process_id,
+            container_id,
+            client,
+            command_router_client=command_router_client,
+            text=False,
+        ).attach()
     else:
         await _ContainerProcess(
             process_id,

{modal-1.4.3.dev25 → modal-1.4.3.dev26}/modal/cli/shell.py

@@ -100,7 +100,10 @@ def _start_shell_in_sandbox_container(sandbox_id: str, container_name: str, cmd:
     try:
         sandbox_container = sandbox._experimental_containers.get(name=container_name)
         if pty:
-            process = sandbox_container.exec(*shlex.split(cmd), pty=pty)
+            # PTY output is raw terminal bytes, not text; strict UTF-8 decode
+            # crashes on the first non-UTF-8 byte (e.g. vim drawing a Latin-1
+            # file under LC_CTYPE=C). See the matching call in `_exec_impl`.
+            process = sandbox_container.exec(*shlex.split(cmd), pty=pty, text=False)
             process.attach()
         else:
             process = sandbox_container.exec(

{modal-1.4.3.dev25 → modal-1.4.3.dev26}/modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.3.dev25",
+        version: str = "1.4.3.dev26",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -175,7 +175,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.3.dev25",
+        version: str = "1.4.3.dev26",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.4.3.dev25 → modal-1.4.3.dev26}/modal/experimental/flash.py

@@ -76,7 +76,7 @@ class _FlashManager:
             except (OSError, asyncio.TimeoutError):
                 await asyncio.sleep(0.1)
 
-        return False, Exception(f"Waited too long for port {self.port} to start accepting connections")
+        return False, Exception(f"Waited too long for port {self.port} to accept connections")
 
     async def _start(self):
         self.tunnel = await self.tunnel_manager.__aenter__()
@@ -152,16 +152,16 @@ class _FlashManager:
                     logger.warning(f"Listening at {resp.url} over {self.tunnel.url} for task_id {self.task_id}")
                     return True
             except asyncio.CancelledError:
-                logger.warning("Waited too long for port to start accepting connections. Shutting down...")
+                logger.warning("Healthcheck cancelled while waiting for port to accept connections. Shutting down...")
                 raise
             except Exception as e:
-                logger.error(f"Error waiting for port to start accepting connections: {e}")
+                logger.error(f"Error waiting for port to accept connections: {e}")
             try:
                 await asyncio.sleep(1)
             except asyncio.CancelledError:
-                logger.warning("Waited too long for port to start accepting connections. Shutting down...")
+                logger.warning("Healthcheck cancelled while waiting for port to accept connections. Shutting down...")
                 raise
-        raise TimeoutError("Waited too long for port to start accepting connections. Shutting down...")
+        raise TimeoutError("Timed out while waiting for port to accept connections. Shutting down...")
 
     async def _run_heartbeat(self, host: str, port: int):
         while True:

{modal-1.4.3.dev25 → modal-1.4.3.dev26}/modal/sandbox.py

@@ -232,7 +232,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         mounts: Sequence[_Mount] = (),
         network_file_systems: dict[Union[str, os.PathLike], _NetworkFileSystem] = {},
         block_network: bool = False,
-        cidr_allowlist: Optional[Sequence[str]] = None,
+        outbound_cidr_allowlist: Optional[Sequence[str]] = None,
         inbound_cidr_allowlist: Optional[Sequence[str]] = None,
         volumes: dict[Union[str, os.PathLike], Union[_Volume, _CloudBucketMount]] = {},
         pty: bool = False,
@@ -321,15 +321,14 @@ class _Sandbox(_Object, type_prefix="sb"):
             )
 
             if block_network:
-                # If the network is blocked, cidr_allowlist is invalid as we don't allow any network access.
-                if cidr_allowlist is not None:
-                    raise InvalidError("`cidr_allowlist` cannot be used when `block_network` is enabled")
+                if outbound_cidr_allowlist is not None:
+                    raise InvalidError("`outbound_cidr_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,
                 )
-            elif cidr_allowlist is None:
+            elif outbound_cidr_allowlist is None:
                 # If the allowlist is empty, we allow all network access.
                 network_access = api_pb2.NetworkAccess(
                     network_access_type=api_pb2.NetworkAccess.NetworkAccessType.OPEN,
@@ -337,7 +336,7 @@ class _Sandbox(_Object, type_prefix="sb"):
             else:
                 network_access = api_pb2.NetworkAccess(
                     network_access_type=api_pb2.NetworkAccess.NetworkAccessType.ALLOWLIST,
-                    allowed_cidrs=cidr_allowlist,
+                    allowed_cidrs=outbound_cidr_allowlist,
                 )
 
             ephemeral_disk = None  # Ephemeral disk requests not supported on Sandboxes.
@@ -412,7 +411,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         memory: Optional[Union[int, tuple[int, int]]] = None,
         block_network: bool = False,  # Whether to block network access
         # List of CIDRs the sandbox is allowed to access. If None, all CIDRs are allowed.
-        cidr_allowlist: Optional[Sequence[str]] = None,
+        outbound_cidr_allowlist: Optional[Sequence[str]] = None,
         # List of CIDRs allowed to connect inbound to the sandbox (tunnels and connection tokens).
         inbound_cidr_allowlist: Optional[Sequence[str]] = None,
         volumes: dict[
@@ -443,6 +442,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         client: Optional[_Client] = None,
         environment_name: Optional[str] = None,  # *DEPRECATED* Optionally override the default environment
         pty_info: Optional[api_pb2.PTYInfo] = None,  # *DEPRECATED* Use `pty` instead. `pty` will override `pty_info`.
+        cidr_allowlist: Optional[Sequence[str]] = None,  # *DEPRECATED* Use outbound_cidr_allowlist instead.
     ) -> "_Sandbox":
         """
         Create a new Sandbox to run untrusted, arbitrary code.
@@ -472,6 +472,16 @@ class _Sandbox(_Object, type_prefix="sb"):
                 "Set the `pty` parameter to `True` instead.",
             )
 
+        if cidr_allowlist is not None:
+            if outbound_cidr_allowlist is not None:
+                raise InvalidError("Cannot specify both `cidr_allowlist` and `outbound_cidr_allowlist`.")
+            deprecation_warning(
+                (2026, 5, 11),
+                "The `cidr_allowlist` parameter has been renamed to `outbound_cidr_allowlist`. "
+                "`cidr_allowlist` will be removed in a future release.",
+            )
+            outbound_cidr_allowlist = cidr_allowlist
+
         secrets = secrets or []
         if env:
             secrets = [*secrets, _Secret.from_dict(env)]
@@ -492,7 +502,7 @@ class _Sandbox(_Object, type_prefix="sb"):
             cpu=cpu,
             memory=memory,
             block_network=block_network,
-            cidr_allowlist=cidr_allowlist,
+            outbound_cidr_allowlist=outbound_cidr_allowlist,
             inbound_cidr_allowlist=inbound_cidr_allowlist,
             volumes=volumes,
             pty=pty,
@@ -531,7 +541,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         cpu: Optional[Union[float, tuple[float, float]]] = None,
         memory: Optional[Union[int, tuple[int, int]]] = None,
         block_network: bool = False,
-        cidr_allowlist: Optional[Sequence[str]] = None,
+        outbound_cidr_allowlist: Optional[Sequence[str]] = None,
         inbound_cidr_allowlist: Optional[Sequence[str]] = None,
         volumes: dict[Union[str, os.PathLike], Union[_Volume, _CloudBucketMount]] = {},
         pty: bool = False,
@@ -584,7 +594,7 @@ class _Sandbox(_Object, type_prefix="sb"):
             mounts=mounts,
             network_file_systems=network_file_systems,
             block_network=block_network,
-            cidr_allowlist=cidr_allowlist,
+            outbound_cidr_allowlist=outbound_cidr_allowlist,
             inbound_cidr_allowlist=inbound_cidr_allowlist,
             volumes=volumes,
             pty=pty,
@@ -1270,8 +1280,8 @@ class _Sandbox(_Object, type_prefix="sb"):
                     )
                 else:
                     self._command_router_client = await TaskCommandRouterClient.init(self._client, task_id)
-            except (ConflictError, NotFoundError):
-                raise NotFoundError("Sandbox already finished")
+            except ConflictError as e:
+                raise NotFoundError(str(e)) from e
         return self._command_router_client
 
     @property

{modal-1.4.3.dev25 → modal-1.4.3.dev26}/modal/sandbox.pyi

@@ -172,7 +172,7 @@ class _Sandbox(modal._object._Object):
         mounts: collections.abc.Sequence[modal.mount._Mount] = (),
         network_file_systems: dict[typing.Union[str, os.PathLike], modal.network_file_system._NetworkFileSystem] = {},
         block_network: bool = False,
-        cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
+        outbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
         inbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
         volumes: dict[
             typing.Union[str, os.PathLike],
@@ -214,7 +214,7 @@ class _Sandbox(modal._object._Object):
         cpu: typing.Union[float, tuple[float, float], None] = None,
         memory: typing.Union[int, tuple[int, int], None] = None,
         block_network: bool = False,
-        cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
+        outbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
         inbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
         volumes: dict[
             typing.Union[str, os.PathLike],
@@ -234,6 +234,7 @@ class _Sandbox(modal._object._Object):
         client: typing.Optional[modal.client._Client] = None,
         environment_name: typing.Optional[str] = None,
         pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
+        cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
     ) -> _Sandbox:
         """Create a new Sandbox to run untrusted, arbitrary code.
 
@@ -270,7 +271,7 @@ class _Sandbox(modal._object._Object):
         cpu: typing.Union[float, tuple[float, float], None] = None,
         memory: typing.Union[int, tuple[int, int], None] = None,
         block_network: bool = False,
-        cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
+        outbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
         inbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
         volumes: dict[
             typing.Union[str, os.PathLike],
@@ -926,7 +927,7 @@ class Sandbox(modal.object.Object):
         mounts: collections.abc.Sequence[modal.mount.Mount] = (),
         network_file_systems: dict[typing.Union[str, os.PathLike], modal.network_file_system.NetworkFileSystem] = {},
         block_network: bool = False,
-        cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
+        outbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
         inbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
         volumes: dict[
             typing.Union[str, os.PathLike], typing.Union[modal.volume.Volume, modal.cloud_bucket_mount.CloudBucketMount]
@@ -971,7 +972,7 @@ class Sandbox(modal.object.Object):
             cpu: typing.Union[float, tuple[float, float], None] = None,
             memory: typing.Union[int, tuple[int, int], None] = None,
             block_network: bool = False,
-            cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
+            outbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
             inbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
             volumes: dict[
                 typing.Union[str, os.PathLike],
@@ -991,6 +992,7 @@ class Sandbox(modal.object.Object):
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
             pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
+            cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
         ) -> Sandbox:
             """Create a new Sandbox to run untrusted, arbitrary code.
 
@@ -1029,7 +1031,7 @@ class Sandbox(modal.object.Object):
             cpu: typing.Union[float, tuple[float, float], None] = None,
             memory: typing.Union[int, tuple[int, int], None] = None,
             block_network: bool = False,
-            cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
+            outbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
             inbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
             volumes: dict[
                 typing.Union[str, os.PathLike],
@@ -1049,6 +1051,7 @@ class Sandbox(modal.object.Object):
             client: typing.Optional[modal.client.Client] = None,
             environment_name: typing.Optional[str] = None,
             pty_info: typing.Optional[modal_proto.api_pb2.PTYInfo] = None,
+            cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
         ) -> Sandbox:
             """Create a new Sandbox to run untrusted, arbitrary code.
 
@@ -1091,7 +1094,7 @@ class Sandbox(modal.object.Object):
             cpu: typing.Union[float, tuple[float, float], None] = None,
             memory: typing.Union[int, tuple[int, int], None] = None,
             block_network: bool = False,
-            cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
+            outbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
             inbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
             volumes: dict[
                 typing.Union[str, os.PathLike],
@@ -1142,7 +1145,7 @@ class Sandbox(modal.object.Object):
             cpu: typing.Union[float, tuple[float, float], None] = None,
             memory: typing.Union[int, tuple[int, int], None] = None,
             block_network: bool = False,
-            cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
+            outbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
             inbound_cidr_allowlist: typing.Optional[collections.abc.Sequence[str]] = None,
             volumes: dict[
                 typing.Union[str, os.PathLike],

{modal-1.4.3.dev25 → modal-1.4.3.dev26}/modal.egg-info/PKG-INFO

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