✨ Rename job_parent_resource_name_filter to job_parent_resource_name_prefix for consistency across the codebase

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/helpers/webserver_rpc_server.py

@@ -57,14 +57,16 @@ async def list_projects_marked_as_jobs(
         offset: PageOffsetInt = 0,
         limit: PageLimitInt = DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
         # filters
-        job_parent_resource_name_filter: str | None = None,
+        job_parent_resource_name_prefix: str | None = None,
     ) -> PageRpcProjectJobRpcGet:
         assert rpc_client
         assert product_name
         assert user_id
 
-        if job_parent_resource_name_filter:
-            assert not job_parent_resource_name_filter.startswith("/")
+        if job_parent_resource_name_prefix:
+            assert not job_parent_resource_name_prefix.startswith("/")
+            assert not job_parent_resource_name_prefix.endswith("%")
+            assert not job_parent_resource_name_prefix.startswith("%")
 
         items = ProjectJobRpcGet.model_json_schema()["examples"]
 

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

@@ -52,7 +52,7 @@ async def list_projects_marked_as_jobs(
     offset: PageOffsetInt = 0,
     limit: PageLimitInt = DEFAULT_NUMBER_OF_ITEMS_PER_PAGE,
     # filters
-    job_parent_resource_name_filter: str | None = None,
+    job_parent_resource_name_prefix: str | None = None,
 ) -> PageRpcProjectJobRpcGet:
     result = await rpc_client.request(
         WEBSERVER_RPC_NAMESPACE,
@@ -61,7 +61,7 @@ async def list_projects_marked_as_jobs(
         user_id=user_id,
         offset=offset,
         limit=limit,
-        job_parent_resource_name_filter=job_parent_resource_name_filter,
+        job_parent_resource_name_prefix=job_parent_resource_name_prefix,
     )
     assert TypeAdapter(PageRpcProjectJobRpcGet).validate_python(result)  # nosec
     return cast(PageRpcProjectJobRpcGet, result)

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

@@ -226,15 +226,15 @@ async def list_projects_marked_as_jobs(
         user_id: UserID,
         offset: int = 0,
         limit: int = 50,
-        job_parent_resource_name_filter: str | None = None,
+        job_parent_resource_name_prefix: str | None = None,
     ):
         return await projects_rpc.list_projects_marked_as_jobs(
             rpc_client=self._client,
             product_name=product_name,
             user_id=user_id,
             offset=offset,
             limit=limit,
-            job_parent_resource_name_filter=job_parent_resource_name_filter,
+            job_parent_resource_name_prefix=job_parent_resource_name_prefix,
         )
 
 

services/web/server/src/simcore_service_webserver/projects/_controller/projects_rpc.py

@@ -66,7 +66,7 @@ async def list_projects_marked_as_jobs(
     offset: PageOffsetInt,
     limit: PageLimitInt,
     # filters
-    job_parent_resource_name_filter: str | None,
+    job_parent_resource_name_prefix: str | None,
 ) -> PageRpcProjectJobRpcGet:
 
     total, projects = await _jobs_service.list_my_projects_marked_as_jobs(
@@ -75,7 +75,7 @@ async def list_projects_marked_as_jobs(
         user_id=user_id,
         offset=offset,
         limit=limit,
-        job_parent_resource_name_filter=job_parent_resource_name_filter,
+        job_parent_resource_name_prefix=job_parent_resource_name_prefix,
     )
 
     job_projects = [

services/web/server/src/simcore_service_webserver/projects/_jobs_repository.py

@@ -62,12 +62,13 @@ async def list_projects_marked_as_jobs(
         user_id: UserID,
         offset: int = 0,
         limit: int = 10,
-        job_parent_resource_name_filter: str | None = None,
+        job_parent_resource_name_prefix: str | None = None,
     ) -> tuple[int, list[ProjectJobDBGet]]:
         """
         Lists projects marked as jobs for a specific user and product
-        """
 
+        Example: job_parent_resource_name = "/solvers/solver1"
+        """
         # Step 1: Get group IDs associated with the user
         user_groups_query = (
             sa.select(user_to_groups.c.gid)
@@ -96,10 +97,10 @@ async def list_projects_marked_as_jobs(
         )
 
         # Apply job_parent_resource_name_filter if provided
-        if job_parent_resource_name_filter:
+        if job_parent_resource_name_prefix:
             access_query = access_query.where(
                 projects_to_jobs.c.job_parent_resource_name.like(
-                    f"%{job_parent_resource_name_filter}%"
+                    f"{job_parent_resource_name_prefix}%"
                 )
             )
 

services/web/server/src/simcore_service_webserver/projects/_jobs_service.py

@@ -56,7 +56,7 @@ async def list_my_projects_marked_as_jobs(
     user_id: UserID,
     offset: int = 0,
     limit: int = 10,
-    job_parent_resource_name_filter: str | None = None,
+    job_parent_resource_name_prefix: str | None = None,
 ) -> tuple[int, list[ProjectJobDBGet]]:
     """
     Lists paginated projects marked as jobs for the given user and product.
@@ -68,5 +68,5 @@ async def list_my_projects_marked_as_jobs(
         product_name=product_name,
         offset=offset,
         limit=limit,
-        job_parent_resource_name_filter=job_parent_resource_name_filter,
+        job_parent_resource_name_prefix=job_parent_resource_name_prefix,
     )

services/web/server/tests/unit/with_dbs/02/test_projects__jobs_service.py

@@ -158,7 +158,7 @@ async def test_user_can_filter_marked_project(
         app=client.app,
         product_name=osparc_product_name,
         user_id=project_job_fixture.user_id,
-        job_parent_resource_name_filter=project_job_fixture.job_parent_resource_name,
+        job_parent_resource_name_prefix=project_job_fixture.job_parent_resource_name,
     )
     assert total_count == 1
     assert len(result) == 1
@@ -174,7 +174,7 @@ async def test_user_can_filter_marked_project(
         app=client.app,
         product_name=osparc_product_name,
         user_id=project_job_fixture.user_id,
-        job_parent_resource_name_filter="test/%",
+        job_parent_resource_name_prefix="test/%",
     )
     assert total_count == 1
     assert len(result) == 1
@@ -190,7 +190,7 @@ async def test_user_can_filter_marked_project(
         app=client.app,
         product_name=osparc_product_name,
         user_id=project_job_fixture.user_id,
-        job_parent_resource_name_filter="other/%",
+        job_parent_resource_name_prefix="other/%",
     )
     assert total_count == 0
     assert len(result) == 0

services/web/server/tests/unit/with_dbs/02/test_projects_rpc.py

@@ -114,7 +114,7 @@ async def test_rpc_client_list_my_projects_marked_as_jobs(
         rpc_client=rpc_client,
         product_name=product_name,
         user_id=user_id,
-        job_parent_resource_name_filter="solvers/solver123",
+        job_parent_resource_name_prefix="solvers/solver123",
     )
 
     assert page.meta.total == 1