modal 1.0.6.dev46__py3-none-any.whl → 1.0.6.dev50__py3-none-any.whl

modal/cli/run.py

@@ -207,7 +207,7 @@ def _make_click_function(app, signature: CliRunnableSignature, inner: Callable[[
     return f
 
 
-def _get_click_command_for_function(app: App, function: Function):
+def _get_click_command_for_function(app: App, function: Function, ctx: click.Context):
     if function.is_generator:
         raise InvalidError("`modal run` is not supported for generator functions")
 
@@ -216,7 +216,10 @@ def _get_click_command_for_function(app: App, function: Function):
     signature: CliRunnableSignature = _get_cli_runnable_signature(sig, type_hints)
 
     def _inner(args, click_kwargs):
-        return function.remote(*args, **click_kwargs)
+        if ctx.obj["detach"]:
+            return function.spawn(*args, **click_kwargs).get()
+        else:
+            return function.remote(*args, **click_kwargs)
 
     f = _make_click_function(app, signature, _inner)
 
@@ -230,7 +233,7 @@ def _get_click_command_for_function(app: App, function: Function):
         return click.command(with_click_options)
 
 
-def _get_click_command_for_cls(app: App, method_ref: MethodReference):
+def _get_click_command_for_cls(app: App, method_ref: MethodReference, ctx: click.Context):
     parameters: dict[str, ParameterMetadata]
     cls = method_ref.cls
     method_name = method_ref.method_name
@@ -271,7 +274,10 @@ def _get_click_command_for_cls(app: App, method_ref: MethodReference):
 
         instance = cls(**cls_kwargs)
         method: Function = getattr(instance, method_name)
-        return method.remote(*args, **fun_kwargs)
+        if ctx.obj["detach"]:
+            return method.spawn(*args, **fun_kwargs).get()
+        else:
+            return method.remote(*args, **fun_kwargs)
 
     f = _make_click_function(app, fun_signature, _inner)
     with_click_options = _add_click_options(f, parameters)
@@ -376,9 +382,9 @@ class RunGroup(click.Group):
         if isinstance(runnable, LocalEntrypoint):
             click_command = _get_click_command_for_local_entrypoint(app, runnable)
         elif isinstance(runnable, Function):
-            click_command = _get_click_command_for_function(app, runnable)
+            click_command = _get_click_command_for_function(app, runnable, ctx)
         elif isinstance(runnable, MethodReference):
-            click_command = _get_click_command_for_cls(app, runnable)
+            click_command = _get_click_command_for_cls(app, runnable, ctx)
         else:
             # This should be unreachable...
             raise ValueError(f"{runnable} is neither function, local entrypoint or class/method")

modal/client.pyi

@@ -33,7 +33,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "1.0.6.dev46",
+        version: str = "1.0.6.dev50",
     ):
         """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.0.6.dev46",
+        version: str = "1.0.6.dev50",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

modal/container_process.py

@@ -50,6 +50,7 @@ class _ContainerProcess(Generic[T]):
             stream_type=stdout,
             text=text,
             by_line=by_line,
+            deadline=exec_deadline,
         )
         self._stderr = _StreamReader[T](
             api_pb2.FILE_DESCRIPTOR_STDERR,
@@ -59,6 +60,7 @@ class _ContainerProcess(Generic[T]):
             stream_type=stderr,
             text=text,
             by_line=by_line,
+            deadline=exec_deadline,
         )
         self._stdin = _StreamWriter(process_id, "container_process", self._client)
 

modal/io_streams.py

@@ -1,5 +1,6 @@
 # Copyright Modal Labs 2022
 import asyncio
+import time
 from collections.abc import AsyncGenerator, AsyncIterator
 from typing import (
     TYPE_CHECKING,
@@ -50,6 +51,7 @@ async def _container_process_logs_iterator(
     file_descriptor: "api_pb2.FileDescriptor.ValueType",
     client: _Client,
     last_index: int,
+    deadline: Optional[float] = None,
 ) -> AsyncGenerator[tuple[Optional[bytes], int], None]:
     req = api_pb2.ContainerExecGetOutputRequest(
         exec_id=process_id,
@@ -58,7 +60,18 @@ async def _container_process_logs_iterator(
         get_raw_bytes=True,
         last_batch_index=last_index,
     )
-    async for batch in client.stub.ContainerExecGetOutput.unary_stream(req):
+
+    stream = client.stub.ContainerExecGetOutput.unary_stream(req)
+    while True:
+        # Check deadline before attempting to receive the next batch
+        try:
+            remaining = (deadline - time.monotonic()) if deadline else None
+            batch = await asyncio.wait_for(stream.__anext__(), timeout=remaining)
+        except asyncio.TimeoutError:
+            yield None, -1
+            break
+        except StopAsyncIteration:
+            break
         if batch.HasField("exit_code"):
             yield None, batch.batch_index
             break
@@ -102,6 +115,7 @@ class _StreamReader(Generic[T]):
         stream_type: StreamType = StreamType.PIPE,
         text: bool = True,
         by_line: bool = False,
+        deadline: Optional[float] = None,
     ) -> None:
         """mdmd:hidden"""
         self._file_descriptor = file_descriptor
@@ -111,6 +125,7 @@ class _StreamReader(Generic[T]):
         self._stream = None
         self._last_entry_id: str = ""
         self._line_buffer = b""
+        self._deadline = deadline
 
         # Sandbox logs are streamed to the client as strings, so StreamReaders reading
         # them must have text mode enabled.
@@ -187,11 +202,12 @@ class _StreamReader(Generic[T]):
         retries_remaining = 10
         last_index = 0
         while not completed:
+            if self._deadline and time.monotonic() >= self._deadline:
+                break
             try:
                 iterator = _container_process_logs_iterator(
-                    self._object_id, self._file_descriptor, self._client, last_index
+                    self._object_id, self._file_descriptor, self._client, last_index, self._deadline
                 )
-
                 async for message, batch_index in iterator:
                     if self._stream_type == StreamType.STDOUT and message:
                         print(message.decode("utf-8"), end="")

modal/io_streams.pyi

@@ -8,7 +8,11 @@ def _sandbox_logs_iterator(
     sandbox_id: str, file_descriptor: int, last_entry_id: str, client: modal.client._Client
 ) -> collections.abc.AsyncGenerator[tuple[typing.Optional[bytes], str], None]: ...
 def _container_process_logs_iterator(
-    process_id: str, file_descriptor: int, client: modal.client._Client, last_index: int
+    process_id: str,
+    file_descriptor: int,
+    client: modal.client._Client,
+    last_index: int,
+    deadline: typing.Optional[float] = None,
 ) -> collections.abc.AsyncGenerator[tuple[typing.Optional[bytes], int], None]: ...
 
 T = typing.TypeVar("T")
@@ -46,6 +50,7 @@ class _StreamReader(typing.Generic[T]):
         stream_type: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
         text: bool = True,
         by_line: bool = False,
+        deadline: typing.Optional[float] = None,
     ) -> None:
         """mdmd:hidden"""
         ...
@@ -211,6 +216,7 @@ class StreamReader(typing.Generic[T]):
         stream_type: modal.stream_type.StreamType = modal.stream_type.StreamType.PIPE,
         text: bool = True,
         by_line: bool = False,
+        deadline: typing.Optional[float] = None,
     ) -> None:
         """mdmd:hidden"""
         ...

modal/sandbox.py

@@ -50,10 +50,11 @@ _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
 

{modal-1.0.6.dev46.dist-info → modal-1.0.6.dev50.dist-info}/METADATA

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

{modal-1.0.6.dev46.dist-info → modal-1.0.6.dev50.dist-info}/RECORD

@@ -22,13 +22,13 @@ modal/app.py,sha256=U0sPiHpphcRHLnoLYh2IrU2RSpRFX9BE5uHb7h42STs,47478
 modal/app.pyi,sha256=cXiSTu2bwu6csAUdkOlh7mr9tPvtaS2qWSEhlC1UxAg,43787
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=5QyM7VJjsFbHf6E91ar3A2KY9mx03wdtGlNJvfTKUVs,17087
-modal/client.pyi,sha256=XrFEHUFGAKbIeQugGthiLTV7TI3SPBhAdPAUKOsUXbM,15270
+modal/client.pyi,sha256=CSXv8f_xO-nkEZ7u6VyimMmdBlQZ2UBEFCeGpIKvCpg,15270
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=-qSfYAQvIoO_l2wsCCGTG5ZUwQieNKXdAO00yP1-LYU,7394
 modal/cls.py,sha256=B5EtzpBXemH718YvgXaYjuTKvairvqfXJ7IwLZ_6vVA,40034
 modal/cls.pyi,sha256=_tZ5qrlL-ZDEcD-mf9BZkkNH5XPr4SmGTEQ-RVmqF3I,27772
 modal/config.py,sha256=FqVewLPVVR4feq_46JBENiCzqTuXKpnvQZxaeWbS39g,12009
-modal/container_process.py,sha256=dfqa6YFRhNQ4XeZ8cS5DVh-VpzfavA2asrXwrLRHYXg,6780
+modal/container_process.py,sha256=1m4NPg0lgZmlG9OTkhHbjafqlqoo4lLv-A-X5lV21yo,6852
 modal/container_process.pyi,sha256=9m-st3hCUlNN1GOTctfPPvIvoLtEl7FbuGWwif5-7YU,6037
 modal/dict.py,sha256=wVIkHPFvR8WDoh5c6jT0UstZYmJTpCTM8drkwwjLiAc,14387
 modal/dict.pyi,sha256=gs3J7X5yG3J1L6rW0s3_7yRn8qAfY0f4n5-sqaDZY2g,20853
@@ -43,8 +43,8 @@ modal/functions.pyi,sha256=FJe_91dSrMCRNVT-YV1UhtxFKzIvL_C5q8xdk08-wT8,34840
 modal/gpu.py,sha256=Fe5ORvVPDIstSq1xjmM6OoNgLYFWvogP9r5BgmD3hYg,6769
 modal/image.py,sha256=qTJ6pTcLfYRh112wId7CCNWWmm077w6JoIqxE8BiCoo,102261
 modal/image.pyi,sha256=TVy-rnSAP2WgQ5zf_sQLFzb-99Qg9LiQNGXR9psFA_o,68107
-modal/io_streams.py,sha256=FUDpBsVK8isqwyC7DtAcQZhaHlMFSaNZGhYJOg-SFW0,15590
-modal/io_streams.pyi,sha256=5b3b93ztZeR8IpJtNIGffX24QLPgocE4-gAps8y7CKU,13824
+modal/io_streams.py,sha256=25ifqMoixhQ3brpnvK2E5z-5n2MOqtYxh8X1tXbahQc,16204
+modal/io_streams.pyi,sha256=aOun_jUFKHSJyUY6-7gKvNoxzcULsa8_hxdtEO7v-gk,13980
 modal/mount.py,sha256=q-pPeVxAmte-G_LDpbFwaNs2Rb2MIpscfnCXzkhxrOI,36734
 modal/mount.pyi,sha256=n6AuS8J3bTCQj750nVZZdVBvzCAlSM2fyxAt_5LLFik,20264
 modal/network_file_system.py,sha256=92U94Wk2fP40LlgLDIHkTqQ-zc21YxaG6SdFQy8SudU,14731
@@ -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=q7kpGNustlL6Lw7KQbzhw_XwDFn0qBfCoEP7lTW3wYY,37583
+modal/sandbox.py,sha256=hKuGVBB-JTn-Oq4hCxNS3rR6ismQ_TgcSKZv5--iDz8,37584
 modal/sandbox.pyi,sha256=AyROza8ZUUxs6MO1f3l8zDjTkp6O46H132xUwBUixIc,38565
 modal/schedule.py,sha256=ng0g0AqNY5GQI9KhkXZQ5Wam5G42glbkqVQsNpBtbDE,3078
 modal/scheduler_placement.py,sha256=BAREdOY5HzHpzSBqt6jDVR6YC_jYfHMVqOzkyqQfngU,1235
@@ -131,7 +131,7 @@ modal/cli/launch.py,sha256=0_sBu6bv2xJEPWi-rbGS6Ri9ggnkWQvrGlgpYSUBMyY,3097
 modal/cli/network_file_system.py,sha256=1_BF95WPLHh7x37lr0JBx5nS8NsKXCDZKt0L2F5fHgo,8104
 modal/cli/profile.py,sha256=0TYhgRSGUvQZ5LH9nkl6iZllEvAjDniES264dE57wOM,3201
 modal/cli/queues.py,sha256=1OzC9HdCkbNz6twF3US4FZmIhuVRQ01GOfBY42ux61A,4533
-modal/cli/run.py,sha256=nicjV2Ei-UxH9bcilUPeqlv1b15TSHAermaoaDJVBxc,24678
+modal/cli/run.py,sha256=96m6fpJKbjtva4xzJut0pxS36Z5WCMq0umpAry96im0,24946
 modal/cli/secret.py,sha256=2bngl3Gb6THXkQ2eWZIN9pOHeOFJqiSNo_waUCVYgns,6611
 modal/cli/token.py,sha256=NAmQzKBfEHkcldWKeFxAVIqQBoo1RTp7_A4yc7-8qM0,1911
 modal/cli/utils.py,sha256=p3ru9mlrvyCg6WWUcTWIJfZtYN3-MsXio_vy3dJ_8WU,3302
@@ -151,7 +151,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.dev46.dist-info/licenses/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-1.0.6.dev50.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
@@ -174,10 +174,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=0WqZMgsOL5_G5EGQHJemZ47NHtj2QHvSoYKIh-b50uE,121
+modal_version/__init__.py,sha256=K2p8aB57qu9ubXiiRDFcIGXUpyyqBFqs1eiMIu3nRhU,121
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal-1.0.6.dev46.dist-info/METADATA,sha256=p5E_YxlzIzOOrExGLNTD5n1ybGVVi7zrz7aYFVy7Y3o,2462
-modal-1.0.6.dev46.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
-modal-1.0.6.dev46.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-1.0.6.dev46.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-1.0.6.dev46.dist-info/RECORD,,
+modal-1.0.6.dev50.dist-info/METADATA,sha256=uQyufZ5YxBlR7YhSg_hUGdpcUpjwTinnw4ITBYt0Enc,2462
+modal-1.0.6.dev50.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+modal-1.0.6.dev50.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-1.0.6.dev50.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-1.0.6.dev50.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.dev46"
+__version__ = "1.0.6.dev50"