modal 0.73.164__py3-none-any.whl → 0.73.166__py3-none-any.whl

modal/_container_entrypoint.py

@@ -46,13 +46,13 @@ from modal.exception import ExecutionError, InputCancellation, InvalidError
 from modal.running_app import RunningApp, running_app_from_layout
 from modal_proto import api_pb2
 
+from ._runtime import execution_context
 from ._runtime.container_io_manager import (
     ContainerIOManager,
     IOContext,
     UserException,
     _ContainerIOManager,
 )
-from ._runtime.execution_context import _set_current_context_ids
 
 if TYPE_CHECKING:
     import modal._object
@@ -190,7 +190,7 @@ def call_function(
     async def run_input_async(io_context: IOContext) -> None:
         started_at = time.time()
         input_ids, function_call_ids = io_context.input_ids, io_context.function_call_ids
-        reset_context = _set_current_context_ids(input_ids, function_call_ids)
+        reset_context = execution_context._set_current_context_ids(input_ids, function_call_ids)
         async with container_io_manager.handle_input_exception.aio(io_context, started_at):
             res = io_context.call_finalized_function()
             # TODO(erikbern): any exception below shouldn't be considered a user exception
@@ -240,7 +240,7 @@ def call_function(
     def run_input_sync(io_context: IOContext) -> None:
         started_at = time.time()
         input_ids, function_call_ids = io_context.input_ids, io_context.function_call_ids
-        reset_context = _set_current_context_ids(input_ids, function_call_ids)
+        reset_context = execution_context._set_current_context_ids(input_ids, function_call_ids)
         with container_io_manager.handle_input_exception(io_context, started_at):
             res = io_context.call_finalized_function()
 
@@ -407,33 +407,34 @@ def main(container_args: api_pb2.ContainerArguments, client: Client):
                 param_args = ()
                 param_kwargs = {}
 
-            if function_def.is_class:
-                # this is a bit ugly - match the function and class based on function name to get metadata
-                # This metadata is required in order to hydrate the class in case it's not globally
-                # decorated (or serialized)
-                service_base_function_id = container_args.app_layout.function_ids[function_def.function_name]
-                service_function_hydration_data = [
-                    o for o in container_args.app_layout.objects if o.object_id == service_base_function_id
-                ][0]
-                class_id = container_args.app_layout.class_ids[function_def.function_name.removesuffix(".*")]
-
-                service = import_class_service(
-                    function_def,
-                    service_function_hydration_data,
-                    class_id,
-                    client,
-                    ser_usr_cls,
-                    param_args,
-                    param_kwargs,
-                )
-            else:
-                service = import_single_function_service(
-                    function_def,
-                    ser_usr_cls,
-                    ser_fun,
-                    param_args,
-                    param_kwargs,
-                )
+            with execution_context._import_context():
+                if function_def.is_class:
+                    # this is a bit ugly - match the function and class based on function name to get metadata
+                    # This metadata is required in order to hydrate the class in case it's not globally
+                    # decorated (or serialized)
+                    service_base_function_id = container_args.app_layout.function_ids[function_def.function_name]
+                    service_function_hydration_data = [
+                        o for o in container_args.app_layout.objects if o.object_id == service_base_function_id
+                    ][0]
+                    class_id = container_args.app_layout.class_ids[function_def.function_name.removesuffix(".*")]
+
+                    service = import_class_service(
+                        function_def,
+                        service_function_hydration_data,
+                        class_id,
+                        client,
+                        ser_usr_cls,
+                        param_args,
+                        param_kwargs,
+                    )
+                else:
+                    service = import_single_function_service(
+                        function_def,
+                        ser_usr_cls,
+                        ser_fun,
+                        param_args,
+                        param_kwargs,
+                    )
 
             # If the cls/function decorator was applied in local scope, but the app is global, we can look it up
             if service.app is not None:

modal/_runtime/execution_context.py

@@ -1,4 +1,5 @@
 # Copyright Modal Labs 2024
+from contextlib import contextmanager
 from contextvars import ContextVar
 from typing import Callable, Optional
 
@@ -87,3 +88,15 @@ def _set_current_context_ids(input_ids: list[str], function_call_ids: list[str])
 
 _current_input_id: ContextVar = ContextVar("_current_input_id")
 _current_function_call_id: ContextVar = ContextVar("_current_function_call_id")
+
+_is_currently_importing = False  # we set this to True while a container is importing user code
+
+
+@contextmanager
+def _import_context():
+    global _is_currently_importing
+    _is_currently_importing = True
+    try:
+        yield
+    finally:
+        _is_currently_importing = False

modal/_runtime/execution_context.pyi

@@ -17,6 +17,7 @@ def current_function_call_id() -> typing.Optional[str]: ...
 def _set_current_context_ids(
     input_ids: list[str], function_call_ids: list[str]
 ) -> collections.abc.Callable[[], None]: ...
+def _import_context(): ...
 
 _current_input_id: contextvars.ContextVar
 

modal/client.pyi

@@ -31,7 +31,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "0.73.164",
+        version: str = "0.73.166",
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -93,7 +93,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "0.73.164",
+        version: str = "0.73.166",
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/mount.py

@@ -655,8 +655,6 @@ class _Mount(_Object, type_prefix="mo"):
         condition: Optional[Callable[[str], bool]] = None,
         ignore: Optional[Union[Sequence[str], Callable[[Path], bool]]] = None,
     ) -> "_Mount":
-        # Don't re-run inside container.
-
         if condition is not None:
             if ignore is not None:
                 raise InvalidError("Cannot specify both `ignore` and `condition`")
@@ -669,10 +667,6 @@ class _Mount(_Object, type_prefix="mo"):
             ignore = FilePatternMatcher(*ignore)
 
         mount = _Mount._new()
-        from ._runtime.execution_context import is_local
-
-        if not is_local():
-            return mount  # empty/non-mountable mount in case it's used from within a container
         for module_name in module_names:
             mount = mount._extend(_MountedPythonModule(module_name, remote_dir, ignore))
         return mount

modal/runner.py

@@ -12,6 +12,7 @@ from typing import TYPE_CHECKING, Any, Optional, TypeVar
 from grpclib import GRPCError, Status
 from synchronicity.async_wrap import asynccontextmanager
 
+import modal._runtime.execution_context
 import modal_proto.api_pb2
 from modal_proto import api_pb2
 
@@ -19,7 +20,6 @@ from ._functions import _Function
 from ._object import _get_environment_name, _Object
 from ._pty import get_pty_info
 from ._resolver import Resolver
-from ._runtime.execution_context import is_local
 from ._traceback import print_server_warnings, traceback_contains_remote_call
 from ._utils.async_utils import TaskContext, gather_cancel_on_exc, synchronize_api
 from ._utils.deprecation import deprecation_error
@@ -266,12 +266,9 @@ async def _run_app(
     if environment_name is None:
         environment_name = typing.cast(str, config.get("environment"))
 
-    if not is_local():
-        raise InvalidError(
-            "Can not run an app from within a container."
-            " Are you calling app.run() directly?"
-            " Consider using the `modal run` shell command."
-        )
+    if modal._runtime.execution_context._is_currently_importing:
+        raise InvalidError("Can not run an app in global scope within a container")
+
     if app._running_app:
         raise InvalidError(
             "App is already running and can't be started again.\n"

{modal-0.73.164.dist-info → modal-0.73.166.dist-info}/METADATA

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

{modal-0.73.164.dist-info → modal-0.73.166.dist-info}/RECORD

@@ -2,7 +2,7 @@ modal/__init__.py,sha256=7wz1AT_bpWJJEzXsAo3QMb7i87y7UGXwfneb0bGDhRg,2502
 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=ueRlANz7w9dgBlkuP9o3iFGxU5dAnx-IRAu2JMYaq1c,28997
+modal/_container_entrypoint.py,sha256=85KptUAmlftjHR-mpl32H5deATqqDrRWp0Z1XrKmWyk,29166
 modal/_functions.py,sha256=M94gzMA9xfW9086djoG2yYFVihcslKnsleacmNbVrG0,74996
 modal/_ipython.py,sha256=TW1fkVOmZL3YYqdS2YlM1hqpf654Yf8ZyybHdBnlhSw,301
 modal/_location.py,sha256=joiX-0ZeutEUDTrrqLF1GHXCdVLF-rHzstocbMcd_-k,366
@@ -23,7 +23,7 @@ modal/app.py,sha256=bJp7W3liuVG2VwWkG31tMFogDh84EKppzP8YJFWl3eQ,48140
 modal/app.pyi,sha256=SkqXNrdnGIZ4MmNNvpGtzNLoUdyuvi9IjQQR_DRiRHk,26968
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=U-YKSw0n7J1ZLREt9cbEJCtmHe5YoPKFxl0xlkan2yc,15565
-modal/client.pyi,sha256=DBHwH_dRIRw4etokK1g9IRaFv1a6lDKHIglO74F01Go,7661
+modal/client.pyi,sha256=iDprzZTVWygReQ1tdzssE36Uvq1_RfNgdO5GC_dMhSc,7661
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=8tvSw7QFTS1FnX2MXaxagu3KwuR6y_DMwhqHv3MZ0Nk,32963
@@ -46,7 +46,7 @@ modal/image.py,sha256=qagLzHPbeEoM7TqvIuFJ8JV_IEJtRqiR0lik4O_K4Gw,92857
 modal/image.pyi,sha256=89zv12C1sFrJs7Es9SnX23_m208ASAdeNGCVTrhjzHI,25632
 modal/io_streams.py,sha256=h5O2LmbRoT9l777z3TQhCAm-JF1r7avZ2ykXlejztDs,15163
 modal/io_streams.pyi,sha256=bJ7ZLmSmJ0nKoa6r4FJpbqvzdUVa0lEe0Fa-MMpMezU,5071
-modal/mount.py,sha256=JII0zTS1fPCcCbZgO18okkOuTDqYCxY1DIVa6i1E9cI,32196
+modal/mount.py,sha256=Y2sXIbUbr3ymVvfvknwbouBkkAUPIW1nkSToRGh8w7g,31973
 modal/mount.pyi,sha256=CmHa7zKSxHA_7-vMQLnGfw_ZXvAvHlafvUEVJcQ1LQA,12535
 modal/network_file_system.py,sha256=WXdyL7du_fvjvuG6hSAREyJ83sSEP2xSLAIAhBsisdI,14869
 modal/network_file_system.pyi,sha256=4N3eqMbTSlqmS8VV_aJK-uvrgJC8xnf_YtW5FHfRfc8,8156
@@ -63,7 +63,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=8jBg-gOjjYyteXMI01u6f7izYsGrABsFaByixeQlTmo,25126
+modal/runner.py,sha256=V17Fb9OtTGplvILc4ogT-waHYjxyCnjf0PP4aYy_0ho,25036
 modal/runner.pyi,sha256=HW2pvC_PLwg1Es_EkrfQgMZsktIr9zzVEtmjOVFG6Dw,5351
 modal/running_app.py,sha256=v61mapYNV1-O-Uaho5EfJlryMLvIT9We0amUOSvSGx8,1188
 modal/sandbox.py,sha256=FRcMkVDfp39_ACbhR71iDJcT6xaqFXuCI3LKsLETHPc,32619
@@ -85,8 +85,8 @@ modal/_runtime/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
 modal/_runtime/asgi.py,sha256=KNarxvZI9z8fnmZl2vbkWTjnoLXs9kqOahkrbsTLkyc,22429
 modal/_runtime/container_io_manager.py,sha256=WZnvKlmHaF7yteHMoeX-jIgU4OEPLhQyAvhNXmjjVy0,44318
 modal/_runtime/container_io_manager.pyi,sha256=wRd2wHMFru0NmNgiCBVdDTrJGkeVZsZvWwA1fzn8wi8,17009
-modal/_runtime/execution_context.py,sha256=E6ofm6j1POXGPxS841X3V7JU6NheVb8OkQc7JpLq4Kg,2712
-modal/_runtime/execution_context.pyi,sha256=wQZwMNADExkeNdB9yKX0PPojovxlFHbap3441wAsiMY,634
+modal/_runtime/execution_context.py,sha256=73Y5zH_o-MhVCrkJXakYVlFkKqCa2CWvqoHjOfJrJGg,3034
+modal/_runtime/execution_context.pyi,sha256=TAxQq7uLj7i9r9XbXgFZiSVBWxObFWN-rkssS0I7Vkk,661
 modal/_runtime/gpu_memory_snapshot.py,sha256=tA3m1d1cwnmHpvpCeN_WijDd6n8byn7LWlpicbIxiOI,3144
 modal/_runtime/telemetry.py,sha256=T1RoAGyjBDr1swiM6pPsGRSITm7LI5FDK18oNXxY08U,5163
 modal/_runtime/user_code_imports.py,sha256=kAv37Pl1TmGKduv0Kozum0xNTD42bDLloSIsT7zf84o,16884
@@ -146,7 +146,7 @@ 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.73.164.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.73.166.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
@@ -154,13 +154,13 @@ modal_docs/mdmd/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,2
 modal_docs/mdmd/mdmd.py,sha256=Irx49MCCTlBOP4FBdLR--JrpA3-WhsVeriq0LGgsRic,6232
 modal_docs/mdmd/signatures.py,sha256=XJaZrK7Mdepk5fdX51A8uENiLFNil85Ud0d4MH8H5f0,3218
 modal_proto/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
-modal_proto/api.proto,sha256=jrhg7sMfpcFSL8xCPBzW8U7kas16vYh0c0WmCo4NN4o,91483
-modal_proto/api_grpc.py,sha256=9Rs0JyHcz_DSjVKhdtMbDuNt6qDkrE2718KsyA3QL4c,110702
-modal_proto/api_pb2.py,sha256=u6qmhGmIjnYxuofALoz0a5TaQKtASbWSlEIk27BfQ_I,322045
-modal_proto/api_pb2.pyi,sha256=EoQ1OnFWEVf9jVVvrjdWSFRJ7MXtWTkBtN3rbWjR8Ok,439118
-modal_proto/api_pb2_grpc.py,sha256=olXvs6OQvy7pqvHP9bkSWC_DdIv0iO38xRlmkLo-ai8,239213
-modal_proto/api_pb2_grpc.pyi,sha256=ybhcN2nwFBIPd4Z4kkMOv-M8Ejidz93Bl4zScLpYcK0,55706
-modal_proto/modal_api_grpc.py,sha256=43ujbC_a8YAjuhtEvS-O-5lNpkG5d0K0ZIlryJ4weT4,14766
+modal_proto/api.proto,sha256=pVzFEsIpOuybO3v6aQW2ONmTaX6-Gcfk9sBbpxNYOOk,92066
+modal_proto/api_grpc.py,sha256=DlrVx10B6HLy4LjWrgK7HJ7kUNDKqEvm6mUqh-6EVvs,112161
+modal_proto/api_pb2.py,sha256=ACSAQ0P-ZR36tTgN3C_RmO381ZK-9EM1FXzUtQzCOn8,325087
+modal_proto/api_pb2.pyi,sha256=KNJrAFmFXQY5REYJUgL4Rjg2ie-CZKGPkFz8vVIx0zs,442208
+modal_proto/api_pb2_grpc.py,sha256=NQPpAa3Co-zFNB6L6BQoZjf-RaOlWFFPX8chQyGHQEo,242401
+modal_proto/api_pb2_grpc.pyi,sha256=zK2Ms2Xws02cC9uy5U5A5sPULXx4T6A9o9BONqFcipg,56456
+modal_proto/modal_api_grpc.py,sha256=K_GsrHIw2CayKh_nyuYAblQW_tOijUNW267Hs9vWUWU,14948
 modal_proto/modal_options_grpc.py,sha256=qJ1cuwA54oRqrdTyPTbvfhFZYd9HhJKK5UCwt523r3Y,120
 modal_proto/options.proto,sha256=a-siq4swVbZPfaFRXAipRZzGP2bq8OsdUvjlyzAeodQ,488
 modal_proto/options_grpc.py,sha256=M18X3d-8F_cNYSVM3I25dUTO5rZ0rd-vCCfynfh13Nc,125
@@ -171,9 +171,9 @@ 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=2I0ucIXjzi2tKSflkJUmKq9nN0hIKaLV0cEjBQVxcf0,150
-modal-0.73.164.dist-info/METADATA,sha256=QEcE3qTvoJmPOms19OEunLqOXOzHXbG7TA7ZiJy7FNk,2475
-modal-0.73.164.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-0.73.164.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.73.164.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-0.73.164.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=sC0tLCnx3SA3ug30Mb8CeHVzuzTF5kCgUvvoRJgRMB0,150
+modal-0.73.166.dist-info/METADATA,sha256=vKOazcM7Fa1cFmz6c1DZZhuPGXzwHG4O0iVSDqHQTwA,2475
+modal-0.73.166.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-0.73.166.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.73.166.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-0.73.166.dist-info/RECORD,,

modal_proto/api.proto

@@ -757,6 +757,29 @@ message CloudBucketMount {
   optional string oidc_auth_role_arn = 9;
 }
 
+message ClusterGetRequest {
+  string cluster_id = 1;
+}
+
+message ClusterGetResponse {
+  ClusterStats cluster = 1;
+}
+
+message ClusterListRequest {
+  string environment_name = 1;
+}
+
+message ClusterListResponse {
+  repeated ClusterStats clusters = 1;
+}
+
+message ClusterStats {
+  string app_id = 1;
+  repeated string task_ids = 2;
+  string region = 3;
+  double started_at = 4; // Defined as start time of the first task in the cluster
+}
+
 message CommitInfo {
   string vcs = 1; // Only git is supported for now
   string branch = 2;
@@ -3052,6 +3075,10 @@ service ModalClient {
   // Clients
   rpc ClientHello(google.protobuf.Empty) returns (ClientHelloResponse);
 
+  // Clusters
+  rpc ClusterGet(ClusterGetRequest) returns (ClusterGetResponse);
+  rpc ClusterList(ClusterListRequest) returns (ClusterListResponse);
+
   // Container
   rpc ContainerCheckpoint(ContainerCheckpointRequest) returns (google.protobuf.Empty);
   rpc ContainerExec(ContainerExecRequest) returns (ContainerExecResponse);

modal_proto/api_grpc.py

@@ -102,6 +102,14 @@ class ModalClientBase(abc.ABC):
     async def ClientHello(self, stream: 'grpclib.server.Stream[google.protobuf.empty_pb2.Empty, modal_proto.api_pb2.ClientHelloResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def ClusterGet(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.ClusterGetRequest, modal_proto.api_pb2.ClusterGetResponse]') -> None:
+        pass
+
+    @abc.abstractmethod
+    async def ClusterList(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.ClusterListRequest, modal_proto.api_pb2.ClusterListResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def ContainerCheckpoint(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.ContainerCheckpointRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
@@ -722,6 +730,18 @@ class ModalClientBase(abc.ABC):
                 google.protobuf.empty_pb2.Empty,
                 modal_proto.api_pb2.ClientHelloResponse,
             ),
+            '/modal.client.ModalClient/ClusterGet': grpclib.const.Handler(
+                self.ClusterGet,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.ClusterGetRequest,
+                modal_proto.api_pb2.ClusterGetResponse,
+            ),
+            '/modal.client.ModalClient/ClusterList': grpclib.const.Handler(
+                self.ClusterList,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.ClusterListRequest,
+                modal_proto.api_pb2.ClusterListResponse,
+            ),
             '/modal.client.ModalClient/ContainerCheckpoint': grpclib.const.Handler(
                 self.ContainerCheckpoint,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -1592,6 +1612,18 @@ class ModalClientStub:
             google.protobuf.empty_pb2.Empty,
             modal_proto.api_pb2.ClientHelloResponse,
         )
+        self.ClusterGet = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/ClusterGet',
+            modal_proto.api_pb2.ClusterGetRequest,
+            modal_proto.api_pb2.ClusterGetResponse,
+        )
+        self.ClusterList = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/ClusterList',
+            modal_proto.api_pb2.ClusterListRequest,
+            modal_proto.api_pb2.ClusterListResponse,
+        )
         self.ContainerCheckpoint = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/ContainerCheckpoint',