modal 1.1.5.dev49__tar.gz → 1.1.5.dev51__tar.gz

{modal-1.1.5.dev49 → modal-1.1.5.dev51}/PKG-INFO

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

{modal-1.1.5.dev49 → modal-1.1.5.dev51}/modal/_output.py

@@ -35,7 +35,7 @@ from modal._utils.time_utils import timestamp_to_localized_str
 from modal_proto import api_pb2
 
 from ._utils.grpc_utils import RETRYABLE_GRPC_STATUS_CODES, retry_transient_errors
-from ._utils.shell_utils import stream_from_stdin
+from ._utils.shell_utils import stream_from_stdin, write_to_fd
 from .client import _Client
 from .config import logger
 
@@ -507,17 +507,32 @@ async def put_pty_content(log: api_pb2.TaskLogs, stdout):
         # because the progress spinner can't interfere with output.
 
         data = log.data.encode("utf-8")
-        written = 0
-        n_retries = 0
-        while written < len(data):
-            try:
-                written += stdout.buffer.write(data[written:])
-                stdout.flush()
-            except BlockingIOError:
-                if n_retries >= 5:
-                    raise
-                n_retries += 1
-                await asyncio.sleep(0.1)
+        # Non-blocking terminals can fill the kernel buffer on output bursts, making flush() raise
+        # BlockingIOError (EAGAIN) and appear frozen until a key is pressed (this happened e.g. when
+        # printing large data from a pdb breakpoint). If stdout has a real fd, we await a
+        # non-blocking fd write (write_to_fd) instead.
+        fd = None
+        try:
+            if hasattr(stdout, "fileno"):
+                fd = stdout.fileno()
+        except Exception:
+            fd = None
+
+        if fd is not None:
+            await write_to_fd(fd, data)
+        else:
+            # For streams without fileno(), use the normal write/flush path.
+            written = 0
+            n_retries = 0
+            while written < len(data):
+                try:
+                    written += stdout.buffer.write(data[written:])
+                    stdout.flush()
+                except BlockingIOError:
+                    if n_retries >= 5:
+                        raise
+                    n_retries += 1
+                    await asyncio.sleep(0.1)
     else:
         # `stdout` isn't always buffered (e.g. %%capture in Jupyter notebooks redirects it to
         # io.StringIO).

{modal-1.1.5.dev49 → modal-1.1.5.dev51}/modal/client.pyi

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

{modal-1.1.5.dev49 → modal-1.1.5.dev51}/modal/functions.pyi

