modal 1.0.6.dev5__py3-none-any.whl → 1.0.6.dev7__py3-none-any.whl

modal/_utils/blob_utils.py

@@ -275,7 +275,9 @@ async def blob_upload(payload: bytes, stub: ModalClientModal) -> str:
     blob_id = await _blob_upload(upload_hashes, payload, stub)
     dur_s = max(time.time() - t0, 0.001)  # avoid division by zero
     throughput_mib_s = (size_mib) / dur_s
-    logger.debug(f"Uploaded large blob of size {size_mib:.2f} MiB ({throughput_mib_s:.2f} MiB/s). {blob_id}")
+    logger.debug(
+        f"Uploaded large blob of size {size_mib:.2f} MiB ({throughput_mib_s:.2f} MiB/s, total {dur_s:.2f}s). {blob_id}"
+    )
     return blob_id
 
 
@@ -314,7 +316,9 @@ async def blob_download(blob_id: str, stub: ModalClientModal) -> bytes:
     size_mib = len(data) / 1024 / 1024
     dur_s = max(time.time() - t0, 0.001)  # avoid division by zero
     throughput_mib_s = size_mib / dur_s
-    logger.debug(f"Downloaded large blob {blob_id} of size {size_mib:.2f} MiB ({throughput_mib_s:.2f} MiB/s)")
+    logger.debug(
+        f"Downloaded large blob {blob_id} of size {size_mib:.2f} MiB ({throughput_mib_s:.2f} MiB/s, total {dur_s:.2f}s)"
+    )
     return data
 
 

modal/client.pyi

@@ -31,7 +31,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.6.dev5",
+        version: str = "1.0.6.dev7",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -160,7 +160,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.6.dev5",
+        version: str = "1.0.6.dev7",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

modal/file_pattern_matcher.py

@@ -46,6 +46,18 @@ class _AbstractPatternMatcher:
 
         return super().__repr__()
 
+    @abstractmethod
+    def can_prune_directories(self) -> bool:
+        """
+        Returns True if this pattern matcher allows safe early directory pruning.
+
+        Directory pruning is safe when matching directories can be skipped entirely
+        without missing any files that should be included.
+
+        An example where pruning is not safe is for inverted patterns, like "!**/*.py".
+        """
+        ...
+
     @abstractmethod
     def __call__(self, path: Path) -> bool: ...
 
@@ -54,6 +66,15 @@ class _CustomPatternMatcher(_AbstractPatternMatcher):
     def __init__(self, predicate: Callable[[Path], bool]):
         self._predicate = predicate
 
+    def can_prune_directories(self) -> bool:
+        """
+        Custom pattern matchers (like negated matchers) cannot safely prune directories.
+
+        Since these are arbitrary predicates, we cannot determine if a directory
+        can be safely skipped without evaluating all files within it.
+        """
+        return False
+
     def __call__(self, path: Path) -> bool:
         return self._predicate(path)
 
@@ -173,6 +194,16 @@ class FilePatternMatcher(_AbstractPatternMatcher):
 
         return matched
 
+    def can_prune_directories(self) -> bool:
+        """
+        Returns True if this pattern matcher allows safe early directory pruning.
+
+        Directory pruning is safe when matching directories can be skipped entirely
+        without missing any files that should be included. This is for example not
+        safe when we have inverted/negated ignore patterns (e.g. "!**/*.py").
+        """
+        return not any(pattern.exclusion for pattern in self.patterns)
+
     def __call__(self, file_path: Path) -> bool:
         if self._delayed_init:
             self._delayed_init()

modal/functions.pyi

