modal 1.0.3.dev28__tar.gz → 1.0.4.dev2__tar.gz

{modal-1.0.3.dev28 → modal-1.0.4.dev2}/PKG-INFO

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

{modal-1.0.3.dev28 → modal-1.0.4.dev2}/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.3.dev28",
+        version: str = "1.0.4.dev2",
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -94,7 +94,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.3.dev28",
+        version: str = "1.0.4.dev2",
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-1.0.3.dev28 → modal-1.0.4.dev2}/modal/functions.pyi

@@ -227,11 +227,11 @@ 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: ...
         async def aio(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
 
-    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]: ...
@@ -246,12 +246,12 @@ class Function(
         self, *args: modal._functions.P.args, **kwargs: modal._functions.P.kwargs
     ) -> modal._functions.OriginalReturnType: ...
 
-    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]: ...
         async def aio(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
     _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]):
@@ -260,11 +260,11 @@ 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]: ...
         async def aio(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
-    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]: ...
 

{modal-1.0.3.dev28 → modal-1.0.4.dev2}/modal/mount.py

@@ -290,6 +290,7 @@ class _Mount(_Object, type_prefix="mo"):
     _deployment_name: Optional[str] = None
     _namespace: Optional[int] = None
     _environment_name: Optional[str] = None
+    _allow_overwrite: bool = False
     _content_checksum_sha256_hex: Optional[str] = None
 
     @staticmethod
@@ -600,11 +601,16 @@ class _Mount(_Object, type_prefix="mo"):
         # Build the mount.
         status_row.message(f"Creating mount {message_label}: Finalizing index of {len(files)} files")
         if self._deployment_name:
+            creation_type = (
+                api_pb2.OBJECT_CREATION_TYPE_CREATE_IF_MISSING
+                if self._allow_overwrite
+                else api_pb2.OBJECT_CREATION_TYPE_CREATE_FAIL_IF_EXISTS
+            )
             req = api_pb2.MountGetOrCreateRequest(
                 deployment_name=self._deployment_name,
                 namespace=self._namespace,
                 environment_name=self._environment_name,
-                object_creation_type=api_pb2.OBJECT_CREATION_TYPE_CREATE_FAIL_IF_EXISTS,
+                object_creation_type=creation_type,
                 files=files,
             )
         elif resolver.app_id is not None:
@@ -736,7 +742,9 @@ class _Mount(_Object, type_prefix="mo"):
         self: "_Mount",
         deployment_name: Optional[str] = None,
         namespace=api_pb2.DEPLOYMENT_NAMESPACE_WORKSPACE,
+        *,
         environment_name: Optional[str] = None,
+        allow_overwrite: bool = False,
         client: Optional[_Client] = None,
     ) -> None:
         check_object_name(deployment_name, "Mount")
@@ -744,6 +752,7 @@ class _Mount(_Object, type_prefix="mo"):
         self._deployment_name = deployment_name
         self._namespace = namespace
         self._environment_name = environment_name
+        self._allow_overwrite = allow_overwrite
         if client is None:
             client = await _Client.from_env()
         resolver = Resolver(client=client, environment_name=environment_name)
