move validate_function_inputs

Author: bisgaard-itis

services/api-server/src/simcore_service_api_server/_service_function_jobs.py

@@ -1,6 +1,7 @@
 from collections.abc import Callable
 from dataclasses import dataclass
 
+import jsonschema
 from common_library.exclude import as_dict_exclude_none
 from models_library.functions import (
     FunctionClass,
@@ -11,6 +12,7 @@
     FunctionJobCollectionID,
     FunctionJobID,
     FunctionJobStatus,
+    FunctionSchemaClass,
     ProjectFunctionJob,
     RegisteredFunction,
     RegisteredFunctionJob,
@@ -31,6 +33,7 @@
 from models_library.rest_pagination import PageMetaInfoLimitOffset, PageOffsetInt
 from models_library.rpc_pagination import PageLimitInt
 from models_library.users import UserID
+from pydantic import ValidationError
 
 from ._service_jobs import JobService
 from .models.schemas.jobs import JobInputs, JobPricingSpecification
@@ -82,8 +85,34 @@ async def list_function_jobs(
             **pagination_kwargs,
         )
 
-    async def validate_function_inputs(self, *args, **kwargs) -> tuple[bool, str]:
-        return True, ""
+    async def validate_function_inputs(
+        self, *, function_id: FunctionID, inputs: FunctionInputs
+    ) -> tuple[bool, str]:
+        function = await self._web_rpc_client.get_function(
+            function_id=function_id,
+            user_id=self.user_id,
+            product_name=self.product_name,
+        )
+
+        if (
+            function.input_schema is None
+            or function.input_schema.schema_content is None
+        ):
+            return True, "No input schema defined for this function"
+
+        if function.input_schema.schema_class == FunctionSchemaClass.json_schema:
+            try:
+                jsonschema.validate(
+                    instance=inputs, schema=function.input_schema.schema_content
+                )
+            except ValidationError as err:
+                return False, str(err)
+            return True, "Inputs are valid"
+
+        return (
+            False,
+            f"Unsupported function schema class {function.input_schema.schema_class}",
+        )
 
     async def inspect_function_job(
         self, function: RegisteredFunction, function_job: RegisteredFunctionJob

services/api-server/src/simcore_service_api_server/api/routes/functions_routes.py

@@ -2,19 +2,16 @@
 from collections.abc import Callable
 from typing import Annotated, Final, Literal
 
-import jsonschema
 from fastapi import APIRouter, Depends, Header, Request, status
 from fastapi_pagination.api import create_page
 from fastapi_pagination.bases import AbstractPage
-from jsonschema import ValidationError
 from models_library.api_schemas_api_server.functions import (
     Function,
     FunctionID,
     FunctionInputs,
     FunctionInputSchema,
     FunctionInputsList,
     FunctionOutputSchema,
-    FunctionSchemaClass,
     RegisteredFunction,
     RegisteredFunctionJob,
     RegisteredFunctionJobCollection,
@@ -295,29 +292,13 @@ async def get_function_outputschema(
 async def validate_function_inputs(
     function_id: FunctionID,
     inputs: FunctionInputs,
-    wb_api_rpc: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
-    user_id: Annotated[UserID, Depends(get_current_user_id)],
-    product_name: Annotated[ProductName, Depends(get_product_name)],
+    function_job_service: Annotated[
+        FunctionJobService, Depends(get_function_job_service)
+    ],
 ) -> tuple[bool, str]:
-    function = await wb_api_rpc.get_function(
-        function_id=function_id, user_id=user_id, product_name=product_name
-    )
-
-    if function.input_schema is None or function.input_schema.schema_content is None:
-        return True, "No input schema defined for this function"
-
-    if function.input_schema.schema_class == FunctionSchemaClass.json_schema:
-        try:
-            jsonschema.validate(
-                instance=inputs, schema=function.input_schema.schema_content
-            )
-        except ValidationError as err:
-            return False, str(err)
-        return True, "Inputs are valid"
-
-    return (
-        False,
-        f"Unsupported function schema class {function.input_schema.schema_class}",
+    return await function_job_service.validate_function_inputs(
+        function_id=function_id,
+        inputs=inputs,
     )