repo

pcrespov · pcrespov · commit cde35a22cc5e · 2025-03-24T11:01:32.000+01:00
diff --git a/packages/pytest-simcore/src/pytest_simcore/helpers/webserver_projects.py b/packages/pytest-simcore/src/pytest_simcore/helpers/webserver_projects.py
@@ -1,6 +1,4 @@
-""" helpers to manage the projects's database and produce fixtures/mockup data for testing
-
-"""
+"""helpers to manage the projects's database and produce fixtures/mockup data for testing"""
 
 # pylint: disable=no-value-for-parameter
 
@@ -17,7 +15,9 @@
 from models_library.services_resources import ServiceResourcesDictHelpers
 from simcore_postgres_database.utils_projects_nodes import ProjectNodeCreate
 from simcore_service_webserver.projects._db_utils import DB_EXCLUSIVE_COLUMNS
-from simcore_service_webserver.projects._groups_db import update_or_insert_project_group
+from simcore_service_webserver.projects._groups_respository import (
+    update_or_insert_project_group,
+)
 from simcore_service_webserver.projects.db import APP_PROJECT_DBAPI, ProjectDBAPI
 from simcore_service_webserver.projects.models import ProjectDict
 from simcore_service_webserver.utils import now_str
diff --git a/services/web/server/src/simcore_service_webserver/folders/_workspaces_repository.py b/services/web/server/src/simcore_service_webserver/folders/_workspaces_repository.py
@@ -8,8 +8,8 @@
 from simcore_postgres_database.utils_repos import transaction_context
 
 from ..db.plugin import get_asyncpg_engine
-from ..projects import _folders_db as project_to_folders_db
-from ..projects import _groups_db as project_groups_db
+from ..projects import _folders_repository as project_to_folders_db
+from ..projects import _groups_respository as project_groups_db
 from ..projects import _projects_db as projects_db
 from ..projects._access_rights_service import check_user_project_permission
 from ..users.api import get_user
diff --git a/services/web/server/src/simcore_service_webserver/projects/_comments_repository.py b/services/web/server/src/simcore_service_webserver/projects/_comments_repository.py
diff --git a/services/web/server/src/simcore_service_webserver/projects/_crud_api_create.py b/services/web/server/src/simcore_service_webserver/projects/_crud_api_create.py
@@ -39,7 +39,7 @@
 from ..users.api import get_user_fullname
 from ..workspaces.api import check_user_workspace_access, get_user_workspace
 from ..workspaces.errors import WorkspaceAccessForbiddenError
-from . import _folders_db as project_to_folders_db
+from . import _folders_repository as project_to_folders_db
 from . import projects_service
 from ._metadata_service import set_project_ancestors
 from ._permalink_service import update_or_pop_permalink_in_project
diff --git a/services/web/server/src/simcore_service_webserver/projects/_folders_repository.py b/services/web/server/src/simcore_service_webserver/projects/_folders_repository.py
diff --git a/services/web/server/src/simcore_service_webserver/projects/_folders_service.py b/services/web/server/src/simcore_service_webserver/projects/_folders_service.py
@@ -7,7 +7,7 @@
 from models_library.users import UserID
 
 from ..folders import _folders_repository as _folders_repository
-from . import _folders_db as project_to_folders_db
+from . import _folders_repository as project_to_folders_db
 from ._access_rights_service import get_user_project_access_rights
 from .db import APP_PROJECT_DBAPI, ProjectDBAPI
 from .exceptions import ProjectInvalidRightsError
diff --git a/services/web/server/src/simcore_service_webserver/projects/_groups_respository.py b/services/web/server/src/simcore_service_webserver/projects/_groups_respository.py
diff --git a/services/web/server/src/simcore_service_webserver/projects/_groups_service.py b/services/web/server/src/simcore_service_webserver/projects/_groups_service.py
@@ -9,9 +9,9 @@
 from pydantic import BaseModel
 
 from ..users import api as users_api
-from . import _groups_db as projects_groups_db
+from . import _groups_respository as projects_groups_db
 from ._access_rights_service import check_user_project_permission