@@ -450,7 +450,7 @@ class Function(
 
     _call_generator: ___call_generator_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER:
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
@@ -459,7 +459,7 @@ class Function(
             """Calls the function remotely, executing it with the given arguments and returning the execution's result."""
             ...
 
-    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, /, *args, **kwargs) -> typing.Generator[typing.Any, None, None]:
@@ -486,7 +486,7 @@ class Function(
         """
         ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """[Experimental] Calls the function with the given arguments, without waiting for the results.
 
@@ -510,7 +510,7 @@ class Function(
             ...
 
     _experimental_spawn: ___experimental_spawn_spec[
-        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
+        modal._functions.ReturnType, modal._functions.P, typing_extensions.Self
     ]
 
     class ___spawn_map_inner_spec(typing_extensions.Protocol[P_INNER, SUPERSELF]):
@@ -519,7 +519,7 @@ class Function(
 
     _spawn_map_inner: ___spawn_map_inner_spec[modal._functions.P, typing_extensions.Self]
 
-    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
         def __call__(self, /, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]:
             """Calls the function with the given arguments, without waiting for the results.
 
@@ -540,7 +540,7 @@ class Function(
             """
             ...
 
-    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.ReturnType, modal._functions.P, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]:
         """Return the inner Python object wrapped by this Modal Function."""

{modal-1.1.5.dev49 → modal-1.1.5.dev51}/modal.egg-info/PKG-INFO

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

{modal-1.1.5.dev49 → modal-1.1.5.dev51}/modal_proto/api.proto

@@ -1345,6 +1345,14 @@ message FlashProxyUpstreamRequest {
   double timestamp = 2; 
 }
 
+message FlashSetTargetSlotsMetricsRequest {
+  // TODO(claudia): add other metrics to use in autoscaling decisions
+  string function_id = 1;
+  uint32 target_slots = 2;
+}
+
+message FlashSetTargetSlotsMetricsResponse {}
+
 message Function {
   string module_name = 1;
   string function_name = 2;
@@ -3629,6 +3637,7 @@ service ModalClient {
   rpc FlashContainerDeregister(FlashContainerDeregisterRequest) returns (google.protobuf.Empty);
   rpc FlashContainerList(FlashContainerListRequest) returns (FlashContainerListResponse);
   rpc FlashContainerRegister(FlashContainerRegisterRequest) returns (FlashContainerRegisterResponse);
+  rpc FlashSetTargetSlotsMetrics(FlashSetTargetSlotsMetricsRequest) returns (FlashSetTargetSlotsMetricsResponse);
 
   // Functions
   rpc FunctionAsyncInvoke(FunctionAsyncInvokeRequest) returns (FunctionAsyncInvokeResponse);

{modal-1.1.5.dev49 → modal-1.1.5.dev51}/modal_proto/api_grpc.py

@@ -262,6 +262,10 @@ class ModalClientBase(abc.ABC):
     async def FlashContainerRegister(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.FlashContainerRegisterRequest, modal_proto.api_pb2.FlashContainerRegisterResponse]') -> None:
         pass
 
+    @abc.abstractmethod
+    async def FlashSetTargetSlotsMetrics(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.FlashSetTargetSlotsMetricsRequest, modal_proto.api_pb2.FlashSetTargetSlotsMetricsResponse]') -> None:
+        pass
+
     @abc.abstractmethod
     async def FunctionAsyncInvoke(self, stream: 'grpclib.server.Stream[modal_proto.api_pb2.FunctionAsyncInvokeRequest, modal_proto.api_pb2.FunctionAsyncInvokeResponse]') -> None:
         pass
@@ -1070,6 +1074,12 @@ class ModalClientBase(abc.ABC):
                 modal_proto.api_pb2.FlashContainerRegisterRequest,
                 modal_proto.api_pb2.FlashContainerRegisterResponse,
             ),
+            '/modal.client.ModalClient/FlashSetTargetSlotsMetrics': grpclib.const.Handler(
+                self.FlashSetTargetSlotsMetrics,
+                grpclib.const.Cardinality.UNARY_UNARY,
+                modal_proto.api_pb2.FlashSetTargetSlotsMetricsRequest,
+                modal_proto.api_pb2.FlashSetTargetSlotsMetricsResponse,
+            ),
             '/modal.client.ModalClient/FunctionAsyncInvoke': grpclib.const.Handler(
                 self.FunctionAsyncInvoke,
                 grpclib.const.Cardinality.UNARY_UNARY,
@@ -2102,6 +2112,12 @@ class ModalClientStub:
             modal_proto.api_pb2.FlashContainerRegisterRequest,
             modal_proto.api_pb2.FlashContainerRegisterResponse,
         )
+        self.FlashSetTargetSlotsMetrics = grpclib.client.UnaryUnaryMethod(
+            channel,
+            '/modal.client.ModalClient/FlashSetTargetSlotsMetrics',
+            modal_proto.api_pb2.FlashSetTargetSlotsMetricsRequest,
+            modal_proto.api_pb2.FlashSetTargetSlotsMetricsResponse,
+        )
         self.FunctionAsyncInvoke = grpclib.client.UnaryUnaryMethod(
             channel,
             '/modal.client.ModalClient/FunctionAsyncInvoke',