modal 0.74.17__py3-none-any.whl → 0.74.19__py3-none-any.whl

modal/_runtime/container_io_manager.py

@@ -352,15 +352,19 @@ class _ContainerIOManager:
         await self._client.stub.ContainerHello(Empty())
 
     async def _run_heartbeat_loop(self):
+        t_last_success = time.monotonic()
         while 1:
             t0 = time.monotonic()
             try:
-                if await self._heartbeat_handle_cancellations():
-                    # got a cancellation event, fine to start another heartbeat immediately
-                    # since the cancellation queue should be empty on the worker server
-                    # however, we wait at least 1s to prevent short-circuiting the heartbeat loop
-                    # in case there is ever a bug. This means it will take at least 1s between
-                    # two subsequent cancellations on the same task at the moment
+                got_cancellation = await self._heartbeat_handle_cancellations()
+                t_last_success = time.monotonic()
+                if got_cancellation:
+                    # Got a cancellation event, so it is fine to start another heartbeat immediately
+                    # since the cancellation queue should be empty on the worker server.
+                    # However, we wait at least 1s to prevent short-circuiting the heartbeat loop
+                    # in case there is ever a bug.
+                    # This means it will take at least 1s between two subsequent cancellations on the
+                    # same task at the moment.
                     await asyncio.sleep(1.0)
                     continue
             except ClientClosed:
@@ -368,13 +372,25 @@ class _ContainerIOManager:
                 break
             except Exception as exc:
                 # don't stop heartbeat loop if there are transient exceptions!
-                time_elapsed = time.monotonic() - t0
+                attempt_dur = time.monotonic() - t0
+                time_since_heartbeat_success = time.monotonic() - t_last_success
                 error = exc
-                logger.warning(f"Heartbeat attempt failed ({time_elapsed=}, {error=})")
+                logger.warning(
+                    f"Modal Client → Modal Worker Heartbeat attempt failed "
+                    f"({attempt_dur=:.2f}, {time_since_heartbeat_success=:.2f}, {error=})"
+                )
+                if time_since_heartbeat_success > HEARTBEAT_INTERVAL * 50:
+                    trouble_mins = time_since_heartbeat_success / 60
+                    logger.warning(
+                        "Modal Client → Modal Worker heartbeat attempts have been failing for "
+                        f"over {trouble_mins:.2f} minutes. "
+                        "Container will eventually be marked unhealthy. "
+                        "See https://modal.com/docs/guide/troubleshooting#heartbeat-timeout. "
+                    )
 
             heartbeat_duration = time.monotonic() - t0
-            time_until_next_hearbeat = max(0.0, HEARTBEAT_INTERVAL - heartbeat_duration)
-            await asyncio.sleep(time_until_next_hearbeat)
+            time_until_next_heartbeat = max(0.0, HEARTBEAT_INTERVAL - heartbeat_duration)
+            await asyncio.sleep(time_until_next_heartbeat)
 
     async def _heartbeat_handle_cancellations(self) -> bool:
         # Return True if a cancellation event was received, in that case

modal/app.py

@@ -333,11 +333,11 @@ class _App:
         interactive: bool = False,
         environment_name: Optional[str] = None,
     ) -> AsyncGenerator["_App", None]:
-        """Context manager that runs an app on Modal.
+        """Context manager that runs an ephemeral app on Modal.
 
         Use this as the main entry point for your Modal application. All calls
-        to Modal functions should be made within the scope of this context
-        manager, and they will correspond to the current app.
+        to Modal Functions should be made within the scope of this context
+        manager, and they will correspond to the current App.
 
         **Example**
 
@@ -346,7 +346,7 @@ class _App:
             some_modal_function.remote()
         ```
 
-        To enable output printing, use `modal.enable_output()`:
+        To enable output printing (i.e., to see App logs), use `modal.enable_output()`:
 
         ```python notest
         with modal.enable_output():