@@ -428,7 +428,7 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         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."""
             ...
@@ -437,7 +437,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -464,7 +464,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         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.
 
@@ -488,7 +488,7 @@ class Function(
             ...
 
     _experimental_spawn: ___experimental_spawn_spec[
-        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
+        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
     ]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER, SUPERSELF]):
@@ -497,7 +497,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P, typing_extensions.Self]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         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.
 
@@ -518,7 +518,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

modal/mount.py

@@ -8,7 +8,7 @@ import re
 import time
 import typing
 import warnings
-from collections.abc import AsyncGenerator
+from collections.abc import AsyncGenerator, Generator
 from pathlib import Path, PurePosixPath
 from typing import Callable, Optional, Sequence, Union
 
@@ -133,12 +133,27 @@ class _MountFile(_MountEntry):
 class _MountDir(_MountEntry):
     local_dir: Path
     remote_path: PurePosixPath
-    ignore: Callable[[Path], bool]
+    ignore: Union[Callable[[Path], bool], modal.file_pattern_matcher._AbstractPatternMatcher]
     recursive: bool
 
     def description(self):
         return str(self.local_dir.expanduser().absolute())
 
+    def _walk_and_prune(self, top_dir: Path) -> Generator[str, None, None]:
+        """Walk directories and prune ignored directories early."""
+        for root, dirs, files in os.walk(top_dir, topdown=True):
+            # with topdown=True, os.walk allows modifying the dirs list in-place, and will only
+            # recurse into dirs that are not ignored.
+            dirs[:] = [d for d in dirs if not self.ignore(Path(os.path.join(root, d)).relative_to(top_dir))]
+            for file in files:
+                yield os.path.join(root, file)
+
+    def _walk_all(self, top_dir: Path) -> Generator[str, None, None]:
+        """Walk all directories without early pruning - safe for complex/inverted ignore patterns."""
+        for root, _, files in os.walk(top_dir):
+            for file in files:
+                yield os.path.join(root, file)
+
     def get_files_to_upload(self):
         # we can't use .resolve() eagerly here since that could end up "renaming" symlinked files
         # see test_mount_directory_with_symlinked_file
@@ -153,7 +168,13 @@ class _MountDir(_MountEntry):
             raise NotADirectoryError(msg)
 
         if self.recursive:
-            gen = (os.path.join(root, name) for root, dirs, files in os.walk(local_dir) for name in files)
+            if (
+                isinstance(self.ignore, modal.file_pattern_matcher._AbstractPatternMatcher)
+                and self.ignore.can_prune_directories()
+            ):
+                gen = self._walk_and_prune(local_dir)
+            else:
+                gen = self._walk_all(local_dir)
         else:
             gen = (dir_entry.path for dir_entry in os.scandir(local_dir) if dir_entry.is_file())
 

modal/mount.pyi

@@ -4,6 +4,7 @@ import modal._object
 import modal._resolver
 import modal._utils.blob_utils
 import modal.client
+import modal.file_pattern_matcher
 import modal.object
 import modal_proto.api_pb2
 import pathlib
@@ -49,14 +50,24 @@ class _MountFile(_MountEntry):
         ...
 
 class _MountDir(_MountEntry):
-    """_MountDir(local_dir: pathlib.Path, remote_path: pathlib.PurePosixPath, ignore: Callable[[pathlib.Path], bool], recursive: bool)"""
+    """_MountDir(local_dir: pathlib.Path, remote_path: pathlib.PurePosixPath, ignore: Union[Callable[[pathlib.Path], bool], modal.file_pattern_matcher._AbstractPatternMatcher], recursive: bool)"""
 
     local_dir: pathlib.Path
     remote_path: pathlib.PurePosixPath
-    ignore: collections.abc.Callable[[pathlib.Path], bool]
+    ignore: typing.Union[
+        collections.abc.Callable[[pathlib.Path], bool], modal.file_pattern_matcher._AbstractPatternMatcher
+    ]
     recursive: bool
 
     def description(self): ...
+    def _walk_and_prune(self, top_dir: pathlib.Path) -> collections.abc.Generator[str, None, None]:
+        """Walk directories and prune ignored directories early."""
+        ...
+
+    def _walk_all(self, top_dir: pathlib.Path) -> collections.abc.Generator[str, None, None]:
+        """Walk all directories without early pruning - safe for complex/inverted ignore patterns."""
+        ...
+
     def get_files_to_upload(self): ...
     def watch_entry(self): ...
     def top_level_paths(self) -> list[tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
@@ -64,7 +75,9 @@ class _MountDir(_MountEntry):
         self,
         local_dir: pathlib.Path,
         remote_path: pathlib.PurePosixPath,
-        ignore: collections.abc.Callable[[pathlib.Path], bool],
+        ignore: typing.Union[
+            collections.abc.Callable[[pathlib.Path], bool], modal.file_pattern_matcher._AbstractPatternMatcher
+        ],
         recursive: bool,
     ) -> None:
         """Initialize self.  See help(type(self)) for accurate signature."""

{modal-1.0.6.dev5.dist-info → modal-1.0.6.dev7.dist-info}/METADATA

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

{modal-1.0.6.dev5.dist-info → modal-1.0.6.dev7.dist-info}/RECORD

@@ -22,7 +22,7 @@ modal/app.py,sha256=fCKq3TJ2Y5LB2WKNs6pp_5XECNH5avUL01jQljuoYRU,46603
 modal/app.pyi,sha256=Z6wi_dkXywiaM2rvAvguj2Wgu9ZgPjMSLl1nH1a7EYI,42243
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=OwISJvkgMb-rHm9Gc4i-7YcDgGiZgwJ7F_PzwZH7a6Q,16847
-modal/client.pyi,sha256=Cp104g6AL3YFJRPLq7CLiM6rytUFg65fxAy0nc24jbM,15079
+modal/client.pyi,sha256=Sf6qZOzIFzhgAEohtVTfB19bIVnBkI8lL2NTPadzUn4,15079
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=-qSfYAQvIoO_l2wsCCGTG5ZUwQieNKXdAO00yP1-LYU,7394
 modal/cls.py,sha256=EFrM949jNXJpmwB2G_1d28b8IpHShfKIEIaiPkZqeOU,39881
@@ -37,16 +37,16 @@ modal/environments.pyi,sha256=9-KtrzAcUe55cCP4020lSUD7-fWS7OPakAHssq4-bro,4219
 modal/exception.py,sha256=RjfKTJH7-Gcf_33BGkvDch-ry1Zx9u6-0QLViNxNTaU,5520
 modal/file_io.py,sha256=SCBfLk5gRieqdTVlA_f-2YHHtRp7Iy_sA6iR1zPsO3c,21100
 modal/file_io.pyi,sha256=_Hm-59MrppfuBYxtzdJkA2Jf9zI5LlbPh_0gURk0_7s,15222
-modal/file_pattern_matcher.py,sha256=wov-otB5M1oTdrYDtR2_VgacYin2srdtAP4McA1Cqzw,6516
+modal/file_pattern_matcher.py,sha256=urAue8es8jxqX94k9EYoZxxhtfgOlsEES8lbFHOorzc,7734
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
-modal/functions.pyi,sha256=ffW_kkU8AxMuV77ltmjK3nslXW_2iwEjKsT-Cgd4Trs,34840
+modal/functions.pyi,sha256=FJe_91dSrMCRNVT-YV1UhtxFKzIvL_C5q8xdk08-wT8,34840
 modal/gpu.py,sha256=Fe5ORvVPDIstSq1xjmM6OoNgLYFWvogP9r5BgmD3hYg,6769
 modal/image.py,sha256=3oF3wo5uJ9tlOV8yotixBJ-ZR1tOkRE1Qvq4E3G7Fhk,94159
 modal/image.pyi,sha256=ha8QhMPDRmfTSoRlQ8CgV4-AZ7kYKK_-R2UXLyGPgQU,68172
 modal/io_streams.py,sha256=FUDpBsVK8isqwyC7DtAcQZhaHlMFSaNZGhYJOg-SFW0,15590
 modal/io_streams.pyi,sha256=5b3b93ztZeR8IpJtNIGffX24QLPgocE4-gAps8y7CKU,13824
-modal/mount.py,sha256=7gdzBNueSjPsgsdisMv1bv5SncEQyWc6D-YlAbpze3s,35523
-modal/mount.pyi,sha256=Q4ryg68yyfgJh4dWqcs4y9jvcF8JArU8tIUZhdjRHac,19613
+modal/mount.py,sha256=VrExPZApUnuh9shJx-tzdmQJ9ASTSK-SEaYHDBkQl-k,36632
+modal/mount.pyi,sha256=n6AuS8J3bTCQj750nVZZdVBvzCAlSM2fyxAt_5LLFik,20264
 modal/network_file_system.py,sha256=92U94Wk2fP40LlgLDIHkTqQ-zc21YxaG6SdFQy8SudU,14731
 modal/network_file_system.pyi,sha256=Td_IobHr84iLo_9LZKQ4tNdUB60yjX8QWBaFiUvhfi8,17685
 modal/object.py,sha256=bTeskuY8JFrESjU4_UL_nTwYlBQdOLmVaOX3X6EMxsg,164
@@ -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=MhSCsCL8GqIVFWoHubU_899IH-JBZAiiqadG9Wri2l4,29361
-modal/_utils/blob_utils.py,sha256=uT_MlcYgS_Qo0EsuQw200_HQdsyNAkWbBe8K1YBrUsw,19838
+modal/_utils/blob_utils.py,sha256=NViIia3A5rdCpN712UDwiIiWtCZFoK_9DGq-xNX1z6A,19906
 modal/_utils/bytes_io_segment_payload.py,sha256=vaXPq8b52-x6G2hwE7SrjS58pg_aRm7gV3bn3yjmTzQ,4261
 modal/_utils/deprecation.py,sha256=-Bgg7jZdcJU8lROy18YyVnQYbM8hue-hVmwJqlWAGH0,5504
 modal/_utils/docker_utils.py,sha256=h1uETghR40mp_y3fSWuZAfbIASH1HMzuphJHghAL6DU,3722
@@ -147,7 +147,7 @@ modal/requirements/2024.10.txt,sha256=qD-5cVIVM9wXesJ6JC89Ew-3m2KjEElUz3jaw_MddR
 modal/requirements/PREVIEW.txt,sha256=KxDaVTOwatHvboDo4lorlgJ7-n-MfAwbPwxJ0zcJqrs,312
 modal/requirements/README.md,sha256=9tK76KP0Uph7O0M5oUgsSwEZDj5y-dcUPsnpR0Sc-Ik,854
 modal/requirements/base-images.json,sha256=f1bwyp2UkM844eoO9Qk30gQw_xrMqKpMSeJ6MErXnEk,995
-modal-1.0.6.dev5.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.0.6.dev7.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,10 +170,10 @@ modal_proto/options_pb2.pyi,sha256=l7DBrbLO7q3Ir-XDkWsajm0d0TQqqrfuX54i4BMpdQg,1
 modal_proto/options_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
 modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0yJSI,247
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-modal_version/__init__.py,sha256=KONbjKXNKx4J-giUGLlC3Wktw8-rQBrVeV4wSv7wj20,120
+modal_version/__init__.py,sha256=LhpZZvv8XrA5pB3BlP89kaxoLYKr4FqpFn-1KFxmJM4,120
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal-1.0.6.dev5.dist-info/METADATA,sha256=px9BLuBKBZsS3WkwU6Kugf6D8Nol3Ycvw-cjFVaZBQo,2461
-modal-1.0.6.dev5.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.0.6.dev5.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.0.6.dev5.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.0.6.dev5.dist-info/RECORD,,
+modal-1.0.6.dev7.dist-info/METADATA,sha256=MbeO2WcpWPifknwp4fqT9sipwP1OO5cHwgIxzoI7mmY,2461
+modal-1.0.6.dev7.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.0.6.dev7.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.0.6.dev7.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.0.6.dev7.dist-info/RECORD,,

modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.0.6.dev5"
+__version__ = "1.0.6.dev7"