modal 0.73.2__py3-none-any.whl → 0.73.4__py3-none-any.whl

modal/functions.pyi

@@ -1,6 +1,6 @@
 import collections.abc
 import google.protobuf.message
-import modal._object
+import modal._functions
 import modal._utils.async_utils
 import modal._utils.function_utils
 import modal.app
@@ -22,292 +22,20 @@ import modal.scheduler_placement
 import modal.secret
 import modal.volume
 import modal_proto.api_pb2
-import modal_proto.modal_api_grpc
 import pathlib
 import typing
 import typing_extensions
 
-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: _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_total_runners: int
-
-    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.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)
-
 SUPERSELF = typing.TypeVar("SUPERSELF", 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]
-    _webhook_config: typing.Optional[modal_proto.api_pb2.WebhookConfig]
-    _web_url: typing.Optional[str]
-    _function_name: typing.Optional[str]
-    _is_method: bool
-    _spec: typing.Optional[_FunctionSpec]
-    _tag: str
-    _raw_f: typing.Optional[collections.abc.Callable[..., typing.Any]]
-    _build_args: dict
-    _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,
-        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,
-        include_source: typing.Optional[bool] = None,
-        _experimental_buffer_containers: typing.Optional[int] = None,
-        _experimental_proxy_ip: typing.Optional[str] = None,
-        _experimental_custom_scaling_factor: typing.Optional[float] = None,
-    ) -> _Function: ...
-    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: type[_Function], app_name: str, name: str, namespace=1, environment_name: typing.Optional[str] = None
-    ) -> _Function: ...
-    @staticmethod
-    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: ...
-    @property
-    def app(self) -> modal.app._App: ...
-    @property
-    def stub(self) -> modal.app._App: ...
-    @property
-    def info(self) -> modal._utils.function_utils.FunctionInfo: ...
-    @property
-    def spec(self) -> _FunctionSpec: ...
-    def _is_web_endpoint(self) -> bool: ...
-    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
-    async def web_url(self) -> str: ...
-    @property
-    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) -> collections.abc.Callable[..., typing.Any]: ...
-    async def get_current_stats(self) -> FunctionStats: ...
-
-    class __map_spec(typing_extensions.Protocol[SUPERSELF]):
-        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[typing_extensions.Self]
-
-    class __starmap_spec(typing_extensions.Protocol[SUPERSELF]):
-        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[typing_extensions.Self]
-
-    class __for_each_spec(typing_extensions.Protocol[SUPERSELF]):
-        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[typing_extensions.Self]
-
 ReturnType_INNER = typing.TypeVar("ReturnType_INNER", covariant=True)
 
 P_INNER = typing_extensions.ParamSpec("P_INNER")
 
-class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.Object):
+class Function(
+    typing.Generic[modal._functions.P, modal._functions.ReturnType, modal._functions.OriginalReturnType],
+    modal.object.Object,
+):
     _info: typing.Optional[modal._utils.function_utils.FunctionInfo]
     _serve_mounts: frozenset[modal.mount.Mount]
     _app: typing.Optional[modal.app.App]
@@ -316,7 +44,7 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
     _web_url: typing.Optional[str]
     _function_name: typing.Optional[str]
     _is_method: bool
-    _spec: typing.Optional[_FunctionSpec]
+    _spec: typing.Optional[modal._functions._FunctionSpec]
     _tag: str
     _raw_f: typing.Optional[collections.abc.Callable[..., typing.Any]]
     _build_args: dict
@@ -423,7 +151,7 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
     @property
     def info(self) -> modal._utils.function_utils.FunctionInfo: ...
     @property
-    def spec(self) -> _FunctionSpec: ...
+    def spec(self) -> modal._functions._FunctionSpec: ...
     def _is_web_endpoint(self) -> bool: ...
     def get_build_def(self) -> str: ...
     def _initialize_from_empty(self): ...
@@ -451,11 +179,11 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
         def __call__(self, args, kwargs) -> ReturnType_INNER: ...
         async def aio(self, args, kwargs) -> ReturnType_INNER: ...
 
-    _call_function: ___call_function_spec[ReturnType, typing_extensions.Self]
+    _call_function: ___call_function_spec[modal._functions.ReturnType, typing_extensions.Self]
 
     class ___call_function_nowait_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, args, kwargs, function_call_invocation_type: int) -> _Invocation: ...
-        async def aio(self, args, kwargs, function_call_invocation_type: int) -> _Invocation: ...
+        def __call__(self, args, kwargs, function_call_invocation_type: int) -> modal._functions._Invocation: ...
+        async def aio(self, args, kwargs, function_call_invocation_type: int) -> modal._functions._Invocation: ...
 
     _call_function_nowait: ___call_function_nowait_spec[typing_extensions.Self]
 
@@ -475,7 +203,7 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
         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[ReturnType, P, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, *args, **kwargs) -> typing.Generator[typing.Any, None, None]: ...
