modal 0.68.17__py3-none-any.whl → 0.68.22__py3-none-any.whl

modal/__init__.py

@@ -17,6 +17,7 @@ try:
     from .cls import Cls, parameter
     from .dict import Dict
     from .exception import Error
+    from .file_pattern_matcher import FilePatternMatcher
     from .functions import Function
     from .image import Image
     from .mount import Mount
@@ -48,6 +49,7 @@ __all__ = [
     "Cron",
     "Dict",
     "Error",
+    "FilePatternMatcher",
     "Function",
     "Image",
     "Mount",

modal/_utils/{pattern_matcher.py → pattern_utils.py}

@@ -5,7 +5,7 @@ This is the same pattern-matching logic used by Docker, except it is written in
 Python rather than Go. Also, the original Go library has a couple deprecated
 functions that we don't implement in this port.
 
-The main way to use this library is by constructing a `PatternMatcher` object,
+The main way to use this library is by constructing a `FilePatternMatcher` object,
 then asking it whether file paths match any of its patterns.
 """
 
@@ -148,75 +148,6 @@ class Pattern:
             return False
 
 
-class PatternMatcher:
-    """Allows checking paths against a list of patterns."""
-
-    def __init__(self, patterns: list[str]) -> None:
-        """Initialize a new PatternMatcher instance.
-
-        Args:
-            patterns (list): A list of pattern strings.
-
-        Raises:
-            ValueError: If an illegal exclusion pattern is provided.
-        """
-        self.patterns: list[Pattern] = []
-        self.exclusions = False
-        for pattern in patterns:
-            pattern = pattern.strip()
-            if not pattern:
-                continue
-            pattern = os.path.normpath(pattern)
-            new_pattern = Pattern()
-            if pattern[0] == "!":
-                if len(pattern) == 1:
-                    raise ValueError('Illegal exclusion pattern: "!"')
-                new_pattern.exclusion = True
-                pattern = pattern[1:]
-                self.exclusions = True
-            # In Python, we can proceed without explicit syntax checking
-            new_pattern.cleaned_pattern = pattern
-            new_pattern.dirs = pattern.split(os.path.sep)
-            self.patterns.append(new_pattern)
-
-    def matches(self, file_path: str) -> bool:
-        """Check if the file path or any of its parent directories match the patterns.
-
-        This is equivalent to `MatchesOrParentMatches()` in the original Go
-        library. The reason is that `Matches()` in the original library is
-        deprecated due to buggy behavior.
-        """
-        matched = False
-        file_path = os.path.normpath(file_path)
-        if file_path == ".":
-            # Don't let them exclude everything; kind of silly.
-            return False
-        parent_path = os.path.dirname(file_path)
-        if parent_path == "":
-            parent_path = "."
-        parent_path_dirs = parent_path.split(os.path.sep)
-
-        for pattern in self.patterns:
-            # Skip evaluation based on current match status and pattern exclusion
-            if pattern.exclusion != matched:
-                continue
-
-            match = pattern.match(file_path)
-
-            if not match and parent_path != ".":
-                # Check if the pattern matches any of the parent directories
-                for i in range(len(parent_path_dirs)):
-                    dir_path = os.path.sep.join(parent_path_dirs[: i + 1])
-                    if pattern.match(dir_path):
-                        match = True
-                        break
-
-            if match:
-                matched = not pattern.exclusion
-
-        return matched
-
-
 def read_ignorefile(reader: TextIO) -> list[str]:
     """Read an ignore file from a reader and return the list of file patterns to
     ignore, applying the following rules:

modal/_utils/shell_utils.py

@@ -19,14 +19,20 @@ def write_to_fd(fd: int, data: bytes):
     future = loop.create_future()
 
     def try_write():
+        nonlocal data
         try:
             nbytes = os.write(fd, data)
-            loop.remove_writer(fd)
-            future.set_result(nbytes)
+            data = data[nbytes:]
+            if not data:
+                loop.remove_writer(fd)
+                future.set_result(None)
         except OSError as e:
-            if e.errno != errno.EAGAIN:
-                future.set_exception(e)
-                raise
+            if e.errno == errno.EAGAIN:
+                # Wait for the next write notification
+                return
+            # Fail if it's not EAGAIN
+            loop.remove_writer(fd)
+            future.set_exception(e)
 
     loop.add_writer(fd, try_write)
     return future

modal/client.pyi

@@ -26,7 +26,7 @@ class _Client:
     _stub: typing.Optional[modal_proto.api_grpc.ModalClientStub]
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.68.17"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.68.22"
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -81,7 +81,7 @@ class Client:
     _stub: typing.Optional[modal_proto.api_grpc.ModalClientStub]
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.68.17"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.68.22"
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/file_pattern_matcher.py

@@ -0,0 +1,121 @@
+# Copyright Modal Labs 2024
+"""Pattern matching library ported from https://github.com/moby/patternmatcher.
+
+This is the same pattern-matching logic used by Docker, except it is written in
+Python rather than Go. Also, the original Go library has a couple deprecated
+functions that we don't implement in this port.
+
+The main way to use this library is by constructing a `FilePatternMatcher` object,
+then asking it whether file paths match any of its patterns.
+"""
+
+import os
+from pathlib import Path
+from typing import Callable
+
+from ._utils.pattern_utils import Pattern
+
+
+class FilePatternMatcher:
+    """Allows matching file paths against a list of patterns."""
+
+    def __init__(self, *pattern: str) -> None:
+        """Initialize a new FilePatternMatcher instance.
+
+        Args:
+            pattern (str): One or more pattern strings.
+
+        Raises:
+            ValueError: If an illegal exclusion pattern is provided.
+        """
+        self.patterns: list[Pattern] = []
+        self.exclusions = False
+        for p in list(pattern):
+            p = p.strip()
+            if not p:
+                continue
+            p = os.path.normpath(p)
+            new_pattern = Pattern()
+            if p[0] == "!":
+                if len(p) == 1:
+                    raise ValueError('Illegal exclusion pattern: "!"')
+                new_pattern.exclusion = True
+                p = p[1:]
+                self.exclusions = True
+            # In Python, we can proceed without explicit syntax checking
+            new_pattern.cleaned_pattern = p
+            new_pattern.dirs = p.split(os.path.sep)
+            self.patterns.append(new_pattern)
+
+    def _matches(self, file_path: str) -> bool:
+        """Check if the file path or any of its parent directories match the patterns.
+
+        This is equivalent to `MatchesOrParentMatches()` in the original Go
+        library. The reason is that `Matches()` in the original library is
+        deprecated due to buggy behavior.
+        """
+        matched = False
+        file_path = os.path.normpath(file_path)
+        if file_path == ".":
+            # Don't let them exclude everything; kind of silly.
+            return False
+        parent_path = os.path.dirname(file_path)
+        if parent_path == "":
+            parent_path = "."
+        parent_path_dirs = parent_path.split(os.path.sep)
+
+        for pattern in self.patterns:
+            # Skip evaluation based on current match status and pattern exclusion
+            if pattern.exclusion != matched:
+                continue
+
+            match = pattern.match(file_path)
+
+            if not match and parent_path != ".":
+                # Check if the pattern matches any of the parent directories
+                for i in range(len(parent_path_dirs)):
+                    dir_path = os.path.sep.join(parent_path_dirs[: i + 1])
+                    if pattern.match(dir_path):
+                        match = True
+                        break
+
+            if match:
+                matched = not pattern.exclusion
+
+        return matched
+
+    def __call__(self, file_path: Path) -> bool:
+        """Check if the path matches any of the patterns.
+
+        Args:
+            file_path (Path): The path to check.
+
+        Returns:
+            True if the path matches any of the patterns.
+
+        Usage:
+        ```python
+        from pathlib import Path
+        from modal import FilePatternMatcher
+
+        matcher = FilePatternMatcher("*.py")
+
+        assert matcher(Path("foo.py"))
+        ```
+        """
+        return self._matches(str(file_path))
+
+    def __invert__(self) -> Callable[[Path], bool]:
+        """Invert the filter. Returns a function that returns True if the path does not match any of the patterns.
+
+        Usage:
+        ```python
+        from pathlib import Path
+        from modal import FilePatternMatcher
+
+        inverted_matcher = ~FilePatternMatcher("**/*.py")
+
+        assert not inverted_matcher(Path("foo.py"))
+        ```
+        """
+        return lambda path: not self(path)

modal/image.py

@@ -37,6 +37,7 @@ from .cloud_bucket_mount import _CloudBucketMount
 from .config import config, logger, user_config_path
 from .environments import _get_environment_cached
 from .exception import InvalidError, NotFoundError, RemoteError, VersionError, deprecation_error, deprecation_warning
+from .file_pattern_matcher import FilePatternMatcher
 from .gpu import GPU_T, parse_gpu_config
 from .mount import _Mount, python_standalone_mount_name
 from .network_file_system import _NetworkFileSystem
@@ -638,7 +639,17 @@ class _Image(_Object, type_prefix="im"):
         mount = _Mount.from_local_file(local_path, remote_path)
         return self._add_mount_layer_or_copy(mount, copy=copy)
 
-    def add_local_dir(self, local_path: Union[str, Path], remote_path: str, *, copy: bool = False) -> "_Image":
+    def add_local_dir(
+        self,
+        local_path: Union[str, Path],
+        remote_path: str,
+        *,
+        copy: bool = False,
+        # Predicate filter function for file exclusion, which should accept a filepath and return `True` for exclusion.
+        # Defaults to excluding no files. If a Sequence is provided, it will be converted to a FilePatternMatcher.
+        # Which follows dockerignore syntax.
+        ignore: Union[Sequence[str], Callable[[Path], bool]] = [],
+    ) -> "_Image":
         """Adds a local directory's content to the image at `remote_path` within the container
 
         By default (`copy=False`), the files are added to containers on startup and are not built into the actual Image,
@@ -650,12 +661,44 @@ class _Image(_Object, type_prefix="im"):
         copy=True can slow down iteration since it requires a rebuild of the Image and any subsequent
         build steps whenever the included files change, but it is required if you want to run additional
         build steps after this one.
+
+        **Usage:**
+
+        ```python
+        from modal import FilePatternMatcher
+
+        image = modal.Image.debian_slim().add_local_dir(
+            "~/assets",
+            remote_path="/assets",
+            ignore=["*.venv"],
+        )
+
+        image = modal.Image.debian_slim().add_local_dir(
+            "~/assets",
+            remote_path="/assets",
+            ignore=lambda p: p.is_relative_to(".venv"),
+        )
+
+        image = modal.Image.debian_slim().copy_local_dir(
+            "~/assets",
+            remote_path="/assets",
+            ignore=FilePatternMatcher("**/*.txt"),
+        )
+
+        # When including files is simpler than excluding them, you can use the `~` operator to invert the matcher.
+        image = modal.Image.debian_slim().copy_local_dir(
+            "~/assets",
+            remote_path="/assets",
+            ignore=~FilePatternMatcher("**/*.py"),
+        )
+        ```
         """
         if not PurePosixPath(remote_path).is_absolute():
             # TODO(elias): implement relative to absolute resolution using image workdir metadata
             #  + make default remote_path="./"
             raise InvalidError("image.add_local_dir() currently only supports absolute remote_path values")
-        mount = _Mount.from_local_dir(local_path, remote_path=remote_path)
+
+        mount = _Mount._add_local_dir(Path(local_path), Path(remote_path), ignore)
         return self._add_mount_layer_or_copy(mount, copy=copy)
 
     def copy_local_file(self, local_path: Union[str, Path], remote_path: Union[str, Path] = "./") -> "_Image":
@@ -697,19 +740,56 @@ class _Image(_Object, type_prefix="im"):
         the destination directory.
         """
 
-        def only_py_files(filename):
-            return filename.endswith(".py")
-
-        mount = _Mount.from_local_python_packages(*modules, condition=only_py_files)
+        mount = _Mount.from_local_python_packages(*modules, ignore=~FilePatternMatcher("**/*.py"))
         return self._add_mount_layer_or_copy(mount, copy=copy)
 
-    def copy_local_dir(self, local_path: Union[str, Path], remote_path: Union[str, Path] = ".") -> "_Image":
+    def copy_local_dir(
+        self,
+        local_path: Union[str, Path],
+        remote_path: Union[str, Path] = ".",
+        # Predicate filter function for file exclusion, which should accept a filepath and return `True` for exclusion.
+        # Defaults to excluding no files. If a Sequence is provided, it will be converted to a FilePatternMatcher.
+        # Which follows dockerignore syntax.
+        ignore: Union[Sequence[str], Callable[[Path], bool]] = [],
+    ) -> "_Image":
         """Copy a directory into the image as a part of building the image.
 
         This works in a similar way to [`COPY`](https://docs.docker.com/engine/reference/builder/#copy)
         works in a `Dockerfile`.
+
+        **Usage:**
+
+        ```python
+        from modal import FilePatternMatcher
+
+        image = modal.Image.debian_slim().copy_local_dir(
+            "~/assets",
+            remote_path="/assets",
+            ignore=["**/*.venv"],
+        )
+
+        image = modal.Image.debian_slim().copy_local_dir(
+            "~/assets",
+            remote_path="/assets",
+            ignore=lambda p: p.is_relative_to(".venv"),
+        )
+
+        image = modal.Image.debian_slim().copy_local_dir(
+            "~/assets",
+            remote_path="/assets",
+            ignore=FilePatternMatcher("**/*.txt"),
+        )
+
+        # When including files is simpler than excluding them, you can use the `~` operator to invert the matcher.
+        image = modal.Image.debian_slim().copy_local_dir(
+            "~/assets",
+            remote_path="/assets",
+            ignore=~FilePatternMatcher("**/*.py"),
+        )
+        ```
         """
-        mount = _Mount.from_local_dir(local_path, remote_path="/")
+
+        mount = _Mount._add_local_dir(Path(local_path), Path("/"), ignore)
 
         def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
             return DockerfileSpec(commands=["FROM base", f"COPY . {remote_path}"], context_files={})

modal/image.pyi

@@ -110,14 +110,22 @@ class _Image(modal.object._Object):
         self, local_path: typing.Union[str, pathlib.Path], remote_path: str, *, copy: bool = False
     ) -> _Image: ...
     def add_local_dir(
-        self, local_path: typing.Union[str, pathlib.Path], remote_path: str, *, copy: bool = False
+        self,
+        local_path: typing.Union[str, pathlib.Path],
+        remote_path: str,
+        *,
+        copy: bool = False,
+        ignore: typing.Union[collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]] = [],
     ) -> _Image: ...
     def copy_local_file(
         self, local_path: typing.Union[str, pathlib.Path], remote_path: typing.Union[str, pathlib.Path] = "./"
     ) -> _Image: ...
     def add_local_python_source(self, *module_names: str, copy: bool = False) -> _Image: ...
     def copy_local_dir(
-        self, local_path: typing.Union[str, pathlib.Path], remote_path: typing.Union[str, pathlib.Path] = "."
+        self,
+        local_path: typing.Union[str, pathlib.Path],
+        remote_path: typing.Union[str, pathlib.Path] = ".",
+        ignore: typing.Union[collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]] = [],
     ) -> _Image: ...
     def pip_install(
         self,
@@ -367,14 +375,22 @@ class Image(modal.object.Object):
         self, local_path: typing.Union[str, pathlib.Path], remote_path: str, *, copy: bool = False
     ) -> Image: ...
     def add_local_dir(
-        self, local_path: typing.Union[str, pathlib.Path], remote_path: str, *, copy: bool = False
+        self,
+        local_path: typing.Union[str, pathlib.Path],
+        remote_path: str,
+        *,
+        copy: bool = False,
+        ignore: typing.Union[collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]] = [],
     ) -> Image: ...
     def copy_local_file(
         self, local_path: typing.Union[str, pathlib.Path], remote_path: typing.Union[str, pathlib.Path] = "./"
     ) -> Image: ...
     def add_local_python_source(self, *module_names: str, copy: bool = False) -> Image: ...
     def copy_local_dir(
-        self, local_path: typing.Union[str, pathlib.Path], remote_path: typing.Union[str, pathlib.Path] = "."
+        self,
+        local_path: typing.Union[str, pathlib.Path],
+        remote_path: typing.Union[str, pathlib.Path] = ".",
+        ignore: typing.Union[collections.abc.Sequence[str], typing.Callable[[pathlib.Path], bool]] = [],
     ) -> Image: ...
     def pip_install(
         self,

modal/mount.py

@@ -11,7 +11,7 @@ import time
 import typing
 from collections.abc import AsyncGenerator
 from pathlib import Path, PurePosixPath
-from typing import Callable, Optional, Union
+from typing import Callable, Optional, Sequence, Union
 
 from google.protobuf.message import Message
 
@@ -27,7 +27,8 @@ from ._utils.name_utils import check_object_name
 from ._utils.package_utils import get_module_mount_info
 from .client import _Client
 from .config import config, logger
-from .exception import ModuleNotMountable
+from .exception import InvalidError, ModuleNotMountable
+from .file_pattern_matcher import FilePatternMatcher
 from .object import _get_environment_name, _Object
 
 ROOT_DIR: PurePosixPath = PurePosixPath("/root")
@@ -122,7 +123,7 @@ class _MountFile(_MountEntry):
 class _MountDir(_MountEntry):
     local_dir: Path
     remote_path: PurePosixPath
-    condition: Callable[[str], bool]
+    ignore: Callable[[Path], bool]
     recursive: bool
 
     def description(self):
@@ -143,7 +144,7 @@ class _MountDir(_MountEntry):
             gen = (dir_entry.path for dir_entry in os.scandir(local_dir) if dir_entry.is_file())
 
         for local_filename in gen:
-            if self.condition(local_filename):
+            if not self.ignore(Path(local_filename)):
                 local_relpath = Path(local_filename).expanduser().absolute().relative_to(local_dir)
                 mount_path = self.remote_path / local_relpath.as_posix()
                 yield local_filename, mount_path
@@ -182,6 +183,10 @@ def module_mount_condition(module_base: Path):
     return condition
 
 
+def module_mount_ignore_condition(module_base: Path):
+    return lambda f: not module_mount_condition(module_base)(str(f))
+
+
 @dataclasses.dataclass
 class _MountedPythonModule(_MountEntry):
     # the purpose of this is to keep printable information about which Python package
@@ -190,7 +195,7 @@ class _MountedPythonModule(_MountEntry):
 
     module_name: str
     remote_dir: Union[PurePosixPath, str] = ROOT_DIR.as_posix()  # cast needed here for type stub generation...
-    condition: typing.Optional[typing.Callable[[str], bool]] = None
+    ignore: Optional[Callable[[Path], bool]] = None
 
     def description(self) -> str:
         return f"PythonPackage:{self.module_name}"
@@ -206,7 +211,7 @@ class _MountedPythonModule(_MountEntry):
                     _MountDir(
                         base_path,
                         remote_path=remote_dir,
-                        condition=self.condition or module_mount_condition(base_path),
+                        ignore=self.ignore or module_mount_ignore_condition(base_path),
                         recursive=True,
                     )
                 )
@@ -313,6 +318,24 @@ class _Mount(_Object, type_prefix="mo"):
         # we can't rely on it to be set. Let's clean this up later.
         return getattr(self, "_is_local", False)
 
+    @staticmethod
+    def _add_local_dir(
+        local_path: Path,
+        remote_path: Path,
+        ignore: Union[Sequence[str], Callable[[Path], bool]] = [],
+    ):
+        if isinstance(ignore, list):
+            ignore = FilePatternMatcher(*ignore)
+
+        return _Mount._new()._extend(
+            _MountDir(
+                local_dir=local_path,
+                ignore=ignore,
+                remote_path=remote_path,
+                recursive=True,
+            ),
+        )
+
     def add_local_dir(
         self,
         local_path: Union[str, Path],
@@ -339,10 +362,13 @@ class _Mount(_Object, type_prefix="mo"):
 
             condition = include_all
 
+        def converted_condition(path: Path) -> bool:
+            return not condition(str(path))
+
         return self._extend(
             _MountDir(
                 local_dir=local_path,
-                condition=condition,
+                ignore=converted_condition,
                 remote_path=remote_path,
                 recursive=recursive,
             ),
@@ -551,6 +577,7 @@ class _Mount(_Object, type_prefix="mo"):
         # Predicate filter function for file selection, which should accept a filepath and return `True` for inclusion.
         # Defaults to including all files.
         condition: Optional[Callable[[str], bool]] = None,
+        ignore: Optional[Union[Sequence[str], Callable[[Path], bool]]] = None,
     ) -> "_Mount":
         """
         Returns a `modal.Mount` that makes local modules listed in `module_names` available inside the container.
@@ -575,13 +602,24 @@ class _Mount(_Object, type_prefix="mo"):
 
         # Don't re-run inside container.
 
+        if condition is not None:
+            if ignore is not None:
+                raise InvalidError("Cannot specify both `ignore` and `condition`")
+
+            def converted_condition(path: Path) -> bool:
+                return not condition(str(path))
+
+            ignore = converted_condition
+        elif isinstance(ignore, list):
+            ignore = FilePatternMatcher(*ignore)
+
         mount = _Mount._new()
         from ._runtime.execution_context import is_local
 
         if not is_local():
             return mount  # empty/non-mountable mount in case it's used from within a container
         for module_name in module_names:
-            mount = mount._extend(_MountedPythonModule(module_name, remote_dir, condition))
+            mount = mount._extend(_MountedPythonModule(module_name, remote_dir, ignore))
         return mount
 
     @staticmethod

modal/mount.pyi

@@ -35,7 +35,7 @@ class _MountFile(_MountEntry):
 class _MountDir(_MountEntry):
     local_dir: pathlib.Path
     remote_path: pathlib.PurePosixPath
-    condition: typing.Callable[[str], bool]
+    ignore: typing.Callable[[pathlib.Path], bool]
     recursive: bool
 
     def description(self): ...
@@ -46,18 +46,19 @@ class _MountDir(_MountEntry):
         self,
         local_dir: pathlib.Path,
         remote_path: pathlib.PurePosixPath,
-        condition: typing.Callable[[str], bool],
+        ignore: typing.Callable[[pathlib.Path], bool],
         recursive: bool,
     ) -> None: ...
     def __repr__(self): ...
     def __eq__(self, other): ...
 
 def module_mount_condition(module_base: pathlib.Path): ...
+def module_mount_ignore_condition(module_base: pathlib.Path): ...
 
 class _MountedPythonModule(_MountEntry):
     module_name: str
     remote_dir: typing.Union[pathlib.PurePosixPath, str]
-    condition: typing.Optional[typing.Callable[[str], bool]]
+    ignore: typing.Optional[typing.Callable[[pathlib.Path], bool]]
 
     def description(self) -> str: ...
     def _proxy_entries(self) -> list[_MountEntry]: ...
@@ -68,7 +69,7 @@ class _MountedPythonModule(_MountEntry):
         self,
         module_name: str,
         remote_dir: typing.Union[pathlib.PurePosixPath, str] = "/root",
-        condition: typing.Optional[typing.Callable[[str], bool]] = None,
+        ignore: typing.Optional[typing.Callable[[pathlib.Path], bool]] = None,
     ) -> None: ...
     def __repr__(self): ...
     def __eq__(self, other): ...
