ensure only pydantic models are passed from function run and map endpoints

Author: bisgaard-itis

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

@@ -1,4 +1,3 @@
-from collections.abc import Callable
 from dataclasses import dataclass
 
 import jsonschema
@@ -36,16 +35,11 @@
 from pydantic import ValidationError
 
 from ._service_jobs import JobService
+from .models.api_resources import JobLinks
 from .models.schemas.jobs import (
     JobInputs,
     JobPricingSpecification,
 )
-from .services_http.solver_job_models_converters import (
-    get_solver_job_rest_interface_links,
-)
-from .services_http.study_job_models_converters import (
-    get_study_job_rest_interface_links,
-)
 from .services_rpc.wb_api_server import WbApiRpcClient
 
 
@@ -172,7 +166,7 @@ async def run_function(
         function: RegisteredFunction,
         function_inputs: FunctionInputs,
         pricing_spec: JobPricingSpecification | None,
-        url_for: Callable,
+        job_links: JobLinks,
         x_simcore_parent_project_uuid: NodeID | None,
         x_simcore_parent_node_id: NodeID | None,
     ) -> RegisteredFunctionJob:
@@ -227,9 +221,6 @@ async def run_function(
                     return cached_function_job
 
         if function.function_class == FunctionClass.PROJECT:
-            job_links = get_study_job_rest_interface_links(
-                url_for=url_for, study_id=function.project_id
-            )
             study_job = await self._job_service.create_studies_job(
                 study_id=function.project_id,
                 job_inputs=JobInputs(values=joined_inputs or {}),
@@ -257,16 +248,11 @@ async def run_function(
             )
 
         if function.function_class == FunctionClass.SOLVER:
-            job_rest_interface_links = get_solver_job_rest_interface_links(
-                url_for=url_for,
-                solver_key=function.solver_key,
-                version=function.solver_version,
-            )
             solver_job = await self._job_service.create_solver_job(
                 solver_key=function.solver_key,
                 version=function.solver_version,
                 inputs=JobInputs(values=joined_inputs or {}),
-                job_links=job_rest_interface_links,
+                job_links=job_links,
                 hidden=True,
                 x_simcore_parent_project_uuid=x_simcore_parent_project_uuid,
                 x_simcore_parent_node_id=x_simcore_parent_node_id,
@@ -299,8 +285,8 @@ async def map_function(
         *,
         function: RegisteredFunction,
         function_inputs_list: FunctionInputsList,
+        job_links: JobLinks,
         pricing_spec: JobPricingSpecification | None,
-        url_for: Callable,
         x_simcore_parent_project_uuid: ProjectID | None,
         x_simcore_parent_node_id: NodeID | None,
     ) -> RegisteredFunctionJobCollection:
@@ -310,7 +296,7 @@ async def map_function(
                 function=function,
                 function_inputs=function_inputs,
                 pricing_spec=pricing_spec,
-                url_for=url_for,
+                job_links=job_links,
                 x_simcore_parent_project_uuid=x_simcore_parent_project_uuid,
                 x_simcore_parent_node_id=x_simcore_parent_node_id,
             )

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

@@ -1,7 +1,9 @@
+from collections.abc import Callable
 from dataclasses import dataclass
 
 from common_library.exclude import as_dict_exclude_none
-from models_library.functions import RegisteredFunction
+from models_library.functions import FunctionClass, RegisteredFunction
+from models_library.functions_errors import UnsupportedFunctionClassError
 from models_library.products import ProductName
 from models_library.rest_pagination import (
     MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE,
@@ -10,7 +12,15 @@
 )
 from models_library.rpc_pagination import PageLimitInt
 from models_library.users import UserID
-from simcore_service_api_server.services_rpc.wb_api_server import WbApiRpcClient
+
+from .models.api_resources import JobLinks
+from .services_http.solver_job_models_converters import (
+    get_solver_job_rest_interface_links,
+)
+from .services_http.study_job_models_converters import (
+    get_study_job_rest_interface_links,
+)
+from .services_rpc.wb_api_server import WbApiRpcClient
 
 DEFAULT_PAGINATION_LIMIT = MAXIMUM_NUMBER_OF_ITEMS_PER_PAGE - 1
 
@@ -38,3 +48,22 @@ async def list_functions(
             product_name=self.product_name,
             **pagination_kwargs,
         )
+
+    async def get_function_job_links(
+        self, function: RegisteredFunction, url_for: Callable
+    ) -> JobLinks:
+        if function.function_class == FunctionClass.SOLVER:
+            return get_solver_job_rest_interface_links(
+                url_for=url_for,
+                solver_key=function.solver_key,
+                version=function.solver_version,
+            )
+        elif function.function_class == FunctionClass.PROJECT:
+            return get_study_job_rest_interface_links(
+                url_for=url_for,
+                study_id=function.project_id,
+            )
+        else:
+            raise UnsupportedFunctionClassError(
+                function_class=function.function_class,
+            )

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

@@ -316,6 +316,7 @@ async def run_function(  # noqa: PLR0913
     to_run_function: Annotated[RegisteredFunction, Depends(get_function)],
     url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
     function_inputs: FunctionInputs,
+    function_service: Annotated[FunctionService, Depends(get_function_service)],
     function_jobs_service: Annotated[
         FunctionJobService, Depends(get_function_job_service)
     ],
@@ -333,11 +334,13 @@ async def run_function(  # noqa: PLR0913
         else None
     )
     pricing_spec = JobPricingSpecification.create_from_headers(request.headers)
+    job_links = await function_service.get_function_job_links(to_run_function, url_for)
+
     return await function_jobs_service.run_function(
         function=to_run_function,
         function_inputs=function_inputs,
         pricing_spec=pricing_spec,
-        url_for=url_for,
+        job_links=job_links,
         x_simcore_parent_project_uuid=parent_project_uuid,
         x_simcore_parent_node_id=parent_node_id,
     )
@@ -388,6 +391,7 @@ async def map_function(  # noqa: PLR0913
     function_jobs_service: Annotated[
         FunctionJobService, Depends(get_function_job_service)
     ],
+    function_service: Annotated[FunctionService, Depends(get_function_service)],
     x_simcore_parent_project_uuid: Annotated[ProjectID | Literal["null"], Header()],
     x_simcore_parent_node_id: Annotated[NodeID | Literal["null"], Header()],
 ) -> RegisteredFunctionJobCollection:
@@ -404,11 +408,13 @@ async def map_function(  # noqa: PLR0913
     )
     pricing_spec = JobPricingSpecification.create_from_headers(request.headers)
 
+    job_links = await function_service.get_function_job_links(to_run_function, url_for)
+
     return await function_jobs_service.map_function(
         function=to_run_function,
         function_inputs_list=function_inputs_list,
         pricing_spec=pricing_spec,
-        url_for=url_for,
+        job_links=job_links,
         x_simcore_parent_project_uuid=parent_project_uuid,
         x_simcore_parent_node_id=parent_node_id,
     )