modal 0.76.2__py3-none-any.whl → 0.76.4__py3-none-any.whl

modal/cli/app.py

@@ -224,10 +224,10 @@ async def history(
         "Time deployed",
         "Client",
         "Deployed by",
+        "Commit",
+        "Tag",
     ]
     rows = []
-    deployments_with_tags = False
-    deployments_with_commit_info = False
     deployments_with_dirty_commit = False
     for idx, app_stats in enumerate(resp.app_deployment_histories):
         style = "bold green" if idx == 0 else ""
@@ -239,24 +239,26 @@ async def history(
             Text(app_stats.deployed_by, style=style),
         ]
 
-        if app_stats.tag:
-            deployments_with_tags = True
-            row.append(Text(app_stats.tag, style=style))
-
         if app_stats.commit_info.commit_hash:
-            deployments_with_commit_info = True
             short_hash = app_stats.commit_info.commit_hash[:7]
             if app_stats.commit_info.dirty:
                 deployments_with_dirty_commit = True
                 short_hash = f"{short_hash}*"
             row.append(Text(short_hash, style=style))
+        else:
+            row.append(None)
+
+        if app_stats.tag:
+            row.append(Text(app_stats.tag, style=style))
+        else:
+            row.append(None)
 
         rows.append(row)
 
-    if deployments_with_tags:
-        columns.append("Tag")
-    if deployments_with_commit_info:
-        columns.append("Commit")
+    # Suppress tag information when no deployments used one
+    if not any(row[-1] for row in rows):
+        rows = [row[:-1] for row in rows]
+        columns = columns[:-1]
 
     rows = sorted(rows, key=lambda x: int(str(x[0])[1:]), reverse=True)
     display_table(columns, rows, json)

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.76.2"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.76.4"
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -86,7 +86,7 @@ class Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.76.2"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.76.4"
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/volume.py

@@ -194,23 +194,19 @@ class _Volume(_Object, type_prefix="vo"):
         if metadata and isinstance(metadata, api_pb2.VolumeMetadata):
             self._metadata = metadata
         else:
-            raise TypeError(
-                "_hydrate_metadata() requires an `api_pb2.VolumeMetadata` to determine volume version"
-            )
+            raise TypeError("_hydrate_metadata() requires an `api_pb2.VolumeMetadata` to determine volume version")
 
     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
+            api_pb2.VolumeFsVersion.VOLUME_FS_VERSION_V1,
         ]
 
