modal 0.73.128__py3-none-any.whl → 0.73.131__py3-none-any.whl

modal/_utils/function_utils.py

@@ -16,12 +16,10 @@ import modal_proto
 from modal_proto import api_pb2
 
 from .._serialization import (
-    PROTO_TYPE_INFO,
-    PYTHON_TO_PROTO_TYPE,
     deserialize,
     deserialize_data_format,
-    get_proto_parameter_type,
     serialize,
+    signature_to_parameter_specs,
 )
 from .._traceback import append_modal_tb
 from ..config import config, logger
@@ -106,24 +104,6 @@ def get_function_type(is_generator: Optional[bool]) -> "api_pb2.Function.Functio
     return api_pb2.Function.FUNCTION_TYPE_GENERATOR if is_generator else api_pb2.Function.FUNCTION_TYPE_FUNCTION
 
 
-def signature_to_protobuf_schema(signature: inspect.Signature) -> list[api_pb2.ClassParameterSpec]:
-    modal_parameters: list[api_pb2.ClassParameterSpec] = []
-    for param in signature.parameters.values():
-        has_default = param.default is not param.empty
-        class_param_spec = api_pb2.ClassParameterSpec(name=param.name, has_default=has_default)
-        if param.annotation not in PYTHON_TO_PROTO_TYPE:
-            class_param_spec.type = api_pb2.PARAM_TYPE_UNKNOWN
-        else:
-            proto_type = PYTHON_TO_PROTO_TYPE[param.annotation]
-            class_param_spec.type = proto_type
-            proto_type_info = PROTO_TYPE_INFO[proto_type]
-            if has_default and proto_type is not api_pb2.PARAM_TYPE_UNKNOWN:
-                setattr(class_param_spec, proto_type_info.default_field, param.default)
-
-        modal_parameters.append(class_param_spec)
-    return modal_parameters
-
-
 class FunctionInfo:
     """Utility that determines serialization/deserialization mechanisms for functions
 
@@ -310,15 +290,12 @@ class FunctionInfo:
         # annotation parameters trigger strictly typed parametrization
         # which enables web endpoint for parametrized classes
         signature = _get_class_constructor_signature(self.user_cls)
-        # validate that the schema has no unspecified fields/unsupported class parameter types
-        for param in signature.parameters.values():
-            get_proto_parameter_type(param.annotation)
-
-        protobuf_schema = signature_to_protobuf_schema(signature)
+        # at this point, the types in the signature should already have been validated (see Cls.from_local())
+        parameter_specs = signature_to_parameter_specs(signature)
 
         return api_pb2.ClassParameterInfo(
             format=api_pb2.ClassParameterInfo.PARAM_SERIALIZATION_FORMAT_PROTO,
-            schema=protobuf_schema,
+            schema=parameter_specs,
         )
 
     def get_entrypoint_mount(self) -> dict[str, _Mount]:

modal/app.py

@@ -678,12 +678,6 @@ class _App:
                 is_generator = f.is_generator
                 batch_max_size = f.batch_max_size
                 batch_wait_ms = f.batch_wait_ms
-                if f.max_concurrent_inputs:  # Using @modal.concurrent()
-                    max_concurrent_inputs = f.max_concurrent_inputs
-                    target_concurrent_inputs = f.target_concurrent_inputs
-                else:
-                    max_concurrent_inputs = allow_concurrent_inputs
-                    target_concurrent_inputs = None
             else:
                 if not is_global_object(f.__qualname__) and not serialized:
                     raise InvalidError(
@@ -715,12 +709,10 @@ class _App:
                     )
 
                 info = FunctionInfo(f, serialized=serialized, name_override=name)
-                raw_f = f
                 webhook_config = None
                 batch_max_size = None
                 batch_wait_ms = None
-                max_concurrent_inputs = allow_concurrent_inputs
-                target_concurrent_inputs = None
+                raw_f = f
 
                 cluster_size = None  # Experimental: Clustered functions
                 i6pn_enabled = i6pn
@@ -761,8 +753,7 @@ class _App:
                 max_containers=max_containers,
                 buffer_containers=buffer_containers,
                 scaledown_window=scaledown_window,
-                max_concurrent_inputs=max_concurrent_inputs,
-                target_concurrent_inputs=target_concurrent_inputs,
+                allow_concurrent_inputs=allow_concurrent_inputs,
                 batch_max_size=batch_max_size,
                 batch_wait_ms=batch_wait_ms,
                 timeout=timeout,
@@ -841,7 +832,7 @@ class _App:
         concurrency_limit: Optional[int] = None,  # Replaced with `max_containers`
         container_idle_timeout: Optional[int] = None,  # Replaced with `scaledown_window`
         _experimental_buffer_containers: Optional[int] = None,  # Now stable API with `buffer_containers`
-    ) -> Callable[[Union[CLS_T, _PartialFunction]], CLS_T]:
+    ) -> Callable[[CLS_T], CLS_T]:
         """
         Decorator to register a new Modal [Cls](/docs/reference/modal.Cls) with this App.
         """
@@ -854,21 +845,8 @@ class _App:
                 raise InvalidError("`region` and `_experimental_scheduler_placement` cannot be used together")
             scheduler_placement = SchedulerPlacement(region=region)
 
-        def wrapper(wrapped_cls: Union[CLS_T, _PartialFunction]) -> CLS_T:
+        def wrapper(user_cls: CLS_T) -> CLS_T:
             # Check if the decorated object is a class
-            if isinstance(wrapped_cls, _PartialFunction):
-                wrapped_cls.wrapped = True
-                user_cls = wrapped_cls.raw_f
-                if wrapped_cls.max_concurrent_inputs:  # Using @modal.concurrent()
-                    max_concurrent_inputs = wrapped_cls.max_concurrent_inputs
-                    target_concurrent_inputs = wrapped_cls.target_concurrent_inputs
-                else:
-                    max_concurrent_inputs = allow_concurrent_inputs
-                    target_concurrent_inputs = None
-            else:
-                user_cls = wrapped_cls
-                max_concurrent_inputs = allow_concurrent_inputs
-                target_concurrent_inputs = None
             if not inspect.isclass(user_cls):
                 raise TypeError("The @app.cls decorator must be used on a class.")
 
@@ -893,12 +871,6 @@ class _App:
             ):
                 raise InvalidError("A class must have `enable_memory_snapshot=True` to use `snap=True` on its methods.")
 
-            for method in _find_partial_methods_for_user_cls(user_cls, _PartialFunctionFlags.FUNCTION).values():
-                if method.max_concurrent_inputs:
-                    raise InvalidError(
-                        "The `@modal.concurrent` decorator cannot be used on methods; decorate the class instead."
-                    )
-
             info = FunctionInfo(None, serialized=serialized, user_cls=user_cls)
 
             cls_func = _Function.from_local(
@@ -920,8 +892,7 @@ class _App:
                 scaledown_window=scaledown_window,
                 proxy=proxy,
                 retries=retries,
-                max_concurrent_inputs=max_concurrent_inputs,
-                target_concurrent_inputs=target_concurrent_inputs,
+                allow_concurrent_inputs=allow_concurrent_inputs,
                 batch_max_size=batch_max_size,
                 batch_wait_ms=batch_wait_ms,
                 timeout=timeout,

modal/app.pyi

@@ -1,7 +1,6 @@
 import collections.abc
 import modal._functions
 import modal._object
-import modal._partial_function
 import modal._utils.function_utils
 import modal.client
 import modal.cloud_bucket_mount
@@ -248,7 +247,7 @@ class _App:
         concurrency_limit: typing.Optional[int] = None,
         container_idle_timeout: typing.Optional[int] = None,
         _experimental_buffer_containers: typing.Optional[int] = None,
-    ) -> collections.abc.Callable[[typing.Union[CLS_T, modal._partial_function._PartialFunction]], CLS_T]: ...
+    ) -> collections.abc.Callable[[CLS_T], CLS_T]: ...
     async def spawn_sandbox(
         self,
         *entrypoint_args: str,
@@ -488,7 +487,7 @@ class App:
         concurrency_limit: typing.Optional[int] = None,
         container_idle_timeout: typing.Optional[int] = None,
         _experimental_buffer_containers: typing.Optional[int] = None,
-    ) -> collections.abc.Callable[[typing.Union[CLS_T, modal.partial_function.PartialFunction]], CLS_T]: ...
+    ) -> collections.abc.Callable[[CLS_T], CLS_T]: ...
 
     class __spawn_sandbox_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(

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.128",
+        version: str = "0.73.131",
     ): ...
     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.128",
+        version: str = "0.73.131",
     ): ...
     def is_closed(self) -> bool: ...
     @property

modal/cls.py

@@ -21,8 +21,9 @@ from ._partial_function import (
 )
 from ._resolver import Resolver
 from ._resources import convert_fn_config_to_resources_config
-from ._serialization import check_valid_cls_constructor_arg, get_proto_parameter_type
+from ._serialization import check_valid_cls_constructor_arg
 from ._traceback import print_server_warnings
+from ._type_manager import parameter_serde_registry
 from ._utils.async_utils import synchronize_api, synchronizer
 from ._utils.deprecation import deprecation_warning, renamed_parameter, warn_on_renamed_autoscaler_settings
 from ._utils.grpc_utils import retry_transient_errors
@@ -462,7 +463,10 @@ class _Cls(_Object, type_prefix="cs"):
 
         annotated_params = {k: t for k, t in annotations.items() if k in params}
         for k, t in annotated_params.items():
-            get_proto_parameter_type(t)
+            try:
+                parameter_serde_registry.validate_parameter_type(t)
+            except TypeError as exc:
+                raise InvalidError(f"Class parameter '{k}': {exc}")
 
     @staticmethod
     def from_local(user_cls, app: "modal.app._App", class_service_function: _Function) -> "_Cls":

modal/functions.pyi

@@ -82,8 +82,7 @@ class Function(
         max_containers: typing.Optional[int] = None,
         buffer_containers: typing.Optional[int] = None,
         scaledown_window: typing.Optional[int] = None,
-        max_concurrent_inputs: typing.Optional[int] = None,
-        target_concurrent_inputs: typing.Optional[int] = None,
+        allow_concurrent_inputs: typing.Optional[int] = None,
         batch_max_size: typing.Optional[int] = None,
         batch_wait_ms: typing.Optional[int] = None,
         cloud: typing.Optional[str] = None,
@@ -199,11 +198,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]: ...
@@ -218,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[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/partial_function.py

@@ -5,7 +5,6 @@ from ._partial_function import (
     _asgi_app,
     _batched,
     _build,
-    _concurrent,
     _enter,
     _exit,
     _fastapi_endpoint,
@@ -29,4 +28,3 @@ build = synchronize_api(_build, target_module=__name__)
 enter = synchronize_api(_enter, target_module=__name__)
 exit = synchronize_api(_exit, target_module=__name__)
 batched = synchronize_api(_batched, target_module=__name__)
-concurrent = synchronize_api(_concurrent, target_module=__name__)

modal/partial_function.pyi

@@ -18,8 +18,6 @@ class PartialFunction(
     force_build: bool
     cluster_size: typing.Optional[int]
     build_timeout: typing.Optional[int]
-    max_concurrent_inputs: typing.Optional[int]
-    target_concurrent_inputs: typing.Optional[int]
 
     def __init__(
         self,
@@ -33,8 +31,6 @@ class PartialFunction(
         cluster_size: typing.Optional[int] = None,
         force_build: bool = False,
         build_timeout: typing.Optional[int] = None,
-        max_concurrent_inputs: typing.Optional[int] = None,
-        target_concurrent_inputs: typing.Optional[int] = None,
     ): ...
     def _get_raw_f(self) -> collections.abc.Callable[modal._partial_function.P, modal._partial_function.ReturnType]: ...
     def _is_web_endpoint(self) -> bool: ...
@@ -122,8 +118,3 @@ def exit(
 def batched(
     _warn_parentheses_missing=None, *, max_batch_size: int, wait_ms: int
 ) -> collections.abc.Callable[[collections.abc.Callable[..., typing.Any]], PartialFunction]: ...
-def concurrent(
-    _warn_parentheses_missing=None, *, max_inputs: int, target_inputs: typing.Optional[int] = None
-) -> collections.abc.Callable[
-    [typing.Union[collections.abc.Callable[..., typing.Any], PartialFunction]], PartialFunction
-]: ...

{modal-0.73.128.dist-info → modal-0.73.131.dist-info}/METADATA

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

{modal-0.73.128.dist-info → modal-0.73.131.dist-info}/RECORD

@@ -1,31 +1,32 @@
-modal/__init__.py,sha256=7wz1AT_bpWJJEzXsAo3QMb7i87y7UGXwfneb0bGDhRg,2502
+modal/__init__.py,sha256=KcoVQVCfwuHmIJ74OxQPn66MHfiJcWi8V5srBW12jTA,2464
 modal/__main__.py,sha256=CgIjP8m1xJjjd4AXc-delmR6LdBCZclw2A_V38CFIio,2870
 modal/_clustered_functions.py,sha256=kTf-9YBXY88NutC1akI-gCbvf01RhMPCw-zoOI_YIUE,2700
 modal/_clustered_functions.pyi,sha256=vllkegc99A0jrUOWa8mdlSbdp6uz36TsHhGxysAOpaQ,771
 modal/_container_entrypoint.py,sha256=arhkIoF8nQNfa4iwYGSoqN3QMDg5M38QNAODXC8TlKc,29301
-modal/_functions.py,sha256=L-8wuokczWuD3xRqZKT4NkgO4tqKV3Cze_9KITgHdmc,73441
+modal/_functions.py,sha256=CNglAqO1gHLCAZiH1L6wD-PflzdPgtezNMK_jDwkIyE,73358
 modal/_ipython.py,sha256=TW1fkVOmZL3YYqdS2YlM1hqpf654Yf8ZyybHdBnlhSw,301
 modal/_location.py,sha256=joiX-0ZeutEUDTrrqLF1GHXCdVLF-rHzstocbMcd_-k,366
 modal/_object.py,sha256=JBIECWdfpRKCaCxVWZbC3Q1kF5Whk_EKvY9f4Y6AFyg,11446
 modal/_output.py,sha256=Z0nngPh2mKHMQc4MQ92YjVPc3ewOLa3I4dFBlL9nvQY,25656
-modal/_partial_function.py,sha256=Qr4smy6ndZUDwEHpe_T9KJZ-z8DpoH_Ipj9PqAIifx8,33044
+modal/_partial_function.py,sha256=ytUhfUEVPMccVD3wMekr2JRo5R0YylaE0LgPsSA05aQ,30508
 modal/_proxy_tunnel.py,sha256=gnKyCfmVB7x2d1A6c-JDysNIP3kEFxmXzhcXhPrzPn0,1906
 modal/_pty.py,sha256=JZfPDDpzqICZqtyPI_oMJf_9w-p_lLNuzHhwhodUXio,1329
-modal/_resolver.py,sha256=RtoXoYzSllPlFu0D1vel_FWiEmDO7RyToiC2bxeN8ZY,6917
+modal/_resolver.py,sha256=95emhRvKHQF_f5jQ2PVvis2lbtuWUuXI591wua71fR4,7029
 modal/_resources.py,sha256=5qmcirXUI8dSH926nwkUaeX9H25mqYu9mXD_KuT79-o,1733
-modal/_serialization.py,sha256=DUM-RljUSoKYezLWlckn8GH46A3IWkx9QIUukWYhCxU,22021
+modal/_serialization.py,sha256=SQMKtmjvjOLM6ErxTboeJiW970LySqjxDWk0humBR1U,21939
 modal/_traceback.py,sha256=IZQzB3fVlUfMHOSyKUgw0H6qv4yHnpyq-XVCNZKfUdA,5023
 modal/_tunnel.py,sha256=zTBxBiuH1O22tS1OliAJdIsSmaZS8PlnifS_6S5z-mk,6320
 modal/_tunnel.pyi,sha256=JmmDYAy9F1FpgJ_hWx0xkom2nTOFQjn4mTPYlU3PFo4,1245
+modal/_type_manager.py,sha256=SvDvX9JK1jLp8TA_psLd-hNYPALlG9KtSOmlbHqdtQE,8284
 modal/_watcher.py,sha256=K6LYnlmSGQB4tWWI9JADv-tvSvQ1j522FwT71B51CX8,3584
-modal/app.py,sha256=NKH7Cw1M6eyyrMXFbhWfdo3uRd28-8kv0Pcw56kPiPU,47312
-modal/app.pyi,sha256=pUEqciyGZ446sc_QoG8XcQ_oc6oU-U4dqjkxjhgOX98,26968
+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=nZCWs5u7jbU0Bnr2FXjfkhvNtNbJ7gKRdbe6gH2tT3g,7661
+modal/client.pyi,sha256=ksmfGdK8S4mWOdzp-UKMBVwkjKWx9uYfrsUDg9W9YUk,7661
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
-modal/cls.py,sha256=PWXqCcBVOuYnp0Q5GY-bEldVyv_AnelApMyPiESYwrU,31410
+modal/cls.py,sha256=PJimWA9q_sbQJNLbYy7fzjZGBm_hdfXuuZ7O_pKLXdk,31586
 modal/cls.pyi,sha256=ZJUwtRaQBGlM6tphvnv49FHBVDSgttMdD_LnYyRSKJM,10302
 modal/config.py,sha256=Zx7YsllgIJzMRKeIkaGSLLtMFV4kTUvGxpptnmqlP1U,11623
 modal/container_process.py,sha256=WTqLn01dJPVkPpwR_0w_JH96ceN5mV4TGtiu1ZR2RRA,6108
@@ -41,7 +42,7 @@ 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=PqApQjvICj11NIMEVCmaUIUyJUfEIuY_KkEzCZ4t6iI,14438
+modal/functions.pyi,sha256=D-PDJfSbwqMDXdq7Bxu2ErZRENo-tRgu_zPoB-jl0OU,14377
 modal/gpu.py,sha256=Kbhs_u49FaC2Zi0TjCdrpstpRtT5eZgecynmQi5IZVE,6752
 modal/image.py,sha256=6hDizLZvRIjRy2cMWGT06Kj1uqW_L5B9GR6x3AKr4v4,92341
 modal/image.pyi,sha256=DQ4DLOCPr6_yV7z4LS0bTY0rOyvQP9-dQOrzaW7pPG8,25260
@@ -56,8 +57,8 @@ modal/object.pyi,sha256=kyJkRQcVv3ct7zSAxvvXcuhBVeH914v80uSlqeS7cA4,5632
 modal/output.py,sha256=q4T9uHduunj4NwY-YSwkHGgjZlCXMuJbfQ5UFaAGRAc,1968
 modal/parallel_map.py,sha256=AB4YH4ZBGmCOe-X_1kB3hm-kNoRnOxCMzpkTUim4tT8,33586
 modal/parallel_map.pyi,sha256=-D_z-K1GOpQcMSUMVHRVLr2rgEA5CXlX6dU5P6msa58,5671
-modal/partial_function.py,sha256=y0h-EvlPnfvZr7nlJLOFk7NB-K-ZO41XJnsGtQTesAI,1200
-modal/partial_function.pyi,sha256=-xWrvFMhLT6ulx9B82u1g8kL69vt3nYAvp8pV0d__uw,5407
+modal/partial_function.py,sha256=uu8zvIV0Big0jiTlC4-VPL16dOScNB5jhfPeqxvvCrI,1117
+modal/partial_function.pyi,sha256=-MAK61qJRi6Wjym-Measz5_9moJurYrJfdi7uSQZa5M,4936
 modal/proxy.py,sha256=NrOevrWxG3G7-zlyRzG6BcIvop7AWLeyahZxitbBaOk,1418
 modal/proxy.pyi,sha256=1OEKIVUyC-xb7fHMzngakQso0nTsK60TVhXtlcMj6Wk,390
 modal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -98,7 +99,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=oWpeCvDQgsbjz3jUZPJ5LVgZO63OqY1ut3BNh8HJ-JM,27732
+modal/_utils/function_utils.py,sha256=t5uVhvmQKFmLmJko_Vv8g99-PGqm1a4QQWIQNt44jKg,26688
 modal/_utils/git_utils.py,sha256=qtUU6JAttF55ZxYq51y55OR58B0tDPZsZWK5dJe6W5g,3182
 modal/_utils/grpc_testing.py,sha256=H1zHqthv19eGPJz2HKXDyWXWGSqO4BRsxah3L5Xaa8A,8619
 modal/_utils/grpc_utils.py,sha256=wmMydVKN9YbugTwUXuOuzxbpzYvxkTDaFRxlBtIDE_0,8526
@@ -154,10 +155,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=94F7C-OQg0Xj_By2XztAGkQD4zRus5o7gy26viQADFo,87786
+modal_proto/api.proto,sha256=2JGv25RJbX4oTCGRzjED-tQJsGwYkuQMa1ftAh04hLo,88280
 modal_proto/api_grpc.py,sha256=SJOfs3Y1cOzzF_ZcDj-UNnOWz59sfU8a4JISp4Y_1Kw,109923
-modal_proto/api_pb2.py,sha256=UzgHEmSdZwWJxsoho67clTWH8uXlpICe7p_jtaHPRrA,315544
-modal_proto/api_pb2.pyi,sha256=WBRQRWufW08Nw8r9qlRZFiBgWsDMI5PN7gNXZKS7D08,426646
+modal_proto/api_pb2.py,sha256=gMhNEVF-siK8NkHBTcdlNhYYAaAdydhVolyaJdnMP-I,316437
+modal_proto/api_pb2.pyi,sha256=5JqfsirPOW4IVqrj8ufcEyEWu7TQAWV5BnNj-T12YKM,428292
 modal_proto/api_pb2_grpc.py,sha256=0XeCIL2B6UGLBh1MEGPFPz1k8qLWNyp-yj_cJrK3NE8,237541
 modal_proto/api_pb2_grpc.pyi,sha256=BsnRBinG0KC9Cp70UkdxuzgZA9KLCTl7T5ze0RK-Mmk,55323
 modal_proto/modal_api_grpc.py,sha256=i9HTreJ5FpBvtz9NwuTC52fZTWZO_M_DWdIYT2lOjs8,14666
@@ -171,10 +172,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=UV2vFNSRCipcz3159A83mk2Cakl8UFhOaMaL-i9YTPY,150
-modal-0.73.128.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-modal-0.73.128.dist-info/METADATA,sha256=5Xr1wyl6HVCsIC2KYo1Kmb93AF0F0Fzfbza3EEGIHro,2453
-modal-0.73.128.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-modal-0.73.128.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.73.128.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-0.73.128.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=YNKdjP2iUBwdkG8jk2i7rPime-g-zng71E6FA9DBvlw,150
+modal-0.73.131.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.73.131.dist-info/METADATA,sha256=KbNxcfaUiUQg253uRRCgmk_Ct1j9Hyoo70GCVKxgRek,2453
+modal-0.73.131.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+modal-0.73.131.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.73.131.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-0.73.131.dist-info/RECORD,,

modal_proto/api.proto

@@ -170,9 +170,12 @@ enum ParameterType {
   PARAM_TYPE_UNSPECIFIED = 0;
   PARAM_TYPE_STRING = 1;
   PARAM_TYPE_INT = 2;
-  PARAM_TYPE_PICKLE = 3;
+  PARAM_TYPE_PICKLE = 3; // currently unused
   PARAM_TYPE_BYTES = 4;
   PARAM_TYPE_UNKNOWN = 5;  // used in schemas to signify unrecognized or un-annotated types
+  PARAM_TYPE_LIST = 6;
+  PARAM_TYPE_DICT = 7;
+  PARAM_TYPE_NONE = 8;
 }
 
 enum ProgressType {
@@ -697,19 +700,22 @@ message ClassParameterSet {
   repeated ClassParameterValue parameters = 1;
 }
 
-message ClassParameterSpec {
+message ClassParameterSpec { // TODO: rename into NamedPayloadType or similar
   string name = 1;
-  ParameterType type = 2;
+  ParameterType type = 2; // TODO: deprecate - use full_type instead
   bool has_default = 3;
   oneof default_oneof {
+    // Default *values* are only registered for class parameters
     string string_default = 4;
     int64 int_default = 5;
     bytes pickle_default = 6;
     bytes bytes_default = 7;
   }
+  GenericPayloadType full_type = 8; // supersedes `type`
 }
 
-message ClassParameterValue {
+
+message ClassParameterValue {  // TODO: rename into NamedPayloadValue
   // NOTE: adding additional *fields* here can invalidate function lookups
   //  since we use the serialized message as the bound function identifier
   //  for parameter-bound classes. Modify with *caution*
@@ -1216,7 +1222,7 @@ message Function {
 
   repeated VolumeMount volume_mounts = 33;
 
-  uint32 max_concurrent_inputs = 34;
+  uint32 target_concurrent_inputs = 34;
 
   repeated CustomDomainInfo custom_domain_info = 35;
 
@@ -1266,7 +1272,7 @@ message Function {
   uint64 batch_linger_ms = 61; // Miliseconds to block before a response is needed
   bool i6pn_enabled = 62;
   bool _experimental_concurrent_cancellations = 63;
-  uint32 target_concurrent_inputs = 64;
+  uint32 max_concurrent_inputs = 64;
 
   // TODO(irfansharif): Remove, once https://github.com/modal-labs/modal/pull/15645 lands.
   bool _experimental_task_templates_enabled = 65;  // forces going through the new gpu-fallbacks integration path, even if no fallback options are specified
@@ -1728,6 +1734,11 @@ message GeneratorDone {  // Sent as the output when a generator finishes running
   uint64 items_total = 1;
 }
 
+message GenericPayloadType {
+  ParameterType base_type = 1;
+  repeated GenericPayloadType sub_types = 2;  // sub-type for generic types like lists
+}
+
 message GenericResult {  // Used for both tasks and function outputs
   enum GenericStatus {
     GENERIC_STATUS_UNSPECIFIED = 0;