modAL 1.4.3.dev20__py3-none-any.whl → 1.4.3.dev22__py3-none-any.whl

modal/_utils/docker_utils.py

@@ -40,10 +40,19 @@ def extract_copy_command_patterns(dockerfile_lines: Sequence[str]) -> list[str]:
 
                 # COPY --from=... commands reference external sources and do not need a context mount.
                 # https://docs.docker.com/reference/dockerfile/#copy---from
-                if parts[0].startswith("--from="):
+                if any(p.startswith("--from=") for p in parts):
                     current_command = ""
                     continue
 
+                # Strip known COPY flags (--chmod, --chown, --link) before processing sources.
+                known_flag_prefixes = ("--chmod=", "--chown=", "--link=")
+                parts = [
+                    p
+                    for p in parts
+                    # link has a special handling - it can be "--link" or like "--link=true"
+                    if p != "--link" and not any(p.startswith(prefix) for prefix in known_flag_prefixes)
+                ]
+
                 if len(parts) >= 2:
                     # Last part is destination, everything else is a mount source
                     sources = parts[:-1]

modal/cli/environment.py

@@ -67,7 +67,8 @@ def list_(json: bool = False):
 def create(name: str, restricted: bool = False):
     check_environment_name(name)
     Environment.objects.create(name, restricted=restricted)
-    rich.print(f"[green]✓[/green] Environment created: {name}")
+    prefix = "Restricted " if restricted else ""
+    rich.print(f"[green]✓[/green] {prefix}Environment created: {name}")
 
 
 ENVIRONMENT_DELETE_HELP = """Delete an environment in the current workspace.

modal/client.pyi

@@ -35,7 +35,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.3.dev20",
+        version: str = "1.4.3.dev22",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -175,7 +175,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.4.3.dev20",
+        version: str = "1.4.3.dev22",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

modal/functions.pyi

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

modal/image.py

@@ -24,7 +24,7 @@ from typing import (
 import typing_extensions
 from google.protobuf.message import Message
 from grpclib.exceptions import StreamTerminatedError
-from typing_extensions import Self
+from typing_extensions import Concatenate, Self
 
 from modal._serialization import serialize_data_format
 from modal_proto import api_pb2
@@ -101,6 +101,8 @@ Use {replacement} instead, which is functionally and performance-wise equivalent
 See https://modal.com/docs/guide/modal-1-0-migration for more details.
 """
 