-
     @classmethod
     @asynccontextmanager
     async def ephemeral(
@@ -369,21 +365,17 @@ class _Volume(_Object, type_prefix="vo"):
         file's description. If `recursive` is set to True, list all files and folders under the path
         recursively.
         """
-        from modal_version import major_number, minor_number
-
-        # This allows us to remove the server shim after 0.62 is no longer supported.
-        deprecation = deprecation_warning if (major_number, minor_number) <= (0, 62) else deprecation_error
         if path.endswith("**"):
             msg = (
                 "Glob patterns in `volume get` and `Volume.listdir()` are deprecated. "
                 "Please pass recursive=True instead. For the CLI, just remove the glob suffix."
             )
-            deprecation(
+            deprecation_error(
                 (2024, 4, 23),
                 msg,
             )
         elif path.endswith("*"):
-            deprecation(
+            deprecation_error(
                 (2024, 4, 23),
                 (
                     "Glob patterns in `volume get` and `Volume.listdir()` are deprecated. "
@@ -423,7 +415,6 @@ class _Volume(_Object, type_prefix="vo"):
         """
         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:
@@ -438,7 +429,6 @@ class _Volume(_Object, type_prefix="vo"):
             async for data in blob_iter(response.data_blob_id, self._client.stub):
                 yield data
 
-
     async def _read_file2(self, path: str) -> AsyncIterator[bytes]:
         req = api_pb2.VolumeGetFile2Request(volume_id=self.object_id, path=path)
 
@@ -462,18 +452,15 @@ class _Volume(_Object, type_prefix="vo"):
             async for value in stream:
                 yield value
 
-
     @live_method
     async def read_file_into_fileobj(
-        self,
-        path: str,
-        fileobj: typing.IO[bytes],
-        progress_cb: Optional[Callable[..., Any]] = None
+        self, path: str, fileobj: typing.IO[bytes], progress_cb: Optional[Callable[..., Any]] = None
     ) -> int:
         """mdmd:hidden
         Read volume file into file-like IO object.
         """
         if progress_cb is None:
+
             def progress_cb(*_, **__):
                 pass
 
@@ -482,12 +469,8 @@ class _Volume(_Object, type_prefix="vo"):
         else:
             return await self._read_file_into_fileobj2(path, fileobj, progress_cb)
 
-
     async def _read_file_into_fileobj1(
-        self,
-        path: str,
-        fileobj: typing.IO[bytes],
-        progress_cb: Callable[..., Any]
+        self, path: str, fileobj: typing.IO[bytes], progress_cb: Callable[..., Any]
     ) -> int:
         num_bytes_written = 0
 
@@ -504,12 +487,8 @@ class _Volume(_Object, type_prefix="vo"):
 
         return num_bytes_written
 
-
     async def _read_file_into_fileobj2(
-        self,
-        path: str,
-        fileobj: typing.IO[bytes],
-        progress_cb: Callable[..., Any]
+        self, path: str, fileobj: typing.IO[bytes], progress_cb: Callable[..., Any]
     ) -> int:
         req = api_pb2.VolumeGetFile2Request(volume_id=self.object_id, path=path)
 
@@ -552,7 +531,6 @@ class _Volume(_Object, type_prefix="vo"):
 
         return total_size
 
-
     @live_method
     async def remove_file(self, path: str, recursive: bool = False) -> None:
         """Remove a file or directory from a volume."""
@@ -607,13 +585,9 @@ class _Volume(_Object, type_prefix="vo"):
         ```
         """
         return _AbstractVolumeUploadContextManager.resolve(
-            self._metadata.version,
-            self.object_id,
-            self._client,
-            force=force
+            self._metadata.version, self.object_id, self._client, force=force
         )
 
-
     @live_method
     async def _instance_delete(self):
         await retry_transient_errors(
@@ -642,30 +616,26 @@ class _Volume(_Object, type_prefix="vo"):
 
 Volume = synchronize_api(_Volume)
 
+
 # TODO(dflemstr): Find a way to add ABC or AbstractAsyncContextManager superclasses while keeping synchronicity happy.
 class _AbstractVolumeUploadContextManager:
-    async def __aenter__(self):
-        ...
-
-    async def __aexit__(self, exc_type, exc_val, exc_tb):
-        ...
+    async def __aenter__(self): ...
 
+    async def __aexit__(self, exc_type, exc_val, exc_tb): ...
 
     def put_file(
         self,
         local_file: Union[Path, str, BinaryIO, BytesIO],
         remote_path: Union[PurePosixPath, str],
         mode: Optional[int] = None,
-    ):
-        ...
+    ): ...
 
     def put_directory(
         self,
         local_path: Union[Path, str],
         remote_path: Union[PurePosixPath, str],
         recursive: bool = True,
-    ):
-        ...
+    ): ...
 
     @staticmethod
     def resolve(
@@ -673,13 +643,12 @@ class _AbstractVolumeUploadContextManager:
         object_id: str,
         client,
         progress_cb: Optional[Callable[..., Any]] = None,
-        force: bool = False
+        force: bool = False,
     ) -> "_AbstractVolumeUploadContextManager":
-
         if version in [
             None,
             api_pb2.VolumeFsVersion.VOLUME_FS_VERSION_UNSPECIFIED,
-            api_pb2.VolumeFsVersion.VOLUME_FS_VERSION_V1
+            api_pb2.VolumeFsVersion.VOLUME_FS_VERSION_V1,
         ]:
             return _VolumeUploadContextManager(object_id, client, progress_cb=progress_cb, force=force)
         elif version == api_pb2.VolumeFsVersion.VOLUME_FS_VERSION_V2:
@@ -690,6 +659,7 @@ class _AbstractVolumeUploadContextManager:
 
 AbstractVolumeUploadContextManager = synchronize_api(_AbstractVolumeUploadContextManager)
 
+
 class _VolumeUploadContextManager(_AbstractVolumeUploadContextManager):
     """Context manager for batch-uploading files to a Volume."""
 
@@ -845,6 +815,7 @@ VolumeUploadContextManager = synchronize_api(_VolumeUploadContextManager)
 
 _FileUploader2 = Callable[[asyncio.Semaphore], Awaitable[FileUploadSpec2]]
 
+
 class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
     """Context manager for batch-uploading files to a Volume version 2."""
 
@@ -898,7 +869,6 @@ class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
             upload_specs = await gen_file_upload_specs()
             await self._put_file_specs(upload_specs)
 
-
     def put_file(
         self,
         local_file: Union[Path, str, BinaryIO, BytesIO],
@@ -918,17 +888,11 @@ class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
         def gen():
             if isinstance(local_file, str) or isinstance(local_file, Path):
                 yield lambda hash_semaphore: FileUploadSpec2.from_path(
-                    local_file,
-                    PurePosixPath(remote_path),
-                    hash_semaphore,
-                    mode
+                    local_file, PurePosixPath(remote_path), hash_semaphore, mode
                 )
             else:
                 yield lambda hash_semaphore: FileUploadSpec2.from_fileobj(
-                    local_file,
-                    PurePosixPath(remote_path),
-                    hash_semaphore,
-                    mode or 0o644
+                    local_file, PurePosixPath(remote_path), hash_semaphore, mode or 0o644
                 )
 
         self._uploader_generators.append(gen())
@@ -975,16 +939,15 @@ class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
             for file_spec in file_specs:
                 blocks = [
                     api_pb2.VolumePutFiles2Request.Block(
-                        contents_sha256=block_sha256,
-                        put_response=put_responses.get(block_sha256)
-                    ) for block_sha256 in file_spec.blocks_sha256
+                        contents_sha256=block_sha256, put_response=put_responses.get(block_sha256)
+                    )
+                    for block_sha256 in file_spec.blocks_sha256
                 ]
-                files.append(api_pb2.VolumePutFiles2Request.File(
-                    path=file_spec.path,
-                    mode=file_spec.mode,
-                    size=file_spec.size,
-                    blocks=blocks
-                ))
+                files.append(
+                    api_pb2.VolumePutFiles2Request.File(
+                        path=file_spec.path, mode=file_spec.mode, size=file_spec.size, blocks=blocks
+                    )
+                )
 
             request = api_pb2.VolumePutFiles2Request(
                 volume_id=self._volume_id,
@@ -1001,11 +964,7 @@ class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
                 break
 
             await _put_missing_blocks(
-                file_specs,
-                response.missing_blocks,
-                put_responses,
-                self._put_concurrency,
-                self._progress_cb
+                file_specs, response.missing_blocks, put_responses, self._put_concurrency, self._progress_cb
             )
         else:
             raise RuntimeError("Did not succeed at uploading all files despite supplying all missing blocks")
@@ -1023,7 +982,7 @@ async def _put_missing_blocks(
     missing_blocks: list,
     put_responses: dict[bytes, bytes],
     put_concurrency: int,
-    progress_cb: Callable[..., Any]
+    progress_cb: Callable[..., Any],
 ):
     @dataclass
     class FileProgress:
@@ -1038,7 +997,7 @@ async def _put_missing_blocks(
     async def put_missing_block(
         # TODO(dflemstr): Type is `api_pb2.VolumePutFiles2Response.MissingBlock` but synchronicity gets confused
         # by the nested class (?)
-        missing_block
+        missing_block,
     ) -> (bytes, bytes):
         # Lazily import to keep the eager loading time of this module down
         from ._utils.bytes_io_segment_payload import BytesIOSegmentPayload
@@ -1067,8 +1026,8 @@ async def _put_missing_blocks(
                     block_start,
                     block_length,
                     # limit chunk size somewhat to not keep event loop busy for too long
-                    chunk_size=256*1024,
-                    progress_report_cb=task_progress_cb
+                    chunk_size=256 * 1024,
+                    progress_report_cb=task_progress_cb,
                 )
 
                 async with ClientSessionRegistry.get_session().put(
@@ -1085,10 +1044,7 @@ async def _put_missing_blocks(
 
         return block_sha256, resp_data
 
-    tasks = [
-        asyncio.create_task(put_missing_block(missing_block))
-        for missing_block in missing_blocks
-    ]
+    tasks = [asyncio.create_task(put_missing_block(missing_block)) for missing_block in missing_blocks]
     for task_result in asyncio.as_completed(tasks):
         digest, resp = await task_result
         put_responses[digest] = resp

{modal-0.76.2.dist-info → modal-0.76.4.dist-info}/METADATA

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

{modal-0.76.2.dist-info → modal-0.76.4.dist-info}/RECORD

@@ -22,7 +22,7 @@ modal/app.py,sha256=xojuGZv4LaQwZU5ntj7WbmMjeNuB9Gll8Mzqe2LyiEs,51323
 modal/app.pyi,sha256=zNwR1_2LpmQc9AhemuAeVdk90XNYDw9keOkXAwAATeA,28732
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=o-aQThHpvDHUzg_kUafyhWzACViUBhY2WLZ2EitnSHA,16787
-modal/client.pyi,sha256=p2n_YI6rAsSQJ5_UEEFhixrcErfM4JwQ_8Z3iDr9le4,8383
+modal/client.pyi,sha256=r3nU3OnZUoj5JW9qEMmXoiTZZiCCXrpM5F6lDHh3BtY,8383
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=LZMQdFZ06LpbLDbsCJknniU-393Jb44E1lqveLVM8F8,38365
@@ -78,7 +78,7 @@ modal/snapshot.pyi,sha256=dIEBdTPb7O3VwkQ8TMPjfyU17RLuS9i0DnACxxHy8X4,676
 modal/stream_type.py,sha256=A6320qoAAWhEfwOCZfGtymQTu5AfLfJXXgARqooTPvY,417
 modal/token_flow.py,sha256=0_4KabXKsuE4OXTJ1OuLOtA-b1sesShztMZkkRFK7tA,7605
 modal/token_flow.pyi,sha256=ILbRv6JsZq-jK8jcJM7eB74e0PsbzwBm7hyPcV9lBlQ,2121
-modal/volume.py,sha256=DFkdjipvjmWvedd1FL_CjIwyfT7QN-VxusJ9O3fVCw4,44206
+modal/volume.py,sha256=DRmaIYwuRF3h1ZePevdYbHdwFUQRZgK0gaytkEkLAWg,43568
 modal/volume.pyi,sha256=9hPIMRBzGZycVL8uRfGpjSmNu_pCbkGAOyrnE86bU2Y,21113
 modal/_runtime/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
 modal/_runtime/asgi.py,sha256=_2xSTsDD27Cit7xnMs4lzkJA2wzer2_N4Oa3BkXFzVA,22521
@@ -117,7 +117,7 @@ modal/_vendor/tblib.py,sha256=g1O7QUDd3sDoLd8YPFltkXkih7r_fyZOjgmGuligv3s,9722
 modal/cli/__init__.py,sha256=6FRleWQxBDT19y7OayO4lBOzuL6Bs9r0rLINYYYbHwQ,769
 modal/cli/_download.py,sha256=tV8JFkncTtQKh85bSguQg6AW5aRRlynf-rvyN7ruigc,4337
 modal/cli/_traceback.py,sha256=4ywtmFcmPnY3tqb4-3fA061N2tRiM01xs8fSagtkwhE,7293
-modal/cli/app.py,sha256=87LWg3bTQQIHFOqs8iiJYD_X03omXBZ6lFYR0rMJV-I,8433
+modal/cli/app.py,sha256=JH0_sMGMrG0qA9ToY1RztP8MT0QHX5nZpAH02LpNYcs,8432
 modal/cli/cluster.py,sha256=EBDhkzfOtPSbwknYdYPBGYvRAwl4Gm7OJkD6_zxrcus,3106
 modal/cli/config.py,sha256=QvFsqO4eUOtI7d_pQAOAyfq_ZitjhPtav3C6GIDQcZM,1680
 modal/cli/container.py,sha256=FYwEgjf93j4NMorAjGbSV98i1wpebqdAeNU1wfrFp1k,3668
@@ -146,7 +146,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.76.2.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.76.4.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
@@ -171,9 +171,9 @@ modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0y
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_version/__init__.py,sha256=u-X2s_2GMkprLryPgSYm4nwqxeDjYDm_2mJ3SGySns4,470
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal_version/_version_generated.py,sha256=uJN3Y7EJj0nBEjsfulQdKiMV7A9NbnmHYksfOTffgyY,148
-modal-0.76.2.dist-info/METADATA,sha256=iCYEhmi87CU0xMH18BQ8WAjCorIDnLy5lx-AM88dssg,2450
-modal-0.76.2.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-0.76.2.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.76.2.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-0.76.2.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=7iBCnOznnSgAM0IT8NXFVsQn9fAJbIohVT-badmMAis,148
+modal-0.76.4.dist-info/METADATA,sha256=fVcPU0QU4KLk1RX4hZOYdZHHBO0WfflaoLEZF2ywcTo,2450
+modal-0.76.4.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-0.76.4.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.76.4.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-0.76.4.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 = 2  # git: 88d20e2
+build_number = 4  # git: 895899b