fix tests

Author: bisgaard-itis

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

@@ -17,6 +17,7 @@
     RegisteredFunctionJobCollection,
 )
 from models_library.functions import (
+    BatchCreateRegisteredFunctionJobs,
     FunctionClass,
     FunctionGroupAccessRights,
     FunctionInputsList,
@@ -26,7 +27,6 @@
     FunctionOutputs,
     FunctionUserAccessRights,
     FunctionUserApiAccessRights,
-    RegisteredFunctionJobList,
     RegisteredFunctionJobWithStatus,
     RegisteredProjectFunctionJobPatchInputList,
     RegisteredSolverFunctionJobPatchInputList,
@@ -339,9 +339,9 @@ async def register_function_job_batch(
         product_name: ProductName,
         user_id: UserID,
         function_jobs: FunctionJobList,
-    ) -> RegisteredFunctionJobList:
+    ) -> BatchCreateRegisteredFunctionJobs:
         """Register a function job."""
-        return TypeAdapter(RegisteredFunctionJobList).validate_python(
+        return TypeAdapter(BatchCreateRegisteredFunctionJobs).validate_python(
             await self._request(
                 "register_function_job_batch",
                 product_name=product_name,

services/web/server/src/simcore_service_webserver/functions/_controller/_functions_rpc.py

@@ -2,6 +2,7 @@
 
 from aiohttp import web
 from models_library.functions import (
+    BatchCreateRegisteredFunctionJobs,
     Function,
     FunctionAccessRights,
     FunctionClass,
@@ -23,7 +24,6 @@
     RegisteredFunction,
     RegisteredFunctionJob,
     RegisteredFunctionJobCollection,
-    RegisteredFunctionJobList,
     RegisteredFunctionJobWithStatus,
     RegisteredProjectFunctionJobPatchInputList,
     RegisteredSolverFunctionJobPatchInputList,
@@ -115,7 +115,7 @@ async def register_function_job_batch(
     user_id: UserID,
     product_name: ProductName,
     function_jobs: FunctionJobList,
-) -> RegisteredFunctionJobList:
+) -> BatchCreateRegisteredFunctionJobs:
     return await _functions_service.register_function_job_batch(
         app=app, 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

@@ -69,11 +69,14 @@ async def test_function_job_collection(
         for _ in range(3)
     ]
     # Register the function jobs
-    registered_jobs = await webserver_rpc_client.functions.register_function_job_batch(
-        function_jobs=TypeAdapter(FunctionJobList).validate_python(function_jobs),
-        user_id=logged_user["id"],
-        product_name=osparc_product_name,
+    registered_jobs_batch_create = (
+        await webserver_rpc_client.functions.register_function_job_batch(
+            function_jobs=TypeAdapter(FunctionJobList).validate_python(function_jobs),
+            user_id=logged_user["id"],
+            product_name=osparc_product_name,
+        )
     )
+    registered_jobs = registered_jobs_batch_create.created_items
     assert len(registered_jobs) == 3
     assert all(job.uid is not None for job in registered_jobs)
     function_job_ids = [job.uid for job in registered_jobs]
@@ -197,11 +200,14 @@ async def test_create_function_job_collection_same_function_job_uuid(
         job_creation_task_id=None,
     )
     # Register the function job
-    registered_jobs = await webserver_rpc_client.functions.register_function_job_batch(
-        function_jobs=[registered_function_job],
-        user_id=logged_user["id"],
-        product_name=osparc_product_name,
+    registered_jobs_batch_create = (
+        await webserver_rpc_client.functions.register_function_job_batch(
+            function_jobs=[registered_function_job],
+            user_id=logged_user["id"],
+            product_name=osparc_product_name,
+        )
     )
+    registered_jobs = registered_jobs_batch_create.created_items
     assert len(registered_jobs) == 1
     registered_job = registered_jobs[0]
     assert registered_job.uid is not None
@@ -271,11 +277,15 @@ async def test_list_function_job_collections(
         for _ in range(3)
     ]
     # Register the function jobs
-    registered_jobs = await webserver_rpc_client.functions.register_function_job_batch(
-        function_jobs=TypeAdapter(FunctionJobList).validate_python(function_jobs),
-        user_id=logged_user["id"],
-        product_name=osparc_product_name,
+    registered_jobs_batch_create = (
+        await webserver_rpc_client.functions.register_function_job_batch(
+            function_jobs=TypeAdapter(FunctionJobList).validate_python(function_jobs),
+            user_id=logged_user["id"],
+            product_name=osparc_product_name,
+        )
     )
+    registered_jobs = registered_jobs_batch_create.created_items
+    assert len(registered_jobs) == 3
     assert all(job.uid is not None for job in registered_jobs)
 
     function_job_collection = FunctionJobCollection(
@@ -367,7 +377,7 @@ async def test_list_function_job_collections_filtered_function_id(
             for _ in range(3)
         ]
         # Register the function job
-        registered_jobs = (
+        registered_jobs_batch_create = (
             await webserver_rpc_client.functions.register_function_job_batch(
                 function_jobs=TypeAdapter(FunctionJobList).validate_python(
                     function_jobs
@@ -376,6 +386,8 @@ async def test_list_function_job_collections_filtered_function_id(
                 product_name=osparc_product_name,
             )
         )
+        registered_jobs = registered_jobs_batch_create.created_items
+        assert len(registered_jobs) == 3
         assert all(job.uid for job in registered_jobs)
         function_job_ids = [job.uid for job in registered_jobs]
 

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

@@ -79,11 +79,14 @@ async def test_register_get_delete_function_job(
     )
 
     # Register the function job
-    registered_jobs = await webserver_rpc_client.functions.register_function_job_batch(
-        function_jobs=[function_job],
-        user_id=logged_user["id"],
-        product_name=osparc_product_name,
+    registered_jobs_batch_create = (
+        await webserver_rpc_client.functions.register_function_job_batch(
+            function_jobs=[function_job],
+            user_id=logged_user["id"],
+            product_name=osparc_product_name,
+        )
     )
+    registered_jobs = registered_jobs_batch_create.created_items
     assert len(registered_jobs) == 1
     registered_job = registered_jobs[0]
 
@@ -199,11 +202,14 @@ async def test_list_function_jobs(
     )
 
     # Register the function job
-    registered_jobs = await webserver_rpc_client.functions.register_function_job_batch(
-        function_jobs=[function_job],
-        user_id=logged_user["id"],
-        product_name=osparc_product_name,
+    registered_jobs_batch_create = (
+        await webserver_rpc_client.functions.register_function_job_batch(
+            function_jobs=[function_job],
+            user_id=logged_user["id"],
+            product_name=osparc_product_name,
+        )
     )
+    registered_jobs = registered_jobs_batch_create.created_items
     assert len(registered_jobs) == 1
     registered_job = registered_jobs[0]
 
@@ -444,10 +450,12 @@ async def test_find_cached_function_jobs(
     ]
 
     # Register the function job
-    await webserver_rpc_client.functions.register_function_job_batch(
-        function_jobs=TypeAdapter(FunctionJobList).validate_python(function_jobs),
-        user_id=logged_user["id"],
-        product_name=osparc_product_name,
+    registered_jobs_batch_create = (
+        await webserver_rpc_client.functions.register_function_job_batch(
+            function_jobs=TypeAdapter(FunctionJobList).validate_python(function_jobs),
+            user_id=logged_user["id"],
+            product_name=osparc_product_name,
+        )
     )
 
     # Find cached function jobs