modAL 0.74.2__tar.gz → 0.74.4__tar.gz

{modal-0.74.2 → modal-0.74.4}/PKG-INFO

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

{modal-0.74.2 → modal-0.74.4}/modal/client.pyi

@@ -27,7 +27,7 @@ class _Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.2"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.4"
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -85,7 +85,7 @@ class Client:
     _snapshotted: bool
 
     def __init__(
-        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.2"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.74.4"
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-0.74.2 → modal-0.74.4}/modal/functions.pyi

@@ -200,11 +200,11 @@ class Function(
 
     _call_generator_nowait: ___call_generator_nowait_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: ...
         async def aio(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> ReturnType_INNER: ...
 
-    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]: ...
@@ -219,19 +219,19 @@ class Function(
         self, *args: modal._functions.P.args, **kwargs: modal._functions.P.kwargs
     ) -> modal._functions.OriginalReturnType: ...
 
-    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]: ...
         async def aio(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
     _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_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]: ...
         async def aio(self, *args: P_INNER.args, **kwargs: P_INNER.kwargs) -> FunctionCall[ReturnType_INNER]: ...
 
-    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]: ...
 

{modal-0.74.2 → modal-0.74.4}/modal/io_streams.py

@@ -46,17 +46,24 @@ async def _sandbox_logs_iterator(
 
 
 async def _container_process_logs_iterator(
-    process_id: str, file_descriptor: "api_pb2.FileDescriptor.ValueType", client: _Client
-) -> AsyncGenerator[Optional[bytes], None]:
+    process_id: str,
+    file_descriptor: "api_pb2.FileDescriptor.ValueType",
+    client: _Client,
+    last_index: int,
+) -> AsyncGenerator[tuple[Optional[bytes], int], None]:
     req = api_pb2.ContainerExecGetOutputRequest(
-        exec_id=process_id, timeout=55, file_descriptor=file_descriptor, get_raw_bytes=True
+        exec_id=process_id,
+        timeout=55,
+        file_descriptor=file_descriptor,
+        get_raw_bytes=True,
+        last_batch_index=last_index,
     )
     async for batch in client.stub.ContainerExecGetOutput.unary_stream(req):
         if batch.HasField("exit_code"):
-            yield None
+            yield None, batch.batch_index
             break
         for item in batch.items:
-            yield item.message_bytes
+            yield item.message_bytes, batch.batch_index
 
 
 T = TypeVar("T", str, bytes)
@@ -178,18 +185,24 @@ class _StreamReader(Generic[T]):
 
         completed = False
         retries_remaining = 10
+        last_index = 0
         while not completed:
             try:
-                iterator = _container_process_logs_iterator(self._object_id, self._file_descriptor, self._client)
+                iterator = _container_process_logs_iterator(
+                    self._object_id, self._file_descriptor, self._client, last_index
+                )
 
-                async for message in iterator:
+                async for message, batch_index in iterator:
                     if self._stream_type == StreamType.STDOUT and message:
                         print(message.decode("utf-8"), end="")
                     elif self._stream_type == StreamType.PIPE:
                         self._container_process_buffer.append(message)
+
                     if message is None:
                         completed = True
                         break
+                    else:
+                        last_index = batch_index
 
             except (GRPCError, StreamTerminatedError, ClientClosed) as exc:
                 if retries_remaining > 0:

{modal-0.74.2 → modal-0.74.4}/modal/io_streams.pyi

@@ -8,8 +8,8 @@ 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
-) -> collections.abc.AsyncGenerator[typing.Optional[bytes], None]: ...
+    process_id: str, file_descriptor: int, client: modal.client._Client, last_index: int
+) -> collections.abc.AsyncGenerator[tuple[typing.Optional[bytes], int], None]: ...
 
 T = typing.TypeVar("T")
 

{modal-0.74.2 → modal-0.74.4}/modal.egg-info/PKG-INFO

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

{modal-0.74.2 → modal-0.74.4}/modal_proto/api.proto

@@ -1,5 +1,7 @@
 syntax = "proto3";
 
+option go_package = "github.com/modal-labs/modal/go/proto";
+
 package modal.client;
 
 import "modal_proto/options.proto";