modal 0.73.150__py3-none-any.whl → 0.73.152__py3-none-any.whl

modal/_functions.py

@@ -27,6 +27,7 @@ from ._resources import convert_fn_config_to_resources_config
 from ._runtime.execution_context import current_input_id, is_local
 from ._serialization import (
     apply_defaults,
+    get_callable_schema,
     serialize,
     serialize_proto_params,
     validate_parameter_values,
@@ -415,6 +416,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
     _method_handle_metadata: Optional[dict[str, "api_pb2.FunctionHandleMetadata"]] = (
         None  # set for 0.67+ class service functions
     )
+    _metadata: Optional[api_pb2.FunctionHandleMetadata] = None
 
     @staticmethod
     def from_local(
@@ -650,10 +652,17 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             for method_name, partial_function in interface_methods.items():
                 function_type = get_function_type(partial_function.params.is_generator)
                 function_name = f"{info.user_cls.__name__}.{method_name}"
+                method_schema = get_callable_schema(
+                    partial_function._get_raw_f(),
+                    is_web_endpoint=partial_function._is_web_endpoint(),
+                    ignore_first_argument=True,
+                )
+
                 method_definition = api_pb2.MethodDefinition(
                     webhook_config=partial_function.params.webhook_config,
                     function_type=function_type,
                     function_name=function_name,
+                    function_schema=method_schema,
                 )
                 method_definitions[method_name] = method_definition
 
@@ -695,6 +704,9 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                 function_name=info.function_name,
                 function_type=function_type,
                 existing_function_id=existing_object_id or "",
+                function_schema=get_callable_schema(info.raw_f, is_web_endpoint=bool(webhook_config))
+                if info.raw_f
+                else None,
             )
             if method_definitions:
                 for method_name, method_definition in method_definitions.items():
@@ -763,8 +775,9 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                     object_dependencies.append(api_pb2.ObjectDependency(object_id=dep.object_id))
 
                 function_data: Optional[api_pb2.FunctionData] = None
-                function_definition: Optional[api_pb2.Function] = None
-
+                function_schema = (
+                    get_callable_schema(info.raw_f, is_web_endpoint=bool(webhook_config)) if info.raw_f else None
+                )
                 # Create function remotely
                 function_definition = api_pb2.Function(
                     module_name=info.module_name or "",
@@ -823,6 +836,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                     _experimental_buffer_containers=buffer_containers or 0,
                     task_idle_timeout_secs=scaledown_window or 0,
                     # ---
+                    function_schema=function_schema,
                 )
 
                 if isinstance(gpu, list):
@@ -855,6 +869,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
                         _experimental_proxy_ip=function_definition._experimental_proxy_ip,
                         snapshot_debug=function_definition.snapshot_debug,
                         runtime_perf_record=function_definition.runtime_perf_record,
+                        function_schema=function_schema,
                     )
 
                     ranked_functions = []
@@ -1225,12 +1240,15 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         self._function_name = None
         self._info = None
         self._serve_mounts = frozenset()
+        self._metadata = None
 
     def _hydrate_metadata(self, metadata: Optional[Message]):
         # Overridden concrete implementation of base class method
         assert metadata and isinstance(metadata, api_pb2.FunctionHandleMetadata), (
             f"{type(metadata)} is not FunctionHandleMetadata"
         )
+        self._metadata = metadata
+        # TODO: replace usage of all below with direct ._metadata access
         self._is_generator = metadata.function_type == api_pb2.Function.FUNCTION_TYPE_GENERATOR
         self._web_url = metadata.web_url
         self._function_name = metadata.function_name
@@ -1252,6 +1270,7 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
             class_parameter_info=self._class_parameter_info,
             definition_id=self._definition_id,
             method_handle_metadata=self._method_handle_metadata,
+            function_schema=self._metadata.function_schema if self._metadata else None,
         )
 
     def _check_no_web_url(self, fn_name: str):
