modal 0.73.143__py3-none-any.whl → 0.73.145__py3-none-any.whl

modal/client.pyi

@@ -31,7 +31,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "0.73.143",
+        version: str = "0.73.145",
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -93,7 +93,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "0.73.143",
+        version: str = "0.73.145",
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/experimental/__init__.py

@@ -1,6 +1,8 @@
 # Copyright Modal Labs 2025
+import os
 from dataclasses import dataclass
-from typing import Any, Callable, Optional
+from pathlib import Path
+from typing import Any, Callable, Literal, Optional, Union
 
 from modal_proto import api_pb2
 
@@ -12,6 +14,8 @@ from .._runtime.container_io_manager import _ContainerIOManager
 from .._utils.async_utils import synchronizer
 from ..client import _Client
 from ..exception import InvalidError
+from ..image import DockerfileSpec, ImageBuilderVersion, _Image, _ImageRegistryConfig
+from ..secret import _Secret
 
 
 def stop_fetching_inputs():
@@ -103,3 +107,82 @@ async def list_deployed_apps(environment_name: str = "", client: Optional[_Clien
                 )
             )
     return app_infos
+
+
+@synchronizer.create_blocking
+async def raw_dockerfile_image(
+    path: Union[str, Path],
+    force_build: bool = False,
+) -> _Image:
+    """
+    Build a Modal Image from a local Dockerfile recipe without any changes.
+
+    Unlike for `modal.Image.from_dockerfile`, the provided recipe will not be embellished with
+    steps to install dependencies for the Modal client package. As a consequence, the resulting
+    Image cannot be used with a modal Function unless those dependencies are added in a subsequent
+    layer. It _can_ be directly used with a modal Sandbox, which does not need the Modal client.
+
+    We expect to support this experimental function until the `2025.04` Modal Image Builder is
+    stable, at which point Modal Image recipes will no longer install the client dependencies
+    by default. At that point, users can upgrade their Image Builder Version and migrate to
+    `modal.Image.from_dockerfile` for usecases supported by this function.
+
+    """
+
+    def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
+        with open(os.path.expanduser(path)) as f:
+            commands = f.read().split("\n")
+        return DockerfileSpec(commands=commands, context_files={})
+
+    return _Image._from_args(
+        dockerfile_function=build_dockerfile,
+        force_build=force_build,
+    )
+
+
+@synchronizer.create_blocking
+async def raw_registry_image(
+    tag: str,
+    registry_secret: Optional[_Secret] = None,
+    credential_type: Literal["static", "aws", "gcp", None] = None,
+    force_build: bool = False,
+) -> _Image:
+    """
+    Build a Modal Image from a public or private image registry without any changes.
+
+    Unlike for `modal.Image.from_registry`, the provided recipe will not be embellished with
+    steps to install dependencies for the Modal client package. As a consequence, the resulting
+    Image cannot be used with a modal Function unless those dependencies are added in a subsequent
+    layer. It _can_ be directly used with a modal Sandbox, which does not need the Modal client.
+
+    We expect to support this experimental function until the `2025.04` Modal Image Builder is
+    stable, at which point Modal Image recipes will no longer install the client dependencies
+    by default. At that point, users can upgrade their Image Builder Version and migrate to
+    `modal.Image.from_registry` for usecases supported by this function.
+
+    """
+
+    def build_dockerfile(version: ImageBuilderVersion) -> DockerfileSpec:
+        commands = [f"FROM {tag}"]
+        return DockerfileSpec(commands=commands, context_files={})
+
+    if registry_secret:
+        if credential_type is None:
+            raise InvalidError("credential_type must be provided when using a registry_secret")
+        elif credential_type == "static":
+            auth_type = api_pb2.REGISTRY_AUTH_TYPE_STATIC_CREDS
+        elif credential_type == "aws":
+            auth_type = api_pb2.REGISTRY_AUTH_TYPE_AWS
+        elif credential_type == "gcp":
+            auth_type = api_pb2.REGISTRY_AUTH_TYPE_GCP
+        else:
+            raise InvalidError(f"Invalid credential_type: {credential_type!r}")
+        registry_config = _ImageRegistryConfig(auth_type, registry_secret)
+    else:
+        registry_config = None
+
+    return _Image._from_args(
+        dockerfile_function=build_dockerfile,
+        image_registry_config=registry_config,
+        force_build=force_build,
+    )

