continue fixing

Author: giancarloromeo

services/director-v2/src/simcore_service_director_v2/api/routes/dynamic_services.py

@@ -23,6 +23,9 @@
 from servicelib.logging_utils import log_decorator
 from servicelib.rabbitmq import RabbitMQClient
 from servicelib.utils import logged_gather
+from simcore_service_director_v2.modules.db.repositories.projects_nodes import (
+    ProjectsNodesRepository,
+)
 from starlette import status
 from starlette.datastructures import URL
 from tenacity import RetryCallState, TryAgain
@@ -323,6 +326,9 @@ async def update_projects_networks(
     projects_repository: Annotated[
         ProjectsRepository, Depends(get_repository(ProjectsRepository))
     ],
+    projects_nodes_repository: Annotated[
+        ProjectsNodesRepository, Depends(get_repository(ProjectsNodesRepository))
+    ],
     scheduler: Annotated[DynamicSidecarsScheduler, Depends(get_scheduler)],
     catalog_client: Annotated[CatalogClient, Depends(get_catalog_client)],
     rabbitmq_client: Annotated[
@@ -333,6 +339,7 @@ async def update_projects_networks(
     await projects_networks.update_from_workbench(
         projects_networks_repository=projects_networks_repository,
         projects_repository=projects_repository,
+        projects_nodes_repository=projects_nodes_repository,
         scheduler=scheduler,
         catalog_client=catalog_client,
         rabbitmq_client=rabbitmq_client,

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_events_user_services.py

@@ -2,13 +2,15 @@
 
 from fastapi import FastAPI
 from models_library.api_schemas_long_running_tasks.base import ProgressPercent
-from models_library.projects import ProjectAtDB
-from models_library.projects_nodes_io import NodeIDStr
+from models_library.projects import NodesDict, ProjectAtDB
 from models_library.service_settings_labels import SimcoreServiceLabels
 from models_library.services import ServiceVersion
 from models_library.services_creation import CreateServiceMetricsAdditionalParams
 from pydantic import TypeAdapter
 from servicelib.fastapi.long_running_tasks.client import TaskId
+from simcore_service_director_v2.modules.db.repositories.projects_nodes import (
+    ProjectsNodesRepository,
+)
 from tenacity import RetryError
 from tenacity.asyncio import AsyncRetrying
 from tenacity.before_sleep import before_sleep_log
@@ -143,7 +145,14 @@ async def progress_create_containers(
         project_id=scheduler_data.project_id
     )
     project_name = project.name
-    node_name = project.workbench[NodeIDStr(scheduler_data.node_uuid)].label
+
+    projects_nodes_repo: ProjectsNodesRepository = get_repository(
+        app, ProjectsNodesRepository
+    )
+    workbench: NodesDict = await projects_nodes_repo.get_nodes(
+        scheduler_data.project_id
+    )
+    node_name = workbench[f"{scheduler_data.node_uuid}"].label
 
     # data from user
     users_repository = get_repository(app, UsersRepository)

services/director-v2/src/simcore_service_director_v2/modules/projects_networks.py

@@ -20,6 +20,9 @@
 from pydantic import TypeAdapter, ValidationError
 from servicelib.rabbitmq import RabbitMQClient
 from servicelib.utils import logged_gather
+from simcore_service_director_v2.modules.db.repositories.projects_nodes import (
+    ProjectsNodesRepository,
+)
 
 from ..core.errors import ProjectNetworkNotFoundError
 from ..modules.catalog import CatalogClient
@@ -227,16 +230,15 @@ async def _get_networks_with_aliases_for_default_network(
             await rabbitmq_client.publish(message.channel_name, message)
             continue
 
-        new_networks_with_aliases[default_network][
-            NodeIDStr(f"{node_uuid}")
-        ] = network_alias
+        new_networks_with_aliases[default_network][f"{node_uuid}"] = network_alias
 
     return new_networks_with_aliases
 
 
 async def update_from_workbench(
     projects_networks_repository: ProjectsNetworksRepository,
     projects_repository: ProjectsRepository,
+    projects_nodes_repository: ProjectsNodesRepository,
     scheduler: DynamicSidecarsScheduler,
     catalog_client: CatalogClient,
     rabbitmq_client: RabbitMQClient,
@@ -262,11 +264,12 @@ async def update_from_workbench(
     # NOTE: when UI is in place this is no longer required
     # for now all services are placed on the same default network
     project: ProjectAtDB = await projects_repository.get_project(project_id)
+    workbench: NodesDict = await projects_nodes_repository.get_nodes(project_id)
     assert project.prj_owner  # nosec
     new_networks_with_aliases = await _get_networks_with_aliases_for_default_network(
         project_id=project_id,
         user_id=project.prj_owner,
-        new_workbench=project.workbench,
+        new_workbench=workbench,
         catalog_client=catalog_client,
         rabbitmq_client=rabbitmq_client,
     )