@@ -354,10 +354,10 @@ class _App:
                 some_modal_function.remote()
         ```
 
-        Note that you cannot invoke this in global scope of a file where you have
-        Modal functions or Classes, since that would run the block when the function
-        or class is imported in your containers as well. If you want to run it as
-        your entrypoint, consider wrapping it:
+        Note that you should not invoke this in global scope of a file where you have
+        Modal Functions or Classes defined, since that would run the block when the Function
+        or Cls is imported in your containers as well. If you want to run it as your entrypoint,
+        consider protecting it:
 
         ```python
         if __name__ == "__main__":
@@ -371,9 +371,6 @@ class _App:
         python app_module.py
         ```
 
-        Note that this method used to return a separate "App" object. This is
-        no longer useful since you can use the app itself for access to all
-        objects. For backwards compatibility reasons, it returns the same app.
         """
         from .runner import _run_app  # Defer import of runner.py, which imports a lot from Rich
 
@@ -392,6 +389,71 @@ class _App:
         ):
             yield self
 
+    async def deploy(
+        self,
+        *,
+        name: Optional[str] = None,  # Name for the deployment, overriding any set on the App
+        environment_name: Optional[str] = None,  # Environment to deploy the App in
+        tag: str = "",  # Optional metadata that will be visible in the deployment history
+        client: Optional[_Client] = None,  # Alternate client to use for RPCs
+    ) -> typing_extensions.Self:
+        """Deploy the App so that it is available persistently.
+
+        Deployed Apps will be avaible for lookup or web-based invocations until they are stopped.
+        Unlike with `App.run`, this method will return as soon as the deployment completes.
+
+        This method is a programmatic alternative to the `modal deploy` CLI command.
+
+        Examples:
+
+        ```python notest
+        app = App("my-app")
+        app.deploy()
+        ```
+
+        To enable output printing (i.e., to see build logs), use `modal.enable_output()`:
+
+        ```python notest
+        app = App("my-app")
+        with modal.enable_output():
+            app.deploy()
+        ```
+
+        Unlike with `App.run`, Function logs will not stream back to the local client after the
+        App is deployed.
+
+        Note that you should not invoke this method in global scope, as that would redeploy
+        the App every time the file is imported. If you want to write a programmatic deployment
+        script, protect this call so that it only runs when the file is executed directly:
+
+        ```python notest
+        if __name__ == "__main__":
+            with modal.enable_output():
+                app.deploy()
+        ```
+
+        Then you can deploy your app with:
+
+        ```shell
+        python app_module.py
+        ```
+
+        """
+        from .runner import _deploy_app  # Defer import of runner.py, which imports a lot from Rich
+
+        if name is None and self._name is None:
+            raise InvalidError(
+                "You need to either supply a deployment name or have a name set on the app.\n"
+                "\n"
+                "Examples:\n"
+                'app.deploy(name="some-name")\n\n'
+                "or\n"
+                'app = modal.App("some-name")'
+            )
+        result = await _deploy_app(self, name=name, environment_name=environment_name, tag=tag, client=client)
+        self._app_id = result.app_id
+        return self
+
     def _get_default_image(self):
         if self._image:
             return self._image

modal/app.pyi

@@ -137,6 +137,14 @@ class _App:
         interactive: bool = False,
         environment_name: typing.Optional[str] = None,
     ) -> typing.AsyncContextManager[_App]: ...
+    async def deploy(
+        self,
+        *,
+        name: typing.Optional[str] = None,
+        environment_name: typing.Optional[str] = None,
+        tag: str = "",
+        client: typing.Optional[modal.client._Client] = None,
+    ) -> typing_extensions.Self: ...
     def _get_default_image(self): ...
     def _get_watch_mounts(self): ...
     def _add_function(self, function: modal._functions._Function, is_web_endpoint: bool): ...
@@ -379,6 +387,26 @@ class App:
 
     run: __run_spec[typing_extensions.Self]
 
+    class __deploy_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(
+            self,
+            *,
+            name: typing.Optional[str] = None,
+            environment_name: typing.Optional[str] = None,
+            tag: str = "",
+            client: typing.Optional[modal.client.Client] = None,
+        ) -> SUPERSELF: ...
+        async def aio(
+            self,
+            *,
+            name: typing.Optional[str] = None,
+            environment_name: typing.Optional[str] = None,
+            tag: str = "",
+            client: typing.Optional[modal.client.Client] = None,
+        ) -> SUPERSELF: ...
+
+    deploy: __deploy_spec[typing_extensions.Self]
+
     def _get_default_image(self): ...
     def _get_watch_mounts(self): ...
     def _add_function(self, function: modal.functions.Function, is_web_endpoint: bool): ...

modal/cli/run.py

@@ -444,8 +444,17 @@ def deploy(
     import_ref = parse_import_ref(app_ref, use_module_mode=use_module_mode)
     app = import_app_from_ref(import_ref, base_cmd="modal deploy")
 
-    if name is None:
-        name = app.name
+    name = name or app.name or ""
+    if not name:
+        raise ExecutionError(
+            "You need to either supply an explicit deployment name on the command line "
+            "or have a name set on the app.\n"
+            "\n"
+            "Examples:\n"
+            'app = modal.App("some-name")'
+            "or\n"
+            "modal deploy ... --name=some-name"
+        )
 
     with enable_output():
         res = deploy_app(app, name=name, environment_name=env or "", tag=tag)

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

modal/runner.py

@@ -1,4 +1,9 @@
 # Copyright Modal Labs 2025
+"""Internal module for building and running Apps."""
+# Note: While this is mostly internal code, the `modal.runner.deploy_app` function was
+# the only way to programmatically deploy Apps for some time, so users have reached into here.
+# We may eventually deprecate it from the public API, but for now we should keep that in mind.
+
 import asyncio
 import dataclasses
 import os
@@ -473,40 +478,22 @@ async def _deploy_app(
     environment_name: Optional[str] = None,
     tag: str = "",
 ) -> DeployResult:
-    """Deploy an app and export its objects persistently.
-
-    Typically, using the command-line tool `modal deploy <module or script>`
-    should be used, instead of this method.
-
-    **Usage:**
-
-    ```python
-    if __name__ == "__main__":
-        deploy_app(app)
-    ```
-
-    Deployment has two primary purposes:
+    """Internal function for deploying an App.
 
-    * Persists all of the objects in the app, allowing them to live past the
-      current app run. For schedules this enables headless "cron"-like
-      functionality where scheduled functions continue to be invoked after
-      the client has disconnected.
-    * Allows for certain kinds of these objects, _deployment objects_, to be
-      referred to and used by other apps.
+    Users should prefer the `modal deploy` CLI or the `App.deploy` method.
     """
     if environment_name is None:
         environment_name = typing.cast(str, config.get("environment"))
 
-    name = name or app.name
+    name = name or app.name or ""
     if not name:
         raise InvalidError(
-            "You need to either supply an explicit deployment name to the deploy command, "
-            "or have a name set on the app.\n"
+            "You need to either supply a deployment name or have a name set on the app.\n"
             "\n"
             "Examples:\n"
-            'app.deploy("some_name")\n\n'
+            'modal.runner.deploy_app(app, name="some_name")\n\n'
             "or\n"
-            'app = App("some-name")'
+            'app = modal.App("some-name")'
         )
     else:
         check_object_name(name, "App")

{modal-0.74.17.dist-info → modal-0.74.19.dist-info}/METADATA

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

{modal-0.74.17.dist-info → modal-0.74.19.dist-info}/RECORD

@@ -18,11 +18,11 @@ modal/_tunnel.py,sha256=zTBxBiuH1O22tS1OliAJdIsSmaZS8PlnifS_6S5z-mk,6320
 modal/_tunnel.pyi,sha256=JmmDYAy9F1FpgJ_hWx0xkom2nTOFQjn4mTPYlU3PFo4,1245
 modal/_type_manager.py,sha256=DWjgmjYJuOagw2erin506UUbG2H5UzZCFEekS-7hmfA,9087
 modal/_watcher.py,sha256=K6LYnlmSGQB4tWWI9JADv-tvSvQ1j522FwT71B51CX8,3584
-modal/app.py,sha256=1GSPMMYRkG17FQwnA_PleK9YQrPQWXlN_4mpZ5VRA4Q,48468
-modal/app.pyi,sha256=bpC9uN_B4d_UtyXVuhGpXC2RM-IcsytS0ndu-GoKrHQ,27276
+modal/app.py,sha256=TnXw6EaejqwyJNawbtp177mG87ufJZClPoiIxO41Ioc,50664
+modal/app.pyi,sha256=8oj9DpTHySHymjy6aSat6IG-z2FF77mx_ls1dGbt3Qg,28222
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=U-YKSw0n7J1ZLREt9cbEJCtmHe5YoPKFxl0xlkan2yc,15565
-modal/client.pyi,sha256=XeLjVRKT3hSZ-VEveAMjPEN4YoZaFrUXWrjMO8g2MZ8,7593
+modal/client.pyi,sha256=wSvN4PKoC4BazCyPhTWaAjvyruNM7vlVoKhuICNBBIE,7593
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=GvaNl8R5UsH7Vg88WEOyerdjvZEPK7xxi3nqHlyOW_c,33497
@@ -62,7 +62,7 @@ modal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal/queue.py,sha256=OIYmve1a4GTP54Vj2CcLatLPIAWToU7hWBNeu7IJiBY,18985
 modal/queue.pyi,sha256=sgvELCK4bJXMZIZw7gllooGFZNipGjI3BT4rmUuyD9M,10282
 modal/retries.py,sha256=IvNLDM0f_GLUDD5VgEDoN09C88yoxSrCquinAuxT1Sc,5205
-modal/runner.py,sha256=V17Fb9OtTGplvILc4ogT-waHYjxyCnjf0PP4aYy_0ho,25036
+modal/runner.py,sha256=yK1mBkX1_ZKvvWLoe1e2mGehJSWs97Mpyglo9Oj5rQw,24783
 modal/runner.pyi,sha256=HW2pvC_PLwg1Es_EkrfQgMZsktIr9zzVEtmjOVFG6Dw,5351
 modal/running_app.py,sha256=v61mapYNV1-O-Uaho5EfJlryMLvIT9We0amUOSvSGx8,1188
 modal/sandbox.py,sha256=CX42Rrso7a_Gz6fWEEu-OYzFsWanWOyBy9iQ4nAfAkg,32162
@@ -82,7 +82,7 @@ modal/volume.py,sha256=3c5_aJNJtgpsFRZWBjc0jwn8Zs0jo9V6UDmh6ifrbdA,40145
 modal/volume.pyi,sha256=juOVWGlgz7IeOY4M7jBhbeNRPA9xdGUwvA3AzlZUscQ,17958
 modal/_runtime/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
 modal/_runtime/asgi.py,sha256=KNarxvZI9z8fnmZl2vbkWTjnoLXs9kqOahkrbsTLkyc,22429
-modal/_runtime/container_io_manager.py,sha256=0yNO3HTVIM4f338rxJavD8nrRN7KhDpjz1jLux71MRY,43842
+modal/_runtime/container_io_manager.py,sha256=6j0jO2-s9ShckM4SK45OapoQxWW9HQwQjFaBkXPJPwU,44763
 modal/_runtime/container_io_manager.pyi,sha256=3N9TOYa5hfufhJV5IiIhpvJYCeLZe-ne76-XuxcFLW0,16147
 modal/_runtime/execution_context.py,sha256=73Y5zH_o-MhVCrkJXakYVlFkKqCa2CWvqoHjOfJrJGg,3034
 modal/_runtime/execution_context.pyi,sha256=TAxQq7uLj7i9r9XbXgFZiSVBWxObFWN-rkssS0I7Vkk,661
@@ -128,7 +128,7 @@ modal/cli/launch.py,sha256=0_sBu6bv2xJEPWi-rbGS6Ri9ggnkWQvrGlgpYSUBMyY,3097
 modal/cli/network_file_system.py,sha256=eq3JnwjbfFNsJodIyANHL06ByYc3BSavzdmu8C96cHA,7948
 modal/cli/profile.py,sha256=0TYhgRSGUvQZ5LH9nkl6iZllEvAjDniES264dE57wOM,3201
 modal/cli/queues.py,sha256=6gTu76dzBtPN5eQVsLrvQpuru5jI9ZCWK5Eh8J8XhaM,4498
-modal/cli/run.py,sha256=NX2wWwj8HD6XUhnZRF808Qy9eeouv8KnvyOP57HqIXI,23637
+modal/cli/run.py,sha256=DPa-yQ9o7vjqwvs_TAOvVJxS51yVn__ZGCnbkORL37g,23972
 modal/cli/secret.py,sha256=WB_c-LE9-eDqleLpJxsJ9rZw62Eeza8ZFQFR10vNMEk,4197
 modal/cli/token.py,sha256=mxSgOWakXG6N71hQb1ko61XAR9ZGkTMZD-Txn7gmTac,1924
 modal/cli/utils.py,sha256=hZmjyzcPjDnQSkLvycZD2LhGdcsfdZshs_rOU78EpvI,3717
@@ -145,10 +145,10 @@ modal/requirements/2024.10.txt,sha256=qD-5cVIVM9wXesJ6JC89Ew-3m2KjEElUz3jaw_MddR
 modal/requirements/PREVIEW.txt,sha256=qD-5cVIVM9wXesJ6JC89Ew-3m2KjEElUz3jaw_MddRo,296
 modal/requirements/README.md,sha256=9tK76KP0Uph7O0M5oUgsSwEZDj5y-dcUPsnpR0Sc-Ik,854
 modal/requirements/base-images.json,sha256=57vMSqzMbLBxw5tFWSaMiIkkVEps4JfX5PAtXGnkS4U,740
-modal-0.74.17.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.74.19.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=c1yfBS_x--gL5bs0N4ihMwqwX8l3IBWSkBAKNNIi6bQ,3801
-modal_docs/gen_reference_docs.py,sha256=cvTgltucqYLLIX84QxAwf51Z5Vc2n6cLxS8VcrxNCAo,6401
+modal_docs/gen_reference_docs.py,sha256=d_CQUGQ0rfw28u75I2mov9AlS773z9rG40-yq5o7g2U,6359
 modal_docs/mdmd/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/mdmd/mdmd.py,sha256=Irx49MCCTlBOP4FBdLR--JrpA3-WhsVeriq0LGgsRic,6232
 modal_docs/mdmd/signatures.py,sha256=XJaZrK7Mdepk5fdX51A8uENiLFNil85Ud0d4MH8H5f0,3218
@@ -170,9 +170,9 @@ modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0y
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_version/__init__.py,sha256=m94xZNWIjH8oUtJk4l9xfovzDJede2o7X-q0MHVECtM,470
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal_version/_version_generated.py,sha256=H1vtLZM1XzNiPv-6d9dhJ011XwwOP0vKyF3rDc1mSu4,149
-modal-0.74.17.dist-info/METADATA,sha256=b0Huvkm15AiCZpAAUBbr-L-c3xmmF_qNVMMPkoKDgh8,2474
-modal-0.74.17.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-0.74.17.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.74.17.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-0.74.17.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=gnhxZOCXj_bRya3jnYgGg-_unrUkIoDxJUMPO5LnVz0,149
+modal-0.74.19.dist-info/METADATA,sha256=xfMm5VTZynErYWFfwZ0xu5TyBDzl6PxByuJll7Raras,2474
+modal-0.74.19.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-0.74.19.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.74.19.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-0.74.19.dist-info/RECORD,,

modal_docs/gen_reference_docs.py

@@ -79,7 +79,6 @@ def run(output_dir: str = None):
         ("modal.call_graph", "modal.call_graph"),
         ("modal.container_process", "modal.container_process"),
         ("modal.gpu", "modal.gpu"),
-        ("modal.runner", "modal.runner"),
         ("modal.io_streams", "modal.io_streams"),
         ("modal.file_io", "modal.file_io"),
     ]

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 = 17  # git: 89e7c15
+build_number = 19  # git: a9af0d6