modal/image.py

@@ -285,7 +285,7 @@ def _create_context_mount(
 
         return False
 
-    return _Mount._add_local_dir(Path("./"), PurePosixPath("/"), ignore=ignore_with_include)
+    return _Mount._add_local_dir(context_dir, PurePosixPath("/"), ignore=ignore_with_include)
 
 
 def _create_context_mount_function(
@@ -293,6 +293,7 @@ def _create_context_mount_function(
     dockerfile_cmds: list[str] = [],
     dockerfile_path: Optional[Path] = None,
     context_mount: Optional[_Mount] = None,
+    context_dir: Optional[Union[Path, str]] = None,
 ):
     if dockerfile_path and dockerfile_cmds:
         raise InvalidError("Cannot provide both dockerfile and docker commands")
@@ -300,15 +301,19 @@ def _create_context_mount_function(
     if context_mount:
         if ignore is not AUTO_DOCKERIGNORE:
             raise InvalidError("Cannot set both `context_mount` and `ignore`")
+        if context_dir is not None:
+            raise InvalidError("Cannot set both `context_mount` and `context_dir`")
 
         def identity_context_mount_fn() -> Optional[_Mount]:
             return context_mount
 
         return identity_context_mount_fn
+
     elif ignore is AUTO_DOCKERIGNORE:
 
         def auto_created_context_mount_fn() -> Optional[_Mount]:
-            context_dir = Path.cwd()
+            nonlocal context_dir
+            context_dir = Path.cwd() if context_dir is None else Path(context_dir).absolute()
             dockerignore_file = find_dockerignore_file(context_dir, dockerfile_path)
             ignore_fn = (
                 FilePatternMatcher(*dockerignore_file.read_text("utf8").splitlines())
@@ -321,12 +326,16 @@ def _create_context_mount_function(
 
         return auto_created_context_mount_fn
 
-    def auto_created_context_mount_fn() -> Optional[_Mount]:
-        # use COPY commands and ignore patterns to construct implicit context mount
-        cmds = dockerfile_path.read_text("utf8").splitlines() if dockerfile_path else dockerfile_cmds
-        return _create_context_mount(cmds, ignore_fn=_ignore_fn(ignore), context_dir=Path.cwd())
+    else:
+
+        def auto_created_context_mount_fn() -> Optional[_Mount]:
+            # use COPY commands and ignore patterns to construct implicit context mount
+            nonlocal context_dir
+            context_dir = Path.cwd() if context_dir is None else Path(context_dir).absolute()
+            cmds = dockerfile_path.read_text("utf8").splitlines() if dockerfile_path else dockerfile_cmds
+            return _create_context_mount(cmds, ignore_fn=_ignore_fn(ignore), context_dir=context_dir)
 
-    return auto_created_context_mount_fn
+        return auto_created_context_mount_fn
 
 
 class _ImageRegistryConfig:
@@ -1310,6 +1319,7 @@ class _Image(_Object, type_prefix="im"):
         secrets: Sequence[_Secret] = [],
         gpu: GPU_T = None,
         context_mount: Optional[_Mount] = None,  # Deprecated: the context is now inferred
+        context_dir: Optional[Union[Path, str]] = None,  # Context for relative COPY commands
         force_build: bool = False,  # Ignore cached builds, similar to 'docker build --no-cache'
         ignore: Union[Sequence[str], Callable[[Path], bool]] = AUTO_DOCKERIGNORE,
     ) -> "_Image":
@@ -1374,7 +1384,7 @@ class _Image(_Object, type_prefix="im"):
             secrets=secrets,
             gpu_config=parse_gpu_config(gpu),
             context_mount_function=_create_context_mount_function(
-                ignore=ignore, dockerfile_cmds=cmds, context_mount=context_mount
+                ignore=ignore, dockerfile_cmds=cmds, context_mount=context_mount, context_dir=context_dir
             ),
             force_build=self.force_build or force_build,
         )
@@ -1552,7 +1562,7 @@ class _Image(_Object, type_prefix="im"):
         add_python: Optional[str] = None,
         **kwargs,
     ) -> "_Image":
-        """Build a Modal image from a public or private image registry, such as Docker Hub.
+        """Build a Modal Image from a public or private image registry, such as Docker Hub.
 
         The image must be built for the `linux/amd64` platform.
 
@@ -1709,6 +1719,7 @@ class _Image(_Object, type_prefix="im"):
         # Ignore cached builds, similar to 'docker build --no-cache'
         force_build: bool = False,
         *,
+        context_dir: Optional[Union[Path, str]] = None,  # Context for relative COPY commands
         secrets: Sequence[_Secret] = [],
         gpu: GPU_T = None,
         add_python: Optional[str] = None,
@@ -1782,7 +1793,7 @@ class _Image(_Object, type_prefix="im"):
         base_image = _Image._from_args(
             dockerfile_function=build_dockerfile_base,
             context_mount_function=_create_context_mount_function(
-                ignore=ignore, dockerfile_path=Path(path), context_mount=context_mount
+                ignore=ignore, dockerfile_path=Path(path), context_mount=context_mount, context_dir=context_dir
             ),
             gpu_config=gpu_config,
             secrets=secrets,

modal/image.pyi

@@ -66,6 +66,7 @@ def _create_context_mount_function(
     dockerfile_cmds: list[str] = [],
     dockerfile_path: typing.Optional[pathlib.Path] = None,
     context_mount: typing.Optional[modal.mount._Mount] = None,
+    context_dir: typing.Union[pathlib.Path, str, None] = None,
 ): ...
 
 class _ImageRegistryConfig:
@@ -222,6 +223,7 @@ class _Image(modal._object._Object):
         secrets: collections.abc.Sequence[modal.secret._Secret] = [],
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
         context_mount: typing.Optional[modal.mount._Mount] = None,
+        context_dir: typing.Union[pathlib.Path, str, None] = None,
         force_build: bool = False,
         ignore: typing.Union[
             collections.abc.Sequence[str], collections.abc.Callable[[pathlib.Path], bool]
@@ -290,6 +292,7 @@ class _Image(modal._object._Object):
         context_mount: typing.Optional[modal.mount._Mount] = None,
         force_build: bool = False,
         *,
+        context_dir: typing.Union[pathlib.Path, str, None] = None,
         secrets: collections.abc.Sequence[modal.secret._Secret] = [],
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
         add_python: typing.Optional[str] = None,
@@ -482,6 +485,7 @@ class Image(modal.object.Object):
         secrets: collections.abc.Sequence[modal.secret.Secret] = [],
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
         context_mount: typing.Optional[modal.mount.Mount] = None,
+        context_dir: typing.Union[pathlib.Path, str, None] = None,
         force_build: bool = False,
         ignore: typing.Union[
             collections.abc.Sequence[str], collections.abc.Callable[[pathlib.Path], bool]
@@ -550,6 +554,7 @@ class Image(modal.object.Object):
         context_mount: typing.Optional[modal.mount.Mount] = None,
         force_build: bool = False,
         *,
+        context_dir: typing.Union[pathlib.Path, str, None] = None,
         secrets: collections.abc.Sequence[modal.secret.Secret] = [],
         gpu: typing.Union[None, str, modal.gpu._GPUConfig] = None,
         add_python: typing.Optional[str] = None,

{modal-0.73.143.dist-info → modal-0.73.145.dist-info}/METADATA

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

{modal-0.73.143.dist-info → modal-0.73.145.dist-info}/RECORD

@@ -23,7 +23,7 @@ modal/app.py,sha256=NKH7Cw1M6eyyrMXFbhWfdo3uRd28-8kv0Pcw56kPiPU,47312
 modal/app.pyi,sha256=pUEqciyGZ446sc_QoG8XcQ_oc6oU-U4dqjkxjhgOX98,26968
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=j9D3hNis1lfhnz9lVFGgJgowbH3PaGUzNKgHPWYG778,15372
-modal/client.pyi,sha256=CfDyx-Nfu0CC1bs8CypPA7qvaTvjCabL-FpRgUm6cog,7661
+modal/client.pyi,sha256=J7eXuFOFX-QEUY-bFll_4B9V3SqdWS9iuFrslnty0Sc,7661
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=PJimWA9q_sbQJNLbYy7fzjZGBm_hdfXuuZ7O_pKLXdk,31586
@@ -42,8 +42,8 @@ modal/file_pattern_matcher.py,sha256=trosX-Bp7dOubudN1bLLhRAoidWy1TcoaR4Pv8CedWw
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
 modal/functions.pyi,sha256=0Au1n37DimTZVvxCIR7HWALuNGxfJ_fcNR-or37eo5k,14438
 modal/gpu.py,sha256=Kbhs_u49FaC2Zi0TjCdrpstpRtT5eZgecynmQi5IZVE,6752
-modal/image.py,sha256=JVnSSAm7wmull3H_plU-bdPkc4Dx_2EPG_229YJd81U,92174
-modal/image.pyi,sha256=DQ4DLOCPr6_yV7z4LS0bTY0rOyvQP9-dQOrzaW7pPG8,25260
+modal/image.py,sha256=HtkKomhX4inozqSRi7lf5Vt9IEqCnVHn5bEo59hD64A,92835
+modal/image.pyi,sha256=iWclz2rxaP-LSsYMgU0X3ZcN5mEFvpyKzIPKJbohmsg,25591
 modal/io_streams.py,sha256=h5O2LmbRoT9l777z3TQhCAm-JF1r7avZ2ykXlejztDs,15163
 modal/io_streams.pyi,sha256=bJ7ZLmSmJ0nKoa6r4FJpbqvzdUVa0lEe0Fa-MMpMezU,5071
 modal/mount.py,sha256=JII0zTS1fPCcCbZgO18okkOuTDqYCxY1DIVa6i1E9cI,32196
@@ -137,7 +137,7 @@ modal/cli/volume.py,sha256=c2IuVNO2yJVaXmZkRh3xwQmznlRTgFoJr_BIzzqtVv0,10251
 modal/cli/programs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal/cli/programs/run_jupyter.py,sha256=MX6YQ6zRyRk1xo8tYZFiGam0p5KETwax81L6TpaS9I0,2778
 modal/cli/programs/vscode.py,sha256=kfvhZQ4bJwtVm3MgC1V7AlygZOlKT1a33alr_uwrewA,3473
-modal/experimental/__init__.py,sha256=6VY98HfgoQU-65ELJ4Re_PB3VBCjDMZywuK1oOvljkg,4025
+modal/experimental/__init__.py,sha256=DXXQnYEjaRPcr1b4pbKk4DckHKtQ8T8PcWTUuXG4_ug,7595
 modal/experimental/ipython.py,sha256=epLUZeDSdE226TH_tU3igRKCiVuQi99mUOrIJ4SemOE,2792
 modal/requirements/2023.12.312.txt,sha256=zWWUVgVQ92GXBKNYYr2-5vn9rlnXcmkqlwlX5u1eTYw,400
 modal/requirements/2023.12.txt,sha256=OjsbXFkCSdkzzryZP82Q73osr5wxQ6EUzmGcK7twfkA,502
@@ -170,10 +170,10 @@ modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0y
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_version/__init__.py,sha256=wiJQ53c-OMs0Xf1UeXOxQ7FwlV1VzIjnX6o-pRYZ_Pk,470
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal_version/_version_generated.py,sha256=Swo3V9IveICUpIFVpIVccS8muTG9yF2vONXjcIswZwg,150
-modal-0.73.143.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-modal-0.73.143.dist-info/METADATA,sha256=RIQlD3ToI9VKKHLrS0I7OnNSeHbBVL6WfzoINs9kuZA,2453
-modal-0.73.143.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-modal-0.73.143.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.73.143.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-0.73.143.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=YQBstI23mB655VZiiHXuwQBeJvkuthZrz2UWbWaboK0,150
+modal-0.73.145.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.73.145.dist-info/METADATA,sha256=TN9rgxptFzQz0ByXCsWGymktdRwq5gSl7bpKDvxwDrw,2453
+modal-0.73.145.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+modal-0.73.145.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.73.145.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-0.73.145.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 = 143  # git: 1eee221
+build_number = 145  # git: d6f7843