modal 0.72.5__py3-none-any.whl → 0.72.48__py3-none-any.whl

modal/parallel_map.pyi

@@ -1,3 +1,4 @@
+import collections.abc
 import modal._utils.async_utils
 import modal.client
 import modal.functions
@@ -9,26 +10,28 @@ class _SynchronizedQueue:
     async def put(self, item): ...
     async def get(self): ...
 
+SUPERSELF = typing.TypeVar("SUPERSELF", covariant=True)
+
 class SynchronizedQueue:
     def __init__(self, /, *args, **kwargs): ...
 
-    class __init_spec(typing_extensions.Protocol):
+    class __init_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self): ...
         async def aio(self): ...
 
-    init: __init_spec
+    init: __init_spec[typing_extensions.Self]
 
-    class __put_spec(typing_extensions.Protocol):
+    class __put_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, item): ...
         async def aio(self, item): ...
 
-    put: __put_spec
+    put: __put_spec[typing_extensions.Self]
 
-    class __get_spec(typing_extensions.Protocol):
+    class __get_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self): ...
         async def aio(self): ...
 
-    get: __get_spec
+    get: __get_spec[typing_extensions.Self]
 
 class _OutputValue:
     value: typing.Any
@@ -43,7 +46,7 @@ def _map_invocation(
     client: modal.client._Client,
     order_outputs: bool,
     return_exceptions: bool,
-    count_update_callback: typing.Optional[typing.Callable[[int, int], None]],
+    count_update_callback: typing.Optional[collections.abc.Callable[[int, int], None]],
 ): ...
 def _map_sync(
     self, *input_iterators, kwargs={}, order_outputs: bool = True, return_exceptions: bool = False

modal/partial_function.py

@@ -89,6 +89,14 @@ class _PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
         self.force_build = force_build
         self.build_timeout = build_timeout
 
+    def _get_raw_f(self) -> Callable[P, ReturnType]:
+        return self.raw_f
+
+    def _is_web_endpoint(self) -> bool:
+        if self.webhook_config is None:
+            return False
+        return self.webhook_config.type != api_pb2.WEBHOOK_TYPE_UNSPECIFIED
+
     def __get__(self, obj, objtype=None) -> _Function[P, ReturnType, OriginalReturnType]:
         k = self.raw_f.__name__
         if obj:  # accessing the method on an instance of a class, e.g. `MyClass().fun``
@@ -530,10 +538,12 @@ def _build(
     _warn_parentheses_missing=None, *, force: bool = False, timeout: int = 86400
 ) -> Callable[[Union[Callable[[Any], Any], _PartialFunction]], _PartialFunction]:
     """
-    Decorator for methods that should execute at _build time_ to create a new layer
-    in a `modal.Image`.
+    Decorator for methods that execute at _build time_ to create a new Image layer.
 
-    See the [lifeycle function guide](https://modal.com/docs/guide/lifecycle-functions#build) for more information.
+    **Deprecated**: This function is deprecated. We recommend using `modal.Volume`
+    to store large assets (such as model weights) instead of writing them to the
+    Image during the build process. For other use cases, you can replace this
+    decorator with the `Image.run_function` method.
 
     **Usage**
 
@@ -552,6 +562,15 @@ def _build(
     if _warn_parentheses_missing is not None:
         raise InvalidError("Positional arguments are not allowed. Did you forget parentheses? Suggestion: `@build()`.")
 
+    deprecation_warning(
+        (2025, 1, 15),
+        "The `@modal.build` decorator is deprecated and will be removed in a future release."
+        "\n\nWe now recommend storing large assets (such as model weights) using a `modal.Volume`"
+        " instead of writing them directly into the `modal.Image` filesystem."
+        " For other use cases we recommend using `Image.run_function` instead."
+        "\n\nSee https://modal.com/docs/guide/modal-1-0-migration for more information.",
+    )
+
     def wrapper(f: Union[Callable[[Any], Any], _PartialFunction]) -> _PartialFunction:
         if isinstance(f, _PartialFunction):
             _disallow_wrapping_method(f, "build")

modal/partial_function.pyi

@@ -25,7 +25,7 @@ ReturnType = typing.TypeVar("ReturnType", covariant=True)
 OriginalReturnType = typing.TypeVar("OriginalReturnType", covariant=True)
 
 class _PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
-    raw_f: typing.Callable[P, ReturnType]
+    raw_f: collections.abc.Callable[P, ReturnType]
     flags: _PartialFunctionFlags
     webhook_config: typing.Optional[modal_proto.api_pb2.WebhookConfig]
     is_generator: bool
@@ -38,7 +38,7 @@ class _PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
 
     def __init__(
         self,
-        raw_f: typing.Callable[P, ReturnType],
+        raw_f: collections.abc.Callable[P, ReturnType],
         flags: _PartialFunctionFlags,
         webhook_config: typing.Optional[modal_proto.api_pb2.WebhookConfig] = None,
         is_generator: typing.Optional[bool] = None,
@@ -49,12 +49,14 @@ class _PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
         force_build: bool = False,
         build_timeout: typing.Optional[int] = None,
     ): ...
+    def _get_raw_f(self) -> collections.abc.Callable[P, ReturnType]: ...
+    def _is_web_endpoint(self) -> bool: ...
     def __get__(self, obj, objtype=None) -> modal.functions._Function[P, ReturnType, OriginalReturnType]: ...
     def __del__(self): ...
     def add_flags(self, flags) -> _PartialFunction: ...
 
 class PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
-    raw_f: typing.Callable[P, ReturnType]
+    raw_f: collections.abc.Callable[P, ReturnType]
     flags: _PartialFunctionFlags
     webhook_config: typing.Optional[modal_proto.api_pb2.WebhookConfig]
     is_generator: bool
@@ -67,7 +69,7 @@ class PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
 
     def __init__(
         self,
-        raw_f: typing.Callable[P, ReturnType],
+        raw_f: collections.abc.Callable[P, ReturnType],
         flags: _PartialFunctionFlags,
         webhook_config: typing.Optional[modal_proto.api_pb2.WebhookConfig] = None,
         is_generator: typing.Optional[bool] = None,
@@ -78,12 +80,16 @@ class PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
         force_build: bool = False,
         build_timeout: typing.Optional[int] = None,
     ): ...
+    def _get_raw_f(self) -> collections.abc.Callable[P, ReturnType]: ...
+    def _is_web_endpoint(self) -> bool: ...
     def __get__(self, obj, objtype=None) -> modal.functions.Function[P, ReturnType, OriginalReturnType]: ...
     def __del__(self): ...
     def add_flags(self, flags) -> PartialFunction: ...
 
 def _find_partial_methods_for_user_cls(user_cls: type[typing.Any], flags: int) -> dict[str, _PartialFunction]: ...
-def _find_callables_for_obj(user_obj: typing.Any, flags: int) -> dict[str, typing.Callable[..., typing.Any]]: ...
+def _find_callables_for_obj(
+    user_obj: typing.Any, flags: int
+) -> dict[str, collections.abc.Callable[..., typing.Any]]: ...
 
 class _MethodDecoratorType:
     @typing.overload
@@ -93,13 +99,13 @@ class _MethodDecoratorType:
     @typing.overload
     def __call__(
         self,
-        func: typing.Callable[
+        func: collections.abc.Callable[
             typing_extensions.Concatenate[typing.Any, P], collections.abc.Coroutine[typing.Any, typing.Any, ReturnType]
         ],
     ) -> PartialFunction[P, ReturnType, collections.abc.Coroutine[typing.Any, typing.Any, ReturnType]]: ...
     @typing.overload
     def __call__(
-        self, func: typing.Callable[typing_extensions.Concatenate[typing.Any, P], ReturnType]
+        self, func: collections.abc.Callable[typing_extensions.Concatenate[typing.Any, P], ReturnType]
     ) -> PartialFunction[P, ReturnType, ReturnType]: ...
 
 def _method(
@@ -120,7 +126,9 @@ def _web_endpoint(
     custom_domains: typing.Optional[collections.abc.Iterable[str]] = None,
     requires_proxy_auth: bool = False,
     wait_for_response: bool = True,
-) -> typing.Callable[[typing.Callable[P, ReturnType]], _PartialFunction[P, ReturnType, ReturnType]]: ...
+) -> collections.abc.Callable[
+    [collections.abc.Callable[P, ReturnType]], _PartialFunction[P, ReturnType, ReturnType]
+]: ...
 def _asgi_app(
     _warn_parentheses_missing=None,
     *,
@@ -128,7 +136,7 @@ def _asgi_app(
     custom_domains: typing.Optional[collections.abc.Iterable[str]] = None,
     requires_proxy_auth: bool = False,
     wait_for_response: bool = True,
-) -> typing.Callable[[typing.Callable[..., typing.Any]], _PartialFunction]: ...
+) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], _PartialFunction]: ...
 def _wsgi_app(
     _warn_parentheses_missing=None,
     *,
@@ -136,7 +144,7 @@ def _wsgi_app(
     custom_domains: typing.Optional[collections.abc.Iterable[str]] = None,
     requires_proxy_auth: bool = False,
     wait_for_response: bool = True,
-) -> typing.Callable[[typing.Callable[..., typing.Any]], _PartialFunction]: ...
+) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], _PartialFunction]: ...
 def _web_server(
     port: int,
     *,
@@ -144,31 +152,35 @@ def _web_server(
     label: typing.Optional[str] = None,
     custom_domains: typing.Optional[collections.abc.Iterable[str]] = None,
     requires_proxy_auth: bool = False,
-) -> typing.Callable[[typing.Callable[..., typing.Any]], _PartialFunction]: ...
+) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], _PartialFunction]: ...
 def _disallow_wrapping_method(f: _PartialFunction, wrapper: str) -> None: ...
 def _build(
     _warn_parentheses_missing=None, *, force: bool = False, timeout: int = 86400
-) -> typing.Callable[[typing.Union[typing.Callable[[typing.Any], typing.Any], _PartialFunction]], _PartialFunction]: ...
+) -> collections.abc.Callable[
+    [typing.Union[collections.abc.Callable[[typing.Any], typing.Any], _PartialFunction]], _PartialFunction
+]: ...
 def _enter(
     _warn_parentheses_missing=None, *, snap: bool = False
-) -> typing.Callable[[typing.Union[typing.Callable[[typing.Any], typing.Any], _PartialFunction]], _PartialFunction]: ...
+) -> collections.abc.Callable[
+    [typing.Union[collections.abc.Callable[[typing.Any], typing.Any], _PartialFunction]], _PartialFunction
+]: ...
 def _exit(
     _warn_parentheses_missing=None,
-) -> typing.Callable[
+) -> collections.abc.Callable[
     [
         typing.Union[
-            typing.Callable[
+            collections.abc.Callable[
                 [typing.Any, typing.Optional[type[BaseException]], typing.Optional[BaseException], typing.Any],
                 typing.Any,
             ],
-            typing.Callable[[typing.Any], typing.Any],
+            collections.abc.Callable[[typing.Any], typing.Any],
         ]
     ],
     _PartialFunction,
 ]: ...
 def _batched(
     _warn_parentheses_missing=None, *, max_batch_size: int, wait_ms: int
-) -> typing.Callable[[typing.Callable[..., typing.Any]], _PartialFunction]: ...
+) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], _PartialFunction]: ...
 def method(
     _warn_parentheses_missing=None,
     *,
@@ -184,7 +196,9 @@ def web_endpoint(
     custom_domains: typing.Optional[collections.abc.Iterable[str]] = None,
     requires_proxy_auth: bool = False,
     wait_for_response: bool = True,
-) -> typing.Callable[[typing.Callable[P, ReturnType]], PartialFunction[P, ReturnType, ReturnType]]: ...
+) -> collections.abc.Callable[
+    [collections.abc.Callable[P, ReturnType]], PartialFunction[P, ReturnType, ReturnType]
+]: ...
 def asgi_app(
     _warn_parentheses_missing=None,
     *,
@@ -192,7 +206,7 @@ def asgi_app(
     custom_domains: typing.Optional[collections.abc.Iterable[str]] = None,
     requires_proxy_auth: bool = False,
     wait_for_response: bool = True,
-) -> typing.Callable[[typing.Callable[..., typing.Any]], PartialFunction]: ...
+) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], PartialFunction]: ...
 def wsgi_app(
     _warn_parentheses_missing=None,
     *,
@@ -200,7 +214,7 @@ def wsgi_app(
     custom_domains: typing.Optional[collections.abc.Iterable[str]] = None,
     requires_proxy_auth: bool = False,
     wait_for_response: bool = True,
-) -> typing.Callable[[typing.Callable[..., typing.Any]], PartialFunction]: ...
+) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], PartialFunction]: ...
 def web_server(
     port: int,
     *,
@@ -208,27 +222,31 @@ def web_server(
     label: typing.Optional[str] = None,
     custom_domains: typing.Optional[collections.abc.Iterable[str]] = None,
     requires_proxy_auth: bool = False,
-) -> typing.Callable[[typing.Callable[..., typing.Any]], PartialFunction]: ...
+) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], PartialFunction]: ...
 def build(
     _warn_parentheses_missing=None, *, force: bool = False, timeout: int = 86400
-) -> typing.Callable[[typing.Union[typing.Callable[[typing.Any], typing.Any], PartialFunction]], PartialFunction]: ...
+) -> collections.abc.Callable[
+    [typing.Union[collections.abc.Callable[[typing.Any], typing.Any], PartialFunction]], PartialFunction
+]: ...
 def enter(
     _warn_parentheses_missing=None, *, snap: bool = False
-) -> typing.Callable[[typing.Union[typing.Callable[[typing.Any], typing.Any], PartialFunction]], PartialFunction]: ...
+) -> collections.abc.Callable[
+    [typing.Union[collections.abc.Callable[[typing.Any], typing.Any], PartialFunction]], PartialFunction
+]: ...
 def exit(
     _warn_parentheses_missing=None,
-) -> typing.Callable[
+) -> collections.abc.Callable[
     [
         typing.Union[
-            typing.Callable[
+            collections.abc.Callable[
                 [typing.Any, typing.Optional[type[BaseException]], typing.Optional[BaseException], typing.Any],
                 typing.Any,
             ],
-            typing.Callable[[typing.Any], typing.Any],
+            collections.abc.Callable[[typing.Any], typing.Any],
         ]
     ],
     PartialFunction,
 ]: ...
 def batched(
     _warn_parentheses_missing=None, *, max_batch_size: int, wait_ms: int
-) -> typing.Callable[[typing.Callable[..., typing.Any]], PartialFunction]: ...
+) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], PartialFunction]: ...

modal/proxy.py

@@ -3,9 +3,9 @@ from typing import Optional
 
 from modal_proto import api_pb2
 
+from ._object import _get_environment_name, _Object
 from ._resolver import Resolver
 from ._utils.async_utils import synchronize_api
-from .object import _get_environment_name, _Object
 
 
 class _Proxy(_Object, type_prefix="pr"):

modal/proxy.pyi

@@ -1,7 +1,8 @@
+import modal._object
 import modal.object
 import typing
 
-class _Proxy(modal.object._Object):
+class _Proxy(modal._object._Object):
     @staticmethod
     def from_name(name: str, environment_name: typing.Optional[str] = None) -> _Proxy: ...
 

modal/queue.py

@@ -10,6 +10,7 @@ from synchronicity.async_wrap import asynccontextmanager
 
 from modal_proto import api_pb2
 
+from ._object import EPHEMERAL_OBJECT_HEARTBEAT_SLEEP, _get_environment_name, _Object, live_method, live_method_gen
 from ._resolver import Resolver
 from ._serialization import deserialize, serialize
 from ._utils.async_utils import TaskContext, synchronize_api, warn_if_generator_is_not_consumed
@@ -18,7 +19,6 @@ from ._utils.grpc_utils import retry_transient_errors
 from ._utils.name_utils import check_object_name
 from .client import _Client
 from .exception import InvalidError, RequestSizeError
-from .object import EPHEMERAL_OBJECT_HEARTBEAT_SLEEP, _get_environment_name, _Object, live_method, live_method_gen
 
 
 class _Queue(_Object, type_prefix="qu"):

modal/queue.pyi

@@ -1,11 +1,12 @@
 import collections.abc
+import modal._object
 import modal.client
 import modal.object
 import synchronicity.combined_types
 import typing
 import typing_extensions
 
-class _Queue(modal.object._Object):
+class _Queue(modal._object._Object):
     def __init__(self): ...
     @staticmethod
     def validate_partition_key(partition: typing.Optional[str]) -> bytes: ...
@@ -84,6 +85,8 @@ class _Queue(modal.object._Object):
         self, *, partition: typing.Optional[str] = None, item_poll_timeout: float = 0.0
     ) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
 
+SUPERSELF = typing.TypeVar("SUPERSELF", covariant=True)
+
 class Queue(modal.object.Object):
     def __init__(self): ...
     @staticmethod
@@ -138,13 +141,13 @@ class Queue(modal.object.Object):
 
     delete: __delete_spec
 
-    class ___get_nonblocking_spec(typing_extensions.Protocol):
+    class ___get_nonblocking_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, partition: typing.Optional[str], n_values: int) -> list[typing.Any]: ...
         async def aio(self, partition: typing.Optional[str], n_values: int) -> list[typing.Any]: ...
 
-    _get_nonblocking: ___get_nonblocking_spec
+    _get_nonblocking: ___get_nonblocking_spec[typing_extensions.Self]
 
-    class ___get_blocking_spec(typing_extensions.Protocol):
+    class ___get_blocking_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self, partition: typing.Optional[str], timeout: typing.Optional[float], n_values: int
         ) -> list[typing.Any]: ...
@@ -152,15 +155,15 @@ class Queue(modal.object.Object):
             self, partition: typing.Optional[str], timeout: typing.Optional[float], n_values: int
         ) -> list[typing.Any]: ...
 
-    _get_blocking: ___get_blocking_spec
+    _get_blocking: ___get_blocking_spec[typing_extensions.Self]
 
-    class __clear_spec(typing_extensions.Protocol):
+    class __clear_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, *, partition: typing.Optional[str] = None, all: bool = False) -> None: ...
         async def aio(self, *, partition: typing.Optional[str] = None, all: bool = False) -> None: ...
 
-    clear: __clear_spec
+    clear: __clear_spec[typing_extensions.Self]
 
-    class __get_spec(typing_extensions.Protocol):
+    class __get_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self, block: bool = True, timeout: typing.Optional[float] = None, *, partition: typing.Optional[str] = None
         ) -> typing.Optional[typing.Any]: ...
@@ -168,9 +171,9 @@ class Queue(modal.object.Object):
             self, block: bool = True, timeout: typing.Optional[float] = None, *, partition: typing.Optional[str] = None
         ) -> typing.Optional[typing.Any]: ...
 
-    get: __get_spec
+    get: __get_spec[typing_extensions.Self]
 
-    class __get_many_spec(typing_extensions.Protocol):
+    class __get_many_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self,
             n_values: int,
@@ -188,9 +191,9 @@ class Queue(modal.object.Object):
             partition: typing.Optional[str] = None,
         ) -> list[typing.Any]: ...
 
-    get_many: __get_many_spec
+    get_many: __get_many_spec[typing_extensions.Self]
 
-    class __put_spec(typing_extensions.Protocol):
+    class __put_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self,
             v: typing.Any,
@@ -210,9 +213,9 @@ class Queue(modal.object.Object):
             partition_ttl: int = 86400,
         ) -> None: ...
 
-    put: __put_spec
+    put: __put_spec[typing_extensions.Self]
 
-    class __put_many_spec(typing_extensions.Protocol):
+    class __put_many_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self,
             vs: list[typing.Any],
@@ -232,9 +235,9 @@ class Queue(modal.object.Object):
             partition_ttl: int = 86400,
         ) -> None: ...
 
-    put_many: __put_many_spec
+    put_many: __put_many_spec[typing_extensions.Self]
 
-    class ___put_many_blocking_spec(typing_extensions.Protocol):
+    class ___put_many_blocking_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self,
             partition: typing.Optional[str],
@@ -250,21 +253,21 @@ class Queue(modal.object.Object):
             timeout: typing.Optional[float] = None,
         ): ...
 
-    _put_many_blocking: ___put_many_blocking_spec
+    _put_many_blocking: ___put_many_blocking_spec[typing_extensions.Self]
 
-    class ___put_many_nonblocking_spec(typing_extensions.Protocol):
+    class ___put_many_nonblocking_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, partition: typing.Optional[str], partition_ttl: int, vs: list[typing.Any]): ...
         async def aio(self, partition: typing.Optional[str], partition_ttl: int, vs: list[typing.Any]): ...
 
-    _put_many_nonblocking: ___put_many_nonblocking_spec
+    _put_many_nonblocking: ___put_many_nonblocking_spec[typing_extensions.Self]
 
-    class __len_spec(typing_extensions.Protocol):
+    class __len_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, *, partition: typing.Optional[str] = None, total: bool = False) -> int: ...
         async def aio(self, *, partition: typing.Optional[str] = None, total: bool = False) -> int: ...
 
-    len: __len_spec
+    len: __len_spec[typing_extensions.Self]
 
-    class __iterate_spec(typing_extensions.Protocol):
+    class __iterate_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self, *, partition: typing.Optional[str] = None, item_poll_timeout: float = 0.0
         ) -> typing.Generator[typing.Any, None, None]: ...
@@ -272,4 +275,4 @@ class Queue(modal.object.Object):
             self, *, partition: typing.Optional[str] = None, item_poll_timeout: float = 0.0
         ) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
 
-    iterate: __iterate_spec
+    iterate: __iterate_spec[typing_extensions.Self]

modal/runner.py

@@ -4,6 +4,7 @@ import dataclasses
 import os
 import time
 import typing
+import warnings
 from collections.abc import AsyncGenerator
 from multiprocessing.synchronize import Event
 from typing import TYPE_CHECKING, Any, Optional, TypeVar
@@ -14,6 +15,7 @@ from synchronicity.async_wrap import asynccontextmanager
 import modal_proto.api_pb2
 from modal_proto import api_pb2
 
+from ._object import _get_environment_name, _Object
 from ._pty import get_pty_info
 from ._resolver import Resolver
 from ._runtime.execution_context import is_local
@@ -28,7 +30,6 @@ from .config import config, logger
 from .environments import _get_environment_cached
 from .exception import InteractiveTimeoutError, InvalidError, RemoteError, _CliUserExecutionError
 from .functions import _Function
-from .object import _get_environment_name, _Object
 from .output import _get_output_manager, enable_output
 from .running_app import RunningApp, running_app_from_layout
 from .sandbox import _Sandbox
@@ -155,7 +156,7 @@ async def _create_all_objects(
             # this is to ensure that directly referenced functions from the global scope has
             # ids associated with them when they are serialized into other functions
             await resolver.preload(obj, existing_object_id)
-            if obj.object_id is not None:
+            if obj.is_hydrated:
                 tag_to_object_id[tag] = obj.object_id
 
         await TaskContext.gather(*(_preload(tag, obj) for tag, obj in indexed_objects.items()))
@@ -287,6 +288,16 @@ async def _run_app(
         client = await _Client.from_env()
 
     app_state = api_pb2.APP_STATE_DETACHED if detach else api_pb2.APP_STATE_EPHEMERAL
+
+    output_mgr = _get_output_manager()
+    if interactive and output_mgr is None:
+        warnings.warn(
+            "Interactive mode is disabled because no output manager is active. "
+            "Use 'with modal.enable_output():' to enable interactive mode and see logs.",
+            stacklevel=2,
+        )
+        interactive = False
+
     running_app: RunningApp = await _init_local_app_new(
         client,
         app.description or "",
@@ -306,7 +317,7 @@ async def _run_app(
         tc.infinite_loop(heartbeat, sleep=HEARTBEAT_INTERVAL, log_exception=not detach)
         logs_loop: Optional[asyncio.Task] = None
 
-        if output_mgr := _get_output_manager():
+        if output_mgr is not None:
             # Defer import so this module is rich-safe
             # TODO(michael): The get_app_logs_loop function is itself rich-safe aside from accepting an OutputManager
             # as an argument, so with some refactoring we could avoid the need for this deferred import.

modal/sandbox.py

@@ -16,9 +16,10 @@ from modal.volume import _Volume
 from modal_proto import api_pb2
 
 from ._location import parse_cloud_provider
+from ._object import _get_environment_name, _Object
 from ._resolver import Resolver
 from ._resources import convert_fn_config_to_resources_config
-from ._utils.async_utils import synchronize_api
+from ._utils.async_utils import TaskContext, synchronize_api
 from ._utils.deprecation import deprecation_error
 from ._utils.grpc_utils import retry_transient_errors
 from ._utils.mount_utils import validate_network_file_systems, validate_volumes
@@ -32,7 +33,6 @@ from .image import _Image
 from .io_streams import StreamReader, StreamWriter, _StreamReader, _StreamWriter
 from .mount import _Mount
 from .network_file_system import _NetworkFileSystem, network_file_system_mount_protos
-from .object import _get_environment_name, _Object
 from .proxy import _Proxy
 from .scheduler_placement import SchedulerPlacement
 from .secret import _Secret
@@ -165,7 +165,8 @@ class _Sandbox(_Object, type_prefix="sb"):
                 resources=convert_fn_config_to_resources_config(
                     cpu=cpu, memory=memory, gpu=gpu, ephemeral_disk=ephemeral_disk
                 ),
-                cloud_provider=parse_cloud_provider(cloud) if cloud else None,
+                cloud_provider=parse_cloud_provider(cloud) if cloud else None,  # Deprecated at some point
+                cloud_provider_str=cloud.upper() if cloud else None,  # Supersedes cloud_provider
                 nfs_mounts=network_file_system_mount_protos(validated_network_file_systems, False),
                 runtime_debug=config.get("function_runtime_debug"),
                 cloud_bucket_mounts=cloud_bucket_mounts_to_proto(cloud_bucket_mounts),
@@ -350,6 +351,7 @@ class _Sandbox(_Object, type_prefix="sb"):
         Returns an [`Image`](https://modal.com/docs/reference/modal.Image) object which
         can be used to spawn a new Sandbox with the same filesystem.
         """
+        await self._get_task_id()  # Ensure the sandbox has started
         req = api_pb2.SandboxSnapshotFsRequest(sandbox_id=self.object_id, timeout=timeout)
         resp = await retry_transient_errors(self._client.stub.SandboxSnapshotFs, req)
 
@@ -360,10 +362,12 @@ class _Sandbox(_Object, type_prefix="sb"):
         metadata = resp.image_metadata
 
         async def _load(self: _Image, resolver: Resolver, existing_object_id: Optional[str]):
-            self._hydrate(image_id, resolver.client, metadata)
+            # no need to hydrate again since we do it eagerly below
+            pass
 
         rep = "Image()"
-        image = _Image._from_loader(_load, rep)
+        image = _Image._from_loader(_load, rep, hydrate_lazily=True)
+        image._hydrate(image_id, self._client, metadata)  # hydrating eagerly since we have all of the data
 
         return image
 
@@ -513,8 +517,8 @@ class _Sandbox(_Object, type_prefix="sb"):
             raise InvalidError(f"workdir must be an absolute path, got: {workdir}")
 
         # Force secret resolution so we can pass the secret IDs to the backend.
-        for secret in secrets:
-            await secret.resolve(client=self._client)
+        secret_coros = [secret.hydrate(client=self._client) for secret in secrets]
+        await TaskContext.gather(*secret_coros)
 
         task_id = await self._get_task_id()
         req = api_pb2.ContainerExecRequest(