modal 0.73.76__py3-none-any.whl → 0.73.78__py3-none-any.whl

modal/_functions.py

@@ -927,7 +927,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
     def _bind_parameters(
         self,
         obj: "modal.cls._Obj",
-        options: Optional[api_pb2.FunctionOptions],
+        options: Optional["modal.cls._ServiceOptions"],
         args: Sized,
         kwargs: dict[str, Any],
     ) -> "_Function":
@@ -978,10 +978,35 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
 
             environment_name = _get_environment_name(None, resolver)
             assert parent is not None and parent.is_hydrated
+
+            if options:
+                volume_mounts = [
+                    api_pb2.VolumeMount(
+                        mount_path=path,
+                        volume_id=volume.object_id,
+                        allow_background_commits=True,
+                    )
+                    for path, volume in options.validated_volumes
+                ]
+                options_pb = api_pb2.FunctionOptions(
+                    secret_ids=[s.object_id for s in options.secrets],
+                    replace_secret_ids=bool(options.secrets),
+                    resources=options.resources,
+                    retry_policy=options.retry_policy,
+                    concurrency_limit=options.concurrency_limit,
+                    timeout_secs=options.timeout_secs,
+                    task_idle_timeout_secs=options.task_idle_timeout_secs,
+                    replace_volume_mounts=len(volume_mounts) > 0,
+                    volume_mounts=volume_mounts,
+                    target_concurrent_inputs=options.target_concurrent_inputs,
+                )
+            else:
+                options_pb = None
+
             req = api_pb2.FunctionBindParamsRequest(
                 function_id=parent.object_id,
                 serialized_params=serialized_params,
-                function_options=options,
+                function_options=options_pb,
                 environment_name=environment_name
                 or "",  # TODO: investigate shouldn't environment name always be specified here?
             )
@@ -989,7 +1014,12 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             response = await retry_transient_errors(parent._client.stub.FunctionBindParams, req)
             param_bound_func._hydrate(response.bound_function_id, parent._client, response.handle_metadata)
 
-        fun: _Function = _Function._from_loader(_load, "Function(parametrized)", hydrate_lazily=True)
+        def _deps():
+            if options:
+                return [v for _, v in options.validated_volumes] + list(options.secrets)
+            return []
+
+        fun: _Function = _Function._from_loader(_load, "Function(parametrized)", hydrate_lazily=True, deps=_deps)
 
         fun._info = self._info
         fun._obj = obj

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.76"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.78"
     ): ...
     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.76"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.78"
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/cls.py

@@ -1,4 +1,5 @@
 # Copyright Modal Labs 2022
+import dataclasses
 import inspect
 import os
 import typing
@@ -72,6 +73,18 @@ def _get_class_constructor_signature(user_cls: type) -> inspect.Signature:
         return inspect.Signature(constructor_parameters)
 
 
+@dataclasses.dataclass()
+class _ServiceOptions:
+    secrets: typing.Collection[_Secret]
+    resources: Optional[api_pb2.Resources]
+    retry_policy: Optional[api_pb2.FunctionRetryPolicy]
+    concurrency_limit: Optional[int]
+    timeout_secs: Optional[int]
+    task_idle_timeout_secs: Optional[int]
+    validated_volumes: typing.Sequence[tuple[str, _Volume]]
+    target_concurrent_inputs: Optional[int]
+
+
 def _bind_instance_method(cls: "_Cls", service_function: _Function, method_name: str):
     """Binds an "instance service function" to a specific method using metadata for that method
 
@@ -97,11 +110,14 @@ def _bind_instance_method(cls: "_Cls", service_function: _Function, method_name:
         hydrate_from_instance_service_function(fun)
 
     def _deps():
-        if service_function.is_hydrated:
-            # without this check, the common service_function will be reloaded by all methods
-            # TODO(elias): Investigate if we can fix this multi-loader in the resolver - feels like a bug?
-            return []
-        return [service_function]
+        unhydrated_deps = []
+        # without this check, the common service_function will be reloaded by all methods
+        # TODO(elias): Investigate if we can fix this multi-loader in the resolver - feels like a bug?
+        if not cls.is_hydrated:
+            unhydrated_deps.append(cls)
+        if not service_function.is_hydrated:
+            unhydrated_deps.append(service_function)
+        return unhydrated_deps
 
     rep = f"Method({cls._name}.{method_name})"
 
@@ -144,12 +160,13 @@ class _Obj:
     _kwargs: dict[str, Any]
 
     _instance_service_function: Optional[_Function] = None  # this gets set lazily
+    _options: Optional[_ServiceOptions]
 
     def __init__(
         self,
         cls: "_Cls",
         user_cls: Optional[type],  # this would be None in case of lookups
-        options: Optional[api_pb2.FunctionOptions],
+        options: Optional[_ServiceOptions],
         args,
         kwargs,
     ):
@@ -354,7 +371,7 @@ class _Cls(_Object, type_prefix="cs"):
     """
 
     _class_service_function: Optional[_Function]  # The _Function (read "service") serving *all* methods of the class
