modal 1.4.3.dev6__tar.gz → 1.4.3.dev7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.4.3.dev6
+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.dev6 → 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.dev6 → 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.dev6 → 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.dev6",
+        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.dev6",
+        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.dev6 → 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.dev6 → modal-1.4.3.dev7}/modal/functions.pyi

@@ -347,7 +347,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."""
             ...
@@ -356,7 +356,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    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]:
@@ -383,7 +383,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.
 
@@ -406,7 +406,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: ...
@@ -414,7 +414,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.
 
@@ -435,7 +435,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.4.3.dev6 → modal-1.4.3.dev7}/modal/sandbox.py

@@ -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.dev6 → 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