modal 0.72.4__py3-none-any.whl → 0.72.48__py3-none-any.whl

modal/object.pyi

@@ -5,117 +5,30 @@ import modal.client
 import typing
 import typing_extensions
 
-O = typing.TypeVar("O", bound="_Object")
-
-_BLOCKING_O = typing.TypeVar("_BLOCKING_O", bound="Object")
-
-def _get_environment_name(
-    environment_name: typing.Optional[str] = None, resolver: typing.Optional[modal._resolver.Resolver] = None
-) -> typing.Optional[str]: ...
-
-class _Object:
-    _type_prefix: typing.ClassVar[typing.Optional[str]]
-    _prefix_to_type: typing.ClassVar[dict[str, type]]
-    _load: typing.Optional[
-        typing.Callable[[O, modal._resolver.Resolver, typing.Optional[str]], collections.abc.Awaitable[None]]
-    ]
-    _preload: typing.Optional[
-        typing.Callable[[O, modal._resolver.Resolver, typing.Optional[str]], collections.abc.Awaitable[None]]
-    ]
-    _rep: str
-    _is_another_app: bool
-    _hydrate_lazily: bool
-    _deps: typing.Optional[typing.Callable[..., list[_Object]]]
-    _deduplication_key: typing.Optional[typing.Callable[[], collections.abc.Awaitable[collections.abc.Hashable]]]
-    _object_id: str
-    _client: modal.client._Client
-    _is_hydrated: bool
-    _is_rehydrated: bool
-
-    @classmethod
-    def __init_subclass__(cls, type_prefix: typing.Optional[str] = None): ...
-    def __init__(self, *args, **kwargs): ...
-    def _init(
-        self,
-        rep: str,
-        load: typing.Optional[
-            typing.Callable[[O, modal._resolver.Resolver, typing.Optional[str]], collections.abc.Awaitable[None]]
-        ] = None,
-        is_another_app: bool = False,
-        preload: typing.Optional[
-            typing.Callable[[O, modal._resolver.Resolver, typing.Optional[str]], collections.abc.Awaitable[None]]
-        ] = None,
-        hydrate_lazily: bool = False,
-        deps: typing.Optional[typing.Callable[..., list[_Object]]] = None,
-        deduplication_key: typing.Optional[
-            typing.Callable[[], collections.abc.Awaitable[collections.abc.Hashable]]
-        ] = None,
-    ): ...
-    def _unhydrate(self): ...
-    def _initialize_from_empty(self): ...
-    def _initialize_from_other(self, other): ...
-    def _hydrate(
-        self, object_id: str, client: modal.client._Client, metadata: typing.Optional[google.protobuf.message.Message]
-    ): ...
-    def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
-    def _get_metadata(self) -> typing.Optional[google.protobuf.message.Message]: ...
-    def _validate_is_hydrated(self: O): ...
-    def clone(self: O) -> O: ...
-    @classmethod
-    def _from_loader(
-        cls,
-        load: typing.Callable[[O, modal._resolver.Resolver, typing.Optional[str]], collections.abc.Awaitable[None]],
-        rep: str,
-        is_another_app: bool = False,
-        preload: typing.Optional[
-            typing.Callable[[O, modal._resolver.Resolver, typing.Optional[str]], collections.abc.Awaitable[None]]
-        ] = None,
-        hydrate_lazily: bool = False,
-        deps: typing.Optional[typing.Callable[..., collections.abc.Sequence[_Object]]] = None,
-        deduplication_key: typing.Optional[
-            typing.Callable[[], collections.abc.Awaitable[collections.abc.Hashable]]
-        ] = None,
-    ): ...
-    @classmethod
-    def _get_type_from_id(cls: type[O], object_id: str) -> type[O]: ...
-    @classmethod
-    def _is_id_type(cls: type[O], object_id) -> bool: ...
-    @classmethod
-    def _new_hydrated(
-        cls: type[O],
-        object_id: str,
-        client: modal.client._Client,
-        handle_metadata: typing.Optional[google.protobuf.message.Message],
-        is_another_app: bool = False,
-    ) -> O: ...
-    def _hydrate_from_other(self, other: O): ...
-    def __repr__(self): ...
-    @property
-    def local_uuid(self): ...
-    @property
-    def object_id(self) -> str: ...
-    @property
-    def is_hydrated(self) -> bool: ...
-    @property
-    def deps(self) -> typing.Callable[..., list[_Object]]: ...
-    async def resolve(self, client: typing.Optional[modal.client._Client] = None): ...
+SUPERSELF = typing.TypeVar("SUPERSELF", covariant=True)
 
 class Object:
     _type_prefix: typing.ClassVar[typing.Optional[str]]
     _prefix_to_type: typing.ClassVar[dict[str, type]]
     _load: typing.Optional[
-        typing.Callable[[_BLOCKING_O, modal._resolver.Resolver, typing.Optional[str]], collections.abc.Awaitable[None]]
+        collections.abc.Callable[
+            [typing_extensions.Self, modal._resolver.Resolver, typing.Optional[str]], collections.abc.Awaitable[None]
+        ]
     ]
     _preload: typing.Optional[
-        typing.Callable[[_BLOCKING_O, modal._resolver.Resolver, typing.Optional[str]], collections.abc.Awaitable[None]]
+        collections.abc.Callable[
+            [typing_extensions.Self, modal._resolver.Resolver, typing.Optional[str]], collections.abc.Awaitable[None]
+        ]
     ]
     _rep: str
     _is_another_app: bool
     _hydrate_lazily: bool
