modAL 1.5.6.dev4__py3-none-any.whl → 1.5.6.dev6__py3-none-any.whl

modal/_utils/grpc_utils.py

@@ -199,16 +199,23 @@ class ConnectionManager:
         self._client = client
         # This metadata is injected into all requests on all channels created by this manager.
         self._metadata = metadata
-        self._channels: dict[str, grpclib.client.Channel] = {}
+        self._channels: dict[str, asyncio.Future[grpclib.client.Channel]] = {}
 
     async def get_or_create_channel(self, server_url: str) -> grpclib.client.Channel:
-        if server_url not in self._channels:
-            self._channels[server_url] = await create_channel_with_fallbacks(server_url, self._metadata)
-        return self._channels[server_url]
+        fut = self._channels.get(server_url)
+        if fut is None or (fut.done() and (fut.cancelled() or fut.exception() is not None)):
+            # Cache the attempt rather than the channel, so callers racing to connect share one.
+            fut = asyncio.ensure_future(create_channel_with_fallbacks(server_url, self._metadata))
+            self._channels[server_url] = fut
+        # Shielded so one caller giving up doesn't cancel the connection for the others.
+        return await asyncio.shield(fut)
 
     def close(self):
-        for channel in self._channels.values():
-            channel.close()
+        for fut in self._channels.values():
+            if fut.done() and not fut.cancelled() and fut.exception() is None:
+                fut.result().close()
+            else:
+                fut.cancel()
         self._channels.clear()
 
 
@@ -265,18 +272,34 @@ class CustomProtoStatusDetailsCodec(StatusDetailsCodecBase):
 custom_detail_codec = CustomProtoStatusDetailsCodec()
 
 
-def create_channel_config() -> grpclib.config.Configuration:
+def create_channel_config(*, sustained_keepalive: bool = False) -> grpclib.config.Configuration:
     """Shared grpclib channel settings for Modal client connections.
 
     HTTP/2 keepalive probes keep idle transports warm through stateful
     middleboxes and surface dead connections before retries reuse them.
+
+    `sustained_keepalive` clears the two grpclib defaults such that a probe
+    actually goes out every `_keepalive_time`, for as long as the connection is
+    open.
     """
+    ping_throttle_overrides: dict[str, Any] = {}
+    if sustained_keepalive:
+        ping_throttle_overrides = {
+            # Default 2: probing stops after two probes with no request sent in
+            # between. Requests reset the count, acks don't. 0 = no cap.
+            "_http2_max_pings_without_data": 0,
+            # Default 300s floor between probes, applied regardless of data
+            # despite the name, so it has to stay under `_keepalive_time`.
+            "_http2_min_sent_ping_interval_without_data": GRPC_KEEPALIVE_TIME_SECS / 2,
+        }
+
     return grpclib.config.Configuration(
         _keepalive_time=GRPC_KEEPALIVE_TIME_SECS,
         _keepalive_timeout=GRPC_KEEPALIVE_TIMEOUT_SECS,
         _keepalive_permit_without_calls=True,
         http2_connection_window_size=GRPC_WINDOW_SIZE,
         http2_stream_window_size=GRPC_WINDOW_SIZE,
+        **ping_throttle_overrides,
     )
 
 

modal/_utils/task_command_router_client.py

@@ -251,7 +251,7 @@ class TaskCommandRouterClient:
             host,
             port,
             ssl=ssl_context,
-            config=create_channel_config(),
+            config=create_channel_config(sustained_keepalive=True),
             closed_error_message="Unable to perform operation on a detached sandbox",
         )
 

modal/client.pyi

@@ -77,7 +77,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.6.dev4",
+        version: str = "1.5.6.dev6",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):
@@ -277,7 +277,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.5.6.dev4",
+        version: str = "1.5.6.dev6",
         *,
         oauth_credentials: typing.Optional[_OAuthCredentials] = None,
     ):

modal/mount.py