@@ -826,35 +835,34 @@ import sys; sys.path.append('{REMOTE_PACKAGES_PATH}')
 """.strip()
 
 
-async def _create_single_mount(
+async def _create_single_client_dependency_mount(
     client: _Client,
     builder_version: str,
     python_version: str,
-    platform: str,
     arch: str,
-    uv_python_platform: str = None,
+    platform: str,
+    uv_python_platform: str,
     check_if_exists: bool = True,
+    allow_overwrite: bool = False,
 ):
-    import subprocess
     import tempfile
 
     profile_environment = config.get("environment")
     abi_tag = "cp" + python_version.replace(".", "")
     mount_name = f"{builder_version}-{abi_tag}-{platform}-{arch}"
-    uv_python_platform = uv_python_platform or f"{arch}-{platform}"
 
     if check_if_exists:
         try:
             await Mount.from_name(mount_name, namespace=api_pb2.DEPLOYMENT_NAMESPACE_GLOBAL).hydrate.aio(client)
-            print(f"✅ Found existing mount {mount_name} in global namespace.")
+            print(f"➖ Found existing mount {mount_name} in global namespace.")
             return
         except modal.exception.NotFoundError:
             pass
 
-    with tempfile.TemporaryDirectory() as tmpd:
+    with tempfile.TemporaryDirectory(ignore_cleanup_errors=True) as tmpd:
         print(f"📦 Building {mount_name}.")
         requirements = os.path.join(os.path.dirname(__file__), f"requirements/{builder_version}.txt")
-        subprocess.run(
+        cmd = " ".join(
             [
                 "uv",
                 "pip",
@@ -871,12 +879,21 @@ async def _create_single_mount(
                 uv_python_platform,
                 "--python-version",
                 python_version,
-            ],
-            check=True,
-            capture_output=True,
+            ]
         )
+        proc = await asyncio.create_subprocess_shell(
+            cmd,
+            stdout=asyncio.subprocess.PIPE,
+            stderr=asyncio.subprocess.PIPE,
+        )
+        await proc.wait()
+        if proc.returncode:
+            stdout, stderr = await proc.communicate()
+            print(stdout.decode("utf-8"))
+            print(stderr.decode("utf-8"))
+            raise RuntimeError(f"Subprocess failed with {proc.returncode}", proc.args)
 
-        print(f"🌐 Downloaded and unpacked packages to {tmpd}.")
+        print(f"🌐 Downloaded and unpacked {mount_name} packages to {tmpd}.")
 
         python_mount = Mount._from_local_dir(tmpd, remote_path=REMOTE_PACKAGES_PATH)
 
@@ -895,6 +912,7 @@ async def _create_single_mount(
                 mount_name,
                 api_pb2.DEPLOYMENT_NAMESPACE_GLOBAL,
                 environment_name=profile_environment,
+                allow_overwrite=allow_overwrite,
                 client=client,
             )
             print(f"✅ Deployed mount {mount_name} to global namespace.")
@@ -902,34 +920,30 @@ async def _create_single_mount(
 
 async def _create_client_dependency_mounts(
     client=None,
-    check_if_exists=True,
     python_versions: list[str] = list(PYTHON_STANDALONE_VERSIONS),
+    check_if_exists=True,
 ):
+    arch = "x86_64"
+    platform_tags = [
+        ("manylinux_2_17", f"{arch}-manylinux_2_17"),  # glibc >= 2.17
+        ("musllinux_1_2", f"{arch}-unknown-linux-musl"),  # musl >= 1.2
+    ]
     coros = []
-    for python_version in python_versions:
-        # glibc >= 2.17
-        coros.append(
-            _create_single_mount(
-                client,
-                "PREVIEW",
-                python_version,
-                "manylinux_2_17",
-                "x86_64",
-                check_if_exists=check_if_exists,
-            )
-        )
-        # musl >= 1.2
-        coros.append(
-            _create_single_mount(
-                client,
-                "PREVIEW",
-                python_version,
-                "musllinux_1_2",
-                "x86_64",
-                uv_python_platform="x86_64-unknown-linux-musl",
-                check_if_exists=check_if_exists,
-            )
-        )
+    for builder_version in ["PREVIEW"]:
+        for python_version in python_versions:
+            for platform, uv_python_platform in platform_tags:
+                coros.append(
+                    _create_single_client_dependency_mount(
+                        client,
+                        builder_version,
+                        python_version,
+                        arch,
+                        platform,
+                        uv_python_platform,
+                        check_if_exists=builder_version != "PREVIEW",
+                        allow_overwrite=builder_version == "PREVIEW",
+                    )
+                )
     await TaskContext.gather(*coros)
 
 

{modal-1.0.3.dev28 → modal-1.0.4.dev2}/modal/mount.pyi

@@ -82,6 +82,7 @@ class _Mount(modal._object._Object):
     _deployment_name: typing.Optional[str]
     _namespace: typing.Optional[int]
     _environment_name: typing.Optional[str]
+    _allow_overwrite: bool
     _content_checksum_sha256_hex: typing.Optional[str]
 
     @staticmethod
@@ -172,7 +173,9 @@ class _Mount(modal._object._Object):
         self: _Mount,
         deployment_name: typing.Optional[str] = None,
         namespace=1,
+        *,
         environment_name: typing.Optional[str] = None,
+        allow_overwrite: bool = False,
         client: typing.Optional[modal.client._Client] = None,
     ) -> None: ...
     def _get_metadata(self) -> modal_proto.api_pb2.MountHandleMetadata: ...
@@ -184,6 +187,7 @@ class Mount(modal.object.Object):
     _deployment_name: typing.Optional[str]
     _namespace: typing.Optional[int]
     _environment_name: typing.Optional[str]
+    _allow_overwrite: bool
     _content_checksum_sha256_hex: typing.Optional[str]
 
     def __init__(self, *args, **kwargs): ...
@@ -288,7 +292,9 @@ class Mount(modal.object.Object):
             /,
             deployment_name: typing.Optional[str] = None,
             namespace=1,
+            *,
             environment_name: typing.Optional[str] = None,
+            allow_overwrite: bool = False,
             client: typing.Optional[modal.client.Client] = None,
         ) -> None: ...
         async def aio(
@@ -296,7 +302,9 @@ class Mount(modal.object.Object):
             /,
             deployment_name: typing.Optional[str] = None,
             namespace=1,
+            *,
             environment_name: typing.Optional[str] = None,
+            allow_overwrite: bool = False,
             client: typing.Optional[modal.client.Client] = None,
         ) -> None: ...
 
@@ -308,25 +316,26 @@ def _create_client_mount(): ...
 def create_client_mount(): ...
 def _get_client_mount(): ...
 def _is_modal_path(remote_path: pathlib.PurePosixPath): ...
-async def _create_single_mount(
+async def _create_single_client_dependency_mount(
     client: modal.client._Client,
     builder_version: str,
     python_version: str,
-    platform: str,
     arch: str,
-    uv_python_platform: str = None,
+    platform: str,
+    uv_python_platform: str,
     check_if_exists: bool = True,
+    allow_overwrite: bool = False,
 ): ...
 async def _create_client_dependency_mounts(
-    client=None, check_if_exists=True, python_versions: list[str] = ["3.9", "3.10", "3.11", "3.12", "3.13"]
+    client=None, python_versions: list[str] = ["3.9", "3.10", "3.11", "3.12", "3.13"], check_if_exists=True
 ): ...
 
 class __create_client_dependency_mounts_spec(typing_extensions.Protocol):
     def __call__(
-        self, /, client=None, check_if_exists=True, python_versions: list[str] = ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        self, /, client=None, python_versions: list[str] = ["3.9", "3.10", "3.11", "3.12", "3.13"], check_if_exists=True
     ): ...
     async def aio(
-        self, /, client=None, check_if_exists=True, python_versions: list[str] = ["3.9", "3.10", "3.11", "3.12", "3.13"]
+        self, /, client=None, python_versions: list[str] = ["3.9", "3.10", "3.11", "3.12", "3.13"], check_if_exists=True
     ): ...
 
 create_client_dependency_mounts: __create_client_dependency_mounts_spec

{modal-1.0.3.dev28 → modal-1.0.4.dev2}/modal/parallel_map.py

@@ -593,7 +593,7 @@ def _spawn_map_sync(self, *input_iterators, kwargs={}) -> None:
 
     return run_coroutine_in_temporary_event_loop(
         _spawn_map_async(self, *input_iterators, kwargs=kwargs),
-        "You can't run Function.spawn_map() from an async function. Use Function.map.aio() instead.",
+        "You can't run Function.spawn_map() from an async function. Use Function.spawn_map.aio() instead.",
     )
 
 

modal-1.0.4.dev2/modal/requirements/PREVIEW.txt

@@ -0,0 +1,17 @@
+aiohappyeyeballs==2.6.1
+aiohttp==3.12.7
+aiosignal==1.3.2
+async-timeout==5.0.1 ; python_version < "3.11"
+attrs==25.3.0
+certifi==2025.4.26
+frozenlist==1.6.0
+grpclib==0.4.8
+h2==4.2.0
+hpack==4.1.0
+hyperframe==6.1.0
+idna==3.10
+multidict==6.4.4
+propcache==0.3.1
+protobuf==6.31.1
+typing_extensions==4.13.2
+yarl==1.20.0

modal-1.0.4.dev2/modal/requirements/base-images.json

@@ -0,0 +1,48 @@
+{
+    "debian": {
+        "PREVIEW": "bookworm",
+        "2024.10": "bookworm",
+        "2024.04": "bookworm",
+        "2023.12": "bullseye"
+    },
+    "python": {
+        "PREVIEW": [
+            "3.9.22",
+            "3.10.17",
+            "3.11.12",
+            "3.12.10",
+            "3.13.3"
+        ],
+        "2024.10": [
+            "3.9.20",
+            "3.10.15",
+            "3.11.10",
+            "3.12.6",
+            "3.13.0"
+        ],
+        "2024.04": [
+            "3.9.19",
+            "3.10.14",
+            "3.11.8",
+            "3.12.2"
+        ],
+        "2023.12": [
+            "3.9.15",
+            "3.10.8",
+            "3.11.0",
+            "3.12.1"
+        ]
+    },
+    "micromamba": {
+        "PREVIEW": "2.1.1",
+        "2024.10": "1.5.10",
+        "2024.04": "1.5.8",
+        "2023.12": "1.3.1"
+    },
+    "package_tools": {
+        "PREVIEW": "pip wheel uv",
+        "2024.10": "pip wheel uv",
+        "2024.04": "pip wheel uv",
+        "2023.12": "pip"
+    }
+}

{modal-1.0.3.dev28 → modal-1.0.4.dev2}/modal.egg-info/PKG-INFO

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

{modal-1.0.3.dev28 → modal-1.0.4.dev2}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.0.3.dev28"
+__version__ = "1.0.4.dev2"

modal-1.0.3.dev28/modal/requirements/PREVIEW.txt

@@ -1,16 +0,0 @@
-aiohappyeyeballs==2.4.3
-aiohttp==3.10.8
-aiosignal==1.3.1
-async-timeout==4.0.3 ; python_version < "3.11"
-attrs==24.2.0
-certifi==2024.8.30
-frozenlist==1.4.1
-grpclib==0.4.7
-h2==4.1.0
-hpack==4.0.0
-hyperframe==6.0.1
-idna==3.10
-multidict==6.1.0
-protobuf>=3.20,<6
-typing_extensions==4.12.2
-yarl==1.13.1

modal-1.0.3.dev28/modal/requirements/base-images.json

@@ -1,26 +0,0 @@
-{
-    "debian": {
-        "PREVIEW": "bookworm",
-        "2024.10": "bookworm",
-        "2024.04": "bookworm",
-        "2023.12": "bullseye"
-    },
-    "python": {
-        "PREVIEW": ["3.9.20", "3.10.15", "3.11.10", "3.12.6", "3.13.0"],
-        "2024.10": ["3.9.20", "3.10.15", "3.11.10", "3.12.6", "3.13.0"],
-        "2024.04": ["3.9.19", "3.10.14", "3.11.8", "3.12.2"],
-        "2023.12": ["3.9.15", "3.10.8", "3.11.0", "3.12.1"]
-    },
-    "micromamba": {
-        "PREVIEW": "1.5.10",
-        "2024.10": "1.5.10",
-        "2024.04": "1.5.8",
-        "2023.12": "1.3.1"
-    },
-    "package_tools": {
-        "PREVIEW": "pip wheel uv",
-        "2024.10": "pip wheel uv",
-        "2024.04": "pip wheel uv",
-        "2023.12": "pip"
-    }
-}