@@ -486,25 +214,29 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
     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 local(
+        self, *args: modal._functions.P.args, **kwargs: modal._functions.P.kwargs
+    ) -> modal._functions.OriginalReturnType: ...
 
     class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         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]: ...
 
-    _experimental_spawn: ___experimental_spawn_spec[ReturnType, P, typing_extensions.Self]
+    _experimental_spawn: ___experimental_spawn_spec[
+        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
+    ]
 
     class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         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]: ...
 
-    spawn: __spawn_spec[ReturnType, P, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]: ...
 
     class __get_current_stats_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self) -> FunctionStats: ...
-        async def aio(self) -> FunctionStats: ...
+        def __call__(self) -> modal._functions.FunctionStats: ...
+        async def aio(self) -> modal._functions.FunctionStats: ...
 
     get_current_stats: __get_current_stats_spec[typing_extensions.Self]
 
@@ -548,20 +280,7 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
 
     for_each: __for_each_spec[typing_extensions.Self]
 
-class _FunctionCall(typing.Generic[ReturnType], modal._object._Object):
-    _is_generator: bool
-
-    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.Optional[modal.client._Client] = None, is_generator: bool = False
-    ) -> _FunctionCall: ...
-
-class FunctionCall(typing.Generic[ReturnType], modal.object.Object):
+class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Object):
     _is_generator: bool
 
     def __init__(self, *args, **kwargs): ...
@@ -571,7 +290,7 @@ class FunctionCall(typing.Generic[ReturnType], modal.object.Object):
         def __call__(self, timeout: typing.Optional[float] = None) -> ReturnType_INNER: ...
         async def aio(self, timeout: typing.Optional[float] = None) -> ReturnType_INNER: ...
 
-    get: __get_spec[ReturnType, typing_extensions.Self]
+    get: __get_spec[modal._functions.ReturnType, typing_extensions.Self]
 
     class __get_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self) -> typing.Generator[typing.Any, None, None]: ...
@@ -594,17 +313,19 @@ class FunctionCall(typing.Generic[ReturnType], modal.object.Object):
     class __from_id_spec(typing_extensions.Protocol):
         def __call__(
             self, function_call_id: str, client: typing.Optional[modal.client.Client] = None, is_generator: bool = False
-        ) -> FunctionCall: ...
+        ) -> FunctionCall[typing.Any]: ...
         async def aio(
             self, function_call_id: str, client: typing.Optional[modal.client.Client] = None, is_generator: bool = False
-        ) -> FunctionCall: ...
+        ) -> FunctionCall[typing.Any]: ...
 
     from_id: __from_id_spec
 
-async def _gather(*function_calls: _FunctionCall[ReturnType]) -> typing.Sequence[ReturnType]: ...
-
 class __gather_spec(typing_extensions.Protocol):
-    def __call__(self, *function_calls: FunctionCall[ReturnType]) -> typing.Sequence[ReturnType]: ...
-    async def aio(self, *function_calls: FunctionCall[ReturnType]) -> typing.Sequence[ReturnType]: ...
+    def __call__(
+        self, *function_calls: FunctionCall[modal._functions.ReturnType]
+    ) -> typing.Sequence[modal._functions.ReturnType]: ...
+    async def aio(
+        self, *function_calls: FunctionCall[modal._functions.ReturnType]
+    ) -> typing.Sequence[modal._functions.ReturnType]: ...
 
 gather: __gather_spec

modal/image.py

@@ -53,7 +53,7 @@ from .secret import _Secret
 from .volume import _Volume
 
 if typing.TYPE_CHECKING:
-    import modal.functions
+    import modal._functions
 
 # This is used for both type checking and runtime validation
 ImageBuilderVersion = Literal["2023.12", "2024.04", "2024.10"]
@@ -481,7 +481,7 @@ class _Image(_Object, type_prefix="im"):
         dockerfile_function: Optional[Callable[[ImageBuilderVersion], DockerfileSpec]] = None,
         secrets: Optional[Sequence[_Secret]] = None,
         gpu_config: Optional[api_pb2.GPUConfig] = None,
-        build_function: Optional["modal.functions._Function"] = None,
+        build_function: Optional["modal._functions._Function"] = None,
         build_function_input: Optional[api_pb2.FunctionInput] = None,
         image_registry_config: Optional[_ImageRegistryConfig] = None,
         context_mount_function: Optional[Callable[[], Optional[_Mount]]] = None,
