@bisgaard-itis review: solver arguments

Author: pcrespov

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

@@ -40,15 +40,15 @@ def __init__(
     async def get_solver(
         self,
         *,
-        user_id: UserID,
-        name: SolverKeyId,
-        version: VersionStr,
         product_name: ProductName,
+        user_id: UserID,
+        solver_key: SolverKeyId,
+        solver_version: VersionStr,
     ) -> Solver:
         service = await self._catalog_service.get(
             user_id=user_id,
-            name=name,
-            version=version,
+            name=solver_key,
+            version=solver_version,
             product_name=product_name,
         )
         assert (  # nosec
@@ -60,9 +60,9 @@ async def get_solver(
     async def get_latest_release(
         self,
         *,
+        product_name: str,
         user_id: int,
         solver_key: SolverKeyId,
-        product_name: str,
     ) -> Solver:
         service_releases: list[ServiceRelease] = []
         for page_params in iter_pagination_params(limit=DEFAULT_PAGINATION_LIMIT):
@@ -89,10 +89,10 @@ async def get_latest_release(
     async def list_jobs(
         self,
         *,
-        user_id: UserID,
         product_name: ProductName,
+        user_id: UserID,
         # filters
-        solver_id: SolverKeyId | None = None,
+        solver_key: SolverKeyId | None = None,
         solver_version: VersionStr | None = None,
         # pagination
         offset: PageOffsetInt = 0,
@@ -104,8 +104,8 @@ async def list_jobs(
         collection_or_resource_ids = [
             "solvers",  # solver_id, "releases", solver_version, "jobs",
         ]
-        if solver_id:
-            collection_or_resource_ids.append(solver_id)
+        if solver_key:
+            collection_or_resource_ids.append(solver_key)
             if solver_version:
                 collection_or_resource_ids.append("releases")
                 collection_or_resource_ids.append(solver_version)

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

@@ -240,8 +240,8 @@ async def get_solver_release(
     try:
         solver: Solver = await solver_service.get_solver(
             user_id=user_id,
-            name=solver_key,
-            version=version,
+            solver_key=solver_key,
+            solver_version=version,
             product_name=product_name,
         )
 

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

@@ -112,8 +112,8 @@ async def create_solver_job(
     # ensures user has access to solver
     solver = await solver_service.get_solver(
         user_id=user_id,
-        name=solver_key,
-        version=version,
+        solver_key=solver_key,
+        solver_version=version,
         product_name=product_name,
     )
     job, project = await job_service.create_job(

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

@@ -185,8 +185,8 @@ async def list_jobs(
 
     solver = await solver_service.get_solver(
         user_id=user_id,
-        name=solver_key,
-        version=version,
+        solver_key=solver_key,
+        solver_version=version,
         product_name=product_name,
     )
     _logger.debug("Listing Jobs in Solver '%s'", solver.name)
@@ -232,8 +232,8 @@ async def get_jobs_page(
 
     solver = await solver_service.get_solver(
         user_id=user_id,
-        name=solver_key,
-        version=version,
+        solver_key=solver_key,
+        solver_version=version,
         product_name=product_name,
     )
     _logger.debug("Listing Jobs in Solver '%s'", solver.name)
@@ -276,8 +276,8 @@ async def get_job(
 
     solver = await solver_service.get_solver(
         user_id=user_id,
-        name=solver_key,
-        version=version,
+        solver_key=solver_key,
+        solver_version=version,
         product_name=product_name,
     )
     project: ProjectGet = await webserver_api.get_project(project_id=job_id)

services/api-server/tests/unit/test_service_solvers.py

@@ -33,8 +33,8 @@ async def test_get_solver(
 ):
     solver = await solver_service.get_solver(
         user_id=user_id,
-        name="simcore/services/comp/solver-1",
-        version="1.0.0",
+        solver_key="simcore/services/comp/solver-1",
+        solver_version="1.0.0",
         product_name=product_name,
     )