-    _options: Optional[api_pb2.FunctionOptions]
+    _options: Optional[_ServiceOptions]
 
     _app: Optional["modal.app._App"] = None  # not set for lookups
     _name: Optional[str]
@@ -595,28 +612,33 @@ class _Cls(_Object, type_prefix="cs"):
         else:
             resources = None
 
-        volume_mounts = [
-            api_pb2.VolumeMount(
-                mount_path=path,
-                volume_id=volume.object_id,
-                allow_background_commits=True,
-            )
-            for path, volume in validate_volumes(volumes)
-        ]
-        replace_volume_mounts = len(volume_mounts) > 0
-
-        cls = self.clone()
-        cls._options = api_pb2.FunctionOptions(
-            replace_secret_ids=bool(secrets),
-            secret_ids=[secret.object_id for secret in secrets],
+        async def _load_from_base(new_cls, resolver, existing_object_id):
+            # this is a bit confusing, the cls will always have the same metadata
+            # since it has the same *class* service function (i.e. "template")
+            # But the (instance) service function for each Obj will be different
+            # since it will rebind to whatever `_options` have been assigned on
+            # the particular Cls parent
+            if not self.is_hydrated:
+                # this should only happen for Cls.from_name instances
+                # other classes should already be hydrated!
+                await resolver.load(self)
+
+            new_cls._initialize_from_other(self)
+
+        def _deps():
+            return []
+
+        cls = _Cls._from_loader(_load_from_base, rep=f"{self._name}.with_options(...)", is_another_app=True, deps=_deps)
+        cls._initialize_from_other(self)
+        cls._options = _ServiceOptions(
+            secrets=secrets,
             resources=resources,
             retry_policy=retry_policy,
             # TODO(michael) Update the protos to use the new terminology
             concurrency_limit=max_containers,
             task_idle_timeout_secs=scaledown_window,
             timeout_secs=timeout,
-            replace_volume_mounts=replace_volume_mounts,
-            volume_mounts=volume_mounts,
+            validated_volumes=validate_volumes(volumes),
             target_concurrent_inputs=allow_concurrent_inputs,
         )
 

modal/cls.pyi

@@ -22,6 +22,31 @@ T = typing.TypeVar("T")
 
 def _use_annotation_parameters(user_cls: type) -> bool: ...
 def _get_class_constructor_signature(user_cls: type) -> inspect.Signature: ...
+
+class _ServiceOptions:
+    secrets: typing.Collection[modal.secret._Secret]
+    resources: typing.Optional[modal_proto.api_pb2.Resources]
+    retry_policy: typing.Optional[modal_proto.api_pb2.FunctionRetryPolicy]
+    concurrency_limit: typing.Optional[int]
+    timeout_secs: typing.Optional[int]
+    task_idle_timeout_secs: typing.Optional[int]
+    validated_volumes: typing.Sequence[tuple[str, modal.volume._Volume]]
+    target_concurrent_inputs: typing.Optional[int]
+
+    def __init__(
+        self,
+        secrets: typing.Collection[modal.secret._Secret],
+        resources: typing.Optional[modal_proto.api_pb2.Resources],
+        retry_policy: typing.Optional[modal_proto.api_pb2.FunctionRetryPolicy],
+        concurrency_limit: typing.Optional[int],
+        timeout_secs: typing.Optional[int],
+        task_idle_timeout_secs: typing.Optional[int],
+        validated_volumes: typing.Sequence[tuple[str, modal.volume._Volume]],
+        target_concurrent_inputs: typing.Optional[int],
+    ) -> None: ...
+    def __repr__(self): ...
+    def __eq__(self, other): ...
+
 def _bind_instance_method(cls: _Cls, service_function: modal._functions._Function, method_name: str): ...
 
 class _Obj:
@@ -32,14 +57,10 @@ class _Obj:
     _args: tuple[typing.Any, ...]
     _kwargs: dict[str, typing.Any]
     _instance_service_function: typing.Optional[modal._functions._Function]
+    _options: typing.Optional[_ServiceOptions]
 
     def __init__(
-        self,
-        cls: _Cls,
-        user_cls: typing.Optional[type],
-        options: typing.Optional[modal_proto.api_pb2.FunctionOptions],
-        args,
-        kwargs,
+        self, cls: _Cls, user_cls: typing.Optional[type], options: typing.Optional[_ServiceOptions], args, kwargs
     ): ...
     def _cached_service_function(self) -> modal._functions._Function: ...
     def _get_parameter_values(self) -> dict[str, typing.Any]: ...
@@ -64,14 +85,10 @@ class Obj:
     _args: tuple[typing.Any, ...]
     _kwargs: dict[str, typing.Any]
     _instance_service_function: typing.Optional[modal.functions.Function]
+    _options: typing.Optional[_ServiceOptions]
 
     def __init__(
-        self,
-        cls: Cls,
-        user_cls: typing.Optional[type],
-        options: typing.Optional[modal_proto.api_pb2.FunctionOptions],
-        args,
-        kwargs,
+        self, cls: Cls, user_cls: typing.Optional[type], options: typing.Optional[_ServiceOptions], args, kwargs
     ): ...
     def _cached_service_function(self) -> modal.functions.Function: ...
     def _get_parameter_values(self) -> dict[str, typing.Any]: ...
@@ -94,7 +111,7 @@ class Obj:
 
 class _Cls(modal._object._Object):
     _class_service_function: typing.Optional[modal._functions._Function]
-    _options: typing.Optional[modal_proto.api_pb2.FunctionOptions]
+    _options: typing.Optional[_ServiceOptions]
     _app: typing.Optional[modal.app._App]
     _name: typing.Optional[str]
     _method_metadata: typing.Optional[dict[str, modal_proto.api_pb2.FunctionHandleMetadata]]
@@ -154,7 +171,7 @@ class _Cls(modal._object._Object):
 
 class Cls(modal.object.Object):
     _class_service_function: typing.Optional[modal.functions.Function]
-    _options: typing.Optional[modal_proto.api_pb2.FunctionOptions]
+    _options: typing.Optional[_ServiceOptions]
     _app: typing.Optional[modal.app.App]
     _name: typing.Optional[str]
     _method_metadata: typing.Optional[dict[str, modal_proto.api_pb2.FunctionHandleMetadata]]

modal/functions.pyi

@@ -103,7 +103,7 @@ class Function(
     def _bind_parameters(
         self,
         obj: modal.cls.Obj,
-        options: typing.Optional[modal_proto.api_pb2.FunctionOptions],
+        options: typing.Optional[modal.cls._ServiceOptions],
         args: collections.abc.Sized,
         kwargs: dict[str, typing.Any],
     ) -> Function: ...

{modal-0.73.76.dist-info → modal-0.73.78.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: modal
-Version: 0.73.76
+Version: 0.73.78
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License: Apache-2.0

{modal-0.73.76.dist-info → modal-0.73.78.dist-info}/RECORD

@@ -3,7 +3,7 @@ modal/__main__.py,sha256=CgIjP8m1xJjjd4AXc-delmR6LdBCZclw2A_V38CFIio,2870
 modal/_clustered_functions.py,sha256=kTf-9YBXY88NutC1akI-gCbvf01RhMPCw-zoOI_YIUE,2700
 modal/_clustered_functions.pyi,sha256=vllkegc99A0jrUOWa8mdlSbdp6uz36TsHhGxysAOpaQ,771
 modal/_container_entrypoint.py,sha256=arhkIoF8nQNfa4iwYGSoqN3QMDg5M38QNAODXC8TlKc,29301
-modal/_functions.py,sha256=LkzRfcex420bHWN2s5Aqbtm9cg7PaAcuG-H2jNz1JfE,71459
+modal/_functions.py,sha256=OR76wIl-Hq5Q-mId_FzcEhpUdU6Lq40FDvnMLvAzgUM,72740
 modal/_ipython.py,sha256=TW1fkVOmZL3YYqdS2YlM1hqpf654Yf8ZyybHdBnlhSw,301
 modal/_location.py,sha256=joiX-0ZeutEUDTrrqLF1GHXCdVLF-rHzstocbMcd_-k,366
 modal/_object.py,sha256=ItQcsMNkz9Y3kdTsvfNarbW-paJ2qabDyQ7njaqY0XI,11359
@@ -22,11 +22,11 @@ modal/app.py,sha256=kF3frIt4eRKVYYCjusMMhKJpO_lDdm2z37HOXPwpjT8,45506
 modal/app.pyi,sha256=tZFbcsu20SuvfB2puxCyuXLFNJ9bQulzag55rVpgZmc,26827
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=8SQawr7P1PNUCq1UmJMUQXG2jIo4Nmdcs311XqrNLRE,15276
-modal/client.pyi,sha256=BY_85JYs5yMmzZbJ4XMfajA48crezjBUTGtZ8RUi-gc,7593
+modal/client.pyi,sha256=nsP8_keaoKGSvTKUjg-5lvGIkudDje81JI4blMbvPA0,7593
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
-modal/cls.py,sha256=pQqLU_vlgHD2aglDQAoVuzt0BS3pUkRfC7oHG_fsbV4,30700
-modal/cls.pyi,sha256=MAx5J72UhD5l2qbH_sTpZDP34PlI4P71OBLSWOqvE68,9300
+modal/cls.py,sha256=5DjpSBP1IyROKZm5ItDiEGdbRnfTT6K1Ul0jEvEKw_Q,31695
+modal/cls.pyi,sha256=ZJUwtRaQBGlM6tphvnv49FHBVDSgttMdD_LnYyRSKJM,10302
 modal/config.py,sha256=Boz1bPzaG-k5Grjq6y6fAELH1N_gTuYDnpB6FODzCPo,11710
 modal/container_process.py,sha256=WTqLn01dJPVkPpwR_0w_JH96ceN5mV4TGtiu1ZR2RRA,6108
 modal/container_process.pyi,sha256=Hf0J5JyDdCCXBJSKx6gvkPOo0XrztCm78xzxamtzUjQ,2828
@@ -41,7 +41,7 @@ modal/file_io.py,sha256=lcMs_E9Xfm0YX1t9U2wNIBPnqHRxmImqjLW1GHqVmyg,20945
 modal/file_io.pyi,sha256=NTRft1tbPSWf9TlWVeZmTlgB5AZ_Zhu2srWIrWr7brk,9445
 modal/file_pattern_matcher.py,sha256=trosX-Bp7dOubudN1bLLhRAoidWy1TcoaR4Pv8CedWw,6497
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
-modal/functions.pyi,sha256=7m3qSR7dKUPcSZycZ4Y1VaySjdBZI0_MmR8pRrbHzxE,14387
+modal/functions.pyi,sha256=ujc6eIYyNmMn__4dpxEy85-vZmAniZv56D2A4uBgs6U,14377
 modal/gpu.py,sha256=Kbhs_u49FaC2Zi0TjCdrpstpRtT5eZgecynmQi5IZVE,6752
 modal/image.py,sha256=adMUpS7WrCu-M78BWslz2r6GPviy4qPvd5Dh-dBIrrk,90257
 modal/image.pyi,sha256=L7aZUOElSGtNHmFHz1RgKP1cG5paiXt_EzylrwBwzVk,25004
@@ -168,10 +168,10 @@ modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0y
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_version/__init__.py,sha256=wiJQ53c-OMs0Xf1UeXOxQ7FwlV1VzIjnX6o-pRYZ_Pk,470
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal_version/_version_generated.py,sha256=jmVn-W1r2Lr0q91iDTY2ZmvlYDwd2coi9KKtw_i03Jk,149
-modal-0.73.76.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-modal-0.73.76.dist-info/METADATA,sha256=XZV1Q5CvoLdg2NmRCtLXu5CfAd8SISK_6cRFO_bySec,2452
-modal-0.73.76.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-modal-0.73.76.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.73.76.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-0.73.76.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=SVM-j7lp7Izmro-RLUeewxt817YY4EwwPw1pMBXAJso,149
+modal-0.73.78.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.73.78.dist-info/METADATA,sha256=X3t3uscecWYwdrRCFn-rrPcuGE664EzvBTfL9PseXMk,2452
+modal-0.73.78.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+modal-0.73.78.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.73.78.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-0.73.78.dist-info/RECORD,,

modal_version/_version_generated.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 
 # Note: Reset this value to -1 whenever you make a minor `0.X` release of the client.
-build_number = 76  # git: d55968d
+build_number = 78  # git: 8254f56