modal 0.74.43__py3-none-any.whl → 0.74.44__py3-none-any.whl

modal/_utils/blob_utils.py

@@ -1,7 +1,6 @@
 # Copyright Modal Labs 2022
 import asyncio
 import dataclasses
-import functools
 import hashlib
 import os
 import platform
@@ -399,6 +398,7 @@ class FileUploadSpec2:
     async def from_path(
         filename: Path,
         mount_filename: PurePosixPath,
+        hash_semaphore: asyncio.Semaphore,
         mode: Optional[int] = None,
     ) -> "FileUploadSpec2":
         # Python appears to give files 0o666 bits on Windows (equal for user, group, and global),
@@ -413,6 +413,7 @@ class FileUploadSpec2:
             filename,
             mount_filename,
             mode,
+            hash_semaphore,
         )
 
 
@@ -420,7 +421,8 @@ class FileUploadSpec2:
     async def from_fileobj(
         source_fp: Union[BinaryIO, BytesIO],
         mount_filename: PurePosixPath,
-        mode: int
+        hash_semaphore: asyncio.Semaphore,
+        mode: int,
     ) -> "FileUploadSpec2":
         try:
             fileno = source_fp.fileno()
@@ -442,6 +444,7 @@ class FileUploadSpec2:
             str(source),
             mount_filename,
             mode,
+            hash_semaphore,
         )
 
 
@@ -451,13 +454,14 @@ class FileUploadSpec2:
         source_description: Union[str, Path],
         mount_filename: PurePosixPath,
         mode: int,
+        hash_semaphore: asyncio.Semaphore,
     ) -> "FileUploadSpec2":
         # Current position is ignored - we always upload from position 0
         with source() as source_fp:
             source_fp.seek(0, os.SEEK_END)
             size = source_fp.tell()
 
