start using batch register function jobs in api-server

Author: bisgaard-itis

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

@@ -333,7 +333,7 @@ async def register_function_job(
             ),
         )
 
-    async def register_function_job_batch(
+    async def batch_register_function_jobs(
         self,
         *,
         product_name: ProductName,

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

@@ -163,13 +163,16 @@ async def pre_register_function_job(
                 )
                 for input_ in job_inputs
             ]
-            jobs = await self._web_rpc_client.register_function_job(
-                function_jobs=TypeAdapter(FunctionJobList).validate_python(
-                    function_jobs
-                ),
-                user_id=self.user_id,
-                product_name=self.product_name,
+            batch_registered_jobs = (
+                await self._web_rpc_client.batch_register_function_jobs(
+                    function_jobs=TypeAdapter(FunctionJobList).validate_python(
+                        function_jobs
+                    ),
+                    user_id=self.user_id,
+                    product_name=self.product_name,
+                )
             )
+            jobs = batch_registered_jobs.created_items
 
         elif function.function_class == FunctionClass.SOLVER:
             function_jobs = [
@@ -184,13 +187,16 @@ async def pre_register_function_job(
                 )
                 for input_ in job_inputs
             ]
-            jobs = await self._web_rpc_client.register_function_job(
-                function_jobs=TypeAdapter(FunctionJobList).validate_python(
-                    function_jobs
-                ),
-                user_id=self.user_id,
-                product_name=self.product_name,
+            batch_registered_jobs = (
+                await self._web_rpc_client.batch_register_function_jobs(
+                    function_jobs=TypeAdapter(FunctionJobList).validate_python(
+                        function_jobs
+                    ),
+                    user_id=self.user_id,
+                    product_name=self.product_name,
+                )
             )
+            jobs = batch_registered_jobs.created_items
         else:
             raise UnsupportedFunctionClassError(
                 function_class=function.function_class,

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

@@ -172,11 +172,10 @@ async def register_function_job(
     user_id: Annotated[UserID, Depends(get_current_user_id)],
     product_name: Annotated[ProductName, Depends(get_product_name)],
 ) -> RegisteredFunctionJob:
-    registered_jobs = await wb_api_rpc.register_function_job(
-        function_jobs=[function_job], user_id=user_id, product_name=product_name
+    registered_job = await wb_api_rpc.register_function_job(
+        function_job=function_job, user_id=user_id, product_name=product_name
     )
-    assert len(registered_jobs) == 1  # nosec
-    return registered_jobs[0]
+    return registered_job
 
 
 @function_job_router.get(

services/api-server/src/simcore_service_api_server/services_rpc/wb_api_server.py

@@ -23,13 +23,14 @@
 )
 from models_library.api_schemas_webserver.licensed_items import LicensedItemRpcGetPage
 from models_library.functions import (
+    BatchCreateRegisteredFunctionJobs,
     FunctionInputsList,
+    FunctionJob,
     FunctionJobList,
     FunctionJobStatus,
     FunctionOutputs,
     FunctionUserAccessRights,
     FunctionUserApiAccessRights,
-    RegisteredFunctionJobList,
     RegisteredFunctionJobWithStatus,
     RegisteredProjectFunctionJobPatchInputList,
     RegisteredSolverFunctionJobPatchInputList,
@@ -487,10 +488,23 @@ async def register_function_job(
         self,
         *,
         user_id: UserID,
-        function_jobs: FunctionJobList,
+        function_job: FunctionJob,
         product_name: ProductName,
-    ) -> RegisteredFunctionJobList:
+    ) -> RegisteredFunctionJob:
         return await self._rpc_client.functions.register_function_job(
+            user_id=user_id,
+            product_name=product_name,
+            function_job=function_job,
+        )
+
+    async def batch_register_function_jobs(
+        self,
+        *,
+        user_id: UserID,
+        function_jobs: FunctionJobList,
+        product_name: ProductName,
+    ) -> BatchCreateRegisteredFunctionJobs:
+        return await self._rpc_client.functions.batch_register_function_jobs(
             user_id=user_id,
             product_name=product_name,
             function_jobs=function_jobs,

services/web/server/tests/unit/with_dbs/04/functions/wb-api-server/test_function_job_collections_controller_rpc.py

@@ -70,7 +70,7 @@ async def test_function_job_collection(
     ]
     # Register the function jobs
     registered_jobs_batch_create = (
-        await webserver_rpc_client.functions.register_function_job_batch(
+        await webserver_rpc_client.functions.batch_register_function_jobs(
             function_jobs=TypeAdapter(FunctionJobList).validate_python(function_jobs),
             user_id=logged_user["id"],
             product_name=osparc_product_name,
@@ -201,7 +201,7 @@ async def test_create_function_job_collection_same_function_job_uuid(
     )
     # Register the function job
     registered_jobs_batch_create = (
-        await webserver_rpc_client.functions.register_function_job_batch(
+        await webserver_rpc_client.functions.batch_register_function_jobs(
             function_jobs=[registered_function_job],
             user_id=logged_user["id"],
             product_name=osparc_product_name,
@@ -278,7 +278,7 @@ async def test_list_function_job_collections(
     ]
     # Register the function jobs
     registered_jobs_batch_create = (
-        await webserver_rpc_client.functions.register_function_job_batch(
+        await webserver_rpc_client.functions.batch_register_function_jobs(
             function_jobs=TypeAdapter(FunctionJobList).validate_python(function_jobs),
             user_id=logged_user["id"],
             product_name=osparc_product_name,
@@ -378,7 +378,7 @@ async def test_list_function_job_collections_filtered_function_id(
         ]
         # Register the function job
         registered_jobs_batch_create = (
-            await webserver_rpc_client.functions.register_function_job_batch(
+            await webserver_rpc_client.functions.batch_register_function_jobs(
                 function_jobs=TypeAdapter(FunctionJobList).validate_python(
                     function_jobs
                 ),

services/web/server/tests/unit/with_dbs/04/functions/wb-api-server/test_function_jobs_controller_rpc.py

@@ -80,7 +80,7 @@ async def test_register_get_delete_function_job(
 
     # Register the function job
     registered_jobs_batch_create = (
-        await webserver_rpc_client.functions.register_function_job_batch(
+        await webserver_rpc_client.functions.batch_register_function_jobs(
             function_jobs=[function_job],
             user_id=logged_user["id"],
             product_name=osparc_product_name,
@@ -203,7 +203,7 @@ async def test_list_function_jobs(
 
     # Register the function job
     registered_jobs_batch_create = (
-        await webserver_rpc_client.functions.register_function_job_batch(
+        await webserver_rpc_client.functions.batch_register_function_jobs(
             function_jobs=[function_job],
             user_id=logged_user["id"],
             product_name=osparc_product_name,
@@ -451,7 +451,7 @@ async def test_find_cached_function_jobs(
 
     # Register the function job
     registered_jobs_batch_create = (
-        await webserver_rpc_client.functions.register_function_job_batch(
+        await webserver_rpc_client.functions.batch_register_function_jobs(
             function_jobs=TypeAdapter(FunctionJobList).validate_python(function_jobs),
             user_id=logged_user["id"],
             product_name=osparc_product_name,