modal 0.73.67__tar.gz → 0.73.69__tar.gz

{modal-0.73.67 → modal-0.73.69}/PKG-INFO

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

{modal-0.73.67 → modal-0.73.69}/modal/_functions.py

@@ -1597,26 +1597,35 @@ class _FunctionCall(typing.Generic[ReturnType], _Object, type_prefix="fc"):
         fc._is_generator = is_generator
         return fc
 
+    @staticmethod
+    async def gather(*function_calls: "_FunctionCall[Any]") -> list[Any]:
+        """Wait until all Modal FunctionCall objects have results before returning.
 
-async def _gather(*function_calls: _FunctionCall[ReturnType]) -> typing.Sequence[ReturnType]:
-    """Wait until all Modal function calls have results before returning
+        Accepts a variable number of `FunctionCall` objects, as returned by `Function.spawn()`.
 
-    Accepts a variable number of FunctionCall objects as returned by `Function.spawn()`.
+        Returns a list of results from each FunctionCall, or raises an exception
+        from the first failing function call.
 
-    Returns a list of results from each function call, or raises an exception
-    of the first failing function call.
+        Examples:
+
+        ```python notest
+        fc1 = slow_func_1.spawn()
+        fc2 = slow_func_2.spawn()
 
-    E.g.
+        result_1, result_2 = modal.FunctionCall.gather(fc1, fc2)
+        ```
+        """
+        try:
+            return await TaskContext.gather(*[fc.get() for fc in function_calls])
+        except Exception as exc:
+            # TODO: kill all running function calls
+            raise exc
 
-    ```python notest
-    function_call_1 = slow_func_1.spawn()
-    function_call_2 = slow_func_2.spawn()
 
-    result_1, result_2 = gather(function_call_1, function_call_2)
-    ```
-    """
-    try:
-        return await TaskContext.gather(*[fc.get() for fc in function_calls])
-    except Exception as exc:
-        # TODO: kill all running function calls
-        raise exc
+async def _gather(*function_calls: _FunctionCall[ReturnType]) -> typing.Sequence[ReturnType]:
+    """Deprecated: Please use `modal.FunctionCall.gather()` instead."""
+    deprecation_warning(
+        (2025, 2, 24),
+        "`modal.functions.gather()` is deprecated; please use `modal.FunctionCall.gather()` instead.",
+    )
+    return await _FunctionCall.gather(*function_calls)

{modal-0.73.67 → modal-0.73.69}/modal/cli/run.py

@@ -526,6 +526,9 @@ def shell(
         ),
     ),
     pty: Optional[bool] = typer.Option(default=None, help="Run the command using a PTY."),
+    use_module_mode: bool = typer.Option(
+        False, "-m", help="Interpret argument as a Python module path instead of a file/script path"
+    ),
 ):
     """Run a command or interactive shell inside a Modal container.
 
@@ -584,7 +587,7 @@ def shell(
             exec(container_id=container_or_function, command=shlex.split(cmd), pty=pty)
             return
 
-        import_ref = parse_import_ref(container_or_function)
+        import_ref = parse_import_ref(container_or_function, use_module_mode=use_module_mode)
         runnable, all_usable_commands = import_and_filter(
             import_ref, base_cmd="modal shell", accept_local_entrypoint=False, accept_webhook=True
         )

{modal-0.73.67 → modal-0.73.69}/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.73.67"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.69"
     ): ...
     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.73.67"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.69"
     ): ...
     def is_closed(self) -> bool: ...
     @property

{modal-0.73.67 → modal-0.73.69}/modal/functions.pyi

@@ -198,11 +198,11 @@ class Function(
 
     _call_generator_nowait: ___call_generator_nowait_spec[typing_extensions.Self]
 
-    class __remote_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __remote_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.ReturnType, modal._functions.P, typing_extensions.Self]
+    remote: __remote_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, *args, **kwargs) -> typing.Generator[typing.Any, None, None]: ...
@@ -217,19 +217,19 @@ class Function(
         self, *args: modal._functions.P.args, **kwargs: modal._functions.P.kwargs
     ) -> modal._functions.OriginalReturnType: ...
 
-    class ___experimental_spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class ___experimental_spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.ReturnType, modal._functions.P, typing_extensions.Self
+        modal._functions.P, modal._functions.ReturnType, typing_extensions.Self
     ]
 
-    class __spawn_spec(typing_extensions.Protocol[ReturnType_INNER, P_INNER, SUPERSELF]):
+    class __spawn_spec(typing_extensions.Protocol[P_INNER, ReturnType_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.ReturnType, modal._functions.P, typing_extensions.Self]
+    spawn: __spawn_spec[modal._functions.P, modal._functions.ReturnType, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]: ...
 
@@ -319,12 +319,14 @@ class FunctionCall(typing.Generic[modal._functions.ReturnType], modal.object.Obj
 
     from_id: __from_id_spec
 
+    class __gather_spec(typing_extensions.Protocol):
+        def __call__(self, *function_calls: FunctionCall[typing.Any]) -> list[typing.Any]: ...
+        async def aio(self, *function_calls: FunctionCall[typing.Any]) -> list[typing.Any]: ...
+
+    gather: __gather_spec
+
 class __gather_spec(typing_extensions.Protocol):
-    def __call__(
-        self, *function_calls: FunctionCall[modal._functions.ReturnType]
-    ) -> typing.Sequence[modal._functions.ReturnType]: ...
-    async def aio(
-        self, *function_calls: FunctionCall[modal._functions.ReturnType]
-    ) -> typing.Sequence[modal._functions.ReturnType]: ...
+    def __call__(self, *function_calls) -> typing.Sequence[modal._functions.ReturnType]: ...
+    async def aio(self, *function_calls) -> typing.Sequence[modal._functions.ReturnType]: ...
 
 gather: __gather_spec

{modal-0.73.67 → modal-0.73.69}/modal.egg-info/PKG-INFO

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

{modal-0.73.67 → modal-0.73.69}/modal_version/_version_generated.py

@@ -1,4 +1,4 @@
 # Copyright Modal Labs 2025
 
 # Note: Reset this value to -1 whenever you make a minor `0.X` release of the client.
-build_number = 67  # git: 54fbd18
+build_number = 69  # git: f83977d