status_filter -> cached_job_statuses

Author: bisgaard-itis

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

@@ -500,7 +500,7 @@ async def find_cached_function_jobs(
         user_id: UserID,
         function_id: FunctionID,
         inputs: FunctionInputsList,
-        status_filter: list[FunctionJobStatus] | None = None,
+        cached_job_statuses: list[FunctionJobStatus] | None = None,
     ) -> list[RegisteredFunctionJob | None]:
         """Find cached function jobs."""
         return TypeAdapter(list[RegisteredFunctionJob | None]).validate_python(
@@ -510,7 +510,7 @@ async def find_cached_function_jobs(
                 user_id=user_id,
                 function_id=function_id,
                 inputs=inputs,
-                status_filter=status_filter,
+                cached_job_statuses=cached_job_statuses,
             ),
         )
 

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

@@ -136,13 +136,13 @@ async def batch_pre_register_function_jobs(
         self,
         *,
         function: RegisteredFunction,
-        job_inputs: list[JobInputs],
+        job_input_list: list[JobInputs],
     ) -> list[PreRegisteredFunctionJobData]:
 
         if function.input_schema is not None:
             is_valid, validation_str = await self.validate_function_inputs(
                 function=function,
-                job_inputs=job_inputs,
+                job_inputs=job_input_list,
             )
             if not is_valid:
                 raise FunctionInputsValidationError(error=validation_str)
@@ -159,7 +159,7 @@ async def batch_pre_register_function_jobs(
                     project_job_id=None,
                     job_creation_task_id=None,
                 )
-                for input_ in job_inputs
+                for input_ in job_input_list
             ]
             batch_registered_jobs = (
                 await self._web_rpc_client.batch_register_function_jobs(
@@ -183,7 +183,7 @@ async def batch_pre_register_function_jobs(
                     solver_job_id=None,
                     job_creation_task_id=None,
                 )
-                for input_ in job_inputs
+                for input_ in job_input_list
             ]
             batch_registered_jobs = (
                 await self._web_rpc_client.batch_register_function_jobs(
@@ -205,7 +205,7 @@ async def batch_pre_register_function_jobs(
                 function_job_id=job.uid,
                 job_inputs=input_,
             )
-            for job, input_ in zip(jobs, job_inputs)
+            for job, input_ in zip(jobs, job_input_list)
         ]
 
     async def batch_patch_registered_function_job(

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

@@ -332,7 +332,7 @@ async def create_function_job_creation_tasks(
         pre_registered_function_job_data_list = (
             await self._function_job_service.batch_pre_register_function_jobs(
                 function=function,
-                job_inputs=[JobInputs(values=_ or {}) for _ in uncached_inputs],
+                job_input_list=[JobInputs(values=_ or {}) for _ in uncached_inputs],
             )
         )
 

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

@@ -629,7 +629,7 @@ async def find_cached_function_jobs(
             product_name=product_name,
             function_id=function_id,
             inputs=inputs,
-            status_filter=status_filter,
+            cached_job_statuses=status_filter,
         )
 
     async def get_function_job_collection(

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

@@ -489,15 +489,15 @@ async def find_cached_function_jobs(
     product_name: ProductName,
     function_id: FunctionID,
     inputs: FunctionInputsList,
-    status_filter: list[FunctionJobStatus] | None,
+    cached_job_statuses: list[FunctionJobStatus] | None,
 ) -> list[RegisteredFunctionJob | None]:
     retrieved_cached_function_jobs = await _functions_service.find_cached_function_jobs(
         app=app,
         user_id=user_id,
         product_name=product_name,
         function_id=function_id,
         inputs=inputs,
-        status_filter=status_filter,
+        cached_job_statuses=cached_job_statuses,
     )
     assert len(retrieved_cached_function_jobs) == len(inputs)  # nosec
     return retrieved_cached_function_jobs

services/web/server/src/simcore_service_webserver/functions/_function_jobs_repository.py

@@ -325,7 +325,7 @@ async def find_cached_function_jobs(
     function_id: FunctionID,
     product_name: ProductName,
     inputs: FunctionInputsList,
-    status_filter: list[FunctionJobStatus] | None = None,
+    cached_job_statuses: list[FunctionJobStatus] | None = None,
 ) -> list[RegisteredFunctionJobDB | None]:
     async with pass_or_acquire_connection(get_asyncpg_engine(app), connection) as conn:
         # Get user groups for access check
@@ -352,9 +352,9 @@ async def find_cached_function_jobs(
             function_jobs_table.c.uuid.in_(access_subquery),
             (
                 function_jobs_table.c.status.in_(
-                    [status.status for status in status_filter]
+                    [status.status for status in cached_job_statuses]
                 )
-                if status_filter is not None
+                if cached_job_statuses is not None
                 else sqlalchemy.sql.true()
             ),
         )

services/web/server/src/simcore_service_webserver/functions/_functions_service.py

@@ -455,15 +455,15 @@ async def find_cached_function_jobs(
     product_name: ProductName,
     function_id: FunctionID,
     inputs: FunctionInputsList,
-    status_filter: list[FunctionJobStatus] | None = None,
+    cached_job_statuses: list[FunctionJobStatus] | None = None,
 ) -> list[RegisteredFunctionJob | None]:
     returned_function_jobs = await _function_jobs_repository.find_cached_function_jobs(
         app=app,
         user_id=user_id,
         product_name=product_name,
         function_id=function_id,
         inputs=inputs,
-        status_filter=status_filter,
+        cached_job_statuses=cached_job_statuses,
     )
     assert len(returned_function_jobs) == len(inputs)  # nosec
 

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

@@ -536,7 +536,7 @@ async def test_find_cached_function_jobs_with_status(
         product_name=osparc_product_name,
         user_id=logged_user["id"],
         inputs=[input_],
-        status_filter=[status],
+        cached_job_statuses=[status],
     )
     assert len(cached_jobs) == 1
     cached_job = cached_jobs[0]