🎨 Batch api-server->wb-api-server requests in map endpoint in the api-server

packages/models-library/src/models_library/functions.py

@@ -1,7 +1,7 @@
 import datetime
 from collections.abc import Mapping
 from enum import Enum
-from typing import Annotated, Any, Literal, TypeAlias
+from typing import Annotated, Any, Final, Literal, TypeAlias
 from uuid import UUID
 
 from models_library import projects
@@ -23,6 +23,8 @@
 FileID: TypeAlias = UUID
 
 InputTypes: TypeAlias = FileID | float | int | bool | str | list
+_MIN_LIST_LENGTH: Final[int] = 1
+_MAX_LIST_LENGTH: Final[int] = 50
 
 
 class FunctionSchemaClass(str, Enum):
@@ -80,9 +82,10 @@ class FunctionClass(str, Enum):
 
 FunctionInputsList: TypeAlias = Annotated[
     list[FunctionInputs],
-    Field(max_length=50),
+    Field(max_length=_MAX_LIST_LENGTH, min_length=_MIN_LIST_LENGTH),
 ]
 
+
 FunctionOutputs: TypeAlias = dict[str, Any] | None
 
 FunctionOutputsLogfile: TypeAlias = Any
@@ -238,6 +241,9 @@ class RegisteredPythonCodeFunctionJobPatch(BaseModel):
     ProjectFunctionJob | PythonCodeFunctionJob | SolverFunctionJob,
     Field(discriminator="function_class"),
 ]
+FunctionJobList: TypeAlias = Annotated[
+    list[FunctionJob], Field(max_length=_MAX_LIST_LENGTH, min_length=_MIN_LIST_LENGTH)
+]
 
 
 class RegisteredFunctionJobBase(FunctionJobBase):
@@ -263,6 +269,11 @@ class RegisteredPythonCodeFunctionJob(PythonCodeFunctionJob, RegisteredFunctionJ
     | RegisteredSolverFunctionJob,
     Field(discriminator="function_class"),
 ]
+RegisteredFunctionJobList: TypeAlias = Annotated[
+    list[RegisteredFunctionJob],
+    Field(max_length=_MAX_LIST_LENGTH, min_length=_MIN_LIST_LENGTH),
+]
+
 
 RegisteredFunctionJobPatch = Annotated[
     RegisteredProjectFunctionJobPatch
@@ -272,6 +283,28 @@ class RegisteredPythonCodeFunctionJob(PythonCodeFunctionJob, RegisteredFunctionJ
 ]
 
 
+class RegisteredProjectFunctionJobPatchInput(BaseModel):
+    uid: FunctionJobID
+    patch: RegisteredProjectFunctionJobPatch
+
+
+RegisteredProjectFunctionJobPatchInputList: TypeAlias = Annotated[
+    list[RegisteredProjectFunctionJobPatchInput],
+    Field(max_length=_MAX_LIST_LENGTH, min_length=_MIN_LIST_LENGTH),
+]
+
+
+class RegisteredSolverFunctionJobPatchInput(BaseModel):
+    uid: FunctionJobID
+    patch: RegisteredSolverFunctionJobPatch
+
+
+RegisteredSolverFunctionJobPatchInputList: TypeAlias = Annotated[
+    list[RegisteredSolverFunctionJobPatchInput],
+    Field(max_length=_MAX_LIST_LENGTH, min_length=_MIN_LIST_LENGTH),
+]
+
+
 class FunctionJobStatus(BaseModel):
     status: str
 

packages/models-library/src/models_library/functions_errors.py

@@ -170,3 +170,8 @@ class FunctionJobCollectionsExecuteApiAccessDeniedError(FunctionBaseError):
 class FunctionJobPatchModelIncompatibleError(FunctionBaseError):
     msg_template = "Incompatible patch model for Function '{function_id}' in product '{product_name}'."
     status_code: int = 422
+
+
+class FunctionUnrecoverableError(FunctionBaseError):
+    msg_template = "Unrecoverable error."
+    status_code: int = 500

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/functions/functions_rpc_interface.py

@@ -21,12 +21,14 @@
 from models_library.functions import (
     FunctionClass,
     FunctionGroupAccessRights,
+    FunctionInputsList,
     FunctionJobStatus,
     FunctionOutputs,
     FunctionUserAccessRights,
     FunctionUserApiAccessRights,
-    RegisteredFunctionJobPatch,
     RegisteredFunctionJobWithStatus,
+    RegisteredProjectFunctionJobPatchInputList,
+    RegisteredSolverFunctionJobPatchInputList,
 )
 from models_library.products import ProductName
 from models_library.rabbitmq_basic_types import RPCMethodName
@@ -365,19 +367,20 @@ async def patch_registered_function_job(
     *,
     user_id: UserID,
     product_name: ProductName,
-    function_job_uuid: FunctionJobID,
-    registered_function_job_patch: RegisteredFunctionJobPatch,
-) -> RegisteredFunctionJob:
+    registered_function_job_patch_inputs: (
+        RegisteredProjectFunctionJobPatchInputList
+        | RegisteredSolverFunctionJobPatchInputList
+    ),
+) -> list[RegisteredFunctionJob]:
     result = await rabbitmq_rpc_client.request(
         DEFAULT_WEBSERVER_RPC_NAMESPACE,
         TypeAdapter(RPCMethodName).validate_python("patch_registered_function_job"),
         user_id=user_id,
         product_name=product_name,
-        function_job_uuid=function_job_uuid,
-        registered_function_job_patch=registered_function_job_patch,
+        registered_function_job_patch_inputs=registered_function_job_patch_inputs,
         timeout_s=_FUNCTION_RPC_TIMEOUT_SEC,
     )
