modal 1.5.4.dev1__tar.gz → 1.5.4.dev2__tar.gz

{modal-1.5.4.dev1 → modal-1.5.4.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.5.4.dev1
+Version: 1.5.4.dev2
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0

{modal-1.5.4.dev1 → modal-1.5.4.dev2}/modal/_functions.py

@@ -93,7 +93,7 @@ from .proxy import _Proxy
 from .retries import Retries, RetryManager
 from .schedule import Schedule
 from .secret import _Secret
-from .types import FunctionStats
+from .types import FunctionAutoscalerSettings, FunctionStats, ServerAutoscalerSettings
 from .volume import _Volume, _volume_to_mount_proto
 
 if TYPE_CHECKING:
@@ -1172,6 +1172,25 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         return obj
 
     async def _update_autoscaler(
+        self,
+        *,
+        min_containers: int | None = None,
+        max_containers: int | None = None,
+        buffer_containers: int | None = None,
+        scaledown_window: int | None = None,
+    ) -> FunctionAutoscalerSettings:
+        settings = api_pb2.AutoscalerSettings(
+            min_containers=min_containers,
+            max_containers=max_containers,
+            buffer_containers=buffer_containers,
+            scaledown_window=scaledown_window,
+        )
+        request = api_pb2.FunctionUpdateSchedulingParamsRequest(function_id=self.object_id, settings=settings)
+        response = await self.client.stub.FunctionUpdateSchedulingParams(request)
+
+        return FunctionAutoscalerSettings._from_proto(response.current_settings)
+
+    async def _update_autoscaler_server(
         self,
         *,
         min_containers: int | None = None,
@@ -1180,7 +1199,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         scaleup_window: int | None = None,
         scaledown_window: int | None = None,
         target_concurrency: int | None = None,
-    ) -> None:
+    ) -> ServerAutoscalerSettings:
         settings = api_pb2.AutoscalerSettings(
             min_containers=min_containers,
             max_containers=max_containers,
@@ -1190,10 +1209,9 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             target_concurrency=target_concurrency,
         )
         request = api_pb2.FunctionUpdateSchedulingParamsRequest(function_id=self.object_id, settings=settings)
-        await self.client.stub.FunctionUpdateSchedulingParams(request)
+        response = await self.client.stub.FunctionUpdateSchedulingParams(request)
 
-        # One idea would be for FunctionUpdateScheduleParams to return the current (coalesced) settings
-        # and then we could return them here (would need some ad hoc dataclass, which I don't love)
+        return ServerAutoscalerSettings._from_proto(response.current_settings)
 
     @live_method
     async def update_autoscaler(
@@ -1203,7 +1221,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         max_containers: int | None = None,
         buffer_containers: int | None = None,
         scaledown_window: int | None = None,
-    ) -> None:
+    ) -> FunctionAutoscalerSettings:
         """Override the current autoscaler behavior for this Function.
 
         Unspecified parameters will retain their current value, i.e. either the static value
@@ -1218,6 +1236,10 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             buffer_containers: Extra containers to keep warm beyond current demand.
             scaledown_window: Maximum duration (in seconds) idle containers wait before scaling down.
 
+        Returns:
+            A `FunctionAutoscalerSettings` dataclass which contains the current autoscaler settings
+            of this Function after the call.
+
         Examples:
             ```python notest
             f = modal.Function.from_name("my-app", "function")
@@ -1237,7 +1259,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         if self._is_method:
             raise InvalidError("Cannot call .update_autoscaler() on a method. Call it on the class instance instead.")
 
-        await self._update_autoscaler(
+        return await self._update_autoscaler(
             min_containers=min_containers,
             max_containers=max_containers,
             buffer_containers=buffer_containers,

{modal-1.5.4.dev1 → modal-1.5.4.dev2}/modal/_server.py

@@ -15,6 +15,7 @@ from ._supports_logs import _LogQueryData
 from .client import _Client
 from .cls import is_parameter
 from .exception import InvalidError
+from .types import ServerAutoscalerSettings
 
 if typing.TYPE_CHECKING:
     import modal.app
@@ -129,7 +130,7 @@ class _Server:
         buffer_containers: int | None = None,
         scaleup_window: int | None = None,
         scaledown_window: int | None = None,
-    ) -> None:
+    ) -> ServerAutoscalerSettings:
         """Override the current autoscaler behavior for this Server.
 
         Unspecified parameters will retain their current value, i.e. either the static value
@@ -146,6 +147,10 @@ class _Server:
             scaleup_window: Seconds of sustained demand required before scaling up new containers.
             scaledown_window: Maximum duration (in seconds) idle containers wait before scaling down.
 
