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

modal/_runtime/user_code_imports.py

@@ -9,10 +9,10 @@ import modal._object
 import modal._runtime.container_io_manager
 import modal.cls
 from modal import Function
+from modal._functions import _Function
 from modal._utils.async_utils import synchronizer
 from modal._utils.function_utils import LocalFunctionError, is_async as get_is_async, is_global_object
 from modal.exception import ExecutionError, InvalidError
-from modal.functions import _Function
 from modal.partial_function import _find_partial_methods_for_user_cls, _PartialFunctionFlags
 from modal_proto import api_pb2
 

modal/_utils/mount_utils.py

@@ -65,7 +65,7 @@ def validate_volumes(
     volume_to_paths: dict[_Volume, list[str]] = {}
     for path, volume in validated_volumes:
         if not isinstance(volume, (_Volume, _CloudBucketMount)):
-            raise InvalidError(f"Object of type {type(volume)} mounted at '{path}' is not useable as a volume.")
+            raise InvalidError(f"Object of type {type(volume)} mounted at '{path}' is not usable as a volume.")
         elif isinstance(volume, (_Volume)):
             volume_to_paths.setdefault(volume, []).append(path)
     for paths in volume_to_paths.values():

modal/app.py

@@ -20,6 +20,7 @@ from synchronicity.async_wrap import asynccontextmanager
 
 from modal_proto import api_pb2
 
+from ._functions import _Function
 from ._ipython import is_notebook
 from ._object import _get_environment_name, _Object
 from ._utils.async_utils import synchronize_api
@@ -32,7 +33,7 @@ from .cloud_bucket_mount import _CloudBucketMount
 from .cls import _Cls, parameter
 from .config import logger
 from .exception import ExecutionError, InvalidError
-from .functions import Function, _Function
+from .functions import Function
 from .gpu import GPU_T
 from .image import _Image
 from .mount import _Mount

modal/app.pyi

@@ -1,4 +1,5 @@
 import collections.abc
+import modal._functions
 import modal._object
 import modal._utils.function_utils
 import modal.client
@@ -79,7 +80,7 @@ class _App:
     _container_app: typing.ClassVar[typing.Optional[_App]]
     _name: typing.Optional[str]
     _description: typing.Optional[str]
-    _functions: dict[str, modal.functions._Function]
+    _functions: dict[str, modal._functions._Function]
     _classes: dict[str, modal.cls._Cls]
     _image: typing.Optional[modal.image._Image]
     _mounts: collections.abc.Sequence[modal.mount._Mount]
@@ -137,11 +138,11 @@ class _App:
     ) -> typing.AsyncContextManager[_App]: ...
     def _get_default_image(self): ...
     def _get_watch_mounts(self): ...
-    def _add_function(self, function: modal.functions._Function, is_web_endpoint: bool): ...
+    def _add_function(self, function: modal._functions._Function, is_web_endpoint: bool): ...
     def _add_class(self, tag: str, cls: modal.cls._Cls): ...
     def _init_container(self, client: modal.client._Client, running_app: modal.running_app.RunningApp): ...
     @property
-    def registered_functions(self) -> dict[str, modal.functions._Function]: ...
+    def registered_functions(self) -> dict[str, modal._functions._Function]: ...
     @property
     def registered_classes(self) -> dict[str, modal.cls._Cls]: ...
     @property

modal/cli/run.py

@@ -15,11 +15,12 @@ import typer
 from click import ClickException
 from typing_extensions import TypedDict
 
+from .._functions import _FunctionSpec
 from ..app import App, LocalEntrypoint
 from ..config import config
 from ..environments import ensure_env
 from ..exception import ExecutionError, InvalidError, _CliUserExecutionError
-from ..functions import Function, _FunctionSpec
+from ..functions import Function
 from ..image import Image
 from ..output import enable_output
 from ..runner import deploy_app, interactive_shell, run_app

modal/client.pyi

@@ -27,7 +27,7 @@ class _Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.2"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.3"
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -85,7 +85,7 @@ class Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.2"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.3"
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/cls.py

@@ -11,6 +11,7 @@ from grpclib import GRPCError, Status
 from modal._utils.function_utils import CLASS_PARAM_TYPE_MAP
 from modal_proto import api_pb2
 
