modal 1.1.5.dev24__tar.gz → 1.1.5.dev26__tar.gz

{modal-1.1.5.dev24 → modal-1.1.5.dev26}/PKG-INFO

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

{modal-1.1.5.dev24 → modal-1.1.5.dev26}/modal/client.pyi

@@ -33,7 +33,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.1.5.dev24",
+        version: str = "1.1.5.dev26",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -164,7 +164,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.1.5.dev24",
+        version: str = "1.1.5.dev26",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.1.5.dev24 → modal-1.1.5.dev26}/modal/functions.pyi

@@ -449,7 +449,7 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER:
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
@@ -458,7 +458,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -485,7 +485,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """[Experimental] Calls the function with the given arguments, without waiting for the results.
 
@@ -509,7 +509,7 @@ class Function(
             ...
 
     _experimental_spawn: ___experimental_spawn_spec[
-        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
+        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
     ]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER, SUPERSELF]):
@@ -518,7 +518,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P, typing_extensions.Self]
 
-    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """Calls the function with the given arguments, without waiting for the results.
 
@@ -539,7 +539,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

{modal-1.1.5.dev24 → modal-1.1.5.dev26}/modal/image.py

@@ -868,6 +868,68 @@ class _Image(_Object, type_prefix="im"):
 
         return obj
 
