modal 0.62.115__py3-none-any.whl → 0.72.13__py3-none-any.whl

modal/runner.pyi

@@ -1,7 +1,8 @@
-import modal._output
 import modal.client
-import modal.object
+import modal.cls
+import modal.functions
 import modal.running_app
+import modal_proto.api_pb2
 import multiprocessing.synchronize
 import synchronicity.combined_types
 import typing
@@ -9,131 +10,144 @@ import typing_extensions
 
 _App = typing.TypeVar("_App")
 
-async def _heartbeat(client, app_id):
-    ...
-
-
-async def _init_local_app_existing(client: modal.client._Client, existing_app_id: str) -> modal.running_app.RunningApp:
-    ...
-
-
-async def _init_local_app_new(client: modal.client._Client, description: str, app_state: int, environment_name: str = '', interactive=False) -> modal.running_app.RunningApp:
-    ...
-
-
-async def _init_local_app_from_name(client: modal.client._Client, name: str, namespace, environment_name: str = '') -> modal.running_app.RunningApp:
-    ...
-
-
-async def _create_all_objects(client: modal.client._Client, running_app: modal.running_app.RunningApp, indexed_objects: typing.Dict[str, modal.object._Object], new_app_state: int, environment_name: str, output_mgr: typing.Union[modal._output.OutputManager, None] = None):
-    ...
-
-
-async def _disconnect(client: modal.client._Client, app_id: str, reason: typing.Union[int, None] = None, exc_str: typing.Union[str, None] = None):
-    ...
-
-
-def _run_app(app: _App, client: typing.Union[modal.client._Client, None] = None, stdout=None, show_progress: bool = True, detach: bool = False, output_mgr: typing.Union[modal._output.OutputManager, None] = None, environment_name: typing.Union[str, None] = None, shell=False, interactive=False) -> typing.AsyncContextManager[_App]:
-    ...
-
-
-async def _serve_update(app: _App, existing_app_id: str, is_ready: multiprocessing.synchronize.Event, environment_name: str) -> None:
-    ...
-
+V = typing.TypeVar("V")
+
+async def _heartbeat(client: modal.client._Client, app_id: str) -> None: ...
+async def _init_local_app_existing(
+    client: modal.client._Client, existing_app_id: str, environment_name: str
+) -> modal.running_app.RunningApp: ...
+async def _init_local_app_new(
+    client: modal.client._Client,
+    description: str,
+    app_state: int,
+    environment_name: str = "",
+    interactive: bool = False,
+) -> modal.running_app.RunningApp: ...
+async def _init_local_app_from_name(
+    client: modal.client._Client, name: str, namespace: typing.Any, environment_name: str = ""
+) -> modal.running_app.RunningApp: ...
+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],
+    environment_name: str,
+) -> None: ...
+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],
+    name: str = "",
+    tag: str = "",
+) -> tuple[str, list[modal_proto.api_pb2.Warning]]: ...
+async def _disconnect(client: modal.client._Client, app_id: str, reason: int, exc_str: str = "") -> None: ...
+async def _status_based_disconnect(
+    client: modal.client._Client, app_id: str, exc_info: typing.Optional[BaseException] = None
+): ...
+def _run_app(
+    app: _App,
+    *,
+    client: typing.Optional[modal.client._Client] = None,
+    detach: bool = False,
+    environment_name: typing.Optional[str] = None,
+    interactive: bool = False,
+) -> typing.AsyncContextManager[_App]: ...
+async def _serve_update(
+    app: _App, existing_app_id: str, is_ready: multiprocessing.synchronize.Event, environment_name: str
+) -> None: ...
 
 class DeployResult:
     app_id: str