@@ -851,7 +851,7 @@ async def _create_single_client_dependency_mount(
         print(f"📦 Building {mount_name}.")  # noqa: T201
         requirements = os.path.join(os.path.dirname(__file__), f"builder/{builder_version}.txt")
         cmd = [
-            "uv",
+            os.environ.get("MODAL_UV_PATH", "uv"),
             "pip",
             "install",
             "--strict",
@@ -867,6 +867,11 @@ async def _create_single_client_dependency_mount(
             "--python",
             python_version,
         ]
+        # A directory holding wheels for every pin in the requirements file, for
+        # building mounts where no package index is reachable.
+        find_links = os.environ.get("MODAL_BUILDER_WHEEL_DIR")
+        if find_links:
+            cmd += ["--no-index", "--find-links", find_links]
         # Retry uv pip install on transient failures (e.g. network blips,
         # resource contention).  uv exits with non-zero on recoverable errors
         # like rate limits or connection resets.

modal/sandbox.py

@@ -2279,7 +2279,7 @@ class _Sandbox(_Object, type_prefix="sb"):
             command_router_client = await self._get_command_router_client(task_id)
             snap_v2_resp = await command_router_client.snapshot_memory(
                 sr_pb2.TaskSnapshotMemoryRequest(task_id=task_id, idempotency_key=str(uuid.uuid4())),
-                timeout=55.0,
+                timeout=165.0,
             )
             snapshot_id = snap_v2_resp.snapshot_id
         else:

{modal-1.5.6.dev4.dist-info → modal-1.5.6.dev6.dist-info}/METADATA

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

{modal-1.5.6.dev4.dist-info → modal-1.5.6.dev6.dist-info}/RECORD

@@ -34,7 +34,7 @@ modal/billing.py,sha256=E1-P_P8bJFLp-bTaggYd4BaaViImPB5UdtXiY8VeAZQ,390
 modal/billing.pyi,sha256=4m7VLYNS8IiJ2I3CJx0awvrOM6BILWRVLfdeqtAYr8M,7189
 modal/call_graph.py,sha256=XGALIDn1bLchWo_goyX23bcPjzCZcfqKUo8INIfDapo,1775
 modal/client.py,sha256=CiBsT2XuUuKps5RYc3jwJcfI_VQKK09cbkqeHfHpx3E,21476
-modal/client.pyi,sha256=xkqw20bz3fiI_5-ZnD4A62-enjwyGv30XalTd0tQ61g,22281
+modal/client.pyi,sha256=Am_gLzSxfCCwHwhvS4l0uBzg2Fv-xoSTucuiM1aW9Vc,22281
 modal/cloud_bucket_mount.py,sha256=NrdNV9r9aL3QFrlt-Dhtd7_K3f8v1igrHf2FRwgJ1CI,6827
 modal/cloud_bucket_mount.pyi,sha256=0E8d53pMh2KsFa-rMh_i6LxlzW4cMV8drVmmkPHSqZk,8149
 modal/cls.py,sha256=oF4hswFWv72C7_FTEVqOsLEzMTv43b5bKAScnCR14x0,41737
@@ -56,7 +56,7 @@ modal/image.py,sha256=c0lUSAoU-Ip3g5DGZ0uhdCzoWSQWh1g0i-7Rxo-Sz-I,160
 modal/image.pyi,sha256=R5rdY4P30IEm-F7A2S9CdXa6QYNk-pQwsEun9BKTyLw,61094
 modal/io_streams.py,sha256=3fhhb7SDJ69pVUu9J3PiMLBePD9bpiIxPN05SCzf8FE,29118
 modal/io_streams.pyi,sha256=5uQAgwxN3aouY8UJbRmDnRj9vOId5psRaMrU4IpyQgw,24471
-modal/mount.py,sha256=pWVsUwr3kPiNIHuzzj_fLvr7g9WFsPNGnhHhDiabC_k,36168
+modal/mount.py,sha256=Mks6IcgK5W7q6B5NmWHc95e4az74kSZvAvRLXPT2_KU,36493
 modal/mount.pyi,sha256=5JFXGXvA9uOxh5n-xYL6ruRvrs59K84-LS7BKwwNjHU,16391
 modal/network_file_system.py,sha256=Mr7gWcxqhS-SqBkFfDgt9lt5Sh36vxb3HXpeGF2qCVE,14159
 modal/network_file_system.pyi,sha256=MS4srjGFl-ogqgNLxYRlj6Ik1ObwZKJ0WrneYKMKk-A,17927
@@ -76,7 +76,7 @@ modal/retries.py,sha256=tSGB5bGM5xZZUDXMkuelIEoQJY0vOukOssZhwc6tXAo,5014
 modal/runner.py,sha256=5auTijqKFvMleYfVaK01sRdXd1dWQLilXlSqWx9gMAM,31344
 modal/runner.pyi,sha256=jIdnTwYv5AH-c8weyeCFzJ0hIekw81QqUsxVzXbgkcc,9954
 modal/running_app.py,sha256=xSR1VVlhxEFytmjx2x697_0GpD25Vc9crhp6r117_QY,1145
-modal/sandbox.py,sha256=vdqjP4c7IAq5BIsobmI0IUiDgl7frCI8vBd1E0lj5q0,134875
+modal/sandbox.py,sha256=AOvNw9Uoz40UtHmx2tGZ5B84PEDv6lWbiA-qBT8FBIM,134876
 modal/sandbox.pyi,sha256=shhenvSkuFYqrozmY6AbnmEuS0-Sp-zbNgeNTTQr378,157117
 modal/sandbox_fs.py,sha256=GSuPlrLSdQ7fG7c_TGMd-VWs_s6RqQxMvLivdvC6s4s,27002
 modal/sandbox_fs.pyi,sha256=TJWx8h7x3yRC7KUxeF7q62_0a7w1IHufnJL7AYEojAg,45285
@@ -129,7 +129,7 @@ modal/_utils/docker_utils.py,sha256=k8fkYT6G-X_B3iamjxiSpwSE-k58xGVHtsk2_gR7i2Q,
 modal/_utils/function_utils.py,sha256=Gmirx0Qs-xu41UF0LZjbgzqtis1i8Y73oIZWpJngsf8,26661
 modal/_utils/git_utils.py,sha256=Lat_l4O4hwOYgylEtWup3hyqWT8D7JoCIjCflXcX8BE,3148
 modal/_utils/grpc_testing.py,sha256=udyK_wRXX_yc9eLt8mIZZqx12XlaiUqORxaGNvfI_MM,8697
-modal/_utils/grpc_utils.py,sha256=vGL6JUNRahbe4HRWV_bS1ceCfszzKNVIgAW_bzUNo74,24249
+modal/_utils/grpc_utils.py,sha256=NSoXoYoOsjvWl-x6ccmCid_McfJGCmnpRoZDA8VtcFM,25515
 modal/_utils/hash_utils.py,sha256=WHuMRwmB4fnaM-qmyWXR87C2CinvLnmRoygSzsTEunA,3008
 modal/_utils/http_utils.py,sha256=TO9nnKR0Cc-iWCmkou56wJh9MHgNZwQMosK8WK-GD5Y,3133
 modal/_utils/jwt_utils.py,sha256=KUoqGHMM4ewDyTsTKXPm1wrMu8Z6lp0l8VILHufm484,1354
@@ -142,7 +142,7 @@ modal/_utils/proxy_support.py,sha256=hLA_XojYxzPysOiLqyUbB-SgMLmn_X8WtXTk92xh7g4
 modal/_utils/rand_pb_testing.py,sha256=kwAKIros_g6XPXluiJAktQ79YPkD9SGopKGl83GQ1l0,4361
 modal/_utils/sandbox_fs_utils.py,sha256=rsfo1uDbVSoiY21XERDzsmp-DALcNmlPfJ6jn_2p5T0,15680
 modal/_utils/shell_utils.py,sha256=_2yHrlx4Crx5JWQXECLPQ51kclu8H-U3N7jOkBN7q5U,3390
-modal/_utils/task_command_router_client.py,sha256=Jl3ozfZ1b2w6dRVduVatm7QQn6KnjDEgnOYn6Ov7GXc,46095
+modal/_utils/task_command_router_client.py,sha256=SLdKsNzZbEnIFcFQcZLhtaZpisadIjmBXdoNScADCKU,46119
 modal/_utils/time_utils.py,sha256=Q5NpNyclZWinfpI4WjcBWdqrL81JbiuVuEbQ4NMsqTc,11045
 modal/_vendor/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
 modal/_vendor/a2wsgi_wsgi.py,sha256=RVLIYVJA8a8o96QxEXYT5tuog2zev2S24XOuAVTXZAs,21872
@@ -198,7 +198,7 @@ modal/experimental/flash.py,sha256=m803RsPvMgLCSNJfT_11da1sz9l1BIr1MDxAA_qtK2k,1
 modal/experimental/flash.pyi,sha256=tHS2un-PxndcxV27l7CAWnPhRPmiIs2cCNzKLXBNxJA,8520
 modal/experimental/ipython.py,sha256=kJ6o9wkAY_MiSb7paewI7f1MJAeqdi8TX5pBdhr_mUI,2925
 modal/skills/modal/SKILL.md,sha256=ERhA-zss3OoPXU_d3Qo8-PNrK2QI_ctyhGavou3egd0,5276
-modal-1.5.6.dev4.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.5.6.dev6.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
 modal_docs/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,28
 modal_docs/gen_cli_docs.py,sha256=9-b8vl2EsLWD9zJqpCK8IUi5h44Bjn3i3rSdedZV4bA,6415
 modal_docs/gen_cli_docs_main.py,sha256=UPGr7O1DYTIRLwfINe2rbdh89J3cPVTU1OWL-SjxnOQ,198
@@ -222,10 +222,10 @@ modal_proto/task_command_router_pb2.py,sha256=rMwEVv6DV1Hpv8_hi7SE0zxCkrv6elWgwK
 modal_proto/task_command_router_pb2.pyi,sha256=OQ2jBFSduSEPtP3llAhFhW2dZJJxsqBy3Y5s8Yj40nA,47640
 modal_proto/task_command_router_pb2_grpc.py,sha256=zuFkJgKcswB2ftjnyEgs70dp61VMA7gK0h0uzR3gYFw,42563
 modal_proto/task_command_router_pb2_grpc.pyi,sha256=UjAJFqz9DpOFXP04fVm5lB2eAyTtjOg3oKjfWei8yLU,14262
-modal_version/__init__.py,sha256=44vhXqcK_Swn8S11Mfc4Ss4Kqm7A3Nhi3vo7-C6Pc14,120
+modal_version/__init__.py,sha256=84HgAIM1X72_mUCXkfnyVMdVFz9XeG0k2mySGSL98qA,120
 modal_version/__main__.py,sha256=nLUbubxKx7GXNzJIkTB7M7_u8080LyLM0IS0rzFkC_c,119
-modal-1.5.6.dev4.dist-info/METADATA,sha256=1G6fdSftvRj_xzOuvUZbpwvvsDaHMyt1MTpzsSHi0Lw,2512
-modal-1.5.6.dev4.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-modal-1.5.6.dev4.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.5.6.dev4.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.5.6.dev4.dist-info/RECORD,,
+modal-1.5.6.dev6.dist-info/METADATA,sha256=HTFx36bZnfakJY3u3YzflSeYISJD5vfx4x3eavCtVWQ,2512
+modal-1.5.6.dev6.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
+modal-1.5.6.dev6.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.5.6.dev6.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.5.6.dev6.dist-info/RECORD,,

modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2026
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.5.6.dev4"
+__version__ = "1.5.6.dev6"