import and groups_repo

Author: pcrespov

packages/pytest-simcore/src/pytest_simcore/helpers/webserver_projects.py

@@ -14,7 +14,7 @@
 from models_library.projects_nodes_io import NodeID
 from models_library.services_resources import ServiceResourcesDictHelpers
 from simcore_postgres_database.utils_projects_nodes import ProjectNodeCreate
-from simcore_service_webserver.projects._groups_respository import (
+from simcore_service_webserver.projects._groups_repository import (
     update_or_insert_project_group,
 )
 from simcore_service_webserver.projects._projects_repository_legacy import (

services/web/server/src/simcore_service_webserver/folders/_workspaces_repository.py

@@ -9,7 +9,7 @@
 
 from ..db.plugin import get_asyncpg_engine
 from ..projects import _folders_repository as projects_folders_repository
-from ..projects import _groups_respository as projects_groups_repository
+from ..projects import _groups_repository as projects_groups_repository
 from ..projects import _projects_repository as projects_repository
 from ..projects._access_rights_service import check_user_project_permission
 from ..users.api import get_user

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_folders_repository
-from . import _folders_repository as _folders_repository
+from . import _folders_repository
 from ._access_rights_service import get_user_project_access_rights
 from ._projects_repository_legacy import APP_PROJECT_DBAPI, ProjectDBAPI
 from .exceptions import ProjectInvalidRightsError

services/web/server/src/simcore_service_webserver/projects/_groups_models.py

@@ -0,0 +1,18 @@
+import logging
+from datetime import datetime
+
+from models_library.groups import GroupID
+from pydantic import BaseModel, ConfigDict
+
+_logger = logging.getLogger(__name__)
+
+
+class ProjectGroupGetDB(BaseModel):
+    gid: GroupID
+    read: bool
+    write: bool
+    delete: bool
+    created: datetime
+    modified: datetime
+
+    model_config = ConfigDict(from_attributes=True)

services/web/server/src/simcore_service_webserver/projects/_groups_respository.py renamed to services/web/server/src/simcore_service_webserver/projects/_groups_repository.py

@@ -1,10 +1,9 @@
 import logging
-from datetime import datetime
 
 from aiohttp import web
 from models_library.groups import GroupID
 from models_library.projects import ProjectID
-from pydantic import BaseModel, ConfigDict, TypeAdapter
+from pydantic import TypeAdapter
 from simcore_postgres_database.models.project_to_groups import project_to_groups
 from simcore_postgres_database.utils_repos import transaction_context
 from sqlalchemy import func, literal_column
@@ -13,26 +12,11 @@
 from sqlalchemy.sql import select
 
 from ..db.plugin import get_asyncpg_engine
+from ._groups_models import ProjectGroupGetDB
 from .exceptions import ProjectGroupNotFoundError
 
 _logger = logging.getLogger(__name__)
 
-### Models
-
-
-class ProjectGroupGetDB(BaseModel):
-    gid: GroupID
-    read: bool
-    write: bool
-    delete: bool
-    created: datetime
-    modified: datetime
-
-    model_config = ConfigDict(from_attributes=True)
-
-
-## DB API
-
 
 async def create_project_group(
     app: web.Application,

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_service
-from . import _groups_respository as projects_groups_db
+from . import _groups_repository
 from ._access_rights_service import check_user_project_permission
-from ._groups_respository import ProjectGroupGetDB
+from ._groups_models import ProjectGroupGetDB
 from ._projects_repository_legacy import APP_PROJECT_DBAPI, ProjectDBAPI
 from .exceptions import ProjectInvalidRightsError
 
@@ -46,7 +46,7 @@ async def create_project_group(
         permission="write",
     )
 
-    project_group_db: ProjectGroupGetDB = await projects_groups_db.create_project_group(
+    project_group_db: ProjectGroupGetDB = await _groups_repository.create_project_group(
         app=app,
         project_id=project_id,
         group_id=group_id,
@@ -77,7 +77,7 @@ async def list_project_groups_by_user_and_project(
     )
 
     project_groups_db: list[ProjectGroupGetDB] = (
-        await projects_groups_db.list_project_groups(app=app, project_id=project_id)
+        await _groups_repository.list_project_groups(app=app, project_id=project_id)
     )
 
     project_groups_api: list[ProjectGroupGet] = [
@@ -121,7 +121,7 @@ async def replace_project_group(
             )
 
     project_group_db: ProjectGroupGetDB = (
-        await projects_groups_db.replace_project_group(
+        await _groups_repository.replace_project_group(
             app=app,
             project_id=project_id,
             group_id=group_id,
@@ -165,7 +165,7 @@ async def delete_project_group(
                 reason=f"User does not have access to modify owner project group in project {project_id}",
             )
 
-    await projects_groups_db.delete_project_group(
+    await _groups_repository.delete_project_group(
         app=app, project_id=project_id, group_id=group_id
     )
 
@@ -179,7 +179,7 @@ async def delete_project_group_without_checking_permissions(
     project_id: ProjectID,
     group_id: GroupID,
 ) -> None:
-    await projects_groups_db.delete_project_group(
+    await _groups_repository.delete_project_group(
         app=app, project_id=project_id, group_id=group_id
     )
 
@@ -193,7 +193,7 @@ async def create_project_group_without_checking_permissions(
     write: bool,
     delete: bool,
 ) -> None:
-    await projects_groups_db.update_or_insert_project_group(
+    await _groups_repository.update_or_insert_project_group(
         app=app,
         project_id=project_id,
         group_id=group_id,

services/web/server/src/simcore_service_webserver/projects/_workspaces_service.py

@@ -10,7 +10,7 @@
 from ..db.plugin import get_asyncpg_engine
 from ..users.api import get_user
 from ..workspaces.api import check_user_workspace_access
-from . import _folders_repository, _groups_respository, _projects_repository
+from . import _folders_repository, _groups_repository, _projects_repository
 from ._access_rights_service import get_user_project_access_rights
 from .exceptions import ProjectInvalidRightsError
 
@@ -60,10 +60,10 @@ async def move_project_into_workspace(
 
         # 5. Remove all project permissions, leave only the user who moved the project
         user = await get_user(app, user_id=user_id)
-        await _groups_respository.delete_all_project_groups(
+        await _groups_repository.delete_all_project_groups(
             app, connection=conn, project_id=project_id
         )
-        await _groups_respository.update_or_insert_project_group(
+        await _groups_repository.update_or_insert_project_group(
             app,
             connection=conn,
             project_id=project_id,

services/web/server/src/simcore_service_webserver/studies_dispatcher/_studies_access.py

@@ -30,7 +30,7 @@
 from ..director_v2._core_computations import create_or_update_pipeline
 from ..dynamic_scheduler import api as dynamic_scheduler_service
 from ..products import products_web
-from ..projects._groups_respository import get_project_group
+from ..projects._groups_repository import get_project_group
 from ..projects._projects_repository_legacy import ProjectDBAPI
 from ..projects.api import check_user_project_permission
 from ..projects.exceptions import (

services/web/server/tests/conftest.py

@@ -41,7 +41,7 @@
 from simcore_service_webserver.projects._crud_api_create import (
     OVERRIDABLE_DOCUMENT_KEYS,
 )
-from simcore_service_webserver.projects._groups_respository import (
+from simcore_service_webserver.projects._groups_repository import (
     update_or_insert_project_group,
 )
 from simcore_service_webserver.projects.models import ProjectDict

services/web/server/tests/integration/01/test_garbage_collection.py

@@ -41,7 +41,7 @@
 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_respository import (
+from simcore_service_webserver.projects._groups_repository import (
     update_or_insert_project_group,
 )
 from simcore_service_webserver.projects.models import ProjectDict