modal 1.2.5.dev26__tar.gz → 1.2.5.dev27__tar.gz

{modal-1.2.5.dev26 → modal-1.2.5.dev27}/PKG-INFO

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

{modal-1.2.5.dev26 → modal-1.2.5.dev27}/modal/_utils/blob_utils.py

@@ -371,11 +371,17 @@ class FileUploadSpec:
     mount_filename: str
 
     use_blob: bool
-    content: Optional[bytes]  # typically None if using blob, required otherwise
     sha256_hex: str
     md5_hex: str
     mode: int  # file permission bits (last 12 bits of st_mode)
     size: int
+    content: Optional[bytes] = None  # Set for very small files to avoid double-read
+
+    def read_content(self) -> bytes:
+        """Read content from source."""
+        with self.source() as fp:
+            fp.seek(0)
+            return fp.read()
 
 
 def _get_file_upload_spec(
@@ -384,6 +390,7 @@ def _get_file_upload_spec(
     mount_filename: PurePosixPath,
     mode: int,
 ) -> FileUploadSpec:
+    content = None
     with source() as fp:
         # Current position is ignored - we always upload from position 0
         fp.seek(0, os.SEEK_END)
@@ -394,12 +401,18 @@ def _get_file_upload_spec(
             # TODO(dano): remove the placeholder md5 once we stop requiring md5 for blobs
             md5_hex = "baadbaadbaadbaadbaadbaadbaadbaad" if size > MULTIPART_UPLOAD_THRESHOLD else None
             use_blob = True
-            content = None
             hashes = get_upload_hashes(fp, md5_hex=md5_hex)
         else:
             use_blob = False
-            content = fp.read()
-            hashes = get_upload_hashes(content)
+            # For very small files (< 256 KiB), read content once and cache it
+            # This avoids double-read penalty while limiting memory usage
+            if size < 256 * 1024:  # 256 KiB threshold
+                fp.seek(0)
+                content = fp.read()
+                hashes = get_upload_hashes(content)
+            else:
+                # For medium files (256 KiB - 4 MiB), compute hashes without caching content
+                hashes = get_upload_hashes(fp)
 
     return FileUploadSpec(
         source=source,
@@ -407,11 +420,11 @@ def _get_file_upload_spec(
         source_is_path=isinstance(source_description, Path),
         mount_filename=mount_filename.as_posix(),
         use_blob=use_blob,
-        content=content,
         sha256_hex=hashes.sha256_hex(),
         md5_hex=hashes.md5_hex(),
         mode=mode & 0o7777,
         size=size,
+        content=content,
     )
 
 

{modal-1.2.5.dev26 → modal-1.2.5.dev27}/modal/client.pyi

@@ -32,7 +32,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.2.5.dev26",
+        version: str = "1.2.5.dev27",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -163,7 +163,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.2.5.dev26",
+        version: str = "1.2.5.dev27",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.2.5.dev26 → modal-1.2.5.dev27}/modal/mount.py

@@ -466,16 +466,18 @@ class _Mount(_Object, type_prefix="mo"):
         loop = asyncio.get_event_loop()
         with concurrent.futures.ThreadPoolExecutor() as exe:
             all_files = await loop.run_in_executor(exe, _select_files, entries)
+            logger.debug(f"Computing checksums for {len(all_files)} files using {exe._max_workers} worker threads")
 
-            futs = []
+            # Yield FileUploadSpec objects lazily as they're consumed by async_map downstream.
+            # async_map's concurrency limit provides natural backpressure, so we don't need
+            # a separate semaphore here. This keeps memory bounded without creating all tasks upfront.
             for local_filename, remote_filename in all_files:
-                logger.debug(f"Mounting {local_filename} as {remote_filename}")
-                futs.append(loop.run_in_executor(exe, get_file_upload_spec_from_path, local_filename, remote_filename))
-
-            logger.debug(f"Computing checksums for {len(futs)} files using {exe._max_workers} worker threads")
-            for fut in asyncio.as_completed(futs):
                 try:
-                    yield await fut
+                    logger.debug(f"Mounting {local_filename} as {remote_filename}")
+                    file_spec = await loop.run_in_executor(
+                        exe, get_file_upload_spec_from_path, local_filename, remote_filename
+                    )
+                    yield file_spec
                 except FileNotFoundError as exc:
                     # Can happen with temporary files (e.g. emacs will write temp files and delete them quickly)
                     logger.info(f"Ignoring file not found: {exc}")
@@ -547,7 +549,11 @@ class _Mount(_Object, type_prefix="mo"):
                 logger.debug(
                     f"Uploading file {file_spec.source_description} to {remote_filename} ({file_spec.size} bytes)"
                 )
-                request2 = api_pb2.MountPutFileRequest(data=file_spec.content, sha256_hex=file_spec.sha256_hex)
+                if file_spec.content is None:
+                    content = await asyncio.to_thread(file_spec.read_content)
+                else:
+                    content = file_spec.content
+                request2 = api_pb2.MountPutFileRequest(data=content, sha256_hex=file_spec.sha256_hex)
 
             start_time = time.monotonic()
             while time.monotonic() - start_time < MOUNT_PUT_FILE_CLIENT_TIMEOUT:

{modal-1.2.5.dev26 → modal-1.2.5.dev27}/modal/volume.py

@@ -1056,7 +1056,11 @@ class _VolumeUploadContextManager(_AbstractVolumeUploadContextManager):
                 logger.debug(
                     f"Uploading file {file_spec.source_description} to {remote_filename} ({file_spec.size} bytes)"
                 )
-                request2 = api_pb2.MountPutFileRequest(data=file_spec.content, sha256_hex=file_spec.sha256_hex)
+                if file_spec.content is None:
+                    content = await asyncio.to_thread(file_spec.read_content)
+                else:
+                    content = file_spec.content
+                request2 = api_pb2.MountPutFileRequest(data=content, sha256_hex=file_spec.sha256_hex)
                 self._progress_cb(task_id=progress_task_id, complete=True)
 
             while (time.monotonic() - start_time) < VOLUME_PUT_FILE_CLIENT_TIMEOUT:

{modal-1.2.5.dev26 → modal-1.2.5.dev27}/modal.egg-info/PKG-INFO

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

{modal-1.2.5.dev26 → modal-1.2.5.dev27}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.2.5.dev26"
+__version__ = "1.2.5.dev27"