modal 0.72.34__py3-none-any.whl → 0.72.36__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.34"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.72.36"
     ): ...
     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.34"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.72.36"
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/functions.py

@@ -785,7 +785,8 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                     task_idle_timeout_secs=container_idle_timeout or 0,
                     concurrency_limit=concurrency_limit or 0,
                     pty_info=pty_info,
-                    cloud_provider=cloud_provider,
+                    cloud_provider=cloud_provider,  # Deprecated at some point
+                    cloud_provider_str=cloud.upper() if cloud else "",  # Supersedes cloud_provider
                     warm_pool_size=keep_warm or 0,
                     runtime=config.get("function_runtime"),
                     runtime_debug=config.get("function_runtime_debug"),

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/sandbox.py

@@ -165,7 +165,8 @@ class _Sandbox(_Object, type_prefix="sb"):
                 resources=convert_fn_config_to_resources_config(
                     cpu=cpu, memory=memory, gpu=gpu, ephemeral_disk=ephemeral_disk
                 ),
-                cloud_provider=parse_cloud_provider(cloud) if cloud else None,
+                cloud_provider=parse_cloud_provider(cloud) if cloud else None,  # Deprecated at some point
+                cloud_provider_str=cloud.upper() if cloud else None,  # Supersedes cloud_provider
                 nfs_mounts=network_file_system_mount_protos(validated_network_file_systems, False),
                 runtime_debug=config.get("function_runtime_debug"),
                 cloud_bucket_mounts=cloud_bucket_mounts_to_proto(cloud_bucket_mounts),

{modal-0.72.34.dist-info → modal-0.72.36.dist-info}/METADATA

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

{modal-0.72.34.dist-info → modal-0.72.36.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=GR95fSkc14RoEkIwaXiI9r8XWn0QPgPDMEHKNRVP9Sw,7326
+modal/client.pyi,sha256=6X3cs5TRTn1yKyl5IPh2O7Tqkk_F6fJIOTw6f7Cb2JQ,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
@@ -37,8 +37,8 @@ modal/experimental.py,sha256=npfKbyMpI41uZZs9HW_QiB3E4ykWfDXZbACXXbw6qeA,2385
 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=IP-6oHMmt-wUJPBWJ7Y7Vw2vqk2bYFRSQmV38T2STTI,68371
-modal/functions.pyi,sha256=EcGd1uGnJVbnMmdsnANYeDjLzjaL8BREG3XgxaDPcvM,25473
+modal/functions.py,sha256=JLQxVn1VEyQMEFzqT1ibDradkb1mvrATJ41zvfffA4I,68499
+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
@@ -64,7 +64,7 @@ modal/retries.py,sha256=HKR2Q9aNPWkMjQ5nwobqYTuZaSuw0a8lI2zrtY5IW98,5230
 modal/runner.py,sha256=0SCMgKO8lZ9W1C7le1EcgViKERMXpi_-QBd6PF_MH0Q,24450
 modal/runner.pyi,sha256=YmP4EOCNjjkwSIPi2Gl6hF_ji_ytkxz9dw3iB9KXaOI,5275
 modal/running_app.py,sha256=v61mapYNV1-O-Uaho5EfJlryMLvIT9We0amUOSvSGx8,1188
-modal/sandbox.py,sha256=n1_TbX1t6cWL43ynG203eL_AiEWBrL9Cry1NfPBrlTc,28829
+modal/sandbox.py,sha256=Au_CdStaksvu2VY6hGvSjdTxAQEsWs0ksfuuuROqmac,28955
 modal/sandbox.pyi,sha256=dCyU848YARwQwoYR19o2A9L6rfB5JFz276VGQ-aZId8,20831
 modal/schedule.py,sha256=0ZFpKs1bOxeo5n3HZjoL7OE2ktsb-_oGtq-WJEPO4tY,2615
 modal/scheduler_placement.py,sha256=BAREdOY5HzHpzSBqt6jDVR6YC_jYfHMVqOzkyqQfngU,1235
@@ -149,13 +149,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=PkjtUKjKBAfykMqvCtgpR_hzEiu6v-SNMEvwcvw_Rgg,84313
-modal_proto/api_grpc.py,sha256=Bcgo5hmJ0FCAVvWAm7X7Qki2GZ2gvAu3kOtqzRtvoMc,106793
-modal_proto/api_pb2.py,sha256=ZZCw9viOLtXC5dIaqO2WmGeOEdpNp3EY8qzhjcnDjZo,307238
-modal_proto/api_pb2.pyi,sha256=FBNfJ1--D0m9jthiQXAgjkHR1ba4tcMi-q9phWQWI8E,410852
-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 +166,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=Ixznspk9sSoaEl-TqOpNARQzukOb53UQZzOi2jNgAW4,149
-modal-0.72.34.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-modal-0.72.34.dist-info/METADATA,sha256=UiVI4xHiCsI7eYFYAXqLGvLIfRncw3d5T_uDtTVeRHw,2329
-modal-0.72.34.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-modal-0.72.34.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.72.34.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
-modal-0.72.34.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=_-XkotRkA8vwh-9aU2yqrQqZ-npHVab30PojNeEQ6Ko,149
+modal-0.72.36.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.72.36.dist-info/METADATA,sha256=5yAsDaawujE-MJ84Qy-ju9383RWwNKd0NMFe7Q57lnY,2329
+modal-0.72.36.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+modal-0.72.36.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.72.36.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
+modal-0.72.36.dist-info/RECORD,,

modal_proto/api.proto

@@ -1163,7 +1163,7 @@ message Function {
 
   uint32 task_idle_timeout_secs = 25;
 
-  optional CloudProvider cloud_provider = 26;
+  optional CloudProvider cloud_provider = 26;  // Deprecated at some point
 
   uint32 warm_pool_size = 27;
 
@@ -1257,6 +1257,8 @@ message Function {
   bool method_definitions_set = 75;
 
   bool _experimental_custom_scaling = 76;
+
+  string cloud_provider_str = 77;  // Supersedes cloud_provider
 }
 
 message FunctionAsyncInvokeRequest {
@@ -2002,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;
@@ -2054,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;
@@ -2193,7 +2207,7 @@ message Sandbox {
   repeated string secret_ids = 4;
 
   Resources resources = 5;
-  CloudProvider cloud_provider = 6;
+  CloudProvider cloud_provider = 6;  // Deprecated at some point
 
   uint32 timeout_secs = 7;
 
@@ -2237,6 +2251,8 @@ message Sandbox {
   // Used to pin gVisor version for memory-snapshottable sandboxes.
   // This field is set by the server, not the client.
   optional uint32 snapshot_version = 25;
+
+  string cloud_provider_str = 26;  // Supersedes cloud_provider
 }
 
 message SandboxCreateRequest {
@@ -2939,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',