modal 1.0.6.dev28__py3-none-any.whl → 1.0.6.dev29__py3-none-any.whl

modal/client.pyi

@@ -31,7 +31,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.6.dev28",
+        version: str = "1.0.6.dev29",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.
@@ -160,7 +160,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.6.dev28",
+        version: str = "1.0.6.dev29",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

modal/container_process.py

@@ -1,6 +1,7 @@
 # Copyright Modal Labs 2024
 import asyncio
 import platform
+import time
 from typing import Generic, Optional, TypeVar
 
 from modal_proto import api_pb2
@@ -21,6 +22,7 @@ class _ContainerProcess(Generic[T]):
     _stdout: _StreamReader[T]
     _stderr: _StreamReader[T]
     _stdin: _StreamWriter
+    _exec_deadline: Optional[float] = None
     _text: bool
     _by_line: bool
     _returncode: Optional[int] = None
@@ -31,11 +33,13 @@ class _ContainerProcess(Generic[T]):
         client: _Client,
         stdout: StreamType = StreamType.PIPE,
         stderr: StreamType = StreamType.PIPE,
+        exec_deadline: Optional[float] = None,
         text: bool = True,
         by_line: bool = False,
     ) -> None:
         self._process_id = process_id
         self._client = client
+        self._exec_deadline = exec_deadline
         self._text = text
         self._by_line = by_line
         self._stdout = _StreamReader[T](
@@ -92,6 +96,11 @@ class _ContainerProcess(Generic[T]):
         """
         if self._returncode is not None:
             return self._returncode
+        if self._exec_deadline and time.monotonic() >= self._exec_deadline:
+            # TODO(matt): In the future, it would be nice to raise a ContainerExecTimeoutError to make it
+            # clear to the user that their sandbox terminated due to a timeout
+            self._returncode = -1
+            return self._returncode
 
         req = api_pb2.ContainerExecWaitRequest(exec_id=self._process_id, timeout=0)
         resp: api_pb2.ContainerExecWaitResponse = await retry_transient_errors(self._client.stub.ContainerExecWait, req)
@@ -102,22 +111,33 @@ class _ContainerProcess(Generic[T]):
 
         return None
 
-    async def wait(self) -> int:
-        """Wait for the container process to finish running. Returns the exit code."""
-
-        if self._returncode is not None:
-            return self._returncode
-
+    async def _wait_for_completion(self) -> int:
         while True:
             req = api_pb2.ContainerExecWaitRequest(exec_id=self._process_id, timeout=10)
             resp: api_pb2.ContainerExecWaitResponse = await retry_transient_errors(
                 self._client.stub.ContainerExecWait, req
             )
             if resp.completed:
-                self._returncode = resp.exit_code
-                return self._returncode
+                return resp.exit_code
+
+    async def wait(self) -> int:
+        """Wait for the container process to finish running. Returns the exit code."""
+        if self._returncode is not None:
+            return self._returncode
+
+        try:
+            timeout = None
+            if self._exec_deadline:
+                timeout = self._exec_deadline - time.monotonic()
+                if timeout <= 0:
+                    raise TimeoutError()
+            self._returncode = await asyncio.wait_for(self._wait_for_completion(), timeout=timeout)
+        except (asyncio.TimeoutError, TimeoutError):
+            self._returncode = -1
+        return self._returncode
 
     async def attach(self):
+        """mdmd:hidden"""
         if platform.system() == "Windows":
             print("interactive exec is not currently supported on Windows.")
             return

modal/container_process.pyi

@@ -31,6 +31,7 @@ class _ContainerProcess(typing.Generic[T]):
     _stdout: modal.io_streams._StreamReader[T]
     _stderr: modal.io_streams._StreamReader[T]
     _stdin: modal.io_streams._StreamWriter
+    _exec_deadline: typing.Optional[float]
     _text: bool
     _by_line: bool
     _returncode: typing.Optional[int]
@@ -41,6 +42,7 @@ class _ContainerProcess(typing.Generic[T]):
         client: modal.client._Client,
         stdout: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
         stderr: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
+        exec_deadline: typing.Optional[float] = None,
         text: bool = True,
         by_line: bool = False,
     ) -> None:
@@ -75,11 +77,14 @@ class _ContainerProcess(typing.Generic[T]):
         """
         ...
 
+    async def _wait_for_completion(self) -> int: ...
     async def wait(self) -> int:
         """Wait for the container process to finish running. Returns the exit code."""
         ...
 
-    async def attach(self): ...
+    async def attach(self):
+        """mdmd:hidden"""
+        ...
 
 SUPERSELF = typing.TypeVar("SUPERSELF", covariant=True)
 
@@ -108,6 +113,7 @@ class ContainerProcess(typing.Generic[T]):
     _stdout: modal.io_streams.StreamReader[T]
     _stderr: modal.io_streams.StreamReader[T]
     _stdin: modal.io_streams.StreamWriter
+    _exec_deadline: typing.Optional[float]
     _text: bool
     _by_line: bool
     _returncode: typing.Optional[int]
@@ -118,6 +124,7 @@ class ContainerProcess(typing.Generic[T]):
         client: modal.client.Client,
         stdout: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
         stderr: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
+        exec_deadline: typing.Optional[float] = None,
         text: bool = True,
         by_line: bool = False,
     ) -> None: ...