+        Returns:
+            A `ServerAutoscalerSettings` dataclass which contains the current autoscaler settings of
+            this Server after the call.
+
         Examples:
             ```python notest
             server = modal.Server.from_name("my-app", "Server")
@@ -167,7 +172,7 @@ class _Server:
             ```
 
         """
-        return await self._get_service_function()._update_autoscaler(
+        return await self._get_service_function()._update_autoscaler_server(
             min_containers=min_containers,
             max_containers=max_containers,
             scaleup_window=scaleup_window,

{modal-1.5.4.dev1 → modal-1.5.4.dev2}/modal/client.pyi

@@ -37,7 +37,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.4.dev1",
+        version: str = "1.5.4.dev2",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -207,7 +207,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.4.dev1",
+        version: str = "1.5.4.dev2",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.5.4.dev1 → modal-1.5.4.dev2}/modal/cls.py

@@ -33,6 +33,7 @@ from .cloud_bucket_mount import _CloudBucketMount
 from .exception import ExecutionError, InvalidError, NotFoundError
 from .retries import Retries
 from .secret import _Secret
+from .types import FunctionAutoscalerSettings
 from .volume import _Volume
 
 T = TypeVar("T")
@@ -288,7 +289,7 @@ class _Obj:
         max_containers: int | None = None,
         scaledown_window: int | None = None,
         buffer_containers: int | None = None,
-    ) -> None:
+    ) -> FunctionAutoscalerSettings:
         """Override the current autoscaler behavior for this Cls instance.
 
         Unspecified parameters will retain their current value, i.e. either the static value
@@ -306,6 +307,10 @@ class _Obj:
             scaledown_window: Idle seconds before scaling down a container; omit to leave unchanged.
             buffer_containers: Extra idle containers under load; omit to leave unchanged.
 
+        Returns:
+            An `FunctionAutoscalerSettings` dataclass which contains the current autoscaler settings
+            of this Cls instance after the call.
+
         Examples:
             ```python notest
             Model = modal.Cls.from_name("my-app", "Model")
@@ -321,6 +326,7 @@ class _Obj:
         """
         if not self._cls.is_hydrated and not self._cls._is_local():
             await self._cls.hydrate()
+
         return await self._cached_service_function().update_autoscaler(
             min_containers=min_containers,
             max_containers=max_containers,

{modal-1.5.4.dev1 → modal-1.5.4.dev2}/modal/cls.pyi

@@ -13,6 +13,7 @@ import modal.object
 import modal.partial_function
 import modal.retries
 import modal.secret
+import modal.types
 import modal.volume
 import modal_proto.api_pb2
 import pathlib
@@ -67,7 +68,7 @@ class _Obj:
         max_containers: typing.Optional[int] = None,
         scaledown_window: typing.Optional[int] = None,
         buffer_containers: typing.Optional[int] = None,
-    ) -> None:
+    ) -> modal.types.FunctionAutoscalerSettings:
         """Override the current autoscaler behavior for this Cls instance.
 
         Unspecified parameters will retain their current value, i.e. either the static value
@@ -85,6 +86,10 @@ class _Obj:
             scaledown_window: Idle seconds before scaling down a container; omit to leave unchanged.
             buffer_containers: Extra idle containers under load; omit to leave unchanged.
 
+        Returns:
+            An `FunctionAutoscalerSettings` dataclass which contains the current autoscaler settings
+            of this Cls instance after the call.
+
         Examples:
             ```python notest
             Model = modal.Cls.from_name("my-app", "Model")
@@ -150,7 +155,7 @@ class Obj:
             max_containers: typing.Optional[int] = None,
             scaledown_window: typing.Optional[int] = None,
             buffer_containers: typing.Optional[int] = None,
-        ) -> None:
+        ) -> modal.types.FunctionAutoscalerSettings:
             """Override the current autoscaler behavior for this Cls instance.
 
             Unspecified parameters will retain their current value, i.e. either the static value
@@ -168,6 +173,10 @@ class Obj:
                 scaledown_window: Idle seconds before scaling down a container; omit to leave unchanged.
                 buffer_containers: Extra idle containers under load; omit to leave unchanged.
 
+            Returns:
+                An `FunctionAutoscalerSettings` dataclass which contains the current autoscaler settings
+                of this Cls instance after the call.
+
             Examples:
                 ```python notest
                 Model = modal.Cls.from_name("my-app", "Model")
@@ -190,7 +199,7 @@ class Obj:
             max_containers: typing.Optional[int] = None,
             scaledown_window: typing.Optional[int] = None,
             buffer_containers: typing.Optional[int] = None,
-        ) -> None:
+        ) -> modal.types.FunctionAutoscalerSettings:
             """Override the current autoscaler behavior for this Cls instance.
 
             Unspecified parameters will retain their current value, i.e. either the static value