-    _deps: typing.Optional[typing.Callable[..., list[Object]]]
-    _deduplication_key: typing.Optional[typing.Callable[[], collections.abc.Awaitable[collections.abc.Hashable]]]
-    _object_id: str
-    _client: modal.client.Client
+    _deps: typing.Optional[collections.abc.Callable[..., collections.abc.Sequence[Object]]]
+    _deduplication_key: typing.Optional[
+        collections.abc.Callable[[], collections.abc.Awaitable[collections.abc.Hashable]]
+    ]
+    _object_id: typing.Optional[str]
+    _client: typing.Optional[modal.client.Client]
     _is_hydrated: bool
     _is_rehydrated: bool
 
@@ -123,43 +36,43 @@ class Object:
     @classmethod
     def __init_subclass__(cls, type_prefix: typing.Optional[str] = None): ...
 
-    class ___init_spec(typing_extensions.Protocol):
+    class ___init_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self,
             rep: str,
             load: typing.Optional[
-                typing.Callable[[_BLOCKING_O, modal._resolver.Resolver, typing.Optional[str]], None]
+                collections.abc.Callable[[SUPERSELF, modal._resolver.Resolver, typing.Optional[str]], None]
             ] = None,
             is_another_app: bool = False,
             preload: typing.Optional[
-                typing.Callable[[_BLOCKING_O, modal._resolver.Resolver, typing.Optional[str]], None]
+                collections.abc.Callable[[SUPERSELF, modal._resolver.Resolver, typing.Optional[str]], None]
             ] = None,
             hydrate_lazily: bool = False,
-            deps: typing.Optional[typing.Callable[..., list[Object]]] = None,
-            deduplication_key: typing.Optional[typing.Callable[[], collections.abc.Hashable]] = None,
+            deps: typing.Optional[collections.abc.Callable[..., collections.abc.Sequence[Object]]] = None,
+            deduplication_key: typing.Optional[collections.abc.Callable[[], collections.abc.Hashable]] = None,
         ): ...
         def aio(
             self,
             rep: str,
             load: typing.Optional[
-                typing.Callable[
-                    [_BLOCKING_O, modal._resolver.Resolver, typing.Optional[str]], collections.abc.Awaitable[None]
+                collections.abc.Callable[
+                    [SUPERSELF, modal._resolver.Resolver, typing.Optional[str]], collections.abc.Awaitable[None]
                 ]
             ] = None,
             is_another_app: bool = False,
             preload: typing.Optional[
-                typing.Callable[
-                    [_BLOCKING_O, modal._resolver.Resolver, typing.Optional[str]], collections.abc.Awaitable[None]
+                collections.abc.Callable[
+                    [SUPERSELF, modal._resolver.Resolver, typing.Optional[str]], collections.abc.Awaitable[None]
                 ]
             ] = None,
             hydrate_lazily: bool = False,
-            deps: typing.Optional[typing.Callable[..., list[Object]]] = None,
+            deps: typing.Optional[collections.abc.Callable[..., collections.abc.Sequence[Object]]] = None,
             deduplication_key: typing.Optional[
-                typing.Callable[[], collections.abc.Awaitable[collections.abc.Hashable]]
+                collections.abc.Callable[[], collections.abc.Awaitable[collections.abc.Hashable]]
             ] = None,
         ): ...
 
-    _init: ___init_spec
+    _init: ___init_spec[typing_extensions.Self]
 
     def _unhydrate(self): ...
     def _initialize_from_empty(self): ...
@@ -169,51 +82,54 @@ class Object:
     ): ...
     def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
     def _get_metadata(self) -> typing.Optional[google.protobuf.message.Message]: ...
-    def _validate_is_hydrated(self: _BLOCKING_O): ...
-    def clone(self: _BLOCKING_O) -> _BLOCKING_O: ...
+    def _validate_is_hydrated(self): ...
+    def clone(self) -> typing_extensions.Self: ...
     @classmethod
     def _from_loader(
         cls,
-        load: typing.Callable[[_BLOCKING_O, modal._resolver.Resolver, typing.Optional[str]], None],
+        load: collections.abc.Callable[[typing_extensions.Self, modal._resolver.Resolver, typing.Optional[str]], None],
         rep: str,
         is_another_app: bool = False,
         preload: typing.Optional[
-            typing.Callable[[_BLOCKING_O, modal._resolver.Resolver, typing.Optional[str]], None]
+            collections.abc.Callable[[typing_extensions.Self, modal._resolver.Resolver, typing.Optional[str]], None]
         ] = None,
         hydrate_lazily: bool = False,
-        deps: typing.Optional[typing.Callable[..., collections.abc.Sequence[Object]]] = None,
-        deduplication_key: typing.Optional[typing.Callable[[], collections.abc.Hashable]] = None,
+        deps: typing.Optional[collections.abc.Callable[..., collections.abc.Sequence[Object]]] = None,
+        deduplication_key: typing.Optional[collections.abc.Callable[[], collections.abc.Hashable]] = None,
     ): ...
+    @staticmethod
+    def _get_type_from_id(object_id: str) -> type[Object]: ...
     @classmethod
-    def _get_type_from_id(cls: type[_BLOCKING_O], object_id: str) -> type[_BLOCKING_O]: ...
-    @classmethod
-    def _is_id_type(cls: type[_BLOCKING_O], object_id) -> bool: ...
+    def _is_id_type(cls, object_id) -> bool: ...
     @classmethod
     def _new_hydrated(
-        cls: type[_BLOCKING_O],
+        cls,
         object_id: str,
         client: modal.client.Client,
         handle_metadata: typing.Optional[google.protobuf.message.Message],
         is_another_app: bool = False,
-    ) -> _BLOCKING_O: ...
-    def _hydrate_from_other(self, other: _BLOCKING_O): ...
+    ) -> typing_extensions.Self: ...
+    def _hydrate_from_other(self, other: typing_extensions.Self): ...
     def __repr__(self): ...
     @property
     def local_uuid(self): ...
     @property
     def object_id(self) -> str: ...
     @property
+    def client(self) -> modal.client.Client: ...
+    @property
     def is_hydrated(self) -> bool: ...
     @property
-    def deps(self) -> typing.Callable[..., list[Object]]: ...
+    def deps(self) -> collections.abc.Callable[..., collections.abc.Sequence[Object]]: ...
 
-    class __resolve_spec(typing_extensions.Protocol):
+    class __resolve_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, client: typing.Optional[modal.client.Client] = None): ...
         async def aio(self, client: typing.Optional[modal.client.Client] = None): ...
 
-    resolve: __resolve_spec
+    resolve: __resolve_spec[typing_extensions.Self]
 
-def live_method(method): ...
-def live_method_gen(method): ...
+    class __hydrate_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(self, client: typing.Optional[modal.client.Client] = None) -> SUPERSELF: ...
+        async def aio(self, client: typing.Optional[modal.client.Client] = None) -> SUPERSELF: ...
 
-EPHEMERAL_OBJECT_HEARTBEAT_SLEEP: int
+    hydrate: __hydrate_spec[typing_extensions.Self]

modal/parallel_map.py

@@ -151,8 +151,8 @@ async def _map_invocation(
                     if err.status != Status.RESOURCE_EXHAUSTED:
                         raise err
                     logger.warning(
-                        "Warning: map progress is limited. Common bottlenecks "
-                        "include slow iteration over results, or function backlogs."
+                        f"Warning: map progress for function {function._function_name} is limited."
+                        " Common bottlenecks include slow iteration over results, or function backlogs."
                     )
 
             count_update()

modal/parallel_map.pyi

@@ -1,3 +1,4 @@
+import collections.abc
 import modal._utils.async_utils
 import modal.client
 import modal.functions
@@ -9,26 +10,28 @@ class _SynchronizedQueue:
     async def put(self, item): ...
     async def get(self): ...
 
+SUPERSELF = typing.TypeVar("SUPERSELF", covariant=True)
+
 class SynchronizedQueue:
     def __init__(self, /, *args, **kwargs): ...
 
-    class __init_spec(typing_extensions.Protocol):
+    class __init_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self): ...
         async def aio(self): ...
 
-    init: __init_spec
+    init: __init_spec[typing_extensions.Self]
 
-    class __put_spec(typing_extensions.Protocol):
+    class __put_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, item): ...
         async def aio(self, item): ...
 
-    put: __put_spec
+    put: __put_spec[typing_extensions.Self]
 
-    class __get_spec(typing_extensions.Protocol):
+    class __get_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self): ...
         async def aio(self): ...
 
-    get: __get_spec
+    get: __get_spec[typing_extensions.Self]
 
 class _OutputValue:
     value: typing.Any
@@ -43,7 +46,7 @@ def _map_invocation(
     client: modal.client._Client,
     order_outputs: bool,
     return_exceptions: bool,
-    count_update_callback: typing.Optional[typing.Callable[[int, int], None]],
+    count_update_callback: typing.Optional[collections.abc.Callable[[int, int], None]],
 ): ...
 def _map_sync(
     self, *input_iterators, kwargs={}, order_outputs: bool = True, return_exceptions: bool = False

modal/partial_function.py

@@ -89,6 +89,14 @@ class _PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
         self.force_build = force_build
         self.build_timeout = build_timeout
 
+    def _get_raw_f(self) -> Callable[P, ReturnType]:
+        return self.raw_f
+
+    def _is_web_endpoint(self) -> bool:
+        if self.webhook_config is None:
+            return False
+        return self.webhook_config.type != api_pb2.WEBHOOK_TYPE_UNSPECIFIED
+
     def __get__(self, obj, objtype=None) -> _Function[P, ReturnType, OriginalReturnType]:
         k = self.raw_f.__name__
         if obj:  # accessing the method on an instance of a class, e.g. `MyClass().fun``
@@ -530,10 +538,12 @@ def _build(
     _warn_parentheses_missing=None, *, force: bool = False, timeout: int = 86400
 ) -> Callable[[Union[Callable[[Any], Any], _PartialFunction]], _PartialFunction]:
     """
-    Decorator for methods that should execute at _build time_ to create a new layer
-    in a `modal.Image`.
+    Decorator for methods that execute at _build time_ to create a new Image layer.
 
-    See the [lifeycle function guide](https://modal.com/docs/guide/lifecycle-functions#build) for more information.
+    **Deprecated**: This function is deprecated. We recommend using `modal.Volume`
+    to store large assets (such as model weights) instead of writing them to the
+    Image during the build process. For other use cases, you can replace this
+    decorator with the `Image.run_function` method.
 
     **Usage**
 
@@ -552,6 +562,15 @@ def _build(
     if _warn_parentheses_missing is not None:
         raise InvalidError("Positional arguments are not allowed. Did you forget parentheses? Suggestion: `@build()`.")
 
+    deprecation_warning(
+        (2025, 1, 15),
+        "The `@modal.build` decorator is deprecated and will be removed in a future release."
+        "\n\nWe now recommend storing large assets (such as model weights) using a `modal.Volume`"
+        " instead of writing them directly into the `modal.Image` filesystem."
+        " For other use cases we recommend using `Image.run_function` instead."
+        "\n\nSee https://modal.com/docs/guide/modal-1-0-migration for more information.",
+    )
+
     def wrapper(f: Union[Callable[[Any], Any], _PartialFunction]) -> _PartialFunction:
         if isinstance(f, _PartialFunction):
             _disallow_wrapping_method(f, "build")

modal/partial_function.pyi

@@ -25,7 +25,7 @@ ReturnType = typing.TypeVar("ReturnType", covariant=True)
 OriginalReturnType = typing.TypeVar("OriginalReturnType", covariant=True)
 
 class _PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
-    raw_f: typing.Callable[P, ReturnType]
+    raw_f: collections.abc.Callable[P, ReturnType]
     flags: _PartialFunctionFlags
     webhook_config: typing.Optional[modal_proto.api_pb2.WebhookConfig]
     is_generator: bool
@@ -38,7 +38,7 @@ class _PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
 
     def __init__(
         self,
-        raw_f: typing.Callable[P, ReturnType],
+        raw_f: collections.abc.Callable[P, ReturnType],
         flags: _PartialFunctionFlags,
         webhook_config: typing.Optional[modal_proto.api_pb2.WebhookConfig] = None,
         is_generator: typing.Optional[bool] = None,
@@ -49,12 +49,14 @@ class _PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
         force_build: bool = False,
         build_timeout: typing.Optional[int] = None,
     ): ...
+    def _get_raw_f(self) -> collections.abc.Callable[P, ReturnType]: ...
+    def _is_web_endpoint(self) -> bool: ...
     def __get__(self, obj, objtype=None) -> modal.functions._Function[P, ReturnType, OriginalReturnType]: ...
     def __del__(self): ...
     def add_flags(self, flags) -> _PartialFunction: ...
 
 class PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
-    raw_f: typing.Callable[P, ReturnType]
+    raw_f: collections.abc.Callable[P, ReturnType]
     flags: _PartialFunctionFlags
     webhook_config: typing.Optional[modal_proto.api_pb2.WebhookConfig]
     is_generator: bool
@@ -67,7 +69,7 @@ class PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
 
     def __init__(
         self,
-        raw_f: typing.Callable[P, ReturnType],
+        raw_f: collections.abc.Callable[P, ReturnType],
         flags: _PartialFunctionFlags,
         webhook_config: typing.Optional[modal_proto.api_pb2.WebhookConfig] = None,
         is_generator: typing.Optional[bool] = None,
@@ -78,12 +80,16 @@ class PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
         force_build: bool = False,
         build_timeout: typing.Optional[int] = None,
     ): ...
+    def _get_raw_f(self) -> collections.abc.Callable[P, ReturnType]: ...
+    def _is_web_endpoint(self) -> bool: ...
     def __get__(self, obj, objtype=None) -> modal.functions.Function[P, ReturnType, OriginalReturnType]: ...
     def __del__(self): ...
     def add_flags(self, flags) -> PartialFunction: ...
 
 def _find_partial_methods_for_user_cls(user_cls: type[typing.Any], flags: int) -> dict[str, _PartialFunction]: ...
-def _find_callables_for_obj(user_obj: typing.Any, flags: int) -> dict[str, typing.Callable[..., typing.Any]]: ...
+def _find_callables_for_obj(
+    user_obj: typing.Any, flags: int
+) -> dict[str, collections.abc.Callable[..., typing.Any]]: ...
 
 class _MethodDecoratorType:
     @typing.overload
@@ -93,13 +99,13 @@ class _MethodDecoratorType:
     @typing.overload
     def __call__(
         self,
-        func: typing.Callable[
+        func: collections.abc.Callable[
             typing_extensions.Concatenate[typing.Any, P], collections.abc.Coroutine[typing.Any, typing.Any, ReturnType]
         ],
     ) -> PartialFunction[P, ReturnType, collections.abc.Coroutine[typing.Any, typing.Any, ReturnType]]: ...
     @typing.overload
     def __call__(
-        self, func: typing.Callable[typing_extensions.Concatenate[typing.Any, P], ReturnType]
+        self, func: collections.abc.Callable[typing_extensions.Concatenate[typing.Any, P], ReturnType]
     ) -> PartialFunction[P, ReturnType, ReturnType]: ...
 
 def _method(
@@ -120,7 +126,9 @@ def _web_endpoint(
     custom_domains: typing.Optional[collections.abc.Iterable[str]] = None,
     requires_proxy_auth: bool = False,
     wait_for_response: bool = True,
-) -> typing.Callable[[typing.Callable[P, ReturnType]], _PartialFunction[P, ReturnType, ReturnType]]: ...
+) -> collections.abc.Callable[
+    [collections.abc.Callable[P, ReturnType]], _PartialFunction[P, ReturnType, ReturnType]
+]: ...
 def _asgi_app(
     _warn_parentheses_missing=None,
     *,
@@ -128,7 +136,7 @@ def _asgi_app(
     custom_domains: typing.Optional[collections.abc.Iterable[str]] = None,
     requires_proxy_auth: bool = False,
     wait_for_response: bool = True,
-) -> typing.Callable[[typing.Callable[..., typing.Any]], _PartialFunction]: ...
+) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], _PartialFunction]: ...
 def _wsgi_app(
     _warn_parentheses_missing=None,
     *,
@@ -136,7 +144,7 @@ def _wsgi_app(
     custom_domains: typing.Optional[collections.abc.Iterable[str]] = None,
     requires_proxy_auth: bool = False,
     wait_for_response: bool = True,
-) -> typing.Callable[[typing.Callable[..., typing.Any]], _PartialFunction]: ...
+) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], _PartialFunction]: ...
 def _web_server(
     port: int,
     *,
@@ -144,31 +152,35 @@ def _web_server(
     label: typing.Optional[str] = None,
     custom_domains: typing.Optional[collections.abc.Iterable[str]] = None,
     requires_proxy_auth: bool = False,
-) -> typing.Callable[[typing.Callable[..., typing.Any]], _PartialFunction]: ...
+) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], _PartialFunction]: ...
 def _disallow_wrapping_method(f: _PartialFunction, wrapper: str) -> None: ...
 def _build(
     _warn_parentheses_missing=None, *, force: bool = False, timeout: int = 86400
-) -> typing.Callable[[typing.Union[typing.Callable[[typing.Any], typing.Any], _PartialFunction]], _PartialFunction]: ...
+) -> collections.abc.Callable[
+    [typing.Union[collections.abc.Callable[[typing.Any], typing.Any], _PartialFunction]], _PartialFunction
+]: ...
 def _enter(
     _warn_parentheses_missing=None, *, snap: bool = False
-) -> typing.Callable[[typing.Union[typing.Callable[[typing.Any], typing.Any], _PartialFunction]], _PartialFunction]: ...
+) -> collections.abc.Callable[
+    [typing.Union[collections.abc.Callable[[typing.Any], typing.Any], _PartialFunction]], _PartialFunction
+]: ...
 def _exit(
     _warn_parentheses_missing=None,
-) -> typing.Callable[
+) -> collections.abc.Callable[
     [
         typing.Union[
-            typing.Callable[
+            collections.abc.Callable[
                 [typing.Any, typing.Optional[type[BaseException]], typing.Optional[BaseException], typing.Any],
                 typing.Any,
             ],
-            typing.Callable[[typing.Any], typing.Any],
+            collections.abc.Callable[[typing.Any], typing.Any],
         ]
     ],
     _PartialFunction,
 ]: ...
 def _batched(
     _warn_parentheses_missing=None, *, max_batch_size: int, wait_ms: int
-) -> typing.Callable[[typing.Callable[..., typing.Any]], _PartialFunction]: ...
+) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], _PartialFunction]: ...
 def method(
     _warn_parentheses_missing=None,
     *,
@@ -184,7 +196,9 @@ def web_endpoint(
     custom_domains: typing.Optional[collections.abc.Iterable[str]] = None,
     requires_proxy_auth: bool = False,
     wait_for_response: bool = True,
-) -> typing.Callable[[typing.Callable[P, ReturnType]], PartialFunction[P, ReturnType, ReturnType]]: ...
+) -> collections.abc.Callable[
+    [collections.abc.Callable[P, ReturnType]], PartialFunction[P, ReturnType, ReturnType]
+]: ...
 def asgi_app(
     _warn_parentheses_missing=None,
     *,
@@ -192,7 +206,7 @@ def asgi_app(
     custom_domains: typing.Optional[collections.abc.Iterable[str]] = None,
     requires_proxy_auth: bool = False,
     wait_for_response: bool = True,
-) -> typing.Callable[[typing.Callable[..., typing.Any]], PartialFunction]: ...
+) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], PartialFunction]: ...
 def wsgi_app(
     _warn_parentheses_missing=None,
     *,
@@ -200,7 +214,7 @@ def wsgi_app(
     custom_domains: typing.Optional[collections.abc.Iterable[str]] = None,
     requires_proxy_auth: bool = False,
     wait_for_response: bool = True,
-) -> typing.Callable[[typing.Callable[..., typing.Any]], PartialFunction]: ...
+) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], PartialFunction]: ...
 def web_server(
     port: int,
     *,
@@ -208,27 +222,31 @@ def web_server(
     label: typing.Optional[str] = None,
     custom_domains: typing.Optional[collections.abc.Iterable[str]] = None,
     requires_proxy_auth: bool = False,
-) -> typing.Callable[[typing.Callable[..., typing.Any]], PartialFunction]: ...
+) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], PartialFunction]: ...
 def build(
     _warn_parentheses_missing=None, *, force: bool = False, timeout: int = 86400
-) -> typing.Callable[[typing.Union[typing.Callable[[typing.Any], typing.Any], PartialFunction]], PartialFunction]: ...
+) -> collections.abc.Callable[
+    [typing.Union[collections.abc.Callable[[typing.Any], typing.Any], PartialFunction]], PartialFunction
+]: ...
 def enter(
     _warn_parentheses_missing=None, *, snap: bool = False
-) -> typing.Callable[[typing.Union[typing.Callable[[typing.Any], typing.Any], PartialFunction]], PartialFunction]: ...
+) -> collections.abc.Callable[
+    [typing.Union[collections.abc.Callable[[typing.Any], typing.Any], PartialFunction]], PartialFunction
+]: ...
 def exit(
     _warn_parentheses_missing=None,
-) -> typing.Callable[
+) -> collections.abc.Callable[
     [
         typing.Union[
-            typing.Callable[
+            collections.abc.Callable[
                 [typing.Any, typing.Optional[type[BaseException]], typing.Optional[BaseException], typing.Any],
                 typing.Any,
             ],
-            typing.Callable[[typing.Any], typing.Any],
+            collections.abc.Callable[[typing.Any], typing.Any],
         ]
     ],
     PartialFunction,
 ]: ...
 def batched(
     _warn_parentheses_missing=None, *, max_batch_size: int, wait_ms: int
-) -> typing.Callable[[typing.Callable[..., typing.Any]], PartialFunction]: ...
+) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], PartialFunction]: ...

modal/proxy.py

@@ -3,9 +3,9 @@ from typing import Optional
 
 from modal_proto import api_pb2
 
+from ._object import _get_environment_name, _Object
 from ._resolver import Resolver
 from ._utils.async_utils import synchronize_api
-from .object import _get_environment_name, _Object
 
 
 class _Proxy(_Object, type_prefix="pr"):

modal/proxy.pyi

@@ -1,7 +1,8 @@
+import modal._object
 import modal.object
 import typing
 
-class _Proxy(modal.object._Object):
+class _Proxy(modal._object._Object):
     @staticmethod
     def from_name(name: str, environment_name: typing.Optional[str] = None) -> _Proxy: ...
 

modal/queue.py

@@ -10,6 +10,7 @@ from synchronicity.async_wrap import asynccontextmanager
 
 from modal_proto import api_pb2
 
+from ._object import EPHEMERAL_OBJECT_HEARTBEAT_SLEEP, _get_environment_name, _Object, live_method, live_method_gen
 from ._resolver import Resolver
 from ._serialization import deserialize, serialize
 from ._utils.async_utils import TaskContext, synchronize_api, warn_if_generator_is_not_consumed
@@ -18,7 +19,6 @@ from ._utils.grpc_utils import retry_transient_errors
 from ._utils.name_utils import check_object_name
 from .client import _Client
 from .exception import InvalidError, RequestSizeError
-from .object import EPHEMERAL_OBJECT_HEARTBEAT_SLEEP, _get_environment_name, _Object, live_method, live_method_gen
 
 
 class _Queue(_Object, type_prefix="qu"):