modAL 1.3.2__tar.gz → 1.3.2.dev0__tar.gz

{modal-1.3.2 → modal-1.3.2.dev0}/PKG-INFO

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

{modal-1.3.2 → modal-1.3.2.dev0}/modal/_object.py

@@ -39,41 +39,6 @@ def _get_environment_name(
         return config.get("environment")
 
 
-def live_method(method):
-    @wraps(method)
-    async def wrapped(self, *args, **kwargs):
-        await self.hydrate()
-        return await method(self, *args, **kwargs)
-
-    return wrapped
-
-
-def live_method_gen(method):
-    @wraps(method)
-    async def wrapped(self, *args, **kwargs):
-        await self.hydrate()
-        async with aclosing(method(self, *args, **kwargs)) as stream:
-            async for item in stream:
-                yield item
-
-    return wrapped
-
-
-def live_method_contextmanager(method):
-    # make sure a wrapped function returning an async context manager
-    # will not require both an `await func.aio()` and `async with`
-    # which would have been the case if it was wrapped in live_method
-
-    @wraps(method)
-    @contextlib.asynccontextmanager
-    async def wrapped(self, *args, **kwargs):
-        await self.hydrate()
-        async with method(self, *args, **kwargs) as ctx:
-            yield ctx
-
-    return wrapped
-
-
 class _Object:
     _type_prefix: ClassVar[Optional[str]] = None
     _prefix_to_type: ClassVar[dict[str, type]] = {}
@@ -310,11 +275,6 @@ class _Object:
             raise AttributeError(f"Attempting to get object_id of unhydrated {self}")
         return self._object_id
 
-    @live_method
-    async def get_dashboard_url(self) -> str:
-        """mdmd:hidden"""
-        return f"https://modal.com/id/{self.object_id}"
-
     @property
     def client(self) -> _Client:
         """mdmd:hidden"""
@@ -376,3 +336,38 @@ class _Object:
                 with suppress_tb_frame():  # skip this frame by default
                     await resolver.load(self, root_load_context)
         return self
+
+
+def live_method(method):
+    @wraps(method)
+    async def wrapped(self, *args, **kwargs):
+        await self.hydrate()
+        return await method(self, *args, **kwargs)
+
+    return wrapped
+
+
+def live_method_gen(method):
+    @wraps(method)
+    async def wrapped(self, *args, **kwargs):
+        await self.hydrate()
+        async with aclosing(method(self, *args, **kwargs)) as stream:
+            async for item in stream:
+                yield item
+
+    return wrapped
+
+
+def live_method_contextmanager(method):
+    # make sure a wrapped function returning an async context manager
+    # will not require both an `await func.aio()` and `async with`
+    # which would have been the case if it was wrapped in live_method
+
+    @wraps(method)
+    @contextlib.asynccontextmanager
+    async def wrapped(self, *args, **kwargs):
+        await self.hydrate()
+        async with method(self, *args, **kwargs) as ctx:
+            yield ctx
+
+    return wrapped

{modal-1.3.2 → modal-1.3.2.dev0}/modal/_output.py

@@ -545,7 +545,7 @@ async def get_app_logs_loop(
     output_mgr: OutputManager,
     app_id: str | None = None,
     task_id: str | None = None,
-    sandbox_id: str | None = None,
+    app_logs_url: str | None = None,
 ):
     last_log_batch_entry_id = ""
 
@@ -600,7 +600,6 @@ async def get_app_logs_loop(
         request = api_pb2.AppGetLogsRequest(
             app_id=app_id or "",
             task_id=task_id or "",
-            sandbox_id=sandbox_id or "",
             timeout=55,
             last_entry_id=last_log_batch_entry_id,
         )

{modal-1.3.2 → modal-1.3.2.dev0}/modal/cli/app.py

@@ -10,9 +10,7 @@ from rich.text import Text
 from typer import Argument
 
 from modal._object import _get_environment_name
-from modal._output import make_console
 from modal._utils.async_utils import synchronizer
-from modal._utils.browser_utils import open_url_and_display
 from modal.client import _Client
 from modal.environments import ensure_env
 from modal_proto import api_pb2
@@ -250,35 +248,3 @@ async def history(
 
     if deployments_with_dirty_commit and not json:
         rich.print("* - repo had uncommitted changes")
-
-
-@app_cli.command("dashboard", no_args_is_help=True)
-@synchronizer.create_blocking
-async def dashboard(
-    app_identifier: str = APP_IDENTIFIER,
-    *,
-    env: Optional[str] = ENV_OPTION,
-):
-    """Open an App's dashboard page in your web browser.
-
-    **Examples:**
-
-    Open dashboard for an app by name:
-
-    ```
-    modal app dashboard my-app
-    ```
-
-    Use a specified environment:
-
-    ```
-    modal app dashboard my-app --env dev
-    ```
-    """
-    client = await _Client.from_env()
-    app_id = await get_app_id.aio(app_identifier, env, client)
-
-    console = make_console()
-    url = f"https://modal.com/id/{app_id}"
-
-    open_url_and_display(url, "App dashboard", console)

{modal-1.3.2 → modal-1.3.2.dev0}/modal/cli/container.py

@@ -13,7 +13,6 @@ from modal.client import _Client
 from modal.config import config
 from modal.container_process import _ContainerProcess
 from modal.environments import ensure_env
-from modal.exception import InvalidError
 from modal.stream_type import StreamType
 from modal_proto import api_pb2
 
@@ -53,14 +52,7 @@ def logs(
     timestamps: bool = typer.Option(False, "--timestamps", help="Show timestamps for each log line"),
 ):
     """Show logs for a specific container, streaming while active."""
-    task_id, sandbox_id = None, None
-    if container_id.startswith("sb-"):
-        sandbox_id = container_id
-    elif container_id.startswith("ta-"):
-        task_id = container_id
-    else:
-        raise InvalidError(f"Invalid container ID: {container_id}")
-    stream_app_logs(task_id=task_id, sandbox_id=sandbox_id, show_timestamps=timestamps)
+    stream_app_logs(task_id=container_id, show_timestamps=timestamps)
 
 
 @container_cli.command("exec")

{modal-1.3.2 → modal-1.3.2.dev0}/modal/cli/entry_point.py

@@ -13,7 +13,6 @@ from .app import app_cli
 from .cluster import cluster_cli
 from .config import config_cli
 from .container import container_cli
-from .dashboard import dashboard
 from .dict import dict_cli
 from .environment import environment_cli
 from .launch import launch_cli
@@ -119,7 +118,6 @@ async def setup(profile: Optional[str] = None):
 entrypoint_cli_typer.command("deploy", no_args_is_help=True)(run.deploy)
 entrypoint_cli_typer.command("serve", no_args_is_help=True)(run.serve)
 entrypoint_cli_typer.command("shell")(shell_module.shell)
-entrypoint_cli_typer.command("dashboard")(dashboard)
 entrypoint_cli_typer.add_typer(launch_cli)
 
 # Deployments

{modal-1.3.2 → modal-1.3.2.dev0}/modal/cli/utils.py

@@ -21,16 +21,14 @@ from ..exception import NotFoundError
 async def stream_app_logs(
     app_id: Optional[str] = None,
     task_id: Optional[str] = None,
-    sandbox_id: Optional[str] = None,
     app_logs_url: Optional[str] = None,
     show_timestamps: bool = False,
 ):
     client = await _Client.from_env()
-    display_id = app_id or task_id or sandbox_id
-    output_mgr = OutputManager(status_spinner_text=f"Tailing logs for {display_id}", show_timestamps=show_timestamps)
+    output_mgr = OutputManager(status_spinner_text=f"Tailing logs for {app_id}", show_timestamps=show_timestamps)
     try:
         with output_mgr.show_status_spinner():
-            await get_app_logs_loop(client, output_mgr, app_id=app_id, task_id=task_id, sandbox_id=sandbox_id)
+            await get_app_logs_loop(client, output_mgr, app_id=app_id, task_id=task_id, app_logs_url=app_logs_url)
     except asyncio.CancelledError:
         pass
     except KeyboardInterrupt:

{modal-1.3.2 → modal-1.3.2.dev0}/modal/cli/volume.py

@@ -12,7 +12,6 @@ from typer import Argument, Option, Typer
 import modal
 from modal._output import OutputManager, ProgressHandler, make_console
 from modal._utils.async_utils import synchronizer
-from modal._utils.browser_utils import open_url_and_display
 from modal._utils.time_utils import timestamp_to_localized_str
 from modal.cli._download import _volume_download
 from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table
@@ -311,30 +310,3 @@ async def rename(
         )
 
     await _Volume.rename(old_name, new_name, environment_name=env)
-
-
-@volume_cli.command(
-    name="dashboard",
-    help="Open the Volume's dashboard page in your web browser.",
-    rich_help_panel="Management",
-)
-@synchronizer.create_blocking
-async def dashboard(
-    volume_name: str = Argument(help="Name of the Volume to view in the dashboard."),
-    env: Optional[str] = ENV_OPTION,
-):
-    """Open a Volume's dashboard page in your web browser.
-
-    **Example:**
-
-    ```
-    modal volume dashboard my-volume
-    ```
-    """
-    env = ensure_env(env)
-    volume = await _Volume.from_name(volume_name, environment_name=env).hydrate()
-
-    console = make_console()
-    url = f"https://modal.com/id/{volume.object_id}"
-
-    open_url_and_display(url, "Volume dashboard", console)

{modal-1.3.2 → modal-1.3.2.dev0}/modal/client.pyi

@@ -31,7 +31,11 @@ class _Client:
     client_type: int
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "1.3.2"
+        self,
+        server_url: str,
+        client_type: int,
+        credentials: typing.Optional[tuple[str, str]],
+        version: str = "1.3.2.dev0",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -163,7 +167,11 @@ class Client:
     client_type: int
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "1.3.2"
+        self,
+        server_url: str,
+        client_type: int,
+        credentials: typing.Optional[tuple[str, str]],
+        version: str = "1.3.2.dev0",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.3.2 → modal-1.3.2.dev0}/modal/functions.pyi

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

{modal-1.3.2 → modal-1.3.2.dev0}/modal/object.pyi

@@ -231,17 +231,6 @@ class Object:
         """mdmd:hidden"""
         ...
 
-    class __get_dashboard_url_spec(typing_extensions.Protocol):
-        def __call__(self, /) -> str:
-            """mdmd:hidden"""
-            ...
-
-        async def aio(self, /) -> str:
-            """mdmd:hidden"""
-            ...
-
-    get_dashboard_url: __get_dashboard_url_spec
-
     @property
     def client(self) -> modal.client.Client:
         """mdmd:hidden"""

{modal-1.3.2 → modal-1.3.2.dev0}/modal/runner.py

@@ -340,7 +340,11 @@ async def _run_app(
 
             # Start logs loop
 
-            logs_loop = tc.create_task(get_app_logs_loop(load_context.client, output_mgr, app_id=running_app.app_id))
+            logs_loop = tc.create_task(
+                get_app_logs_loop(
+                    load_context.client, output_mgr, app_id=running_app.app_id, app_logs_url=running_app.app_logs_url
+                )
+            )
 
         try:
             # Create all members

{modal-1.3.2 → modal-1.3.2.dev0}/modal/token_flow.py

@@ -1,6 +1,7 @@
 # Copyright Modal Labs 2023
 import itertools
 import os
+import webbrowser
 from collections.abc import AsyncGenerator
 from typing import Optional
 
@@ -11,7 +12,6 @@ from modal_proto import api_pb2
 
 from ._output import make_console
 from ._utils.async_utils import synchronize_api
-from ._utils.browser_utils import open_url
 from ._utils.http_utils import run_temporary_http_server
 from .client import _Client
 from .config import DEFAULT_SERVER_URL, _lookup_workspace, _store_user_config, config, config_profiles, user_config_path
@@ -85,7 +85,7 @@ async def _new_token(
         async with token_flow.start(source, next_url) as (_, web_url, code):
             with console.status("Waiting for authentication in the web browser", spinner="dots"):
                 # Open the web url in the browser
-                if open_url(web_url):
+                if _open_url(web_url):
                     console.print(
                         "The web browser should have opened for you to authenticate and get an API token.\n"
                         "If it didn't, please copy this URL into your web browser manually:\n"
@@ -176,3 +176,18 @@ async def _set_token(
             f"Warning: The {env_vars_str} environment variable{s} {verb} set; this will override your new credentials.",
             style="yellow",
         )
+
+
+def _open_url(url: str) -> bool:
+    """Opens url in web browser, making sure we use a modern one (not Lynx etc)"""
+    if "PYTEST_CURRENT_TEST" in os.environ:
+        return False
+    try:
+        browser = webbrowser.get()
+        # zpresto defines `BROWSER=open` by default on macOS, which causes `webbrowser` to return `GenericBrowser`.
+        if isinstance(browser, webbrowser.GenericBrowser) and browser.name != "open":
+            return False
+        else:
+            return browser.open_new_tab(url)
+    except webbrowser.Error:
+        return False

{modal-1.3.2 → modal-1.3.2.dev0}/modal/token_flow.pyi

@@ -71,3 +71,6 @@ async def _set_token(
     verify: bool = True,
     server_url: typing.Optional[str] = None,
 ): ...
+def _open_url(url: str) -> bool:
+    """Opens url in web browser, making sure we use a modern one (not Lynx etc)"""
+    ...

{modal-1.3.2 → modal-1.3.2.dev0}/modal.egg-info/PKG-INFO

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

{modal-1.3.2 → modal-1.3.2.dev0}/modal.egg-info/SOURCES.txt

@@ -111,7 +111,6 @@ modal/_utils/app_utils.py
 modal/_utils/async_utils.py
 modal/_utils/auth_token_manager.py
 modal/_utils/blob_utils.py
-modal/_utils/browser_utils.py
 modal/_utils/bytes_io_segment_payload.py
 modal/_utils/deprecation.py
 modal/_utils/docker_utils.py
@@ -150,7 +149,6 @@ modal/cli/app.py
 modal/cli/cluster.py
 modal/cli/config.py
 modal/cli/container.py
-modal/cli/dashboard.py
 modal/cli/dict.py
 modal/cli/entry_point.py
 modal/cli/environment.py

{modal-1.3.2 → modal-1.3.2.dev0}/modal_proto/api.proto

@@ -3690,15 +3690,6 @@ message WorkspaceBillingReportRequest {
   repeated string tag_names = 4;
 }
 
-message WorkspaceDashboardUrlRequest {
-  string environment_name = 1;
-}
-
-message WorkspaceDashboardUrlResponse {
-  string url = 1;
-}
-
-
 message WorkspaceNameLookupResponse {
   string workspace_name = 1 [deprecated=true];
   string username = 2;
@@ -3933,6 +3924,5 @@ service ModalClient {
 
   // Workspaces
   rpc WorkspaceBillingReport(WorkspaceBillingReportRequest) returns (stream WorkspaceBillingReportItem);
-  rpc WorkspaceDashboardUrlGet(WorkspaceDashboardUrlRequest) returns (WorkspaceDashboardUrlResponse);
   rpc WorkspaceNameLookup(google.protobuf.Empty) returns (WorkspaceNameLookupResponse);
 }

{modal-1.3.2 → modal-1.3.2.dev0}/modal_proto/api_grpc.py

@@ -715,10 +715,6 @@ class ModalClientBase(abc.ABC):
     async def WorkspaceBillingReport(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.WorkspaceBillingReportRequest, modal_proto.api_pb2.WorkspaceBillingReportItem]') -> None:
         pass
 
-    @abc.abstractmethod
-    async def WorkspaceDashboardUrlGet(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.WorkspaceDashboardUrlRequest, modal_proto.api_pb2.WorkspaceDashboardUrlResponse]') -> None:
-        pass
-
     @abc.abstractmethod
     async def WorkspaceNameLookup(self, stream: 'grpclib.server.Stream[google.protobuf.empty_pb2.Empty, modal_proto.api_pb2.WorkspaceNameLookupResponse]') -> None:
         pass
@@ -1769,12 +1765,6 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.WorkspaceBillingReportRequest,
                 modal_proto.api_pb2.WorkspaceBillingReportItem,
             ),
-            '/modal.client.ModalClient/WorkspaceDashboardUrlGet': grpclib.const.Handler(
-                self.WorkspaceDashboardUrlGet,
-                grpclib.const.Cardinality.UNARY_UNARY,
-                modal_proto.api_pb2.WorkspaceDashboardUrlRequest,
-                modal_proto.api_pb2.WorkspaceDashboardUrlResponse,
-            ),
             '/modal.client.ModalClient/WorkspaceNameLookup': grpclib.const.Handler(
                 self.WorkspaceNameLookup,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2831,12 +2821,6 @@ class ModalClientStub:
             modal_proto.api_pb2.WorkspaceBillingReportRequest,
             modal_proto.api_pb2.WorkspaceBillingReportItem,
         )
-        self.WorkspaceDashboardUrlGet = grpclib.client.UnaryUnaryMethod(
-            channel,
-            '/modal.client.ModalClient/WorkspaceDashboardUrlGet',
-            modal_proto.api_pb2.WorkspaceDashboardUrlRequest,
-            modal_proto.api_pb2.WorkspaceDashboardUrlResponse,
-        )
         self.WorkspaceNameLookup = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/WorkspaceNameLookup',