-        blocks_sha256 = await hash_blocks_sha256(source, size)
+        blocks_sha256 = await hash_blocks_sha256(source, size, hash_semaphore)
 
         return FileUploadSpec2(
             source=source,
@@ -472,13 +476,14 @@ class FileUploadSpec2:
 async def hash_blocks_sha256(
     source: _FileUploadSource2,
     size: int,
+    hash_semaphore: asyncio.Semaphore,
 ) -> list[bytes]:
     def ceildiv(a: int, b: int) -> int:
         return -(a // -b)
 
     num_blocks = ceildiv(size, BLOCK_SIZE)
 
-    def hash_block_sha256(block_idx: int) -> bytes:
+    def blocking_hash_block_sha256(block_idx: int) -> bytes:
         sha256_hash = hashlib.sha256()
         block_start = block_idx * BLOCK_SIZE
 
@@ -497,7 +502,11 @@ async def hash_blocks_sha256(
 
         return sha256_hash.digest()
 
-    tasks = (asyncio.to_thread(functools.partial(hash_block_sha256, idx)) for idx in range(num_blocks))
+    async def hash_block_sha256(block_idx: int) -> bytes:
+        async with hash_semaphore:
+            return await asyncio.to_thread(blocking_hash_block_sha256, block_idx)
+
+    tasks = (hash_block_sha256(idx) for idx in range(num_blocks))
     return await asyncio.gather(*tasks)
 
 

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.43"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.44"
     ): ...
     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.43"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.44"
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/volume.py

@@ -3,6 +3,7 @@ import asyncio
 import concurrent.futures
 import enum
 import functools
+import multiprocessing
 import os
 import platform
 import re
@@ -755,19 +756,27 @@ class _VolumeUploadContextManager(_AbstractVolumeUploadContextManager):
 
 VolumeUploadContextManager = synchronize_api(_VolumeUploadContextManager)
 
-_FileUploader2 = Callable[[], Awaitable[FileUploadSpec2]]
+_FileUploader2 = Callable[[asyncio.Semaphore], Awaitable[FileUploadSpec2]]
 
 class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
     """Context manager for batch-uploading files to a Volume version 2."""
 
     _volume_id: str
     _client: _Client
-    _force: bool
     _progress_cb: Callable[..., Any]
+    _force: bool
+    _hash_concurrency: int
+    _put_concurrency: int
     _uploader_generators: list[Generator[_FileUploader2]]
 
     def __init__(
-        self, volume_id: str, client: _Client, progress_cb: Optional[Callable[..., Any]] = None, force: bool = False
+        self,
+        volume_id: str,
+        client: _Client,
+        progress_cb: Optional[Callable[..., Any]] = None,
+        force: bool = False,
+        hash_concurrency: int = multiprocessing.cpu_count(),
+        put_concurrency: int = multiprocessing.cpu_count(),
     ):
         """mdmd:hidden"""
         self._volume_id = volume_id
@@ -775,6 +784,8 @@ class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
         self._uploader_generators = []
         self._progress_cb = progress_cb or (lambda *_, **__: None)
         self._force = force
+        self._hash_concurrency = hash_concurrency
+        self._put_concurrency = put_concurrency
 
     async def __aenter__(self):
         return self
@@ -787,7 +798,9 @@ class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
                     yield from gen
 
             async def gen_file_upload_specs() -> list[FileUploadSpec2]:
-                uploads = [asyncio.create_task(fut()) for fut in gen_upload_providers()]
+                hash_semaphore = asyncio.Semaphore(self._hash_concurrency)
+
+                uploads = [asyncio.create_task(fut(hash_semaphore)) for fut in gen_upload_providers()]
                 logger.debug(f"Computing checksums for {len(uploads)} files")
 
                 file_specs = []
@@ -817,9 +830,19 @@ class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
 
         def gen():
             if isinstance(local_file, str) or isinstance(local_file, Path):
-                yield lambda: FileUploadSpec2.from_path(local_file, PurePosixPath(remote_path), mode)
+                yield lambda hash_semaphore: FileUploadSpec2.from_path(
+                    local_file,
+                    PurePosixPath(remote_path),
+                    hash_semaphore,
+                    mode
+                )
             else:
-                yield lambda: FileUploadSpec2.from_fileobj(local_file, PurePosixPath(remote_path), mode or 0o644)
+                yield lambda hash_semaphore: FileUploadSpec2.from_fileobj(
+                    local_file,
+                    PurePosixPath(remote_path),
+                    hash_semaphore,
+                    mode or 0o644
+                )
 
         self._uploader_generators.append(gen())
 
@@ -840,7 +863,7 @@ class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
 
         def create_spec(subpath):
             relpath_str = subpath.relative_to(local_path)
-            return lambda: FileUploadSpec2.from_path(subpath, remote_path / relpath_str)
+            return lambda hash_semaphore: FileUploadSpec2.from_path(subpath, remote_path / relpath_str, hash_semaphore)
 
         def gen():
             glob = local_path.rglob("*") if recursive else local_path.glob("*")
@@ -855,6 +878,8 @@ class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
         put_responses = {}
         # num_blocks_total = sum(len(file_spec.blocks_sha256) for file_spec in file_specs)
 
+        logger.debug(f"Ensuring {len(file_specs)} files are uploaded...")
+
         # We should only need two iterations: Once to possibly get some missing_blocks; the second time we should have
         # all blocks uploaded
         for _ in range(2):
@@ -888,7 +913,13 @@ class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
             if not response.missing_blocks:
                 break
 
-            await _put_missing_blocks(file_specs, response.missing_blocks, put_responses, self._progress_cb)
+            await _put_missing_blocks(
+                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")
 
@@ -904,8 +935,19 @@ async def _put_missing_blocks(
     # by the nested class (?)
     missing_blocks: list,
     put_responses: dict[bytes, bytes],
+    put_concurrency: int,
     progress_cb: Callable[..., Any]
 ):
+    @dataclass
+    class FileProgress:
+        task_id: str
+        pending_blocks: set[int]
+
+    put_semaphore = asyncio.Semaphore(put_concurrency)
+    file_progresses: dict[str, FileProgress] = dict()
+
+    logger.debug(f"Uploading {len(missing_blocks)} missing blocks...")
+
     async def put_missing_block(
         # TODO(dflemstr): Type is `api_pb2.VolumePutFiles2Response.MissingBlock` but synchronicity gets confused
         # by the nested class (?)
@@ -923,23 +965,36 @@ async def _put_missing_blocks(
         block_start = missing_block.block_index * BLOCK_SIZE
         block_length = min(BLOCK_SIZE, file_spec.size - block_start)
 
-        progress_name = f"{file_spec.path} block {missing_block.block_index + 1} / {len(file_spec.blocks_sha256)}"
-        progress_task_id = progress_cb(name=progress_name, size=file_spec.size)
+        if file_spec.path not in file_progresses:
+            file_task_id = progress_cb(name=file_spec.path, size=file_spec.size)
+            file_progresses[file_spec.path] = FileProgress(task_id=file_task_id, pending_blocks=set())
+
+        file_progress = file_progresses[file_spec.path]
+        file_progress.pending_blocks.add(missing_block.block_index)
+        task_progress_cb = functools.partial(progress_cb, task_id=file_progress.task_id)
+
+        async with put_semaphore:
+            with file_spec.source() as source_fp:
+                payload = BytesIOSegmentPayload(
+                    source_fp,
+                    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
+                )
+
+                async with ClientSessionRegistry.get_session().put(
+                    missing_block.put_url,
+                    data=payload,
+                ) as response:
+                    response.raise_for_status()
+                    resp_data = await response.content.read()
 
-        with file_spec.source() as source_fp:
-            payload = BytesIOSegmentPayload(
-                source_fp,
-                block_start,
-                block_length,
-                progress_report_cb=functools.partial(progress_cb, progress_task_id)
-            )
+        file_progress.pending_blocks.remove(missing_block.block_index)
 
-            async with ClientSessionRegistry.get_session().put(
-                missing_block.put_url,
-                data=payload,
-            ) as response:
-                response.raise_for_status()
-                resp_data = await response.content.read()
+        if len(file_progress.pending_blocks) == 0:
+            task_progress_cb(complete=True)
 
         return block_sha256, resp_data
 

modal/volume.pyi

@@ -406,11 +406,15 @@ class VolumeUploadContextManager(AbstractVolumeUploadContextManager):
 class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
     _volume_id: str
     _client: modal.client._Client
-    _force: bool
     _progress_cb: collections.abc.Callable[..., typing.Any]
+    _force: bool
+    _hash_concurrency: int
+    _put_concurrency: int
     _uploader_generators: list[
         collections.abc.Generator[
-            collections.abc.Callable[[], typing.Awaitable[modal._utils.blob_utils.FileUploadSpec2]]
+            collections.abc.Callable[
+                [asyncio.locks.Semaphore], typing.Awaitable[modal._utils.blob_utils.FileUploadSpec2]
+            ]
         ]
     ]
 
@@ -420,6 +424,8 @@ class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
         client: modal.client._Client,
         progress_cb: typing.Optional[collections.abc.Callable[..., typing.Any]] = None,
         force: bool = False,
+        hash_concurrency: int = 4,
+        put_concurrency: int = 4,
     ): ...
     async def __aenter__(self): ...
     async def __aexit__(self, exc_type, exc_val, exc_tb): ...
@@ -440,11 +446,15 @@ class _VolumeUploadContextManager2(_AbstractVolumeUploadContextManager):
 class VolumeUploadContextManager2(AbstractVolumeUploadContextManager):
     _volume_id: str
     _client: modal.client.Client
-    _force: bool
     _progress_cb: collections.abc.Callable[..., typing.Any]
+    _force: bool
+    _hash_concurrency: int
+    _put_concurrency: int
     _uploader_generators: list[
         collections.abc.Generator[
-            collections.abc.Callable[[], typing.Awaitable[modal._utils.blob_utils.FileUploadSpec2]]
+            collections.abc.Callable[
+                [asyncio.locks.Semaphore], typing.Awaitable[modal._utils.blob_utils.FileUploadSpec2]
+            ]
         ]
     ]
 
@@ -454,6 +464,8 @@ class VolumeUploadContextManager2(AbstractVolumeUploadContextManager):
         client: modal.client.Client,
         progress_cb: typing.Optional[collections.abc.Callable[..., typing.Any]] = None,
         force: bool = False,
+        hash_concurrency: int = 4,
+        put_concurrency: int = 4,
     ): ...
     def __enter__(self): ...
     async def __aenter__(self): ...
@@ -482,6 +494,7 @@ async def _put_missing_blocks(
     file_specs: list[modal._utils.blob_utils.FileUploadSpec2],
     missing_blocks: list,
     put_responses: dict[bytes, bytes],
+    put_concurrency: int,
     progress_cb: collections.abc.Callable[..., typing.Any],
 ): ...
 def _open_files_error_annotation(mount_path: str) -> typing.Optional[str]: ...

{modal-0.74.43.dist-info → modal-0.74.44.dist-info}/METADATA

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

{modal-0.74.43.dist-info → modal-0.74.44.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=rPfz_p9AUkyobZGg5_yGRjA1RFzdHk97BrdExJ_57KE,7593
+modal/client.pyi,sha256=cwIyiWSCJzcoX33hLR2JME97LUoPaLRaNaLHvljlR1M,7593
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=pfEKqzNldQbtoM45CApRhSd8jJ7hD6o-83SLX8DTXXk,33549
@@ -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=4iCJURTNb-10T4HXAEXOCsRys1VLapytjLRrE_tErtM,40156
-modal/volume.pyi,sha256=Mq6w6lI2RTrilzQna1z2DwHznSC-Jte2-sCh1R6mp9s,17980
+modal/volume.py,sha256=197mYPFbjJfQWpLEvE3vinTwNpmbh0CC_B-NkOHzKo8,41979
+modal/volume.pyi,sha256=_gE9ED_aO-o3_f9MDCkJc6OM8qU1w5ULJ4aKoJkhlgk,18356
 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
@@ -92,7 +92,7 @@ modal/_runtime/user_code_imports.py,sha256=78wJyleqY2RVibqcpbDQyfWVBVT9BjyHPeoV9
 modal/_utils/__init__.py,sha256=waLjl5c6IPDhSsdWAm9Bji4e2PVxamYABKAze6CHVXY,28
 modal/_utils/app_utils.py,sha256=88BT4TPLWfYAQwKTHcyzNQRHg8n9B-QE2UyJs96iV-0,108
 modal/_utils/async_utils.py,sha256=b2TJyKY1Hq7df7M-fo3qlFM95mGdo3dCuqRPPcV5hsE,27445
-modal/_utils/blob_utils.py,sha256=WhWaSFLcffVDchMyfKys-j0EFVbm9l7rebzeoa7Z2jM,18214
+modal/_utils/blob_utils.py,sha256=IexC2Jbtqp_Tkmy62ayfgzTYte0UPCNufB_v-DO21g8,18585
 modal/_utils/bytes_io_segment_payload.py,sha256=uunxVJS4PE1LojF_UpURMzVK9GuvmYWRqQo_bxEj5TU,3385
 modal/_utils/deprecation.py,sha256=EXP1beU4pmEqEzWMLw6E3kUfNfpmNA_VOp6i0EHi93g,4856
 modal/_utils/docker_utils.py,sha256=h1uETghR40mp_y3fSWuZAfbIASH1HMzuphJHghAL6DU,3722
@@ -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.43.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.74.44.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=2hJCmnOxsmCyxzg5ap4nElf3c9LDoeofF0nLLlnsOGw,149
-modal-0.74.43.dist-info/METADATA,sha256=lWjSSt9FvZhtmQQVZkKRNBjRGF_BDnGSJGdQgL2neps,2451
-modal-0.74.43.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-0.74.43.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.74.43.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-0.74.43.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=A2au9WWp8OSJGELFBGHBaU8Q48nDv5wD_3RhTsz8opQ,149
+modal-0.74.44.dist-info/METADATA,sha256=07r7G26kX3keUDnSBhVjtaCEBrktd04tpkxSiC3A7Z0,2451
+modal-0.74.44.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-0.74.44.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.74.44.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-0.74.44.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 = 43  # git: a61b2c8
+build_number = 44  # git: 58b258f