modal 1.5.2.dev3__py3-none-any.whl → 1.5.2.dev5__py3-none-any.whl

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/_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/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/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/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/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.dist-info → modal-1.5.2.dev5.dist-info}/METADATA

@@ -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.dist-info → modal-1.5.2.dev5.dist-info}/RECORD

@@ -31,7 +31,7 @@ modal/billing.py,sha256=tWrlpbNau0cfGSr643MzguHS0Dl5cRd7tm0GsCLYvtQ,372
 modal/billing.pyi,sha256=2hUdEbWa1nLdFfzZpwxHHpyK9k8uBRASGkFmPJhtkUU,7318
 modal/call_graph.py,sha256=k_wH3DuuUHCeuycHsOqlcOpIlIVbCYi9RPobg21hJdI,2550
 modal/client.py,sha256=OgjptM5UuU5LL85_-DFia-ehS8UCgMzVuzfNcxA1qPA,16136
-modal/client.pyi,sha256=-EPEnAI129D7HbPdJvWlfTwjx28EKu92b8PcKjsWhQU,17852
+modal/client.pyi,sha256=nkN4HbEW0stuQNoVjY7wnPnD2e92Enn6D19zZj15gYU,17852
 modal/cloud_bucket_mount.py,sha256=03gECcV9l2Lnt9k23YrDOTGFW7ajfXMW5O8b1prhtwQ,6254
 modal/cloud_bucket_mount.pyi,sha256=lMOb44pbNE9kDVEqWfcmvpsnh1sdNNFzuKoVyZZ3d5M,8058
 modal/cls.py,sha256=4oWIthR84usP5oejQbdMWzXkvzXyER2GDIpLvLTH4Og,40936
@@ -48,7 +48,7 @@ modal/file_io.py,sha256=kfojtm0euzOMhfkVTAGyfuygDJ1XPPHQa5uUhkCsThg,21800
 modal/file_io.pyi,sha256=Tr0OtfbkTNa8v1dkGtl8l3RH58pMc9uGTYKxL1jNwho,15422
 modal/file_pattern_matcher.py,sha256=6g_awxudMy_ontBvkznybyeNnwGMj297YrmIHCbREI0,8132
 modal/functions.py,sha256=EZRcHFfnoYbvawUJnAHF5nIvoo9GX2Djy7mUmOCXmXc,258
-modal/functions.pyi,sha256=4G6CRSPa4c84nZNiiC0eoieyQLGvt1lDoaK68efP2BI,47565
+modal/functions.pyi,sha256=pxTuV31WW1SuRNXTm4CMp7s_tssbjj9jPhnY3TroVag,47565
 modal/image.py,sha256=c0lUSAoU-Ip3g5DGZ0uhdCzoWSQWh1g0i-7Rxo-Sz-I,160
 modal/image.pyi,sha256=Whbfmda2YLAyzctLEF9uF4FQ5b1canwLojSksRJ4gx8,59716
 modal/io_streams.py,sha256=3fhhb7SDJ69pVUu9J3PiMLBePD9bpiIxPN05SCzf8FE,29118
@@ -73,8 +73,8 @@ modal/retries.py,sha256=tSGB5bGM5xZZUDXMkuelIEoQJY0vOukOssZhwc6tXAo,5014
 modal/runner.py,sha256=YdBqWOWkcGgSDKLEz1zrGNHrh0-d2tSNx24XPB6QyoM,30284
 modal/runner.pyi,sha256=0hIfkl-7VTyw1n-1B0AV7f53t3i3hCzRPyBu3DUyHnk,9669
 modal/running_app.py,sha256=xSR1VVlhxEFytmjx2x697_0GpD25Vc9crhp6r117_QY,1145
-modal/sandbox.py,sha256=Eh0gxGZUfDBkPlAq0f8irp9hNAajaQWVSjyj02wDkSU,107078
-modal/sandbox.pyi,sha256=aARprjklTBoyGhOGqdS7vTa-VddPmM59j1lnBBnUZeY,124147
+modal/sandbox.py,sha256=Pb_rqjAkEIlIl_ewgbKzj6kKMDPAJdv9JiVbSZKj5hU,109254
+modal/sandbox.pyi,sha256=vF1qXdslQeZDrlLTgw5q0F3jtjmTMz9USy-ggQiJiO8,126252
 modal/sandbox_fs.py,sha256=Iwx-kjWrp12Gii_8Zdo1T8DHOkkbO0n9RMyBuYXMkU4,31361
 modal/sandbox_fs.pyi,sha256=nmfb1Ns9__C5sH3Mq52rFDtJbfKdQrn7Cc1mcP64WBw,46902
 modal/schedule.py,sha256=3F15Vh4g8C34jGcO-vgFkBHZl7XvP7qieXayQ9gKsyw,3248
@@ -101,7 +101,7 @@ modal/_output/rich.py,sha256=x3PQKzIt_HBbaHOyzsN8gbuS1QsR7eFVD3Bo3GthXss,31845
 modal/_output/status.py,sha256=c0rdvjoYKtIG7XJqq42TlcKawkYqZWtod38RmRY5IWA,4492
 modal/_runtime/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
 modal/_runtime/asgi.py,sha256=eDNPsmV6SXl0CwUqgy7yrFDaPdlx4NiWTScXpCTlBFQ,22805
