modal 0.72.35__py3-none-any.whl → 0.72.37__py3-none-any.whl

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.72.35"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.72.37"
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -83,7 +83,7 @@ class Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.72.35"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.72.37"
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/experimental.py

@@ -1,16 +1,16 @@
 # Copyright Modal Labs 2022
-from typing import (
-    Any,
-    Callable,
-)
+from dataclasses import dataclass
+from typing import Any, Callable, Optional
 
-import modal._clustered_functions
-from modal.functions import _Function
+from modal_proto import api_pb2
 
+from ._clustered_functions import ClusterInfo, get_cluster_info as _get_cluster_info
+from ._object import _get_environment_name
 from ._runtime.container_io_manager import _ContainerIOManager
-from .exception import (
-    InvalidError,
-)
+from ._utils.async_utils import synchronizer
+from .client import _Client
+from .exception import InvalidError
+from .functions import _Function
 from .partial_function import _PartialFunction, _PartialFunctionFlags
 
 
@@ -65,5 +65,41 @@ def clustered(size: int, broadcast: bool = True):
     return wrapper
 
 
-def get_cluster_info() -> modal._clustered_functions.ClusterInfo:
-    return modal._clustered_functions.get_cluster_info()
+def get_cluster_info() -> ClusterInfo:
+    return _get_cluster_info()
+
+
+@dataclass
+class AppInfo:
+    app_id: str
+    name: str
+    containers: int
+
+
+@synchronizer.create_blocking
+async def list_deployed_apps(environment_name: str = "", client: Optional[_Client] = None) -> list[AppInfo]:
+    """List deployed Apps along with the number of containers currently running."""
+    # This function exists to provide backwards compatibility for some users who had been
+    # calling into the private function that previously backed the `modal app list` CLI command.
+    # We plan to add more Python API for exposing this sort of information, but we haven't
+    # settled on a design we're happy with yet. In the meantime, this function will continue
+    # to support existing codebases. It's likely that the final API will be different
+    # (e.g. more oriented around the App object). This function should be gracefully deprecated
+    # one the new API is released.
+    client = client or await _Client.from_env()
+
+    resp: api_pb2.AppListResponse = await client.stub.AppList(
+        api_pb2.AppListRequest(environment_name=_get_environment_name(environment_name))
+    )
+
+    app_infos = []
+    for app_stats in resp.apps:
+        if app_stats.state == api_pb2.APP_STATE_DEPLOYED:
+            app_infos.append(
+                AppInfo(
+                    app_id=app_stats.app_id,
+                    name=app_stats.description,
+                    containers=app_stats.n_running_tasks,
+                )
+            )
+    return app_infos

modal/experimental.pyi

@@ -0,0 +1,29 @@
+import modal._clustered_functions
+import modal.client
+import typing
+import typing_extensions
+
+def stop_fetching_inputs(): ...
+def get_local_input_concurrency(): ...
+def set_local_input_concurrency(concurrency: int): ...
+def clustered(size: int, broadcast: bool = True): ...
+def get_cluster_info() -> modal._clustered_functions.ClusterInfo: ...
+
+class AppInfo:
+    app_id: str
+    name: str
+    containers: int
+
+    def __init__(self, app_id: str, name: str, containers: int) -> None: ...
+    def __repr__(self): ...
+    def __eq__(self, other): ...
+
+class __list_deployed_apps_spec(typing_extensions.Protocol):
+    def __call__(
+        self, environment_name: str = "", client: typing.Optional[modal.client.Client] = None
+    ) -> list[AppInfo]: ...
+    async def aio(
+        self, environment_name: str = "", client: typing.Optional[modal.client.Client] = None
+    ) -> list[AppInfo]: ...
+
+list_deployed_apps: __list_deployed_apps_spec

modal/functions.pyi