+    async def build(self, app: "modal.app._App") -> "_Image":
+        """Eagerly build an image.
+
+        If your image was previously built, then this method will not rebuild your image
+        and your cached image is returned.
+
+        **Examples**
+
+        ```python
+        image = modal.Image.debian_slim().uv_pip_install("scipy", "numpy")
+
+        app = modal.App("build-image")
+        with modal.enable_output(), app.run():
+            image.build(app)
+
+        # Save the image id
+        my_image_id = image.object_id
+
+        # Reference the image with the id or uses it another context.
+        built_image = modal.Image.from_id(my_image_id)
+        ```
+
+        Alternatively, you can pre-build a image and use it in a sandbox.
+
+        ```python notest
+        app = modal.App.lookup("sandbox-example")
+
+        with modal.enable_output():
+            image = modal.Image.debian_slim().uv_pip_install("scipy")
+            image.build(app)
+
+        sb = modal.Sandbox.create("python", "-c", "import scipy; print(scipy)", app=app, image=image)
+        print(sb.stdout.read())
+        sb.terminate()
+        ```
+
+        **Note**
+
+        For defining Modal functions, images are built automatically when deploying or running an App.
+        You do not need to built the image explicitly:
+
+        ```python notest
+        app = modal.App()
+        image = modal.Image.debian_slim()
+
+        # No need to explicitly build the image for defining a function.
+        @app.function(image=image)
+        def f():
+            ...
+        ```
+
+        """
+        if app.app_id is None:
+            raise InvalidError("App has not been initialized yet. Use the content manager `app.run()` or `App.lookup`")
+
+        app_id = app.app_id
+        app_client = app._client or await _Client.from_env()
+
+        resolver = Resolver(app_client, app_id=app_id)
+        await resolver.load(self)
+        return self
+
     def pip_install(
         self,
         *packages: Union[str, list[str]],  # A list of Python packages, eg. ["numpy", "matplotlib>=3.5.0"]

{modal-1.1.5.dev24 → modal-1.1.5.dev26}/modal/image.pyi

@@ -2,6 +2,7 @@ import collections.abc
 import google.protobuf.message
 import modal._functions
 import modal._object
+import modal.app
 import modal.client
 import modal.cloud_bucket_mount
 import modal.functions
@@ -318,6 +319,59 @@ class _Image(modal._object._Object):
         """
         ...
 
+    async def build(self, app: modal.app._App) -> _Image:
+        """Eagerly build an image.
+
+        If your image was previously built, then this method will not rebuild your image
+        and your cached image is returned.
+
+        **Examples**
+
+        ```python
+        image = modal.Image.debian_slim().uv_pip_install("scipy", "numpy")
+
+        app = modal.App("build-image")
+        with modal.enable_output(), app.run():
+            image.build(app)
+
+        # Save the image id
+        my_image_id = image.object_id
+
+        # Reference the image with the id or uses it another context.
+        built_image = modal.Image.from_id(my_image_id)
+        ```
+
+        Alternatively, you can pre-build a image and use it in a sandbox.
+
+        ```python notest
+        app = modal.App.lookup("sandbox-example")
+
+        with modal.enable_output():
+            image = modal.Image.debian_slim().uv_pip_install("scipy")
+            image.build(app)
+
+        sb = modal.Sandbox.create("python", "-c", "import scipy; print(scipy)", app=app, image=image)
+        print(sb.stdout.read())
+        sb.terminate()
+        ```
+
+        **Note**
+
+        For defining Modal functions, images are built automatically when deploying or running an App.
+        You do not need to built the image explicitly:
+
+        ```python notest
+        app = modal.App()
+        image = modal.Image.debian_slim()
+
+        # No need to explicitly build the image for defining a function.
+        @app.function(image=image)
+        def f():
+            ...
+        ```
+        """
+        ...
+
     def pip_install(
         self,
         *packages: typing.Union[str, list[str]],
@@ -1182,6 +1236,115 @@ class Image(modal.object.Object):
 
     from_id: __from_id_spec
 
+    class __build_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(self, /, app: modal.app.App) -> Image:
+            """Eagerly build an image.
+
+            If your image was previously built, then this method will not rebuild your image
+            and your cached image is returned.
+
+            **Examples**
+
+            ```python
+            image = modal.Image.debian_slim().uv_pip_install("scipy", "numpy")
+
+            app = modal.App("build-image")
+            with modal.enable_output(), app.run():
+                image.build(app)
+
+            # Save the image id
+            my_image_id = image.object_id
+
+            # Reference the image with the id or uses it another context.
+            built_image = modal.Image.from_id(my_image_id)
+            ```
+
+            Alternatively, you can pre-build a image and use it in a sandbox.
+
+            ```python notest
+            app = modal.App.lookup("sandbox-example")
+
+            with modal.enable_output():
+                image = modal.Image.debian_slim().uv_pip_install("scipy")
+                image.build(app)
+
+            sb = modal.Sandbox.create("python", "-c", "import scipy; print(scipy)", app=app, image=image)
+            print(sb.stdout.read())
+            sb.terminate()
+            ```
+
+            **Note**
+
+            For defining Modal functions, images are built automatically when deploying or running an App.
+            You do not need to built the image explicitly:
+
+            ```python notest
+            app = modal.App()
+            image = modal.Image.debian_slim()
+
+            # No need to explicitly build the image for defining a function.
+            @app.function(image=image)
+            def f():
+                ...
+            ```
+            """
+            ...
+
+        async def aio(self, /, app: modal.app.App) -> Image:
+            """Eagerly build an image.
+
+            If your image was previously built, then this method will not rebuild your image
+            and your cached image is returned.
+
+            **Examples**
+
+            ```python
+            image = modal.Image.debian_slim().uv_pip_install("scipy", "numpy")
+
+            app = modal.App("build-image")
+            with modal.enable_output(), app.run():
+                image.build(app)
+
+            # Save the image id
+            my_image_id = image.object_id
+
+            # Reference the image with the id or uses it another context.
+            built_image = modal.Image.from_id(my_image_id)
+            ```
+
+            Alternatively, you can pre-build a image and use it in a sandbox.
+
+            ```python notest
+            app = modal.App.lookup("sandbox-example")
+
+            with modal.enable_output():
+                image = modal.Image.debian_slim().uv_pip_install("scipy")
+                image.build(app)
+
+            sb = modal.Sandbox.create("python", "-c", "import scipy; print(scipy)", app=app, image=image)
+            print(sb.stdout.read())
+            sb.terminate()
+            ```
+
+            **Note**
+
+            For defining Modal functions, images are built automatically when deploying or running an App.
+            You do not need to built the image explicitly:
+
+            ```python notest
+            app = modal.App()
+            image = modal.Image.debian_slim()
+
+            # No need to explicitly build the image for defining a function.
+            @app.function(image=image)
+            def f():
+                ...
+            ```
+            """
+            ...
+
+    build: __build_spec[typing_extensions.Self]
+
     def pip_install(
         self,
         *packages: typing.Union[str, list[str]],

{modal-1.1.5.dev24 → modal-1.1.5.dev26}/modal.egg-info/PKG-INFO

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

{modal-1.1.5.dev24 → modal-1.1.5.dev26}/modal_proto/api.proto

@@ -628,11 +628,26 @@ message AuthTokenGetResponse {
   string token = 1;
 }
 
+// Message representing the current (coalesced) state of the autoscaler configuration
+// As well as the different sources that were used to create it.
+message AutoscalerConfiguration {
+  // The settings that are currently in effect.
+  AutoscalerSettings settings = 1;
+  // For tracking the source of the overridden value; keys correspond to fields in `settings`.
+  map<string, UserActionInfo> override_events = 2;
+  // The default settings that are used when no static settings are provided and no overrides are in effect.
+  AutoscalerSettings default_settings = 3;
+  // The static settings that were used to initialize the configuration.
+  AutoscalerSettings static_settings = 4;
+  // The merge of all overrides that were used to create the current configuration.
+  AutoscalerSettings override_settings = 5;
+}
+
 message AutoscalerSettings {
   // A collection of user-configurable settings for Function autoscaling
   // These are used for static configuration and for dynamic autoscaler updates
 
-  // Minimum containers when scale-to-zero is not deisired; pka "keep_warm" or "warm_pool_size"
+  // Minimum containers when scale-to-zero is not desired; pka "keep_warm" or "warm_pool_size"
   optional uint32 min_containers = 1;
   // Limit on the number of containers that can be running for each Function; pka "concurrency_limit"
   optional uint32 max_containers = 2;
@@ -3217,6 +3232,12 @@ message UploadUrlList {
   repeated string items = 1;
 }
 
+// Used for capturing context about an action performed by a user
+message UserActionInfo {
+  string user_id = 1;
+  double timestamp = 2;
+}
+
 message VolumeCommitRequest {
   // NOTE(staffan): Mounting a volume in multiple locations is not supported, so volume_id alone uniquely identifies
   // a volume mount.