modal 1.4.3.dev5__tar.gz → 1.4.3.dev7__tar.gz

{modal-1.4.3.dev5 → modal-1.4.3.dev7}/PKG-INFO

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

{modal-1.4.3.dev5 → modal-1.4.3.dev7}/modal/_utils/async_utils.py

@@ -1115,7 +1115,7 @@ async def async_merge(
             new_output_task = asyncio.create_task(queue.get())
 
     finally:
-        unfinished_tasks = [t for t in tasks | {new_output_task} if not t.done()]
+        unfinished_tasks: list[asyncio.Task[Any]] = [t for t in tasks | {new_output_task} if not t.done()]
         for t in unfinished_tasks:
             t.cancel()
         try:

{modal-1.4.3.dev5 → modal-1.4.3.dev7}/modal/_utils/sandbox_fs_utils.py

@@ -60,27 +60,6 @@ def try_parse_error_payload(stderr: Union[str, bytes]) -> Optional[ErrorPayload]
     return ErrorPayload(error_kind=error_kind, message=message, detail=detail)
 
 
-def raise_read_file_error(returncode: int, stderr: Union[str, bytes], remote_path: str) -> NoReturn:
-    if payload := try_parse_error_payload(stderr):
-        logger.debug(
-            f"sandbox-fs-tools read error: path={remote_path}, "
-            f"error_kind={payload.error_kind}, message={payload.message}, detail={payload.detail}"
-        )
-        if payload.error_kind == "NotFound":
-            raise SandboxFilesystemNotFoundError(f"{payload.message}: {remote_path}")
-        if payload.error_kind == "IsDirectory":
-            raise SandboxFilesystemIsADirectoryError(f"{payload.message}: {remote_path}")
-        if payload.error_kind == "PermissionDenied":
-            raise SandboxFilesystemPermissionError(f"{payload.message}: {remote_path}")
-        if payload.error_kind == "FileTooLarge":
-            raise SandboxFilesystemFileTooLargeError(f"{payload.message}: {remote_path}")
-        raise SandboxFilesystemError(payload.message)
-
-    if stderr_text := _stderr_to_text(stderr):
-        logger.debug(f"Unstructured modal-sandbox-fs-tools stderr: {stderr_text}")
-    raise SandboxFilesystemError(f"Operation on '{remote_path}' failed with exit code {returncode}")
-
-
 def _extract_support_error_code(exc: Exception) -> Optional[str]:
     if match := re.search(r"Error code:\s*([A-Z0-9]{8})", str(exc)):
         return match.group(1)
@@ -144,26 +123,66 @@ def make_write_file_command(remote_path: str) -> str:
     return json.dumps({"WriteFile": {"path": remote_path}})
 
 
-def make_read_file_command(remote_path: str) -> str:
-    """Build the JSON command string for a ReadFile operation.
+def raise_list_files_error(returncode: int, stderr: Union[str, bytes], remote_path: str) -> NoReturn:
+    if payload := try_parse_error_payload(stderr):
+        logger.debug(
+            f"sandbox-fs-tools list_files error: path={remote_path}, "
+            f"error_kind={payload.error_kind}, message={payload.message}, detail={payload.detail}"
+        )
+        if payload.error_kind == "NotFound":
+            raise SandboxFilesystemNotFoundError(f"{payload.message}: {remote_path}")
+        if payload.error_kind in ("IsFile", "NotDirectory"):
+            raise SandboxFilesystemNotADirectoryError(f"{payload.message}: {remote_path}")
+        if payload.error_kind == "PermissionDenied":
+            raise SandboxFilesystemPermissionError(f"{payload.message}: {remote_path}")
+        raise SandboxFilesystemError(payload.message)
+
+    if stderr_text := _stderr_to_text(stderr):
+        logger.debug(f"Unstructured modal-sandbox-fs-tools stderr: {stderr_text}")
+    raise SandboxFilesystemError(f"Operation on '{remote_path}' failed with exit code {returncode}")
+
+
+def make_list_files_command(remote_path: str) -> str:
+    """Build the JSON command string for a ListFiles operation.
 
     The returned JSON must match the `Command` enum in the modal-sandbox-fs-tools
     Rust crate (crates/modal-sandbox-fs-tools/src/lib.rs). Treat changes to
     this schema like protobuf changes: fields must not be removed or renamed,
     only added with backwards-compatible defaults.
     """
-    return json.dumps({"ReadFile": {"path": remote_path}})
+    return json.dumps({"ListFiles": {"path": remote_path}})
 
 
-def make_remove_command(remote_path: str, recursive: bool) -> str:
-    """Build the JSON command string for a Remove operation.
+def raise_read_file_error(returncode: int, stderr: Union[str, bytes], remote_path: str) -> NoReturn:
+    if payload := try_parse_error_payload(stderr):
+        logger.debug(
+            f"sandbox-fs-tools read error: path={remote_path}, "
+            f"error_kind={payload.error_kind}, message={payload.message}, detail={payload.detail}"
+        )
+        if payload.error_kind == "NotFound":
+            raise SandboxFilesystemNotFoundError(f"{payload.message}: {remote_path}")
+        if payload.error_kind == "IsDirectory":
+            raise SandboxFilesystemIsADirectoryError(f"{payload.message}: {remote_path}")
+        if payload.error_kind == "PermissionDenied":
+            raise SandboxFilesystemPermissionError(f"{payload.message}: {remote_path}")
+        if payload.error_kind == "FileTooLarge":
+            raise SandboxFilesystemFileTooLargeError(f"{payload.message}: {remote_path}")
+        raise SandboxFilesystemError(payload.message)
+
+    if stderr_text := _stderr_to_text(stderr):
+        logger.debug(f"Unstructured modal-sandbox-fs-tools stderr: {stderr_text}")
+    raise SandboxFilesystemError(f"Operation on '{remote_path}' failed with exit code {returncode}")
+
+
+def make_read_file_command(remote_path: str) -> str:
+    """Build the JSON command string for a ReadFile operation.
 
     The returned JSON must match the `Command` enum in the modal-sandbox-fs-tools
     Rust crate (crates/modal-sandbox-fs-tools/src/lib.rs). Treat changes to
     this schema like protobuf changes: fields must not be removed or renamed,
     only added with backwards-compatible defaults.
     """
-    return json.dumps({"Remove": {"path": remote_path, "recursive": recursive}})
+    return json.dumps({"ReadFile": {"path": remote_path}})
 
 
 def raise_remove_error(returncode: int, stderr: Union[str, bytes], remote_path: str) -> NoReturn:
@@ -189,15 +208,15 @@ def raise_remove_error(returncode: int, stderr: Union[str, bytes], remote_path:
     raise SandboxFilesystemError(f"Operation on '{remote_path}' failed with exit code {returncode}")
 
 
-def make_make_directory_command(remote_path: str, create_parents: bool) -> str:
-    """Build the JSON command string for a MakeDirectory operation.
+def make_remove_command(remote_path: str, recursive: bool) -> str:
+    """Build the JSON command string for a Remove operation.
 
     The returned JSON must match the `Command` enum in the modal-sandbox-fs-tools
     Rust crate (crates/modal-sandbox-fs-tools/src/lib.rs). Treat changes to
     this schema like protobuf changes: fields must not be removed or renamed,
     only added with backwards-compatible defaults.
     """
-    return json.dumps({"MakeDirectory": {"path": remote_path, "parents": create_parents}})
+    return json.dumps({"Remove": {"path": remote_path, "recursive": recursive}})
 
 
 def raise_make_directory_error(returncode: int, stderr: Union[str, bytes], remote_path: str) -> NoReturn:
@@ -225,6 +244,17 @@ def raise_make_directory_error(returncode: int, stderr: Union[str, bytes], remot
     raise SandboxFilesystemError(f"Operation on '{remote_path}' failed with exit code {returncode}")
 
 
+def make_make_directory_command(remote_path: str, create_parents: bool) -> str:
+    """Build the JSON command string for a MakeDirectory operation.
+
+    The returned JSON must match the `Command` enum in the modal-sandbox-fs-tools
+    Rust crate (crates/modal-sandbox-fs-tools/src/lib.rs). Treat changes to
+    this schema like protobuf changes: fields must not be removed or renamed,
+    only added with backwards-compatible defaults.
+    """
+    return json.dumps({"MakeDirectory": {"path": remote_path, "parents": create_parents}})
+
+
 def validate_absolute_remote_path(remote_path: str, operation: str) -> None:
     if not PurePosixPath(remote_path).is_absolute():
         raise InvalidError(f"Sandbox.filesystem.{operation}() currently only supports absolute remote_path values")

{modal-1.4.3.dev5 → modal-1.4.3.dev7}/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.dev5",
+        version: str = "1.4.3.dev7",
     ):
         """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.dev5",
+        version: str = "1.4.3.dev7",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.4.3.dev5 → modal-1.4.3.dev7}/modal/exception.py

@@ -90,7 +90,7 @@ class _GRPCErrorWrapper(grpclib.GRPCError):
     def __repr__(self) -> str:
         return f"{type(self).__name__}({self._message!r})"
 
-    def _warn_on_grpc_error_attribute_access(self) -> None:
+    def _attribute_warning(self) -> None:
         from ._utils.deprecation import deprecation_warning  # Avoid circular import
 
         exc_type = type(self).__name__
@@ -104,7 +104,7 @@ class _GRPCErrorWrapper(grpclib.GRPCError):
 
     @property
     def message(self) -> str:
-        self._warn_on_grpc_error_attribute_access()
+        self._attribute_warning()
         return self._grpc_message
 
     @message.setter
@@ -113,7 +113,7 @@ class _GRPCErrorWrapper(grpclib.GRPCError):
 
     @property
     def status(self) -> grpclib.Status:
-        self._warn_on_grpc_error_attribute_access()
+        self._attribute_warning()
         return self._grpc_status
 
     @status.setter
@@ -122,7 +122,7 @@ class _GRPCErrorWrapper(grpclib.GRPCError):
 
     @property
     def details(self) -> Any:
-        self._warn_on_grpc_error_attribute_access()
+        self._attribute_warning()
         return self._grpc_details
 
     @details.setter

{modal-1.4.3.dev5 → modal-1.4.3.dev7}/modal/file_io.py

@@ -396,7 +396,7 @@ class _FileIO(Generic[T]):
         """List the contents of the provided directory."""
         deprecation_warning(
             (2026, 3, 9),
-            "`FileIO.ls()` is deprecated. Use `Sandbox.ls()` instead.",
+            "`FileIO.ls()` is deprecated. Use `Sandbox.filesystem.list_files()` instead.",
             pending=True,
         )
         return await ls(path, client, task_id)

{modal-1.4.3.dev5 → modal-1.4.3.dev7}/modal/sandbox.py

@@ -268,22 +268,28 @@ class _Sandbox(_Object, type_prefix="sb"):
         if pty:
             pty_info = _Sandbox._default_pty_info()
 
-        def _deps() -> list[_Object]:
-            deps: list[_Object] = [image] + list(mounts) + list(secrets)
+        async def _load(
+            self: _Sandbox, resolver: Resolver, load_context: LoadContext, _existing_object_id: Optional[str]
+        ):
+            # An already-hydrated image (e.g. one returned by
+            # `Sandbox.snapshot_directory`) is skipped — there's nothing to load.
+            dep_tasks: list = []
+            if not image._is_hydrated:
+                dep_tasks.append(resolver.load(image, load_context))
+            for dep in list(mounts) + list(secrets):
+                dep_tasks.append(resolver.load(dep, load_context))
             for _, vol in validated_network_file_systems:
-                deps.append(vol)
+                dep_tasks.append(resolver.load(vol, load_context))
             for _, vol in validated_volumes:
-                deps.append(vol)
+                dep_tasks.append(resolver.load(vol, load_context))
             for _, cloud_bucket_mount in cloud_bucket_mounts:
                 if cloud_bucket_mount.secret:
-                    deps.append(cloud_bucket_mount.secret)
+                    dep_tasks.append(resolver.load(cloud_bucket_mount.secret, load_context))
             if proxy:
-                deps.append(proxy)
-            return deps
+                dep_tasks.append(resolver.load(proxy, load_context))
+            if dep_tasks:
+                await asyncio.gather(*dep_tasks)
 
-        async def _load(
-            self: _Sandbox, resolver: Resolver, load_context: LoadContext, _existing_object_id: Optional[str]
-        ):
             # Validate that the same volume (by object_id) isn't mounted at multiple paths
             validate_volumes_by_object_id(validated_volumes)
 
@@ -363,7 +369,7 @@ class _Sandbox(_Object, type_prefix="sb"):
             sandbox_id = create_resp.sandbox_id
             self._hydrate(sandbox_id, load_context.client, None)
 
-        return _Sandbox._from_loader(_load, "Sandbox()", deps=_deps, load_context_overrides=LoadContext.empty())
+        return _Sandbox._from_loader(_load, "Sandbox()", load_context_overrides=LoadContext.empty())
 
     @staticmethod
     async def create(
@@ -689,12 +695,17 @@ class _Sandbox(_Object, type_prefix="sb"):
                 allowed_cidrs=cidr_allowlist,
             )
 
-        def _deps() -> list[_Object]:
-            return [image] + list(secrets)
-
         async def _load(
             self: _Sandbox, resolver: Resolver, load_context: LoadContext, _existing_object_id: Optional[str]
         ):
+            dep_tasks: list = []
+            if not image._is_hydrated:
+                dep_tasks.append(resolver.load(image, load_context))
+            for secret in secrets:
+                dep_tasks.append(resolver.load(secret, load_context))
+            if dep_tasks:
+                await asyncio.gather(*dep_tasks)
+
             definition = api_pb2.Sandbox(
                 entrypoint_args=args,
                 image_id=image.object_id,
@@ -732,7 +743,7 @@ class _Sandbox(_Object, type_prefix="sb"):
                 for t in create_resp.tunnels
             }
 
-        obj = _Sandbox._from_loader(_load, "Sandbox()", deps=_deps, load_context_overrides=LoadContext.empty())
+        obj = _Sandbox._from_loader(_load, "Sandbox()", load_context_overrides=LoadContext.empty())
 
         app_id: Optional[str] = None
         app_client: Optional[_Client] = None
@@ -906,19 +917,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         if resp.result.status != api_pb2.GenericResult.GENERIC_STATUS_SUCCESS:
             raise ExecutionError(resp.result.exception)
 
-        image_id = resp.image_id
-        metadata = resp.image_metadata
-
-        async def _load(self: _Image, resolver: Resolver, load_context: LoadContext, existing_object_id: Optional[str]):
-            # no need to hydrate again since we do it eagerly below
-            pass
-
-        rep = "Image()"
-        # TODO: use ._new_hydrated instead
-        image = _Image._from_loader(_load, rep, hydrate_lazily=True, load_context_overrides=LoadContext.empty())
-        image._hydrate(image_id, self._client, metadata)  # hydrating eagerly since we have all of the data
-
-        return image
+        return _Image._new_hydrated(resp.image_id, self._client, resp.image_metadata)
 
     async def mount_image(self, path: Union[PurePosixPath, str], image: _Image):
         """Mount an Image at a specified path in a running Sandbox.
@@ -1032,7 +1031,8 @@ class _Sandbox(_Object, type_prefix="sb"):
             raise InvalidError(f"Snapshot path must be absolute; got: {posix_path}")
         path_bytes = posix_path.as_posix().encode("utf8")
 
-        req = sr_pb2.TaskSnapshotDirectoryRequest(task_id=task_id, path=path_bytes)
+        snapshot_id = str(uuid.uuid4())
+        req = sr_pb2.TaskSnapshotDirectoryRequest(task_id=task_id, path=path_bytes, snapshot_id=snapshot_id)
         res = await command_router_client.snapshot_directory(req)
         return _Image._new_hydrated(res.image_id, self._client, None)
 
@@ -1641,8 +1641,16 @@ class _Sandbox(_Object, type_prefix="sb"):
         return await _FileIO.create(path, mode, self._client, task_id)
 
     async def ls(self, path: str) -> builtins.list[str]:
-        """[Alpha] List the contents of a directory in the Sandbox."""
+        """[Alpha] List the contents of a directory in the Sandbox.
+
+        .. deprecated:: 2026-04-15
+            Use `Sandbox.filesystem.list_files()` instead."""
         self._ensure_v1("ls")
+        deprecation_warning(
+            (2026, 4, 15),
+            "`Sandbox.ls()` is deprecated. Use `Sandbox.filesystem.list_files()` instead.",
+            pending=True,
+        )
         task_id = await self._get_task_id()
         return await ls(path, self._client, task_id)
 

{modal-1.4.3.dev5 → modal-1.4.3.dev7}/modal/sandbox.pyi

@@ -613,7 +613,11 @@ class _Sandbox(modal._object._Object):
     @typing.overload
     async def open(self, path: str, mode: _typeshed.OpenBinaryMode) -> modal.file_io._FileIO[bytes]: ...
     async def ls(self, path: str) -> list[str]:
-        """[Alpha] List the contents of a directory in the Sandbox."""
+        """[Alpha] List the contents of a directory in the Sandbox.
+
+        .. deprecated:: 2026-04-15
+            Use `Sandbox.filesystem.list_files()` instead.
+        """
         ...
 
     async def mkdir(self, path: str, parents: bool = False) -> None:
@@ -1908,11 +1912,19 @@ class Sandbox(modal.object.Object):
 
     class __ls_spec(typing_extensions.Protocol):
         def __call__(self, /, path: str) -> list[str]:
-            """[Alpha] List the contents of a directory in the Sandbox."""
+            """[Alpha] List the contents of a directory in the Sandbox.
+
+            .. deprecated:: 2026-04-15
+                Use `Sandbox.filesystem.list_files()` instead.
+            """
             ...
 
         async def aio(self, /, path: str) -> list[str]:
-            """[Alpha] List the contents of a directory in the Sandbox."""
+            """[Alpha] List the contents of a directory in the Sandbox.
+
+            .. deprecated:: 2026-04-15
+                Use `Sandbox.filesystem.list_files()` instead.
+            """
             ...
 
     ls: __ls_spec