modal 0.73.100__py3-none-any.whl → 0.73.102__py3-none-any.whl

modal/_utils/function_utils.py

@@ -207,6 +207,7 @@ class FunctionInfo:
             if serialized:  # if explicit
                 self._type = FunctionInfoType.SERIALIZED
             else:
+                # notebook, or in general any exec() on a function definition
                 self._type = FunctionInfoType.NOTEBOOK
 
         if not self.is_serialized():

modal/cli/import_refs.py

@@ -12,7 +12,7 @@ import importlib
 import importlib.util
 import inspect
 import sys
-import types
+import typing
 from collections import defaultdict
 from dataclasses import dataclass
 from pathlib import Path
@@ -130,7 +130,7 @@ class AutoRunPriority:
 
 
 def list_cli_commands(
-    module: types.ModuleType,
+    module_members: dict[str, typing.Any],
 ) -> list[CLICommand]:
     """
     Extracts all runnables found either directly in the input module, or in any of the Apps listed in that module
@@ -142,7 +142,9 @@ def list_cli_commands(
 
     Where the first name is always the module level name if such a name exists
     """
-    apps = cast(list[tuple[str, App]], inspect.getmembers(module, lambda x: isinstance(x, App)))
+    apps = cast(
+        list[tuple[str, App]], [(name, member) for name, member in module_members.items() if isinstance(member, App)]
+    )
 
     all_runnables: dict[Runnable, list[str]] = defaultdict(list)
     priorities: dict[Runnable, int] = defaultdict(lambda: AutoRunPriority.APP_FUNCTION)
