modal 1.5.2.dev3__tar.gz → 1.5.2.dev5__tar.gz

{modal-1.5.2.dev3 → modal-1.5.2.dev5}/PKG-INFO

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

{modal-1.5.2.dev3 → modal-1.5.2.dev5}/modal/_runtime/container_io_manager.py

@@ -264,7 +264,7 @@ class IOContext:
         if not inspect.isasyncgen(expected_async_gen):
             raise InvalidError(f"Async generator function returned value of type {type(expected_async_gen)}")
 
-        async with aclosing(expected_async_gen) as gen:
+        async with aclosing(cast(AsyncGenerator[Any, None], expected_async_gen)) as gen:
             async for result in gen:
                 yield result
         logger.debug(f"Finished generator input {self.input_ids}")

{modal-1.5.2.dev3 → modal-1.5.2.dev5}/modal/_utils/blob_utils.py

@@ -138,6 +138,13 @@ async def _upload_to_s3_url(
                     text = await resp.text()
                 except Exception:
                     text = "<no body>"
+
+                if "The Content-MD5 you specified did not match what we received." in text:
+                    raise ExecutionError(
+                        "Hash mismatch during upload. This may be caused by files changing while an upload is in "
+                        "progress. Please try again."
+                    )
+
                 raise ExecutionError(f"Put to url {upload_url} failed with status {resp.status}: {text}")
 
             # client side ETag checksum verification

{modal-1.5.2.dev3 → modal-1.5.2.dev5}/modal/client.pyi

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

{modal-1.5.2.dev3 → modal-1.5.2.dev5}/modal/functions.pyi

@@ -490,7 +490,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.
 
@@ -515,7 +515,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]:
@@ -565,7 +565,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.
 
@@ -598,7 +598,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: ...
@@ -606,7 +606,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.
 
@@ -639,7 +639,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.2.dev3 → modal-1.5.2.dev5}/modal/sandbox.py

@@ -2056,7 +2056,6 @@ class _Sandbox(_Object, type_prefix="sb"):
         Returns:
             A `SandboxFilesystem` helper bound to this sandbox.
         """
-        self._ensure_v1("filesystem")
         self._ensure_attached()
         if self._filesystem is None:
             self._filesystem = _SandboxFilesystem(self)
@@ -2283,6 +2282,62 @@ class _Sandbox(_Object, type_prefix="sb"):
             # Fetch the next batch starting from the end of the current one.
             before_timestamp = resp.sandboxes[-1].created_at
 
+    @staticmethod
+    async def _experimental_list(
+        *, app_id: str | None = None, client: _Client | None = None
+    ) -> AsyncGenerator["_Sandbox", None]:
+        """List v2 Sandboxes in an App.
+
+        This function lists v2 sandboxes, ie sandboxes created via modal.Sandbox._experimental_create.
+        Filtering based on tags is not yet supported.
+
+        Args:
+            app_id: The App to list Sandboxes under.
+            client: Optional client to use for the session.
+
+        Yields:
+            `Sandbox` objects that are currently running in the App.
+        """
+        if not app_id:
+            raise InvalidError(
+                "Sandbox._experimental_list requires an `app_id`:\n\n"
+                'app = modal.App.lookup("my-app")\n'
+                "Sandbox._experimental_list(app_id=app.app_id)"
+            )
+
+        before_timestamp = None
+        if client is None:
+            client = await _Client.from_env()
+
+        assert client._auth_token_manager
+        while True:
+            req = api_pb2.SandboxListRequest(
+                app_id=app_id,
+                before_timestamp=before_timestamp,
+                include_finished=False,
+            )
+
+            # Fetches a batch of sandboxes. SandboxListV2 authenticates via the
+            # auth-token metadata, like the other V2 sandbox RPCs.
+            auth_token = await client._auth_token_manager.get_token()
+            resp = await client.stub.SandboxListV2(req, metadata=[("x-modal-auth-token", auth_token)])
+
+            if not resp.sandboxes:
+                return
+
+            for sandbox_info in resp.sandboxes:
+                sandbox_info: api_pb2.SandboxInfo
+                obj = _Sandbox._new_hydrated(sandbox_info.id, client, None)
+                # SandboxListV2 only returns V2 sandboxes; mark them as such so
+                # operations like wait/terminate/exec use the V2 RPCs and stdio.
+                obj._is_v2 = True
+                obj._hydrate_metadata_v2()
+                obj._result = sandbox_info.task_info.result
+                yield obj
+
+            # Fetch the next batch starting from the end of the current one.
+            before_timestamp = resp.sandboxes[-1].created_at
+
 
 class _SidecarContainer:
     """Handle to an additional container running in a Sandbox."""

{modal-1.5.2.dev3 → modal-1.5.2.dev5}/modal/sandbox.pyi

@@ -942,6 +942,24 @@ class _Sandbox(modal._object._Object):
         """
         ...
 
+    @staticmethod
+    def _experimental_list(
+        *, app_id: typing.Optional[str] = None, client: typing.Optional[modal.client._Client] = None
+    ) -> collections.abc.AsyncGenerator[_Sandbox, None]:
+        """List v2 Sandboxes in an App.
+
+        This function lists v2 sandboxes, ie sandboxes created via modal.Sandbox._experimental_create.
+        Filtering based on tags is not yet supported.
+
+        Args:
+            app_id: The App to list Sandboxes under.
+            client: Optional client to use for the session.
+
+        Yields:
+            `Sandbox` objects that are currently running in the App.
+        """
+        ...
+
 class _SidecarContainer:
     """Handle to an additional container running in a Sandbox."""
 
@@ -2790,6 +2808,43 @@ class Sandbox(modal.object.Object):
 
     list: typing.ClassVar[__list_spec]
 
+    class ___experimental_list_spec(typing_extensions.Protocol):
+        def __call__(
+            self, /, *, app_id: typing.Optional[str] = None, client: typing.Optional[modal.client.Client] = None
+        ) -> typing.Generator[Sandbox, None, None]:
+            """List v2 Sandboxes in an App.
+
+            This function lists v2 sandboxes, ie sandboxes created via modal.Sandbox._experimental_create.
+            Filtering based on tags is not yet supported.
+
+            Args:
+                app_id: The App to list Sandboxes under.
+                client: Optional client to use for the session.
+
+            Yields:
+                `Sandbox` objects that are currently running in the App.
+            """
+            ...
+
+        def aio(
+            self, /, *, app_id: typing.Optional[str] = None, client: typing.Optional[modal.client.Client] = None
+        ) -> collections.abc.AsyncGenerator[Sandbox, None]:
+            """List v2 Sandboxes in an App.
+
+            This function lists v2 sandboxes, ie sandboxes created via modal.Sandbox._experimental_create.
+            Filtering based on tags is not yet supported.
+
+            Args:
+                app_id: The App to list Sandboxes under.
+                client: Optional client to use for the session.
+
+            Yields:
+                `Sandbox` objects that are currently running in the App.
+            """
+            ...
+
+    _experimental_list: typing.ClassVar[___experimental_list_spec]
+
 _default_image: modal._image._Image
 
 _MAIN_CONTAINER_NAME: str

{modal-1.5.2.dev3 → modal-1.5.2.dev5}/modal.egg-info/PKG-INFO

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

{modal-1.5.2.dev3 → modal-1.5.2.dev5}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2026
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.5.2.dev3"
+__version__ = "1.5.2.dev5"