modal 1.6.4.dev2__tar.gz → 1.6.4.dev3__tar.gz

{modal-1.6.4.dev2 → modal-1.6.4.dev3}/PKG-INFO

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

{modal-1.6.4.dev2 → modal-1.6.4.dev3}/modal/_runtime/task_lifecycle_manager.py

@@ -25,9 +25,19 @@ from modal._utils.blob_utils import format_blob_data
 from modal._utils.grpc_utils import Retry
 from modal._utils.package_utils import parse_major_minor_version
 from modal.client import _Client
-from modal.config import config, logger
+from modal.config import _env_var_name, config, logger
 from modal_proto import api_pb2
 
+SPEC_ENVIRON_PATH: str = "/proc/gvisor/spec_environ"
+
+
+def _read_spec_environ() -> dict[str, str]:
+    path = Path(SPEC_ENVIRON_PATH)
+    if not path.exists():
+        return {}
+    entries = (entry.partition("=") for entry in path.read_text("utf8").split("\0"))
+    return {key: value for key, sep, value in entries if sep}
+
 
 class UserException(Exception):
     """Used to shut down the task gracefully."""
@@ -42,6 +52,7 @@ class _TaskLifecycleManager:
     checkpoint_id: str | None
     _client: _Client
     _cuda_checkpoint_session: gpu_memory_snapshot.CudaCheckpointSession | None
