modal 0.74.49__py3-none-any.whl → 0.74.51__py3-none-any.whl

modal/client.pyi

@@ -27,7 +27,7 @@ class _Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.49"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.51"
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -85,7 +85,7 @@ class Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.49"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.51"
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/volume.py

@@ -14,7 +14,6 @@ from dataclasses import dataclass
 from io import BytesIO
 from pathlib import Path, PurePosixPath
 from typing import (
-    IO,
     Any,
     Awaitable,
     BinaryIO,
@@ -195,6 +194,16 @@ class _Volume(_Object, type_prefix="vo"):
     def _get_metadata(self) -> Optional[Message]:
         return self._metadata
 
+
+    @property
+    def _is_v1(self) -> bool:
+        return self._metadata.version in [
+            None,
+            api_pb2.VolumeFsVersion.VOLUME_FS_VERSION_UNSPECIFIED,
+            api_pb2.VolumeFsVersion.VOLUME_FS_VERSION_V1
+        ]
+
+
     @classmethod
     @asynccontextmanager
     async def ephemeral(
@@ -391,7 +400,7 @@ class _Volume(_Object, type_prefix="vo"):
         return [entry async for entry in self.iterdir(path, recursive=recursive)]
 
     @live_method_gen
-    async def read_file(self, path: str) -> AsyncIterator[bytes]:
+    def read_file(self, path: str) -> AsyncIterator[bytes]:
         """
         Read a file from the modal.Volume.
 
@@ -405,6 +414,10 @@ class _Volume(_Object, type_prefix="vo"):
         print(len(data))  # == 1024 * 1024
         ```
         """
+        return self._read_file1(path) if self._is_v1 else self._read_file2(path)
+
+
+    async def _read_file1(self, path: str) -> AsyncIterator[bytes]:
         req = api_pb2.VolumeGetFileRequest(volume_id=self.object_id, path=path)
         try:
             response = await retry_transient_errors(self._client.stub.VolumeGetFile, req)
@@ -418,53 +431,20 @@ class _Volume(_Object, type_prefix="vo"):
             async for data in blob_iter(response.data_blob_id, self._client.stub):
                 yield data
 
-    @live_method
-    async def read_file_into_fileobj(self, path: str, fileobj: IO[bytes]) -> int:
-        """mdmd:hidden
 
-        Read volume file into file-like IO object.
-        In the future, this will replace the current generator implementation of the `read_file` method.
-        """
+    async def _read_file2(self, path: str) -> AsyncIterator[bytes]:
+        req = api_pb2.VolumeGetFile2Request(volume_id=self.object_id, path=path)
 
-        chunk_size_bytes = 8 * 1024 * 1024
-        start = 0
-        req = api_pb2.VolumeGetFileRequest(volume_id=self.object_id, path=path, start=start, len=chunk_size_bytes)
         try:
-            response = await retry_transient_errors(self._client.stub.VolumeGetFile, req)
+            response = await retry_transient_errors(self._client.stub.VolumeGetFile2, req)
         except GRPCError as exc:
             raise FileNotFoundError(exc.message) if exc.status == Status.NOT_FOUND else exc
-        if response.WhichOneof("data_oneof") != "data":
-            raise RuntimeError("expected to receive 'data' in response")
-
-        n = fileobj.write(response.data)
-        if n != len(response.data):
-            raise OSError(f"failed to write {len(response.data)} bytes to output. Wrote {n}.")
-        elif n == response.size:
-            return response.size
-        elif n > response.size:
-            raise RuntimeError(f"length of returned data exceeds reported filesize: {n} > {response.size}")
-        # else: there's more data to read. continue reading with further ranged GET requests.
-        file_size = response.size
-        written = n
-
-        while True:
-            req = api_pb2.VolumeGetFileRequest(volume_id=self.object_id, path=path, start=written, len=chunk_size_bytes)
-            response = await retry_transient_errors(self._client.stub.VolumeGetFile, req)
-            if response.WhichOneof("data_oneof") != "data":
-                raise RuntimeError("expected to receive 'data' in response")
-            if len(response.data) > chunk_size_bytes:
-                raise RuntimeError(f"received more data than requested: {len(response.data)} > {chunk_size_bytes}")
-            elif (written + len(response.data)) > file_size:
-                raise RuntimeError(f"received data exceeds filesize of {chunk_size_bytes}")
-
-            n = fileobj.write(response.data)
-            if n != len(response.data):
-                raise OSError(f"failed to write {len(response.data)} bytes to output. Wrote {n}.")
-            written += n
-            if written == file_size:
-                break
 
-        return written
+        for url in response.get_urls:
+            async with ClientSessionRegistry.get_session().get(url) as get_response:
+                async for data in get_response.content.iter_any():
+                    yield data
+
 
     @live_method
     async def remove_file(self, path: str, recursive: bool = False) -> None:

modal/volume.pyi

@@ -52,6 +52,8 @@ class _Volume(modal._object._Object):
     ) -> _Volume: ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
     def _get_metadata(self) -> typing.Optional[google.protobuf.message.Message]: ...
+    @property
+    def _is_v1(self) -> bool: ...
     @classmethod
     def ephemeral(
         cls: type[_Volume],
@@ -83,7 +85,8 @@ class _Volume(modal._object._Object):
     def iterdir(self, path: str, *, recursive: bool = True) -> collections.abc.AsyncIterator[FileEntry]: ...
     async def listdir(self, path: str, *, recursive: bool = False) -> list[FileEntry]: ...
     def read_file(self, path: str) -> collections.abc.AsyncIterator[bytes]: ...
-    async def read_file_into_fileobj(self, path: str, fileobj: typing.IO[bytes]) -> int: ...
+    def _read_file1(self, path: str) -> collections.abc.AsyncIterator[bytes]: ...
+    def _read_file2(self, path: str) -> collections.abc.AsyncIterator[bytes]: ...
     async def remove_file(self, path: str, recursive: bool = False) -> None: ...
     async def copy_files(self, src_paths: collections.abc.Sequence[str], dst_path: str) -> None: ...
     async def batch_upload(self, force: bool = False) -> _AbstractVolumeUploadContextManager: ...
@@ -126,6 +129,8 @@ class Volume(modal.object.Object):
     ) -> Volume: ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
     def _get_metadata(self) -> typing.Optional[google.protobuf.message.Message]: ...
+    @property
+    def _is_v1(self) -> bool: ...
     @classmethod
     def ephemeral(
         cls: type[Volume],
@@ -213,11 +218,17 @@ class Volume(modal.object.Object):
 
     read_file: __read_file_spec[typing_extensions.Self]
 
-    class __read_file_into_fileobj_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, path: str, fileobj: typing.IO[bytes]) -> int: ...
-        async def aio(self, path: str, fileobj: typing.IO[bytes]) -> int: ...
+    class ___read_file1_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(self, path: str) -> typing.Iterator[bytes]: ...
+        def aio(self, path: str) -> collections.abc.AsyncIterator[bytes]: ...
+
+    _read_file1: ___read_file1_spec[typing_extensions.Self]
+
+    class ___read_file2_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(self, path: str) -> typing.Iterator[bytes]: ...
+        def aio(self, path: str) -> collections.abc.AsyncIterator[bytes]: ...
 
-    read_file_into_fileobj: __read_file_into_fileobj_spec[typing_extensions.Self]
+    _read_file2: ___read_file2_spec[typing_extensions.Self]
 
     class __remove_file_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, path: str, recursive: bool = False) -> None: ...