@@ -463,11 +463,11 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
 
     _call_generator_nowait: ___call_generator_nowait_spec
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
         def __call__(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
         async def aio(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
 
-    remote: __remote_spec[ReturnType, P]
+    remote: __remote_spec[P, ReturnType]
 
     class __remote_gen_spec(typing_extensions.Protocol):
         def __call__(self, *args, **kwargs) -> typing.Generator[typing.Any, None, None]: ...
@@ -480,17 +480,17 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
     def _get_obj(self) -> typing.Optional[modal.cls.Obj]: ...
     def local(self, *args: P.args, **kwargs: P.kwargs) -> OriginalReturnType: ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
         def __call__(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
         async def aio(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
-    _experimental_spawn: ___experimental_spawn_spec[ReturnType, P]
+    _experimental_spawn: ___experimental_spawn_spec[P, ReturnType]
 
-    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER]):
         def __call__(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
         async def aio(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
-    spawn: __spawn_spec[ReturnType, P]
+    spawn: __spawn_spec[P, ReturnType]
 
     def get_raw_f(self) -> typing.Callable[..., typing.Any]: ...
 

{modal-0.72.35.dist-info → modal-0.72.37.dist-info}/METADATA

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

{modal-0.72.35.dist-info → modal-0.72.37.dist-info}/RECORD

@@ -20,7 +20,7 @@ modal/app.py,sha256=UOuqlCKlFAjOXCacXmoEMM90FnqFwPRXUhLh0Gi6xzg,45344
 modal/app.pyi,sha256=5D3LkPP6qvTIl2_YgiyhNQ9X4VsOVuxd69a23UmohDg,25477
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=8SQawr7P1PNUCq1UmJMUQXG2jIo4Nmdcs311XqrNLRE,15276
-modal/client.pyi,sha256=zQPANmRIUfQZQWyiOz86Nz8i0c6erIcaS7CfGnKB_OU,7326
+modal/client.pyi,sha256=a8mZAozQK3R3y8QO2JmP3DCLX-emclgL7SXcEgJr8q0,7326
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=xHgZZAmymplw0I2YZGAA8raBboixdNKKTrnsxQZI7G8,32159
@@ -33,12 +33,13 @@ modal/dict.pyi,sha256=VM3dmNqQzV1piZbRncXDqkpiKpmVracmuZB_VXRkrTw,7137
 modal/environments.py,sha256=20doFhRnm1fae30LMOp8hSYbIfR7yFZTtbLdo5PrSj4,6661
 modal/environments.pyi,sha256=RXE3slyEr9tWpfS84Fj7iUzNJy-SujlqWOQTE8A4Qaw,3537
 modal/exception.py,sha256=4JyO-SACaLNDe2QC48EjsK8GMkZ8AgEurZ8j1YdRu8E,5263
-modal/experimental.py,sha256=npfKbyMpI41uZZs9HW_QiB3E4ykWfDXZbACXXbw6qeA,2385
+modal/experimental.py,sha256=H9FXT3kshbjPLovshT10DicyOkGFrPqILy-qdTX-P7s,4015
+modal/experimental.pyi,sha256=24tIYu_w9RLwFrz1cIsgYuqmDCtV8eg6-bQNz3zjhDo,939
 modal/file_io.py,sha256=lcMs_E9Xfm0YX1t9U2wNIBPnqHRxmImqjLW1GHqVmyg,20945
 modal/file_io.pyi,sha256=NrIoB0YjIqZ8MDMe826xAnybT0ww_kxQM3iPLo82REU,8898
 modal/file_pattern_matcher.py,sha256=dSo7BMQGZBAuoBFOX-e_72HxmF3FLzjQlEtnGtJiaD4,6506
 modal/functions.py,sha256=JLQxVn1VEyQMEFzqT1ibDradkb1mvrATJ41zvfffA4I,68499
-modal/functions.pyi,sha256=EcGd1uGnJVbnMmdsnANYeDjLzjaL8BREG3XgxaDPcvM,25473
+modal/functions.pyi,sha256=eoXG53WPMnHY7N8dblghdLEBQ47k8uiSSaCDP9LfNxA,25473
 modal/gpu.py,sha256=rcBwbE-_e2hEUr3VJbr1EgQDRb6aieJKx6G2oQdyBhE,7462
 modal/image.py,sha256=leeY7fLfFjS0IqTi3D4cRxIDOb80BPtb3jsQfqvVJ8c,90912
 modal/image.pyi,sha256=X9vj6cwBdYh8q_2cOd-2RSYNMF49ujcy0lrOXh_v1xc,26049
@@ -149,13 +150,13 @@ 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=pEML5GaV2_0ahci_1vpfc_FnySpsfi2fhYmFF5I7IiQ,1837
 modal_proto/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
-modal_proto/api.proto,sha256=smkhq5gGvZ6HWMc_-zv6ex3Pj76ySdqrmtHn_Ic0iFg,84501
-modal_proto/api_grpc.py,sha256=Bcgo5hmJ0FCAVvWAm7X7Qki2GZ2gvAu3kOtqzRtvoMc,106793
-modal_proto/api_pb2.py,sha256=Qy1Z-i65J6CKrSpDJ0IsvA48JJr1pGn8-YsUFEag6lY,307334
-modal_proto/api_pb2.pyi,sha256=9pzRwWw2GKZsFwsU5VmGuBQvZq6Jb9GfJdM28S3KjuQ,411354
-modal_proto/api_pb2_grpc.py,sha256=OTPQgFBajKwy7fhAFEewDjY6lK49C60Z9vTqUpQy_oY,230822
-modal_proto/api_pb2_grpc.pyi,sha256=mwP2mw6UE46CHlraqicXHsgyGPtV0mCy96LwnFMz74s,53787
-modal_proto/modal_api_grpc.py,sha256=C5QcdsBWEvF9ufbEjdyPQ5IDDexMdAI2_CQ_U2nEYuc,14258
+modal_proto/api.proto,sha256=hhpsbyLV6Rziyb9pGIw6zVcR30G4ueV3B9qD-8JtwCE,84899
+modal_proto/api_grpc.py,sha256=UH63GuZR9AQFBgk5UdNEnjREgkejsnMH7H9KaRjzpiY,108244
+modal_proto/api_pb2.py,sha256=WrVMzHddqlxj1GXpBz4ciqa0L9PVC6uRDxo3OWF3GV0,309536
+modal_proto/api_pb2.pyi,sha256=rJxZnSSLOI9GjNaGDnRtc9XASiB9128Hnbb01PRAunM,412814
+modal_proto/api_pb2_grpc.py,sha256=0STIhGJkO5sN2JnGKmoNGT38EK-kti4oXziPi-_hty8,234054
+modal_proto/api_pb2_grpc.pyi,sha256=KUZw2u9D23f2QI9Khd_FD8HGPOJksPOTiZGLN3HSPuM,54491
+modal_proto/modal_api_grpc.py,sha256=4sdBOwimIgkh8OmBsiRQHgB2hTBp6mT7lfEukN6GYb4,14444
 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
@@ -166,10 +167,10 @@ modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0y
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_version/__init__.py,sha256=kGya2ZlItX2zB7oHORs-wvP4PG8lg_mtbi1QIK3G6SQ,470
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal_version/_version_generated.py,sha256=Risj0f23NjXwV5p-2zAoUMadoNdAPr6CGxd8K2p7sDk,149
-modal-0.72.35.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-modal-0.72.35.dist-info/METADATA,sha256=aHEZox4anXEutB5lNyiMsxgWcHVypn-HV4-8AsxnxoE,2329
-modal-0.72.35.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-modal-0.72.35.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.72.35.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
-modal-0.72.35.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=qp2mAYJytI5mo-UHfq8OErWhtyaT-laTRNVGIcSL2f0,149
+modal-0.72.37.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.72.37.dist-info/METADATA,sha256=jFge-HVQEUG5kFJaBH_-GGPZ4L2MY0amN4Crhz6dHoE,2329
+modal-0.72.37.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+modal-0.72.37.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.72.37.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
+modal-0.72.37.dist-info/RECORD,,

modal_proto/api.proto

@@ -2004,6 +2004,14 @@ message Proxy {
   repeated ProxyIp proxy_ips = 4;
 }
 
+message ProxyAddIpRequest {
+  string proxy_id = 1 [ (modal.options.audit_target_attr) = true ];
+}
+
+message ProxyAddIpResponse {
+  ProxyIp proxy_ip = 1;
+}
+
 message ProxyCreateRequest {
   string name = 1 [ (modal.options.audit_target_attr) = true ];
   string environment_name = 2;
@@ -2056,6 +2064,10 @@ message ProxyListResponse {
   repeated Proxy proxies = 1;
 }
 
+message ProxyRemoveIpRequest {
+  string proxy_ip = 1 [ (modal.options.audit_target_attr) = true ];
+}
+
 message QueueClearRequest {
   string queue_id = 1;
   bytes partition_key = 2;
@@ -2943,11 +2955,13 @@ service ModalClient {
   rpc NotebookKernelPublishResults(NotebookKernelPublishResultsRequest) returns (google.protobuf.Empty);
 
   // Proxies
+  rpc ProxyAddIp(ProxyAddIpRequest) returns (ProxyAddIpResponse);
   rpc ProxyCreate(ProxyCreateRequest) returns (ProxyCreateResponse);
   rpc ProxyDelete(ProxyDeleteRequest) returns (google.protobuf.Empty);
   rpc ProxyGet(ProxyGetRequest) returns (ProxyGetResponse);
   rpc ProxyGetOrCreate(ProxyGetOrCreateRequest) returns (ProxyGetOrCreateResponse);
   rpc ProxyList(google.protobuf.Empty) returns (ProxyListResponse);
+  rpc ProxyRemoveIp(ProxyRemoveIpRequest) returns (google.protobuf.Empty);
 
   // Queues
   rpc QueueClear(QueueClearRequest) returns (google.protobuf.Empty);

modal_proto/api_grpc.py

@@ -334,6 +334,10 @@ class ModalClientBase(abc.ABC):
     async def NotebookKernelPublishResults(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.NotebookKernelPublishResultsRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def ProxyAddIp(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.ProxyAddIpRequest, modal_proto.api_pb2.ProxyAddIpResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def ProxyCreate(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.ProxyCreateRequest, modal_proto.api_pb2.ProxyCreateResponse]') -> None:
         pass
@@ -354,6 +358,10 @@ class ModalClientBase(abc.ABC):
     async def ProxyList(self, stream: 'grpclib.server.Stream[google.protobuf.empty_pb2.Empty, modal_proto.api_pb2.ProxyListResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def ProxyRemoveIp(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.ProxyRemoveIpRequest, google.protobuf.empty_pb2.Empty]') -> None:
+        pass
+
     @abc.abstractmethod
     async def QueueClear(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.QueueClearRequest, google.protobuf.empty_pb2.Empty]') -> None:
         pass
@@ -1050,6 +1058,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.NotebookKernelPublishResultsRequest,
                 google.protobuf.empty_pb2.Empty,
             ),
+            '/modal.client.ModalClient/ProxyAddIp': grpclib.const.Handler(
+                self.ProxyAddIp,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.ProxyAddIpRequest,
+                modal_proto.api_pb2.ProxyAddIpResponse,
+            ),
             '/modal.client.ModalClient/ProxyCreate': grpclib.const.Handler(
                 self.ProxyCreate,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -1080,6 +1094,12 @@ class ModalClientBase(abc.ABC):
                 google.protobuf.empty_pb2.Empty,
                 modal_proto.api_pb2.ProxyListResponse,
             ),
+            '/modal.client.ModalClient/ProxyRemoveIp': grpclib.const.Handler(
+                self.ProxyRemoveIp,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.ProxyRemoveIpRequest,
+                google.protobuf.empty_pb2.Empty,
+            ),
             '/modal.client.ModalClient/QueueClear': grpclib.const.Handler(
                 self.QueueClear,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -1890,6 +1910,12 @@ class ModalClientStub:
             modal_proto.api_pb2.NotebookKernelPublishResultsRequest,
             google.protobuf.empty_pb2.Empty,
         )
+        self.ProxyAddIp = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/ProxyAddIp',
+            modal_proto.api_pb2.ProxyAddIpRequest,
+            modal_proto.api_pb2.ProxyAddIpResponse,
+        )
         self.ProxyCreate = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/ProxyCreate',
@@ -1920,6 +1946,12 @@ class ModalClientStub:
             google.protobuf.empty_pb2.Empty,
             modal_proto.api_pb2.ProxyListResponse,
         )
+        self.ProxyRemoveIp = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/ProxyRemoveIp',
+            modal_proto.api_pb2.ProxyRemoveIpRequest,
+            google.protobuf.empty_pb2.Empty,
+        )
         self.QueueClear = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/QueueClear',