-    return TypeAdapter(RegisteredFunctionJob).validate_python(
+    return TypeAdapter(list[RegisteredFunctionJob]).validate_python(
         result
     )  # Validates the result as a RegisteredFunctionJob
 
@@ -512,20 +515,20 @@ async def find_cached_function_jobs(
     user_id: UserID,
     product_name: ProductName,
     function_id: FunctionID,
-    inputs: FunctionInputs,
-) -> list[RegisteredFunctionJob] | None:
+    inputs: FunctionInputsList,
+    status_filter: list[FunctionJobStatus] | None = None,
+) -> list[RegisteredFunctionJob | None]:
     result = await rabbitmq_rpc_client.request(
         DEFAULT_WEBSERVER_RPC_NAMESPACE,
         TypeAdapter(RPCMethodName).validate_python("find_cached_function_jobs"),
         function_id=function_id,
         inputs=inputs,
+        status_filter=status_filter,
         user_id=user_id,
         product_name=product_name,
         timeout_s=_FUNCTION_RPC_TIMEOUT_SEC,
     )
-    if result is None:
-        return None
-    return TypeAdapter(list[RegisteredFunctionJob]).validate_python(result)
+    return TypeAdapter(list[RegisteredFunctionJob | None]).validate_python(result)
 
 
 @log_decorator(_logger, level=logging.DEBUG)

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/webserver/v1/functions.py

@@ -7,7 +7,6 @@
     FunctionID,
     FunctionInputs,
     FunctionInputSchema,
-    FunctionJob,
     FunctionJobCollection,
     FunctionJobCollectionID,
     FunctionJobCollectionsListFilters,
@@ -20,12 +19,16 @@
 from models_library.functions import (
     FunctionClass,
     FunctionGroupAccessRights,
+    FunctionInputsList,
+    FunctionJobList,
     FunctionJobStatus,
     FunctionOutputs,
     FunctionUserAccessRights,
     FunctionUserApiAccessRights,
-    RegisteredFunctionJobPatch,
+    RegisteredFunctionJobList,
     RegisteredFunctionJobWithStatus,
+    RegisteredProjectFunctionJobPatchInputList,
+    RegisteredSolverFunctionJobPatchInputList,
 )
 from models_library.products import ProductName
 from models_library.rabbitmq_basic_types import RPCNamespace
@@ -317,15 +320,15 @@ async def register_function_job(
         *,
         product_name: ProductName,
         user_id: UserID,
-        function_job: FunctionJob,
-    ) -> RegisteredFunctionJob:
+        function_jobs: FunctionJobList,
+    ) -> RegisteredFunctionJobList:
         """Register a function job."""
-        return TypeAdapter(RegisteredFunctionJob).validate_python(
+        return TypeAdapter(RegisteredFunctionJobList).validate_python(
             await self._request(
                 "register_function_job",
                 product_name=product_name,
                 user_id=user_id,
-                function_job=function_job,
+                function_jobs=function_jobs,
             ),
         )
 
@@ -334,17 +337,18 @@ async def patch_registered_function_job(
         *,
         product_name: ProductName,
         user_id: UserID,
-        function_job_uuid: FunctionJobID,
-        registered_function_job_patch: RegisteredFunctionJobPatch,
-    ) -> RegisteredFunctionJob:
+        registered_function_job_patch_inputs: (
+            RegisteredProjectFunctionJobPatchInputList
+            | RegisteredSolverFunctionJobPatchInputList
+        ),
+    ) -> list[RegisteredFunctionJob]:
         """Patch a registered function job."""
-        return TypeAdapter(RegisteredFunctionJob).validate_python(
+        return TypeAdapter(list[RegisteredFunctionJob]).validate_python(
             await self._request(
                 "patch_registered_function_job",
                 product_name=product_name,
                 user_id=user_id,
-                function_job_uuid=function_job_uuid,
-                registered_function_job_patch=registered_function_job_patch,
+                registered_function_job_patch_inputs=registered_function_job_patch_inputs,
             ),
         )
 
@@ -462,16 +466,18 @@ async def find_cached_function_jobs(
         product_name: ProductName,
         user_id: UserID,
         function_id: FunctionID,
-        inputs: FunctionInputs,
-    ) -> list[RegisteredFunctionJob] | None:
+        inputs: FunctionInputsList,
+        status_filter: list[FunctionJobStatus] | None = None,
+    ) -> list[RegisteredFunctionJob | None]:
         """Find cached function jobs."""
-        return TypeAdapter(list[RegisteredFunctionJob] | None).validate_python(
+        return TypeAdapter(list[RegisteredFunctionJob | None]).validate_python(
             await self._request(
                 "find_cached_function_jobs",
                 product_name=product_name,
                 user_id=user_id,
                 function_id=function_id,
                 inputs=inputs,
+                status_filter=status_filter,
             ),
         )
 

services/api-server/openapi.json

@@ -1,3 +1,3 @@
 {
   "openapi": "3.1.0",
   "info": {
@@ -8240,6 +8240,7 @@
                     }
                   ]
                 },
+                "minItems": 1,
                 "maxItems": 50,
                 "title": "Function Inputs List"
               }