modal 0.73.0__py3-none-any.whl → 0.73.1__py3-none-any.whl

modal/cli/import_refs.py

@@ -109,6 +109,14 @@ class CLICommand:
     names: list[str]
     runnable: Runnable
     is_web_endpoint: bool
+    priority: int
+
+
+class AutoRunPriority:
+    MODULE_LOCAL_ENTRYPOINT = 0
+    MODULE_FUNCTION = 1
+    APP_LOCAL_ENTRYPOINT = 2
+    APP_FUNCTION = 3
 
 
 def list_cli_commands(
@@ -127,17 +135,21 @@ def list_cli_commands(
     apps = cast(list[tuple[str, App]], inspect.getmembers(module, lambda x: isinstance(x, App)))
 
     all_runnables: dict[Runnable, list[str]] = defaultdict(list)
+    priorities: dict[Runnable, int] = defaultdict(lambda: AutoRunPriority.APP_FUNCTION)
     for app_name, app in apps:
         for name, local_entrypoint in app.registered_entrypoints.items():
             all_runnables[local_entrypoint].append(f"{app_name}.{name}")
+            priorities[local_entrypoint] = AutoRunPriority.APP_LOCAL_ENTRYPOINT
         for name, function in app.registered_functions.items():
             if name.endswith(".*"):
                 continue
             all_runnables[function].append(f"{app_name}.{name}")
+            priorities[function] = AutoRunPriority.APP_FUNCTION
         for cls_name, cls in app.registered_classes.items():
             for method_name in cls._get_method_names():
                 method_ref = MethodReference(cls, method_name)
                 all_runnables[method_ref].append(f"{app_name}.{cls_name}.{method_name}")
+                priorities[method_ref] = AutoRunPriority.APP_FUNCTION
 
     # If any class or function is exported as a module level object, use that
     # as the preferred name by putting it first in the list
@@ -150,8 +162,13 @@ def list_cli_commands(
             for method_name in entity._get_method_names():
                 method_ref = MethodReference(entity, method_name)
                 all_runnables.setdefault(method_ref, []).insert(0, f"{name}.{method_name}")
-        elif (isinstance(entity, Function) and entity._is_local()) or isinstance(entity, LocalEntrypoint):
+                priorities[method_ref] = AutoRunPriority.MODULE_FUNCTION
+        elif isinstance(entity, Function) and entity._is_local():
             all_runnables.setdefault(entity, []).insert(0, name)
+            priorities[entity] = AutoRunPriority.MODULE_FUNCTION
+        elif isinstance(entity, LocalEntrypoint):
+            all_runnables.setdefault(entity, []).insert(0, name)
+            priorities[entity] = AutoRunPriority.MODULE_LOCAL_ENTRYPOINT
 
     def _is_web_endpoint(runnable: Runnable) -> bool:
         if isinstance(runnable, Function) and runnable._is_web_endpoint():
@@ -164,7 +181,10 @@ def list_cli_commands(
 
         return False
 
-    return [CLICommand(names, runnable, _is_web_endpoint(runnable)) for runnable, names in all_runnables.items()]
+    return [
+        CLICommand(names, runnable, _is_web_endpoint(runnable), priority=priorities[runnable])
+        for runnable, names in all_runnables.items()
+    ]
 
 
 def filter_cli_commands(
@@ -308,17 +328,19 @@ def import_and_filter(
     filtered_commands = filter_cli_commands(
         cli_commands, import_ref.object_path, accept_local_entrypoint, accept_webhook
     )
+
     all_usable_commands = filter_cli_commands(cli_commands, "", accept_local_entrypoint, accept_webhook)
 
-    if len(filtered_commands) == 1:
-        cli_command = filtered_commands[0]
-        return cli_command.runnable, all_usable_commands
+    if filtered_commands:
+        # if there is a single command with "highest run prio" - use that
+        filtered_commands_by_prio = defaultdict(list)
+        for cmd in filtered_commands:
+            filtered_commands_by_prio[cmd.priority].append(cmd)
 
-    # we are here if there is more than one matching function
-    if accept_local_entrypoint:
-        local_entrypoint_cmds = [cmd for cmd in filtered_commands if isinstance(cmd.runnable, LocalEntrypoint)]
-        if len(local_entrypoint_cmds) == 1:
-            # if there is a single local entrypoint - use that
-            return local_entrypoint_cmds[0].runnable, all_usable_commands
+        _, highest_prio_commands = min(filtered_commands_by_prio.items())
+        if len(highest_prio_commands) == 1:
+            cli_command = highest_prio_commands[0]
+            return cli_command.runnable, all_usable_commands
 
+    # otherwise, just return the list of all commands
     return None, all_usable_commands

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

modal/functions.pyi

@@ -471,11 +471,11 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
 
     _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[P, ReturnType, typing_extensions.Self]
+    remote: __remote_spec[ReturnType, P, typing_extensions.Self]
 
     class __remote_gen_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(self, *args, **kwargs) -> typing.Generator[typing.Any, None, None]: ...
@@ -488,17 +488,17 @@ class Function(typing.Generic[P, ReturnType, OriginalReturnType], modal.object.O
     def _get_obj(self) -> typing.Optional[modal.cls.Obj]: ...
     def local(self, *args: P.args, **kwargs: P.kwargs) -> 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[P, ReturnType, typing_extensions.Self]
+    _experimental_spawn: ___experimental_spawn_spec[ReturnType, 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[P, ReturnType, typing_extensions.Self]
+    spawn: __spawn_spec[ReturnType, P, typing_extensions.Self]
 
     def get_raw_f(self) -> collections.abc.Callable[..., typing.Any]: ...
 

{modal-0.73.0.dist-info → modal-0.73.1.dist-info}/METADATA

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

{modal-0.73.0.dist-info → modal-0.73.1.dist-info}/RECORD

@@ -20,7 +20,7 @@ modal/app.py,sha256=BEl90AuVlcrVlXKhM0wDFn1E8hewvbia9Qdq6SiT-FE,44225
 modal/app.pyi,sha256=NnUpnKq5y5fM45F5cXLMZK5zVJZA9T_UKawloOXCVXE,25858
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=8SQawr7P1PNUCq1UmJMUQXG2jIo4Nmdcs311XqrNLRE,15276
-modal/client.pyi,sha256=zrgKN8G3exCslhD6GQkTjD8tddibnNtFRMx6ZiHnyhU,7591
+modal/client.pyi,sha256=B6N3IX6_KfMiukhFzQtUJVgjMMD7wuiUHTQWphpAKaQ,7591
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=7k3_FwhPUzewRXRZP8bcVJA9AZstoxGJuHKQ5Db-YoY,32683
@@ -39,7 +39,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=bD4NbWgAfo5jsiqlT5XT0nGTaQ_6zOfyNmwYu0I-aVY,69951
-modal/functions.pyi,sha256=j6FWZzwFVSaxyOy4zcmCwz2wlAhWeuzqsjndNKt7VlA,26641
+modal/functions.pyi,sha256=eHwUCC7wt_DkCWDnNKuL8LBc4JIRm-rzCOtdmdUgGKY,26641
 modal/gpu.py,sha256=2qZMNnoMrjU-5Bu7fx68pANUAKTtZq0EWEEeBA9OUVQ,7426
 modal/image.py,sha256=c6-RsdVDCscmfOoZI26gj8GvBBw1oVC18n8WaYKBWAw,90949
 modal/image.pyi,sha256=QMKS6E3CsZr5DoyNqGpcJPBYJTJZSvtAQIsAhPVd_E4,26347
@@ -118,7 +118,7 @@ modal/cli/container.py,sha256=FYwEgjf93j4NMorAjGbSV98i1wpebqdAeNU1wfrFp1k,3668
 modal/cli/dict.py,sha256=8Wq3w-UDaywk8EVNdj-ECCNV9TYHqh4kzhUqhhulatM,4593
 modal/cli/entry_point.py,sha256=aaNxFAqZcmtSjwzkYIA_Ba9CkL4cL4_i2gy5VjoXxkM,4228
 modal/cli/environment.py,sha256=Ayddkiq9jdj3XYDJ8ZmUqFpPPH8xajYlbexRkzGtUcg,4334
-modal/cli/import_refs.py,sha256=T10EjBn-7gP-Nv5jTZyd3fEAV7zCaaLtW8eJ4Zt80Mk,11865
+modal/cli/import_refs.py,sha256=YYseLJ6cU_wln7DjVWfKPgEhv77hxfA0klWAkTK_1HA,12672
 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
@@ -169,10 +169,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=Yxiko82vGjUn9KsvIwjuM1GwRICvG_28r-6MWuHV0-Q,148
-modal-0.73.0.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-modal-0.73.0.dist-info/METADATA,sha256=TmKeZvOba2fFzlrg4VGPHQ7nr4tLVPOB_SSmTLxWjsE,2328
-modal-0.73.0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-modal-0.73.0.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.73.0.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
-modal-0.73.0.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=b5X16t-GbrJxsrM_vcD_WXLcjcejIbm7gcrXoJd5e64,148
+modal-0.73.1.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.73.1.dist-info/METADATA,sha256=qsi27dGq0I0z2jCMDbs8cfkdh_kjKztW9uR00_IPuj8,2328
+modal-0.73.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+modal-0.73.1.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.73.1.dist-info/top_level.txt,sha256=1nvYbOSIKcmU50fNrpnQnrrOpj269ei3LzgB6j9xGqg,64
+modal-0.73.1.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 = 0  # git: 7858ac1
+build_number = 1  # git: 539ddf8