-from ._groups_db import ProjectGroupGetDB
+from ._groups_respository import ProjectGroupGetDB
 from .db import APP_PROJECT_DBAPI, ProjectDBAPI
 from .exceptions import ProjectInvalidRightsError
 
diff --git a/services/web/server/src/simcore_service_webserver/projects/_metadata_repository.py b/services/web/server/src/simcore_service_webserver/projects/_metadata_repository.py
diff --git a/services/web/server/src/simcore_service_webserver/projects/_metadata_service.py b/services/web/server/src/simcore_service_webserver/projects/_metadata_service.py
@@ -9,7 +9,7 @@
 from pydantic import TypeAdapter
 
 from ..db.plugin import get_database_engine
-from . import _metadata_db
+from . import _metadata_repository
 from ._access_rights_service import validate_project_ownership
 
 _logger = logging.getLogger(__name__)
@@ -20,7 +20,7 @@ async def get_project_custom_metadata(
 ) -> MetadataDict:
     await validate_project_ownership(app, user_id=user_id, project_uuid=project_uuid)
 
-    return await _metadata_db.get_project_custom_metadata(
+    return await _metadata_repository.get_project_custom_metadata(
         engine=get_database_engine(app), project_uuid=project_uuid
     )
 
@@ -33,7 +33,7 @@ async def set_project_custom_metadata(
 ) -> MetadataDict:
     await validate_project_ownership(app, user_id=user_id, project_uuid=project_uuid)
 
-    return await _metadata_db.set_project_custom_metadata(
+    return await _metadata_repository.set_project_custom_metadata(
         engine=get_database_engine(app),
         project_uuid=project_uuid,
         custom_metadata=value,
@@ -48,7 +48,7 @@ async def _project_has_ancestors(
 ) -> bool:
     await validate_project_ownership(app, user_id=user_id, project_uuid=project_uuid)
 
-    return await _metadata_db.project_has_ancestors(
+    return await _metadata_repository.project_has_ancestors(
         engine=get_database_engine(app), project_uuid=project_uuid
     )
 
@@ -73,11 +73,11 @@ async def set_project_ancestors_from_custom_metadata(
             return
 
         # let's try to get the parent project UUID
-        parent_project_uuid = await _metadata_db.get_project_id_from_node_id(
+        parent_project_uuid = await _metadata_repository.get_project_id_from_node_id(
             get_database_engine(app), node_id=parent_node_id
         )
 
-        await _metadata_db.set_project_ancestors(
+        await _metadata_repository.set_project_ancestors(
             get_database_engine(app),
             project_uuid=project_uuid,
             parent_project_uuid=parent_project_uuid,
@@ -94,7 +94,7 @@ async def set_project_ancestors(
 ) -> None:
     await validate_project_ownership(app, user_id=user_id, project_uuid=project_uuid)
 
-    await _metadata_db.set_project_ancestors(
+    await _metadata_repository.set_project_ancestors(
         get_database_engine(app),
         project_uuid=project_uuid,
         parent_project_uuid=parent_project_uuid,
diff --git a/services/web/server/src/simcore_service_webserver/projects/_workspaces_service.py b/services/web/server/src/simcore_service_webserver/projects/_workspaces_service.py
@@ -10,8 +10,8 @@
 from ..db.plugin import get_asyncpg_engine
 from ..users.api import get_user
 from ..workspaces.api import check_user_workspace_access
-from . import _folders_db as project_to_folders_db
-from . import _groups_db as project_groups_db
+from . import _folders_repository as project_to_folders_db
+from . import _groups_respository as project_groups_db
 from . import _projects_db
 from ._access_rights_service import get_user_project_access_rights
 from .exceptions import ProjectInvalidRightsError
diff --git a/services/web/server/src/simcore_service_webserver/projects/db.py b/services/web/server/src/simcore_service_webserver/projects/db.py
@@ -66,7 +66,7 @@
 from tenacity.retry import retry_if_exception_type
 
 from ..utils import now_str
-from ._comments_db import (
+from ._comments_repository import (
     create_project_comment,
     delete_project_comment,
     get_project_comment,
diff --git a/services/web/server/src/simcore_service_webserver/studies_dispatcher/_studies_access.py b/services/web/server/src/simcore_service_webserver/studies_dispatcher/_studies_access.py
@@ -1,4 +1,4 @@
-""" handles access to *public* studies
+"""handles access to *public* studies
 
     Handles a request to share a given sharable study via '/study/{id}'
 
@@ -30,7 +30,7 @@
 from ..director_v2._core_computations import create_or_update_pipeline
 from ..dynamic_scheduler import api as dynamic_scheduler_api
 from ..products import products_web
-from ..projects._groups_db import get_project_group
+from ..projects._groups_respository import get_project_group
 from ..projects.api import check_user_project_permission
 from ..projects.db import ProjectDBAPI
 from ..projects.exceptions import (
diff --git a/services/web/server/tests/conftest.py b/services/web/server/tests/conftest.py
@@ -41,7 +41,9 @@
 from simcore_service_webserver.projects._crud_api_create import (
     OVERRIDABLE_DOCUMENT_KEYS,
 )
-from simcore_service_webserver.projects._groups_db import update_or_insert_project_group
+from simcore_service_webserver.projects._groups_respository import (
+    update_or_insert_project_group,
+)
 from simcore_service_webserver.projects.models import ProjectDict
 from simcore_service_webserver.utils import to_datetime
 from tenacity.asyncio import AsyncRetrying
diff --git a/services/web/server/tests/integration/01/test_garbage_collection.py b/services/web/server/tests/integration/01/test_garbage_collection.py
@@ -41,7 +41,9 @@
 from simcore_service_webserver.groups.api import add_user_in_group
 from simcore_service_webserver.login.plugin import setup_login
 from simcore_service_webserver.projects._crud_api_delete import get_scheduled_tasks
-from simcore_service_webserver.projects._groups_db import update_or_insert_project_group
+from simcore_service_webserver.projects._groups_respository import (
+    update_or_insert_project_group,
+)
 from simcore_service_webserver.projects.models import ProjectDict
 from simcore_service_webserver.projects.plugin import setup_projects
 from simcore_service_webserver.resource_manager.plugin import setup_resource_manager
diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_comments_handlers.py b/services/web/server/tests/unit/with_dbs/02/test_projects_comments_handlers.py
@@ -16,7 +16,9 @@
 from servicelib.aiohttp import status
 from simcore_service_webserver._meta import api_version_prefix
 from simcore_service_webserver.db.models import UserRole
-from simcore_service_webserver.projects._groups_db import update_or_insert_project_group
+from simcore_service_webserver.projects._groups_respository import (
+    update_or_insert_project_group,
+)
 from simcore_service_webserver.projects.models import ProjectDict
 
 API_PREFIX = "/" + api_version_prefix
diff --git a/services/web/server/tests/unit/with_dbs/03/test_project_db.py b/services/web/server/tests/unit/with_dbs/03/test_project_db.py
@@ -30,7 +30,9 @@
 from simcore_postgres_database.models.users import UserRole
 from simcore_postgres_database.utils_projects_nodes import ProjectNodesRepo
 from simcore_service_webserver.projects._db_utils import PermissionStr
-from simcore_service_webserver.projects._groups_db import update_or_insert_project_group
+from simcore_service_webserver.projects._groups_respository import (
+    update_or_insert_project_group,
+)
 from simcore_service_webserver.projects.api import has_user_project_access_rights
 from simcore_service_webserver.projects.db import ProjectAccessRights, ProjectDBAPI
 from simcore_service_webserver.projects.exceptions import (
@@ -350,7 +352,7 @@ async def test_insert_project_to_db(
 
 @pytest.mark.parametrize(
     "user_role",
-    [(UserRole.USER)],
+    [UserRole.USER],
 )
 async def test_patch_user_project_workbench_raises_if_project_does_not_exist(
     fake_project: dict[str, Any],
@@ -376,7 +378,7 @@ async def test_patch_user_project_workbench_raises_if_project_does_not_exist(
 
 @pytest.mark.parametrize(
     "user_role",
-    [(UserRole.USER)],
+    [UserRole.USER],
 )
 async def test_patch_user_project_workbench_creates_nodes(
     fake_project: dict[str, Any],
@@ -420,7 +422,7 @@ async def test_patch_user_project_workbench_creates_nodes(
 
 @pytest.mark.parametrize(
     "user_role",
-    [(UserRole.USER)],
+    [UserRole.USER],
 )
 async def test_patch_user_project_workbench_creates_nodes_raises_if_invalid_node_is_passed(
     fake_project: dict[str, Any],
@@ -457,7 +459,7 @@ async def test_patch_user_project_workbench_creates_nodes_raises_if_invalid_node
 
 @pytest.mark.parametrize(
     "user_role",
-    [(UserRole.USER)],
+    [UserRole.USER],
 )
 @pytest.mark.parametrize("number_of_nodes", [1, randint(250, 300)])  # noqa: S311
 async def test_patch_user_project_workbench_concurrently(
@@ -514,18 +516,18 @@ async def test_patch_user_project_workbench_concurrently(
     for n in range(_NUMBER_OF_NODES):
         expected_project["workbench"][node_uuids[n]].update(randomly_created_outputs[n])
 
-    patched_projects: list[
-        tuple[dict[str, Any], dict[str, Any]]
-    ] = await asyncio.gather(
-        *[
-            db_api._update_project_workbench(  # noqa: SLF001
-                {NodeIDStr(node_uuids[n]): randomly_created_outputs[n]},
-                user_id=logged_user["id"],
-                project_uuid=new_project["uuid"],
-                allow_workbench_changes=False,
-            )
-            for n in range(_NUMBER_OF_NODES)
-        ]
+    patched_projects: list[tuple[dict[str, Any], dict[str, Any]]] = (
+        await asyncio.gather(
+            *[
+                db_api._update_project_workbench(  # noqa: SLF001
+                    {NodeIDStr(node_uuids[n]): randomly_created_outputs[n]},
+                    user_id=logged_user["id"],
+                    project_uuid=new_project["uuid"],
+                    allow_workbench_changes=False,
+                )
+                for n in range(_NUMBER_OF_NODES)
+            ]
+        )
     )
     # NOTE: each returned project contains the project with some updated workbenches
     # the ordering is uncontrolled.
@@ -743,9 +745,9 @@ async def test_replace_user_project(
         },
         "output_2": 5,
     }
-    node_data[
-        "runHash"
-    ] = "5b0583fa546ac82f0e41cef9705175b7187ce3928ba42892e842add912c16676"
+    node_data["runHash"] = (
+        "5b0583fa546ac82f0e41cef9705175b7187ce3928ba42892e842add912c16676"
+    )
     # replacing with the new entries shall return the very same data
     replaced_project = await db_api.replace_project(
         working_project,
@@ -917,7 +919,7 @@ async def inserted_project(
         ),
     ],
 )
-@pytest.mark.parametrize("user_role", [(UserRole.USER)])
+@pytest.mark.parametrize("user_role", [UserRole.USER])
 async def test_check_project_node_has_all_required_inputs_raises(
     client: TestClient,
     logged_user: dict[str, Any],
@@ -948,7 +950,7 @@ async def test_check_project_node_has_all_required_inputs_raises(
         ),
     ],
 )
-@pytest.mark.parametrize("user_role", [(UserRole.USER)])
+@pytest.mark.parametrize("user_role", [UserRole.USER])
 async def test_check_project_node_has_all_required_inputs_ok(
     client: TestClient,
     logged_user: dict[str, Any],
diff --git a/services/web/server/tests/unit/with_dbs/04/folders/test_folders.py b/services/web/server/tests/unit/with_dbs/04/folders/test_folders.py
@@ -23,7 +23,7 @@
 from servicelib.aiohttp import status
 from servicelib.aiohttp.application_keys import APP_FIRE_AND_FORGET_TASKS_KEY
 from simcore_service_webserver.db.models import UserRole
-from simcore_service_webserver.projects._groups_db import (
+from simcore_service_webserver.projects._groups_respository import (
     GroupID,
     update_or_insert_project_group,
 )
