continue fixing

Author: giancarloromeo

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/projects.py

@@ -3,8 +3,6 @@
 import sqlalchemy as sa
 from aiopg.sa.result import RowProxy
 from models_library.projects import ProjectAtDB, ProjectID
-from models_library.projects_nodes_io import NodeID
-from simcore_postgres_database.utils_projects_nodes import ProjectNodesRepo
 
 from ....core.errors import ProjectNotFoundError
 from ..tables import projects
@@ -24,18 +22,3 @@ async def get_project(self, project_id: ProjectID) -> ProjectAtDB:
         if not row:
             raise ProjectNotFoundError(project_id=project_id)
         return ProjectAtDB.model_validate(row)
-
-    async def is_node_present_in_workbench(
-        self, project_id: ProjectID, node_uuid: NodeID
-    ) -> bool:
-        try:
-            project = await self.get_project(project_id)
-            return f"{node_uuid}" in project.workbench
-        except ProjectNotFoundError:
-            return False
-
-    async def get_project_id_from_node(self, node_id: NodeID) -> ProjectID:
-        async with self.db_engine.acquire() as conn:
-            return await ProjectNodesRepo.get_project_id_from_node_id(
-                conn, node_id=node_id
-            )

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/projects_nodes.py

@@ -2,7 +2,7 @@
 
 import sqlalchemy as sa
 from models_library.projects import NodesDict, ProjectID
-from models_library.projects_nodes import Node
+from models_library.projects_nodes import Node, NodeID
 from simcore_postgres_database.utils_projects_nodes import ProjectNode
 
 from ..tables import projects_nodes
@@ -12,13 +12,13 @@
 
 
 class ProjectsNodesRepository(BaseRepository):
-    async def get_nodes(self, project_uuid: ProjectID) -> NodesDict:
+    async def get_nodes(self, project_id: ProjectID) -> NodesDict:
         nodes_dict = {}
         async with self.db_engine.acquire() as conn:
             rows = await (
                 await conn.execute(
                     sa.select(projects_nodes).where(
-                        projects_nodes.c.project_uuid == f"{project_uuid}"
+                        projects_nodes.c.project_uuid == f"{project_id}"
                     )
                 )
             ).fetchall()
@@ -39,17 +39,14 @@ async def get_nodes(self, project_uuid: ProjectID) -> NodesDict:
 
         return nodes_dict
 
-    # async def is_node_present_in_workbench(
-    #     self, project_id: ProjectID, node_uuid: NodeID
-    # ) -> bool:
-    #     try:
-    #         project = await self.get_project(project_id)
-    #         return f"{node_uuid}" in project.workbench
-    #     except ProjectNotFoundError:
-    #         return False
-
-    # async def get_project_id_from_node(self, node_id: NodeID) -> ProjectID:
-    #     async with self.db_engine.acquire() as conn:
-    #         return await ProjectNodesRepo.get_project_id_from_node_id(
-    #             conn, node_id=node_id
-    #         )
+    async def exists_node(self, project_id: ProjectID, node_id: NodeID) -> bool:
+        async with self.db_engine.acquire() as conn:
+            result = await (
+                await conn.execute(
+                    sa.select(projects_nodes).where(
+                        (projects_nodes.c.project_uuid == f"{project_id}")
+                        & (projects_nodes.c.node_id == f"{node_id}")
+                    )
+                )
+            ).fetchone()
+            return result is not None

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

@@ -60,8 +60,8 @@
     track_duration,
 )
 from .....utils.db import get_repository
-from ....db.repositories.projects import ProjectsRepository
 from ....db.repositories.projects_networks import ProjectsNetworksRepository
+from ....db.repositories.projects_nodes import ProjectsNodesRepository
 from ....db.repositories.user_preferences_frontend import (
     UserPreferencesFrontendRepository,
 )
@@ -321,12 +321,12 @@ async def attempt_pod_removal_and_data_saving(
         # to try and save the data, nodeports will raise errors
         # and sidecar will hang
 
-        projects_repository: ProjectsRepository = get_repository(
-            app, ProjectsRepository
+        projects_nodes_repo: ProjectsNodesRepository = get_repository(
+            app, ProjectsNodesRepository
         )
 
-        can_really_save = await projects_repository.is_node_present_in_workbench(
-            project_id=scheduler_data.project_id, node_uuid=scheduler_data.node_uuid
+        can_really_save = await projects_nodes_repo.exists_node(
+            project_id=scheduler_data.project_id, node_id=scheduler_data.node_uuid
         )
 
     if can_really_save and scheduler_data.dynamic_sidecar.were_containers_created:

services/director-v2/tests/unit/with_dbs/test_cli.py

@@ -220,6 +220,7 @@ def test_project_save_state_retry_3_times_and_fails(
     mock_save_service_state_as_failing: None,
     cli_runner: CliRunner,
     project_at_db: ProjectAtDB,
+    fake_workbench_without_outputs: dict[str, Any],
     capsys: pytest.CaptureFixture,
 ):
     with capsys.disabled() as _disabled:
@@ -231,7 +232,7 @@ def test_project_save_state_retry_3_times_and_fails(
     print(result.stdout)
     assert result.exit_code == 1, _format_cli_error(result)
     assert "The following nodes failed to save:" in result.stdout
-    for node_uuid in project_at_db.workbench:
+    for node_uuid in fake_workbench_without_outputs:
         assert (
             result.stdout.count(f"Attempting to save {node_uuid}")
             == DEFAULT_NODE_SAVE_ATTEMPTS

services/director-v2/tests/unit/with_dbs/test_modules_db_repositories_projects.py

@@ -16,6 +16,9 @@
 from simcore_service_director_v2.modules.db.repositories.projects import (
     ProjectsRepository,
 )
+from simcore_service_director_v2.modules.db.repositories.projects_nodes import (
+    ProjectsNodesRepository,
+)
 from simcore_service_director_v2.utils.db import get_repository
 
 pytest_simcore_core_services_selection = [
@@ -79,32 +82,35 @@ async def project(
 
 
 async def test_is_node_present_in_workbench(
-    initialized_app: FastAPI, project: ProjectAtDB, faker: Faker
+    initialized_app: FastAPI,
+    project: ProjectAtDB,
+    workbench: dict[str, Any],
+    faker: Faker,
 ):
-    project_repository = get_repository(initialized_app, ProjectsRepository)
+    project_nodes_repo = get_repository(initialized_app, ProjectsNodesRepository)
 
-    for node_uuid in project.workbench:
+    for node_uuid in workbench:
         assert (
-            await project_repository.is_node_present_in_workbench(
-                project_id=project.uuid, node_uuid=NodeID(node_uuid)
+            await project_nodes_repo.exists_node(
+                project_id=project.uuid, node_id=NodeID(node_uuid)
             )
             is True
         )
 
     not_existing_node = faker.uuid4(cast_to=None)
-    assert not_existing_node not in project.workbench
+    assert not_existing_node not in workbench
     assert (
-        await project_repository.is_node_present_in_workbench(
-            project_id=project.uuid, node_uuid=not_existing_node
+        await project_nodes_repo.exists_node(
+            project_id=project.uuid, node_id=not_existing_node
         )
         is False
     )
 
     not_existing_project = faker.uuid4(cast_to=None)
     assert not_existing_project != project.uuid
     assert (
-        await project_repository.is_node_present_in_workbench(
-            project_id=not_existing_project, node_uuid=not_existing_node
+        await project_nodes_repo.exists_node(
+            project_id=not_existing_project, node_id=not_existing_node
         )
         is False
     )