modAL 1.6.3.dev4__tar.gz → 1.6.3.dev5__tar.gz

{modal-1.6.3.dev4 → modal-1.6.3.dev5}/PKG-INFO

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

{modal-1.6.3.dev4 → modal-1.6.3.dev5}/modal/_image.py

@@ -212,23 +212,32 @@ def _dockerhub_python_version(
     python_version = _validate_python_version(
         python_version, builder_version, allow_free_threading=allow_free_threading, caller_name=caller_name
     )
+
     version_components = python_version.split(".")
 
-    # When user specifies a full Python version, use that
-    if len(version_components) > 2:
+    # - Users that want a specific patch version for reproducibility guarantees can specify that up
+    #   front
+    # - Users on the newest builder can force-rebuild to get the latest patch versions, allowing
+    #   quick responses to upstream bug fixes / CVEs.
+    if builder_version > "2025.06" or len(version_components) > 2:
         return python_version
 
     # Otherwise, use the same series, but a specific micro version, corresponding to the latest
     # available from https://hub.docker.com/_/python at the time of each image builder release.
     # This allows us to publish one pre-built debian-slim image per Python series.
     python_versions = _base_image_config("python", builder_version)
-    series_to_micro_version = dict(tuple(v.rsplit(".", 1)) for v in python_versions)
+    series_to_micro_version: dict[str, str] = {}
+    for v in python_versions:
+        series, micro = v.rsplit(".", 1)
+        series_to_micro_version[series] = micro
     python_series_requested = "{}.{}".format(*version_components)
     micro_version = series_to_micro_version[python_series_requested]
     return f"{python_series_requested}.{micro_version}"
 
 
 def _base_image_config(group: str, builder_version: ImageBuilderVersion) -> Any:
+    # data["python"] does not include image builder versions more recent than `2025.06`, as those do
+    # not rely on hardcoded patch versions.
     with open(LOCAL_REQUIREMENTS_DIR / "base-images.json") as f:
         data = json.load(f)
     return data[group][builder_version]

{modal-1.6.3.dev4 → modal-1.6.3.dev5}/modal/builder/2025.06.txt

@@ -7,7 +7,7 @@ aiosignal==1.4.0 ; python_version >= "3.14"
 async-timeout==5.0.1 ; python_version < "3.11"
 attrs==25.3.0
 cbor2==5.7.0
-certifi==2025.4.26
+certifi==2026.10.19
 frozenlist==1.6.0
 grpclib==0.4.8 ; python_version < "3.14"
 grpclib==0.4.9 ; python_version >= "3.14"

{modal-1.6.3.dev4 → modal-1.6.3.dev5}/modal/builder/base-images.json

@@ -1,21 +1,12 @@
 {
     "debian": {
-        "PREVIEW": "bookworm",
+        "PREVIEW": "trixie",
         "2025.06": "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",
-            "3.14.2",
-            "3.15.0"
-        ],
         "2025.06": [
             "3.9.22",
             "3.10.17",
@@ -46,7 +37,7 @@
         ]
     },
     "micromamba": {
-        "PREVIEW": "2.1.1-debian12-slim",
+        "PREVIEW": "2.9.0-debian13-slim",
         "2025.06": "2.1.1-debian12-slim",
         "2024.10": "1.5.10-bookworm-slim",
         "2024.04": "1.5.8-bookworm-slim",

{modal-1.6.3.dev4 → modal-1.6.3.dev5}/modal/client.pyi

@@ -80,7 +80,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.6.3.dev4",
+        version: str = "1.6.3.dev5",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):
@@ -290,7 +290,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.6.3.dev4",
+        version: str = "1.6.3.dev5",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):

{modal-1.6.3.dev4 → modal-1.6.3.dev5}/modal/functions.pyi

@@ -619,7 +619,7 @@ class Function(
 
     _call_generator: ___call_generator_spec
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_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.
 
@@ -644,7 +644,7 @@ class Function(
             """
             ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -694,7 +694,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_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.
 
@@ -727,7 +727,7 @@ class Function(
             """
             ...
 
-    _experimental_spawn: ___experimental_spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    _experimental_spawn: ___experimental_spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> None: ...
@@ -735,7 +735,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_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.
 
@@ -768,7 +768,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
 
     @property
     def _raw_f_(self) -> collections.abc.Callable[..., typing.Any]: ...

{modal-1.6.3.dev4 → modal-1.6.3.dev5}/modal/runner.py

@@ -43,7 +43,9 @@ from .exception import (
 )
 from .output import OutputManager
 from .running_app import RunningApp, running_app_from_layout
-from .sandbox._sandbox import _Sandbox
+from .sandbox._common import SandboxCreateArgs
+from .sandbox._impl_v2 import SandboxImplV2
+from .sandbox._sandbox import _Sandbox, impl_class_for_create_args
 from .secret import _Secret
 from .stream_type import StreamType
 
@@ -758,21 +760,10 @@ async def _interactive_shell(
             for option in ("gpu", "network_file_systems"):
                 if kwargs.pop(option, None):
                     raise InvalidError(f"`{option}` is not supported for V2 sandboxes")
-            sandbox = await _Sandbox._experimental_create(
-                "sleep",
-                "100000",
-                app=_app,
-                secrets=secrets,
-                **kwargs,
-            )
-        else:
-            sandbox = await _Sandbox._create(
-                "sleep",
-                "100000",
-                app=_app,
-                secrets=secrets,
-                **kwargs,
-            )
+        create_args = SandboxCreateArgs(args=("sleep", "100000"), secrets=secrets, **kwargs)
+        impl_cls = SandboxImplV2 if v2 else impl_class_for_create_args(create_args)
+        impl, metadata = await impl_cls.create(create_args, app=_app, client=None)
+        sandbox = _Sandbox._from_impl(impl, metadata)
 
         # Re-enable quiet mode before starting the interactive session
         output_mgr.set_quiet_mode(True)
@@ -790,15 +781,9 @@ async def _interactive_shell(
                 await container_process.wait()
         except InteractiveTimeoutError:
             # Check on status of Sandbox. It may have crashed, causing connection failure.
-            req = api_pb2.SandboxWaitRequest(sandbox_id=sandbox.object_id, timeout=0)
-            if sandbox._is_v2:
-                assert sandbox._client._auth_token_manager
-                auth_token = await sandbox._client._auth_token_manager.get_token()
-                resp = await sandbox._client._stub.SandboxWaitV2(req, metadata=[("x-modal-auth-token", auth_token)])
-            else:
-                resp = await sandbox._client._stub.SandboxWait(req)
-            if resp.result.exception:
-                raise RemoteError(resp.result.exception)
+            await sandbox.poll()
+            if sandbox._impl.result is not None and sandbox._impl.result.exception:
+                raise RemoteError(sandbox._impl.result.exception)
             else:
                 raise