{modal-0.74.49.dist-info → modal-0.74.51.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 0.74.49
+Version: 0.74.51
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0
@@ -20,7 +20,7 @@ Requires-Dist: aiohttp
 Requires-Dist: certifi
 Requires-Dist: click>=8.1.0
 Requires-Dist: grpclib==0.4.7
-Requires-Dist: protobuf!=4.24.0,<6.0,>=3.19
+Requires-Dist: protobuf!=4.24.0,<7.0,>=3.19
 Requires-Dist: rich>=12.0.0
 Requires-Dist: synchronicity~=0.9.10
 Requires-Dist: toml

{modal-0.74.49.dist-info → modal-0.74.51.dist-info}/RECORD

@@ -22,7 +22,7 @@ modal/app.py,sha256=r-9vVU1lrR1CWtJEo60fuaianvxY_oOXZyv1Qx1DEkI,51231
 modal/app.pyi,sha256=0QNtnUpAFbOPcbwCt119ge7OmoBqMFw5SajLgdE5eOw,28600
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=U-YKSw0n7J1ZLREt9cbEJCtmHe5YoPKFxl0xlkan2yc,15565
-modal/client.pyi,sha256=aMgJftZr5pTStBb0n4tz8sgLrlKIaRZdrBMMEh9rFVg,7593
+modal/client.pyi,sha256=ogVEBy4PU2drB-wMNRCDKprT_A5VwKKO5GdfXBeEHvg,7593
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=aHoMEWMZUN7bOezs3tRPxzS1FP3gTxZBORVjbPmtxyg,35338
@@ -78,8 +78,8 @@ modal/snapshot.pyi,sha256=Ypd4NKsjOTnnnqXyTGGLKq5lkocRrUURYjY5Pi67_qA,670
 modal/stream_type.py,sha256=A6320qoAAWhEfwOCZfGtymQTu5AfLfJXXgARqooTPvY,417
 modal/token_flow.py,sha256=ZYCa-uVP6jrJmUKA6wAG4lngqNem8Mgm2HXz1DR19BM,7355
 modal/token_flow.pyi,sha256=0XV3d-9CGQL3qjPdw3RgwIFVqqxo8Z-u044_mkgAM3o,2064
-modal/volume.py,sha256=197mYPFbjJfQWpLEvE3vinTwNpmbh0CC_B-NkOHzKo8,41979
-modal/volume.pyi,sha256=_gE9ED_aO-o3_f9MDCkJc6OM8qU1w5ULJ4aKoJkhlgk,18356
+modal/volume.py,sha256=d8x6i2qJgacJQ5qbNMvzeNFrK7ap4jPtjxZEpWstpCw,40624
+modal/volume.pyi,sha256=rjlkEt9zuCy7GLe1TuVDSTiGJliFX9v6_KGKqL8HaeM,18760
 modal/_runtime/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
 modal/_runtime/asgi.py,sha256=_2xSTsDD27Cit7xnMs4lzkJA2wzer2_N4Oa3BkXFzVA,22521
 modal/_runtime/container_io_manager.py,sha256=6j0jO2-s9ShckM4SK45OapoQxWW9HQwQjFaBkXPJPwU,44763
@@ -145,7 +145,7 @@ modal/requirements/2024.10.txt,sha256=qD-5cVIVM9wXesJ6JC89Ew-3m2KjEElUz3jaw_MddR
 modal/requirements/PREVIEW.txt,sha256=qD-5cVIVM9wXesJ6JC89Ew-3m2KjEElUz3jaw_MddRo,296
 modal/requirements/README.md,sha256=9tK76KP0Uph7O0M5oUgsSwEZDj5y-dcUPsnpR0Sc-Ik,854
 modal/requirements/base-images.json,sha256=57vMSqzMbLBxw5tFWSaMiIkkVEps4JfX5PAtXGnkS4U,740
-modal-0.74.49.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.74.51.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=c1yfBS_x--gL5bs0N4ihMwqwX8l3IBWSkBAKNNIi6bQ,3801
 modal_docs/gen_reference_docs.py,sha256=d_CQUGQ0rfw28u75I2mov9AlS773z9rG40-yq5o7g2U,6359
@@ -170,9 +170,9 @@ modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0y
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_version/__init__.py,sha256=m94xZNWIjH8oUtJk4l9xfovzDJede2o7X-q0MHVECtM,470
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal_version/_version_generated.py,sha256=-h2evheb0h6ZeCRd4OY4P-xlD3f4lAxmMFdV25T_ZpM,149
-modal-0.74.49.dist-info/METADATA,sha256=WVM_5pHEfZr-wAqhPek3gvwIZMAWoKWpdeUjIw-Bveo,2451
-modal-0.74.49.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-0.74.49.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.74.49.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-0.74.49.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=XWG6Z6Rycy47HH88imPv1R6cURBY7Kq4Khuy3MbKuh4,149
+modal-0.74.51.dist-info/METADATA,sha256=ub5SsraMgh2uqk6809lzYrCsp0T6NEke1jYNdAsUezQ,2451
+modal-0.74.51.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-0.74.51.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.74.51.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-0.74.51.dist-info/RECORD,,

modal_version/_version_generated.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 
 # Note: Reset this value to -1 whenever you make a minor `0.X` release of the client.
-build_number = 49  # git: b2ad6b8
+build_number = 51  # git: c6fac09