modal 0.73.144__tar.gz → 0.73.146__tar.gz

{modal-0.73.144 → modal-0.73.146}/PKG-INFO

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

{modal-0.73.144 → modal-0.73.146}/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.144",
+        version: str = "0.73.146",
     ): ...
     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.144",
+        version: str = "0.73.146",
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-0.73.144 → modal-0.73.146}/modal/container_process.py

@@ -59,6 +59,9 @@ class _ContainerProcess(Generic[T]):
         )
         self._stdin = _StreamWriter(process_id, "container_process", self._client)
 
+    def __repr__(self) -> str:
+        return f"ContainerProcess(process_id={self._process_id!r})"
+
     @property
     def stdout(self) -> _StreamReader[T]:
         """StreamReader for the container process's stdout stream."""
@@ -107,7 +110,7 @@ class _ContainerProcess(Generic[T]):
             return self._returncode
 
         while True:
-            req = api_pb2.ContainerExecWaitRequest(exec_id=self._process_id, timeout=50)
+            req = api_pb2.ContainerExecWaitRequest(exec_id=self._process_id, timeout=10)
             resp: api_pb2.ContainerExecWaitResponse = await retry_transient_errors(
                 self._client.stub.ContainerExecWait, req
             )

{modal-0.73.144 → modal-0.73.146}/modal/container_process.pyi

@@ -24,6 +24,7 @@ class _ContainerProcess(typing.Generic[T]):
         text: bool = True,
         by_line: bool = False,
     ) -> None: ...
+    def __repr__(self) -> str: ...
     @property
     def stdout(self) -> modal.io_streams._StreamReader[T]: ...
     @property
@@ -56,6 +57,7 @@ class ContainerProcess(typing.Generic[T]):
         text: bool = True,
         by_line: bool = False,
     ) -> None: ...
+    def __repr__(self) -> str: ...
     @property
     def stdout(self) -> modal.io_streams.StreamReader[T]: ...
     @property

{modal-0.73.144 → modal-0.73.146}/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-0.73.144 → modal-0.73.146}/modal/image.py

@@ -1562,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.
 

{modal-0.73.144 → modal-0.73.146}/modal/sandbox.py

@@ -408,7 +408,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         """Wait for the Sandbox to finish running."""
 
         while True:
-            req = api_pb2.SandboxWaitRequest(sandbox_id=self.object_id, timeout=50)
+            req = api_pb2.SandboxWaitRequest(sandbox_id=self.object_id, timeout=10)
             resp = await retry_transient_errors(self._client.stub.SandboxWait, req)
             if resp.result.status:
                 self._result = resp.result

{modal-0.73.144 → modal-0.73.146}/modal.egg-info/PKG-INFO

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

{modal-0.73.144 → modal-0.73.146}/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 = 144  # git: d3f70c8
+build_number = 146  # git: 868bbba