@@ -208,6 +217,10 @@ class Obj:
                 scaledown_window: Idle seconds before scaling down a container; omit to leave unchanged.
                 buffer_containers: Extra idle containers under load; omit to leave unchanged.
 
+            Returns:
+                An `FunctionAutoscalerSettings` dataclass which contains the current autoscaler settings
+                of this Cls instance after the call.
+
             Examples:
                 ```python notest
                 Model = modal.Cls.from_name("my-app", "Model")

{modal-1.5.4.dev1 → modal-1.5.4.dev2}/modal/functions.pyi

@@ -148,6 +148,28 @@ class Function(
         ...
 
     class ___update_autoscaler_spec(typing_extensions.Protocol):
+        def __call__(
+            self,
+            /,
+            *,
+            min_containers: typing.Optional[int] = None,
+            max_containers: typing.Optional[int] = None,
+            buffer_containers: typing.Optional[int] = None,
+            scaledown_window: typing.Optional[int] = None,
+        ) -> modal.types.FunctionAutoscalerSettings: ...
+        async def aio(
+            self,
+            /,
+            *,
+            min_containers: typing.Optional[int] = None,
+            max_containers: typing.Optional[int] = None,
+            buffer_containers: typing.Optional[int] = None,
+            scaledown_window: typing.Optional[int] = None,
+        ) -> modal.types.FunctionAutoscalerSettings: ...
+
+    _update_autoscaler: ___update_autoscaler_spec
+
+    class ___update_autoscaler_server_spec(typing_extensions.Protocol):
         def __call__(
             self,
             /,
@@ -158,7 +180,7 @@ class Function(
             scaleup_window: typing.Optional[int] = None,
             scaledown_window: typing.Optional[int] = None,
             target_concurrency: typing.Optional[int] = None,
-        ) -> None: ...
+        ) -> modal.types.ServerAutoscalerSettings: ...
         async def aio(
             self,
             /,
@@ -169,9 +191,9 @@ class Function(
             scaleup_window: typing.Optional[int] = None,
             scaledown_window: typing.Optional[int] = None,
             target_concurrency: typing.Optional[int] = None,
-        ) -> None: ...
+        ) -> modal.types.ServerAutoscalerSettings: ...
 
-    _update_autoscaler: ___update_autoscaler_spec
+    _update_autoscaler_server: ___update_autoscaler_server_spec
 
     class __update_autoscaler_spec(typing_extensions.Protocol):
         def __call__(
@@ -182,7 +204,7 @@ class Function(
             max_containers: typing.Optional[int] = None,
             buffer_containers: typing.Optional[int] = None,
             scaledown_window: typing.Optional[int] = None,
-        ) -> None:
+        ) -> modal.types.FunctionAutoscalerSettings:
             """Override the current autoscaler behavior for this Function.
 
             Unspecified parameters will retain their current value, i.e. either the static value
@@ -197,6 +219,10 @@ class Function(
                 buffer_containers: Extra containers to keep warm beyond current demand.
                 scaledown_window: Maximum duration (in seconds) idle containers wait before scaling down.
 
+            Returns:
+                A `FunctionAutoscalerSettings` dataclass which contains the current autoscaler settings
+                of this Function after the call.
+
             Examples:
                 ```python notest
                 f = modal.Function.from_name("my-app", "function")
@@ -221,7 +247,7 @@ class Function(
             max_containers: typing.Optional[int] = None,
             buffer_containers: typing.Optional[int] = None,
             scaledown_window: typing.Optional[int] = None,
-        ) -> None:
+        ) -> modal.types.FunctionAutoscalerSettings:
             """Override the current autoscaler behavior for this Function.
 
             Unspecified parameters will retain their current value, i.e. either the static value
@@ -236,6 +262,10 @@ class Function(
                 buffer_containers: Extra containers to keep warm beyond current demand.
                 scaledown_window: Maximum duration (in seconds) idle containers wait before scaling down.
 
+            Returns:
+                A `FunctionAutoscalerSettings` dataclass which contains the current autoscaler settings
+                of this Function after the call.
+
             Examples:
                 ```python notest
                 f = modal.Function.from_name("my-app", "function")

{modal-1.5.4.dev1 → modal-1.5.4.dev2}/modal/server.pyi

@@ -4,6 +4,7 @@ import modal.app
 import modal.client
 import modal.functions
 import modal.partial_function
+import modal.types
 import typing
 import typing_extensions
 
@@ -86,7 +87,7 @@ class Server:
             buffer_containers: typing.Optional[int] = None,
             scaleup_window: typing.Optional[int] = None,
             scaledown_window: typing.Optional[int] = None,
-        ) -> None:
+        ) -> modal.types.ServerAutoscalerSettings:
             """Override the current autoscaler behavior for this Server.
 
             Unspecified parameters will retain their current value, i.e. either the static value
