modal 0.73.115__py3-none-any.whl → 0.73.126__py3-none-any.whl

modal/parallel_map.pyi

@@ -1,8 +1,13 @@
+import asyncio
+import asyncio.events
 import collections.abc
+import enum
 import modal._functions
 import modal._utils.async_utils
 import modal.client
 import modal.functions
+import modal.retries
+import modal_proto.api_pb2
 import typing
 import typing_extensions
 
@@ -48,6 +53,7 @@ def _map_invocation(
     order_outputs: bool,
     return_exceptions: bool,
     count_update_callback: typing.Optional[collections.abc.Callable[[int, int], None]],
+    function_call_invocation_type: int,
 ): ...
 def _map_sync(
     self, *input_iterators, kwargs={}, order_outputs: bool = True, return_exceptions: bool = False
@@ -77,3 +83,72 @@ def _starmap_sync(
     order_outputs: bool = True,
     return_exceptions: bool = False,
 ) -> modal._utils.async_utils.AsyncOrSyncIterable: ...
+
+class _MapItemState(enum.Enum):
+    # The input is being sent the server with a PutInputs request, but the response has not been received yet.
+    SENDING = 1
+    # A call to either PutInputs or FunctionRetry has completed, and we are waiting to receive the output.
+    WAITING_FOR_OUTPUT = 2
+    # The input is on the retry queue, and waiting for its delay to expire.
+    WAITING_TO_RETRY = 3
+    # The input is being sent to the server with a FunctionRetry request, but the response has not been received yet.
+    RETRYING = 4
+    # The output has been received and was either successful, or failed with no more retries remaining.
+    COMPLETE = 5
+
+class _OutputType(enum.Enum):
+    SUCCESSFUL_COMPLETION = 1
+    FAILED_COMPLETION = 2
+    RETRYING = 3
+    ALREADY_COMPLETE_DUPLICATE = 4
+    STALE_RETRY_DUPLICATE = 5
+    NO_CONTEXT_DUPLICATE = 6
+
+class _MapItemContext:
+    state: _MapItemState
+    input: modal_proto.api_pb2.FunctionInput
+    retry_manager: modal.retries.RetryManager
+    sync_client_retries_enabled: bool
+    input_id: asyncio.Future
+    input_jwt: asyncio.Future
+    previous_input_jwt: typing.Optional[str]
+    _event_loop: asyncio.events.AbstractEventLoop
+
+    def __init__(
+        self,
+        input: modal_proto.api_pb2.FunctionInput,
+        retry_manager: modal.retries.RetryManager,
+        sync_client_retries_enabled: bool,
+    ): ...
+    def handle_put_inputs_response(self, item: modal_proto.api_pb2.FunctionPutInputsResponseItem): ...
+    async def handle_get_outputs_response(
+        self,
+        item: modal_proto.api_pb2.FunctionGetOutputsItem,
+        now_seconds: int,
+        function_call_invocation_type: int,
+        retry_queue: modal._utils.async_utils.TimestampPriorityQueue,
+    ) -> _OutputType: ...
+    async def prepare_item_for_retry(self) -> modal_proto.api_pb2.FunctionRetryInputsItem: ...
+    def handle_retry_response(self, input_jwt: str): ...
+
+class _MapItemsManager:
+    def __init__(
+        self,
+        retry_policy: modal_proto.api_pb2.FunctionRetryPolicy,
+        function_call_invocation_type: int,
+        retry_queue: modal._utils.async_utils.TimestampPriorityQueue,
+        sync_client_retries_enabled: bool,
+    ): ...
+    async def add_items(self, items: list[modal_proto.api_pb2.FunctionPutInputsItem]): ...
+    async def prepare_items_for_retry(
+        self, retriable_idxs: list[int]
+    ) -> list[modal_proto.api_pb2.FunctionRetryInputsItem]: ...
+    def get_input_jwts_waiting_for_output(self) -> list[str]: ...
+    def _remove_item(self, item_idx: int): ...
+    def get_item_context(self, item_idx: int) -> _MapItemContext: ...
+    def handle_put_inputs_response(self, items: list[modal_proto.api_pb2.FunctionPutInputsResponseItem]): ...
+    def handle_retry_response(self, input_jwts: list[str]): ...
+    async def handle_get_outputs_response(
+        self, item: modal_proto.api_pb2.FunctionGetOutputsItem, now_seconds: int
+    ) -> _OutputType: ...
+    def __len__(self): ...

modal/retries.py

@@ -1,6 +1,6 @@
 # Copyright Modal Labs 2022
-import asyncio
 from datetime import timedelta
+from typing import Union
 
 from modal_proto import api_pb2
 
@@ -116,17 +116,19 @@ class RetryManager:
 
     def __init__(self, retry_policy: api_pb2.FunctionRetryPolicy):
         self.retry_policy = retry_policy
-        self.attempt_count = 0
+        self.retry_count = 0
 
-    async def raise_or_sleep(self, exc: Exception):
+    def get_delay_ms(self) -> Union[float, None]:
         """
-        Raises an exception if the maximum retry count has been reached, otherwise sleeps for calculated delay.
+        Returns the delay in milliseconds before the next retry, or None
+        if the maximum number of retries has been reached.
         """
-        self.attempt_count += 1
-        if self.attempt_count > self.retry_policy.retries:
-            raise exc
-        delay_ms = self._retry_delay_ms(self.attempt_count, self.retry_policy)
-        await asyncio.sleep(delay_ms / 1000)
+        self.retry_count += 1
+
+        if self.retry_count > self.retry_policy.retries:
+            return None
+
+        return self._retry_delay_ms(self.retry_count, self.retry_policy)
 
     @staticmethod
     def _retry_delay_ms(attempt_count: int, retry_policy: api_pb2.FunctionRetryPolicy) -> float:

{modal-0.73.115.dist-info → modal-0.73.126.dist-info}/METADATA

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

{modal-0.73.115.dist-info → modal-0.73.126.dist-info}/RECORD

@@ -3,7 +3,7 @@ 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=arhkIoF8nQNfa4iwYGSoqN3QMDg5M38QNAODXC8TlKc,29301
-modal/_functions.py,sha256=B2pf6yN3MI07j9TdyJ-fSLUHXUjrLJzEby37I8WhKnc,72826
+modal/_functions.py,sha256=csh7ZeCfUSTcJv_dWjq0D94Eq5ivb31D-xJYD5LBrbg,73316
 modal/_ipython.py,sha256=TW1fkVOmZL3YYqdS2YlM1hqpf654Yf8ZyybHdBnlhSw,301
 modal/_location.py,sha256=joiX-0ZeutEUDTrrqLF1GHXCdVLF-rHzstocbMcd_-k,366
 modal/_object.py,sha256=JBIECWdfpRKCaCxVWZbC3Q1kF5Whk_EKvY9f4Y6AFyg,11446
@@ -13,7 +13,7 @@ modal/_proxy_tunnel.py,sha256=gnKyCfmVB7x2d1A6c-JDysNIP3kEFxmXzhcXhPrzPn0,1906
 modal/_pty.py,sha256=JZfPDDpzqICZqtyPI_oMJf_9w-p_lLNuzHhwhodUXio,1329
 modal/_resolver.py,sha256=RtoXoYzSllPlFu0D1vel_FWiEmDO7RyToiC2bxeN8ZY,6917
 modal/_resources.py,sha256=5qmcirXUI8dSH926nwkUaeX9H25mqYu9mXD_KuT79-o,1733
-modal/_serialization.py,sha256=xqBzCNvzDofh3DSmXFbK3nFvpz6gi4JDEnsLhcW21uI,20554
+modal/_serialization.py,sha256=DUM-RljUSoKYezLWlckn8GH46A3IWkx9QIUukWYhCxU,22021
 modal/_traceback.py,sha256=IZQzB3fVlUfMHOSyKUgw0H6qv4yHnpyq-XVCNZKfUdA,5023
 modal/_tunnel.py,sha256=zTBxBiuH1O22tS1OliAJdIsSmaZS8PlnifS_6S5z-mk,6320
 modal/_tunnel.pyi,sha256=JmmDYAy9F1FpgJ_hWx0xkom2nTOFQjn4mTPYlU3PFo4,1245
@@ -22,11 +22,11 @@ modal/app.py,sha256=ojhuLZuNZAQ1OsbDH0k6G4pm1W7bOIvZfXbaKlvQ-Ao,45622
 modal/app.pyi,sha256=tZFbcsu20SuvfB2puxCyuXLFNJ9bQulzag55rVpgZmc,26827
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=j9D3hNis1lfhnz9lVFGgJgowbH3PaGUzNKgHPWYG778,15372
-modal/client.pyi,sha256=xE78ktMJldHGjMgAE6Sfpl6LiDrQvIFGcA1yYNgpqGY,7661
+modal/client.pyi,sha256=o7WUb0ztNmkP28C1tECtWjPivzD6vnBCwGL8fE0jb1k,7661
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
-modal/cls.py,sha256=jjhzmnGdmLaBTJzVfUM81B-DWU2Mm2Rdw-m2LCGYbE0,31955
-modal/cls.pyi,sha256=odrnYkqtQRiVwrAc6Ly23_zMYojIDYPo2bwMeElz-Ms,10395
+modal/cls.py,sha256=PWXqCcBVOuYnp0Q5GY-bEldVyv_AnelApMyPiESYwrU,31410
+modal/cls.pyi,sha256=ZJUwtRaQBGlM6tphvnv49FHBVDSgttMdD_LnYyRSKJM,10302
 modal/config.py,sha256=Zx7YsllgIJzMRKeIkaGSLLtMFV4kTUvGxpptnmqlP1U,11623
 modal/container_process.py,sha256=WTqLn01dJPVkPpwR_0w_JH96ceN5mV4TGtiu1ZR2RRA,6108
 modal/container_process.pyi,sha256=Hf0J5JyDdCCXBJSKx6gvkPOo0XrztCm78xzxamtzUjQ,2828
@@ -41,9 +41,9 @@ modal/file_io.py,sha256=lcMs_E9Xfm0YX1t9U2wNIBPnqHRxmImqjLW1GHqVmyg,20945
 modal/file_io.pyi,sha256=NTRft1tbPSWf9TlWVeZmTlgB5AZ_Zhu2srWIrWr7brk,9445
 modal/file_pattern_matcher.py,sha256=trosX-Bp7dOubudN1bLLhRAoidWy1TcoaR4Pv8CedWw,6497
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
-modal/functions.pyi,sha256=D-PDJfSbwqMDXdq7Bxu2ErZRENo-tRgu_zPoB-jl0OU,14377
+modal/functions.pyi,sha256=ujc6eIYyNmMn__4dpxEy85-vZmAniZv56D2A4uBgs6U,14377
 modal/gpu.py,sha256=Kbhs_u49FaC2Zi0TjCdrpstpRtT5eZgecynmQi5IZVE,6752
-modal/image.py,sha256=Q-zNKdDmn7HHRv8YW7cIVYD1lbsOiiRuWfTZqLjGu2U,92189
+modal/image.py,sha256=6hDizLZvRIjRy2cMWGT06Kj1uqW_L5B9GR6x3AKr4v4,92341
 modal/image.pyi,sha256=DQ4DLOCPr6_yV7z4LS0bTY0rOyvQP9-dQOrzaW7pPG8,25260
 modal/io_streams.py,sha256=h5O2LmbRoT9l777z3TQhCAm-JF1r7avZ2ykXlejztDs,15163
 modal/io_streams.pyi,sha256=bJ7ZLmSmJ0nKoa6r4FJpbqvzdUVa0lEe0Fa-MMpMezU,5071
@@ -54,8 +54,8 @@ modal/network_file_system.pyi,sha256=4N3eqMbTSlqmS8VV_aJK-uvrgJC8xnf_YtW5FHfRfc8
 modal/object.py,sha256=bTeskuY8JFrESjU4_UL_nTwYlBQdOLmVaOX3X6EMxsg,164
 modal/object.pyi,sha256=kyJkRQcVv3ct7zSAxvvXcuhBVeH914v80uSlqeS7cA4,5632
 modal/output.py,sha256=q4T9uHduunj4NwY-YSwkHGgjZlCXMuJbfQ5UFaAGRAc,1968
-modal/parallel_map.py,sha256=Mctp_HdfyG1aMCw2ohcywLqGEKIbSPNtI3VyvXgSGJc,16321
-modal/parallel_map.pyi,sha256=CWLbHNo6bJMOHSGfbLLcIDh-3XT3jtUOG_jzuFYLqcw,2573
+modal/parallel_map.py,sha256=AB4YH4ZBGmCOe-X_1kB3hm-kNoRnOxCMzpkTUim4tT8,33586
+modal/parallel_map.pyi,sha256=-D_z-K1GOpQcMSUMVHRVLr2rgEA5CXlX6dU5P6msa58,5671
 modal/partial_function.py,sha256=uu8zvIV0Big0jiTlC4-VPL16dOScNB5jhfPeqxvvCrI,1117
 modal/partial_function.pyi,sha256=-MAK61qJRi6Wjym-Measz5_9moJurYrJfdi7uSQZa5M,4936
 modal/proxy.py,sha256=NrOevrWxG3G7-zlyRzG6BcIvop7AWLeyahZxitbBaOk,1418
@@ -63,7 +63,7 @@ modal/proxy.pyi,sha256=1OEKIVUyC-xb7fHMzngakQso0nTsK60TVhXtlcMj6Wk,390
 modal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal/queue.py,sha256=OIYmve1a4GTP54Vj2CcLatLPIAWToU7hWBNeu7IJiBY,18985
 modal/queue.pyi,sha256=sgvELCK4bJXMZIZw7gllooGFZNipGjI3BT4rmUuyD9M,10282
-modal/retries.py,sha256=HKR2Q9aNPWkMjQ5nwobqYTuZaSuw0a8lI2zrtY5IW98,5230
+modal/retries.py,sha256=IvNLDM0f_GLUDD5VgEDoN09C88yoxSrCquinAuxT1Sc,5205
 modal/runner.py,sha256=2VoA5jR9JwgPlmaGFWWOsSCGivS9Pv4-e-YFP9l92iE,25073
 modal/runner.pyi,sha256=HW2pvC_PLwg1Es_EkrfQgMZsktIr9zzVEtmjOVFG6Dw,5351
 modal/running_app.py,sha256=v61mapYNV1-O-Uaho5EfJlryMLvIT9We0amUOSvSGx8,1188
@@ -84,8 +84,8 @@ modal/volume.py,sha256=JAWeDvoAG95tMBv-fYIERyHsJPS_X_xGpxRRmYtb6j0,30096
 modal/volume.pyi,sha256=kTsXarphjZILXci84LQy7EyC84eXUs5-7D62IM5q3eE,12491
 modal/_runtime/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
 modal/_runtime/asgi.py,sha256=vmbrREjdCnxAeUyoUd1vtv7PfcR86IR0R2Jp1J6rEok,22435
-modal/_runtime/container_io_manager.py,sha256=3VPj0RWtSdvVZD96l5ZpO8MjhLRjAi_P_ZtpNK3nGn0,43593
-modal/_runtime/container_io_manager.pyi,sha256=sEGpOvlDOQCwUiJn4CAyE8TT2lCBKNBEqGWExfvVKsY,16661
+modal/_runtime/container_io_manager.py,sha256=EPprznbVbA9hEinJj6RqwizTyC0hGoBvZ25ptZhMMt0,43876
+modal/_runtime/container_io_manager.pyi,sha256=H3HOnJR3fw1EOQG66izBWVFvyYDS4J2Ohr8oD349WRo,16803
 modal/_runtime/execution_context.py,sha256=E6ofm6j1POXGPxS841X3V7JU6NheVb8OkQc7JpLq4Kg,2712
 modal/_runtime/execution_context.pyi,sha256=wQZwMNADExkeNdB9yKX0PPojovxlFHbap3441wAsiMY,634
 modal/_runtime/gpu_memory_snapshot.py,sha256=tA3m1d1cwnmHpvpCeN_WijDd6n8byn7LWlpicbIxiOI,3144
@@ -93,17 +93,18 @@ modal/_runtime/telemetry.py,sha256=T1RoAGyjBDr1swiM6pPsGRSITm7LI5FDK18oNXxY08U,5
 modal/_runtime/user_code_imports.py,sha256=OTxf5BIwMOaHFplIxxyEAOsR-xM2f5kSiSOa9Ne2le0,14814
 modal/_utils/__init__.py,sha256=waLjl5c6IPDhSsdWAm9Bji4e2PVxamYABKAze6CHVXY,28
 modal/_utils/app_utils.py,sha256=88BT4TPLWfYAQwKTHcyzNQRHg8n9B-QE2UyJs96iV-0,108
-modal/_utils/async_utils.py,sha256=aes4Me0GA3yurNjsb6f8qeLD5bQw8NOmzKQFUqLaqSk,25208
+modal/_utils/async_utils.py,sha256=b2TJyKY1Hq7df7M-fo3qlFM95mGdo3dCuqRPPcV5hsE,27445
 modal/_utils/blob_utils.py,sha256=RB1G6T7eC1Poe-O45qYLaxwCr2jkM-Q6Nexk1J3wk_w,14505
 modal/_utils/bytes_io_segment_payload.py,sha256=uunxVJS4PE1LojF_UpURMzVK9GuvmYWRqQo_bxEj5TU,3385
 modal/_utils/deprecation.py,sha256=EXP1beU4pmEqEzWMLw6E3kUfNfpmNA_VOp6i0EHi93g,4856
 modal/_utils/docker_utils.py,sha256=h1uETghR40mp_y3fSWuZAfbIASH1HMzuphJHghAL6DU,3722
-modal/_utils/function_utils.py,sha256=Un9WXZCmLb0itbDDOn4q6hF6n1r5ayhxPDb6oMCkucE,27190
+modal/_utils/function_utils.py,sha256=oWpeCvDQgsbjz3jUZPJ5LVgZO63OqY1ut3BNh8HJ-JM,27732
 modal/_utils/git_utils.py,sha256=qtUU6JAttF55ZxYq51y55OR58B0tDPZsZWK5dJe6W5g,3182
 modal/_utils/grpc_testing.py,sha256=H1zHqthv19eGPJz2HKXDyWXWGSqO4BRsxah3L5Xaa8A,8619
 modal/_utils/grpc_utils.py,sha256=wmMydVKN9YbugTwUXuOuzxbpzYvxkTDaFRxlBtIDE_0,8526
 modal/_utils/hash_utils.py,sha256=zg3J6OGxTFGSFri1qQ12giDz90lWk8bzaxCTUCRtiX4,3034
 modal/_utils/http_utils.py,sha256=yeTFsXYr0rYMEhB7vBP7audG9Uc7OLhzKBANFDZWVt0,2451
+modal/_utils/jwt_utils.py,sha256=fxH9plyrbAemTbjSsQtzIdDXE9QXxvMC4DiUZ16G0aA,1360
 modal/_utils/logger.py,sha256=ePzdudrtx9jJCjuO6-bcL_kwUJfi4AwloUmIiNtqkY0,1330
 modal/_utils/mount_utils.py,sha256=gGCgIlWwYiJbUtgFY2GJcWYismYvazbMAeUOgf7NhFQ,3205
 modal/_utils/name_utils.py,sha256=TW1iyJedvDNPEJ5UVp93u8xuD5J2gQL_CUt1mgov_aI,1939
@@ -118,7 +119,7 @@ modal/_vendor/tblib.py,sha256=g1O7QUDd3sDoLd8YPFltkXkih7r_fyZOjgmGuligv3s,9722
 modal/cli/__init__.py,sha256=waLjl5c6IPDhSsdWAm9Bji4e2PVxamYABKAze6CHVXY,28
 modal/cli/_download.py,sha256=t6BXZwjTd9MgznDvbsV8rp0FZWggdzC-lUAGZU4xx1g,3984
 modal/cli/_traceback.py,sha256=QlLa_iw3fAOA-mqCqjS8qAxvNT48J3YY3errtVVc2cw,7316
-modal/cli/app.py,sha256=TmUiFKAE1yc6ll8pfl-wZ2lh9crC31Fu_8_YKCX8NJc,7818
+modal/cli/app.py,sha256=87LWg3bTQQIHFOqs8iiJYD_X03omXBZ6lFYR0rMJV-I,8433
 modal/cli/config.py,sha256=QvFsqO4eUOtI7d_pQAOAyfq_ZitjhPtav3C6GIDQcZM,1680
 modal/cli/container.py,sha256=FYwEgjf93j4NMorAjGbSV98i1wpebqdAeNU1wfrFp1k,3668
 modal/cli/dict.py,sha256=8Wq3w-UDaywk8EVNdj-ECCNV9TYHqh4kzhUqhhulatM,4593
@@ -153,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=yd5qoqd5x8OyY38MzCo7hHtVKwAsmyngvFUe8oAAYkQ,87353
-modal_proto/api_grpc.py,sha256=FYGqDegM_w_qxdtlxum8k31mDibKoMvmNxv_p9cKdKs,109056
-modal_proto/api_pb2.py,sha256=ItLGikaH1NXGuFKhucWTHb_gRHU7kNXiLqzmydM1UD4,313829
-modal_proto/api_pb2.pyi,sha256=p-VzoefqELok0wgWmrRiA4a6Oin1upNA6f8RJgaiZbo,424640
-modal_proto/api_pb2_grpc.py,sha256=DNp0Et5i_Ey4dKx_1o1LRtYhyWYyT0NzTcAY4EcHn-c,235765
-modal_proto/api_pb2_grpc.pyi,sha256=RI6tWC3L8EIN4-izFSEGPPJl5Ta0lXPNuHUJaWAr35s,54892
-modal_proto/modal_api_grpc.py,sha256=UG8WJU81afrWPwItWB4Ag64E9EpyREMpBbAVGVEYJiM,14550
+modal_proto/api.proto,sha256=6xhnFkmsqP8cThFDUNcAPQgYmAaukqjMVjRKAdmapVA,87786
+modal_proto/api_grpc.py,sha256=SJOfs3Y1cOzzF_ZcDj-UNnOWz59sfU8a4JISp4Y_1Kw,109923
+modal_proto/api_pb2.py,sha256=rbdtVZY39LuPezotOMsOUbMqvoPIhZblevLqDy0r2dA,315544
+modal_proto/api_pb2.pyi,sha256=sIbeFpkte0acPdDUQ26Nz6at9VWTzkeHuMBwk_CuzKM,426646
+modal_proto/api_pb2_grpc.py,sha256=0XeCIL2B6UGLBh1MEGPFPz1k8qLWNyp-yj_cJrK3NE8,237541
+modal_proto/api_pb2_grpc.pyi,sha256=BsnRBinG0KC9Cp70UkdxuzgZA9KLCTl7T5ze0RK-Mmk,55323
+modal_proto/modal_api_grpc.py,sha256=i9HTreJ5FpBvtz9NwuTC52fZTWZO_M_DWdIYT2lOjs8,14666
 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
@@ -170,10 +171,10 @@ 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=UYVu80OuzFCShlTl1bGkjkxEUmQ2WFqu_AaRJ9AXteA,150
-modal-0.73.115.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-modal-0.73.115.dist-info/METADATA,sha256=lHov8_PXPDz7NNTAKDel9-Z-JhNiEwfson9zuw6NMt8,2453
-modal-0.73.115.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-modal-0.73.115.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.73.115.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-0.73.115.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=N3-ozfWU5EauDyfN9CQOyvG2WmMHD3l38ewrSfddkME,150
+modal-0.73.126.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.73.126.dist-info/METADATA,sha256=NniJfmCWzeCudS3OWlLTeZopwkFQgMC4fp-20kPk0_Q,2453
+modal-0.73.126.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+modal-0.73.126.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.73.126.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-0.73.126.dist-info/RECORD,,

{modal-0.73.115.dist-info → modal-0.73.126.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.1.0)
+Generator: setuptools (76.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

modal_proto/api.proto

@@ -172,6 +172,7 @@ enum ParameterType {
   PARAM_TYPE_INT = 2;
   PARAM_TYPE_PICKLE = 3;
   PARAM_TYPE_BYTES = 4;
+  PARAM_TYPE_UNKNOWN = 5;  // used in schemas to signify unrecognized or un-annotated types
 }
 
 enum ProgressType {
@@ -2327,6 +2328,17 @@ message SandboxGetLogsRequest {
   string last_entry_id = 4;
 }
 
+message SandboxGetResourceUsageRequest {
+  string sandbox_id = 1;
+}
+
+message SandboxGetResourceUsageResponse {
+  uint64 cpu_core_nanosecs = 1;
+  uint64 mem_gib_nanosecs = 2;
+  uint64 gpu_nanosecs = 3;
+  optional string gpu_type = 4;
+}
+
 message SandboxGetTaskIdRequest {
   string sandbox_id = 1;
   optional float timeout = 2; // Legacy clients do not provide a timeout. New clients must always provide a timeout.
@@ -3041,6 +3053,7 @@ service ModalClient {
   // Sandboxes
   rpc SandboxCreate(SandboxCreateRequest) returns (SandboxCreateResponse);
   rpc SandboxGetLogs(SandboxGetLogsRequest) returns (stream TaskLogsBatch);
+  rpc SandboxGetResourceUsage(SandboxGetResourceUsageRequest) returns (SandboxGetResourceUsageResponse);
   rpc SandboxGetTaskId(SandboxGetTaskIdRequest) returns (SandboxGetTaskIdResponse); // needed for modal container exec
   rpc SandboxGetTunnels(SandboxGetTunnelsRequest) returns (SandboxGetTunnelsResponse);
   rpc SandboxList(SandboxListRequest) returns (SandboxListResponse);

modal_proto/api_grpc.py

@@ -406,6 +406,10 @@ class ModalClientBase(abc.ABC):
     async def SandboxGetLogs(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxGetLogsRequest, modal_proto.api_pb2.TaskLogsBatch]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def SandboxGetResourceUsage(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxGetResourceUsageRequest, modal_proto.api_pb2.SandboxGetResourceUsageResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def SandboxGetTaskId(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.SandboxGetTaskIdRequest, modal_proto.api_pb2.SandboxGetTaskIdResponse]') -> None:
         pass
@@ -1170,6 +1174,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.SandboxGetLogsRequest,
                 modal_proto.api_pb2.TaskLogsBatch,
             ),
+            '/modal.client.ModalClient/SandboxGetResourceUsage': grpclib.const.Handler(
+                self.SandboxGetResourceUsage,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.SandboxGetResourceUsageRequest,
+                modal_proto.api_pb2.SandboxGetResourceUsageResponse,
+            ),
             '/modal.client.ModalClient/SandboxGetTaskId': grpclib.const.Handler(
                 self.SandboxGetTaskId,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2028,6 +2038,12 @@ class ModalClientStub:
             modal_proto.api_pb2.SandboxGetLogsRequest,
             modal_proto.api_pb2.TaskLogsBatch,
         )
+        self.SandboxGetResourceUsage = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/SandboxGetResourceUsage',
+            modal_proto.api_pb2.SandboxGetResourceUsageRequest,
+            modal_proto.api_pb2.SandboxGetResourceUsageResponse,
+        )
         self.SandboxGetTaskId = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/SandboxGetTaskId',