@@ -1942,7 +1942,7 @@ class _Image(_Object, type_prefix="im"):
         )
         ```
         """
-        from .functions import _Function
+        from ._functions import _Function
 
         if not callable(raw_f):
             raise InvalidError(f"Argument to Image.run_function must be a function, not {type(raw_f).__name__}.")

modal/image.pyi

@@ -1,5 +1,6 @@
 import collections.abc
 import google.protobuf.message
+import modal._functions
 import modal._object
 import modal.client
 import modal.cloud_bucket_mount
@@ -102,7 +103,7 @@ class _Image(modal._object._Object):
         ] = None,
         secrets: typing.Optional[collections.abc.Sequence[modal.secret._Secret]] = None,
         gpu_config: typing.Optional[modal_proto.api_pb2.GPUConfig] = None,
-        build_function: typing.Optional[modal.functions._Function] = None,
+        build_function: typing.Optional[modal._functions._Function] = None,
         build_function_input: typing.Optional[modal_proto.api_pb2.FunctionInput] = None,
         image_registry_config: typing.Optional[_ImageRegistryConfig] = None,
         context_mount_function: typing.Optional[

modal/parallel_map.pyi

@@ -1,7 +1,7 @@
 import collections.abc
+import modal._functions
 import modal._utils.async_utils
 import modal.client
-import modal.functions
 import typing
 import typing_extensions
 
@@ -41,7 +41,7 @@ class _OutputValue:
     def __eq__(self, other): ...
 
 def _map_invocation(
-    function: modal.functions._Function,
+    function: modal._functions._Function,
     raw_input_queue: _SynchronizedQueue,
     client: modal.client._Client,
     order_outputs: bool,

modal/partial_function.py

@@ -14,12 +14,12 @@ import typing_extensions
 
 from modal_proto import api_pb2
 
+from ._functions import _Function
 from ._utils.async_utils import synchronize_api, synchronizer
 from ._utils.deprecation import deprecation_error, deprecation_warning
 from ._utils.function_utils import callable_has_non_self_non_default_params, callable_has_non_self_params
 from .config import logger
 from .exception import InvalidError
-from .functions import _Function
 
 MAX_MAX_BATCH_SIZE = 1000
 MAX_BATCH_WAIT_MS = 10 * 60 * 1000  # 10 minutes

modal/partial_function.pyi

@@ -1,5 +1,6 @@
 import collections.abc
 import enum
+import modal._functions
 import modal.functions
 import modal_proto.api_pb2
 import typing
@@ -51,7 +52,7 @@ class _PartialFunction(typing.Generic[P, ReturnType, OriginalReturnType]):
     ): ...
     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 __get__(self, obj, objtype=None) -> modal._functions._Function[P, ReturnType, OriginalReturnType]: ...
     def __del__(self): ...
     def add_flags(self, flags) -> _PartialFunction: ...
 

modal/runner.py

@@ -15,6 +15,7 @@ from synchronicity.async_wrap import asynccontextmanager
 import modal_proto.api_pb2
 from modal_proto import api_pb2
 
+from ._functions import _Function
 from ._object import _get_environment_name, _Object
 from ._pty import get_pty_info
 from ._resolver import Resolver
@@ -29,7 +30,6 @@ from .cls import _Cls
 from .config import config, logger
 from .environments import _get_environment_cached
 from .exception import InteractiveTimeoutError, InvalidError, RemoteError, _CliUserExecutionError
-from .functions import _Function
 from .output import _get_output_manager, enable_output
 from .running_app import RunningApp, running_app_from_layout
 from .sandbox import _Sandbox

modal/runner.pyi

@@ -1,6 +1,6 @@
+import modal._functions
 import modal.client
 import modal.cls
-import modal.functions
 import modal.running_app
 import modal_proto.api_pb2
 import multiprocessing.synchronize
@@ -29,7 +29,7 @@ async def _init_local_app_from_name(
 async def _create_all_objects(
     client: modal.client._Client,
     running_app: modal.running_app.RunningApp,
-    functions: dict[str, modal.functions._Function],
+    functions: dict[str, modal._functions._Function],
     classes: dict[str, modal.cls._Cls],
     environment_name: str,
 ) -> None: ...
@@ -37,7 +37,7 @@ async def _publish_app(
     client: modal.client._Client,
     running_app: modal.running_app.RunningApp,
     app_state: int,
-    functions: dict[str, modal.functions._Function],
+    functions: dict[str, modal._functions._Function],
     classes: dict[str, modal.cls._Cls],
     name: str = "",
     tag: str = "",

{modal-0.73.2.dist-info → modal-0.73.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modal
-Version: 0.73.2
+Version: 0.73.4
 Summary: Python client library for Modal
 Author: Modal Labs
 Author-email: support@modal.com
@@ -21,7 +21,7 @@ Requires-Dist: fastapi
 Requires-Dist: grpclib (==0.4.7)
 Requires-Dist: protobuf (!=4.24.0,<6.0,>=3.19)
 Requires-Dist: rich (>=12.0.0)
-Requires-Dist: synchronicity (~=0.9.9)
+Requires-Dist: synchronicity (~=0.9.10)
 Requires-Dist: toml
 Requires-Dist: typer (>=0.9)
 Requires-Dist: types-certifi