+from ._functions import _Function, _parse_retries
 from ._object import _get_environment_name, _Object
 from ._resolver import Resolver
 from ._resources import convert_fn_config_to_resources_config
@@ -22,7 +23,6 @@ from ._utils.grpc_utils import retry_transient_errors
 from ._utils.mount_utils import validate_volumes
 from .client import _Client
 from .exception import ExecutionError, InvalidError, NotFoundError, VersionError
-from .functions import _Function, _parse_retries
 from .gpu import GPU_T
 from .partial_function import (
     _find_callables_for_obj,

modal/cls.pyi

@@ -1,6 +1,7 @@
 import collections.abc
 import google.protobuf.message
 import inspect
+import modal._functions
 import modal._object
 import modal.app
 import modal.client
@@ -21,17 +22,17 @@ T = typing.TypeVar("T")
 def _use_annotation_parameters(user_cls: type) -> bool: ...
 def _get_class_constructor_signature(user_cls: type) -> inspect.Signature: ...
 def _bind_instance_method(
-    service_function: modal.functions._Function, class_bound_method: modal.functions._Function
+    service_function: modal._functions._Function, class_bound_method: modal._functions._Function
 ): ...
 
 class _Obj:
     _cls: _Cls
-    _functions: dict[str, modal.functions._Function]
+    _functions: dict[str, modal._functions._Function]
     _has_entered: bool
     _user_cls_instance: typing.Optional[typing.Any]
     _args: tuple[typing.Any, ...]
     _kwargs: dict[str, typing.Any]
-    _instance_service_function: typing.Optional[modal.functions._Function]
+    _instance_service_function: typing.Optional[modal._functions._Function]
 
     def _uses_common_service_function(self): ...
     def __init__(
@@ -42,7 +43,7 @@ class _Obj:
         args,
         kwargs,
     ): ...
-    def _cached_service_function(self) -> modal.functions._Function: ...
+    def _cached_service_function(self) -> modal._functions._Function: ...
     def _get_parameter_values(self) -> dict[str, typing.Any]: ...
     def _new_user_cls_instance(self): ...
     async def keep_warm(self, warm_pool_size: int) -> None: ...
@@ -96,8 +97,8 @@ class Obj:
 
 class _Cls(modal._object._Object):
     _user_cls: typing.Optional[type]
-    _class_service_function: typing.Optional[modal.functions._Function]
-    _method_functions: typing.Optional[dict[str, modal.functions._Function]]
+    _class_service_function: typing.Optional[modal._functions._Function]
+    _method_functions: typing.Optional[dict[str, modal._functions._Function]]
     _options: typing.Optional[modal_proto.api_pb2.FunctionOptions]
     _callables: dict[str, collections.abc.Callable[..., typing.Any]]
     _app: typing.Optional[modal.app._App]
@@ -109,13 +110,13 @@ class _Cls(modal._object._Object):
     def _get_app(self) -> modal.app._App: ...
     def _get_user_cls(self) -> type: ...
     def _get_name(self) -> str: ...
-    def _get_class_service_function(self) -> modal.functions._Function: ...
+    def _get_class_service_function(self) -> modal._functions._Function: ...
     def _get_method_names(self) -> collections.abc.Collection[str]: ...
     def _hydrate_metadata(self, metadata: google.protobuf.message.Message): ...
     @staticmethod
     def validate_construction_mechanism(user_cls): ...
     @staticmethod
-    def from_local(user_cls, app: modal.app._App, class_service_function: modal.functions._Function) -> _Cls: ...
+    def from_local(user_cls, app: modal.app._App, class_service_function: modal._functions._Function) -> _Cls: ...
     def _uses_common_service_function(self): ...
     @classmethod
     def from_name(

modal/experimental.py

@@ -5,12 +5,12 @@ from typing import Any, Callable, Optional
 from modal_proto import api_pb2
 
 from ._clustered_functions import ClusterInfo, get_cluster_info as _get_cluster_info
+from ._functions import _Function
 from ._object import _get_environment_name
 from ._runtime.container_io_manager import _ContainerIOManager
 from ._utils.async_utils import synchronizer
 from .client import _Client
 from .exception import InvalidError
-from .functions import _Function
 from .partial_function import _PartialFunction, _PartialFunctionFlags