modAL 1.3.1.dev0__py3-none-any.whl → 1.3.1.dev2__py3-none-any.whl

modal/_utils/task_command_router_client.py

@@ -5,6 +5,8 @@ import json
 import ssl
 import time
 import urllib.parse
+import weakref
+from contextlib import suppress
 from typing import AsyncGenerator, Optional
 
 import grpclib.client
@@ -106,6 +108,15 @@ async def fetch_command_router_access(server_client, task_id: str) -> api_pb2.Ta
     )
 
 
+def _finalize_channel(loop, channel):
+    if not loop.is_closed():
+        # only run if loop has not shut down
+        # call_soon_threadsafe could throw if the loop is torn down after calling
+        # is_closed. This is safe to ignore.
+        with suppress(Exception):
+            loop.call_soon_threadsafe(channel.close)
+
+
 class TaskCommandRouterClient:
     """
     Client used to talk directly to TaskCommandRouter service on worker hosts.
@@ -199,44 +210,17 @@ class TaskCommandRouterClient:
 
         self._closed = False
 
-        async def send_request(event: grpclib.events.SendRequest) -> None:
-            # This will get the most recent JWT for every request. No need to
-            # lock _jwt_refresh_lock: reads and writes happen on the
-            # single-threaded event loop and variable assignment is atomic.
-            event.metadata["authorization"] = f"Bearer {self._jwt}"
-
-        grpclib.events.listen(self._channel, grpclib.events.SendRequest, send_request)
+        self._channel_finalizer = weakref.finalize(
+            self,
+            _finalize_channel,
+            loop,
+            channel,
+        )
 
         self._stub = TaskCommandRouterStub(self._channel)
 
-    def __del__(self) -> None:
-        """Best-effort cleanup if the caller forgot to close().
-
-        This object is typically used through synchronicity wrappers, which means this finalizer
-        may run on a different thread than the event loop that owns the channel. Closing the
-        channel is therefore scheduled onto the owning loop using call_soon_threadsafe.
-
-        Use getattr in the event that attributes are not yet initialized or the
-        object is in a half-torn-down state.
-        """
-        if getattr(self, "_closed", False):
-            return
-        self._closed = True
-
-        channel = getattr(self, "_channel", None)
-        if channel is None:
-            return
-
-        loop = getattr(self, "_loop", None)
-
-        if loop is not None and not loop.is_closed():
-            try:
-                loop.call_soon_threadsafe(channel.close)
-            except Exception:
-                # call_soon_threadsafe could throw if the loop is torn down
-                # after calling is_closed. This is safe to ignore, and we don't
-                # want to raise an exception from a destructor.
-                pass
+    def _get_metadata(self):
+        return {"authorization": f"Bearer {self._jwt}"}
 
     async def close(self) -> None:
         """Close the client."""
@@ -245,6 +229,9 @@ class TaskCommandRouterClient:
 
         self._closed = True
         self._channel.close()
+        if self._channel_finalizer.alive:
+            # skip the finalizer if we've closed the channel anyway
+            self._channel_finalizer.detach()
 
     async def exec_start(self, request: sr_pb2.TaskExecStartRequest) -> sr_pb2.TaskExecStartResponse:
         """Start an exec'd command, properly retrying on transient errors."""
@@ -420,12 +407,12 @@ class TaskCommandRouterClient:
 
     async def _call_with_auth_retry(self, func, *args, **kwargs):
         try:
-            return await func(*args, **kwargs)
+            return await func(*args, **kwargs, metadata=self._get_metadata())
         except GRPCError as exc:
             if exc.status == Status.UNAUTHENTICATED:
                 await self._refresh_jwt()
                 # Retry with the original arguments preserved