@@ -163,10 +165,11 @@ def list_cli_commands(
 
     # 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
-    module_level_entities = cast(
-        list[tuple[str, Runnable]],
-        inspect.getmembers(module, lambda x: isinstance(x, (Function, Cls, LocalEntrypoint))),
-    )
+    module_level_entities = [
+        (name, member)
+        for name, member in module_members.items()
+        if isinstance(member, (Function, Cls, LocalEntrypoint))
+    ]
     for name, entity in module_level_entities:
         if isinstance(entity, Cls) and entity._is_local():
             for method_name in entity._get_method_names():
@@ -335,25 +338,35 @@ def import_and_filter(
     """
     # all commands:
     module = import_file_or_module(import_ref, base_cmd)
-    cli_commands = list_cli_commands(module)
+    cli_commands = list_cli_commands(dict(inspect.getmembers(module)))
 
     # all commands that satisfy local entrypoint/accept webhook limitations AND object path prefix
-    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)
+    inferred_runnable = infer_runnable(cli_commands, import_ref.object_path, accept_local_entrypoint, accept_webhook)
 
-    if filtered_commands:
+    if inferred_runnable:
         # 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)
-
-        _, 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
+        return inferred_runnable, all_usable_commands
 
     # otherwise, just return the list of all commands
     return None, all_usable_commands
+
+
+def infer_runnable(
+    cli_commands: list[CLICommand], object_path: str, accept_local_entrypoint: bool, accept_webhook: bool
+) -> Optional[Runnable]:
+    filtered_commands = filter_cli_commands(cli_commands, object_path, accept_local_entrypoint, accept_webhook)
+    if len(filtered_commands) == 0:
+        return None
+
+    filtered_commands_by_prio = defaultdict(list)
+    for cmd in filtered_commands:
+        filtered_commands_by_prio[cmd.priority].append(cmd)
+
+    _, 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
+
+    return None

modal/client.pyi

@@ -31,7 +31,7 @@ class _Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "0.73.100",
+        version: str = "0.73.102",
     ): ...
     def is_closed(self) -> bool: ...
     @property
@@ -93,7 +93,7 @@ class Client:
         server_url: str,
         client_type: int,
         credentials: typing.Optional[tuple[str, str]],
-        version: str = "0.73.100",
+        version: str = "0.73.102",
     ): ...
     def is_closed(self) -> bool: ...
     @property

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]: ...
 

modal/io_streams.py

@@ -70,14 +70,14 @@ class _StreamReader(Generic[T]):
 
     **Usage**
 
-    ```python
+    ```python fixture:running_app
     from modal import Sandbox
 
     sandbox = Sandbox.create(
         "bash",
         "-c",
         "for i in $(seq 1 10); do echo foo; sleep 0.1; done",
-        app=app,
+        app=running_app,
     )
     for message in sandbox.stdout:
         print(f"Message: {message}")
@@ -147,10 +147,10 @@ class _StreamReader(Generic[T]):
 
         **Usage**
 
-        ```python
+        ```python fixture:running_app
         from modal import Sandbox
 
-        sandbox = Sandbox.create("echo", "hello", app=app)
+        sandbox = Sandbox.create("echo", "hello", app=running_app)
         sandbox.wait()
 
         print(sandbox.stdout.read())
@@ -347,14 +347,14 @@ class _StreamWriter:
 
         **Usage**
 
-        ```python
+        ```python fixture:running_app
         from modal import Sandbox
 
         sandbox = Sandbox.create(
             "bash",
             "-c",
             "while read line; do echo $line; done",
-            app=app,
+            app=running_app,
         )
         sandbox.stdin.write(b"foo\\n")
         sandbox.stdin.write(b"bar\\n")

{modal-0.73.100.dist-info → modal-0.73.102.dist-info}/METADATA

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

{modal-0.73.100.dist-info → modal-0.73.102.dist-info}/RECORD

@@ -22,7 +22,7 @@ modal/app.py,sha256=ojhuLZuNZAQ1OsbDH0k6G4pm1W7bOIvZfXbaKlvQ-Ao,45622
 modal/app.pyi,sha256=tZFbcsu20SuvfB2puxCyuXLFNJ9bQulzag55rVpgZmc,26827
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=j9D3hNis1lfhnz9lVFGgJgowbH3PaGUzNKgHPWYG778,15372
-modal/client.pyi,sha256=FEU84jA8vf8eCZgXVpJEWv6TL8ezLrhOqptR10cRRME,7661
+modal/client.pyi,sha256=zUHwpjWRBiFlOyWRnztgyJKHBGc0W6a9a7hEtP9KAdo,7661
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
 modal/cls.py,sha256=JhDbaZZHN52lqA_roY1BCbcN9BvbkUcdXiM2Kg9lIc0,31717
@@ -41,11 +41,11 @@ modal/file_io.py,sha256=lcMs_E9Xfm0YX1t9U2wNIBPnqHRxmImqjLW1GHqVmyg,20945
 modal/file_io.pyi,sha256=NTRft1tbPSWf9TlWVeZmTlgB5AZ_Zhu2srWIrWr7brk,9445
 modal/file_pattern_matcher.py,sha256=trosX-Bp7dOubudN1bLLhRAoidWy1TcoaR4Pv8CedWw,6497
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
-modal/functions.pyi,sha256=D-PDJfSbwqMDXdq7Bxu2ErZRENo-tRgu_zPoB-jl0OU,14377
+modal/functions.pyi,sha256=ujc6eIYyNmMn__4dpxEy85-vZmAniZv56D2A4uBgs6U,14377
 modal/gpu.py,sha256=Kbhs_u49FaC2Zi0TjCdrpstpRtT5eZgecynmQi5IZVE,6752
 modal/image.py,sha256=fWamISDhtUo-DRtIn9c8aevNE78HafOlG9Rn-otUZv8,90800
 modal/image.pyi,sha256=Im_ap8E2oxDXA6uHQExKtH0KlB17gg6dfgAaJwW38ts,25163
-modal/io_streams.py,sha256=QkQiizKRzd5bnbKQsap31LJgBYlAnj4-XkV_50xPYX0,15079
+modal/io_streams.py,sha256=h5O2LmbRoT9l777z3TQhCAm-JF1r7avZ2ykXlejztDs,15163
 modal/io_streams.pyi,sha256=bJ7ZLmSmJ0nKoa6r4FJpbqvzdUVa0lEe0Fa-MMpMezU,5071
 modal/mount.py,sha256=JII0zTS1fPCcCbZgO18okkOuTDqYCxY1DIVa6i1E9cI,32196
 modal/mount.pyi,sha256=CmHa7zKSxHA_7-vMQLnGfw_ZXvAvHlafvUEVJcQ1LQA,12535
@@ -98,7 +98,7 @@ modal/_utils/blob_utils.py,sha256=RB1G6T7eC1Poe-O45qYLaxwCr2jkM-Q6Nexk1J3wk_w,14
 modal/_utils/bytes_io_segment_payload.py,sha256=uunxVJS4PE1LojF_UpURMzVK9GuvmYWRqQo_bxEj5TU,3385
 modal/_utils/deprecation.py,sha256=EXP1beU4pmEqEzWMLw6E3kUfNfpmNA_VOp6i0EHi93g,4856
 modal/_utils/docker_utils.py,sha256=h1uETghR40mp_y3fSWuZAfbIASH1HMzuphJHghAL6DU,3722
-modal/_utils/function_utils.py,sha256=Rmz8GJDie-RW_q2RcTwholEWixS2IQDPBsRBJ3f3ZvU,27302
+modal/_utils/function_utils.py,sha256=OqsmLKOqSenxkXiNSPUWpKqD5KotySa_Omw1tmt97K0,27380
 modal/_utils/grpc_testing.py,sha256=H1zHqthv19eGPJz2HKXDyWXWGSqO4BRsxah3L5Xaa8A,8619
 modal/_utils/grpc_utils.py,sha256=wmMydVKN9YbugTwUXuOuzxbpzYvxkTDaFRxlBtIDE_0,8526
 modal/_utils/hash_utils.py,sha256=zg3J6OGxTFGSFri1qQ12giDz90lWk8bzaxCTUCRtiX4,3034
@@ -123,7 +123,7 @@ modal/cli/container.py,sha256=FYwEgjf93j4NMorAjGbSV98i1wpebqdAeNU1wfrFp1k,3668
 modal/cli/dict.py,sha256=8Wq3w-UDaywk8EVNdj-ECCNV9TYHqh4kzhUqhhulatM,4593
 modal/cli/entry_point.py,sha256=dOosuCwhfznwTCB4oMljUFhihq5aLUVoAz7RhcBEDnc,4189
 modal/cli/environment.py,sha256=Ayddkiq9jdj3XYDJ8ZmUqFpPPH8xajYlbexRkzGtUcg,4334
-modal/cli/import_refs.py,sha256=kbjWZxSyLc6Bp6UxtB7iJ7qp10DG5j7i4bbbA1bSIXQ,13529
+modal/cli/import_refs.py,sha256=53WmXyOivTk2Pi85NgAr8K5tjwOxNeCmOR0wLNEEX1c,13941
 modal/cli/launch.py,sha256=0_sBu6bv2xJEPWi-rbGS6Ri9ggnkWQvrGlgpYSUBMyY,3097
 modal/cli/network_file_system.py,sha256=eq3JnwjbfFNsJodIyANHL06ByYc3BSavzdmu8C96cHA,7948
 modal/cli/profile.py,sha256=0TYhgRSGUvQZ5LH9nkl6iZllEvAjDniES264dE57wOM,3201
@@ -152,10 +152,10 @@ modal_docs/mdmd/__init__.py,sha256=svYKtV8HDwDCN86zbdWqyq5T8sMdGDj0PVlzc2tIxDM,2
 modal_docs/mdmd/mdmd.py,sha256=Irx49MCCTlBOP4FBdLR--JrpA3-WhsVeriq0LGgsRic,6232
 modal_docs/mdmd/signatures.py,sha256=XJaZrK7Mdepk5fdX51A8uENiLFNil85Ud0d4MH8H5f0,3218
 modal_proto/__init__.py,sha256=MIEP8jhXUeGq_eCjYFcqN5b1bxBM4fdk0VESpjWR0fc,28
-modal_proto/api.proto,sha256=2ZqCWqGd3uou1gB-3BaeHH4ifUc2tGqfuECK5xZ66qs,87119
+modal_proto/api.proto,sha256=S8AuRY85IXHsK7zjGz9rpLrM58wvsndiKTg6mB869_0,87199
 modal_proto/api_grpc.py,sha256=FYGqDegM_w_qxdtlxum8k31mDibKoMvmNxv_p9cKdKs,109056
-modal_proto/api_pb2.py,sha256=_B9huqNJ0UIPxXLZAI951Wm0ZuMuSto08Ohk2jElhbk,312674
-modal_proto/api_pb2.pyi,sha256=eBbPOUnaWFd4at5uw4UlBkyFl0H6m2NQNSxYwajIo_Y,422034
+modal_proto/api_pb2.py,sha256=sObPf-wW6CJMyxRKQYvOY3NCZY8vwnA_1PNYLw_5CRY,312842
+modal_proto/api_pb2.pyi,sha256=fONlrXklOTc3tqZ_rdZi5onnUPMBBvgbouW6OcWiJ5M,422539
 modal_proto/api_pb2_grpc.py,sha256=DNp0Et5i_Ey4dKx_1o1LRtYhyWYyT0NzTcAY4EcHn-c,235765
 modal_proto/api_pb2_grpc.pyi,sha256=RI6tWC3L8EIN4-izFSEGPPJl5Ta0lXPNuHUJaWAr35s,54892
 modal_proto/modal_api_grpc.py,sha256=UG8WJU81afrWPwItWB4Ag64E9EpyREMpBbAVGVEYJiM,14550
@@ -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=jrj-io9Vvj9b8ayvjvkQBghmhFcoL3PoPvuHrMVsV7s,150
-modal-0.73.100.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-modal-0.73.100.dist-info/METADATA,sha256=T5xt-lKTVec2t_gdZp-YQOK642mod1EK32esilLdAJk,2453
-modal-0.73.100.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-modal-0.73.100.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.73.100.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-0.73.100.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=oH3omNi-OAM0rjMoM0SWBophXz8Tb0WoBdvKLHIz5qk,150
+modal-0.73.102.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.73.102.dist-info/METADATA,sha256=Ndz6dLmlGqDk8oLm9XE_p7esv3KrT8dRcBeY729tvFg,2453
+modal-0.73.102.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+modal-0.73.102.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.73.102.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-0.73.102.dist-info/RECORD,,

modal_proto/api.proto

@@ -171,6 +171,7 @@ enum ParameterType {
   PARAM_TYPE_STRING = 1;
   PARAM_TYPE_INT = 2;
   PARAM_TYPE_PICKLE = 3;
+  PARAM_TYPE_BYTES = 4;
 }
 
 enum ProgressType {
@@ -701,6 +702,7 @@ message ClassParameterSpec {
     string string_default = 4;
     int64 int_default = 5;
     bytes pickle_default = 6;
+    bytes bytes_default = 7;
   }
 }
 
@@ -714,6 +716,7 @@ message ClassParameterValue {
     string string_value = 3;
     int64 int_value = 4;
     bytes pickle_value = 5;
+    bytes bytes_value = 6;
   }
 }