webserver

Author: pcrespov

services/web/server/src/simcore_service_webserver/catalog/_models.py

@@ -1,6 +1,11 @@
-from typing import TypedDict
+from typing import TypeAlias, TypedDict
+
+from models_library.api_schemas_catalog.services import MyServicesRpcBatchGet
 
 
 class ServiceKeyVersionDict(TypedDict):
     key: str
     version: str
+
+
+MyServicesBatchGetResult: TypeAlias = MyServicesRpcBatchGet

services/web/server/src/simcore_service_webserver/catalog/_service.py

@@ -3,7 +3,7 @@
 from typing import Any, cast
 
 from aiohttp import web
-from models_library.api_schemas_catalog.services import MyServiceGet, ServiceUpdateV2
+from models_library.api_schemas_catalog.services import ServiceUpdateV2
 from models_library.api_schemas_webserver.catalog import (
     ServiceInputGet,
     ServiceInputKey,
@@ -37,6 +37,7 @@
     ServiceInputGetFactory,
     ServiceOutputGetFactory,
 )
+from ._models import MyServicesBatchGetResult
 from ._units_service import can_connect, replace_service_input_outputs
 
 _logger = logging.getLogger(__name__)
@@ -97,7 +98,7 @@ async def batch_get_my_services(
     user_id: UserID,
     product_name: ProductName,
     services_ids: list[tuple[ServiceKey, ServiceVersion]],
-) -> list[MyServiceGet]:
+) -> MyServicesBatchGetResult:
     try:
 
         return await catalog_rpc.batch_get_my_services(

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

@@ -9,7 +9,6 @@
 from models_library.api_schemas_catalog.service_access_rights import (
     ServiceAccessRightsGet,
 )
-from models_library.api_schemas_catalog.services import MyServiceGet
 from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceGet
 from models_library.api_schemas_dynamic_scheduler.dynamic_services import (
     DynamicServiceStop,
@@ -547,19 +546,23 @@ async def get_project_services(request: web.Request) -> web.Response:
         )
     )
 
-    services: list[MyServiceGet] = await catalog_service.batch_get_my_services(
+    batch_got = await catalog_service.batch_get_my_services(
         request.app,
         product_name=req_ctx.product_name,
         user_id=req_ctx.user_id,
         services_ids=services_in_project,
     )
 
+    #
+    # FIXME: in "data" we return list[ProjectNodeServiceGet] that were found
+    # in "error" we return list[ServiceKeyVersion] that were not found!
+    # returned lists should keep the order of services_in_project
     return envelope_json_response(
         ProjectNodeServicesGet(
             project_uuid=path_params.project_id,
             services=[
                 NodeServiceGet.model_validate(sv, from_attributes=True)
-                for sv in services
+                for sv in batch_got.found_items
             ],
         )
     )