modal 0.73.9__py3-none-any.whl → 0.73.10__py3-none-any.whl

modal/cli/run.py

@@ -7,6 +7,7 @@ import re
 import shlex
 import sys
 import time
+from dataclasses import dataclass
 from functools import partial
 from typing import Any, Callable, Optional, get_type_hints
 
@@ -35,6 +36,7 @@ class ParameterMetadata(TypedDict):
     default: Any
     annotation: Any
     type_hint: Any
+    kind: Any
 
 
 class AnyParamType(click.ParamType):
@@ -58,7 +60,13 @@ class NoParserAvailable(InvalidError):
     pass
 
 
-def _get_signature(f: Callable[..., Any], is_method: bool = False) -> dict[str, ParameterMetadata]:
+@dataclass
+class FnSignature:
+    parameters: dict[str, ParameterMetadata]
+    has_variadic_args: bool
+
+
+def _get_signature(f: Callable[..., Any], is_method: bool = False) -> FnSignature:
     try:
         type_hints = get_type_hints(f)
     except Exception as exc:
@@ -66,18 +74,29 @@ def _get_signature(f: Callable[..., Any], is_method: bool = False) -> dict[str,
         msg = "Unable to generate command line interface for app entrypoint. See traceback above for details."
         raise ExecutionError(msg) from exc
 
+    has_variadic_args = False
+
     if is_method:
         self = None  # Dummy, doesn't matter
         f = functools.partial(f, self)
+
     signature: dict[str, ParameterMetadata] = {}
     for param in inspect.signature(f).parameters.values():
-        signature[param.name] = {
-            "name": param.name,
-            "default": param.default,
-            "annotation": param.annotation,
-            "type_hint": type_hints.get(param.name, "Any"),
-        }
-    return signature
+        if param.kind == inspect.Parameter.VAR_POSITIONAL:
+            has_variadic_args = True
+        else:
+            signature[param.name] = {
+                "name": param.name,
+                "default": param.default,
+                "annotation": param.annotation,
+                "type_hint": type_hints.get(param.name, "Any"),
+                "kind": param.kind,
+            }
+
+    if has_variadic_args and len(signature) > 0:
+        raise InvalidError("Functions with variable-length positional arguments (*args) cannot have other parameters.")
+
+    return FnSignature(signature, has_variadic_args)
 
 
 def _get_param_type_as_str(annot: Any) -> str:
@@ -96,17 +115,18 @@ def _get_param_type_as_str(annot: Any) -> str:
     return annot_str
 
 
-def _add_click_options(func, signature: dict[str, ParameterMetadata]):
+def _add_click_options(func, parameters: dict[str, ParameterMetadata]):
     """Adds @click.option based on function signature
 
     Kind of like typer, but using options instead of positional arguments
     """
-    for param in signature.values():
+    for param in parameters.values():
         param_type_str = _get_param_type_as_str(param["type_hint"])
         param_name = param["name"].replace("_", "-")
         cli_name = "--" + param_name
         if param_type_str == "bool":
             cli_name += "/--no-" + param_name
+
         parser = option_parsers.get(param_type_str)
         if parser is None:
             msg = f"Parameter `{param_name}` has unparseable annotation: {param['annotation']!r}"
@@ -145,9 +165,15 @@ def _write_local_result(result_path: str, res: Any):
         fid.write(res)
 
 
-def _make_click_function(app, inner: Callable[[dict[str, Any]], Any]):
+def _make_click_function(app, signature: FnSignature, inner: Callable[[tuple[str, ...], dict[str, Any]], Any]):
     @click.pass_context
     def f(ctx, **kwargs):
+        if signature.has_variadic_args:
+            assert len(kwargs) == 0
+            args = ctx.args
+        else:
+            args = ()
+
         show_progress: bool = ctx.obj["show_progress"]
         with enable_output(show_progress):
             with run_app(
@@ -156,7 +182,7 @@ def _make_click_function(app, inner: Callable[[dict[str, Any]], Any]):
                 environment_name=ctx.obj["env"],
                 interactive=ctx.obj["interactive"],
             ):
-                res = inner(kwargs)
+                res = inner(args, kwargs)
 
             if result_path := ctx.obj["result_path"]:
                 _write_local_result(result_path, res)
@@ -168,23 +194,33 @@ def _get_click_command_for_function(app: App, function: Function):
     if function.is_generator:
         raise InvalidError("`modal run` is not supported for generator functions")
 
-    signature: dict[str, ParameterMetadata] = _get_signature(function.info.raw_f)
+    signature = _get_signature(function.info.raw_f)
+
+    def _inner(args, click_kwargs):
+        return function.remote(*args, **click_kwargs)
 
-    def _inner(click_kwargs):
-        return function.remote(**click_kwargs)
+    f = _make_click_function(app, signature, _inner)
 
-    f = _make_click_function(app, _inner)
+    with_click_options = _add_click_options(f, signature.parameters)
 
-    with_click_options = _add_click_options(f, signature)
-    return click.command(with_click_options)
+    if signature.has_variadic_args:
+        return click.command(context_settings={"ignore_unknown_options": True, "allow_extra_args": True})(
+            with_click_options
+        )
+    else:
+        return click.command(with_click_options)
 
 
 def _get_click_command_for_cls(app: App, method_ref: MethodReference):
-    signature: dict[str, ParameterMetadata]
+    parameters: dict[str, ParameterMetadata]
     cls = method_ref.cls
     method_name = method_ref.method_name
 
     cls_signature = _get_signature(cls._get_user_cls())
+
+    if cls_signature.has_variadic_args:
+        raise InvalidError("Modal classes cannot have variable-length positional arguments (*args).")
+
     partial_functions = cls._get_partial_functions()
 
     if method_name in ("*", ""):
@@ -202,27 +238,35 @@ def _get_click_command_for_cls(app: App, method_ref: MethodReference):
     fun_signature = _get_signature(partial_function._get_raw_f(), is_method=True)
 
     # TODO(erikbern): assert there's no overlap?
-    signature = dict(**cls_signature, **fun_signature)  # Pool all arguments
+    parameters = dict(**cls_signature.parameters, **fun_signature.parameters)  # Pool all arguments
 
-    def _inner(click_kwargs):
+    def _inner(args, click_kwargs):
         # unpool class and method arguments
         # TODO(erikbern): this code is a bit hacky
-        cls_kwargs = {k: click_kwargs[k] for k in cls_signature}
-        fun_kwargs = {k: click_kwargs[k] for k in fun_signature}
+        cls_kwargs = {k: click_kwargs[k] for k in cls_signature.parameters}
+        fun_kwargs = {k: click_kwargs[k] for k in fun_signature.parameters}
 
         instance = cls(**cls_kwargs)
         method: Function = getattr(instance, method_name)
-        return method.remote(**fun_kwargs)
+        return method.remote(*args, **fun_kwargs)
+
+    f = _make_click_function(app, fun_signature, _inner)
+    with_click_options = _add_click_options(f, parameters)
 
-    f = _make_click_function(app, _inner)
-    with_click_options = _add_click_options(f, signature)
-    return click.command(with_click_options)
+    if fun_signature.has_variadic_args:
+        return click.command(context_settings={"ignore_unknown_options": True, "allow_extra_args": True})(
+            with_click_options
+        )
+    else:
+        return click.command(with_click_options)
 
 
 def _get_click_command_for_local_entrypoint(app: App, entrypoint: LocalEntrypoint):
     func = entrypoint.info.raw_f
     isasync = inspect.iscoroutinefunction(func)
 
+    signature = _get_signature(func)
+
     @click.pass_context
     def f(ctx, *args, **kwargs):
         if ctx.obj["detach"]:
@@ -231,6 +275,10 @@ def _get_click_command_for_local_entrypoint(app: App, entrypoint: LocalEntrypoin
                 "triggered Modal function alive after the parent process has been killed or disconnected."
             )
 
+        if signature.has_variadic_args:
+            assert len(args) == 0 and len(kwargs) == 0
+            args = ctx.args
+
         show_progress: bool = ctx.obj["show_progress"]
         with enable_output(show_progress):
             with run_app(
@@ -250,8 +298,14 @@ def _get_click_command_for_local_entrypoint(app: App, entrypoint: LocalEntrypoin
             if result_path := ctx.obj["result_path"]:
                 _write_local_result(result_path, res)
 
-    with_click_options = _add_click_options(f, _get_signature(func))
-    return click.command(with_click_options)
+    with_click_options = _add_click_options(f, signature.parameters)
+
+    if signature.has_variadic_args:
+        return click.command(context_settings={"ignore_unknown_options": True, "allow_extra_args": True})(
+            with_click_options
+        )
+    else:
+        return click.command(with_click_options)
 
 
 def _get_runnable_list(all_usable_commands: list[CLICommand]) -> str:

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.9"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.10"
     ): ...
     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.9"
+        self, server_url: str, client_type: int, credentials: typing.Optional[tuple[str, str]], version: str = "0.73.10"
     ): ...
     def is_closed(self) -> bool: ...
     @property

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.73.9.dist-info → modal-0.73.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: modal
-Version: 0.73.9
+Version: 0.73.10
 Summary: Python client library for Modal
 Author: Modal Labs
 Author-email: support@modal.com

{modal-0.73.9.dist-info → modal-0.73.10.dist-info}/RECORD

@@ -21,7 +21,7 @@ modal/app.py,sha256=wRygVSrWH8iIqhDAAl2Ww_RAkz8MCJZ0Jt9qYZCF6SA,44626
 modal/app.pyi,sha256=lxiuWzE_OLb3WHg-H7Pek9DGBuCUzZ55P594VhJL5LA,26113
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=8SQawr7P1PNUCq1UmJMUQXG2jIo4Nmdcs311XqrNLRE,15276
-modal/client.pyi,sha256=UOfACeLizRMYzf2NDFzalr9sLhXAy447M3jSwPxPCbc,7591
+modal/client.pyi,sha256=zquF7hra8lDrBysJUafRuLtmDHnUXpEU1nt9wRDDCUs,7593
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=kNnZrBYVXOhgEXU0rDWk2Hr-bQRrsZkMKDgC-TD_6Bs,31063
@@ -40,7 +40,7 @@ modal/file_io.py,sha256=lcMs_E9Xfm0YX1t9U2wNIBPnqHRxmImqjLW1GHqVmyg,20945
 modal/file_io.pyi,sha256=NTRft1tbPSWf9TlWVeZmTlgB5AZ_Zhu2srWIrWr7brk,9445
 modal/file_pattern_matcher.py,sha256=1cZ4V2wSLiaXqAqStETSwp3bzDD6QZOt6pmmjk3Okz4,6505
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
-modal/functions.pyi,sha256=QYZy3BCjA2y3UC217e3YG-omyG0E1Jx-Uc-sonsyQsE,14288
+modal/functions.pyi,sha256=mtngzj8VlzMOQATe6muBN5oH_Gw9zGKxMKZ56Z-41kU,14288
 modal/gpu.py,sha256=2qZMNnoMrjU-5Bu7fx68pANUAKTtZq0EWEEeBA9OUVQ,7426
 modal/image.py,sha256=Vjsi7wS9dEcoj-7m7_LmvbK5iqEuFz-SHKl2K-qWcew,90952
 modal/image.pyi,sha256=A5mW2dBguEhmRo815Ax1rBIMXTCriu7PqLMHoUPsez8,26372
@@ -125,7 +125,7 @@ modal/cli/launch.py,sha256=pzQt2QlcrbIUU0MVzWWPAvMQ6MCyqsHZ0X9JcV-sY04,3242
 modal/cli/network_file_system.py,sha256=eq3JnwjbfFNsJodIyANHL06ByYc3BSavzdmu8C96cHA,7948
 modal/cli/profile.py,sha256=rLXfjJObfPNjaZvNfHGIKqs7y9bGYyGe-K7V0w-Ni0M,3110
 modal/cli/queues.py,sha256=6gTu76dzBtPN5eQVsLrvQpuru5jI9ZCWK5Eh8J8XhaM,4498
-modal/cli/run.py,sha256=_hYvRwBkrbakN3oAuoiaMdYytBtN4BoryrYxPAVIIvc,20065
+modal/cli/run.py,sha256=hXCvqQM6w7dXz0254q5Sr0UNR5JC6cEA6fBdrcshCcg,21784
 modal/cli/secret.py,sha256=uQpwYrMY98iMCWeZOQTcktOYhPTZ8IHnyealDc2CZqo,4206
 modal/cli/token.py,sha256=mxSgOWakXG6N71hQb1ko61XAR9ZGkTMZD-Txn7gmTac,1924
 modal/cli/utils.py,sha256=hZmjyzcPjDnQSkLvycZD2LhGdcsfdZshs_rOU78EpvI,3717
@@ -171,10 +171,10 @@ modal_proto/options_pb2_grpc.pyi,sha256=CImmhxHsYnF09iENPoe8S4J-n93jtgUYD2JPAc0y
 modal_proto/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 modal_version/__init__.py,sha256=wiJQ53c-OMs0Xf1UeXOxQ7FwlV1VzIjnX6o-pRYZ_Pk,470
 modal_version/__main__.py,sha256=2FO0yYQQwDTh6udt1h-cBnGd1c4ZyHnHSI4BksxzVac,105
-modal_version/_version_generated.py,sha256=RgDn253uA_DeV6d6P40AOPpDJqMMVupp6gXgLMcak24,148
-modal-0.73.9.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-modal-0.73.9.dist-info/METADATA,sha256=BYeidDOAvKaxgE_yMfAun3xjsRB6Q0jGKR8fcs9a0jU,2329
-modal-0.73.9.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-modal-0.73.9.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.73.9.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
-modal-0.73.9.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=bRP1kitLENe-C1R8SFEB0RNXUvVdmynlJRPg8FgsxXA,149
+modal-0.73.10.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.73.10.dist-info/METADATA,sha256=o2yy7RC_d68S0vZZyIem-3gJG0H7EDGGXtmHHcPzmEE,2330
+modal-0.73.10.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+modal-0.73.10.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.73.10.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
+modal-0.73.10.dist-info/RECORD,,

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 = 9  # git: 76a3f59
+build_number = 10  # git: 6951dc1