modal 1.0.6.dev46__tar.gz → 1.0.6.dev50__tar.gz

{modal-1.0.6.dev46 → modal-1.0.6.dev50}/PKG-INFO

@@ -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 → modal-1.0.6.dev50}/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-1.0.6.dev46 → modal-1.0.6.dev50}/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-1.0.6.dev46 → modal-1.0.6.dev50}/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-1.0.6.dev46 → modal-1.0.6.dev50}/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-1.0.6.dev46 → modal-1.0.6.dev50}/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-1.0.6.dev46 → modal-1.0.6.dev50}/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 → modal-1.0.6.dev50}/modal.egg-info/PKG-INFO

@@ -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 → modal-1.0.6.dev50}/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"