-
-    def __init__(self, app_id: str) -> None:
-        ...
-
-    def __repr__(self):
-        ...
-
-    def __eq__(self, other):
-        ...
-
-    def __setattr__(self, name, value):
-        ...
-
-    def __delattr__(self, name):
-        ...
-
-    def __hash__(self):
-        ...
-
-
-async def _deploy_app(app: _App, name: str = None, namespace=1, client=None, stdout=None, show_progress=True, environment_name: typing.Union[str, None] = None, public: bool = False) -> DeployResult:
-    ...
-
-
-async def _interactive_shell(_app: _App, cmd: typing.List[str], environment_name: str = '', **kwargs):
-    ...
-
+    app_page_url: str
+    app_logs_url: str
+    warnings: list[str]
+
+    def __init__(self, app_id: str, app_page_url: str, app_logs_url: str, warnings: list[str]) -> None: ...
+    def __repr__(self): ...
+    def __eq__(self, other): ...
+    def __setattr__(self, name, value): ...
+    def __delattr__(self, name): ...
+    def __hash__(self): ...
+
+async def _deploy_app(
+    app: _App,
+    name: typing.Optional[str] = None,
+    namespace: typing.Any = 1,
+    client: typing.Optional[modal.client._Client] = None,
+    environment_name: typing.Optional[str] = None,
+    tag: str = "",
+) -> DeployResult: ...
+async def _interactive_shell(
+    _app: _App, cmds: list[str], environment_name: str = "", pty: bool = True, **kwargs: typing.Any
+) -> None: ...
+def _run_stub(*args: typing.Any, **kwargs: typing.Any): ...
+def _deploy_stub(*args: typing.Any, **kwargs: typing.Any): ...
 
 class __run_app_spec(typing_extensions.Protocol):
-    def __call__(self, app: _App, client: typing.Union[modal.client.Client, None] = None, stdout=None, show_progress: bool = True, detach: bool = False, output_mgr: typing.Union[modal._output.OutputManager, None] = None, environment_name: typing.Union[str, None] = None, shell=False, interactive=False) -> synchronicity.combined_types.AsyncAndBlockingContextManager[_App]:
-        ...
-
-    def aio(self, app: _App, client: typing.Union[modal.client.Client, None] = None, stdout=None, show_progress: bool = True, detach: bool = False, output_mgr: typing.Union[modal._output.OutputManager, None] = None, environment_name: typing.Union[str, None] = None, shell=False, interactive=False) -> typing.AsyncContextManager[_App]:
-        ...
+    def __call__(
+        self,
+        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]: ...
+    def aio(
+        self,
+        app: _App,
+        *,
+        client: typing.Optional[modal.client.Client] = None,
+        detach: bool = False,
+        environment_name: typing.Optional[str] = None,
+        interactive: bool = False,
+    ) -> typing.AsyncContextManager[_App]: ...
 
 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) -> None:
-        ...
-
-    async def aio(self, *args, **kwargs) -> None:
-        ...
+    def __call__(
+        self, app: _App, existing_app_id: str, is_ready: multiprocessing.synchronize.Event, environment_name: str
+    ) -> None: ...
+    async def aio(
+        self, app: _App, existing_app_id: str, is_ready: multiprocessing.synchronize.Event, environment_name: str
+    ) -> None: ...
 
 serve_update: __serve_update_spec
 
-
 class __deploy_app_spec(typing_extensions.Protocol):
-    def __call__(self, app: _App, name: str = None, namespace=1, client=None, stdout=None, show_progress=True, environment_name: typing.Union[str, None] = None, public: bool = False) -> DeployResult:
-        ...
-
-    async def aio(self, *args, **kwargs) -> DeployResult:
-        ...
+    def __call__(
+        self,
+        app: _App,
+        name: typing.Optional[str] = None,
+        namespace: typing.Any = 1,
+        client: typing.Optional[modal.client.Client] = None,
+        environment_name: typing.Optional[str] = None,
+        tag: str = "",
+    ) -> DeployResult: ...
+    async def aio(
+        self,
+        app: _App,
+        name: typing.Optional[str] = None,
+        namespace: typing.Any = 1,
+        client: typing.Optional[modal.client.Client] = None,
+        environment_name: typing.Optional[str] = None,
+        tag: str = "",
+    ) -> DeployResult: ...
 
 deploy_app: __deploy_app_spec
 
-
 class __interactive_shell_spec(typing_extensions.Protocol):