@@ -157,6 +164,12 @@ class ContainerProcess(typing.Generic[T]):
 
     poll: __poll_spec[typing_extensions.Self]
 
+    class ___wait_for_completion_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(self, /) -> int: ...
+        async def aio(self, /) -> int: ...
+
+    _wait_for_completion: ___wait_for_completion_spec[typing_extensions.Self]
+
     class __wait_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /) -> int:
             """Wait for the container process to finish running. Returns the exit code."""
@@ -169,7 +182,12 @@ class ContainerProcess(typing.Generic[T]):
     wait: __wait_spec[typing_extensions.Self]
 
     class __attach_spec(typing_extensions.Protocol[SUPERSELF]):
-        def __call__(self, /): ...
-        async def aio(self, /): ...
+        def __call__(self, /):
+            """mdmd:hidden"""
+            ...
+
+        async def aio(self, /):
+            """mdmd:hidden"""
+            ...
 
     attach: __attach_spec[typing_extensions.Self]

modal/sandbox.py

@@ -1,6 +1,7 @@
 # Copyright Modal Labs 2022
 import asyncio
 import os
+import time
 from collections.abc import AsyncGenerator, Sequence
 from typing import TYPE_CHECKING, AsyncIterator, Literal, Optional, Union, overload
 
@@ -49,6 +50,10 @@ _default_image: _Image = _Image.debian_slim()
 # e.g. 'runsc exec ...'. So we use 2**16 as the limit.
 ARG_MAX_BYTES = 2**16
 
+
+# This buffer extends the user-supplied timeout on ContainerExec-related RPCs. This was introduced to
+# give any in-flight status codes/IO data more time to reach the client before the stream is closed.
+CONTAINER_EXEC_TIMEOUT_BUFFER = 5
 if TYPE_CHECKING:
     import modal.app
 
@@ -665,7 +670,16 @@ class _Sandbox(_Object, type_prefix="sb"):
         )
         resp = await retry_transient_errors(self._client.stub.ContainerExec, req)
         by_line = bufsize == 1
-        return _ContainerProcess(resp.exec_id, self._client, stdout=stdout, stderr=stderr, text=text, by_line=by_line)
+        exec_deadline = time.monotonic() + int(timeout) + CONTAINER_EXEC_TIMEOUT_BUFFER if timeout else None
+        return _ContainerProcess(
+            resp.exec_id,
+            self._client,
+            stdout=stdout,
+            stderr=stderr,
+            text=text,
+            exec_deadline=exec_deadline,
+            by_line=by_line,
+        )
 
     async def _experimental_snapshot(self) -> _SandboxSnapshot:
         await self._get_task_id()

{modal-1.0.6.dev28.dist-info → modal-1.0.6.dev29.dist-info}/METADATA

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

{modal-1.0.6.dev28.dist-info → modal-1.0.6.dev29.dist-info}/RECORD

@@ -22,14 +22,14 @@ modal/app.py,sha256=fCKq3TJ2Y5LB2WKNs6pp_5XECNH5avUL01jQljuoYRU,46603
 modal/app.pyi,sha256=Z6wi_dkXywiaM2rvAvguj2Wgu9ZgPjMSLl1nH1a7EYI,42243
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=OwISJvkgMb-rHm9Gc4i-7YcDgGiZgwJ7F_PzwZH7a6Q,16847
-modal/client.pyi,sha256=bOAJKP6U4pNl6nqRcrNKygIFvRoMfAfQZQD1gyL8a8A,15081
+modal/client.pyi,sha256=kOwnZMykQ3S9Yi5-VXdUKycQW9cYb9zfAdbvqdMDsFg,15081
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=-qSfYAQvIoO_l2wsCCGTG5ZUwQieNKXdAO00yP1-LYU,7394
 modal/cls.py,sha256=EFrM949jNXJpmwB2G_1d28b8IpHShfKIEIaiPkZqeOU,39881
 modal/cls.pyi,sha256=_tZ5qrlL-ZDEcD-mf9BZkkNH5XPr4SmGTEQ-RVmqF3I,27772
 modal/config.py,sha256=e8sQ4RgwgJ_45S302vWUWs_wqRlKyEt3tU898RiaDKE,12073