@@ -1535,6 +1554,12 @@ class _Function(typing.Generic[P, ReturnType, OriginalReturnType], _Object, type
         )
         return FunctionStats(backlog=resp.backlog, num_total_runners=resp.num_total_tasks)
 
+    @live_method
+    async def _get_schema(self) -> api_pb2.FunctionSchema:
+        """Returns recorded schema for function, internal use only for now"""
+        assert self._metadata
+        return self._metadata.function_schema
+
     # A bit hacky - but the map-style functions need to not be synchronicity-wrapped
     # in order to not execute their input iterators on the synchronicity event loop.
     # We still need to wrap them using MethodWithAio to maintain a synchronicity-like

modal/_serialization.py

@@ -12,7 +12,7 @@ from modal_proto import api_pb2
 from ._object import _Object
 from ._type_manager import parameter_serde_registry, schema_registry
 from ._vendor import cloudpickle
-from .config import logger
+from .config import config, logger
 from .exception import DeserializationError, ExecutionError, InvalidError
 from .object import Object
 
@@ -526,3 +526,28 @@ def signature_to_parameter_specs(signature: inspect.Signature) -> list[api_pb2.C
         field_spec = _signature_parameter_to_spec(param, include_legacy_parameter_fields=True)
         modal_parameters.append(field_spec)
     return modal_parameters
+
+
+def get_callable_schema(
+    callable: typing.Callable, *, is_web_endpoint: bool, ignore_first_argument: bool = False
+) -> typing.Optional[api_pb2.FunctionSchema]:
+    # ignore_first_argument can be used in case of unbound methods where we want to ignore the first (self) argument
+    if is_web_endpoint or not config.get("function_schemas"):
+        # we don't support schemas on web endpoints for now
+        return None
+
+    sig = inspect.signature(callable)
+    # TODO: treat no return value annotation as None return?
+    return_type_proto = schema_registry.get_proto_generic_type(sig.return_annotation)
+    arguments = []
+    for i, p in enumerate(sig.parameters.values()):
+        if i == 0 and ignore_first_argument:
+            continue
+
+        arguments.append(_signature_parameter_to_spec(p))
+
+    return api_pb2.FunctionSchema(
+        schema_type=api_pb2.FunctionSchema.FUNCTION_SCHEMA_V1,
+        arguments=arguments,
+        return_type=return_type_proto,
+    )

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

modal/cls.py

@@ -719,6 +719,28 @@ class _Cls(_Object, type_prefix="cs"):
 Cls = synchronize_api(_Cls)
 
 
+@synchronize_api
+async def _get_constructor_args(cls: _Cls) -> typing.Sequence[api_pb2.ClassParameterSpec]:
+    # for internal use only - defined separately to not clutter Cls namespace
+    await cls.hydrate()
+    service_function = cls._get_class_service_function()
+    metadata = service_function._metadata
+    assert metadata
+    if metadata.class_parameter_info.format != metadata.class_parameter_info.PARAM_SERIALIZATION_FORMAT_PROTO:
+        raise InvalidError("Can only get constructor args for strictly parameterized classes")
+    return metadata.class_parameter_info.schema
+
+
+@synchronize_api
+async def _get_method_schemas(cls: _Cls) -> dict[str, api_pb2.FunctionSchema]:
+    # for internal use only - defined separately to not clutter Cls namespace
+    await cls.hydrate()
+    assert cls._method_metadata
+    return {
+        method_name: method_metadata.function_schema for method_name, method_metadata in cls._method_metadata.items()
+    }
+
+
 class _NO_DEFAULT:
     def __repr__(self):
         return "modal.cls._NO_DEFAULT()"

modal/cls.pyi

@@ -244,6 +244,18 @@ class Cls(modal.object.Object):
     def __getattr__(self, k): ...
     def _is_local(self) -> bool: ...
 
+class ___get_constructor_args_spec(typing_extensions.Protocol):
+    def __call__(self, cls: Cls) -> typing.Sequence[modal_proto.api_pb2.ClassParameterSpec]: ...
+    async def aio(self, cls: Cls) -> typing.Sequence[modal_proto.api_pb2.ClassParameterSpec]: ...
+
+_get_constructor_args: ___get_constructor_args_spec
+
+class ___get_method_schemas_spec(typing_extensions.Protocol):
+    def __call__(self, cls: Cls) -> dict[str, modal_proto.api_pb2.FunctionSchema]: ...
+    async def aio(self, cls: Cls) -> dict[str, modal_proto.api_pb2.FunctionSchema]: ...
+
+_get_method_schemas: ___get_method_schemas_spec
+
 class _NO_DEFAULT:
     def __repr__(self): ...
 

modal/config.py

@@ -231,6 +231,7 @@ _SETTINGS = {
     "strict_parameters": _Setting(False, transform=_to_boolean),  # For internal/experimental use
     "snapshot_debug": _Setting(False, transform=_to_boolean),
     "cuda_checkpoint_path": _Setting("/__modal/.bin/cuda-checkpoint"),  # Used for snapshotting GPU memory.
+    "function_schemas": _Setting(False, transform=_to_boolean),
 }
 
 

modal/functions.pyi

@@ -52,6 +52,7 @@ class Function(
     _use_method_name: str
     _class_parameter_info: typing.Optional[modal_proto.api_pb2.ClassParameterInfo]
     _method_handle_metadata: typing.Optional[dict[str, modal_proto.api_pb2.FunctionHandleMetadata]]
+    _metadata: typing.Optional[modal_proto.api_pb2.FunctionHandleMetadata]
 
     def __init__(self, *args, **kwargs): ...
     @staticmethod
@@ -240,6 +241,12 @@ class Function(
 
     get_current_stats: __get_current_stats_spec[typing_extensions.Self]
 
+    class ___get_schema_spec(typing_extensions.Protocol[SUPERSELF]):
+        def __call__(self) -> modal_proto.api_pb2.FunctionSchema: ...
+        async def aio(self) -> modal_proto.api_pb2.FunctionSchema: ...
+
+    _get_schema: ___get_schema_spec[typing_extensions.Self]
+
     class __map_spec(typing_extensions.Protocol[SUPERSELF]):
         def __call__(
             self, *input_iterators, kwargs={}, order_outputs: bool = True, return_exceptions: bool = False

{modal-0.73.150.dist-info → modal-0.73.152.dist-info}/METADATA

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

{modal-0.73.150.dist-info → modal-0.73.152.dist-info}/RECORD

@@ -3,7 +3,7 @@ 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=XyqJPvzX0YMqviIIz-9bsD6HMrPsboU4A1yfgTloTSA,29302
-modal/_functions.py,sha256=nUyiCOYcuY_jXJhY5-haHFIUQleCmjh8z6GgXgo5MRY,73556
+modal/_functions.py,sha256=QKH7L7CHS_DN21bkayeQm-XkYFBs92El26RgKNTwqGA,74760
 modal/_ipython.py,sha256=TW1fkVOmZL3YYqdS2YlM1hqpf654Yf8ZyybHdBnlhSw,301
 modal/_location.py,sha256=joiX-0ZeutEUDTrrqLF1GHXCdVLF-rHzstocbMcd_-k,366
 modal/_object.py,sha256=JBIECWdfpRKCaCxVWZbC3Q1kF5Whk_EKvY9f4Y6AFyg,11446
@@ -13,7 +13,7 @@ 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/_resources.py,sha256=5qmcirXUI8dSH926nwkUaeX9H25mqYu9mXD_KuT79-o,1733
-modal/_serialization.py,sha256=SQMKtmjvjOLM6ErxTboeJiW970LySqjxDWk0humBR1U,21939
+modal/_serialization.py,sha256=kkLmQ6jnPlbLT3FfuyigocHKG7H1HDJ0i24IxYFbgs8,22927
 modal/_traceback.py,sha256=IZQzB3fVlUfMHOSyKUgw0H6qv4yHnpyq-XVCNZKfUdA,5023
 modal/_tunnel.py,sha256=zTBxBiuH1O22tS1OliAJdIsSmaZS8PlnifS_6S5z-mk,6320
 modal/_tunnel.pyi,sha256=JmmDYAy9F1FpgJ_hWx0xkom2nTOFQjn4mTPYlU3PFo4,1245
@@ -23,12 +23,12 @@ modal/app.py,sha256=w00bV9cjABAsS2ExE7zb1jY6Q_snXYmdKa3xRFg8iXA,47428
 modal/app.pyi,sha256=pUEqciyGZ446sc_QoG8XcQ_oc6oU-U4dqjkxjhgOX98,26968
 modal/call_graph.py,sha256=1g2DGcMIJvRy-xKicuf63IVE98gJSnQsr8R_NVMptNc,2581
 modal/client.py,sha256=j9D3hNis1lfhnz9lVFGgJgowbH3PaGUzNKgHPWYG778,15372
-modal/client.pyi,sha256=7uZv9uWQf4FIvAK5rTuUNBrYYa2l_S-nGgvxH6ttlVI,7661
+modal/client.pyi,sha256=TRrXBJ1tKWb__uvy2-rwSu43guCKdMsjiJIECpeDCdQ,7661
 modal/cloud_bucket_mount.py,sha256=YOe9nnvSr4ZbeCn587d7_VhE9IioZYRvF9VYQTQux08,5914
 modal/cloud_bucket_mount.pyi,sha256=30T3K1a89l6wzmEJ_J9iWv9SknoGqaZDx59Xs-ZQcmk,1607
-modal/cls.py,sha256=6MZYzhOcsCG7uWKk_zv_Q7fDcn5dkmK0M4QVRrpfF3Q,31769
-modal/cls.pyi,sha256=ZJUwtRaQBGlM6tphvnv49FHBVDSgttMdD_LnYyRSKJM,10302
-modal/config.py,sha256=Zx7YsllgIJzMRKeIkaGSLLtMFV4kTUvGxpptnmqlP1U,11623
+modal/cls.py,sha256=OE6lPrKmaZDvyctfmZ__nCIw-b7AWxSmoOHMqlrrI7A,32723
+modal/cls.pyi,sha256=pTYO9JsRENmsa5pDgzfoRJGm_NpCvEjEx--vs-jJkj8,10902
+modal/config.py,sha256=FlqVyh6LVukMahhmEGQVTwWtwtfoPfHqEo3GDn13EOA,11687
 modal/container_process.py,sha256=vvyK3DVPUMsuqvkKdUiQ49cDLF9JawGrxpglLk5vfgI,6208
 modal/container_process.pyi,sha256=bXs2KHe7nxVuLAm6RRBqXCvDKelANGX9gFY8qIuZYDs,2898
 modal/dict.py,sha256=3Pb45IkfqcDGXu3VVStJVbC_QYk6RTRXrMbZxtByAAk,13354
@@ -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=trosX-Bp7dOubudN1bLLhRAoidWy1TcoaR4Pv8CedWw,6497
 modal/functions.py,sha256=kcNHvqeGBxPI7Cgd57NIBBghkfbeFJzXO44WW0jSmao,325
-modal/functions.pyi,sha256=0Au1n37DimTZVvxCIR7HWALuNGxfJ_fcNR-or37eo5k,14438
+modal/functions.pyi,sha256=Bg_zlYSHMYuEXQYLcFU-j1Kwq5zHQ9jggMA_5ZO_du8,14785
 modal/gpu.py,sha256=Kbhs_u49FaC2Zi0TjCdrpstpRtT5eZgecynmQi5IZVE,6752
 modal/image.py,sha256=HtkKomhX4inozqSRi7lf5Vt9IEqCnVHn5bEo59hD64A,92835
 modal/image.pyi,sha256=iWclz2rxaP-LSsYMgU0X3ZcN5mEFvpyKzIPKJbohmsg,25591
@@ -153,10 +153,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=KLgOS8GclVSbeNOJcxC2Vyzbns2BHt9AdvQrXBEltvA,90668
+modal_proto/api.proto,sha256=N53PcynS8Lue5GnrYdcqlgzSMayAD4kiV-iLvgqECP8,91004
 modal_proto/api_grpc.py,sha256=9Rs0JyHcz_DSjVKhdtMbDuNt6qDkrE2718KsyA3QL4c,110702
-modal_proto/api_pb2.py,sha256=rl4rGn-Q_AS-Kn_F_T3df0_Lx2rvJMajdcpTkewJ0Ag,320170
-modal_proto/api_pb2.pyi,sha256=QLmFaTak-GwdKUhGQGk-DudI3cV7PdluTWSnvxlgobo,434662
+modal_proto/api_pb2.py,sha256=CqY-OvOubZmM74rgT0dAeBCGkLvjUn9RKV1U_9ucuK0,321579
+modal_proto/api_pb2.pyi,sha256=eUasABRN3TFeeesNKAdH1eWwk4jOce_Zc633LUinavY,437780
 modal_proto/api_pb2_grpc.py,sha256=olXvs6OQvy7pqvHP9bkSWC_DdIv0iO38xRlmkLo-ai8,239213
 modal_proto/api_pb2_grpc.pyi,sha256=ybhcN2nwFBIPd4Z4kkMOv-M8Ejidz93Bl4zScLpYcK0,55706
 modal_proto/modal_api_grpc.py,sha256=43ujbC_a8YAjuhtEvS-O-5lNpkG5d0K0ZIlryJ4weT4,14766
@@ -170,10 +170,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=b_9tYBKQ8OVORw51ouAMn3uT9_gfkq2Vrg3B7PU_BQw,150
-modal-0.73.150.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
-modal-0.73.150.dist-info/METADATA,sha256=ePf8YfB9Bp8xAIz5Mjv9GwuZpwsQnBC_wnNqL3u-AY8,2453
-modal-0.73.150.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-modal-0.73.150.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
-modal-0.73.150.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
-modal-0.73.150.dist-info/RECORD,,
+modal_version/_version_generated.py,sha256=ciOdTKcT9aMFmuPOVpqzfwEYkTVr5C0lQk4__he_oB8,150
+modal-0.73.152.dist-info/LICENSE,sha256=psuoW8kuDP96RQsdhzwOqi6fyWv0ct8CR6Jr7He_P_k,10173
+modal-0.73.152.dist-info/METADATA,sha256=uB-4bcV49TVPAV-c6QD7iVfnwrUu91e0Qdg4f6xKddI,2453
+modal-0.73.152.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+modal-0.73.152.dist-info/entry_points.txt,sha256=An-wYgeEUnm6xzrAP9_NTSTSciYvvEWsMZILtYrvpAI,46
+modal-0.73.152.dist-info/top_level.txt,sha256=4BWzoKYREKUZ5iyPzZpjqx4G8uB5TWxXPDwibLcVa7k,43
+modal-0.73.152.dist-info/RECORD,,

modal_proto/api.proto

@@ -1308,7 +1308,7 @@ message Function {
   bool _experimental_enable_gpu_snapshot = 78; // Experimental support for GPU snapshotting
 
   AutoscalerSettings autoscaler_settings = 79;  // Bundle of parameters related to autoscaling
-
+  FunctionSchema function_schema = 80;
 }
 
 message FunctionAsyncInvokeRequest {
@@ -1457,7 +1457,7 @@ message FunctionData {
   bool runtime_perf_record = 29; // For internal debugging use only.
 
   AutoscalerSettings autoscaler_settings = 31;  // Bundle of parameters related to autoscaling
-
+  FunctionSchema function_schema = 32;
 }
 
 message FunctionExtended {
@@ -1591,6 +1591,7 @@ message FunctionHandleMetadata {
   ClassParameterInfo class_parameter_info = 43;
   // Mapping of method names to their metadata, only non-empty for class service functions
   map<string, FunctionHandleMetadata> method_handle_metadata = 44;
+  FunctionSchema function_schema = 45;
 }
 
 message FunctionInput {
@@ -1647,6 +1648,7 @@ message FunctionPrecreateRequest {
   string use_method_name = 7;  // for class methods - this method name needs to be included in the FunctionInput
   // Mapping of method names to method definitions, only non-empty for class service functions
   map<string, MethodDefinition> method_definitions = 8;
+  FunctionSchema function_schema = 9;
 }
 
 message FunctionPrecreateResponse {
@@ -1712,6 +1714,16 @@ message FunctionRetryPolicy {
   uint32 retries = 18;
 }
 
+message FunctionSchema {
+  enum FunctionSchemaType {
+    FUNCTION_SCHEMA_UNSPECIFIED = 0;
+    FUNCTION_SCHEMA_V1 = 1;
+  }
+  FunctionSchemaType schema_type = 1; // allows easy disambiguation between empty schema and no schema collection etc.
+  repeated ClassParameterSpec arguments = 2;
+  GenericPayloadType return_type = 3;
+}
+
 message FunctionStats {
   uint32 backlog = 1;
   uint32 num_total_tasks = 3;
@@ -1891,6 +1903,7 @@ message MethodDefinition {
   string web_url = 4;
   WebUrlInfo web_url_info = 5;
   repeated CustomDomainInfo custom_domain_info = 6;
+  FunctionSchema function_schema = 7;
 }
 
 message MountFile {
@@ -2880,17 +2893,12 @@ message VolumeMount {
 }
 
 message VolumePutFiles2Request {
-  // List of files, sorted lexicographically by `path`.
+  // List of files to put/upload.
   repeated File files = 1;
 
-  // The last time the client called `VolumePutFiles2` for this file, it was
-  // told that some blocks were missing. This field contains information
-  // about the client having uploaded those missing blocks.
-  repeated NewBlock new_blocks = 2;
-
   // If set to true, prevent overwriting existing files. (Note that we don't
   // allow overwriting existing directories with uploaded files regardless.)
-  bool disallow_overwrite_existing_files = 3;
+  bool disallow_overwrite_existing_files = 2;
 
   message File {
     // Destination path of the file to be uploaded, including any parent dirs
@@ -2900,22 +2908,22 @@ message VolumePutFiles2Request {
     // The total size of the file, in bytes.
     uint64 size = 2;
 
-    // SHA-256 checksum of each 8MiB block of the file's contents, in binary
-    // (ie 32 raw bytes) format for compactness.
-    repeated bytes blocks_sha256 = 3;
+    // The blocks, in units of 8MiB, that this file consists of.
+    repeated Block blocks = 3;
   }
 
-  message NewBlock {
-    // Index of the file in the `files` field.
-    uint64 file_index = 1;
-
-    // The index of the block in `files[file_index].blocks_sha256`.
-    uint64 block_index = 2;
-
-    // The raw bytes of the body that was returned from the HTTP PUT request
-    // when the client made a request for the `put_url` returned in the
-    // previous `VolumePutFiles2Response`.
-    bytes put_response = 3;
+  message Block {
+    // The SHA256 digest of the contents of this block, in raw (ie. 32 bytes)
+    // form for compactness.
+    bytes contents_sha256 = 1;
+
+    // From a previous call to `VolumePutFiles2`, we might have gotten a
+    // response indicating that this block was missing.
+    //
+    // For such a block, this field contains the raw bytes of the body that
+    // was returned from the HTTP PUT request when the client made a request
+    // for the `put_url` returned in the previous `VolumePutFiles2Response`.
+    optional bytes put_response = 2;
   }
 }
 
@@ -2934,8 +2942,8 @@ message VolumePutFiles2Response {
     // Index of the file in the original `files` field of the request.
     uint64 file_index = 1;
 
-    // The index of the block in the original
-    // `files[file_index].blocks_sha256`.
+    // The index of the block in the original `files[file_index].blocks` of the
+    // request.
     uint64 block_index = 2;
 
     // Make a HTTP PUT request to this endpoint with the blocks' contents as