-modal/_runtime/container_io_manager.py,sha256=gwoe2zdWYCuZnTAUmVLOlRwsdC2yop6JWdSa6sBeQYs,46013
+modal/_runtime/container_io_manager.py,sha256=Mn0YzfpG0cALpc7vi5F1OIMiRSiA1s7d2sXv083AUps,46046
 modal/_runtime/container_io_manager.pyi,sha256=Wj2JA-EizzOGyrpR-GJuH97KDtyHAAspSsU-WJGDo4c,20050
 modal/_runtime/execution_context.py,sha256=zsPsVOryok4Bgsi_T19dX6ro7JUnqJeNV1_esjI5JfM,3730
 modal/_runtime/execution_context.pyi,sha256=i30NeuFxr7wcaqIUnLN9-fh_LqpcMe-KZ6Cn0VXZvcU,2569
@@ -115,7 +115,7 @@ modal/_utils/__init__.py,sha256=waLjl5c6IPDhSsdWAm9Bji4e2PVxamYABKAze6CHVXY,28
 modal/_utils/app_utils.py,sha256=88BT4TPLWfYAQwKTHcyzNQRHg8n9B-QE2UyJs96iV-0,108
 modal/_utils/async_utils.py,sha256=4E4i5bReO4NudEwi8zT9kTDKwZsQeuMOFC5O8Rz9_E4,45838
 modal/_utils/auth_token_manager.py,sha256=J3EG8lMLUe2t_sHQ0gllj5qQi6j2SpStnMEh9JV4NCk,5124
-modal/_utils/blob_utils.py,sha256=8ESgmhIH1Rh28mr0B05msp9yU5NmRhoTqxswgVoLhR8,25683
+modal/_utils/blob_utils.py,sha256=VUYGmrRqmjdsjOEDcqIDeWONouVI4CzL-Rrcn8skNXs,26010
 modal/_utils/browser_utils.py,sha256=Yqq0qU4Id6oaDOdeT1JEmbCN7vj4baNJJraJhRWU8ZI,1085
 modal/_utils/bytes_io_segment_payload.py,sha256=MFe0hs9pSskRLL6iX0vV7bJ_oG-VwIC98oNB3EpsW2w,4272
 modal/_utils/curl_utils.py,sha256=cZey1GZzyCRafXW4kje1rm739S0rc0TuY6CLG5U_zI8,3447
@@ -193,7 +193,7 @@ modal/experimental/flash.py,sha256=GAJ1c-EGL8M3_loAkqr5gdUfySMHY3U_oc6RywfZ8-0,3
 modal/experimental/flash.pyi,sha256=lpTqJFZRMGWscw0xpYZVdBMnAYjj16asXE4_64A6itQ,17774
 modal/experimental/ipython.py,sha256=kJ6o9wkAY_MiSb7paewI7f1MJAeqdi8TX5pBdhr_mUI,2925
 modal/skills/modal/SKILL.md,sha256=WzLjYJ1utjc_ZOf6qZTPwB6wxxwRYB5PibdvIf_FLy0,5316
-modal-1.5.2.dev3.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.5.2.dev5.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=nZRXP6sh0hTFqTQOo_dMKy8V57I-L6V5cv3cs3eL7NE,5808
 modal_docs/gen_cli_docs_main.py,sha256=UPGr7O1DYTIRLwfINe2rbdh89J3cPVTU1OWL-SjxnOQ,198
@@ -216,10 +216,10 @@ modal_proto/task_command_router_pb2.py,sha256=A-Q_mi-Wf761JNtcOmUkoWsPpIuYiGYcoK
 modal_proto/task_command_router_pb2.pyi,sha256=-0UrXDxiTvIy_BUP7OGeGNeLVaTWPHWDSaES4FVMYyw,42841
 modal_proto/task_command_router_pb2_grpc.py,sha256=QM5h4IvjweLZ6ZRyJD5AB8juzw4anhj4hzPS8mE1mWM,38611
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=jLJvR5sZmKqU_3pTul-Mgfc7WcG5gQjvHS9CbACpFIU,12602
-modal_version/__init__.py,sha256=LE5HqLHa8MaxjQHJFD3E66__uYN-eES_OjuXHNrB4TM,120
+modal_version/__init__.py,sha256=zJasD63IVnWBdrYwCLFH_o6sXGX4qdIQPNV2rLclhFQ,120
 modal_version/__main__.py,sha256=nLUbubxKx7GXNzJIkTB7M7_u8080LyLM0IS0rzFkC_c,119
-modal-1.5.2.dev3.dist-info/METADATA,sha256=9JAyU5gZxJTNijv3uaee68K9yAAQiLONV6duKrJTppQ,2512
-modal-1.5.2.dev3.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.5.2.dev3.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.5.2.dev3.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.5.2.dev3.dist-info/RECORD,,
+modal-1.5.2.dev5.dist-info/METADATA,sha256=69zEZi2xYO3kPZDStB0XqIlBsmqJCJ409PV8kkgFsyY,2512
+modal-1.5.2.dev5.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.5.2.dev5.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.5.2.dev5.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.5.2.dev5.dist-info/RECORD,,

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"