+P = typing_extensions.ParamSpec("P")
+
 
 def _validate_python_version(
     python_version: Optional[str],
@@ -2480,6 +2482,32 @@ class _Image(_Object, type_prefix="im"):
 
         return self.dockerfile_commands(dockerfile_cmd)
 
+    def pipe(
+        self,
+        func: Callable[Concatenate["_Image", P], "_Image"],
+        *args: P.args,
+        **kwargs: P.kwargs,
+    ) -> "_Image":
+        """Apply a local function to expand the Image recipe.
+
+        This method can be useful for defining reusable Image build
+        recipes that compose well with the fluent Image builder interface.
+
+        **Example**
+
+        ```python
+        def workspace_setup(image: modal.Image, repo: str) -> modal.Image:
+            return image.run_commands(f"git clone {repo}").uv_pip_install(".")
+
+        image = (
+            modal.Image.debian_slim()
+            .apt_install("git")
+            .pipe(workspace_setup, "https://github.com/example/repo.git")
+        )
+        ```
+        """
+        return func(self, *args, **kwargs)
+
     # Live handle methods
 
     @contextlib.contextmanager

modal/image.pyi

@@ -29,6 +29,8 @@ class _AutoDockerIgnoreSentinel:
 
 AUTO_DOCKERIGNORE: _AutoDockerIgnoreSentinel
 
+P = typing_extensions.ParamSpec("P")
+
 def _validate_python_version(
     python_version: typing.Optional[str],
     builder_version: typing.Literal["2023.12", "2024.04", "2024.10", "2025.06", "PREVIEW"],
@@ -1041,6 +1043,32 @@ class _Image(modal._object._Object):
         """
         ...
 
+    def pipe(
+        self,
+        func: collections.abc.Callable[typing_extensions.Concatenate[_Image, P], _Image],
+        *args: P.args,
+        **kwargs: P.kwargs,
+    ) -> _Image:
+        """Apply a local function to expand the Image recipe.
+
+        This method can be useful for defining reusable Image build
+        recipes that compose well with the fluent Image builder interface.
+
+        **Example**
+
+        ```python
+        def workspace_setup(image: modal.Image, repo: str) -> modal.Image:
+            return image.run_commands(f"git clone {repo}").uv_pip_install(".")
+
+        image = (
+            modal.Image.debian_slim()
+            .apt_install("git")
+            .pipe(workspace_setup, "https://github.com/example/repo.git")
+        )
+        ```
+        """
+        ...
+
     def imports(self):
         """Used to import packages in global scope that are only available when running remotely.
         By using this context manager you can avoid an `ImportError` due to not having certain
@@ -2038,6 +2066,32 @@ class Image(modal.object.Object):
         """
         ...
 
+    def pipe(
+        self,
+        func: collections.abc.Callable[typing_extensions.Concatenate[Image, P], Image],
+        *args: P.args,
+        **kwargs: P.kwargs,
+    ) -> Image:
+        """Apply a local function to expand the Image recipe.
+
+        This method can be useful for defining reusable Image build
+        recipes that compose well with the fluent Image builder interface.
+
+        **Example**
+
+        ```python
+        def workspace_setup(image: modal.Image, repo: str) -> modal.Image:
+            return image.run_commands(f"git clone {repo}").uv_pip_install(".")
+
+        image = (
+            modal.Image.debian_slim()
+            .apt_install("git")
+            .pipe(workspace_setup, "https://github.com/example/repo.git")
+        )
+        ```
+        """
+        ...
+
     def imports(self):
         """Used to import packages in global scope that are only available when running remotely.
         By using this context manager you can avoid an `ImportError` due to not having certain

{modal-1.4.3.dev20.dist-info → modal-1.4.3.dev22.dist-info}/METADATA

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

{modal-1.4.3.dev20.dist-info → modal-1.4.3.dev22.dist-info}/RECORD

@@ -27,7 +27,7 @@ modal/app.pyi,sha256=-9667eLtUgoinLTRrJ-Z3SOgMR0S89Qw_vpwEZfp2Pk,53910
 modal/billing.py,sha256=B2zXa7KeMnpqi2AQINycEk-KSXVYaLTTTAQTtuf2Gfs,257
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=jjT4eLFHGcvIF6Xw4kPptIx-VmExtphRN8XJ1JA7fWI,15502
-modal/client.pyi,sha256=AG2_H3M98oFAac8SKnQdSLYxYmtQuROzyxvA2siq84I,15703
+modal/client.pyi,sha256=YOTWsO3zKjYIKksljRAtkugSIY9WCCDTybpuURepglQ,15703
 modal/cloud_bucket_mount.py,sha256=KkaJVy5vpO_u2NtDYtv1JM-M3y4J0UtWBapTDKpQRcA,6034
 modal/cloud_bucket_mount.pyi,sha256=mGDeEd1XvxGpCE6O5jRBSfIvMXvZ5AtIybea5k-0w9w,7560
 modal/cls.py,sha256=Yrl5b_tQhZMhc5avInM-i5UlGuqeog6Gs4rX2d9lLjI,40390
@@ -44,9 +44,9 @@ modal/file_io.py,sha256=DYQXrPUNkKG-0lyzc81E3rh7g56Fg5y6eIQkTqhfqbU,22015
 modal/file_io.pyi,sha256=DPaq0BhySaiCX3g56QHhyIMdU1izbfWsjpSp30JoJUU,15745
 modal/file_pattern_matcher.py,sha256=A_Kdkej6q7YQyhM_2-BvpFmPqJ0oHb54B6yf9VqvPVE,8116
 modal/functions.py,sha256=EZRcHFfnoYbvawUJnAHF5nIvoo9GX2Djy7mUmOCXmXc,258
-modal/functions.pyi,sha256=_sZ27MFClkElRg0iyVXmn9pGXwm9F-r49sHjrYhH4Sg,34255
-modal/image.py,sha256=Gsj05uwX84bY2xkTWuv2Wbfz_6iGySezvlAEJzVIZx4,112580
-modal/image.pyi,sha256=zYiJsc5tEhGev_rT9R3cGpyQJf-Hm08OJl37sV4E_fk,79377
+modal/functions.pyi,sha256=m2uNU9DMi9LWprk9PJykCM1Zs_oEG2-Vl2FaJMGSNpY,34255
+modal/image.py,sha256=K-105RcY39Kq8uC4toG6WOMTnAVlPn_6P8J_DiNxiyQ,113430
+modal/image.pyi,sha256=FUAY23rnaUmpRBVazrzh3Z3b9tYTMikbyk2SbuIpihI,81004
 modal/io_streams.py,sha256=JcYbvvjMZFugv53yHc9Id0N4nIvDMwV63ZtnN1bPmZc,30940
 modal/io_streams.pyi,sha256=aBxCcbHTprL08FLvPlkzu4bypCTT7xUdelNe5kc7OZY,18506
 modal/mount.py,sha256=1inCkNfb5IyXEIVyenpdPwPGFWLPTwf6zgABln025ew,34749
@@ -111,7 +111,7 @@ modal/_utils/blob_utils.py,sha256=d9ZBhSt-BXNJy-xpOjyZDD050-b_ORnGSUVhJCpXq08,25
 modal/_utils/browser_utils.py,sha256=Yqq0qU4Id6oaDOdeT1JEmbCN7vj4baNJJraJhRWU8ZI,1085
 modal/_utils/bytes_io_segment_payload.py,sha256=vaXPq8b52-x6G2hwE7SrjS58pg_aRm7gV3bn3yjmTzQ,4261
 modal/_utils/deprecation.py,sha256=i97J-n82xI2tKFsNF77Iqv5-gDgNLWJHwmyxui3ZhR4,4547
-modal/_utils/docker_utils.py,sha256=h1uETghR40mp_y3fSWuZAfbIASH1HMzuphJHghAL6DU,3722
+modal/_utils/docker_utils.py,sha256=4dTcYtT3fWg5aCax7YKOBktRDoK0YWAfHiw555Q7nSU,4204
 modal/_utils/function_utils.py,sha256=5NTus-Nd9uT6frNA9C6I_QUjnXgrrc_P2tIi1gjCPsU,24717
 modal/_utils/git_utils.py,sha256=qtUU6JAttF55ZxYq51y55OR58B0tDPZsZWK5dJe6W5g,3182
 modal/_utils/grpc_testing.py,sha256=fZLyfMA5VYmIo-dUCcKQrVCH3ZKPT7K4_6ww373jt0Y,8697
@@ -156,7 +156,7 @@ modal/cli/container.py,sha256=iK8wVsM7tWaIKTOiDUlRNK-McnZFRQOlb6Kqrm7_zUM,12212
 modal/cli/dashboard.py,sha256=u3HzFNb4BgSBTW8ve034XNO0Tdt_z5P1kr8RcGFMxcw,941
 modal/cli/dict.py,sha256=S1bN8fakoxlnAUMhYlRACM7iTP2PuNLGQ8kQnWgMS9M,5088
 modal/cli/entry_point.py,sha256=0g7C_BGDg6GPJSCKEOty9GPGXhkjlRI6UoP9oZVQdDI,4647
-modal/cli/environment.py,sha256=ZSve0YKywgYp5Pf-MGuIaPUIsMmo1ZHJkcNbV1C0jQ4,6855
+modal/cli/environment.py,sha256=3W__Nqj5beXq4rx-NfeHIIzmHlqRQ2dHO6NOA-E8mpE,6912
 modal/cli/import_refs.py,sha256=XjJpEovHzXt3xDF0CdRK-9R148M7esnq6gyGz0X4mQM,15559
 modal/cli/launch.py,sha256=ccqO0fS0xnXpBQDqdiguKhFLJWDM9sukVYiDwmi9mkA,4516
 modal/cli/logo.py,sha256=plv82syvPb8j3qrR1A_nojZwp823t3VEXaDlrx1jkt0,3221
@@ -177,7 +177,7 @@ modal/experimental/__init__.py,sha256=Wb1YoAKAnNxH_0c2wA0T12I7bSu9PSO2nS_LuLska7
 modal/experimental/flash.py,sha256=ATGhVO8AleJ-TOe2PGolI5T7zfCEtj0kl_ivMPp7Rqg,33362
 modal/experimental/flash.pyi,sha256=R4h2nQl7-oiwqq_twCp0YqID_LnPjPGqxywXvxbiLIk,17011
 modal/experimental/ipython.py,sha256=TrCfmol9LGsRZMeDoeMPx3Hv3BFqQhYnmD_iH0pqdhk,2904
-modal-1.4.3.dev20.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.4.3.dev22.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=bfUSLscHfoQoKkKjIqJvQMe3fURzqcQK7gF1h9WQLtM,3742
 modal_docs/gen_cli_docs_main.py,sha256=UPGr7O1DYTIRLwfINe2rbdh89J3cPVTU1OWL-SjxnOQ,198
@@ -188,8 +188,8 @@ modal_docs/mdmd/mdmd.py,sha256=z9T3lMktTq3N4r6T6MSSyw8lebbqKc3Igw8l9EdMJNM,9998
 modal_docs/mdmd/signatures.py,sha256=XJaZrK7Mdepk5fdX51A8uENiLFNil85Ud0d4MH8H5f0,3218
 modal_proto/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
 modal_proto/api_grpc.py,sha256=H4Z21x81592KlGzgDIcgltk5WixY5vs5EyOH8Q89wvA,153140
-modal_proto/api_pb2.py,sha256=P09tScxAvEid1BbXBAxC_N_IZJ7EpjfpFIub-RMgOHU,424105
-modal_proto/api_pb2.pyi,sha256=pcSsNAvaMCnzTwzl8uGm75FY4wlx7yvV32r9iVoL_EM,593732
+modal_proto/api_pb2.py,sha256=c0NQd6BfKIoXJFl5lh1lYDSYIl0uZID77nY8M2FiTb4,424149
+modal_proto/api_pb2.pyi,sha256=bp1EfIDDxVzRjXG-iziUHZJfoi2wlKCvChg6NBUYk4k,593892
 modal_proto/api_pb2_grpc.py,sha256=dWnojBtfuaqHvBos1FL-JMNEB7LsNHM1UGUpKXO5IFY,329867
 modal_proto/api_pb2_grpc.pyi,sha256=qDqqKIs18olWaoBjLOJ8Z6Gn8_GjpNn3Z1Pw1yG_M4I,77024
 modal_proto/modal_api_grpc.py,sha256=bBPhTehvCriGANMHxXNxKa58ew_2QbSvO88zhKCr4CE,24177
@@ -199,10 +199,10 @@ modal_proto/task_command_router_pb2.py,sha256=6TY5umHeqYdFNuRaOoZP2YfUbtCxRHqyi2
 modal_proto/task_command_router_pb2.pyi,sha256=PYljoZVw16_d4Hn-9cD6SDssmYsvVqx_HOgEEUGYBLk,31452
 modal_proto/task_command_router_pb2_grpc.py,sha256=XVmcdxLnK_IY3trlF6nLmzFhqSG-bbYNABC7xIs6fT8,28732
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=og_J8CxYeAV0ikpHXZMvr_uC15UD3I3fgyyAO2pGm1E,8981
-modal_version/__init__.py,sha256=RI763JGSMNFaL5G9olas6cDpWUs2vqtiLrGltEJCE8c,121
+modal_version/__init__.py,sha256=_wDGul1YyU6J-p-w8JU9D77KNysIoNNafBBYT6aIkoE,121
 modal_version/__main__.py,sha256=nLUbubxKx7GXNzJIkTB7M7_u8080LyLM0IS0rzFkC_c,119
-modal-1.4.3.dev20.dist-info/METADATA,sha256=V-5wUJcLBjqouhHu-RE68yO4M5jnaD4aWjjJpHO3ma8,2339
-modal-1.4.3.dev20.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.4.3.dev20.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.4.3.dev20.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.4.3.dev20.dist-info/RECORD,,
+modal-1.4.3.dev22.dist-info/METADATA,sha256=kqGI3ohDG8Evpd3N3ugaV9_NOTIDKpH1NEEKuGJPv0Q,2339
+modal-1.4.3.dev22.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.4.3.dev22.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.4.3.dev22.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.4.3.dev22.dist-info/RECORD,,