-modal/container_process.py,sha256=PDvjcyZ6eeN8foKQgR0WJ66Sg3lt7OFhK7Y_Akz6k5w,5846
-modal/container_process.pyi,sha256=E81Zqa6OZ8k_I5SXHb2xz3Sn4vd9SEKd5gyNSr7nBW8,5428
+modal/container_process.py,sha256=dfqa6YFRhNQ4XeZ8cS5DVh-VpzfavA2asrXwrLRHYXg,6780
+modal/container_process.pyi,sha256=9m-st3hCUlNN1GOTctfPPvIvoLtEl7FbuGWwif5-7YU,6037
 modal/dict.py,sha256=wVIkHPFvR8WDoh5c6jT0UstZYmJTpCTM8drkwwjLiAc,14387
 modal/dict.pyi,sha256=gs3J7X5yG3J1L6rW0s3_7yRn8qAfY0f4n5-sqaDZY2g,20853
 modal/environments.py,sha256=gHFNLG78bqgizpQ4w_elz27QOqmcgAonFsmLs7NjUJ4,6804
@@ -65,7 +65,7 @@ modal/retries.py,sha256=IvNLDM0f_GLUDD5VgEDoN09C88yoxSrCquinAuxT1Sc,5205
 modal/runner.py,sha256=ostdzYpQb-20tlD6dIq7bpWTkZkOhjJBNuMNektqnJA,24068
 modal/runner.pyi,sha256=lbwLljm1cC8d6PcNvmYQhkE8501V9fg0bYqqKX6G4r4,8489
 modal/running_app.py,sha256=v61mapYNV1-O-Uaho5EfJlryMLvIT9We0amUOSvSGx8,1188
-modal/sandbox.py,sha256=G_QWzIkVMZL7XOYTdblNvMSQ7dy3hOV9ev9OFWpgqn8,37006
+modal/sandbox.py,sha256=NS2ShX-JxsRYczCe-hz7Iu6TKxJq8OXLMWGx04FJHls,37489
 modal/sandbox.pyi,sha256=AiZlmZdYHrlqnT8Ba8K5BxNWI1W_oIIkNMhQHF2zqIU,38469
 modal/schedule.py,sha256=ng0g0AqNY5GQI9KhkXZQ5Wam5G42glbkqVQsNpBtbDE,3078
 modal/scheduler_placement.py,sha256=BAREdOY5HzHpzSBqt6jDVR6YC_jYfHMVqOzkyqQfngU,1235
@@ -148,7 +148,7 @@ modal/requirements/2025.06.txt,sha256=KxDaVTOwatHvboDo4lorlgJ7-n-MfAwbPwxJ0zcJqr
 modal/requirements/PREVIEW.txt,sha256=KxDaVTOwatHvboDo4lorlgJ7-n-MfAwbPwxJ0zcJqrs,312
 modal/requirements/README.md,sha256=9tK76KP0Uph7O0M5oUgsSwEZDj5y-dcUPsnpR0Sc-Ik,854
 modal/requirements/base-images.json,sha256=JYSDAgHTl-WrV_TZW5icY-IJEnbe2eQ4CZ_KN6EOZKU,1304
-modal-1.0.6.dev28.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.0.6.dev29.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
@@ -171,10 +171,10 @@ modal_proto/options_pb2.pyi,sha256=l7DBrbLO7q3Ir-XDkWsajm0d0TQqqrfuX54i4BMpdQg,1
 modal_proto/options_pb2_grpc.py,sha256=1oboBPFxaTEXt9Aw7EAj8gXHDCNMhZD2VXqocC9l_gk,159
 modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0yJSI,247
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-modal_version/__init__.py,sha256=PijnDhVVBPiglC-Nb0a6WJVbSmIXqDnSOkkI41TLZw8,121
+modal_version/__init__.py,sha256=4Q7BJww6Va2uUZa6Qogsj9rOLXqxgVTPBeTz5Xgewsw,121
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal-1.0.6.dev28.dist-info/METADATA,sha256=UBi0UEIjplPCBhy7hGLRlexDvUqXQlqq-oaPM51-8Vk,2462
-modal-1.0.6.dev28.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.0.6.dev28.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.0.6.dev28.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.0.6.dev28.dist-info/RECORD,,
+modal-1.0.6.dev29.dist-info/METADATA,sha256=NZKx4E7tS0ppkOvq5MCO1luFnlsgGJX8YzdHSCxHIdY,2462
+modal-1.0.6.dev29.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.0.6.dev29.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.0.6.dev29.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.0.6.dev29.dist-info/RECORD,,

modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.0.6.dev28"
+__version__ = "1.0.6.dev29"