modal 1.1.2.dev36__tar.gz → 1.1.2.dev37__tar.gz

{modal-1.1.2.dev36 → modal-1.1.2.dev37}/PKG-INFO

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

{modal-1.1.2.dev36 → modal-1.1.2.dev37}/modal/_functions.py

@@ -1564,12 +1564,13 @@ Use the `Function.get_web_url()` method instead.
             raise InvalidError("A generator function cannot be called with `.spawn_map(...)`.")
 
         assert self._function_name
-        function_call_id = await _spawn_map_invocation(
+        function_call_id, num_inputs = await _spawn_map_invocation(
             self,
             input_queue,
             self.client,
         )
-        fc: _FunctionCall[ReturnType] = _FunctionCall._new_hydrated(function_call_id, self.client, None)
+        metadata = api_pb2.FunctionCallFromIdResponse(function_call_id=function_call_id, num_inputs=num_inputs)
+        fc: _FunctionCall[ReturnType] = _FunctionCall._new_hydrated(function_call_id, self.client, metadata)
         return fc
 
     async def _call_function(self, args, kwargs) -> ReturnType:
@@ -1833,10 +1834,24 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
     """
 
     _is_generator: bool = False
+    _num_inputs: Optional[int] = None
 
     def _invocation(self):
         return _Invocation(self.client.stub, self.object_id, self.client)
 
+    def _hydrate_metadata(self, metadata: Optional[Message]):
+        if not metadata:
+            return
+        assert isinstance(metadata, api_pb2.FunctionCallFromIdResponse)
+        self._num_inputs = metadata.num_inputs
+
+    @live_method
+    async def num_inputs(self) -> int:
+        """Get the number of inputs in the function call."""
+        # Should have been hydrated.
+        assert self._num_inputs is not None
+        return self._num_inputs
+
     async def get(self, timeout: Optional[float] = None, *, index: int = 0) -> ReturnType:
         """Get the result of the index-th input of the function call.
         `.spawn()` calls have a single output, so only specifying `index=0` is valid.
@@ -1902,7 +1917,15 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
         if client is None:
             client = await _Client.from_env()
 
-        fc: _FunctionCall[Any] = _FunctionCall._new_hydrated(function_call_id, client, None)
+        async def _load(self: _FunctionCall, resolver: Resolver, existing_object_id: Optional[str]):
+            request = api_pb2.FunctionCallFromIdRequest(function_call_id=function_call_id)
+            resp = await retry_transient_errors(resolver.client.stub.FunctionCallFromId, request)
+            self._hydrate(function_call_id, resolver.client, resp)
+
+        rep = f"FunctionCall.from_id({function_call_id!r})"
+        fc: _FunctionCall[Any] = _FunctionCall._from_loader(_load, rep, hydrate_lazily=True)
+        # We already know the object ID, so we can set it directly
+        fc._object_id = function_call_id
         return fc
 
     @staticmethod

{modal-1.1.2.dev36 → modal-1.1.2.dev37}/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.2.dev36",
+        version: str = "1.1.2.dev37",
     ):
         """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.2.dev36",
+        version: str = "1.1.2.dev37",
     ):
         """mdmd:hidden
         The Modal client object is not intended to be instantiated directly by users.

{modal-1.1.2.dev36 → modal-1.1.2.dev37}/modal/functions.pyi

@@ -738,12 +738,25 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
     """
 
     _is_generator: bool
+    _num_inputs: typing.Optional[int]
 
     def __init__(self, *args, **kwargs):
         """mdmd:hidden"""
         ...
 
     def _invocation(self): ...
+    def _hydrate_metadata(self, metadata: typing.Optional[google.protobuf.message.Message]): ...
+
+    class __num_inputs_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(self, /) -> int:
+            """Get the number of inputs in the function call."""
+            ...
+
+        async def aio(self, /) -> int:
+            """Get the number of inputs in the function call."""
+            ...
+
+    num_inputs: __num_inputs_spec[typing_extensions.Self]
 
     class __get_spec(typing_extensions.Protocol[ReturnType_INNER, SUPERSELF]):
         def __call__(self, /, timeout: typing.Optional[float] = None, *, index: int = 0) -> ReturnType_INNER:

{modal-1.1.2.dev36 → modal-1.1.2.dev37}/modal/parallel_map.py

@@ -271,10 +271,21 @@ class AsyncInputPumper(InputPumper):
     ):
         super().__init__(client, input_queue=input_queue, function=function, function_call_id=function_call_id)
 
+    async def pump_inputs(self):
+        async for _ in super().pump_inputs():
+            pass
+        request = api_pb2.FunctionFinishInputsRequest(
+            function_id=self.function.object_id,
+            function_call_id=self.function_call_id,
+            num_inputs=self.inputs_sent,
+        )
+        await retry_transient_errors(self.client.stub.FunctionFinishInputs, request, max_retries=None)
+        yield
+
 
 async def _spawn_map_invocation(
     function: "modal.functions._Function", raw_input_queue: _SynchronizedQueue, client: "modal.client._Client"
-) -> str:
+) -> tuple[str, int]:
     assert client.stub
     request = api_pb2.FunctionMapRequest(
         function_id=function.object_id,
@@ -340,7 +351,7 @@ async def _spawn_map_invocation(
     )
     log_debug_stats_task.cancel()
     await log_debug_stats_task
-    return function_call_id
+    return function_call_id, inputs_created
 
 
 async def _map_invocation(

{modal-1.1.2.dev36 → modal-1.1.2.dev37}/modal/parallel_map.pyi

@@ -136,9 +136,11 @@ class AsyncInputPumper(InputPumper):
         """Initialize self.  See help(type(self)) for accurate signature."""
         ...
 
+    def pump_inputs(self): ...
+
 async def _spawn_map_invocation(
     function: modal._functions._Function, raw_input_queue: _SynchronizedQueue, client: modal.client._Client
-) -> str: ...
+) -> tuple[str, int]: ...
 def _map_invocation(
     function: modal._functions._Function,
     raw_input_queue: _SynchronizedQueue,

{modal-1.1.2.dev36 → modal-1.1.2.dev37}/modal.egg-info/PKG-INFO

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

{modal-1.1.2.dev36 → modal-1.1.2.dev37}/modal_version/__init__.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 """Supplies the current version of the modal client library."""
 
-__version__ = "1.1.2.dev36"
+__version__ = "1.1.2.dev37"