-                return await func(*args, **kwargs)
+                return await func(*args, **kwargs, metadata=self._get_metadata())
             raise
 
     async def _stream_stdio(
@@ -460,7 +447,7 @@ class TaskCommandRouterClient:
         while True:
             timeout = max(0, deadline - time.monotonic()) if deadline is not None else None
             try:
-                stream = self._stub.TaskExecStdioRead.open(timeout=timeout)
+                stream = self._stub.TaskExecStdioRead.open(timeout=timeout, metadata=self._get_metadata())
                 async with stream as s:
                     req = sr_pb2.TaskExecStdioReadRequest(
                         task_id=task_id,

modal/client.pyi

@@ -33,7 +33,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.3.1.dev0",
+        version: str = "1.3.1.dev2",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -163,7 +163,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.3.1.dev0",
+        version: str = "1.3.1.dev2",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.3.1.dev0.dist-info → modal-1.3.1.dev2.dist-info}/METADATA

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

{modal-1.3.1.dev0.dist-info → modal-1.3.1.dev2.dist-info}/RECORD

@@ -26,7 +26,7 @@ modal/app.pyi,sha256=WR0nGSUh8-8OYRHFqEnijGoPp_IbawNY1JW_0pozXsE,50857
 modal/billing.py,sha256=zmQ3bcCJlwa4KD1IA_QgdWpm1pn13c-7qfy79iEauYI,195
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=CXnyJYLhY--xaCkjv3tpjYDca8AuXGQG1IiaXQVX4y4,14436
-modal/client.pyi,sha256=VfRy7DXu5vNO5JP0T8YHiiNqgE8yYhCsyyUMmwsA2fc,14471
+modal/client.pyi,sha256=zCGUF3RioFCBkCy14L6a3gZ8kvoucamb3bKgVijBo98,14471
 modal/cloud_bucket_mount.py,sha256=cvVj5Rt4nDHoQbTneoJPTaAcnl_Ab_mrsjnnzd0v9OI,6013
 modal/cloud_bucket_mount.pyi,sha256=vXusGMOUk9HjCs4lhxteuCK4xLQclPfugGWKo7LECEA,7539
 modal/cls.py,sha256=Cmqt1vOw0-01ktjJBOrdzvdyDbHpjKMTaZ2eEy_8YUE,41694
@@ -116,7 +116,7 @@ modal/_utils/package_utils.py,sha256=jYE7WFVzYWIfO0ZJhno_BYHb6Skp48uupOiw1a3yWzw
 modal/_utils/pattern_utils.py,sha256=ZUffaECfe2iYBhH6cvCB-0-UWhmEBTZEl_TwG_So3ag,6714
 modal/_utils/rand_pb_testing.py,sha256=oNtQB1BY9CDh7vDXEkJitCuCu9a2ufk0KRcEuZ15d0k,4229
 modal/_utils/shell_utils.py,sha256=hWHzv730Br2Xyj6cGPiMZ-198Z3RZuOu3pDXhFSZ22c,2157
-modal/_utils/task_command_router_client.py,sha256=Ua1WoNEH0Tdi1skLFZ8dJ5I2aq95zaup9MLlL0hsIdw,23961
+modal/_utils/task_command_router_client.py,sha256=-5ZYVBZj0mQLA2Nul2o_XSEM5xV0hrzLziP4v6SZPiI,23219
 modal/_utils/time_utils.py,sha256=43tpFVwT7ykOjlETIFLVt9auMsRZqYYRYBEKxGCrRSA,1212
 modal/_vendor/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
 modal/_vendor/a2wsgi_wsgi.py,sha256=Q1AsjpV_Q_vzQsz_cSqmP9jWzsGsB-ARFU6vpQYml8k,21878
@@ -158,7 +158,7 @@ modal/experimental/__init__.py,sha256=GOuo3t4-Le0ZVddiHIOw0MQxkdTJge-bVbhDvgnblm
 modal/experimental/flash.py,sha256=GJZwSr-4OHlP6gCIZdcbsSb8D8WX9xJwMphjwcfsRoU,31262
 modal/experimental/flash.pyi,sha256=W62a0AhmLUuH9a0n8Y3-DYhyEEFH3-bRUQFphOQfKHg,16418
 modal/experimental/ipython.py,sha256=TrCfmol9LGsRZMeDoeMPx3Hv3BFqQhYnmD_iH0pqdhk,2904
-modal-1.3.1.dev0.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.3.1.dev2.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=d_CQUGQ0rfw28u75I2mov9AlS773z9rG40-yq5o7g2U,6359
@@ -166,10 +166,10 @@ modal_docs/mdmd/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,2
 modal_docs/mdmd/mdmd.py,sha256=tUTImNd4UMFk1opkaw8J672gX8AkBO5gbY2S_NMxsxs,7140
 modal_docs/mdmd/signatures.py,sha256=XJaZrK7Mdepk5fdX51A8uENiLFNil85Ud0d4MH8H5f0,3218
 modal_proto/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
-modal_proto/api.proto,sha256=bs2s1cWI6iciKdq-eFfki4vtYS3Q2XBrbxbbtLJuRCE,111143
+modal_proto/api.proto,sha256=rCVrHKcB6QWjaALTGasjPr6En10CCWTWHSEYAMbkslk,111165
 modal_proto/api_grpc.py,sha256=-8SHvPtalTAjQtRv7zzU7Z1VoDupoJs2ifG4gl_mF0s,134442
-modal_proto/api_pb2.py,sha256=WtQuOdWlkcFgehpcn27nZmdQ5uMQPvluzElkHfdQlhM,384541
-modal_proto/api_pb2.pyi,sha256=3MsY1f4n7LfMiy-J5zA-cKHPci3ejSMb3JaISxkbHAU,542926
+modal_proto/api_pb2.py,sha256=DfSnuy7cKJ6e6udu22xKoVQyoF0d0aod0U-_za9j7ZE,384579
+modal_proto/api_pb2.pyi,sha256=4jfkVV0jZDsIVkoEaffdkRnrjwy_rxiYsy1LKAIKzzQ,543056
 modal_proto/api_pb2_grpc.py,sha256=Hqw9jcbhpr-W6jsfog_tGU55ouZjITxGvA-DGNBqOLA,289714
 modal_proto/api_pb2_grpc.pyi,sha256=QLJ58ANCx147HeGJva58h0MTCLIDs9JmVjrx8bDdwlg,67776
 modal_proto/modal_api_grpc.py,sha256=MqaBZB2ZqYj6XTIgI_p5dOPjt9gKT4pAJNd_WXR3W84,21295
@@ -180,10 +180,10 @@ modal_proto/task_command_router_pb2.py,sha256=2Y8wRvnq4_7RiQ-5ZAPIgXaxrHv_MXzgS5
 modal_proto/task_command_router_pb2.pyi,sha256=yI4tFteErLlonFA2HyaWtONfhY_VGSe7KCWFIspvmkE,16323
 modal_proto/task_command_router_pb2_grpc.py,sha256=q2VWfK2-4uDcPaPLhAqPZkgxhuQRYnWmwUcnEbPbGuk,13895
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=e1MM10VGUgDkm041v53QeTglGQPzTpA0FUsFtezjp74,4536
-modal_version/__init__.py,sha256=BBWANGgdOqoz_AAvW4L3wSTTNVQgOzT37GoLzforXbI,120
+modal_version/__init__.py,sha256=0AlO5a1cQL-5pwDpK4XlTfcYD1BbP5voNFZ8DMSnYK0,120
 modal_version/__main__.py,sha256=nLUbubxKx7GXNzJIkTB7M7_u8080LyLM0IS0rzFkC_c,119
-modal-1.3.1.dev0.dist-info/METADATA,sha256=eo2Z8mnKT0nQdP5bdUFlkwdEVZOHJE2dh3Y0dOUiE2I,2492
-modal-1.3.1.dev0.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.3.1.dev0.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.3.1.dev0.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.3.1.dev0.dist-info/RECORD,,
+modal-1.3.1.dev2.dist-info/METADATA,sha256=z3ClS3lEdrOLP9XxGEtKPgQGakMVOWEp2S1YcG9uCv8,2492
+modal-1.3.1.dev2.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.3.1.dev2.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.3.1.dev2.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.3.1.dev2.dist-info/RECORD,,

modal_proto/api.proto

@@ -2886,7 +2886,7 @@ message SandboxInfo {
   string app_id = 5;
   repeated SandboxTag tags = 6; // TODO: Not yet exposed in client library.
   string name = 7;
-
+  string image_id = 8;
   reserved 2; // modal.client.Sandbox definition
 }