✨ Refactor service dependency injection to use get_solver_service for improved clarity and consistency

Author: pcrespov

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

@@ -1,11 +1,15 @@
-""" Dependences with any other services (except webserver)
-
-"""
 from collections.abc import Callable
+from typing import Annotated
 
-from fastapi import HTTPException, Request, status
+from fastapi import Depends, HTTPException, Request, status
+from servicelib.rabbitmq import RabbitMQRPCClient
 
+from ..._service_solvers import SolverService
+from ...services_rpc.catalog import CatalogService
+from ...services_rpc.wb_api_server import WbApiRpcClient
 from ...utils.client_base import BaseServiceClientApi
+from .rabbitmq import get_rabbitmq_rpc_client
+from .webserver_rpc import get_wb_api_rpc_client
 
 
 def get_api_client(client_type: type[BaseServiceClientApi]) -> Callable:
@@ -32,3 +36,28 @@ def _get_client_from_app(request: Request) -> BaseServiceClientApi:
         return client_obj
 
     return _get_client_from_app
+
+
+def get_catalog_service(
+    rpc_client: Annotated[RabbitMQRPCClient, Depends(get_rabbitmq_rpc_client)],
+):
+    """
+    "Assembles" the CatalogService layer to the RabbitMQ client
+    in the context of the rest controller (i.e. api/dependencies)
+    """
+    return CatalogService(client=rpc_client)
+
+
+def get_solver_service(
+    catalog_service: Annotated[CatalogService, Depends(get_catalog_service)],
+    webserver_client: Annotated[WbApiRpcClient, Depends(get_wb_api_rpc_client)],
+) -> SolverService:
+    """
+    "Assembles" the SolverService layer to the underlying service and client interfaces
+    in the context of the rest controller (i.e. api/dependencies)
+    """
+
+    return SolverService(
+        catalog_service=catalog_service,
+        webserver_client=webserver_client,
+    )

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

@@ -56,7 +56,7 @@
 from ..dependencies.authentication import get_current_user_id, get_product_name
 from ..dependencies.database import get_db_asyncpg_engine
 from ..dependencies.rabbitmq import get_log_check_timeout, get_log_distributor
-from ..dependencies.services import get_api_client
+from ..dependencies.services import get_api_client, get_solver_service
 from ..dependencies.webserver_http import AuthSession, get_webserver_session
 from ._common import API_SERVER_DEV_FEATURES_ENABLED
 from ._constants import (
@@ -132,7 +132,7 @@
 async def list_all_solvers_jobs(
     user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
     page_params: Annotated[PaginationParams, Depends()],
-    solver_service: Annotated[SolverService, Depends(SolverService)],
+    solver_service: Annotated[SolverService, Depends(get_solver_service)],
     url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
     product_name: Annotated[str, Depends(get_product_name)],
 ):
@@ -176,7 +176,7 @@ async def list_jobs(
     solver_key: SolverKeyId,
     version: VersionStr,
     user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
-    solver_service: Annotated[SolverService, Depends(SolverService)],
+    solver_service: Annotated[SolverService, Depends(get_solver_service)],
     webserver_api: Annotated[AuthSession, Depends(get_webserver_session)],
     url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
     product_name: Annotated[str, Depends(get_product_name)],
@@ -222,7 +222,7 @@ async def get_jobs_page(
     version: VersionStr,
     user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
     page_params: Annotated[PaginationParams, Depends()],
-    solver_service: Annotated[SolverService, Depends(SolverService)],
+    solver_service: Annotated[SolverService, Depends(get_solver_service)],
     webserver_api: Annotated[AuthSession, Depends(get_webserver_session)],
     url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
     product_name: Annotated[str, Depends(get_product_name)],
@@ -266,7 +266,7 @@ async def get_job(
     user_id: Annotated[PositiveInt, Depends(get_current_user_id)],
     product_name: Annotated[str, Depends(get_product_name)],
     webserver_api: Annotated[AuthSession, Depends(get_webserver_session)],
-    solver_service: Annotated[SolverService, Depends(SolverService)],
+    solver_service: Annotated[SolverService, Depends(get_solver_service)],
     url_for: Annotated[Callable, Depends(get_reverse_url_mapper)],
 ):
     """Gets job of a given solver"""