modal 0.67.6__py3-none-any.whl → 0.67.8__py3-none-any.whl

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.6",
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.67.8"
     ): ...
     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.6",
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.67.8"
     ): ...
     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

modal/cls.py

@@ -2,7 +2,8 @@
 import inspect
 import os
 import typing
-from typing import Any, Callable, Collection, Dict, List, Optional, Tuple, Type, TypeVar, Union
+from collections.abc import Collection
+from typing import Any, Callable, Optional, TypeVar, Union
 
 from google.protobuf.message import Message
 from grpclib import GRPCError, Status
@@ -76,10 +77,10 @@ class _Obj:
 
     All this class does is to return `Function` objects."""
 
-    _functions: Dict[str, _Function]
+    _functions: dict[str, _Function]
     _entered: bool
     _user_cls_instance: Optional[Any] = None
-    _construction_args: Tuple[tuple, Dict[str, Any]]
+    _construction_args: tuple[tuple, dict[str, Any]]
 
     _instance_service_function: Optional[_Function]
 
@@ -91,7 +92,7 @@ class _Obj:
         self,
         user_cls: type,
         class_service_function: Optional[_Function],  # only None for <v0.63 classes
-        classbound_methods: Dict[str, _Function],
+        classbound_methods: dict[str, _Function],
         from_other_workspace: bool,
         options: Optional[api_pb2.FunctionOptions],
         args,
@@ -244,9 +245,9 @@ class _Cls(_Object, type_prefix="cs"):
     _class_service_function: Optional[
         _Function
     ]  # The _Function serving *all* methods of the class, used for version >=v0.63
-    _method_functions: Optional[Dict[str, _Function]] = None  # Placeholder _Functions for each method
+    _method_functions: Optional[dict[str, _Function]] = None  # Placeholder _Functions for each method
     _options: Optional[api_pb2.FunctionOptions]
-    _callables: Dict[str, Callable[..., Any]]
+    _callables: dict[str, Callable[..., Any]]
     _from_other_workspace: Optional[bool]  # Functions require FunctionBindParams before invocation.
     _app: Optional["modal.app._App"] = None  # not set for lookups
 
@@ -265,7 +266,7 @@ class _Cls(_Object, type_prefix="cs"):
         self._callables = other._callables
         self._from_other_workspace = other._from_other_workspace
 
-    def _get_partial_functions(self) -> Dict[str, _PartialFunction]:
+    def _get_partial_functions(self) -> dict[str, _PartialFunction]:
         if not self._user_cls:
             raise AttributeError("You can only get the partial functions of a local Cls instance")
         return _find_partial_methods_for_user_cls(self._user_cls, _PartialFunctionFlags.all())
@@ -344,8 +345,8 @@ class _Cls(_Object, type_prefix="cs"):
         # validate signature
         _Cls.validate_construction_mechanism(user_cls)
 
-        method_functions: Dict[str, _Function] = {}
-        partial_functions: Dict[str, _PartialFunction] = _find_partial_methods_for_user_cls(
+        method_functions: dict[str, _Function] = {}
+        partial_functions: dict[str, _PartialFunction] = _find_partial_methods_for_user_cls(
             user_cls, _PartialFunctionFlags.FUNCTION
         )
 
@@ -361,11 +362,11 @@ class _Cls(_Object, type_prefix="cs"):
             partial_function.wrapped = True
 
         # Get all callables
-        callables: Dict[str, Callable] = {
+        callables: dict[str, Callable] = {
             k: pf.raw_f for k, pf in _find_partial_methods_for_user_cls(user_cls, _PartialFunctionFlags.all()).items()
         }
 
-        def _deps() -> List[_Function]:
+        def _deps() -> list[_Function]:
             return [class_service_function]
 
         async def _load(self: "_Cls", resolver: Resolver, existing_object_id: Optional[str]):
@@ -392,7 +393,7 @@ class _Cls(_Object, type_prefix="cs"):
 
     @classmethod
     def from_name(
-        cls: Type["_Cls"],
+        cls: type["_Cls"],
         app_name: str,
         tag: str,
         namespace=api_pb2.DEPLOYMENT_NAMESPACE_WORKSPACE,
@@ -454,11 +455,11 @@ class _Cls(_Object, type_prefix="cs"):
 
     def with_options(
         self: "_Cls",
-        cpu: Optional[Union[float, Tuple[float, float]]] = None,
-        memory: Optional[Union[int, Tuple[int, int]]] = None,
+        cpu: Optional[Union[float, tuple[float, float]]] = None,
+        memory: Optional[Union[int, tuple[int, int]]] = None,
         gpu: GPU_T = None,
         secrets: Collection[_Secret] = (),
-        volumes: Dict[Union[str, os.PathLike], _Volume] = {},
+        volumes: dict[Union[str, os.PathLike], _Volume] = {},
         retries: Optional[Union[int, Retries]] = None,
         timeout: Optional[int] = None,
         concurrency_limit: Optional[int] = None,

modal/cls.pyi

@@ -1,3 +1,4 @@
+import collections.abc
 import google.protobuf.message
 import inspect
 import modal.app
@@ -20,10 +21,10 @@ def _use_annotation_parameters(user_cls) -> bool: ...
 def _get_class_constructor_signature(user_cls: type) -> inspect.Signature: ...
 
 class _Obj:
-    _functions: typing.Dict[str, modal.functions._Function]
+    _functions: dict[str, modal.functions._Function]
     _entered: bool
     _user_cls_instance: typing.Optional[typing.Any]
-    _construction_args: typing.Tuple[tuple, typing.Dict[str, typing.Any]]
+    _construction_args: tuple[tuple, dict[str, typing.Any]]
     _instance_service_function: typing.Optional[modal.functions._Function]
 
     def _uses_common_service_function(self): ...
@@ -31,7 +32,7 @@ class _Obj:
         self,
         user_cls: type,
         class_service_function: typing.Optional[modal.functions._Function],
-        classbound_methods: typing.Dict[str, modal.functions._Function],
+        classbound_methods: dict[str, modal.functions._Function],
         from_other_workspace: bool,
         options: typing.Optional[modal_proto.api_pb2.FunctionOptions],
         args,
@@ -49,17 +50,17 @@ class _Obj:
     def __getattr__(self, k): ...
 
 class Obj:
-    _functions: typing.Dict[str, modal.functions.Function]
+    _functions: dict[str, modal.functions.Function]
     _entered: bool
     _user_cls_instance: typing.Optional[typing.Any]
-    _construction_args: typing.Tuple[tuple, typing.Dict[str, typing.Any]]
+    _construction_args: tuple[tuple, dict[str, typing.Any]]
     _instance_service_function: typing.Optional[modal.functions.Function]
 
     def __init__(
         self,
         user_cls: type,
         class_service_function: typing.Optional[modal.functions.Function],
-        classbound_methods: typing.Dict[str, modal.functions.Function],
+        classbound_methods: dict[str, modal.functions.Function],
         from_other_workspace: bool,
         options: typing.Optional[modal_proto.api_pb2.FunctionOptions],
         args,
@@ -86,15 +87,15 @@ class Obj:
 class _Cls(modal.object._Object):
     _user_cls: typing.Optional[type]
     _class_service_function: typing.Optional[modal.functions._Function]
-    _method_functions: typing.Optional[typing.Dict[str, modal.functions._Function]]
+    _method_functions: typing.Optional[dict[str, modal.functions._Function]]
     _options: typing.Optional[modal_proto.api_pb2.FunctionOptions]
-    _callables: typing.Dict[str, typing.Callable[..., typing.Any]]
+    _callables: dict[str, typing.Callable[..., typing.Any]]
     _from_other_workspace: typing.Optional[bool]
     _app: typing.Optional[modal.app._App]
 
     def _initialize_from_empty(self): ...
     def _initialize_from_other(self, other: _Cls): ...
-    def _get_partial_functions(self) -> typing.Dict[str, modal.partial_function._PartialFunction]: ...
+    def _get_partial_functions(self) -> dict[str, modal.partial_function._PartialFunction]: ...
     def _hydrate_metadata(self, metadata: google.protobuf.message.Message): ...
     @staticmethod
     def validate_construction_mechanism(user_cls): ...
@@ -103,7 +104,7 @@ class _Cls(modal.object._Object):
     def _uses_common_service_function(self): ...
     @classmethod
     def from_name(
-        cls: typing.Type[_Cls],
+        cls: type[_Cls],
         app_name: str,
         tag: str,
         namespace=1,
@@ -112,11 +113,11 @@ class _Cls(modal.object._Object):
     ) -> _Cls: ...
     def with_options(
         self: _Cls,
-        cpu: typing.Union[float, typing.Tuple[float, float], None] = None,
-        memory: typing.Union[int, typing.Tuple[int, int], None] = None,
+        cpu: typing.Union[float, tuple[float, float], None] = None,
+        memory: typing.Union[int, tuple[int, int], None] = None,
         gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig] = None,
-        secrets: typing.Collection[modal.secret._Secret] = (),
-        volumes: typing.Dict[typing.Union[str, os.PathLike], modal.volume._Volume] = {},
+        secrets: collections.abc.Collection[modal.secret._Secret] = (),
+        volumes: dict[typing.Union[str, os.PathLike], modal.volume._Volume] = {},
         retries: typing.Union[int, modal.retries.Retries, None] = None,
         timeout: typing.Optional[int] = None,
         concurrency_limit: typing.Optional[int] = None,
@@ -138,16 +139,16 @@ class _Cls(modal.object._Object):
 class Cls(modal.object.Object):
     _user_cls: typing.Optional[type]
     _class_service_function: typing.Optional[modal.functions.Function]
-    _method_functions: typing.Optional[typing.Dict[str, modal.functions.Function]]
+    _method_functions: typing.Optional[dict[str, modal.functions.Function]]
     _options: typing.Optional[modal_proto.api_pb2.FunctionOptions]
-    _callables: typing.Dict[str, typing.Callable[..., typing.Any]]
+    _callables: dict[str, typing.Callable[..., typing.Any]]
     _from_other_workspace: typing.Optional[bool]
     _app: typing.Optional[modal.app.App]
 
     def __init__(self, *args, **kwargs): ...
     def _initialize_from_empty(self): ...
     def _initialize_from_other(self, other: Cls): ...
-    def _get_partial_functions(self) -> typing.Dict[str, modal.partial_function.PartialFunction]: ...
+    def _get_partial_functions(self) -> dict[str, modal.partial_function.PartialFunction]: ...
     def _hydrate_metadata(self, metadata: google.protobuf.message.Message): ...
     @staticmethod
     def validate_construction_mechanism(user_cls): ...
@@ -156,7 +157,7 @@ class Cls(modal.object.Object):
     def _uses_common_service_function(self): ...
     @classmethod
     def from_name(
-        cls: typing.Type[Cls],
+        cls: type[Cls],
         app_name: str,
         tag: str,
         namespace=1,
@@ -165,11 +166,11 @@ class Cls(modal.object.Object):
     ) -> Cls: ...
     def with_options(
         self: Cls,
-        cpu: typing.Union[float, typing.Tuple[float, float], None] = None,
-        memory: typing.Union[int, typing.Tuple[int, int], None] = None,
+        cpu: typing.Union[float, tuple[float, float], None] = None,
+        memory: typing.Union[int, tuple[int, int], None] = None,
         gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig] = None,
-        secrets: typing.Collection[modal.secret.Secret] = (),
-        volumes: typing.Dict[typing.Union[str, os.PathLike], modal.volume.Volume] = {},
+        secrets: collections.abc.Collection[modal.secret.Secret] = (),
+        volumes: dict[typing.Union[str, os.PathLike], modal.volume.Volume] = {},
         retries: typing.Union[int, modal.retries.Retries, None] = None,
         timeout: typing.Optional[int] = None,
         concurrency_limit: typing.Optional[int] = None,

modal/config.py

@@ -80,7 +80,7 @@ import os
 import typing
 import warnings
 from textwrap import dedent
-from typing import Any, Dict, Optional
+from typing import Any, Optional
 
 from google.protobuf.empty_pb2 import Empty
 
@@ -282,7 +282,7 @@ configure_logger(logger, config["loglevel"], config["log_format"])
 
 
 def _store_user_config(
-    new_settings: Dict[str, Any], profile: Optional[str] = None, active_profile: Optional[str] = None
+    new_settings: dict[str, Any], profile: Optional[str] = None, active_profile: Optional[str] = None
 ):
     """Internal method, used by the CLI to set tokens."""
     if profile is None: