modal 0.62.115__py3-none-any.whl → 0.72.13__py3-none-any.whl

modal/functions.pyi

@@ -1,542 +1,601 @@
+import collections.abc
 import google.protobuf.message
-import modal._output
 import modal._utils.async_utils
 import modal._utils.function_utils
 import modal.app
 import modal.call_graph
 import modal.client
 import modal.cloud_bucket_mount
+import modal.cls
 import modal.gpu
 import modal.image
 import modal.mount
 import modal.network_file_system
 import modal.object
 import modal.parallel_map
+import modal.partial_function
 import modal.proxy
 import modal.retries
 import modal.schedule
 import modal.scheduler_placement
 import modal.secret
 import modal.volume
-import modal_proto.api_grpc
 import modal_proto.api_pb2
+import modal_proto.modal_api_grpc
 import pathlib
 import typing
 import typing_extensions
 
-class _Invocation:
-    def __init__(self, stub: modal_proto.api_grpc.ModalClientStub, function_call_id: str, client: modal.client._Client):
-        ...
+class _RetryContext:
+    function_call_invocation_type: int
+    retry_policy: modal_proto.api_pb2.FunctionRetryPolicy
+    function_call_jwt: str
+    input_jwt: str
+    input_id: str
+    item: modal_proto.api_pb2.FunctionPutInputsItem
+
+    def __init__(
+        self,
+        function_call_invocation_type: int,
+        retry_policy: modal_proto.api_pb2.FunctionRetryPolicy,
+        function_call_jwt: str,
+        input_jwt: str,
+        input_id: str,
+        item: modal_proto.api_pb2.FunctionPutInputsItem,
+    ) -> None: ...
+    def __repr__(self): ...
+    def __eq__(self, other): ...
 
+class _Invocation:
+    stub: modal_proto.modal_api_grpc.ModalClientModal
+
+    def __init__(
+        self,
+        stub: modal_proto.modal_api_grpc.ModalClientModal,
+        function_call_id: str,
+        client: modal.client._Client,
+        retry_context: typing.Optional[_RetryContext] = None,
+    ): ...
     @staticmethod
-    async def create(function_id: str, args, kwargs, client: modal.client._Client) -> _Invocation:
-        ...
-
-    def pop_function_call_outputs(self, timeout: typing.Union[float, None], clear_on_success: bool) -> typing.AsyncIterator[modal_proto.api_pb2.FunctionGetOutputsItem]:
-        ...
-
-    async def run_function(self) -> typing.Any:
-        ...
-
-    async def poll_function(self, timeout: typing.Union[float, None] = None):
-        ...
-
-    def run_generator(self):
-        ...
-
+    async def create(
+        function: _Function, args, kwargs, *, client: modal.client._Client, function_call_invocation_type: int
+    ) -> _Invocation: ...
+    async def pop_function_call_outputs(
+        self, timeout: typing.Optional[float], clear_on_success: bool, input_jwts: typing.Optional[list[str]] = None
+    ) -> modal_proto.api_pb2.FunctionGetOutputsResponse: ...
+    async def _retry_input(self) -> None: ...
+    async def _get_single_output(self, expected_jwt: typing.Optional[str] = None) -> typing.Any: ...
+    async def run_function(self) -> typing.Any: ...
+    async def poll_function(self, timeout: typing.Optional[float] = None): ...
+    def run_generator(self): ...
 
 class FunctionStats:
     backlog: int
-    num_active_runners: int
     num_total_runners: int
 
-    def __init__(self, backlog: int, num_active_runners: int, num_total_runners: int) -> None:
-        ...
-
-    def __repr__(self):
-        ...
-
-    def __eq__(self, other):
-        ...
-
-    def __setattr__(self, name, value):
-        ...
-
-    def __delattr__(self, name):
-        ...
-
-    def __hash__(self):
-        ...
-
-
-def _parse_retries(retries: typing.Union[int, modal.retries.Retries, None], raw_f: typing.Union[typing.Callable, None] = None) -> typing.Union[modal_proto.api_pb2.FunctionRetryPolicy, None]:
-    ...
+    def __getattr__(self, name): ...
+    def __init__(self, backlog: int, num_total_runners: int) -> None: ...
+    def __repr__(self): ...
+    def __eq__(self, other): ...
+    def __setattr__(self, name, value): ...
+    def __delattr__(self, name): ...
+    def __hash__(self): ...
 
+def _parse_retries(
+    retries: typing.Union[int, modal.retries.Retries, None], source: str = ""
+) -> typing.Optional[modal_proto.api_pb2.FunctionRetryPolicy]: ...
 
 class _FunctionSpec:
-    image: typing.Union[modal.image._Image, None]
-    mounts: typing.Sequence[modal.mount._Mount]
-    secrets: typing.Sequence[modal.secret._Secret]
-    network_file_systems: typing.Dict[typing.Union[str, pathlib.PurePosixPath], modal.network_file_system._NetworkFileSystem]
-    volumes: typing.Dict[typing.Union[str, pathlib.PurePosixPath], typing.Union[modal.volume._Volume, modal.cloud_bucket_mount._CloudBucketMount]]
-    gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig]
-    cloud: typing.Union[str, None]
-    cpu: typing.Union[float, None]
-    memory: typing.Union[int, typing.Tuple[int, int], None]
-
-    def __init__(self, image: typing.Union[modal.image._Image, None], mounts: typing.Sequence[modal.mount._Mount], secrets: typing.Sequence[modal.secret._Secret], network_file_systems: typing.Dict[typing.Union[str, pathlib.PurePosixPath], modal.network_file_system._NetworkFileSystem], volumes: typing.Dict[typing.Union[str, pathlib.PurePosixPath], typing.Union[modal.volume._Volume, modal.cloud_bucket_mount._CloudBucketMount]], gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig], cloud: typing.Union[str, None], cpu: typing.Union[float, None], memory: typing.Union[int, typing.Tuple[int, int], None]) -> None:
-        ...
-
-    def __repr__(self):
-        ...
-
-    def __eq__(self, other):
-        ...
-
-
-class _Function(modal.object._Object):
-    _info: typing.Union[modal._utils.function_utils.FunctionInfo, None]
-    _all_mounts: typing.Collection[modal.mount._Mount]
-    _app: modal.app._App
-    _obj: typing.Any
-    _web_url: typing.Union[str, None]
-    _is_remote_cls_method: bool
-    _function_name: typing.Union[str, None]
+    image: typing.Optional[modal.image._Image]
+    mounts: collections.abc.Sequence[modal.mount._Mount]
+    secrets: collections.abc.Sequence[modal.secret._Secret]
+    network_file_systems: dict[typing.Union[str, pathlib.PurePosixPath], modal.network_file_system._NetworkFileSystem]
+    volumes: dict[
+        typing.Union[str, pathlib.PurePosixPath],
+        typing.Union[modal.volume._Volume, modal.cloud_bucket_mount._CloudBucketMount],
+    ]
+    gpus: typing.Union[None, bool, str, modal.gpu._GPUConfig, list[typing.Union[None, bool, str, modal.gpu._GPUConfig]]]
+    cloud: typing.Optional[str]
+    cpu: typing.Union[float, tuple[float, float], None]
+    memory: typing.Union[int, tuple[int, int], None]
+    ephemeral_disk: typing.Optional[int]
+    scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement]
+    proxy: typing.Optional[modal.proxy._Proxy]
+
+    def __init__(
+        self,
+        image: typing.Optional[modal.image._Image],
+        mounts: collections.abc.Sequence[modal.mount._Mount],
+        secrets: collections.abc.Sequence[modal.secret._Secret],
+        network_file_systems: dict[
+            typing.Union[str, pathlib.PurePosixPath], modal.network_file_system._NetworkFileSystem
+        ],
+        volumes: dict[
+            typing.Union[str, pathlib.PurePosixPath],
+            typing.Union[modal.volume._Volume, modal.cloud_bucket_mount._CloudBucketMount],
+        ],
+        gpus: typing.Union[
+            None, bool, str, modal.gpu._GPUConfig, list[typing.Union[None, bool, str, modal.gpu._GPUConfig]]
+        ],
+        cloud: typing.Optional[str],
+        cpu: typing.Union[float, tuple[float, float], None],
+        memory: typing.Union[int, tuple[int, int], None],
+        ephemeral_disk: typing.Optional[int],
+        scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement],
+        proxy: typing.Optional[modal.proxy._Proxy],
+    ) -> None: ...
+    def __repr__(self): ...
+    def __eq__(self, other): ...
+
+P = typing_extensions.ParamSpec("P")
+
+ReturnType = typing.TypeVar("ReturnType", covariant=True)
+
+OriginalReturnType = typing.TypeVar("OriginalReturnType", covariant=True)
+
+class _Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object._Object):
+    _info: typing.Optional[modal._utils.function_utils.FunctionInfo]
+    _serve_mounts: frozenset[modal.mount._Mount]
+    _app: typing.Optional[modal.app._App]
+    _obj: typing.Optional[modal.cls._Obj]
+    _web_url: typing.Optional[str]
+    _function_name: typing.Optional[str]
     _is_method: bool
-    _spec: _FunctionSpec
+    _spec: typing.Optional[_FunctionSpec]
     _tag: str
     _raw_f: typing.Callable[..., typing.Any]
     _build_args: dict
-    _parent: _Function
+    _is_generator: typing.Optional[bool]
+    _cluster_size: typing.Optional[int]
+    _use_method_name: str
+    _class_parameter_info: typing.Optional[modal_proto.api_pb2.ClassParameterInfo]
+    _method_handle_metadata: typing.Optional[dict[str, modal_proto.api_pb2.FunctionHandleMetadata]]
 
+    def _bind_method(self, user_cls, method_name: str, partial_function: modal.partial_function._PartialFunction): ...
     @staticmethod
-    def from_args(info: modal._utils.function_utils.FunctionInfo, app, image: modal.image._Image, secret: typing.Union[modal.secret._Secret, None] = None, secrets: typing.Sequence[modal.secret._Secret] = (), schedule: typing.Union[modal.schedule.Schedule, None] = None, is_generator=False, gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig] = None, mounts: typing.Collection[modal.mount._Mount] = (), network_file_systems: typing.Dict[typing.Union[str, pathlib.PurePosixPath], modal.network_file_system._NetworkFileSystem] = {}, allow_cross_region_volumes: bool = False, volumes: typing.Dict[typing.Union[str, pathlib.PurePosixPath], typing.Union[modal.volume._Volume, modal.cloud_bucket_mount._CloudBucketMount]] = {}, webhook_config: typing.Union[modal_proto.api_pb2.WebhookConfig, None] = None, memory: typing.Union[int, typing.Tuple[int, int], None] = None, proxy: typing.Union[modal.proxy._Proxy, None] = None, retries: typing.Union[int, modal.retries.Retries, None] = None, timeout: typing.Union[int, None] = None, concurrency_limit: typing.Union[int, None] = None, allow_concurrent_inputs: typing.Union[int, None] = None, container_idle_timeout: typing.Union[int, None] = None, cpu: typing.Union[float, None] = None, keep_warm: typing.Union[int, None] = None, cloud: typing.Union[str, None] = None, _experimental_boost: bool = False, _experimental_scheduler: bool = False, _experimental_scheduler_placement: typing.Union[modal.scheduler_placement.SchedulerPlacement, None] = None, is_builder_function: bool = False, is_auto_snapshot: bool = False, enable_memory_snapshot: bool = False, checkpointing_enabled: typing.Union[bool, None] = None, allow_background_volume_commits: bool = False, block_network: bool = False, max_inputs: typing.Union[int, None] = None) -> None:
-        ...
-
-    def from_parametrized(self, obj, from_other_workspace: bool, options: typing.Union[modal_proto.api_pb2.FunctionOptions, None], args: typing.Sized, kwargs: typing.Dict[str, typing.Any]) -> _Function:
-        ...
-
-    async def keep_warm(self, warm_pool_size: int) -> None:
-        ...
-
+    def from_args(
+        info: modal._utils.function_utils.FunctionInfo,
+        app,
+        image: modal.image._Image,
+        secrets: collections.abc.Sequence[modal.secret._Secret] = (),
+        schedule: typing.Optional[modal.schedule.Schedule] = None,
+        is_generator: bool = False,
+        gpu: typing.Union[
+            None, bool, str, modal.gpu._GPUConfig, list[typing.Union[None, bool, str, modal.gpu._GPUConfig]]
+        ] = None,
+        mounts: collections.abc.Collection[modal.mount._Mount] = (),
+        network_file_systems: dict[
+            typing.Union[str, pathlib.PurePosixPath], modal.network_file_system._NetworkFileSystem
+        ] = {},
+        allow_cross_region_volumes: bool = False,
+        volumes: dict[
+            typing.Union[str, pathlib.PurePosixPath],
+            typing.Union[modal.volume._Volume, modal.cloud_bucket_mount._CloudBucketMount],
+        ] = {},
+        webhook_config: typing.Optional[modal_proto.api_pb2.WebhookConfig] = None,
+        memory: typing.Union[int, tuple[int, int], None] = None,
+        proxy: typing.Optional[modal.proxy._Proxy] = None,
+        retries: typing.Union[int, modal.retries.Retries, None] = None,
+        timeout: typing.Optional[int] = None,
+        concurrency_limit: typing.Optional[int] = None,
+        allow_concurrent_inputs: typing.Optional[int] = None,
+        batch_max_size: typing.Optional[int] = None,
+        batch_wait_ms: typing.Optional[int] = None,
+        container_idle_timeout: typing.Optional[int] = None,
+        cpu: typing.Union[float, tuple[float, float], None] = None,
+        keep_warm: typing.Optional[int] = None,
+        cloud: typing.Optional[str] = None,
+        scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
+        is_builder_function: bool = False,
+        is_auto_snapshot: bool = False,
+        enable_memory_snapshot: bool = False,
+        block_network: bool = False,
+        i6pn_enabled: bool = False,
+        cluster_size: typing.Optional[int] = None,
+        max_inputs: typing.Optional[int] = None,
+        ephemeral_disk: typing.Optional[int] = None,
+        _experimental_buffer_containers: typing.Optional[int] = None,
+        _experimental_proxy_ip: typing.Optional[str] = None,
+        _experimental_custom_scaling_factor: typing.Optional[float] = None,
+    ) -> None: ...
+    def _bind_parameters(
+        self,
+        obj: modal.cls._Obj,
+        options: typing.Optional[modal_proto.api_pb2.FunctionOptions],
+        args: collections.abc.Sized,
+        kwargs: dict[str, typing.Any],
+    ) -> _Function: ...
+    async def keep_warm(self, warm_pool_size: int) -> None: ...
     @classmethod
-    def from_name(cls: typing.Type[_Function], app_name: str, tag: typing.Union[str, None] = None, namespace=1, environment_name: typing.Union[str, None] = None) -> _Function:
-        ...
-
+    def from_name(
+        cls: type[_Function], app_name: str, name: str, namespace=1, environment_name: typing.Optional[str] = None
+    ) -> _Function: ...
     @staticmethod
-    async def lookup(app_name: str, tag: typing.Union[str, None] = None, namespace=1, client: typing.Union[modal.client._Client, None] = None, environment_name: typing.Union[str, None] = None) -> _Function:
-        ...
-
+    async def lookup(
+        app_name: str,
+        name: str,
+        namespace=1,
+        client: typing.Optional[modal.client._Client] = None,
+        environment_name: typing.Optional[str] = None,
+    ) -> _Function: ...
     @property
-    def tag(self) -> str:
-        ...
-
+    def tag(self) -> str: ...
     @property
-    def app(self) -> modal.app._App:
-        ...
-
+    def app(self) -> modal.app._App: ...
     @property
-    def stub(self) -> modal.app._App:
-        ...
-
+    def stub(self) -> modal.app._App: ...
     @property
-    def info(self) -> modal._utils.function_utils.FunctionInfo:
-        ...
-
+    def info(self) -> modal._utils.function_utils.FunctionInfo: ...
     @property
-    def spec(self) -> _FunctionSpec:
-        ...
-
-    def get_build_def(self) -> str:
-        ...
-
-    def _initialize_from_empty(self):
-        ...
-
-    def _hydrate_metadata(self, metadata: typing.Union[google.protobuf.message.Message, None]):
-        ...
-
-    def _get_metadata(self):
-        ...
-
-    def _set_mute_cancellation(self, value: bool = True):
-        ...
-
-    def _set_output_mgr(self, output_mgr: modal._output.OutputManager):
-        ...
-
+    def spec(self) -> _FunctionSpec: ...
+    def get_build_def(self) -> str: ...
+    def _initialize_from_empty(self): ...
+    def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
+    def _get_metadata(self): ...
+    def _check_no_web_url(self, fn_name: str): ...
     @property
-    def web_url(self) -> str:
-        ...
-
+    async def web_url(self) -> str: ...
     @property
-    def is_generator(self) -> bool:
-        ...
-
-    def _map(self, input_queue: modal.parallel_map._SynchronizedQueue, order_outputs: bool, return_exceptions: bool) -> typing.AsyncGenerator[typing.Any, None]:
-        ...
-
-    async def _call_function(self, args, kwargs):
-        ...
-
-    async def _call_function_nowait(self, args, kwargs) -> _Invocation:
-        ...
-
-    def _call_generator(self, args, kwargs):
-        ...
-
-    async def _call_generator_nowait(self, args, kwargs):
-        ...
-
-    async def remote(self, *args, **kwargs) -> typing.Any:
-        ...
-
-    def remote_gen(self, *args, **kwargs) -> typing.AsyncGenerator[typing.Any, None]:
-        ...
-
-    async def shell(self, *args, **kwargs) -> None:
-        ...
-
-    def _get_is_remote_cls_method(self):
-        ...
-
-    def _get_info(self):
-        ...
-
-    def _get_obj(self):
-        ...
-
-    def local(self, *args, **kwargs) -> typing.Any:
-        ...
-
-    async def spawn(self, *args, **kwargs) -> typing.Union[_FunctionCall, None]:
-        ...
-
-    def get_raw_f(self) -> typing.Callable[..., typing.Any]:
-        ...
-
-    async def get_current_stats(self) -> FunctionStats:
-        ...
+    async def is_generator(self) -> bool: ...
+    @property
+    def cluster_size(self) -> int: ...
+    def _map(
+        self, input_queue: modal.parallel_map._SynchronizedQueue, order_outputs: bool, return_exceptions: bool
+    ) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
+    async def _call_function(self, args, kwargs) -> ReturnType: ...
+    async def _call_function_nowait(self, args, kwargs, function_call_invocation_type: int) -> _Invocation: ...
+    def _call_generator(self, args, kwargs): ...
+    async def _call_generator_nowait(self, args, kwargs): ...
+    async def remote(self, *args: P.args, **kwargs: P.kwargs) -> ReturnType: ...
+    def remote_gen(self, *args, **kwargs) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
+    def _is_local(self): ...
+    def _get_info(self) -> modal._utils.function_utils.FunctionInfo: ...
+    def _get_obj(self) -> typing.Optional[modal.cls._Obj]: ...
+    def local(self, *args: P.args, **kwargs: P.kwargs) -> OriginalReturnType: ...
+    async def _experimental_spawn(self, *args: P.args, **kwargs: P.kwargs) -> _FunctionCall[ReturnType]: ...
+    async def spawn(self, *args: P.args, **kwargs: P.kwargs) -> _FunctionCall[ReturnType]: ...
+    def get_raw_f(self) -> typing.Callable[..., typing.Any]: ...
+    async def get_current_stats(self) -> FunctionStats: ...
 
     class __map_spec(typing_extensions.Protocol):
-        def __call__(self, *input_iterators, kwargs={}, order_outputs: bool = True, return_exceptions: bool = False) -> modal._utils.async_utils.AsyncOrSyncIteratable:
-            ...
-
-        def aio(self, *input_iterators: typing.Union[typing.Iterable[typing.Any], typing.AsyncIterable[typing.Any]], kwargs={}, order_outputs: bool = True, return_exceptions: bool = False) -> typing.AsyncGenerator[typing.Any, None]:
-            ...
+        def __call__(
+            self, *input_iterators, kwargs={}, order_outputs: bool = True, return_exceptions: bool = False
+        ) -> modal._utils.async_utils.AsyncOrSyncIterable: ...
+        def aio(
+            self,
+            *input_iterators: typing.Union[typing.Iterable[typing.Any], typing.AsyncIterable[typing.Any]],
+            kwargs={},
+            order_outputs: bool = True,
+            return_exceptions: bool = False,
+        ) -> typing.AsyncGenerator[typing.Any, None]: ...
 
     map: __map_spec
 
     class __starmap_spec(typing_extensions.Protocol):
-        def __call__(self, input_iterator: typing.Iterable[typing.Sequence[typing.Any]], kwargs={}, order_outputs: bool = True, return_exceptions: bool = False) -> modal._utils.async_utils.AsyncOrSyncIteratable:
-            ...
-
-        def aio(self, input_iterator: typing.Union[typing.Iterable[typing.Sequence[typing.Any]], typing.AsyncIterable[typing.Sequence[typing.Any]]], kwargs={}, order_outputs: bool = True, return_exceptions: bool = False) -> typing.AsyncIterable[typing.Any]:
-            ...
+        def __call__(
+            self,
+            input_iterator: typing.Iterable[typing.Sequence[typing.Any]],
+            kwargs={},
+            order_outputs: bool = True,
+            return_exceptions: bool = False,
+        ) -> modal._utils.async_utils.AsyncOrSyncIterable: ...
+        def aio(
+            self,
+            input_iterator: typing.Union[
+                typing.Iterable[typing.Sequence[typing.Any]], typing.AsyncIterable[typing.Sequence[typing.Any]]
+            ],
+            kwargs={},
+            order_outputs: bool = True,
+            return_exceptions: bool = False,
+        ) -> typing.AsyncIterable[typing.Any]: ...
 
     starmap: __starmap_spec
 
     class __for_each_spec(typing_extensions.Protocol):
-        def __call__(self, *input_iterators, kwargs={}, ignore_exceptions: bool = False):
-            ...
-
-        async def aio(self, *input_iterators, kwargs={}, ignore_exceptions: bool = False):
-            ...
+        def __call__(self, *input_iterators, kwargs={}, ignore_exceptions: bool = False): ...
+        async def aio(self, *input_iterators, kwargs={}, ignore_exceptions: bool = False): ...
 
     for_each: __for_each_spec
 
+ReturnType_INNER = typing.TypeVar("ReturnType_INNER", covariant=True)
+
+P_INNER = typing_extensions.ParamSpec("P_INNER")
 
-class Function(modal.object.Object):
-    _info: typing.Union[modal._utils.function_utils.FunctionInfo, None]
-    _all_mounts: typing.Collection[modal.mount.Mount]
-    _app: modal.app.App
-    _obj: typing.Any
-    _web_url: typing.Union[str, None]
-    _is_remote_cls_method: bool
-    _function_name: typing.Union[str, None]
+class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.Object):
+    _info: typing.Optional[modal._utils.function_utils.FunctionInfo]
+    _serve_mounts: frozenset[modal.mount.Mount]
+    _app: typing.Optional[modal.app.App]
+    _obj: typing.Optional[modal.cls.Obj]
+    _web_url: typing.Optional[str]
+    _function_name: typing.Optional[str]
     _is_method: bool
-    _spec: _FunctionSpec
+    _spec: typing.Optional[_FunctionSpec]
     _tag: str
     _raw_f: typing.Callable[..., typing.Any]
     _build_args: dict
-    _parent: Function
-
-    def __init__(self, *args, **kwargs):
-        ...
-
+    _is_generator: typing.Optional[bool]
+    _cluster_size: typing.Optional[int]
+    _use_method_name: str
+    _class_parameter_info: typing.Optional[modal_proto.api_pb2.ClassParameterInfo]
+    _method_handle_metadata: typing.Optional[dict[str, modal_proto.api_pb2.FunctionHandleMetadata]]
+
+    def __init__(self, *args, **kwargs): ...
+    def _bind_method(self, user_cls, method_name: str, partial_function: modal.partial_function.PartialFunction): ...
     @staticmethod
-    def from_args(info: modal._utils.function_utils.FunctionInfo, app, image: modal.image.Image, secret: typing.Union[modal.secret.Secret, None] = None, secrets: typing.Sequence[modal.secret.Secret] = (), schedule: typing.Union[modal.schedule.Schedule, None] = None, is_generator=False, gpu: typing.Union[None, bool, str, modal.gpu._GPUConfig] = None, mounts: typing.Collection[modal.mount.Mount] = (), network_file_systems: typing.Dict[typing.Union[str, pathlib.PurePosixPath], modal.network_file_system.NetworkFileSystem] = {}, allow_cross_region_volumes: bool = False, volumes: typing.Dict[typing.Union[str, pathlib.PurePosixPath], typing.Union[modal.volume.Volume, modal.cloud_bucket_mount.CloudBucketMount]] = {}, webhook_config: typing.Union[modal_proto.api_pb2.WebhookConfig, None] = None, memory: typing.Union[int, typing.Tuple[int, int], None] = None, proxy: typing.Union[modal.proxy.Proxy, None] = None, retries: typing.Union[int, modal.retries.Retries, None] = None, timeout: typing.Union[int, None] = None, concurrency_limit: typing.Union[int, None] = None, allow_concurrent_inputs: typing.Union[int, None] = None, container_idle_timeout: typing.Union[int, None] = None, cpu: typing.Union[float, None] = None, keep_warm: typing.Union[int, None] = None, cloud: typing.Union[str, None] = None, _experimental_boost: bool = False, _experimental_scheduler: bool = False, _experimental_scheduler_placement: typing.Union[modal.scheduler_placement.SchedulerPlacement, None] = None, is_builder_function: bool = False, is_auto_snapshot: bool = False, enable_memory_snapshot: bool = False, checkpointing_enabled: typing.Union[bool, None] = None, allow_background_volume_commits: bool = False, block_network: bool = False, max_inputs: typing.Union[int, None] = None) -> None:
-        ...
-
-    def from_parametrized(self, obj, from_other_workspace: bool, options: typing.Union[modal_proto.api_pb2.FunctionOptions, None], args: typing.Sized, kwargs: typing.Dict[str, typing.Any]) -> Function:
-        ...
+    def from_args(
+        info: modal._utils.function_utils.FunctionInfo,
+        app,
+        image: modal.image.Image,
+        secrets: collections.abc.Sequence[modal.secret.Secret] = (),
+        schedule: typing.Optional[modal.schedule.Schedule] = None,
+        is_generator: bool = False,
+        gpu: typing.Union[
+            None, bool, str, modal.gpu._GPUConfig, list[typing.Union[None, bool, str, modal.gpu._GPUConfig]]
+        ] = None,
+        mounts: collections.abc.Collection[modal.mount.Mount] = (),
+        network_file_systems: dict[
+            typing.Union[str, pathlib.PurePosixPath], modal.network_file_system.NetworkFileSystem
+        ] = {},
+        allow_cross_region_volumes: bool = False,
+        volumes: dict[
+            typing.Union[str, pathlib.PurePosixPath],
+            typing.Union[modal.volume.Volume, modal.cloud_bucket_mount.CloudBucketMount],
+        ] = {},
+        webhook_config: typing.Optional[modal_proto.api_pb2.WebhookConfig] = None,
+        memory: typing.Union[int, tuple[int, int], None] = None,
+        proxy: typing.Optional[modal.proxy.Proxy] = None,
+        retries: typing.Union[int, modal.retries.Retries, None] = None,
+        timeout: typing.Optional[int] = None,
+        concurrency_limit: typing.Optional[int] = None,
+        allow_concurrent_inputs: typing.Optional[int] = None,
+        batch_max_size: typing.Optional[int] = None,
+        batch_wait_ms: typing.Optional[int] = None,
+        container_idle_timeout: typing.Optional[int] = None,
+        cpu: typing.Union[float, tuple[float, float], None] = None,
+        keep_warm: typing.Optional[int] = None,
+        cloud: typing.Optional[str] = None,
+        scheduler_placement: typing.Optional[modal.scheduler_placement.SchedulerPlacement] = None,
+        is_builder_function: bool = False,
+        is_auto_snapshot: bool = False,
+        enable_memory_snapshot: bool = False,
+        block_network: bool = False,
+        i6pn_enabled: bool = False,
+        cluster_size: typing.Optional[int] = None,
+        max_inputs: typing.Optional[int] = None,
+        ephemeral_disk: typing.Optional[int] = None,
+        _experimental_buffer_containers: typing.Optional[int] = None,
+        _experimental_proxy_ip: typing.Optional[str] = None,
+        _experimental_custom_scaling_factor: typing.Optional[float] = None,
+    ) -> None: ...
+    def _bind_parameters(
+        self,
+        obj: modal.cls.Obj,
+        options: typing.Optional[modal_proto.api_pb2.FunctionOptions],
+        args: collections.abc.Sized,
+        kwargs: dict[str, typing.Any],
+    ) -> Function: ...
 
     class __keep_warm_spec(typing_extensions.Protocol):
-        def __call__(self, warm_pool_size: int) -> None:
-            ...
-
-        async def aio(self, *args, **kwargs) -> None:
-            ...
+        def __call__(self, warm_pool_size: int) -> None: ...
+        async def aio(self, warm_pool_size: int) -> None: ...
 
     keep_warm: __keep_warm_spec
 
     @classmethod
-    def from_name(cls: typing.Type[Function], app_name: str, tag: typing.Union[str, None] = None, namespace=1, environment_name: typing.Union[str, None] = None) -> Function:
-        ...
+    def from_name(
+        cls: type[Function], app_name: str, name: str, namespace=1, environment_name: typing.Optional[str] = None
+    ) -> Function: ...
 
     class __lookup_spec(typing_extensions.Protocol):
-        def __call__(self, app_name: str, tag: typing.Union[str, None] = None, namespace=1, client: typing.Union[modal.client.Client, None] = None, environment_name: typing.Union[str, None] = None) -> Function:
-            ...
-
-        async def aio(self, *args, **kwargs) -> Function:
-            ...
+        def __call__(
+            self,
+            app_name: str,
+            name: str,
+            namespace=1,
+            client: typing.Optional[modal.client.Client] = None,
+            environment_name: typing.Optional[str] = None,
+        ) -> Function: ...
+        async def aio(
+            self,
+            app_name: str,
+            name: str,
+            namespace=1,
+            client: typing.Optional[modal.client.Client] = None,
+            environment_name: typing.Optional[str] = None,
+        ) -> Function: ...
 
     lookup: __lookup_spec
 
     @property
-    def tag(self) -> str:
-        ...
-
+    def tag(self) -> str: ...
     @property
-    def app(self) -> modal.app.App:
-        ...
-
+    def app(self) -> modal.app.App: ...
     @property
-    def stub(self) -> modal.app.App:
-        ...
-
+    def stub(self) -> modal.app.App: ...
     @property
-    def info(self) -> modal._utils.function_utils.FunctionInfo:
-        ...
-
+    def info(self) -> modal._utils.function_utils.FunctionInfo: ...
     @property
-    def spec(self) -> _FunctionSpec:
-        ...
-
-    def get_build_def(self) -> str:
-        ...
-
-    def _initialize_from_empty(self):
-        ...
-
-    def _hydrate_metadata(self, metadata: typing.Union[google.protobuf.message.Message, None]):
-        ...
-
-    def _get_metadata(self):
-        ...
-
-    def _set_mute_cancellation(self, value: bool = True):
-        ...
-
-    def _set_output_mgr(self, output_mgr: modal._output.OutputManager):
-        ...
-
+    def spec(self) -> _FunctionSpec: ...
+    def get_build_def(self) -> str: ...
+    def _initialize_from_empty(self): ...
+    def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
+    def _get_metadata(self): ...
+    def _check_no_web_url(self, fn_name: str): ...
     @property
-    def web_url(self) -> str:
-        ...
-
+    def web_url(self) -> str: ...
+    @property
+    def is_generator(self) -> bool: ...
     @property
-    def is_generator(self) -> bool:
-        ...
+    def cluster_size(self) -> int: ...
 
     class ___map_spec(typing_extensions.Protocol):
-        def __call__(self, input_queue: modal.parallel_map.SynchronizedQueue, order_outputs: bool, return_exceptions: bool) -> typing.Generator[typing.Any, None, None]:
-            ...
-
-        def aio(self, input_queue: modal.parallel_map.SynchronizedQueue, order_outputs: bool, return_exceptions: bool) -> typing.AsyncGenerator[typing.Any, None]:
-            ...
+        def __call__(
+            self, input_queue: modal.parallel_map.SynchronizedQueue, order_outputs: bool, return_exceptions: bool
+        ) -> typing.Generator[typing.Any, None, None]: ...
+        def aio(
+            self, input_queue: modal.parallel_map.SynchronizedQueue, order_outputs: bool, return_exceptions: bool
+        ) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
 
     _map: ___map_spec
 
-    class ___call_function_spec(typing_extensions.Protocol):
-        def __call__(self, args, kwargs):
-            ...
-
-        async def aio(self, *args, **kwargs):
-            ...
+    class ___call_function_spec(typing_extensions.Protocol[ReturnType_INNER]):
+        def __call__(self, args, kwargs) -> ReturnType_INNER: ...
+        async def aio(self, args, kwargs) -> ReturnType_INNER: ...
 
-    _call_function: ___call_function_spec
+    _call_function: ___call_function_spec[ReturnType]
 
     class ___call_function_nowait_spec(typing_extensions.Protocol):
-        def __call__(self, args, kwargs) -> _Invocation:
-            ...
-
-        async def aio(self, *args, **kwargs) -> _Invocation:
-            ...
+        def __call__(self, args, kwargs, function_call_invocation_type: int) -> _Invocation: ...
+        async def aio(self, args, kwargs, function_call_invocation_type: int) -> _Invocation: ...
 
     _call_function_nowait: ___call_function_nowait_spec
 
-    def _call_generator(self, args, kwargs):
-        ...
+    class ___call_generator_spec(typing_extensions.Protocol):
+        def __call__(self, args, kwargs): ...
+        def aio(self, args, kwargs): ...
 
-    class ___call_generator_nowait_spec(typing_extensions.Protocol):
-        def __call__(self, args, kwargs):
-            ...
+    _call_generator: ___call_generator_spec
 
-        async def aio(self, *args, **kwargs):
-            ...
+    class ___call_generator_nowait_spec(typing_extensions.Protocol):
+        def __call__(self, args, kwargs): ...
+        async def aio(self, args, kwargs): ...
 
     _call_generator_nowait: ___call_generator_nowait_spec
 