@@ -90,6 +91,12 @@ class _Mount(modal.object._Object):
     def _hydrate_metadata(self, handle_metadata: typing.Optional[google.protobuf.message.Message]): ...
     def _top_level_paths(self) -> list[tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
     def is_local(self) -> bool: ...
+    @staticmethod
+    def _add_local_dir(
+        local_path: pathlib.Path,
+        remote_path: pathlib.Path,
+        ignore: typing.Union[typing.Sequence[str], typing.Callable[[pathlib.Path], bool]] = [],
+    ): ...
     def add_local_dir(
         self,
         local_path: typing.Union[str, pathlib.Path],
@@ -129,6 +136,7 @@ class _Mount(modal.object._Object):
         *module_names: str,
         remote_dir: typing.Union[str, pathlib.PurePosixPath] = "/root",
         condition: typing.Optional[typing.Callable[[str], bool]] = None,
+        ignore: typing.Union[typing.Sequence[str], typing.Callable[[pathlib.Path], bool], None] = None,
     ) -> _Mount: ...
     @staticmethod
     def from_name(label: str, namespace=1, environment_name: typing.Optional[str] = None) -> _Mount: ...
@@ -165,6 +173,12 @@ class Mount(modal.object.Object):
     def _hydrate_metadata(self, handle_metadata: typing.Optional[google.protobuf.message.Message]): ...
     def _top_level_paths(self) -> list[tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
     def is_local(self) -> bool: ...
+    @staticmethod
+    def _add_local_dir(
+        local_path: pathlib.Path,
+        remote_path: pathlib.Path,
+        ignore: typing.Union[typing.Sequence[str], typing.Callable[[pathlib.Path], bool]] = [],
+    ): ...
     def add_local_dir(
         self,
         local_path: typing.Union[str, pathlib.Path],
@@ -214,6 +228,7 @@ class Mount(modal.object.Object):
         *module_names: str,
         remote_dir: typing.Union[str, pathlib.PurePosixPath] = "/root",
         condition: typing.Optional[typing.Callable[[str], bool]] = None,
+        ignore: typing.Union[typing.Sequence[str], typing.Callable[[pathlib.Path], bool], None] = None,
     ) -> Mount: ...
     @staticmethod
     def from_name(label: str, namespace=1, environment_name: typing.Optional[str] = None) -> Mount: ...

{modal-0.68.17.dist-info → modal-0.68.22.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modal
-Version: 0.68.17
+Version: 0.68.22
 Summary: Python client library for Modal
 Author: Modal Labs
 Author-email: support@modal.com

{modal-0.68.17.dist-info → modal-0.68.22.dist-info}/RECORD

@@ -1,4 +1,4 @@
-modal/__init__.py,sha256=Yn8zS7Jxl5uZjPM331Pc4FdSmp9Rt6VdE7TiE4ZKRc8,2151
+modal/__init__.py,sha256=3NJLLHb0TRc2tc68kf8NHzORx38GbtbZvPEWDWrQ6N4,2234
 modal/__main__.py,sha256=scYhGFqh8OJcVDo-VOxIT6CCwxOgzgflYWMnIZiMRqE,2871
 modal/_clustered_functions.py,sha256=kTf-9YBXY88NutC1akI-gCbvf01RhMPCw-zoOI_YIUE,2700
 modal/_clustered_functions.pyi,sha256=vllkegc99A0jrUOWa8mdlSbdp6uz36TsHhGxysAOpaQ,771
@@ -19,7 +19,7 @@ modal/app.py,sha256=EJ7FUN6rWnSwLJoYJh8nmKg_t-8hdN8_rt0OrkP7JvQ,46084
 modal/app.pyi,sha256=BE5SlR5tRECuc6-e2lUuOknDdov3zxgZ4N0AsLb5ZVQ,25270
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=JAnd4-GCN093BwkvOFAK5a6iy5ycxofjpUncMxlrIMw,15253
-modal/client.pyi,sha256=a3tSqqxDP2RB5k9owWQ8XyGZxXOdWOwqVZceDAk8agc,7280
+modal/client.pyi,sha256=dfEnFo8-UHPgN1obEZZNljgyXnRbGEjXdZld0uZtxL0,7280
 modal/cloud_bucket_mount.py,sha256=G7T7jWLD0QkmrfKR75mSTwdUZ2xNfj7pkVqb4ipmxmI,5735
 modal/cloud_bucket_mount.pyi,sha256=CEi7vrH3kDUF4LAy4qP6tfImy2UJuFRcRbsgRNM1wo8,1403
 modal/cls.py,sha256=ONnrfZ2vPcaY2JuKypPiBA9eTiyg8Qfg-Ull40nn9zs,30956
@@ -35,15 +35,16 @@ modal/exception.py,sha256=dRK789TD1HaB63kHhu1yZuvS2vP_Vua3iLMBtA6dgqk,7128
 modal/experimental.py,sha256=jFuNbwrNHos47viMB9q-cHJSvf2RDxDdoEcss9plaZE,2302
 modal/file_io.py,sha256=q8s872qf6Ntdw7dPogDlpYbixxGkwCA0BlQn2UUoVhY,14637
 modal/file_io.pyi,sha256=pfkmJiaBpMCZReE6-KCjYOzB1dVtyYDYokJoYX8ARK4,6932
+modal/file_pattern_matcher.py,sha256=vX6MjWRGdonE4I8QPdjFUnz6moBjSzvgD6417BNQrW4,4021
 modal/functions.py,sha256=IIdHw0FNOdoMksG1b2zvkn8f-xskhJu07ZvHMey9iq4,67667
 modal/functions.pyi,sha256=EYH4w4VgQtdbEWLGarnU5QtYVfuM2_tnovKFEbYyg2c,25068
 modal/gpu.py,sha256=r4rL6uH3UJIQthzYvfWauXNyh01WqCPtKZCmmSX1fd4,6881
-modal/image.py,sha256=cQ6WP1xHXZT_nY8z3aEFiGwKzrTV0yxi3Ab8JzF91eo,79653
-modal/image.pyi,sha256=PIKH6JBA4L5TfdJrQu3pm2ykyIITmiP920TpP8cdyQA,24585
+modal/image.py,sha256=xQAC1gWOG0L77QfVfAbHfLwfVkvMYi2sy0V_Ah7GWPg,82253
+modal/image.pyi,sha256=8R8Ac9eZ83ocM_1qrFUvH3rCbI5zRnq-Eq0xaAQq4nI,25105
 modal/io_streams.py,sha256=QkQiizKRzd5bnbKQsap31LJgBYlAnj4-XkV_50xPYX0,15079
 modal/io_streams.pyi,sha256=bCCVSxkMcosYd8O3PQDDwJw7TQ8JEcnYonLJ5t27TQs,4804
-modal/mount.py,sha256=7FJrS-QkRJGndKuvRnMz452wfUcbLpd_UEnmFgQCKQQ,27770
-modal/mount.pyi,sha256=3e4nkXUeeVmUmOyK8Tiyk_EQlHeWruN3yGJVnmDUVrI,9761
+modal/mount.py,sha256=QKvrgpS_FMqrGdoyVZWeWnkNpQeDSLpuiwZFSGgRp_Y,29017
+modal/mount.pyi,sha256=a0WAFmT7kZvoq_ZAu6R6fwxiEUR6QSmeC_avUpJKGWM,10495
 modal/network_file_system.py,sha256=kwwQLCJVO086FTiAWSF_jz9BkqijZLpSbEYXpFvS0Ik,14600
 modal/network_file_system.pyi,sha256=8mHKXuRkxHPazF6ljIW7g4M5aVqLSl6eKUPLgDCug5c,7901
 modal/object.py,sha256=HZs3N59C6JxlMuPQWJYvrWV1FEEkH9txUovVDorVUbs,9763
@@ -95,9 +96,9 @@ modal/_utils/logger.py,sha256=ePzdudrtx9jJCjuO6-bcL_kwUJfi4AwloUmIiNtqkY0,1330
 modal/_utils/mount_utils.py,sha256=J-FRZbPQv1i__Tob-FIpbB1oXWpFLAwZiB4OCiJpFG0,3206
 modal/_utils/name_utils.py,sha256=TW1iyJedvDNPEJ5UVp93u8xuD5J2gQL_CUt1mgov_aI,1939
 modal/_utils/package_utils.py,sha256=LcL2olGN4xaUzu2Tbv-C-Ft9Qp6bsLxEfETOAVd-mjU,2073
-modal/_utils/pattern_matcher.py,sha256=sssw9Cmck2f-TvOE1i96fbdsJr9DKLpbebyCwNr3wHY,9246
+modal/_utils/pattern_utils.py,sha256=ZUffaECfe2iYBhH6cvCB-0-UWhmEBTZEl_TwG_So3ag,6714
 modal/_utils/rand_pb_testing.py,sha256=NYM8W6HF-6_bzxJCAj4ITvItZYrclacEZlBhTptOT_Q,3845
-modal/_utils/shell_utils.py,sha256=6P0ykuE5qU2MkCu2HHc8yqJzp8CgTm79ws3snsV9OkU,1946
+modal/_utils/shell_utils.py,sha256=hWHzv730Br2Xyj6cGPiMZ-198Z3RZuOu3pDXhFSZ22c,2157
 modal/_vendor/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
 modal/_vendor/a2wsgi_wsgi.py,sha256=Q1AsjpV_Q_vzQsz_cSqmP9jWzsGsB-ARFU6vpQYml8k,21878
 modal/_vendor/cloudpickle.py,sha256=Loq12qo7PBNbE4LFVEW6BdMMwY10MG94EOW1SCpcnQ0,55217
@@ -162,10 +163,10 @@ modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0y
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_version/__init__.py,sha256=RT6zPoOdFO99u5Wcxxaoir4ZCuPTbQ22cvzFAXl3vUY,470
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal_version/_version_generated.py,sha256=3LQTgInOVM-50IiUJ-gaG2Cb7X-KLoWbUrkc7gj101I,149
-modal-0.68.17.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-modal-0.68.17.dist-info/METADATA,sha256=_vtR2S6yUPVCB8gnWn0cByPkdbPtHFyh5HCELRrG4oI,2329
-modal-0.68.17.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-modal-0.68.17.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.68.17.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
-modal-0.68.17.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=wLHIwO28sQtEk0ciwX4jSNkWaBSvrjwFXwTKHNJnrk8,149
+modal-0.68.22.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.68.22.dist-info/METADATA,sha256=lxET0EL_6taaugt-THklYA5DDoV-yEiaulTb6-hv33I,2329
+modal-0.68.22.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+modal-0.68.22.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.68.22.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
+modal-0.68.22.dist-info/RECORD,,

modal_version/_version_generated.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2024
 
 # Note: Reset this value to -1 whenever you make a minor `0.X` release of the client.
-build_number = 17  # git: cf44c8d
+build_number = 22  # git: 8f81e00