modal 1.2.1.dev6__py3-none-any.whl → 1.2.1.dev8__py3-none-any.whl

modal/app.py

@@ -2,6 +2,7 @@
 import inspect
 import typing
 from collections.abc import AsyncGenerator, Collection, Coroutine, Mapping, Sequence
+from dataclasses import dataclass
 from pathlib import PurePosixPath
 from textwrap import dedent
 from typing import (
@@ -114,6 +115,22 @@ class _FunctionDecoratorType:
     def __call__(self, func): ...
 
 
+@dataclass()
+class _LocalAppState:
+    """All state for apps that's part of the local/definition state"""
+
+    functions: dict[str, _Function]
+    classes: dict[str, _Cls]
+    image_default: Optional[_Image]
+    web_endpoints: list[str]  # Used by the CLI
+    local_entrypoints: dict[str, _LocalEntrypoint]
+    tags: dict[str, str]
+
+    include_source_default: bool
+    secrets_default: Sequence[_Secret]
+    volumes_default: dict[Union[str, PurePosixPath], _Volume]
+
+
 class _App:
     """A Modal App is a group of functions and classes that are deployed together.
 
@@ -151,23 +168,21 @@ class _App:
 
     _name: Optional[str]
     _description: Optional[str]
-    _tags: dict[str, str]
-
-    _functions: dict[str, _Function]
-    _classes: dict[str, _Cls]
 
-    _image: Optional[_Image]
-    _secrets: Sequence[_Secret]
-    _volumes: dict[Union[str, PurePosixPath], _Volume]
-    _web_endpoints: list[str]  # Used by the CLI
-    _local_entrypoints: dict[str, _LocalEntrypoint]
+    _local_state_attr: Optional[_LocalAppState] = None
 
     # Running apps only (container apps or running local)
     _app_id: Optional[str]  # Kept after app finishes
     _running_app: Optional[RunningApp]  # Various app info
     _client: Optional[_Client]
 
-    _include_source_default: Optional[bool] = None
+    @property
+    def _local_state(self) -> _LocalAppState:
+        """For internal use only. Do not use this property directly."""
+
+        if self._local_state_attr is None:
+            raise AttributeError("Local state is not initialized - app is not locally available")
+        return self._local_state_attr
 
     def __init__(
         self,
@@ -196,8 +211,6 @@ class _App:
 
         self._name = name
         self._description = name
-        self._tags = tags or {}
-        self._include_source_default = include_source
 
         check_sequence(secrets, _Secret, "`secrets=` has to be a list or tuple of `modal.Secret` objects")
         validate_volumes(volumes)
@@ -205,16 +218,24 @@ class _App:
         if image is not None and not isinstance(image, _Image):
             raise InvalidError("`image=` has to be a `modal.Image` object")
 
-        self._functions = {}
-        self._classes = {}
-        self._image = image
-        self._secrets = secrets
-        self._volumes = volumes
-        self._local_entrypoints = {}
-        self._web_endpoints = []
+        self._local_state_attr = _LocalAppState(
+            functions={},
+            classes={},
+            image_default=image,
+            secrets_default=secrets,
+            volumes_default=volumes,
+            include_source_default=include_source,
+            web_endpoints=[],
+            local_entrypoints={},
+            tags=tags or {},
+        )
 
+        # Running apps only
         self._app_id = None
         self._running_app = None  # Set inside container, OR during the time an app is running locally
+
+        # Client is special - needed to be set just before the app is "hydrated" or running at the latest
+        # Guaranteed to be set for running apps, but also needed to actually *hydrate* the app and make it running
         self._client = None
 
         # Register this app. This is used to look up the app in the container, when we can't get it from the function
@@ -283,7 +304,8 @@ class _App:
 
         response = await retry_transient_errors(client.stub.AppGetOrCreate, request)
 
-        app = _App(name)
+        app = _App(name)  # TODO: this should probably be a distinct constructor, possibly even a distinct type
+        app._local_state_attr = None  # this is not a locally defined App, so no local state
         app._app_id = response.app_id
         app._client = client
         app._running_app = RunningApp(response.app_id, interactive=False)
@@ -310,18 +332,19 @@ class _App:
         App that is retrieved via `modal.App.lookup`. It is likely to be deprecated in the future.
 
         """
-        return self._image
+        return self._local_state.image_default
 
     @image.setter
     def image(self, value):
         """mdmd:hidden"""
-        self._image = value
+        self._local_state.image_default = value
 
     def _uncreate_all_objects(self):
         # TODO(erikbern): this doesn't unhydrate objects that aren't tagged
-        for obj in self._functions.values():
+        local_state = self._local_state
+        for obj in local_state.functions.values():
             obj._unhydrate()
-        for obj in self._classes.values():
+        for obj in local_state.classes.values():
             obj._unhydrate()
 
     @asynccontextmanager
@@ -457,8 +480,9 @@ class _App:
         return self
 
     def _get_default_image(self):
-        if self._image:
-            return self._image
+        local_state = self._local_state
+        if local_state.image_default:
+            return local_state.image_default
         else:
             return _default_image
 
@@ -473,7 +497,8 @@ class _App:
         return [m for m in all_mounts if m.is_local()]
 
     def _add_function(self, function: _Function, is_web_endpoint: bool):
-        if old_function := self._functions.get(function.tag, None):
+        local_state = self._local_state
+        if old_function := local_state.functions.get(function.tag, None):
             if old_function is function:
                 return  # already added the same exact instance, ignore
 
@@ -484,7 +509,7 @@ class _App:
                     f"[{old_function._info.module_name}].{old_function._info.function_name}"
                     f" with new function [{function._info.module_name}].{function._info.function_name}"
                 )