@@ -103,6 +104,10 @@ class Server:
                 scaleup_window: Seconds of sustained demand required before scaling up new containers.
                 scaledown_window: Maximum duration (in seconds) idle containers wait before scaling down.
 
+            Returns:
+                A `ServerAutoscalerSettings` dataclass which contains the current autoscaler settings of
+                this Server after the call.
+
             Examples:
                 ```python notest
                 server = modal.Server.from_name("my-app", "Server")
@@ -135,7 +140,7 @@ class Server:
             buffer_containers: typing.Optional[int] = None,
             scaleup_window: typing.Optional[int] = None,
             scaledown_window: typing.Optional[int] = None,
-        ) -> None:
+        ) -> modal.types.ServerAutoscalerSettings:
             """Override the current autoscaler behavior for this Server.
 
             Unspecified parameters will retain their current value, i.e. either the static value
@@ -152,6 +157,10 @@ class Server:
                 scaleup_window: Seconds of sustained demand required before scaling up new containers.
                 scaledown_window: Maximum duration (in seconds) idle containers wait before scaling down.
 
+            Returns:
+                A `ServerAutoscalerSettings` dataclass which contains the current autoscaler settings of
+                this Server after the call.
+
             Examples:
                 ```python notest
                 server = modal.Server.from_name("my-app", "Server")

{modal-1.5.4.dev1 → modal-1.5.4.dev2}/modal/types.py

@@ -367,3 +367,41 @@ class EnvironmentBillingSummary:
             metered_cost=Decimal(pb_item.metered_cost),
             metered_cost_breakdown=metered_cost_breakdown,
         )
+
+
+@dataclass(slots=True, frozen=True)
+class FunctionAutoscalerSettings:
+    min_containers: int | None
+    max_containers: int | None
+    scaledown_window: int | None
+    buffer_containers: int | None
+
+    @classmethod
+    def _from_proto(cls, pb_item: api_pb2.AutoscalerSettings) -> "FunctionAutoscalerSettings":
+        return cls(
+            min_containers=pb_item.min_containers if pb_item.HasField("min_containers") else None,
+            max_containers=pb_item.max_containers if pb_item.HasField("max_containers") else None,
+            scaledown_window=pb_item.scaledown_window if pb_item.HasField("scaledown_window") else None,
+            buffer_containers=pb_item.buffer_containers if pb_item.HasField("buffer_containers") else None,
+        )
+
+
+@dataclass(slots=True, frozen=True)
+class ServerAutoscalerSettings:
+    target_concurrency: int | None
+    min_containers: int | None
+    max_containers: int | None
+    buffer_containers: int | None
+    scaleup_window: int | None
+    scaledown_window: int | None
+
+    @classmethod
+    def _from_proto(cls, pb_item: api_pb2.AutoscalerSettings) -> "ServerAutoscalerSettings":
+        return cls(
+            min_containers=pb_item.min_containers if pb_item.HasField("min_containers") else None,
+            max_containers=pb_item.max_containers if pb_item.HasField("max_containers") else None,
+            buffer_containers=pb_item.buffer_containers if pb_item.HasField("buffer_containers") else None,
+            scaleup_window=pb_item.scaleup_window if pb_item.HasField("scaleup_window") else None,
+            scaledown_window=pb_item.scaledown_window if pb_item.HasField("scaledown_window") else None,
+            target_concurrency=pb_item.target_concurrency if pb_item.HasField("target_concurrency") else None,
+        )

{modal-1.5.4.dev1 → modal-1.5.4.dev2}/modal.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: modal
-Version: 1.5.4.dev1
+Version: 1.5.4.dev2
 Summary: Python client library for Modal
 Author-email: Modal Labs <support@modal.com>
 License-Expression: Apache-2.0

{modal-1.5.4.dev1 → modal-1.5.4.dev2}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2026
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.5.4.dev1"
+__version__ = "1.5.4.dev2"