+    _snapshot_spec_environ: dict[str, str]
 
     def _init(
         self,
@@ -57,6 +68,7 @@ class _TaskLifecycleManager:
         self.checkpoint_id = checkpoint_id
         self._client = client
         self._cuda_checkpoint_session = None
+        self._snapshot_spec_environ = {}
 
     def __new__(
         cls,
@@ -171,10 +183,18 @@ class _TaskLifecycleManager:
                 setattr(self, key, restored_state[key])
 
         # Env vars and global state.
+        env_updates = {}
+        for key, value in _read_spec_environ().items():
+            if self._snapshot_spec_environ.get(key) != value:
+                env_updates[key] = value
+
+        # Values from the restore state take precedence.
         for key, value in restored_state.items():
             # Empty string indicates that value does not need to be updated.
             if value != "":
-                config.override_locally(key, value)
+                env_updates[_env_var_name(key)] = value
+
+        os.environ.update(env_updates)
 
         # Restore GPU memory.
         if self.function_def._experimental_enable_gpu_snapshot and self.function_def.resources.gpu_config.gpu_type:
@@ -205,6 +225,7 @@ class _TaskLifecycleManager:
             self._cuda_checkpoint_session = gpu_memory_snapshot.CudaCheckpointSession()
             self._cuda_checkpoint_session.checkpoint()
 
+        self._snapshot_spec_environ = _read_spec_environ()
         await self._client._stub.ContainerCheckpoint(
             api_pb2.ContainerCheckpointRequest(checkpoint_id=self.checkpoint_id)
         )

{modal-1.6.4.dev2 → modal-1.6.4.dev3}/modal/_runtime/task_lifecycle_manager.pyi

@@ -5,6 +5,8 @@ import synchronicity.combined_types
 import typing
 import typing_extensions
 
+def _read_spec_environ() -> dict[str, str]: ...
+
 class UserException(Exception):
     """Used to shut down the task gracefully."""
 
@@ -18,6 +20,7 @@ class _TaskLifecycleManager:
     checkpoint_id: typing.Optional[str]
     _client: modal.client._Client
     _cuda_checkpoint_session: typing.Optional[modal._runtime.gpu_memory_snapshot.CudaCheckpointSession]
+    _snapshot_spec_environ: dict[str, str]
 
     def _init(
         self,
@@ -67,6 +70,7 @@ class TaskLifecycleManager:
     checkpoint_id: typing.Optional[str]
     _client: modal.client.Client
     _cuda_checkpoint_session: typing.Optional[modal._runtime.gpu_memory_snapshot.CudaCheckpointSession]
+    _snapshot_spec_environ: dict[str, str]
 
     def __init__(self, /, *args, **kwargs):
         """Initialize self.  See help(type(self)) for accurate signature."""
@@ -136,3 +140,5 @@ def check_fastapi_pydantic_compatibility(exc: ImportError) -> None:
     building an image that specifies a more recent version only for pydantic.
     """
     ...
+
+SPEC_ENVIRON_PATH: str

{modal-1.6.4.dev2 → modal-1.6.4.dev3}/modal/cli/image.py

@@ -4,21 +4,27 @@ from __future__ import annotations
 
 import asyncio
 import json as json_module
+import os
 from collections.abc import AsyncIterator
 from typing import Optional
 
 import click
+from rich.syntax import Syntax
 
 from modal._environments import ensure_env
-from modal._image import _upgrade_image_name
+from modal._image import _Image, _infer_registry_auth_type, _upgrade_image_name
 from modal._logs_manager import _resolve_source
 from modal._utils.async_utils import synchronizer
 from modal._utils.time_utils import timestamp_to_localized_str
+from modal.app import _App
 from modal.cli.utils import display_table, env_option
 from modal.client import _Client
 from modal.config import config
+from modal.exception import InvalidError
 from modal.image import Image
 from modal.output import OutputManager
+from modal.runner import _run_app
+from modal.secret import _Secret
 from modal_proto import api_pb2
 
 from ._help import ModalGroup
@@ -36,6 +42,118 @@ def _print_result_summary(count: int) -> None:
     OutputManager.get().print(f"Showing {count} {result_label}")
 
 
+async def _registry_secret(
+    secret_name: Optional[str], secret_vars: Optional[str], env: str
+) -> tuple[Optional[_Secret], set[str]]:
+    if secret_name and secret_vars:
+        raise click.UsageError("--registry-secret and --registry-secret-from-env cannot be used together.")
+    if secret_name:
+        secret = _Secret.from_name(secret_name, environment_name=env)
+        return secret, await secret._get_keys()
+    keys = [key.strip() for key in (secret_vars or "").split(",") if key.strip()]
+    if not keys:
+        return None, set()
+    return _Secret.from_local_environ(keys), set(keys)
+
+
+@image_cli.command("build", no_args_is_help=True)
+@click.argument("context_dir", metavar="CONTEXT_DIR")
+@click.option(
+    "-t",
+    "--name",
+    "name",
+    metavar="[ENV/]NAME[:TAG]",
+    required=True,
+    help="Name to publish the Image as, e.g. `my-image`, `my-image:v2`, or `my-env/my-image`.",
+)
+@click.option(
+    "-f",
+    "--file",
+    "dockerfile",
+    type=click.Path(exists=True, dir_okay=False),
+    default=None,
+    help="Path to the Dockerfile. Defaults to `CONTEXT_DIR/Dockerfile`.",
+)
+@click.option(
+    "--registry-secret",
+    "registry_secret_name",
+    metavar="SECRET_NAME",
+    default=None,
+    help="Name of a Secret with credentials for pulling the base image from a private registry.",
+)
+@click.option(
+    "--registry-secret-from-env",
+    "registry_secret_vars",
+    default=None,
+    metavar="VAR[,VAR...]",
+    help=(
+        "Comma-separated local environment variable names holding registry credentials. "
+        "Cannot be combined with --registry-secret."
+    ),
+)
+@click.option("--force-build", is_flag=True, help="Rebuild every layer of the Image, ignoring cached builds.")
+@env_option
+@synchronizer.create_blocking
+async def build(
+    context_dir: str,
+    name: str,
+    dockerfile: Optional[str],
+    registry_secret_name: Optional[str],
+    registry_secret_vars: Optional[str],
+    force_build: bool,
+    env: Optional[str],
+) -> None:
+    """Build an Image from a Dockerfile and publish it as NAME.
+
+    CONTEXT_DIR is the build context used to resolve relative COPY paths. Use `.` for the current directory.
+
+    NAME defaults to the `latest` tag. `--env` sets the environment the build runs in and where
+    `--registry-secret` is looked up. The Image is published into that environment unless NAME has an
+    environment prefix, e.g. `my-env/my-image`.
+
+    Examples:
+
+    ```
+    modal image build -t my-image .
+    modal image build --name my-image:v2 -f docker/Dockerfile .
+    modal image build -t my-env/my-image .
+    modal image build -t my-image --registry-secret my-registry-creds .
+    modal image build -t my-image --registry-secret-from-env REGISTRY_USERNAME,REGISTRY_PASSWORD .
+    ```
+    """
+    if not os.path.isdir(context_dir):
+        raise click.UsageError(f"CONTEXT_DIR {context_dir!r} is not a directory.")
+    if dockerfile is None:
+        dockerfile = os.path.join(context_dir, "Dockerfile")
+        if not os.path.isfile(dockerfile):
+            raise click.UsageError(f"No Dockerfile found at {dockerfile}. Use --file to specify one.")
+    env = ensure_env(env)
+    try:
+        tag = _upgrade_image_name(name, fallback_environment_name=env)
+    except InvalidError as exc:
+        raise click.UsageError(str(exc))
+
+    secret, keys = await _registry_secret(registry_secret_name, registry_secret_vars, env)
+    if secret is not None:
+        # Fail before creating the app; from_dockerfile runs the same check during the build
+        try:
+            _infer_registry_auth_type(keys)
+        except InvalidError as exc:
+            raise click.UsageError(str(exc)) from exc
+    image = _Image.from_dockerfile(dockerfile, context_dir=context_dir, registry_secret=secret, force_build=force_build)
+    app = _App("modal-image-build")
+    # Only show the Image build output, which includes its logs
+    async with _run_app(app, environment_name=env, stream_output=False):
+        await image.build(app)
+        await image.publish(tag)
+
+    output_mgr = OutputManager.get()
+    output_mgr.step_completed(f"Image built: [bold]{image.object_id}[/bold]")
+    output_mgr.step_completed(f"Image published as [bold magenta]{tag}[/bold magenta]! 🎉")
+    output_mgr.print("\nUse it with:\n")
+    output_mgr.print(Syntax(f'modal.Image.from_name("{tag}")', "python"))
+
+
 @image_cli.command("logs", no_args_is_help=True)
 @click.argument("image_id")
 @click.option(

{modal-1.6.4.dev2 → modal-1.6.4.dev3}/modal/client.pyi

@@ -87,7 +87,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.6.4.dev2",
+        version: str = "1.6.4.dev3",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):
@@ -304,7 +304,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.6.4.dev2",
+        version: str = "1.6.4.dev3",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):

{modal-1.6.4.dev2 → modal-1.6.4.dev3}/modal/config.py

@@ -414,6 +414,10 @@ _SETTINGS = {
 }
 
 
+def _env_var_name(key: str) -> str:
+    return f"MODAL_{key.upper()}" if key in _SETTINGS else key.upper()
+
+
 class Config:
     """Singleton that holds configuration used by Modal internally."""
 
@@ -474,13 +478,7 @@ class Config:
         # Override setting in this process by overriding environment variable for the setting
         #
         # Does NOT write back to settings file etc.
-        try:
-            self.get(key)
-            os.environ["MODAL_" + key.upper()] = value
-        except KeyError:
-            # Override env vars not available in config, e.g. NVIDIA_VISIBLE_DEVICES.
-            # This is used for restoring env vars from a memory snapshot.
-            os.environ[key.upper()] = value
+        os.environ[_env_var_name(key)] = value
 
     def __getitem__(self, key):
         return self.get(key)

{modal-1.6.4.dev2 → modal-1.6.4.dev3}/modal/functions.pyi

@@ -619,7 +619,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.
 
@@ -644,7 +644,7 @@ class Function(
             """
             ...
 
-    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]:
@@ -694,7 +694,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.
 
@@ -727,7 +727,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: ...
@@ -735,7 +735,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.
 
@@ -768,7 +768,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType]
 
     @property
     def _raw_f_(self) -> collections.abc.Callable[..., typing.Any]: ...

{modal-1.6.4.dev2 → modal-1.6.4.dev3}/modal/runner.py

@@ -25,6 +25,7 @@ from modal_proto import api_pb2
 from ._environments import _get_environment_cached
 from ._functions import _Function
 from ._object import _get_environment_name, _Object
+from ._output.manager import _DISABLED_OUTPUT_MANAGER
 from ._output.pty import get_app_logs_loop, get_pty_info
 from ._resolver import Resolver
 from ._traceback import print_server_warnings, traceback_contains_remote_call
@@ -139,6 +140,7 @@ async def _create_all_objects(
     running_app: RunningApp,
     local_app_state: "modal.app._LocalAppState",
     load_context: LoadContext,
+    output_mgr: OutputManager,
 ) -> None:
     """Create objects that have been defined but not created on the server.
 
@@ -149,7 +151,6 @@ async def _create_all_objects(
     tc = load_context.task_context
 
     resolver = Resolver()
-    output_mgr = OutputManager.get()
     with output_mgr.display_object_tree():
         # Get current objects, and reset all objects.
         # Only reuse an existing object id when its type matches the object now being
@@ -377,6 +378,7 @@ async def _run_app(
     environment_name: str | None = None,
     interactive: bool = False,
     deployment_strategy: str = "rolling",
+    stream_output: bool = True,
 ) -> AsyncGenerator["modal.app._App", None]:
     """mdmd:hidden"""
     if modal._runtime.execution_context._in_import_context():
@@ -409,7 +411,8 @@ async def _run_app(
             app._description = __main__.__name__
 
     app_state = api_pb2.APP_STATE_DETACHED if detach else api_pb2.APP_STATE_EPHEMERAL
-    output_mgr = OutputManager.get()
+    # stream_output covers the App's own status, spinner, and log stream; objects print their own output
+    output_mgr = OutputManager.get() if stream_output else _DISABLED_OUTPUT_MANAGER
 
     if interactive and not output_mgr.is_enabled:
         msg = "Interactive mode requires output to be enabled. (Use the the `modal.enable_output()` context manager.)"
@@ -454,7 +457,7 @@ async def _run_app(
 
         try:
             # Create all members
-            await _create_all_objects(running_app, local_app_state, load_context)
+            await _create_all_objects(running_app, local_app_state, load_context, output_mgr)
 
             # Publish the app
             await _publish_app(
@@ -467,7 +470,7 @@ async def _run_app(
             )
         except asyncio.CancelledError as e:
             # this typically happens on sigint/ctrl-C during setup (the KeyboardInterrupt happens in the main thread)
-            OutputManager.get().print("Aborting app initialization...\n")
+            output_mgr.print("Aborting app initialization...\n")
             await _status_based_disconnect(load_context.client, running_app.app_id, e)
             raise
         except BaseException as e:
@@ -541,7 +544,7 @@ async def _run_app(
 
     # Print completion message if output is still enabled (it may have been disabled during PTY mode)
     # Re-fetch the output manager in case it was disabled
-    output_mgr = OutputManager.get()
+    output_mgr = OutputManager.get() if stream_output else _DISABLED_OUTPUT_MANAGER
     if output_mgr.is_enabled:
         output_mgr.step_completed(
             f"App completed. [grey70]View run at [underline]{running_app.app_page_url}[/underline][/grey70]"
@@ -564,7 +567,7 @@ async def _serve_update(
         # Create objects with a TaskContext for proper exception handling
         async with TaskContext() as tc:
             await load_context.in_place_upgrade(task_context=tc, app_id=running_app.app_id)
-            await _create_all_objects(running_app, local_app_state, load_context)
+            await _create_all_objects(running_app, local_app_state, load_context, OutputManager.get())
 
         # Publish the updated app
         await _publish_app(
@@ -665,7 +668,7 @@ async def _deploy_app(
 
         try:
             # Create all members
-            await _create_all_objects(running_app, local_app_state, root_load_context)
+            await _create_all_objects(running_app, local_app_state, root_load_context, OutputManager.get())
 
             commit_info = None
             try:

{modal-1.6.4.dev2 → modal-1.6.4.dev3}/modal/runner.pyi

@@ -1,4 +1,5 @@
 import modal._load_context
+import modal._output.manager
 import modal.app
 import modal.client
 import modal.running_app
@@ -31,6 +32,7 @@ async def _create_all_objects(
     running_app: modal.running_app.RunningApp,
     local_app_state: modal.app._LocalAppState,
     load_context: modal._load_context.LoadContext,
+    output_mgr: modal._output.manager.OutputManager,
 ) -> None:
     """Create objects that have been defined but not created on the server.
 
@@ -82,6 +84,7 @@ def _run_app(
     environment_name: typing.Optional[str] = None,
     interactive: bool = False,
     deployment_strategy: str = "rolling",
+    stream_output: bool = True,
 ) -> typing.AsyncContextManager[modal.app._App]:
     """mdmd:hidden"""
     ...
@@ -185,6 +188,7 @@ class __run_app_spec(typing_extensions.Protocol):
         environment_name: typing.Optional[str] = None,
         interactive: bool = False,
         deployment_strategy: str = "rolling",
+        stream_output: bool = True,
     ) -> synchronicity.combined_types.AsyncAndBlockingContextManager[modal.app.App]:
         """mdmd:hidden"""
         ...
@@ -200,6 +204,7 @@ class __run_app_spec(typing_extensions.Protocol):
         environment_name: typing.Optional[str] = None,
         interactive: bool = False,
         deployment_strategy: str = "rolling",
+        stream_output: bool = True,
     ) -> typing.AsyncContextManager[modal.app.App]:
         """mdmd:hidden"""
         ...

{modal-1.6.4.dev2 → modal-1.6.4.dev3}/modal.egg-info/PKG-INFO

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