-        if function.tag in self._classes:
+        if function.tag in local_state.classes:
             logger.warning(f"Warning: tag {function.tag} exists but is overridden by function")
 
         if self._running_app:
@@ -495,9 +520,9 @@ class _App:
                 metadata: Message = self._running_app.object_handle_metadata[object_id]
                 function._hydrate(object_id, self._client, metadata)
 
-        self._functions[function.tag] = function
+        local_state.functions[function.tag] = function
         if is_web_endpoint:
-            self._web_endpoints.append(function.tag)
+            local_state.web_endpoints.append(function.tag)
 
     def _add_class(self, tag: str, cls: _Cls):
         if self._running_app:
@@ -508,7 +533,7 @@ class _App:
                 metadata: Message = self._running_app.object_handle_metadata[object_id]
                 cls._hydrate(object_id, self._client, metadata)
 
-        self._classes[tag] = cls
+        self._local_state.classes[tag] = cls
 
     def _init_container(self, client: _Client, running_app: RunningApp):
         self._app_id = running_app.app_id
@@ -516,18 +541,18 @@ class _App:
         self._client = client
 
         _App._container_app = self
-
+        local_state = self._local_state
         # Hydrate function objects
         for tag, object_id in running_app.function_ids.items():
-            if tag in self._functions:
-                obj = self._functions[tag]
+            if tag in local_state.functions:
+                obj = local_state.functions[tag]
                 handle_metadata = running_app.object_handle_metadata[object_id]
                 obj._hydrate(object_id, client, handle_metadata)
 
         # Hydrate class objects
         for tag, object_id in running_app.class_ids.items():
-            if tag in self._classes:
-                obj = self._classes[tag]
+            if tag in local_state.classes:
+                obj = local_state.classes[tag]
                 handle_metadata = running_app.object_handle_metadata[object_id]
                 obj._hydrate(object_id, client, handle_metadata)
 
@@ -541,7 +566,7 @@ class _App:
         This method is likely to be deprecated in the future in favor of a different
         approach for retrieving the layout of a deployed App.
         """
-        return self._functions
+        return self._local_state.functions
 
     @property
     def registered_classes(self) -> dict[str, _Cls]:
@@ -553,7 +578,7 @@ class _App:
         This method is likely to be deprecated in the future in favor of a different
         approach for retrieving the layout of a deployed App.
         """
-        return self._classes
+        return self._local_state.classes
 
     @property
     def registered_entrypoints(self) -> dict[str, _LocalEntrypoint]:
@@ -564,7 +589,7 @@ class _App:
         expected to work when a deplyoed App has been retrieved via `modal.App.lookup`.
         This method is likely to be deprecated in the future.
         """
-        return self._local_entrypoints
+        return self._local_state.local_entrypoints
 
     @property
     def registered_web_endpoints(self) -> list[str]:
@@ -576,7 +601,7 @@ class _App:
         This method is likely to be deprecated in the future in favor of a different
         approach for retrieving the layout of a deployed App.
         """
