modal 1.0.6.dev61__py3-none-any.whl → 1.1.1__py3-none-any.whl

modal/cli/cluster.py

@@ -2,13 +2,13 @@
 from typing import Optional, Union
 
 import typer
-from rich.console import Console
 from rich.text import Text
 
 from modal._object import _get_environment_name
+from modal._output import make_console
 from modal._pty import get_pty_info
 from modal._utils.async_utils import synchronizer
-from modal._utils.time_utils import timestamp_to_local
+from modal._utils.time_utils import timestamp_to_localized_str
 from modal.cli.utils import ENV_OPTION, display_table, is_tty
 from modal.client import _Client
 from modal.config import config
@@ -42,7 +42,7 @@ async def list_(env: Optional[str] = ENV_OPTION, json: bool = False):
             [
                 c.cluster_id,
                 c.app_id,
-                timestamp_to_local(c.started_at, json) if c.started_at else "Pending",
+                timestamp_to_localized_str(c.started_at, json) if c.started_at else "Pending",
                 str(len(c.task_ids)),
             ]
         )
@@ -62,7 +62,7 @@ async def shell(
     if len(res.cluster.task_ids) <= rank:
         raise typer.Abort(f"No node with rank {rank} in cluster {cluster_id}")
     task_id = res.cluster.task_ids[rank]
-    console = Console()
+    console = make_console()
     is_main = "(main)" if rank == 0 else ""
     console.print(
         f"Opening shell to node {rank} {is_main} of cluster {cluster_id} (container {task_id})", style="green"

modal/cli/config.py

@@ -1,7 +1,7 @@
 # Copyright Modal Labs 2022
 import typer
-from rich.console import Console
 
+from modal._output import make_console
 from modal.config import _profile, _store_user_config, config
 from modal.environments import Environment
 
@@ -24,7 +24,7 @@ def show(redact: bool = typer.Option(True, help="Redact the `token_secret` value
     if redact and config_dict.get("token_secret"):
         config_dict["token_secret"] = "***"
 
-    console = Console()
+    console = make_console()
     console.print(config_dict)
 
 

modal/cli/container.py

@@ -8,7 +8,7 @@ from modal._object import _get_environment_name
 from modal._pty import get_pty_info
 from modal._utils.async_utils import synchronizer
 from modal._utils.grpc_utils import retry_transient_errors
-from modal._utils.time_utils import timestamp_to_local
+from modal._utils.time_utils import timestamp_to_localized_str
 from modal.cli.utils import ENV_OPTION, display_table, is_tty, stream_app_logs
 from modal.client import _Client
 from modal.config import config
@@ -40,7 +40,7 @@ async def list_(env: Optional[str] = ENV_OPTION, json: bool = False):
                 task_stats.task_id,
                 task_stats.app_id,
                 task_stats.app_description,
-                timestamp_to_local(task_stats.started_at, json) if task_stats.started_at else "Pending",
+                timestamp_to_localized_str(task_stats.started_at, json) if task_stats.started_at else "Pending",
             ]
         )
 

modal/cli/dict.py

@@ -2,13 +2,13 @@
 from typing import Optional
 
 import typer
-from rich.console import Console
 from typer import Argument, Option, Typer
 
+from modal._output import make_console
 from modal._resolver import Resolver
 from modal._utils.async_utils import synchronizer
 from modal._utils.grpc_utils import retry_transient_errors
-from modal._utils.time_utils import timestamp_to_local
+from modal._utils.time_utils import timestamp_to_localized_str
 from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table
 from modal.client import _Client
 from modal.dict import _Dict
@@ -44,7 +44,7 @@ async def list_(*, json: bool = False, env: Optional[str] = ENV_OPTION):
     request = api_pb2.DictListRequest(environment_name=env)
     response = await retry_transient_errors(client.stub.DictList, request)
 
-    rows = [(d.name, timestamp_to_local(d.created_at, json)) for d in response.dicts]
+    rows = [(d.name, timestamp_to_localized_str(d.created_at, json)) for d in response.dicts]
     display_table(["Name", "Created at"], rows, json)
 
 
@@ -85,7 +85,7 @@ async def get(name: str, key: str, *, env: Optional[str] = ENV_OPTION):
     Note: When using the CLI, keys are always interpreted as having a string type.
     """
     d = _Dict.from_name(name, environment_name=env)
-    console = Console()
+    console = make_console()
     val = await d.get(key)
     console.print(val)
 

modal/cli/entry_point.py

@@ -3,9 +3,9 @@ import subprocess
 from typing import Optional
 
 import typer
-from rich.console import Console
 from rich.rule import Rule
 
+from modal._output import make_console
 from modal._utils.async_utils import synchronizer
 
 from . import run
@@ -71,7 +71,7 @@ def check_path():
             "You may need to give it permissions or use `[white]python -m modal[/white]` as a workaround.[/red]\n"
         )
     text += f"See more information here:\n\n[link={url}]{url}[/link]\n"
-    console = Console()
+    console = make_console()
     console.print(text)
     console.print(Rule(style="white"))
 

modal/cli/import_refs.py

@@ -19,9 +19,9 @@ from pathlib import Path
 from typing import Optional, Union, cast
 
 import click
-from rich.console import Console
 from rich.markdown import Markdown
 
+from modal._output import make_console
 from modal._utils.deprecation import deprecation_warning
 from modal.app import App, LocalEntrypoint
 from modal.cls import Cls
@@ -258,7 +258,7 @@ def import_app_from_ref(import_ref: ImportRef, base_cmd: str = "") -> App:
     app = getattr(module, object_path)
 
     if app is None:
-        error_console = Console(stderr=True)
+        error_console = make_console(stderr=True)
         error_console.print(f"[bold red]Could not find Modal app '{object_path}' in {import_path}.[/bold red]")
 
         if not object_path:
@@ -282,7 +282,7 @@ def import_app_from_ref(import_ref: ImportRef, base_cmd: str = "") -> App:
 def _show_function_ref_help(app_ref: ImportRef, base_cmd: str) -> None:
     object_path = app_ref.object_path
     import_path = app_ref.file_or_module
-    error_console = Console(stderr=True)
+    error_console = make_console(stderr=True)
     if object_path:
         error_console.print(
             f"[bold red]Could not find Modal function or local entrypoint"

modal/cli/network_file_system.py

@@ -7,17 +7,16 @@ from typing import Optional
 import typer
 from click import UsageError
 from grpclib import GRPCError, Status
-from rich.console import Console
 from rich.syntax import Syntax
 from rich.table import Table
 from typer import Argument, Typer
 
 import modal
 from modal._location import display_location
-from modal._output import OutputManager, ProgressHandler
+from modal._output import OutputManager, ProgressHandler, make_console
 from modal._utils.async_utils import synchronizer
 from modal._utils.grpc_utils import retry_transient_errors
-from modal._utils.time_utils import timestamp_to_local
+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
 from modal.client import _Client
@@ -45,7 +44,7 @@ async def list_(env: Optional[str] = ENV_OPTION, json: Optional[bool] = False):
             [
                 item.label,
                 display_location(item.cloud_provider),
-                timestamp_to_local(item.created_at, json),
+                timestamp_to_localized_str(item.created_at, json),
             ]
         )
     display_table(column_names, rows, json, title=f"Shared Volumes{env_part}")
@@ -66,7 +65,7 @@ def create(
 ):
     ensure_env(env)
     modal.NetworkFileSystem.create_deployed(name, environment_name=env)
-    console = Console()
+    console = make_console()
     console.print(f"Created volume '{name}'. \n\nCode example:\n")
     usage = Syntax(gen_usage_code(name), "python")
     console.print(usage)
@@ -93,7 +92,7 @@ async def ls(
         raise
 
     if sys.stdout.isatty():
-        console = Console()
+        console = make_console()
         console.print(f"Directory listing of '{path}' in '{volume_name}'")
         table = Table()
 
@@ -131,7 +130,7 @@ async def put(
     volume = _NetworkFileSystem.from_name(volume_name)
     if remote_path.endswith("/"):
         remote_path = remote_path + os.path.basename(local_path)
-    console = Console()
+    console = make_console()
 
     if Path(local_path).is_dir():
         progress_handler = ProgressHandler(type="upload", console=console)
@@ -184,7 +183,7 @@ async def get(
     ensure_env(env)
     destination = Path(local_destination)
     volume = _NetworkFileSystem.from_name(volume_name)
-    console = Console()
+    console = make_console()
     progress_handler = ProgressHandler(type="download", console=console)
     with progress_handler.live:
         await _volume_download(volume, remote_path, destination, force, progress_cb=progress_handler.progress)
@@ -203,7 +202,7 @@ async def rm(
 ):
     ensure_env(env)
     volume = _NetworkFileSystem.from_name(volume_name)
-    console = Console()
+    console = make_console()
     try:
         await volume.remove_file(remote_path, recursive=recursive)
         console.print(OutputManager.step_completed(f"{remote_path} was deleted successfully!"))

modal/cli/profile.py

@@ -5,10 +5,10 @@ import os
 from typing import Optional
 
 import typer
-from rich.console import Console
 from rich.json import JSON
 from rich.table import Table
 
+from modal._output import make_console
 from modal._utils.async_utils import synchronizer
 from modal.config import Config, _lookup_workspace, _profile, config_profiles, config_set_active_profile
 from modal.exception import AuthError
@@ -69,7 +69,7 @@ async def list_(json: Optional[bool] = False):
         except AuthError:
             env_based_workspace = "Unknown (authentication failure)"
 
-    console = Console()
+    console = make_console()
     highlight = "bold green" if env_based_workspace is None else "yellow"
     if json:
         json_data = []

modal/cli/queues.py

@@ -2,13 +2,13 @@
 from typing import Optional
 
 import typer
-from rich.console import Console
 from typer import Argument, Option, Typer
 
+from modal._output import make_console
 from modal._resolver import Resolver
 from modal._utils.async_utils import synchronizer
 from modal._utils.grpc_utils import retry_transient_errors
-from modal._utils.time_utils import timestamp_to_local
+from modal._utils.time_utils import timestamp_to_localized_str
 from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table
 from modal.client import _Client
 from modal.environments import ensure_env
@@ -71,7 +71,7 @@ async def list_(*, json: bool = False, env: Optional[str] = ENV_OPTION):
     rows = [
         (
             q.name,
-            timestamp_to_local(q.created_at, json),
+            timestamp_to_localized_str(q.created_at, json),
             str(q.num_partitions),
             str(q.total_size) if q.total_size <= max_total_size else f">{max_total_size}",
         )
@@ -108,7 +108,7 @@ async def peek(
 ):
     """Print the next N items in the queue or queue partition (without removal)."""
     q = _Queue.from_name(name, environment_name=env)
-    console = Console()
+    console = make_console()
     i = 0
     async for item in q.iterate(partition=partition):
         console.print(item)
@@ -128,5 +128,5 @@ async def len(
 ):
     """Print the length of a queue partition or the total length of all partitions."""
     q = _Queue.from_name(name, environment_name=env)
-    console = Console()
+    console = make_console()
     console.print(await q.len(partition=partition, total=total))

modal/cli/secret.py

@@ -9,13 +9,13 @@ from typing import Optional
 
 import click
 import typer
-from rich.console import Console
 from rich.syntax import Syntax
 from typer import Argument
 
+from modal._output import make_console
 from modal._utils.async_utils import synchronizer
 from modal._utils.grpc_utils import retry_transient_errors
-from modal._utils.time_utils import timestamp_to_local
+from modal._utils.time_utils import timestamp_to_localized_str
 from modal.cli.utils import ENV_OPTION, YES_OPTION, display_table
 from modal.client import _Client
 from modal.environments import ensure_env
@@ -38,8 +38,8 @@ async def list_(env: Optional[str] = ENV_OPTION, json: bool = False):
         rows.append(
             [
                 item.label,
-                timestamp_to_local(item.created_at, json),
-                timestamp_to_local(item.last_used_at, json) if item.last_used_at else "-",
+                timestamp_to_localized_str(item.created_at, json),
+                timestamp_to_localized_str(item.last_used_at, json) if item.last_used_at else "-",
             ]
         )
 
@@ -117,7 +117,7 @@ modal secret create my-credentials username=john password="$PASSWORD"
     await _Secret.create_deployed(secret_name, env_dict, overwrite=force)
 
     # Print code sample
-    console = Console()
+    console = make_console()
     env_var_code = "\n    ".join(f'os.getenv("{name}")' for name in env_dict.keys()) if env_dict else "..."
     example_code = f"""
 @app.function(secrets=[modal.Secret.from_name("{secret_name}")])

modal/cli/utils.py

@@ -7,13 +7,12 @@ from typing import Optional, Union
 import typer
 from click import UsageError
 from grpclib import GRPCError, Status
-from rich.console import Console
 from rich.table import Column, Table
 from rich.text import Text
 
 from modal_proto import api_pb2
 
-from .._output import OutputManager, get_app_logs_loop
+from .._output import OutputManager, get_app_logs_loop, make_console
 from .._utils.async_utils import synchronizer
 from ..client import _Client
 from ..environments import ensure_env
@@ -66,7 +65,7 @@ def _plain(text: Union[Text, str]) -> str:
 
 
 def is_tty() -> bool:
-    return Console().is_terminal
+    return make_console().is_terminal
 
 
 def display_table(
@@ -78,7 +77,7 @@ def display_table(
     def col_to_str(col: Union[Column, str]) -> str:
         return str(col.header) if isinstance(col, Column) else col
 
-    console = Console()
+    console = make_console()
     if json:
         json_data = [{col_to_str(col): _plain(row[i]) for i, col in enumerate(columns)} for row in rows]
         console.print_json(dumps(json_data))

modal/cli/volume.py

@@ -7,15 +7,14 @@ from typing import Optional
 import typer
 from click import UsageError
 from grpclib import GRPCError, Status
-from rich.console import Console
 from rich.syntax import Syntax
 from typer import Argument, Option, Typer
 
 import modal
-from modal._output import OutputManager, ProgressHandler
+from modal._output import OutputManager, ProgressHandler, make_console
 from modal._utils.async_utils import synchronizer
 from modal._utils.grpc_utils import retry_transient_errors
-from modal._utils.time_utils import timestamp_to_local
+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
 from modal.client import _Client
@@ -64,7 +63,7 @@ def some_func():
     os.listdir("/my_vol")
 """
 
-    console = Console()
+    console = make_console()
     console.print(f"Created Volume '{name}' in environment '{env_name}'. \n\nCode example:\n")
     usage = Syntax(usage_code, "python")
     console.print(usage)
@@ -96,7 +95,7 @@ async def get(
     ensure_env(env)
     destination = Path(local_destination)
     volume = _Volume.from_name(volume_name, environment_name=env)
-    console = Console()
+    console = make_console()
     progress_handler = ProgressHandler(type="download", console=console)
     with progress_handler.live:
         await _volume_download(volume, remote_path, destination, force, progress_cb=progress_handler.progress)
@@ -117,7 +116,7 @@ async def list_(env: Optional[str] = ENV_OPTION, json: Optional[bool] = False):
     column_names = ["Name", "Created at"]
     rows = []
     for item in response.items:
-        rows.append([item.label, timestamp_to_local(item.created_at, json)])
+        rows.append([item.label, timestamp_to_localized_str(item.created_at, json)])
     display_table(column_names, rows, json, title=f"Volumes{env_part}")
 
 
@@ -164,7 +163,7 @@ async def ls(
                 (
                     entry.path.encode("unicode_escape").decode("utf-8"),
                     filetype,
-                    timestamp_to_local(entry.mtime, False),
+                    timestamp_to_localized_str(entry.mtime, False),
                     humanize_filesize(entry.size),
                 )
             )
@@ -197,7 +196,7 @@ async def put(
 
     if remote_path.endswith("/"):
         remote_path = remote_path + os.path.basename(local_path)
-    console = Console()
+    console = make_console()
     progress_handler = ProgressHandler(type="upload", console=console)
 
     if Path(local_path).is_dir():
@@ -245,7 +244,7 @@ async def rm(
 ):
     ensure_env(env)
     volume = _Volume.from_name(volume_name, environment_name=env)
-    console = Console()
+    console = make_console()
     try:
         await volume.remove_file(remote_path, recursive=recursive)
         console.print(OutputManager.step_completed(f"{remote_path} was deleted successfully!"))

modal/client.py

@@ -268,6 +268,14 @@ class _Client:
         # Just used from tests.
         cls._client_from_env = client
 
+    async def get_input_plane_metadata(self, input_plane_region: str) -> list[tuple[str, str]]:
+        assert self._auth_token_manager, "Client must have an instance of auth token manager."
+        token = await self._auth_token_manager.get_token()
+        return [
+            ("x-modal-input-plane-region", input_plane_region),
+            ("x-modal-auth-token", token),
+        ]
+
     async def _call_safely(self, coro, readable_method: str):
         """Runs coroutine wrapped in a task that's part of the client's task context
 
@@ -456,4 +464,3 @@ class UnaryStreamWrapper(Generic[RequestType, ResponseType]):
         self.wrapped_method.channel = await self.client._get_channel(self.server_url)
         async for response in self.client._call_stream(self.wrapped_method, request, metadata=metadata):
             yield response
-

modal/client.pyi

@@ -29,11 +29,7 @@ class _Client:
     _snapshotted: bool
 
     def __init__(
-        self,
-        server_url: str,
-        client_type: int,
-        credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.6.dev61",
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "1.1.1"
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -112,6 +108,7 @@ class _Client:
         """mdmd:hidden"""
         ...
 
+    async def get_input_plane_metadata(self, input_plane_region: str) -> list[tuple[str, str]]: ...
     async def _call_safely(self, coro, readable_method: str):
         """Runs coroutine wrapped in a task that's part of the client's task context
 
@@ -159,11 +156,7 @@ class Client:
     _snapshotted: bool
 
     def __init__(
-        self,
-        server_url: str,
-        client_type: int,
-        credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.6.dev61",
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "1.1.1"
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -275,6 +268,12 @@ class Client:
         """mdmd:hidden"""
         ...
 
+    class __get_input_plane_metadata_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(self, /, input_plane_region: str) -> list[tuple[str, str]]: ...
+        async def aio(self, /, input_plane_region: str) -> list[tuple[str, str]]: ...
+
+    get_input_plane_metadata: __get_input_plane_metadata_spec[typing_extensions.Self]
+
     class ___call_safely_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, coro, readable_method: str):
             """Runs coroutine wrapped in a task that's part of the client's task context

modal/container_process.py

@@ -144,9 +144,9 @@ class _ContainerProcess(Generic[T]):
             print("interactive exec is not currently supported on Windows.")
             return
 
-        from rich.console import Console
+        from ._output import make_console
 
-        console = Console()
+        console = make_console()
 
         connecting_status = console.status("Connecting...")
         connecting_status.start()

modal/dict.py

@@ -1,7 +1,10 @@
 # Copyright Modal Labs 2022
 from collections.abc import AsyncIterator, Mapping
+from dataclasses import dataclass
+from datetime import datetime
 from typing import Any, Optional
 
+from google.protobuf.message import Message
 from grpclib import GRPCError
 from synchronicity.async_wrap import asynccontextmanager
 
@@ -14,6 +17,7 @@ from ._utils.async_utils import TaskContext, synchronize_api
 from ._utils.deprecation import deprecation_warning, warn_if_passing_namespace
 from ._utils.grpc_utils import retry_transient_errors
 from ._utils.name_utils import check_object_name
+from ._utils.time_utils import timestamp_to_localized_dt
 from .client import _Client
 from .config import logger
 from .exception import RequestSizeError
@@ -23,6 +27,18 @@ def _serialize_dict(data):
     return [api_pb2.DictEntry(key=serialize(k), value=serialize(v)) for k, v in data.items()]
 
 
+@dataclass
+class DictInfo:
+    """Information about the Dict object."""
+
+    # This dataclass should be limited to information that is unchanging over the lifetime of the Dict,
+    # since it is transmitted from the server when the object is hydrated and could be stale when accessed.
+
+    name: Optional[str]
+    created_at: datetime
+    created_by: Optional[str]
+
+
 class _Dict(_Object, type_prefix="di"):
     """Distributed dictionary for storage in Modal apps.
 
@@ -65,12 +81,29 @@ class _Dict(_Object, type_prefix="di"):
     For more examples, see the [guide](https://modal.com/docs/guide/dicts-and-queues#modal-dicts).
     """
 
+    _name: Optional[str] = None
+    _metadata: Optional[api_pb2.DictMetadata] = None
+
     def __init__(self, data={}):
         """mdmd:hidden"""
         raise RuntimeError(
             "`Dict(...)` constructor is not allowed. Please use `Dict.from_name` or `Dict.ephemeral` instead"
         )
 
+    @property
+    def name(self) -> Optional[str]:
+        return self._name
+
+    def _hydrate_metadata(self, metadata: Optional[Message]):
+        if metadata:
+            assert isinstance(metadata, api_pb2.DictMetadata)
+            self._metadata = metadata
+            self._name = metadata.name
+
+    def _get_metadata(self) -> api_pb2.DictMetadata:
+        assert self._metadata
+        return self._metadata
+
     @classmethod
     @asynccontextmanager
     async def ephemeral(
@@ -112,7 +145,7 @@ class _Dict(_Object, type_prefix="di"):
         async with TaskContext() as tc:
             request = api_pb2.DictHeartbeatRequest(dict_id=response.dict_id)
             tc.infinite_loop(lambda: client.stub.DictHeartbeat(request), sleep=_heartbeat_sleep)
-            yield cls._new_hydrated(response.dict_id, client, None, is_another_app=True)
+            yield cls._new_hydrated(response.dict_id, client, response.metadata, is_another_app=True)
 
     @staticmethod
     def from_name(
@@ -153,9 +186,9 @@ class _Dict(_Object, type_prefix="di"):
             )
             response = await resolver.client.stub.DictGetOrCreate(req)
             logger.debug(f"Created dict with id {response.dict_id}")
-            self._hydrate(response.dict_id, resolver.client, None)
+            self._hydrate(response.dict_id, resolver.client, response.metadata)
 
-        return _Dict._from_loader(_load, "Dict()", is_another_app=True, hydrate_lazily=True)
+        return _Dict._from_loader(_load, "Dict()", is_another_app=True, hydrate_lazily=True, name=name)
 
     @staticmethod
     async def lookup(
@@ -209,6 +242,17 @@ class _Dict(_Object, type_prefix="di"):
         req = api_pb2.DictDeleteRequest(dict_id=obj.object_id)
         await retry_transient_errors(obj._client.stub.DictDelete, req)
 
+    @live_method
+    async def info(self) -> DictInfo:
+        """Return information about the Dict object."""
+        metadata = self._get_metadata()
+        creation_info = metadata.creation_info
+        return DictInfo(
+            name=metadata.name or None,
+            created_at=timestamp_to_localized_dt(creation_info.created_at),
+            created_by=creation_info.created_by or None,
+        )
+
     @live_method
     async def clear(self) -> None:
         """Remove all items from the Dict."""