-    class __remote_spec(typing_extensions.Protocol):
-        def __call__(self, *args, **kwargs) -> typing.Any:
-            ...
-
-        async def aio(self, *args, **kwargs) -> typing.Any:
-            ...
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+        def __call__(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
+        async def aio(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
 
-    remote: __remote_spec
+    remote: __remote_spec[ReturnType, P]
 
     class __remote_gen_spec(typing_extensions.Protocol):
-        def __call__(self, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
-            ...
-
-        def aio(self, *args, **kwargs) -> typing.AsyncGenerator[typing.Any, None]:
-            ...
+        def __call__(self, *args, **kwargs) -> typing.Generator[typing.Any, None, None]: ...
+        def aio(self, *args, **kwargs) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
 
     remote_gen: __remote_gen_spec
 
-    class __shell_spec(typing_extensions.Protocol):
-        def __call__(self, *args, **kwargs) -> None:
-            ...
-
-        async def aio(self, *args, **kwargs) -> None:
-            ...
-
-    shell: __shell_spec
+    def _is_local(self): ...
+    def _get_info(self) -> modal._utils.function_utils.FunctionInfo: ...
+    def _get_obj(self) -> typing.Optional[modal.cls.Obj]: ...
+    def local(self, *args: P.args, **kwargs: P.kwargs) -> OriginalReturnType: ...
 
-    def _get_is_remote_cls_method(self):
-        ...
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+        def __call__(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
+        async def aio(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
-    def _get_info(self):
-        ...
+    _experimental_spawn: ___experimental_spawn_spec[ReturnType, P]
 
-    def _get_obj(self):
-        ...
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+        def __call__(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
+        async def aio(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
-    def local(self, *args, **kwargs) -> typing.Any:
-        ...
+    spawn: __spawn_spec[ReturnType, P]
 
-    class __spawn_spec(typing_extensions.Protocol):
-        def __call__(self, *args, **kwargs) -> typing.Union[FunctionCall, None]:
-            ...
-
-        async def aio(self, *args, **kwargs) -> typing.Union[FunctionCall, None]:
-            ...
-
-    spawn: __spawn_spec
-
-    def get_raw_f(self) -> typing.Callable[..., typing.Any]:
-        ...
+    def get_raw_f(self) -> typing.Callable[..., typing.Any]: ...
 
     class __get_current_stats_spec(typing_extensions.Protocol):
-        def __call__(self) -> FunctionStats:
-            ...
-
-        async def aio(self, *args, **kwargs) -> FunctionStats:
-            ...
+        def __call__(self) -> FunctionStats: ...
+        async def aio(self) -> FunctionStats: ...
 
     get_current_stats: __get_current_stats_spec
 
     class __map_spec(typing_extensions.Protocol):
-        def __call__(self, *input_iterators, kwargs={}, order_outputs: bool = True, return_exceptions: bool = False) -> modal._utils.async_utils.AsyncOrSyncIteratable:
-            ...
-
-        def aio(self, *input_iterators: typing.Union[typing.Iterable[typing.Any], typing.AsyncIterable[typing.Any]], kwargs={}, order_outputs: bool = True, return_exceptions: bool = False) -> typing.AsyncGenerator[typing.Any, None]:
-            ...
+        def __call__(
+            self, *input_iterators, kwargs={}, order_outputs: bool = True, return_exceptions: bool = False
+        ) -> modal._utils.async_utils.AsyncOrSyncIterable: ...
+        def aio(
+            self,
+            *input_iterators: typing.Union[typing.Iterable[typing.Any], typing.AsyncIterable[typing.Any]],
+            kwargs={},
+            order_outputs: bool = True,
+            return_exceptions: bool = False,
+        ) -> typing.AsyncGenerator[typing.Any, None]: ...
 
     map: __map_spec
 
     class __starmap_spec(typing_extensions.Protocol):
-        def __call__(self, input_iterator: typing.Iterable[typing.Sequence[typing.Any]], kwargs={}, order_outputs: bool = True, return_exceptions: bool = False) -> modal._utils.async_utils.AsyncOrSyncIteratable:
-            ...
-
-        def aio(self, input_iterator: typing.Union[typing.Iterable[typing.Sequence[typing.Any]], typing.AsyncIterable[typing.Sequence[typing.Any]]], kwargs={}, order_outputs: bool = True, return_exceptions: bool = False) -> typing.AsyncIterable[typing.Any]:
-            ...
+        def __call__(
+            self,
+            input_iterator: typing.Iterable[typing.Sequence[typing.Any]],
+            kwargs={},
+            order_outputs: bool = True,
+            return_exceptions: bool = False,
+        ) -> modal._utils.async_utils.AsyncOrSyncIterable: ...
+        def aio(
+            self,
+            input_iterator: typing.Union[
+                typing.Iterable[typing.Sequence[typing.Any]], typing.AsyncIterable[typing.Sequence[typing.Any]]
+            ],
+            kwargs={},
+            order_outputs: bool = True,
+            return_exceptions: bool = False,
+        ) -> typing.AsyncIterable[typing.Any]: ...
 
     starmap: __starmap_spec
 
     class __for_each_spec(typing_extensions.Protocol):
-        def __call__(self, *input_iterators, kwargs={}, ignore_exceptions: bool = False):
-            ...
-
-        async def aio(self, *input_iterators, kwargs={}, ignore_exceptions: bool = False):
-            ...
+        def __call__(self, *input_iterators, kwargs={}, ignore_exceptions: bool = False): ...
+        async def aio(self, *input_iterators, kwargs={}, ignore_exceptions: bool = False): ...
 
     for_each: __for_each_spec
 
+class _FunctionCall(typing.Generic[ReturnType], modal.object._Object):
+    _is_generator: bool
 
-class _FunctionCall(modal.object._Object):
-    def _invocation(self):
-        ...
-
-    async def get(self, timeout: typing.Union[float, None] = None):
-        ...
-
-    async def get_call_graph(self) -> typing.List[modal.call_graph.InputInfo]:
-        ...
-
-    async def cancel(self):
-        ...
-
+    def _invocation(self): ...
+    async def get(self, timeout: typing.Optional[float] = None) -> ReturnType: ...
+    def get_gen(self) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
+    async def get_call_graph(self) -> list[modal.call_graph.InputInfo]: ...
+    async def cancel(self, terminate_containers: bool = False): ...
     @staticmethod
-    async def from_id(function_call_id: str, client: typing.Union[modal.client._Client, None] = None) -> _FunctionCall:
-        ...
+    async def from_id(
+        function_call_id: str, client: typing.Optional[modal.client._Client] = None, is_generator: bool = False
+    ) -> _FunctionCall: ...
 
+class FunctionCall(typing.Generic[ReturnType], modal.object.Object):
+    _is_generator: bool
 
-class FunctionCall(modal.object.Object):
-    def __init__(self, *args, **kwargs):
-        ...
+    def __init__(self, *args, **kwargs): ...
+    def _invocation(self): ...
 
-    def _invocation(self):
-        ...
+    class __get_spec(typing_extensions.Protocol[ReturnType_INNER]):
+        def __call__(self, timeout: typing.Optional[float] = None) -> ReturnType_INNER: ...
+        async def aio(self, timeout: typing.Optional[float] = None) -> ReturnType_INNER: ...
 
-    class __get_spec(typing_extensions.Protocol):
-        def __call__(self, timeout: typing.Union[float, None] = None):
-            ...
+    get: __get_spec[ReturnType]
 
-        async def aio(self, *args, **kwargs):
-            ...
+    class __get_gen_spec(typing_extensions.Protocol):
+        def __call__(self) -> typing.Generator[typing.Any, None, None]: ...
+        def aio(self) -> collections.abc.AsyncGenerator[typing.Any, None]: ...
 
-    get: __get_spec
+    get_gen: __get_gen_spec
 
     class __get_call_graph_spec(typing_extensions.Protocol):
-        def __call__(self) -> typing.List[modal.call_graph.InputInfo]:
-            ...
-
-        async def aio(self, *args, **kwargs) -> typing.List[modal.call_graph.InputInfo]:
-            ...
+        def __call__(self) -> list[modal.call_graph.InputInfo]: ...
+        async def aio(self) -> list[modal.call_graph.InputInfo]: ...
 
     get_call_graph: __get_call_graph_spec
 
     class __cancel_spec(typing_extensions.Protocol):
-        def __call__(self):
-            ...
-
-        async def aio(self, *args, **kwargs):
-            ...
+        def __call__(self, terminate_containers: bool = False): ...
+        async def aio(self, terminate_containers: bool = False): ...
 
     cancel: __cancel_spec
 
     class __from_id_spec(typing_extensions.Protocol):
-        def __call__(self, function_call_id: str, client: typing.Union[modal.client.Client, None] = None) -> FunctionCall:
-            ...
-
-        async def aio(self, *args, **kwargs) -> FunctionCall:
-            ...
+        def __call__(
+            self, function_call_id: str, client: typing.Optional[modal.client.Client] = None, is_generator: bool = False
+        ) -> FunctionCall: ...
+        async def aio(
+            self, function_call_id: str, client: typing.Optional[modal.client.Client] = None, is_generator: bool = False
+        ) -> FunctionCall: ...
 
     from_id: __from_id_spec
 
-
-async def _gather(*function_calls: _FunctionCall):
-    ...
-
+async def _gather(*function_calls: _FunctionCall[ReturnType]) -> typing.Sequence[ReturnType]: ...
 
 class __gather_spec(typing_extensions.Protocol):
-    def __call__(self, *function_calls: FunctionCall):
-        ...
-
-    async def aio(self, *args, **kwargs):
-        ...
+    def __call__(self, *function_calls: FunctionCall[ReturnType]) -> typing.Sequence[ReturnType]: ...
+    async def aio(self, *function_calls: FunctionCall[ReturnType]) -> typing.Sequence[ReturnType]: ...
 
 gather: __gather_spec