-        return self._web_endpoints
+        return self._local_state.web_endpoints
 
     def local_entrypoint(
         self, _warn_parentheses_missing: Any = None, *, name: Optional[str] = None
@@ -637,10 +662,11 @@ class _App:
         def wrapped(raw_f: Callable[..., Any]) -> _LocalEntrypoint:
             info = FunctionInfo(raw_f)
             tag = name if name is not None else raw_f.__qualname__
-            if tag in self._local_entrypoints:
+            local_state = self._local_state
+            if tag in local_state.local_entrypoints:
                 # TODO: get rid of this limitation.
                 raise InvalidError(f"Duplicate local entrypoint name: {tag}. Local entrypoint names must be unique.")
-            entrypoint = self._local_entrypoints[tag] = _LocalEntrypoint(info, self)
+            entrypoint = local_state.local_entrypoints[tag] = _LocalEntrypoint(info, self)
             return entrypoint
 
         return wrapped
@@ -732,7 +758,8 @@ class _App:
         secrets = secrets or []
         if env:
             secrets = [*secrets, _Secret.from_dict(env)]
-        secrets = [*self._secrets, *secrets]
+        local_state = self._local_state
+        secrets = [*local_state.secrets_default, *secrets]
 
         def wrapped(
             f: Union[_PartialFunction, Callable[..., Any], None],
@@ -840,7 +867,7 @@ class _App:
                 is_generator=is_generator,
                 gpu=gpu,
                 network_file_systems=network_file_systems,
-                volumes={**self._volumes, **volumes},
+                volumes={**local_state.volumes_default, **volumes},
                 cpu=cpu,
                 memory=memory,
                 ephemeral_disk=ephemeral_disk,
@@ -866,7 +893,7 @@ class _App:
                 i6pn_enabled=i6pn_enabled,
                 cluster_size=cluster_size,  # Experimental: Clustered functions
                 rdma=rdma,
-                include_source=include_source if include_source is not None else self._include_source_default,
+                include_source=include_source if include_source is not None else local_state.include_source_default,
                 experimental_options={k: str(v) for k, v in (experimental_options or {}).items()},
                 _experimental_proxy_ip=_experimental_proxy_ip,
                 restrict_output=_experimental_restrict_output,
@@ -963,6 +990,7 @@ class _App:
             secrets = [*secrets, _Secret.from_dict(env)]
 
         def wrapper(wrapped_cls: Union[CLS_T, _PartialFunction]) -> CLS_T:
+            local_state = self._local_state
             # Check if the decorated object is a class
             if isinstance(wrapped_cls, _PartialFunction):
                 wrapped_cls.registered = True
@@ -1029,10 +1057,10 @@ class _App:
                 info,
                 app=self,
                 image=image or self._get_default_image(),
-                secrets=[*self._secrets, *secrets],
+                secrets=[*local_state.secrets_default, *secrets],
                 gpu=gpu,
                 network_file_systems=network_file_systems,
-                volumes={**self._volumes, **volumes},
+                volumes={**local_state.volumes_default, **volumes},
                 cpu=cpu,
                 memory=memory,
                 ephemeral_disk=ephemeral_disk,
@@ -1057,7 +1085,7 @@ class _App:
                 i6pn_enabled=i6pn_enabled,
                 cluster_size=cluster_size,
                 rdma=rdma,
-                include_source=include_source if include_source is not None else self._include_source_default,
+                include_source=include_source if include_source is not None else local_state.include_source_default,
                 experimental_options={k: str(v) for k, v in (experimental_options or {}).items()},
                 _experimental_proxy_ip=_experimental_proxy_ip,
                 _experimental_custom_scaling_factor=_experimental_custom_scaling_factor,
@@ -1067,6 +1095,11 @@ class _App:
             self._add_function(cls_func, is_web_endpoint=False)
 
             cls: _Cls = _Cls.from_local(user_cls, self, cls_func)
+            for method_name, partial_function in cls._method_partials.items():
+                if partial_function.params.webhook_config is not None:
+                    full_name = f"{user_cls.__name__}.{method_name}"
+                    local_state.web_endpoints.append(full_name)
+                partial_function.registered = True
 
             tag: str = user_cls.__name__
             self._add_class(tag, cls)
@@ -1102,11 +1135,14 @@ class _App:
         (with this App's tags taking precedence in the case of conflicts).
 
         """
-        for tag, function in other_app._functions.items():
+        other_app_local_state = other_app._local_state
+        this_local_state = self._local_state
+
+        for tag, function in other_app_local_state.functions.items():
             self._add_function(function, False)  # TODO(erikbern): webhook config?
 
-        for tag, cls in other_app._classes.items():
-            existing_cls = self._classes.get(tag)
+        for tag, cls in other_app_local_state.classes.items():
+            existing_cls = this_local_state.classes.get(tag)
             if existing_cls and existing_cls != cls:
                 logger.warning(
                     f"Named app class {tag} with existing value {existing_cls} is being "
@@ -1116,7 +1152,7 @@ class _App:
             self._add_class(tag, cls)
 
         if inherit_tags:
-            self._tags = {**other_app._tags, **self._tags}
+            this_local_state.tags = {**other_app_local_state.tags, **this_local_state.tags}
 
         return self
 
@@ -1132,7 +1168,7 @@ class _App:
 
         """
         # Note that we are requiring the App to be "running" before we set the tags.
-        # Alternatively, we could hold onto the tags (i.e. in `self._tags`) and then pass
+        # Alternatively, we could hold onto the tags (i.e. in `self._local_state.tags`) and then pass
         # then up when AppPublish gets called. I'm not certain we want to support it, though.
         # It might not be obvious to users that `.set_tags()` is eager and has immediate effect
         # when the App is running, but lazy (and potentially ignored) otherwise. There would be

modal/app.pyi

@@ -74,6 +74,42 @@ class _FunctionDecoratorType:
         self, func: collections.abc.Callable[P, ReturnType]
     ) -> modal.functions.Function[P, ReturnType, ReturnType]: ...
 
+class _LocalAppState:
+    """All state for apps that's part of the local/definition state"""
+
+    functions: dict[str, modal._functions._Function]
+    classes: dict[str, modal.cls._Cls]
+    image_default: typing.Optional[modal.image._Image]
+    web_endpoints: list[str]
+    local_entrypoints: dict[str, _LocalEntrypoint]
+    tags: dict[str, str]
+    include_source_default: bool
+    secrets_default: collections.abc.Sequence[modal.secret._Secret]
+    volumes_default: dict[typing.Union[str, pathlib.PurePosixPath], modal.volume._Volume]
+
+    def __init__(
+        self,
+        functions: dict[str, modal._functions._Function],
+        classes: dict[str, modal.cls._Cls],
+        image_default: typing.Optional[modal.image._Image],
+        web_endpoints: list[str],
+        local_entrypoints: dict[str, _LocalEntrypoint],
+        tags: dict[str, str],
+        include_source_default: bool,
+        secrets_default: collections.abc.Sequence[modal.secret._Secret],
+        volumes_default: dict[typing.Union[str, pathlib.PurePosixPath], modal.volume._Volume],
+    ) -> None:
+        """Initialize self.  See help(type(self)) for accurate signature."""
+        ...
+
+    def __repr__(self):
+        """Return repr(self)."""
+        ...
+
+    def __eq__(self, other):
+        """Return self==value."""
+        ...
+
 class _App:
     """A Modal App is a group of functions and classes that are deployed together.
 
@@ -110,18 +146,15 @@ class _App:
     _container_app: typing.ClassVar[typing.Optional[_App]]
     _name: typing.Optional[str]
     _description: typing.Optional[str]
-    _tags: dict[str, str]
-    _functions: dict[str, modal._functions._Function]
-    _classes: dict[str, modal.cls._Cls]
-    _image: typing.Optional[modal.image._Image]
-    _secrets: collections.abc.Sequence[modal.secret._Secret]
-    _volumes: dict[typing.Union[str, pathlib.PurePosixPath], modal.volume._Volume]
-    _web_endpoints: list[str]
-    _local_entrypoints: dict[str, _LocalEntrypoint]
+    _local_state_attr: typing.Optional[_LocalAppState]
     _app_id: typing.Optional[str]
     _running_app: typing.Optional[modal.running_app.RunningApp]
     _client: typing.Optional[modal.client._Client]
-    _include_source_default: typing.Optional[bool]
+
+    @property
+    def _local_state(self) -> _LocalAppState:
+        """For internal use only. Do not use this property directly."""
+        ...
 
     def __init__(
         self,
@@ -630,18 +663,10 @@ class App:
     _container_app: typing.ClassVar[typing.Optional[App]]
     _name: typing.Optional[str]
     _description: typing.Optional[str]
-    _tags: dict[str, str]
-    _functions: dict[str, modal.functions.Function]
-    _classes: dict[str, modal.cls.Cls]
-    _image: typing.Optional[modal.image.Image]
-    _secrets: collections.abc.Sequence[modal.secret.Secret]
-    _volumes: dict[typing.Union[str, pathlib.PurePosixPath], modal.volume.Volume]
-    _web_endpoints: list[str]
-    _local_entrypoints: dict[str, LocalEntrypoint]
+    _local_state_attr: typing.Optional[_LocalAppState]
     _app_id: typing.Optional[str]
     _running_app: typing.Optional[modal.running_app.RunningApp]
     _client: typing.Optional[modal.client.Client]
-    _include_source_default: typing.Optional[bool]
 
     def __init__(
         self,
@@ -664,6 +689,11 @@ class App:
         """
         ...
 
+    @property
+    def _local_state(self) -> _LocalAppState:
+        """For internal use only. Do not use this property directly."""
+        ...
+
     @property
     def name(self) -> typing.Optional[str]:
         """The user-provided name of the App."""

modal/client.pyi

@@ -33,7 +33,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.2.1.dev6",
+        version: str = "1.2.1.dev8",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -164,7 +164,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.2.1.dev6",
+        version: str = "1.2.1.dev8",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

modal/cls.py

@@ -577,22 +577,15 @@ More information on class parameterization can be found here: https://modal.com/
         # validate signature
         _Cls.validate_construction_mechanism(user_cls)
 
-        method_partials: dict[str, _PartialFunction] = _find_partial_methods_for_user_cls(
-            user_cls, _PartialFunctionFlags.interface_flags()
-        )
-
-        for method_name, partial_function in method_partials.items():
-            if partial_function.params.webhook_config is not None:
-                full_name = f"{user_cls.__name__}.{method_name}"
-                app._web_endpoints.append(full_name)
-            partial_function.registered = True
-
         # Disable the warning that lifecycle methods are not wrapped
-        for partial_function in _find_partial_methods_for_user_cls(
+        lifecycle_method_partials = _find_partial_methods_for_user_cls(
             user_cls, ~_PartialFunctionFlags.interface_flags()
-        ).values():
+        )
+        for partial_function in lifecycle_method_partials.values():
             partial_function.registered = True
 
+        method_partials = _find_partial_methods_for_user_cls(user_cls, _PartialFunctionFlags.interface_flags())
+
         # Get all callables
         callables: dict[str, Callable] = {
             k: pf.raw_f

modal/functions.pyi

@@ -401,7 +401,7 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         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."""
             ...
@@ -410,7 +410,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -437,7 +437,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         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.
 
@@ -461,7 +461,7 @@ class Function(
             ...
 
     _experimental_spawn: ___experimental_spawn_spec[
-        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
+        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
     ]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER, SUPERSELF]):
@@ -470,7 +470,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P, typing_extensions.Self]
 
-    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         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.
 
@@ -491,7 +491,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

modal/runner.py

@@ -43,9 +43,7 @@ from .secret import _Secret
 from .stream_type import StreamType
 
 if TYPE_CHECKING:
-    from .app import _App
-else:
-    _App = TypeVar("_App")
+    import modal.app
 
 
 V = TypeVar("V")
@@ -126,12 +124,11 @@ async def _init_local_app_from_name(
 async def _create_all_objects(
     client: _Client,
     running_app: RunningApp,
-    functions: dict[str, _Function],
-    classes: dict[str, _Cls],
+    local_app_state: "modal.app._LocalAppState",
     environment_name: str,
 ) -> None:
     """Create objects that have been defined but not created on the server."""
-    indexed_objects: dict[str, _Object] = {**functions, **classes}
+    indexed_objects: dict[str, _Object] = {**local_app_state.functions, **local_app_state.classes}
     resolver = Resolver(
         client,
         environment_name=environment_name,
@@ -182,21 +179,19 @@ async def _publish_app(
     client: _Client,
     running_app: RunningApp,
     app_state: int,  # api_pb2.AppState.value
-    functions: dict[str, _Function],
-    classes: dict[str, _Cls],
+    app_local_state: "modal.app._LocalAppState",
     name: str = "",
-    tags: dict[str, str] = {},  # Additional App metadata
     deployment_tag: str = "",  # Only relevant for deployments
     commit_info: Optional[api_pb2.CommitInfo] = None,  # Git commit information
 ) -> tuple[str, list[api_pb2.Warning]]:
     """Wrapper for AppPublish RPC."""
-
+    functions = app_local_state.functions
     definition_ids = {obj.object_id: obj._get_metadata().definition_id for obj in functions.values()}  # type: ignore
 
     request = api_pb2.AppPublishRequest(
         app_id=running_app.app_id,
         name=name,
-        tags=tags,
+        tags=app_local_state.tags,
         deployment_tag=deployment_tag,
         commit_info=commit_info,
         app_state=app_state,  # type: ignore  : should be a api_pb2.AppState.value
@@ -260,13 +255,13 @@ async def _status_based_disconnect(client: _Client, app_id: str, exc_info: Optio
 
 @asynccontextmanager
 async def _run_app(
-    app: _App,
+    app: "modal.app._App",
     *,
     client: Optional[_Client] = None,
     detach: bool = False,
     environment_name: Optional[str] = None,
     interactive: bool = False,
-) -> AsyncGenerator[_App, None]:
+) -> AsyncGenerator["modal.app._App", None]:
     """mdmd:hidden"""
     if environment_name is None:
         environment_name = typing.cast(str, config.get("environment"))
@@ -338,12 +333,13 @@ async def _run_app(
                 get_app_logs_loop(client, output_mgr, app_id=running_app.app_id, app_logs_url=running_app.app_logs_url)
             )
 
+        local_app_state = app._local_state
         try:
             # Create all members
-            await _create_all_objects(client, running_app, app._functions, app._classes, environment_name)
+            await _create_all_objects(client, running_app, local_app_state, environment_name)
 
             # Publish the app
-            await _publish_app(client, running_app, app_state, app._functions, app._classes, tags=app._tags)
+            await _publish_app(client, running_app, app_state, local_app_state)
         except asyncio.CancelledError as e:
             # this typically happens on sigint/ctrl-C during setup (the KeyboardInterrupt happens in the main thread)
             if output_mgr := _get_output_manager():
@@ -355,6 +351,14 @@ async def _run_app(
             await _status_based_disconnect(client, running_app.app_id, e)
             raise
 
+        detached_disconnect_msg = (
+            "The detached App will keep running. You can track its progress on the Dashboard: "
+            f"[magenta underline]{running_app.app_page_url}[/magenta underline]"
+            "\n"
+            f"\nStream logs: [green]modal app logs {running_app.app_id}[/green]"
+            f"\nStop the App: [green]modal app stop {running_app.app_id}[/green]"
+        )
+
         try:
             # Show logs from dynamically created images.
             # TODO: better way to do this
@@ -377,11 +381,7 @@ async def _run_app(
             if detach:
                 if output_mgr := _get_output_manager():
                     output_mgr.print(output_mgr.step_completed("Shutting down Modal client."))
-                    output_mgr.print(
-                        "The detached app keeps running. You can track its progress at: "
-                        f"[magenta]{running_app.app_page_url}[/magenta]"
-                        ""
-                    )
+                    output_mgr.print(detached_disconnect_msg)
                 if logs_loop:
                     logs_loop.cancel()
                 await _status_based_disconnect(client, running_app.app_id, e)
@@ -409,10 +409,8 @@ async def _run_app(
             # If we lose connection to the server after a detached App has started running, it will continue
             # I think we can only exit "nicely" if we are able to print output though, otherwise we should raise
             if detach and (output_mgr := _get_output_manager()):
-                output_mgr.print(
-                    "Connection lost, but detached App will continue running: "
-                    f"[magenta]{running_app.app_page_url}[/magenta]"
-                )
+                output_mgr.print(":white_exclamation_mark: Connection lost!")
+                output_mgr.print(detached_disconnect_msg)
                 return
             raise
         except BaseException as e:
@@ -438,7 +436,7 @@ async def _run_app(
 
 
 async def _serve_update(
-    app: _App,
+    app: "modal.app._App",
     existing_app_id: str,
     is_ready: Event,
     environment_name: str,
@@ -448,13 +446,12 @@ async def _serve_update(
     client = await _Client.from_env()
     try:
         running_app: RunningApp = await _init_local_app_existing(client, existing_app_id, environment_name)
-
+        local_app_state = app._local_state
         # Create objects
         await _create_all_objects(
             client,
             running_app,
-            app._functions,
-            app._classes,
+            local_app_state,
             environment_name,
         )
 
@@ -463,9 +460,7 @@ async def _serve_update(
             client,
             running_app,
             app_state=api_pb2.APP_STATE_UNSPECIFIED,
-            functions=app._functions,
-            classes=app._classes,
-            tags=app._tags,
+            app_local_state=local_app_state,
         )
 
         # Communicate to the parent process
@@ -486,7 +481,7 @@ class DeployResult:
 
 
 async def _deploy_app(
-    app: _App,
+    app: "modal.app._App",
     name: Optional[str] = None,
     namespace: Any = None,  # mdmd:line-hidden
     client: Optional[_Client] = None,
@@ -544,8 +539,7 @@ async def _deploy_app(
             await _create_all_objects(
                 client,
                 running_app,
-                app._functions,
-                app._classes,
+                app._local_state,
                 environment_name=environment_name,
             )
 
@@ -558,11 +552,9 @@ async def _deploy_app(
             app_url, warnings = await _publish_app(
                 client,
                 running_app,
-                app_state=api_pb2.APP_STATE_DEPLOYED,
-                functions=app._functions,
-                classes=app._classes,
+                api_pb2.APP_STATE_DEPLOYED,
+                app._local_state,
                 name=name,
-                tags=app._tags,
                 deployment_tag=tag,
                 commit_info=commit_info,
             )
@@ -584,7 +576,7 @@ async def _deploy_app(
 
 
 async def _interactive_shell(
-    _app: _App, cmds: list[str], environment_name: str = "", pty: bool = True, **kwargs: Any
+    _app: "modal.app._App", cmds: list[str], environment_name: str = "", pty: bool = True, **kwargs: Any
 ) -> None:
     """Run an interactive shell (like `bash`) within the image for this app.
 

modal/runner.pyi

@@ -1,6 +1,5 @@
-import modal._functions
+import modal.app
 import modal.client
-import modal.cls
 import modal.running_app
 import modal_proto.api_pb2
 import multiprocessing.synchronize
@@ -8,8 +7,6 @@ import synchronicity.combined_types
 import typing
 import typing_extensions
 
-_App = typing.TypeVar("_App")
-
 V = typing.TypeVar("V")
 
 async def _heartbeat(client: modal.client._Client, app_id: str) -> None: ...
@@ -29,8 +26,7 @@ async def _init_local_app_from_name(
 async def _create_all_objects(
     client: modal.client._Client,
     running_app: modal.running_app.RunningApp,
-    functions: dict[str, modal._functions._Function],
-    classes: dict[str, modal.cls._Cls],
+    local_app_state: modal.app._LocalAppState,
     environment_name: str,
 ) -> None:
     """Create objects that have been defined but not created on the server."""
@@ -40,10 +36,8 @@ async def _publish_app(
     client: modal.client._Client,
     running_app: modal.running_app.RunningApp,
     app_state: int,
-    functions: dict[str, modal._functions._Function],
-    classes: dict[str, modal.cls._Cls],
+    app_local_state: modal.app._LocalAppState,
     name: str = "",
-    tags: dict[str, str] = {},
     deployment_tag: str = "",
     commit_info: typing.Optional[modal_proto.api_pb2.CommitInfo] = None,
 ) -> tuple[str, list[modal_proto.api_pb2.Warning]]:
@@ -66,18 +60,18 @@ async def _status_based_disconnect(
     ...
 
 def _run_app(
-    app: _App,
+    app: modal.app._App,
     *,
     client: typing.Optional[modal.client._Client] = None,
     detach: bool = False,
     environment_name: typing.Optional[str] = None,
     interactive: bool = False,
-) -> typing.AsyncContextManager[_App]:
+) -> typing.AsyncContextManager[modal.app._App]:
     """mdmd:hidden"""
     ...
 
 async def _serve_update(
-    app: _App, existing_app_id: str, is_ready: multiprocessing.synchronize.Event, environment_name: str
+    app: modal.app._App, existing_app_id: str, is_ready: multiprocessing.synchronize.Event, environment_name: str
 ) -> None:
     """mdmd:hidden"""
     ...
@@ -115,7 +109,7 @@ class DeployResult:
         ...
 
 async def _deploy_app(
-    app: _App,
+    app: modal.app._App,
     name: typing.Optional[str] = None,
     namespace: typing.Any = None,
     client: typing.Optional[modal.client._Client] = None,
@@ -129,7 +123,7 @@ async def _deploy_app(
     ...
 
 async def _interactive_shell(
-    _app: _App, cmds: list[str], environment_name: str = "", pty: bool = True, **kwargs: typing.Any
+    _app: modal.app._App, cmds: list[str], environment_name: str = "", pty: bool = True, **kwargs: typing.Any
 ) -> None:
     """Run an interactive shell (like `bash`) within the image for this app.
 
@@ -159,26 +153,26 @@ class __run_app_spec(typing_extensions.Protocol):
     def __call__(
         self,
         /,
-        app: _App,
+        app: modal.app.App,
         *,
         client: typing.Optional[modal.client.Client] = None,
         detach: bool = False,
         environment_name: typing.Optional[str] = None,
         interactive: bool = False,
-    ) -> synchronicity.combined_types.AsyncAndBlockingContextManager[_App]:
+    ) -> synchronicity.combined_types.AsyncAndBlockingContextManager[modal.app.App]:
         """mdmd:hidden"""
         ...
 
     def aio(
         self,
         /,
-        app: _App,
+        app: modal.app.App,
         *,
         client: typing.Optional[modal.client.Client] = None,
         detach: bool = False,
         environment_name: typing.Optional[str] = None,
         interactive: bool = False,
-    ) -> typing.AsyncContextManager[_App]:
+    ) -> typing.AsyncContextManager[modal.app.App]:
         """mdmd:hidden"""
         ...
 
@@ -186,13 +180,23 @@ run_app: __run_app_spec
 
 class __serve_update_spec(typing_extensions.Protocol):
     def __call__(
-        self, /, app: _App, existing_app_id: str, is_ready: multiprocessing.synchronize.Event, environment_name: str
+        self,
+        /,
+        app: modal.app.App,
+        existing_app_id: str,
+        is_ready: multiprocessing.synchronize.Event,
+        environment_name: str,
     ) -> None:
         """mdmd:hidden"""
         ...
 
     async def aio(
-        self, /, app: _App, existing_app_id: str, is_ready: multiprocessing.synchronize.Event, environment_name: str
+        self,
+        /,
+        app: modal.app.App,
+        existing_app_id: str,
+        is_ready: multiprocessing.synchronize.Event,
+        environment_name: str,
     ) -> None:
         """mdmd:hidden"""
         ...
@@ -203,7 +207,7 @@ class __deploy_app_spec(typing_extensions.Protocol):
     def __call__(
         self,
         /,
-        app: _App,
+        app: modal.app.App,
         name: typing.Optional[str] = None,
         namespace: typing.Any = None,
         client: typing.Optional[modal.client.Client] = None,
@@ -219,7 +223,7 @@ class __deploy_app_spec(typing_extensions.Protocol):
     async def aio(
         self,
         /,
-        app: _App,
+        app: modal.app.App,
         name: typing.Optional[str] = None,
         namespace: typing.Any = None,
         client: typing.Optional[modal.client.Client] = None,
@@ -236,7 +240,13 @@ deploy_app: __deploy_app_spec
 
 class __interactive_shell_spec(typing_extensions.Protocol):
     def __call__(
-        self, /, _app: _App, cmds: list[str], environment_name: str = "", pty: bool = True, **kwargs: typing.Any
+        self,
+        /,
+        _app: modal.app.App,
+        cmds: list[str],
+        environment_name: str = "",
+        pty: bool = True,
+        **kwargs: typing.Any,
     ) -> None:
         """Run an interactive shell (like `bash`) within the image for this app.
 
@@ -263,7 +273,13 @@ class __interactive_shell_spec(typing_extensions.Protocol):
         ...
 
     async def aio(
-        self, /, _app: _App, cmds: list[str], environment_name: str = "", pty: bool = True, **kwargs: typing.Any
+        self,
+        /,
+        _app: modal.app.App,
+        cmds: list[str],
+        environment_name: str = "",
+        pty: bool = True,
+        **kwargs: typing.Any,
     ) -> None:
         """Run an interactive shell (like `bash`) within the image for this app.
 

{modal-1.2.1.dev6.dist-info → modal-1.2.1.dev8.dist-info}/METADATA

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

{modal-1.2.1.dev6.dist-info → modal-1.2.1.dev8.dist-info}/RECORD

@@ -19,15 +19,15 @@ modal/_tunnel.py,sha256=zTBxBiuH1O22tS1OliAJdIsSmaZS8PlnifS_6S5z-mk,6320
 modal/_tunnel.pyi,sha256=rvC7USR2BcKkbZIeCJXwf7-UfGE-LPLjKsGNiK7Lxa4,13366
 modal/_type_manager.py,sha256=DWjgmjYJuOagw2erin506UUbG2H5UzZCFEekS-7hmfA,9087
 modal/_watcher.py,sha256=K6LYnlmSGQB4tWWI9JADv-tvSvQ1j522FwT71B51CX8,3584
-modal/app.py,sha256=W-24GIIBTKBqBWF6n4aB_heUhCb8d4KJfGF8oWteZn8,52454
-modal/app.pyi,sha256=6wlYK9nNp0GuHXyUxGmcZ6J92EjsWS-KK6KRuejqXEY,49718
+modal/app.py,sha256=tXbc6EO7ZCxphspVuqIOHOr-OKqL7De8vChDTYEAElg,54516
+modal/app.pyi,sha256=AUV5Rp8qQrZJTP2waoKHFY7rYgsXNMYibMcCAQKuSeo,50544
 modal/billing.py,sha256=zmQ3bcCJlwa4KD1IA_QgdWpm1pn13c-7qfy79iEauYI,195
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=kyAIVB3Ay-XKJizQ_1ufUFB__EagV0MLmHJpyYyJ7J0,18636
-modal/client.pyi,sha256=FGi7I3pZlYeqgO-K6BAnw70jdm-Zb3cxkuMFCACHIJY,15829
+modal/client.pyi,sha256=xJmCcXA-PosLDtwke2D3FfNQrdt1jVNJ_jGodXMBA8Y,15829
 modal/cloud_bucket_mount.py,sha256=I2GRXYhOWLIz2kJZjXu75jAm9EJkBNcutGc6jR2ReUw,5928
 modal/cloud_bucket_mount.pyi,sha256=VuUOipMIHqFXMkD-3g2bsoqpSxV5qswlFHDOqPQzYAo,7405
-modal/cls.py,sha256=_Dzu8Tjjp_XukJxfBioAeHf03egKQYuKj7SrHJiK6CE,40676
+modal/cls.py,sha256=ZxzivE3fNci4-A5uyBYNAzXMXtdqDg3gnYvgbdy5fhg,40384
 modal/cls.pyi,sha256=jJsDPFoqzM4ht-V-e-xEJKJ5TINLF0fYtoBm_UeAW5Y,27281
 modal/config.py,sha256=ZvQtKR4vACdvV-sDI-CtGepUGNMpQucwhgkGZ3k6gc0,12869
 modal/container_process.py,sha256=Mutkl7sg_WR5zP4oJiWSC-3UdYRqp0zdKi1shZbi-bk,6996
@@ -41,7 +41,7 @@ modal/file_io.py,sha256=OSKr77TujcXGJW1iikzYiHckLSmv07QBgBHcxxYEkoI,21456
 modal/file_io.pyi,sha256=xtO6Glf_BFwDE7QiQQo24QqcMf_Vv-iz7WojcGVlLBU,15932
 modal/file_pattern_matcher.py,sha256=A_Kdkej6q7YQyhM_2-BvpFmPqJ0oHb54B6yf9VqvPVE,8116
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
-modal/functions.pyi,sha256=Z6VuukLrjASAgf0kV9I6c09WvP_b2gCujX6f9j2bBaw,37988
+modal/functions.pyi,sha256=CMwApS396tdElFrjnV6RuL2DTCz4C3jYzYoq1y_LPUQ,37988
 modal/gpu.py,sha256=Fe5ORvVPDIstSq1xjmM6OoNgLYFWvogP9r5BgmD3hYg,6769
 modal/image.py,sha256=HDkOnhIAN8g63a8LTN4J5SjC9ciReFQQJIxTS2z5KFM,107216
 modal/image.pyi,sha256=dMvMwAuvWkNN2BRYJFijkEy2m_xtEXgCKK0T7FVldsc,77514
@@ -64,8 +64,8 @@ modal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal/queue.py,sha256=aaH3SNWeh_HjEyVUtFiN345v0GJFoucJ6aNDrDggWZQ,25775
 modal/queue.pyi,sha256=mFu7GFFVFNLU9VZshnfekEsb-ABgpjdhJ07KXHvdv3A,37256
 modal/retries.py,sha256=IvNLDM0f_GLUDD5VgEDoN09C88yoxSrCquinAuxT1Sc,5205
-modal/runner.py,sha256=ZqXk12TyiuyZQXlDhSTXKylg-G0_I0uK6fzdJ_qFV7o,25182
-modal/runner.pyi,sha256=vUDRKqLz09QvZsaCH1gTG_iujewj-eGxxb6-VmN6eAw,8531
+modal/runner.py,sha256=b_oG8LU8pT3NByfhwLJfYJ0RdNbnlBd-Zcds-J1JRYU,25197
+modal/runner.pyi,sha256=DV3Z7h0owgRyOu9W5KU5O3UbRftX99KGrZQId91fpsU,8671
 modal/running_app.py,sha256=v61mapYNV1-O-Uaho5EfJlryMLvIT9We0amUOSvSGx8,1188
 modal/sandbox.py,sha256=R1WOFDTmg_SiG7NIEbzQMeTYHwLvX9r3j9lpINhIufc,45970
 modal/sandbox.pyi,sha256=elVE1xEy_ZhD009oNPnCwlZi4tK-RUb1qAoxkVteG9E,50713
@@ -155,7 +155,7 @@ modal/experimental/__init__.py,sha256=9gkVuDmu3m4TlKoU3MzEtTOemUSs8EEOWba40s7Aa0
 modal/experimental/flash.py,sha256=C4sef08rARYFllsgtqukFmYL18SZW0_JpMS0BejDcUs,28552
 modal/experimental/flash.pyi,sha256=vV_OQhtdrPn8SW0XrBK-aLLHHIvxAzLzwFbWrke-m74,15463
 modal/experimental/ipython.py,sha256=TrCfmol9LGsRZMeDoeMPx3Hv3BFqQhYnmD_iH0pqdhk,2904
-modal-1.2.1.dev6.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.2.1.dev8.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=c1yfBS_x--gL5bs0N4ihMwqwX8l3IBWSkBAKNNIi6bQ,3801
 modal_docs/gen_reference_docs.py,sha256=d_CQUGQ0rfw28u75I2mov9AlS773z9rG40-yq5o7g2U,6359
@@ -183,10 +183,10 @@ modal_proto/task_command_router_pb2.py,sha256=_pD2ZpU0bNzhwBdzmLoLyLtAtftI_Agxwn
 modal_proto/task_command_router_pb2.pyi,sha256=EyDgXPLr7alqjXYERV8w_MPuO404x0uCppmSkrfE9IE,14589
 modal_proto/task_command_router_pb2_grpc.py,sha256=uEQ0HdrCp8v-9bB5yIic9muA8spCShLHY6Bz9cCgOUE,10114
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=s3Yxsrawdj4nr8vqQqsAxyX6ilWaGbdECy425KKbLIA,3301
-modal_version/__init__.py,sha256=LY_wuei6F9T8FfZ_2nkSI70w3GrMT-NIf59vhLq1kV8,120
+modal_version/__init__.py,sha256=BGT-zG4jbs-VPlDeSA13G_diAPSM3dNIBl_5lJOh-4w,120
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal-1.2.1.dev6.dist-info/METADATA,sha256=c1rDfKMZkhrvkyQicFPbv9evf5wuXLUX5BzW6R_YHwc,2483
-modal-1.2.1.dev6.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.2.1.dev6.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.2.1.dev6.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.2.1.dev6.dist-info/RECORD,,
+modal-1.2.1.dev8.dist-info/METADATA,sha256=gfahBhON2zAnVUbV8XvOE3cuXb3nukFnV9mOuVwiWBs,2483
+modal-1.2.1.dev8.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.2.1.dev8.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.2.1.dev8.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.2.1.dev8.dist-info/RECORD,,

modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.2.1.dev6"
+__version__ = "1.2.1.dev8"