modal 0.73.34__py3-none-any.whl → 0.73.36__py3-none-any.whl

modal/_functions.py

@@ -619,6 +619,13 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                 f"strictly less than its `{keep_warm=}` parameter."
             )
 
+        autoscaler_settings = api_pb2.AutoscalerSettings(
+            max_containers=concurrency_limit,
+            min_containers=keep_warm,
+            buffer_containers=_experimental_buffer_containers,
+            scaledown_window=container_idle_timeout,
+        )
+
         if _experimental_custom_scaling_factor is not None and (
             _experimental_custom_scaling_factor < 0 or _experimental_custom_scaling_factor > 1
         ):
@@ -802,6 +809,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                     class_serialized=class_serialized or b"",
                     function_type=function_type,
                     webhook_config=webhook_config,
+                    autoscaler_settings=autoscaler_settings,
                     method_definitions=method_definitions,
                     method_definitions_set=True,
                     shared_volume_mounts=network_file_system_mount_protos(
@@ -1066,25 +1074,9 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         await retry_transient_errors(self.client.stub.FunctionUpdateSchedulingParams, request)
 
     @classmethod
-    @renamed_parameter((2024, 12, 18), "tag", "name")
-    def from_name(
-        cls: type["_Function"],
-        app_name: str,
-        name: str,
-        namespace=api_pb2.DEPLOYMENT_NAMESPACE_WORKSPACE,
-        environment_name: Optional[str] = None,
-    ) -> "_Function":
-        """Reference a Function from a deployed App by its name.
-
-        In contrast to `modal.Function.lookup`, this is a lazy method
-        that defers hydrating the local object with metadata from
-        Modal servers until the first time it is actually used.
-
-        ```python
-        f = modal.Function.from_name("other-app", "function")
-        ```
-        """
-
+    def _from_name(cls, app_name: str, name: str, namespace, environment_name: Optional[str]):
+        # internal function lookup implementation that allows lookup of class "service functions"
+        # in addition to non-class functions
         async def _load_remote(self: _Function, resolver: Resolver, existing_object_id: Optional[str]):
             assert resolver.client and resolver.client.stub
             request = api_pb2.FunctionGetRequest(
@@ -1108,6 +1100,38 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         rep = f"Function.from_name({app_name}, {name})"
         return cls._from_loader(_load_remote, rep, is_another_app=True, hydrate_lazily=True)
 
+    @classmethod
+    @renamed_parameter((2024, 12, 18), "tag", "name")
+    def from_name(
+        cls: type["_Function"],
+        app_name: str,
+        name: str,
+        namespace=api_pb2.DEPLOYMENT_NAMESPACE_WORKSPACE,
+        environment_name: Optional[str] = None,
+    ) -> "_Function":
+        """Reference a Function from a deployed App by its name.
+
+        In contrast to `modal.Function.lookup`, this is a lazy method
+        that defers hydrating the local object with metadata from
+        Modal servers until the first time it is actually used.
+
+        ```python
+        f = modal.Function.from_name("other-app", "function")
+        ```
+        """
+        if "." in name:
+            class_name, method_name = name.split(".", 1)
+            deprecation_warning(
+                (2025, 2, 11),
+                "Looking up class methods using Function.from_name will be deprecated"
+                " in a future version of Modal.\nUse modal.Cls.from_name instead, e.g.\n\n"
+                f'{class_name} = modal.Cls.from_name("{app_name}", "{class_name}")\n'
+                f"instance = {class_name}(...)\n"
+                f"instance.{method_name}.remote(...)\n",
+            )
+
+        return cls._from_name(app_name, name, namespace, environment_name)
+
     @staticmethod
     @renamed_parameter((2024, 12, 18), "tag", "name")
     async def lookup(

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

modal/cls.py

@@ -558,9 +558,10 @@ class _Cls(_Object, type_prefix="cs"):
         cls = cls._from_loader(_load_remote, rep, is_another_app=True, hydrate_lazily=True)
 
         class_service_name = f"{name}.*"  # special name of the base service function for the class
-        cls._class_service_function = _Function.from_name(
+        cls._class_service_function = _Function._from_name(
             app_name,
             class_service_name,
+            namespace=namespace,
             environment_name=_environment_name,
         )
         cls._name = name

modal/functions.pyi

@@ -116,6 +116,8 @@ class Function(
 
     keep_warm: __keep_warm_spec[typing_extensions.Self]
 
+    @classmethod
+    def _from_name(cls, app_name: str, name: str, namespace, environment_name: typing.Optional[str]): ...
     @classmethod
     def from_name(
         cls: type[Function], app_name: str, name: str, namespace=1, environment_name: typing.Optional[str] = None

{modal-0.73.34.dist-info → modal-0.73.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modal
-Version: 0.73.34
+Version: 0.73.36
 Summary: Python client library for Modal
 Author: Modal Labs
 Author-email: support@modal.com

{modal-0.73.34.dist-info → modal-0.73.36.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=YtfJ852XUDtAWBD-yVs99zy933-VBEKQyIngEj36Qcw,29286
-modal/_functions.py,sha256=ls_u9YqRFLgL5_vAWcTpBkpRQZX0Wx50kCxrt6Tlb_k,71180
+modal/_functions.py,sha256=UpkT7V6YjIL_BWJzIUV847-eSwBPWZSMnONtftr_Ses,72372
 modal/_ipython.py,sha256=TW1fkVOmZL3YYqdS2YlM1hqpf654Yf8ZyybHdBnlhSw,301
 modal/_location.py,sha256=joiX-0ZeutEUDTrrqLF1GHXCdVLF-rHzstocbMcd_-k,366
 modal/_object.py,sha256=ItQcsMNkz9Y3kdTsvfNarbW-paJ2qabDyQ7njaqY0XI,11359
@@ -22,10 +22,10 @@ modal/app.py,sha256=rCOPD51gVyow8muyaqMuV65qfTnAZKf_w1OCZdSF_6o,44636
 modal/app.pyi,sha256=0MMCgskIL4r3eq8oBcfm2lLyeao2gXjS3iXaIfmaJ-o,25959
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=8SQawr7P1PNUCq1UmJMUQXG2jIo4Nmdcs311XqrNLRE,15276
-modal/client.pyi,sha256=oEUwn4aphdWly9XyCu--z0Y8qVxgnT9y7w9t8QWxbSE,7593
+modal/client.pyi,sha256=gy7-aWZUpvjyNpRtJ00m-uSlLs_Rxaw9ZCWUk8vGx8Q,7593
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
-modal/cls.py,sha256=5Er9L9tGpLGIrbiHOI7c9266gPG6nhxoJ_BX8op96nU,31096
+modal/cls.py,sha256=nJhJr-YuttOmdNWxtMHcBV-q6iQmY5qXkEy9yO43clY,31130
 modal/cls.pyi,sha256=QqYoRKVCKhP_HkHittKpEZ6sqXkEdtEl4n1wMqeoe3M,8897
 modal/config.py,sha256=XT1W4Y9PVkbYMAXjJRshvQEPDhZmnfW_ZRMwl8XKoqA,11149
 modal/container_process.py,sha256=WTqLn01dJPVkPpwR_0w_JH96ceN5mV4TGtiu1ZR2RRA,6108
@@ -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=B6sPrnpt34Z_DVz_5SpHV7NVpfk2nTXuS215Xcu4kK0,14255
+modal/functions.pyi,sha256=CEM12TJcrb-6v-VAHcDvzrgAlynFTDhUTXKf68E9O30,14378
 modal/gpu.py,sha256=Kbhs_u49FaC2Zi0TjCdrpstpRtT5eZgecynmQi5IZVE,6752
 modal/image.py,sha256=KYc6bg-m9A6wiLF38dWcFBMrEATyR2KOF0sp-6O9uC0,91508
 modal/image.pyi,sha256=kMkIDHcyyhA7BC2Vrx0RfrLEsqK8Ng2-IqUKL-CJexI,26250
@@ -155,10 +155,10 @@ modal_global_objects/mounts/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0
 modal_global_objects/mounts/modal_client_package.py,sha256=W0E_yShsRojPzWm6LtIQqNVolapdnrZkm2hVEQuZK_4,767
 modal_global_objects/mounts/python_standalone.py,sha256=EsC-hdPtiAPOwgW9emHN6muNUkrJwR8dYxroVArxHxM,1841
 modal_proto/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
-modal_proto/api.proto,sha256=-1UTgFwz_qrPvCLNv5xrztGIQXxlTaW2n8deTppCLnw,86504
+modal_proto/api.proto,sha256=VfozLNIfiwjLeydRVqELpF8giGhmvCOIh63ICyZtuV8,86834
 modal_proto/api_grpc.py,sha256=FYGqDegM_w_qxdtlxum8k31mDibKoMvmNxv_p9cKdKs,109056
-modal_proto/api_pb2.py,sha256=BCq06_U3wJXMKSq4MTzZQHrs1HF7jBxICK8ib870IUQ,312269
-modal_proto/api_pb2.pyi,sha256=hjRUFcmO2epIMz4h5XjB-ZctgtnmS7EwRROpU6BvjP4,420220
+modal_proto/api_pb2.py,sha256=IPpA4du84rbeP1flUQDlpuxfZD5U-c8NLdSCKhVHyNU,312354
+modal_proto/api_pb2.pyi,sha256=HD8mwmTsXY36NPlwMRgEGcmQeFawr0_GFlEimr34K8M,420831
 modal_proto/api_pb2_grpc.py,sha256=DNp0Et5i_Ey4dKx_1o1LRtYhyWYyT0NzTcAY4EcHn-c,235765
 modal_proto/api_pb2_grpc.pyi,sha256=RI6tWC3L8EIN4-izFSEGPPJl5Ta0lXPNuHUJaWAr35s,54892
 modal_proto/modal_api_grpc.py,sha256=UG8WJU81afrWPwItWB4Ag64E9EpyREMpBbAVGVEYJiM,14550
@@ -172,10 +172,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=Uq8vpXoX7M6MQ85HLh6ReVhc-C0_MbAGw5eRXRR0x2o,149
-modal-0.73.34.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-modal-0.73.34.dist-info/METADATA,sha256=JId5JwGx7Pr-gIs4F96UcZReJ7Lpshq3xaYjTAR9wlw,2330
-modal-0.73.34.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-modal-0.73.34.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.73.34.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
-modal-0.73.34.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=fP5zP8t74bD5IjSKt6l4Uo9LQlYTy8J8zrEL-zloyfw,149
+modal-0.73.36.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.73.36.dist-info/METADATA,sha256=oHHOvStUgzT8jJR-061X0tYvZrXsQ8PD7bWy2rQ9zKM,2330
+modal-0.73.36.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+modal-0.73.36.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.73.36.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
+modal-0.73.36.dist-info/RECORD,,

modal_proto/api.proto

@@ -1174,7 +1174,7 @@ message Function {
 
   FunctionRetryPolicy retry_policy = 18;
 
-  uint32 concurrency_limit = 19;
+  uint32 concurrency_limit = 19;  // To be replaced by autoscaler_settings.max_containers
 
   reserved 20; // old fields
 
@@ -1183,11 +1183,11 @@ message Function {
   PTYInfo pty_info = 22;
   bytes class_serialized = 23;
 
-  uint32 task_idle_timeout_secs = 25;
+  uint32 task_idle_timeout_secs = 25;  // To be replaced by autoscaler_settings.scaledown_period
 
   optional CloudProvider cloud_provider = 26;  // Deprecated at some point
 
-  uint32 warm_pool_size = 27;
+  uint32 warm_pool_size = 27;  // To be replaced by autoscaler_settings.min_containers
 
   string web_url = 28;
   WebUrlInfo web_url_info = 29;
@@ -1262,7 +1262,7 @@ message Function {
   // If set, the function will be run in an untrusted environment.
   bool untrusted = 68;
 
-  uint32 _experimental_buffer_containers = 69;
+  uint32 _experimental_buffer_containers = 69;  // To be replaced by autoscaler_settings.buffer_containers
 
   // _experimental_proxy_ip -> ProxyInfo
   // TODO: deprecate.
@@ -1283,6 +1283,9 @@ message Function {
   string cloud_provider_str = 77;  // Supersedes cloud_provider
 
   bool _experimental_enable_gpu_snapshot = 78; // Experimental support for GPU snapshotting
+
+  AutoscalerSettings autoscaler_settings = 79;  // Bundle of parameters related to autoscaling
+
 }
 
 message FunctionAsyncInvokeRequest {