modal 0.67.1__py3-none-any.whl → 0.67.33__py3-none-any.whl

modal/cli/launch.py

@@ -4,7 +4,7 @@ import inspect
 import json
 import os
 from pathlib import Path
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 
 from typer import Typer
 
@@ -25,7 +25,7 @@ launch_cli = Typer(
 )
 
 
-def _launch_program(name: str, filename: str, detach: bool, args: Dict[str, Any]) -> None:
+def _launch_program(name: str, filename: str, detach: bool, args: dict[str, Any]) -> None:
     os.environ["MODAL_LAUNCH_ARGS"] = json.dumps(args)
 
     program_path = str(Path(__file__).parent / "programs" / filename)

modal/cli/network_file_system.py

@@ -29,7 +29,7 @@ nfs_cli = Typer(name="nfs", help="Read and edit `modal.NetworkFileSystem` file s
 
 @nfs_cli.command(name="list", help="List the names of all network file systems.", rich_help_panel="Management")
 @synchronizer.create_blocking
-async def list(env: Optional[str] = ENV_OPTION, json: Optional[bool] = False):
+async def list_(env: Optional[str] = ENV_OPTION, json: Optional[bool] = False):
     env = ensure_env(env)
 
     client = await _Client.from_env()

modal/cli/profile.py

@@ -28,7 +28,7 @@ def current():
 
 @profile_cli.command(name="list", help="Show all Modal profiles and highlight the active one.")
 @synchronizer.create_blocking
-async def list(json: Optional[bool] = False):
+async def list_(json: Optional[bool] = False):
     config = Config()
     profiles = config_profiles()
     lookup_coros = [

modal/cli/programs/run_jupyter.py

@@ -8,12 +8,12 @@ import subprocess
 import threading
 import time
 import webbrowser
-from typing import Any, Dict
+from typing import Any
 
 from modal import App, Image, Mount, Queue, Secret, Volume, forward
 
 # Passed by `modal launch` locally via CLI, plumbed to remote runner through secrets.
-args: Dict[str, Any] = json.loads(os.environ.get("MODAL_LAUNCH_ARGS", "{}"))
+args: dict[str, Any] = json.loads(os.environ.get("MODAL_LAUNCH_ARGS", "{}"))
 
 
 app = App()

modal/cli/programs/vscode.py

@@ -8,12 +8,12 @@ import subprocess
 import threading
 import time
 import webbrowser
-from typing import Any, Dict, Tuple
+from typing import Any
 
 from modal import App, Image, Mount, Queue, Secret, Volume, forward
 
 # Passed by `modal launch` locally via CLI, plumbed to remote runner through secrets.
-args: Dict[str, Any] = json.loads(os.environ.get("MODAL_LAUNCH_ARGS", "{}"))
+args: dict[str, Any] = json.loads(os.environ.get("MODAL_LAUNCH_ARGS", "{}"))
 
 
 app = App()
@@ -41,7 +41,7 @@ volume = (
 volumes = {"/home/coder/volume": volume} if volume else {}
 
 
-def wait_for_port(data: Tuple[str, str], q: Queue):
+def wait_for_port(data: tuple[str, str], q: Queue):
     start_time = time.monotonic()
     while True:
         try:

modal/cli/queues.py

@@ -58,7 +58,7 @@ async def delete(name: str, *, yes: bool = YES_OPTION, env: Optional[str] = ENV_
 
 @queue_cli.command(name="list", rich_help_panel="Management")
 @synchronizer.create_blocking
-async def list(*, json: bool = False, env: Optional[str] = ENV_OPTION):
+async def list_(*, json: bool = False, env: Optional[str] = ENV_OPTION):
     """List all named Queues."""
     env = ensure_env(env)
 

modal/cli/run.py

@@ -9,7 +9,7 @@ import sys
 import time
 import typing
 from functools import partial
-from typing import Any, Callable, Dict, Optional, get_type_hints
+from typing import Any, Callable, Optional, get_type_hints
 
 import click
 import typer
@@ -60,7 +60,7 @@ class NoParserAvailable(InvalidError):
     pass
 
 
-def _get_signature(f: Callable[..., Any], is_method: bool = False) -> Dict[str, ParameterMetadata]:
+def _get_signature(f: Callable[..., Any], is_method: bool = False) -> dict[str, ParameterMetadata]:
     try:
         type_hints = get_type_hints(f)
     except Exception as exc:
@@ -71,7 +71,7 @@ def _get_signature(f: Callable[..., Any], is_method: bool = False) -> Dict[str,
     if is_method:
         self = None  # Dummy, doesn't matter
         f = functools.partial(f, self)
-    signature: Dict[str, ParameterMetadata] = {}
+    signature: dict[str, ParameterMetadata] = {}
     for param in inspect.signature(f).parameters.values():
         signature[param.name] = {
             "name": param.name,
@@ -98,7 +98,7 @@ def _get_param_type_as_str(annot: Any) -> str:
     return annot_str
 
 
-def _add_click_options(func, signature: Dict[str, ParameterMetadata]):
+def _add_click_options(func, signature: dict[str, ParameterMetadata]):
     """Adds @click.option based on function signature
 
     Kind of like typer, but using options instead of positional arguments
@@ -148,7 +148,7 @@ def _get_click_command_for_function(app: App, function_tag):
     if function.is_generator:
         raise InvalidError("`modal run` is not supported for generator functions")
 
-    signature: Dict[str, ParameterMetadata]
+    signature: dict[str, ParameterMetadata]
     cls: Optional[Cls] = None
     if function.info.user_cls is not None:
         cls = typing.cast(Cls, app.registered_classes[class_name])
@@ -364,7 +364,7 @@ def shell(
         default=None, help="Container image tag for inside the shell (if not using REF)."
     ),
     add_python: Optional[str] = typer.Option(default=None, help="Add Python to the image (if not using REF)."),
-    volume: Optional[typing.List[str]] = typer.Option(
+    volume: Optional[list[str]] = typer.Option(
         default=None,
         help=(
             "Name of a `modal.Volume` to mount inside the shell at `/mnt/{name}` (if not using REF)."

modal/cli/secret.py

@@ -3,7 +3,7 @@ import os
 import platform
 import subprocess
 from tempfile import NamedTemporaryFile
-from typing import List, Optional
+from typing import Optional
 
 import click
 import typer
@@ -23,7 +23,7 @@ secret_cli = typer.Typer(name="secret", help="Manage secrets.", no_args_is_help=
 
 @secret_cli.command("list", help="List your published secrets.")
 @synchronizer.create_blocking
-async def list(env: Optional[str] = ENV_OPTION, json: Optional[bool] = False):
+async def list_(env: Optional[str] = ENV_OPTION, json: Optional[bool] = False):
     env = ensure_env(env)
     client = await _Client.from_env()
     response = await retry_transient_errors(client.stub.SecretList, api_pb2.SecretListRequest(environment_name=env))
@@ -47,7 +47,7 @@ async def list(env: Optional[str] = ENV_OPTION, json: Optional[bool] = False):
 @synchronizer.create_blocking
 async def create(
     secret_name,
-    keyvalues: List[str] = typer.Argument(..., help="Space-separated KEY=VALUE items"),
+    keyvalues: list[str] = typer.Argument(..., help="Space-separated KEY=VALUE items"),
     env: Optional[str] = ENV_OPTION,
     force: bool = typer.Option(False, "--force", help="Overwrite the secret if it already exists."),
 ):

modal/cli/utils.py

@@ -1,8 +1,9 @@
 # Copyright Modal Labs 2022
 import asyncio
+from collections.abc import Sequence
 from datetime import datetime
 from json import dumps
-from typing import Optional, Sequence, Union
+from typing import Optional, Union
 
 import typer
 from click import UsageError

modal/cli/volume.py

@@ -2,7 +2,7 @@
 import os
 import sys
 from pathlib import Path
-from typing import List, Optional
+from typing import Optional
 
 import typer
 from click import UsageError
@@ -108,7 +108,7 @@ async def get(
     rich_help_panel="Management",
 )
 @synchronizer.create_blocking
-async def list(env: Optional[str] = ENV_OPTION, json: Optional[bool] = False):
+async def list_(env: Optional[str] = ENV_OPTION, json: Optional[bool] = False):
     env = ensure_env(env)
     client = await _Client.from_env()
     response = await retry_transient_errors(client.stub.VolumeList, api_pb2.VolumeListRequest(environment_name=env))
@@ -257,7 +257,7 @@ async def rm(
 @synchronizer.create_blocking
 async def cp(
     volume_name: str,
-    paths: List[str],  # accepts multiple paths, last path is treated as destination path
+    paths: list[str],  # accepts multiple paths, last path is treated as destination path
     env: Optional[str] = ENV_OPTION,
 ):
     ensure_env(env)

modal/client.py

@@ -3,17 +3,12 @@ import asyncio
 import os
 import platform
 import warnings
+from collections.abc import AsyncGenerator, AsyncIterator, Collection, Mapping
 from typing import (
     Any,
-    AsyncGenerator,
-    AsyncIterator,
     ClassVar,
-    Collection,
-    Dict,
     Generic,
-    Mapping,
     Optional,
-    Tuple,
     TypeVar,
     Union,
 )
@@ -40,7 +35,7 @@ CLIENT_CREATE_ATTEMPT_TIMEOUT: float = 4.0
 CLIENT_CREATE_TOTAL_TIMEOUT: float = 15.0
 
 
-def _get_metadata(client_type: int, credentials: Optional[Tuple[str, str]], version: str) -> Dict[str, str]:
+def _get_metadata(client_type: int, credentials: Optional[tuple[str, str]], version: str) -> dict[str, str]:
     # This implements a simplified version of platform.platform() that's still machine-readable
     uname: platform.uname_result = platform.uname()
     if uname.system == "Darwin":
@@ -69,7 +64,7 @@ def _get_metadata(client_type: int, credentials: Optional[Tuple[str, str]], vers
 
 ReturnType = TypeVar("ReturnType")
 _Value = Union[str, bytes]
-_MetadataLike = Union[Mapping[str, _Value], Collection[Tuple[str, _Value]]]
+_MetadataLike = Union[Mapping[str, _Value], Collection[tuple[str, _Value]]]
 RequestType = TypeVar("RequestType", bound=Message)
 ResponseType = TypeVar("ResponseType", bound=Message)
 
@@ -85,7 +80,7 @@ class _Client:
         self,
         server_url: str,
         client_type: int,
-        credentials: Optional[Tuple[str, str]],
+        credentials: Optional[tuple[str, str]],
         version: str = __version__,
     ):
         """mdmd:hidden
@@ -201,7 +196,7 @@ class _Client:
         else:
             c = config
 
-        credentials: Optional[Tuple[str, str]]
+        credentials: Optional[tuple[str, str]]
 
         if cls._client_from_env_lock is None:
             cls._client_from_env_lock = asyncio.Lock()
@@ -266,7 +261,7 @@ class _Client:
         return client
 
     @classmethod
-    async def verify(cls, server_url: str, credentials: Tuple[str, str]) -> None:
+    async def verify(cls, server_url: str, credentials: tuple[str, str]) -> None:
         """mdmd:hidden
         Check whether can the client can connect to this server with these credentials; raise if not.
         """

modal/client.pyi

@@ -1,5 +1,6 @@
 import asyncio.events
 import asyncio.locks
+import collections.abc
 import google.protobuf.message
 import grpclib.client
 import modal._utils.async_utils
@@ -9,9 +10,7 @@ import synchronicity.combined_types
 import typing
 import typing_extensions
 
-def _get_metadata(
-    client_type: int, credentials: typing.Optional[typing.Tuple[str, str]], version: str
-) -> typing.Dict[str, str]: ...
+def _get_metadata(client_type: int, credentials: typing.Optional[tuple[str, str]], version: str) -> dict[str, str]: ...
 
 ReturnType = typing.TypeVar("ReturnType")
 
@@ -27,11 +26,7 @@ class _Client:
     _stub: typing.Optional[modal_proto.api_grpc.ModalClientStub]
 
     def __init__(
-        self,
-        server_url: str,
-        client_type: int,
-        credentials: typing.Optional[typing.Tuple[str, str]],
-        version: str = "0.67.1",
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.67.33"
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -48,7 +43,7 @@ class _Client:
     @classmethod
     async def from_credentials(cls, token_id: str, token_secret: str) -> _Client: ...
     @classmethod
-    async def verify(cls, server_url: str, credentials: typing.Tuple[str, str]) -> None: ...
+    async def verify(cls, server_url: str, credentials: tuple[str, str]) -> None: ...
     @classmethod
     def set_env_client(cls, client: typing.Optional[_Client]): ...
     async def _call_safely(self, coro, readable_method: str): ...
@@ -61,8 +56,8 @@ class _Client:
         *,
         timeout: typing.Optional[float] = None,
         metadata: typing.Union[
-            typing.Mapping[str, typing.Union[str, bytes]],
-            typing.Collection[typing.Tuple[str, typing.Union[str, bytes]]],
+            collections.abc.Mapping[str, typing.Union[str, bytes]],
+            collections.abc.Collection[tuple[str, typing.Union[str, bytes]]],
             None,
         ] = None,
     ) -> typing.Any: ...
@@ -72,11 +67,11 @@ class _Client:
         request: typing.Any,
         *,
         metadata: typing.Union[
-            typing.Mapping[str, typing.Union[str, bytes]],
-            typing.Collection[typing.Tuple[str, typing.Union[str, bytes]]],
+            collections.abc.Mapping[str, typing.Union[str, bytes]],
+            collections.abc.Collection[tuple[str, typing.Union[str, bytes]]],
             None,
         ],
-    ) -> typing.AsyncGenerator[typing.Any, None]: ...
+    ) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
 
 class Client:
     _client_from_env: typing.ClassVar[typing.Optional[Client]]
@@ -86,11 +81,7 @@ class Client:
     _stub: typing.Optional[modal_proto.api_grpc.ModalClientStub]
 
     def __init__(
-        self,
-        server_url: str,
-        client_type: int,
-        credentials: typing.Optional[typing.Tuple[str, str]],
-        version: str = "0.67.1",
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.67.33"
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -125,7 +116,7 @@ class Client:
     @classmethod
     def from_credentials(cls, token_id: str, token_secret: str) -> Client: ...
     @classmethod
-    def verify(cls, server_url: str, credentials: typing.Tuple[str, str]) -> None: ...
+    def verify(cls, server_url: str, credentials: tuple[str, str]) -> None: ...
     @classmethod
     def set_env_client(cls, client: typing.Optional[Client]): ...
 
@@ -154,8 +145,8 @@ class Client:
         *,
         timeout: typing.Optional[float] = None,
         metadata: typing.Union[
-            typing.Mapping[str, typing.Union[str, bytes]],
-            typing.Collection[typing.Tuple[str, typing.Union[str, bytes]]],
+            collections.abc.Mapping[str, typing.Union[str, bytes]],
+            collections.abc.Collection[tuple[str, typing.Union[str, bytes]]],
             None,
         ] = None,
     ) -> typing.Any: ...
@@ -165,11 +156,11 @@ class Client:
         request: typing.Any,
         *,
         metadata: typing.Union[
-            typing.Mapping[str, typing.Union[str, bytes]],
-            typing.Collection[typing.Tuple[str, typing.Union[str, bytes]]],
+            collections.abc.Mapping[str, typing.Union[str, bytes]],
+            collections.abc.Collection[tuple[str, typing.Union[str, bytes]]],
             None,
         ],
-    ) -> typing.AsyncGenerator[typing.Any, None]: ...
+    ) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
 
 class UnaryUnaryWrapper(typing.Generic[RequestType, ResponseType]):
     wrapped_method: grpclib.client.UnaryUnaryMethod[RequestType, ResponseType]
@@ -184,8 +175,8 @@ class UnaryUnaryWrapper(typing.Generic[RequestType, ResponseType]):
         *,
         timeout: typing.Optional[float] = None,
         metadata: typing.Union[
-            typing.Mapping[str, typing.Union[str, bytes]],
-            typing.Collection[typing.Tuple[str, typing.Union[str, bytes]]],
+            collections.abc.Mapping[str, typing.Union[str, bytes]],
+            collections.abc.Collection[tuple[str, typing.Union[str, bytes]]],
             None,
         ] = None,
     ) -> ResponseType: ...

modal/cloud_bucket_mount.py

@@ -1,6 +1,6 @@
 # Copyright Modal Labs 2022
 from dataclasses import dataclass
-from typing import List, Optional, Tuple
+from typing import Optional
 from urllib.parse import urlparse
 
 from modal_proto import api_pb2
@@ -116,9 +116,9 @@ class _CloudBucketMount:
     requester_pays: bool = False
 
 
-def cloud_bucket_mounts_to_proto(mounts: List[Tuple[str, _CloudBucketMount]]) -> List[api_pb2.CloudBucketMount]:
+def cloud_bucket_mounts_to_proto(mounts: list[tuple[str, _CloudBucketMount]]) -> list[api_pb2.CloudBucketMount]:
     """Helper function to convert `CloudBucketMount` to a list of protobufs that can be passed to the server."""
-    cloud_bucket_mounts: List[api_pb2.CloudBucketMount] = []
+    cloud_bucket_mounts: list[api_pb2.CloudBucketMount] = []
 
     for path, mount in mounts:
         # crude mapping from mount arguments to type.

modal/cloud_bucket_mount.pyi

@@ -23,8 +23,8 @@ class _CloudBucketMount:
     def __eq__(self, other): ...
 
 def cloud_bucket_mounts_to_proto(
-    mounts: typing.List[typing.Tuple[str, _CloudBucketMount]],
-) -> typing.List[modal_proto.api_pb2.CloudBucketMount]: ...
+    mounts: list[tuple[str, _CloudBucketMount]],
+) -> list[modal_proto.api_pb2.CloudBucketMount]: ...
 
 class CloudBucketMount:
     bucket_name: str