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

modal/io_streams.pyi

@@ -1,3 +1,4 @@
+import collections.abc
 import modal.client
 import modal.stream_type
 import typing
@@ -5,15 +6,15 @@ import typing_extensions
 
 def _sandbox_logs_iterator(
     sandbox_id: str, file_descriptor: int, last_entry_id: str, client: modal.client._Client
-) -> typing.AsyncGenerator[typing.Tuple[typing.Optional[bytes], str], None]: ...
+) -> collections.abc.AsyncGenerator[tuple[typing.Optional[bytes], str], None]: ...
 def _container_process_logs_iterator(
     process_id: str, file_descriptor: int, client: modal.client._Client
-) -> typing.AsyncGenerator[typing.Optional[bytes], None]: ...
+) -> collections.abc.AsyncGenerator[typing.Optional[bytes], None]: ...
 
 T = typing.TypeVar("T")
 
 class _StreamReader(typing.Generic[T]):
-    _stream: typing.Optional[typing.AsyncGenerator[typing.Optional[bytes], None]]
+    _stream: typing.Optional[collections.abc.AsyncGenerator[typing.Optional[bytes], None]]
 
     def __init__(
         self,
@@ -29,11 +30,14 @@ class _StreamReader(typing.Generic[T]):
     def file_descriptor(self) -> int: ...
     async def read(self) -> T: ...
     async def _consume_container_process_stream(self): ...
-    def _stream_container_process(self) -> typing.AsyncGenerator[typing.Tuple[typing.Optional[bytes], str], None]: ...
-    def _get_logs(self) -> typing.AsyncGenerator[typing.Optional[bytes], None]: ...
-    def _get_logs_by_line(self) -> typing.AsyncGenerator[typing.Optional[bytes], None]: ...
-    def __aiter__(self) -> typing.AsyncIterator[T]: ...
+    def _stream_container_process(self) -> collections.abc.AsyncGenerator[tuple[typing.Optional[bytes], str], None]: ...
+    def _get_logs(
+        self, skip_empty_messages: bool = True
+    ) -> collections.abc.AsyncGenerator[typing.Optional[bytes], None]: ...
+    def _get_logs_by_line(self) -> collections.abc.AsyncGenerator[typing.Optional[bytes], None]: ...
+    def __aiter__(self) -> collections.abc.AsyncIterator[T]: ...
     async def __anext__(self) -> T: ...
+    async def aclose(self): ...
 
 class _StreamWriter:
     def __init__(
@@ -47,7 +51,7 @@ class _StreamWriter:
 T_INNER = typing.TypeVar("T_INNER", covariant=True)
 
 class StreamReader(typing.Generic[T]):
-    _stream: typing.Optional[typing.AsyncGenerator[typing.Optional[bytes], None]]
+    _stream: typing.Optional[collections.abc.AsyncGenerator[typing.Optional[bytes], None]]
 
     def __init__(
         self,
@@ -75,27 +79,33 @@ class StreamReader(typing.Generic[T]):
     _consume_container_process_stream: ___consume_container_process_stream_spec
 
     class ___stream_container_process_spec(typing_extensions.Protocol):
-        def __call__(self) -> typing.Generator[typing.Tuple[typing.Optional[bytes], str], None, None]: ...
-        def aio(self) -> typing.AsyncGenerator[typing.Tuple[typing.Optional[bytes], str], None]: ...
+        def __call__(self) -> typing.Generator[tuple[typing.Optional[bytes], str], None, None]: ...
+        def aio(self) -> collections.abc.AsyncGenerator[tuple[typing.Optional[bytes], str], None]: ...
 
     _stream_container_process: ___stream_container_process_spec
 
     class ___get_logs_spec(typing_extensions.Protocol):
-        def __call__(self) -> typing.Generator[typing.Optional[bytes], None, None]: ...
-        def aio(self) -> typing.AsyncGenerator[typing.Optional[bytes], None]: ...
+        def __call__(
+            self, skip_empty_messages: bool = True
+        ) -> typing.Generator[typing.Optional[bytes], None, None]: ...
+        def aio(
+            self, skip_empty_messages: bool = True
+        ) -> collections.abc.AsyncGenerator[typing.Optional[bytes], None]: ...
 
     _get_logs: ___get_logs_spec
 
     class ___get_logs_by_line_spec(typing_extensions.Protocol):
         def __call__(self) -> typing.Generator[typing.Optional[bytes], None, None]: ...
-        def aio(self) -> typing.AsyncGenerator[typing.Optional[bytes], None]: ...
+        def aio(self) -> collections.abc.AsyncGenerator[typing.Optional[bytes], None]: ...
 
     _get_logs_by_line: ___get_logs_by_line_spec
 
     def __iter__(self) -> typing.Iterator[T]: ...
-    def __aiter__(self) -> typing.AsyncIterator[T]: ...
+    def __aiter__(self) -> collections.abc.AsyncIterator[T]: ...
     def __next__(self) -> T: ...
     async def __anext__(self) -> T: ...
+    def close(self): ...
+    async def aclose(self): ...
 
 class StreamWriter:
     def __init__(

modal/mount.py

@@ -9,8 +9,9 @@ import sys
 import sysconfig
 import time
 import typing
+from collections.abc import AsyncGenerator
 from pathlib import Path, PurePosixPath
-from typing import AsyncGenerator, Callable, List, Optional, Tuple, Type, Union
+from typing import Callable, Optional, Union
 
 from google.protobuf.message import Message
 
@@ -36,7 +37,7 @@ MOUNT_PUT_FILE_CLIENT_TIMEOUT = 10 * 60  # 10 min max for transferring files
 #
 # These can be updated safely, but changes will trigger a rebuild for all images
 # that rely on `add_python()` in their constructor.
-PYTHON_STANDALONE_VERSIONS: typing.Dict[str, typing.Tuple[str, str]] = {
+PYTHON_STANDALONE_VERSIONS: dict[str, tuple[str, str]] = {
     "3.9": ("20230826", "3.9.18"),
     "3.10": ("20230826", "3.10.13"),
     "3.11": ("20230826", "3.11.5"),
@@ -73,21 +74,21 @@ class _MountEntry(metaclass=abc.ABCMeta):
         ...
 
     @abc.abstractmethod
-    def get_files_to_upload(self) -> typing.Iterator[Tuple[Path, str]]:
+    def get_files_to_upload(self) -> typing.Iterator[tuple[Path, str]]:
         ...
 
     @abc.abstractmethod
-    def watch_entry(self) -> Tuple[Path, Path]:
+    def watch_entry(self) -> tuple[Path, Path]:
         ...
 
     @abc.abstractmethod
-    def top_level_paths(self) -> List[Tuple[Path, PurePosixPath]]:
+    def top_level_paths(self) -> list[tuple[Path, PurePosixPath]]:
         ...
 
 
-def _select_files(entries: List[_MountEntry]) -> List[Tuple[Path, PurePosixPath]]:
+def _select_files(entries: list[_MountEntry]) -> list[tuple[Path, PurePosixPath]]:
     # TODO: make this async
-    all_files: typing.Set[Tuple[Path, PurePosixPath]] = set()
+    all_files: set[tuple[Path, PurePosixPath]] = set()
     for entry in entries:
         all_files |= set(entry.get_files_to_upload())
     return list(all_files)
@@ -113,7 +114,7 @@ class _MountFile(_MountEntry):
         safe_path = self.local_file.expanduser().absolute()
         return safe_path.parent, safe_path
 
-    def top_level_paths(self) -> List[Tuple[Path, PurePosixPath]]:
+    def top_level_paths(self) -> list[tuple[Path, PurePosixPath]]:
         return [(self.local_file, self.remote_path)]
 
 
@@ -150,7 +151,7 @@ class _MountDir(_MountEntry):
     def watch_entry(self):
         return self.local_dir.resolve().expanduser(), None
 
-    def top_level_paths(self) -> List[Tuple[Path, PurePosixPath]]:
+    def top_level_paths(self) -> list[tuple[Path, PurePosixPath]]:
         return [(self.local_dir, self.remote_path)]
 
 
@@ -194,7 +195,7 @@ class _MountedPythonModule(_MountEntry):
     def description(self) -> str:
         return f"PythonPackage:{self.module_name}"
 
-    def _proxy_entries(self) -> List[_MountEntry]:
+    def _proxy_entries(self) -> list[_MountEntry]:
         mount_infos = get_module_mount_info(self.module_name)
         entries = []
         for mount_info in mount_infos:
@@ -220,16 +221,16 @@ class _MountedPythonModule(_MountEntry):
                 )
         return entries
 
-    def get_files_to_upload(self) -> typing.Iterator[Tuple[Path, str]]:
+    def get_files_to_upload(self) -> typing.Iterator[tuple[Path, str]]:
         for entry in self._proxy_entries():
             yield from entry.get_files_to_upload()
 
-    def watch_entry(self) -> Tuple[Path, Path]:
+    def watch_entry(self) -> tuple[Path, Path]:
         for entry in self._proxy_entries():
             # TODO: fix watch for mounts of multi-path packages
             return entry.watch_entry()
 
-    def top_level_paths(self) -> List[Tuple[Path, PurePosixPath]]:
+    def top_level_paths(self) -> list[tuple[Path, PurePosixPath]]:
         paths = []
         for sub in self._proxy_entries():
             paths.extend(sub.top_level_paths())
@@ -262,14 +263,14 @@ class _Mount(_Object, type_prefix="mo"):
     the file's contents to skip uploading files that have been uploaded before.
     """
 
-    _entries: Optional[List[_MountEntry]] = None
+    _entries: Optional[list[_MountEntry]] = None
     _deployment_name: Optional[str] = None
     _namespace: Optional[int] = None
     _environment_name: Optional[str] = None
     _content_checksum_sha256_hex: Optional[str] = None
 
     @staticmethod
-    def _new(entries: List[_MountEntry] = []) -> "_Mount":
+    def _new(entries: list[_MountEntry] = []) -> "_Mount":
         rep = f"Mount({entries})"
 
         async def mount_content_deduplication_key():
@@ -298,10 +299,10 @@ class _Mount(_Object, type_prefix="mo"):
         assert isinstance(handle_metadata, api_pb2.MountHandleMetadata)
         self._content_checksum_sha256_hex = handle_metadata.content_checksum_sha256_hex
 
-    def _top_level_paths(self) -> List[Tuple[Path, PurePosixPath]]:
+    def _top_level_paths(self) -> list[tuple[Path, PurePosixPath]]:
         # Returns [(local_absolute_path, remote_path), ...] for all top level entries in the Mount
         # Used to determine if a package mount is installed in a sys directory or not
-        res: List[Tuple[Path, PurePosixPath]] = []
+        res: list[tuple[Path, PurePosixPath]] = []
         for entry in self.entries:
             res.extend(entry.top_level_paths())
         return res
@@ -413,12 +414,12 @@ class _Mount(_Object, type_prefix="mo"):
         return _Mount._new().add_local_file(local_path, remote_path=remote_path)
 
     @staticmethod
-    def _description(entries: List[_MountEntry]) -> str:
+    def _description(entries: list[_MountEntry]) -> str:
         local_contents = [e.description() for e in entries]
         return ", ".join(local_contents)
 
     @staticmethod
-    async def _get_files(entries: List[_MountEntry]) -> AsyncGenerator[FileUploadSpec, None]:
+    async def _get_files(entries: list[_MountEntry]) -> AsyncGenerator[FileUploadSpec, None]:
         loop = asyncio.get_event_loop()
         with concurrent.futures.ThreadPoolExecutor() as exe:
             all_files = await loop.run_in_executor(exe, _select_files, entries)
@@ -502,7 +503,7 @@ class _Mount(_Object, type_prefix="mo"):
 
         # Upload files, or check if they already exist.
         n_concurrent_uploads = 512
-        files: List[api_pb2.MountFile] = []
+        files: list[api_pb2.MountFile] = []
         async with aclosing(
             async_map(_Mount._get_files(self._entries), _put_file, concurrency=n_concurrent_uploads)
         ) as stream:
@@ -602,7 +603,7 @@ class _Mount(_Object, type_prefix="mo"):
 
     @classmethod
     async def lookup(
-        cls: Type["_Mount"],
+        cls: type["_Mount"],
         label: str,
         namespace=api_pb2.DEPLOYMENT_NAMESPACE_WORKSPACE,
         client: Optional[_Client] = None,
@@ -715,7 +716,7 @@ def _is_modal_path(remote_path: PurePosixPath):
     return False
 
 
-def get_auto_mounts() -> typing.List[_Mount]:
+def get_auto_mounts() -> list[_Mount]:
     """mdmd:hidden
 
     Auto-mount local modules that have been imported in global scope.
@@ -748,8 +749,7 @@ def get_auto_mounts() -> typing.List[_Mount]:
             continue
 
         for local_path, remote_path in mount_paths:
-            # TODO: use is_relative_to once we deprecate Python 3.8
-            if any(str(local_path).startswith(str(p)) for p in SYS_PREFIXES) or _is_modal_path(remote_path):
+            if any(local_path.is_relative_to(p) for p in SYS_PREFIXES) or _is_modal_path(remote_path):
                 # skip any module that has paths in SYS_PREFIXES, or would overwrite the modal Package in the container
                 break
         else:

modal/mount.pyi

@@ -1,3 +1,4 @@
+import collections.abc
 import google.protobuf.message
 import modal._resolver
 import modal._utils.blob_utils
@@ -13,13 +14,11 @@ def python_standalone_mount_name(version: str) -> str: ...
 
 class _MountEntry:
     def description(self) -> str: ...
-    def get_files_to_upload(self) -> typing.Iterator[typing.Tuple[pathlib.Path, str]]: ...
-    def watch_entry(self) -> typing.Tuple[pathlib.Path, pathlib.Path]: ...
-    def top_level_paths(self) -> typing.List[typing.Tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
+    def get_files_to_upload(self) -> typing.Iterator[tuple[pathlib.Path, str]]: ...
+    def watch_entry(self) -> tuple[pathlib.Path, pathlib.Path]: ...
+    def top_level_paths(self) -> list[tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
 
-def _select_files(
-    entries: typing.List[_MountEntry],
-) -> typing.List[typing.Tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
+def _select_files(entries: list[_MountEntry]) -> list[tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
 
 class _MountFile(_MountEntry):
     local_file: pathlib.Path
@@ -28,7 +27,7 @@ class _MountFile(_MountEntry):
     def description(self) -> str: ...
     def get_files_to_upload(self): ...
     def watch_entry(self): ...
-    def top_level_paths(self) -> typing.List[typing.Tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
+    def top_level_paths(self) -> list[tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
     def __init__(self, local_file: pathlib.Path, remote_path: pathlib.PurePosixPath) -> None: ...
     def __repr__(self): ...
     def __eq__(self, other): ...
@@ -42,7 +41,7 @@ class _MountDir(_MountEntry):
     def description(self): ...
     def get_files_to_upload(self): ...
     def watch_entry(self): ...
-    def top_level_paths(self) -> typing.List[typing.Tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
+    def top_level_paths(self) -> list[tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
     def __init__(
         self,
         local_dir: pathlib.Path,
@@ -61,10 +60,10 @@ class _MountedPythonModule(_MountEntry):
     condition: typing.Optional[typing.Callable[[str], bool]]
 
     def description(self) -> str: ...
-    def _proxy_entries(self) -> typing.List[_MountEntry]: ...
-    def get_files_to_upload(self) -> typing.Iterator[typing.Tuple[pathlib.Path, str]]: ...
-    def watch_entry(self) -> typing.Tuple[pathlib.Path, pathlib.Path]: ...
-    def top_level_paths(self) -> typing.List[typing.Tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
+    def _proxy_entries(self) -> list[_MountEntry]: ...
+    def get_files_to_upload(self) -> typing.Iterator[tuple[pathlib.Path, str]]: ...
+    def watch_entry(self) -> tuple[pathlib.Path, pathlib.Path]: ...
+    def top_level_paths(self) -> list[tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
     def __init__(
         self,
         module_name: str,
@@ -77,19 +76,19 @@ class _MountedPythonModule(_MountEntry):
 class NonLocalMountError(Exception): ...
 
 class _Mount(modal.object._Object):
-    _entries: typing.Optional[typing.List[_MountEntry]]
+    _entries: typing.Optional[list[_MountEntry]]
     _deployment_name: typing.Optional[str]
     _namespace: typing.Optional[int]
     _environment_name: typing.Optional[str]
     _content_checksum_sha256_hex: typing.Optional[str]
 
     @staticmethod
-    def _new(entries: typing.List[_MountEntry] = []) -> _Mount: ...
+    def _new(entries: list[_MountEntry] = []) -> _Mount: ...
     def _extend(self, entry: _MountEntry) -> _Mount: ...
     @property
     def entries(self): ...
     def _hydrate_metadata(self, handle_metadata: typing.Optional[google.protobuf.message.Message]): ...
-    def _top_level_paths(self) -> typing.List[typing.Tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
+    def _top_level_paths(self) -> list[tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
     def is_local(self) -> bool: ...
     def add_local_dir(
         self,
@@ -117,11 +116,11 @@ class _Mount(modal.object._Object):
         local_path: typing.Union[str, pathlib.Path], remote_path: typing.Union[str, pathlib.PurePosixPath, None] = None
     ) -> _Mount: ...
     @staticmethod
-    def _description(entries: typing.List[_MountEntry]) -> str: ...
+    def _description(entries: list[_MountEntry]) -> str: ...
     @staticmethod
     def _get_files(
-        entries: typing.List[_MountEntry],
-    ) -> typing.AsyncGenerator[modal._utils.blob_utils.FileUploadSpec, None]: ...
+        entries: list[_MountEntry],
+    ) -> collections.abc.AsyncGenerator[modal._utils.blob_utils.FileUploadSpec, None]: ...
     async def _load_mount(
         self: _Mount, resolver: modal._resolver.Resolver, existing_object_id: typing.Optional[str]
     ): ...
@@ -135,7 +134,7 @@ class _Mount(modal.object._Object):
     def from_name(label: str, namespace=1, environment_name: typing.Optional[str] = None) -> _Mount: ...
     @classmethod
     async def lookup(
-        cls: typing.Type[_Mount],
+        cls: type[_Mount],
         label: str,
         namespace=1,
         client: typing.Optional[modal.client._Client] = None,
@@ -151,7 +150,7 @@ class _Mount(modal.object._Object):
     def _get_metadata(self) -> modal_proto.api_pb2.MountHandleMetadata: ...
 
 class Mount(modal.object.Object):
-    _entries: typing.Optional[typing.List[_MountEntry]]
+    _entries: typing.Optional[list[_MountEntry]]
     _deployment_name: typing.Optional[str]
     _namespace: typing.Optional[int]
     _environment_name: typing.Optional[str]
@@ -159,12 +158,12 @@ class Mount(modal.object.Object):
 
     def __init__(self, *args, **kwargs): ...
     @staticmethod
-    def _new(entries: typing.List[_MountEntry] = []) -> Mount: ...
+    def _new(entries: list[_MountEntry] = []) -> Mount: ...
     def _extend(self, entry: _MountEntry) -> Mount: ...
     @property
     def entries(self): ...
     def _hydrate_metadata(self, handle_metadata: typing.Optional[google.protobuf.message.Message]): ...
-    def _top_level_paths(self) -> typing.List[typing.Tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
+    def _top_level_paths(self) -> list[tuple[pathlib.Path, pathlib.PurePosixPath]]: ...
     def is_local(self) -> bool: ...
     def add_local_dir(
         self,
@@ -192,15 +191,15 @@ class Mount(modal.object.Object):
         local_path: typing.Union[str, pathlib.Path], remote_path: typing.Union[str, pathlib.PurePosixPath, None] = None
     ) -> Mount: ...
     @staticmethod
-    def _description(entries: typing.List[_MountEntry]) -> str: ...
+    def _description(entries: list[_MountEntry]) -> str: ...
 
     class ___get_files_spec(typing_extensions.Protocol):
         def __call__(
-            self, entries: typing.List[_MountEntry]
+            self, entries: list[_MountEntry]
         ) -> typing.Generator[modal._utils.blob_utils.FileUploadSpec, None, None]: ...
         def aio(
-            self, entries: typing.List[_MountEntry]
-        ) -> typing.AsyncGenerator[modal._utils.blob_utils.FileUploadSpec, None]: ...
+            self, entries: list[_MountEntry]
+        ) -> collections.abc.AsyncGenerator[modal._utils.blob_utils.FileUploadSpec, None]: ...
 
     _get_files: ___get_files_spec
 
@@ -220,7 +219,7 @@ class Mount(modal.object.Object):
     def from_name(label: str, namespace=1, environment_name: typing.Optional[str] = None) -> Mount: ...
     @classmethod
     def lookup(
-        cls: typing.Type[Mount],
+        cls: type[Mount],
         label: str,
         namespace=1,
         client: typing.Optional[modal.client.Client] = None,
@@ -251,8 +250,8 @@ def _create_client_mount(): ...
 def create_client_mount(): ...
 def _get_client_mount(): ...
 def _is_modal_path(remote_path: pathlib.PurePosixPath): ...
-def get_auto_mounts() -> typing.List[_Mount]: ...
+def get_auto_mounts() -> list[_Mount]: ...
 
 ROOT_DIR: pathlib.PurePosixPath
 
-PYTHON_STANDALONE_VERSIONS: typing.Dict[str, typing.Tuple[str, str]]
+PYTHON_STANDALONE_VERSIONS: dict[str, tuple[str, str]]

modal/network_file_system.py

@@ -2,8 +2,9 @@
 import functools
 import os
 import time
+from collections.abc import AsyncIterator
 from pathlib import Path, PurePosixPath
-from typing import Any, AsyncIterator, BinaryIO, Callable, List, Optional, Tuple, Type, Union
+from typing import Any, BinaryIO, Callable, Optional, Union
 
 from grpclib import GRPCError, Status
 from synchronicity.async_wrap import asynccontextmanager
@@ -34,9 +35,9 @@ NETWORK_FILE_SYSTEM_PUT_FILE_CLIENT_TIMEOUT = (
 
 
 def network_file_system_mount_protos(
-    validated_network_file_systems: List[Tuple[str, "_NetworkFileSystem"]],
+    validated_network_file_systems: list[tuple[str, "_NetworkFileSystem"]],
     allow_cross_region_volumes: bool,
-) -> List[api_pb2.SharedVolumeMount]:
+) -> list[api_pb2.SharedVolumeMount]:
     network_file_system_mounts = []
     # Relies on dicts being ordered (true as of Python 3.6).
     for path, volume in validated_network_file_systems:
@@ -143,7 +144,7 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
     @classmethod
     @asynccontextmanager
     async def ephemeral(
-        cls: Type["_NetworkFileSystem"],
+        cls: type["_NetworkFileSystem"],
         client: Optional[_Client] = None,
         environment_name: Optional[str] = None,
         _heartbeat_sleep: float = EPHEMERAL_OBJECT_HEARTBEAT_SLEEP,
@@ -152,11 +153,13 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
 
         Usage:
         ```python
-        with NetworkFileSystem.ephemeral() as nfs:
-            assert nfs.listdir() == []
+        with modal.NetworkFileSystem.ephemeral() as nfs:
+            assert nfs.listdir("/") == []
+        ```
 
-        async with NetworkFileSystem.ephemeral() as nfs:
-            assert await nfs.listdir() == []
+        ```python notest
+        async with modal.NetworkFileSystem.ephemeral() as nfs:
+            assert await nfs.listdir("/") == []
         ```
         """
         if client is None:
@@ -184,7 +187,7 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
         In contrast to `modal.NetworkFileSystem.from_name`, this is an eager method
         that will hydrate the local object with metadata from Modal servers.
 
-        ```python
+        ```python notest
         nfs = modal.NetworkFileSystem.lookup("my-nfs")
         print(nfs.listdir("/"))
         ```
@@ -327,7 +330,7 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
                 relpath_str = subpath.relative_to(_local_path).as_posix()
                 yield subpath, PurePosixPath(remote_path, relpath_str)
 
-        async def _add_local_file(paths: Tuple[Path, PurePosixPath]) -> int:
+        async def _add_local_file(paths: tuple[Path, PurePosixPath]) -> int:
             return await self.add_local_file(paths[0], paths[1], progress_cb)
 
         async with aclosing(async_map(sync_or_async_iter(gen_transfers()), _add_local_file, concurrency=20)) as stream:
@@ -335,7 +338,7 @@ class _NetworkFileSystem(_Object, type_prefix="sv"):
                 pass
 
     @live_method
-    async def listdir(self, path: str) -> List[FileEntry]:
+    async def listdir(self, path: str) -> list[FileEntry]:
         """List all files in a directory in the network file system.
 
         * Passing a directory path lists all files in the directory (names are relative to the directory)

modal/network_file_system.pyi

@@ -1,3 +1,4 @@
+import collections.abc
 import modal.client
 import modal.object
 import modal.volume
@@ -8,8 +9,8 @@ import typing
 import typing_extensions
 
 def network_file_system_mount_protos(
-    validated_network_file_systems: typing.List[typing.Tuple[str, _NetworkFileSystem]], allow_cross_region_volumes: bool
-) -> typing.List[modal_proto.api_pb2.SharedVolumeMount]: ...
+    validated_network_file_systems: list[tuple[str, _NetworkFileSystem]], allow_cross_region_volumes: bool
+) -> list[modal_proto.api_pb2.SharedVolumeMount]: ...
 
 class _NetworkFileSystem(modal.object._Object):
     @staticmethod
@@ -20,7 +21,7 @@ class _NetworkFileSystem(modal.object._Object):
     ) -> _NetworkFileSystem: ...
     @classmethod
     def ephemeral(
-        cls: typing.Type[_NetworkFileSystem],
+        cls: type[_NetworkFileSystem],
         client: typing.Optional[modal.client._Client] = None,
         environment_name: typing.Optional[str] = None,
         _heartbeat_sleep: float = 300,
@@ -46,8 +47,8 @@ class _NetworkFileSystem(modal.object._Object):
         fp: typing.BinaryIO,
         progress_cb: typing.Optional[typing.Callable[..., typing.Any]] = None,
     ) -> int: ...
-    def read_file(self, path: str) -> typing.AsyncIterator[bytes]: ...
-    def iterdir(self, path: str) -> typing.AsyncIterator[modal.volume.FileEntry]: ...
+    def read_file(self, path: str) -> collections.abc.AsyncIterator[bytes]: ...
+    def iterdir(self, path: str) -> collections.abc.AsyncIterator[modal.volume.FileEntry]: ...
     async def add_local_file(
         self,
         local_path: typing.Union[pathlib.Path, str],
@@ -60,7 +61,7 @@ class _NetworkFileSystem(modal.object._Object):
         remote_path: typing.Union[str, pathlib.PurePosixPath, None] = None,
         progress_cb: typing.Optional[typing.Callable[..., typing.Any]] = None,
     ): ...
-    async def listdir(self, path: str) -> typing.List[modal.volume.FileEntry]: ...
+    async def listdir(self, path: str) -> list[modal.volume.FileEntry]: ...
     async def remove_file(self, path: str, recursive=False): ...
 
 class NetworkFileSystem(modal.object.Object):
@@ -73,7 +74,7 @@ class NetworkFileSystem(modal.object.Object):
     ) -> NetworkFileSystem: ...
     @classmethod
     def ephemeral(
-        cls: typing.Type[NetworkFileSystem],
+        cls: type[NetworkFileSystem],
         client: typing.Optional[modal.client.Client] = None,
         environment_name: typing.Optional[str] = None,
         _heartbeat_sleep: float = 300,
@@ -135,13 +136,13 @@ class NetworkFileSystem(modal.object.Object):
 
     class __read_file_spec(typing_extensions.Protocol):
         def __call__(self, path: str) -> typing.Iterator[bytes]: ...
-        def aio(self, path: str) -> typing.AsyncIterator[bytes]: ...
+        def aio(self, path: str) -> collections.abc.AsyncIterator[bytes]: ...
 
     read_file: __read_file_spec
 
     class __iterdir_spec(typing_extensions.Protocol):
         def __call__(self, path: str) -> typing.Iterator[modal.volume.FileEntry]: ...
-        def aio(self, path: str) -> typing.AsyncIterator[modal.volume.FileEntry]: ...
+        def aio(self, path: str) -> collections.abc.AsyncIterator[modal.volume.FileEntry]: ...
 
     iterdir: __iterdir_spec
 
@@ -178,8 +179,8 @@ class NetworkFileSystem(modal.object.Object):
     add_local_dir: __add_local_dir_spec
 
     class __listdir_spec(typing_extensions.Protocol):
-        def __call__(self, path: str) -> typing.List[modal.volume.FileEntry]: ...
-        async def aio(self, path: str) -> typing.List[modal.volume.FileEntry]: ...
+        def __call__(self, path: str) -> list[modal.volume.FileEntry]: ...
+        async def aio(self, path: str) -> list[modal.volume.FileEntry]: ...
 
     listdir: __listdir_spec
 

modal/object.py

@@ -1,7 +1,8 @@
 # Copyright Modal Labs 2022
 import uuid
+from collections.abc import Awaitable, Hashable, Sequence
 from functools import wraps
-from typing import Awaitable, Callable, ClassVar, Dict, Hashable, List, Optional, Sequence, Type, TypeVar
+from typing import Callable, ClassVar, Optional, TypeVar
 
 from google.protobuf.message import Message
 
@@ -31,7 +32,7 @@ def _get_environment_name(environment_name: Optional[str] = None, resolver: Opti
 
 class _Object:
     _type_prefix: ClassVar[Optional[str]] = None
-    _prefix_to_type: ClassVar[Dict[str, type]] = {}
+    _prefix_to_type: ClassVar[dict[str, type]] = {}
 
     # For constructors
     _load: Optional[Callable[[O, Resolver, Optional[str]], Awaitable[None]]]
@@ -39,7 +40,7 @@ class _Object:
     _rep: str
     _is_another_app: bool
     _hydrate_lazily: bool
-    _deps: Optional[Callable[..., List["_Object"]]]
+    _deps: Optional[Callable[..., list["_Object"]]]
     _deduplication_key: Optional[Callable[[], Awaitable[Hashable]]] = None
 
     # For hydrated objects
@@ -65,7 +66,7 @@ class _Object:
         is_another_app: bool = False,
         preload: Optional[Callable[[O, Resolver, Optional[str]], Awaitable[None]]] = None,
         hydrate_lazily: bool = False,
-        deps: Optional[Callable[..., List["_Object"]]] = None,
+        deps: Optional[Callable[..., list["_Object"]]] = None,
         deduplication_key: Optional[Callable[[], Awaitable[Hashable]]] = None,
     ):
         self._local_uuid = str(uuid.uuid4())
@@ -159,7 +160,7 @@ class _Object:
         return obj
 
     @classmethod
-    def _get_type_from_id(cls: Type[O], object_id: str) -> Type[O]:
+    def _get_type_from_id(cls: type[O], object_id: str) -> type[O]:
         parts = object_id.split("-")
         if len(parts) != 2:
             raise InvalidError(f"Object id {object_id} has no dash in it")
@@ -169,12 +170,12 @@ class _Object:
         return cls._prefix_to_type[prefix]
 
     @classmethod
-    def _is_id_type(cls: Type[O], object_id) -> bool:
+    def _is_id_type(cls: type[O], object_id) -> bool:
         return cls._get_type_from_id(object_id) == cls
 
     @classmethod
     def _new_hydrated(
-        cls: Type[O], object_id: str, client: _Client, handle_metadata: Optional[Message], is_another_app: bool = False
+        cls: type[O], object_id: str, client: _Client, handle_metadata: Optional[Message], is_another_app: bool = False
     ) -> O:
         if cls._type_prefix is not None:
             # This is called directly on a subclass, e.g. Secret.from_id
@@ -215,7 +216,7 @@ class _Object:
         return self._is_hydrated
 
     @property
-    def deps(self) -> Callable[..., List["_Object"]]:
+    def deps(self) -> Callable[..., list["_Object"]]:
         """mdmd:hidden"""
         return self._deps if self._deps is not None else lambda: []