-    def __call__(self, _app: _App, cmd: typing.List[str], environment_name: str = '', **kwargs):
-        ...
-
-    async def aio(self, *args, **kwargs):
-        ...
+    def __call__(
+        self, _app: _App, cmds: list[str], environment_name: str = "", pty: bool = True, **kwargs: typing.Any
+    ) -> None: ...
+    async def aio(
+        self, _app: _App, cmds: list[str], environment_name: str = "", pty: bool = True, **kwargs: typing.Any
+    ) -> None: ...
 
 interactive_shell: __interactive_shell_spec
 
-
-def _run_stub(app: _App, client: typing.Union[modal.client._Client, None] = None, stdout=None, show_progress: bool = True, detach: bool = False, output_mgr: typing.Union[modal._output.OutputManager, None] = None, environment_name: typing.Union[str, None] = None, shell=False, interactive=False) -> typing.AsyncContextManager[_App]:
-    ...
-
-
-class __run_stub_spec(typing_extensions.Protocol):
-    def __call__(self, app: _App, client: typing.Union[modal.client.Client, None] = None, stdout=None, show_progress: bool = True, detach: bool = False, output_mgr: typing.Union[modal._output.OutputManager, None] = None, environment_name: typing.Union[str, None] = None, shell=False, interactive=False) -> synchronicity.combined_types.AsyncAndBlockingContextManager[_App]:
-        ...
-
-    def aio(self, app: _App, client: typing.Union[modal.client.Client, None] = None, stdout=None, show_progress: bool = True, detach: bool = False, output_mgr: typing.Union[modal._output.OutputManager, None] = None, environment_name: typing.Union[str, None] = None, shell=False, interactive=False) -> typing.AsyncContextManager[_App]:
-        ...
-
-run_stub: __run_stub_spec
-
-
-async def _deploy_stub(app: _App, name: str = None, namespace=1, client=None, stdout=None, show_progress=True, environment_name: typing.Union[str, None] = None, public: bool = False) -> DeployResult:
-    ...
-
-
-class __deploy_stub_spec(typing_extensions.Protocol):
-    def __call__(self, app: _App, name: str = None, namespace=1, client=None, stdout=None, show_progress=True, environment_name: typing.Union[str, None] = None, public: bool = False) -> DeployResult:
-        ...
-
-    async def aio(self, *args, **kwargs) -> DeployResult:
-        ...
-
-deploy_stub: __deploy_stub_spec
+def run_stub(*args: typing.Any, **kwargs: typing.Any): ...
+def deploy_stub(*args: typing.Any, **kwargs: typing.Any): ...

modal/running_app.py

@@ -1,15 +1,38 @@
 # Copyright Modal Labs 2024
 from dataclasses import dataclass, field
-from typing import Dict, Optional
+from typing import Optional
 
 from google.protobuf.message import Message
 
+from modal._utils.grpc_utils import get_proto_oneof
+from modal_proto import api_pb2
+
 
 @dataclass
 class RunningApp:
     app_id: str
-    environment_name: Optional[str] = None
     app_page_url: Optional[str] = None
-    tag_to_object_id: Dict[str, str] = field(default_factory=dict)
-    object_handle_metadata: Dict[str, Optional[Message]] = field(default_factory=dict)
+    app_logs_url: Optional[str] = None
+    function_ids: dict[str, str] = field(default_factory=dict)
+    class_ids: dict[str, str] = field(default_factory=dict)
+    object_handle_metadata: dict[str, Optional[Message]] = field(default_factory=dict)
     interactive: bool = False
+
+
+def running_app_from_layout(
+    app_id: str,
+    app_layout: api_pb2.AppLayout,
+    app_page_url: Optional[str] = None,
+) -> RunningApp:
+    object_handle_metadata = {}
+    for obj in app_layout.objects:
+        handle_metadata: Optional[Message] = get_proto_oneof(obj, "handle_metadata_oneof")
+        object_handle_metadata[obj.object_id] = handle_metadata
+
+    return RunningApp(
+        app_id,
+        function_ids=dict(app_layout.function_ids),
+        class_ids=dict(app_layout.class_ids),
+        object_handle_metadata=object_handle_metadata,
+        app_page_url=app_page_url,
+    )