imports

Author: pcrespov

services/web/server/src/simcore_service_webserver/director_v2/_api_utils.py

@@ -9,7 +9,7 @@
 from ..projects import api as projects_api
 from ..users import preferences_api as user_preferences_api
 from ..users.exceptions import UserDefaultWalletNotFoundError
-from ..wallets import api as wallets_api
+from ..wallets import api as wallets_service
 
 
 async def get_wallet_info(
@@ -49,7 +49,7 @@ async def get_wallet_info(
         project_wallet_id = project_wallet.wallet_id
 
     # Check whether user has access to the wallet
-    wallet = await wallets_api.get_wallet_with_available_credits_by_user_and_wallet(
+    wallet = await wallets_service.get_wallet_with_available_credits_by_user_and_wallet(
         app,
         user_id=user_id,
         wallet_id=project_wallet_id,

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

@@ -8,9 +8,9 @@
 from simcore_postgres_database.utils_repos import transaction_context
 
 from ..db.plugin import get_asyncpg_engine
-from ..projects import _folders_repository as _folders_repository
-from ..projects import _groups_respository as project_groups_db
-from ..projects import _projects_repository as projects_db
+from ..projects import _folders_repository as projects_folders_repository
+from ..projects import _groups_respository 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
 from ..workspaces.api import check_user_workspace_access
@@ -78,7 +78,7 @@ async def move_folder_into_workspace(
     async with transaction_context(get_asyncpg_engine(app)) as conn:
         # 4. Update workspace ID on the project resource
         for project_id in project_ids:
-            await projects_db.patch_project(
+            await projects_repository.patch_project(
                 app=app,
                 connection=conn,
                 project_uuid=project_id,
@@ -106,15 +106,15 @@ async def move_folder_into_workspace(
 
         # 7. Remove all records of project to folders that are not in the folders that we are moving
         # (ex. If we are moving from private workspace, the same project can be in different folders for different users)
-        await _folders_repository.delete_all_project_to_folder_by_project_ids_not_in_folder_ids(
+        await projects_folders_repository.delete_all_project_to_folder_by_project_ids_not_in_folder_ids(
             app,
             connection=conn,
             project_id_or_ids=set(project_ids),
             not_in_folder_ids=set(folder_ids),
         )
 
         # 8. Update the user id field for the remaining folders
-        await _folders_repository.update_project_to_folder(
+        await projects_folders_repository.update_project_to_folder(
             app,
             connection=conn,
             folders_id_or_ids=set(folder_ids),
@@ -124,10 +124,10 @@ async def move_folder_into_workspace(
         # 9. Remove all project permissions, leave only the user who moved the project
         user = await get_user(app, user_id=user_id)
         for project_id in project_ids:
-            await project_groups_db.delete_all_project_groups(
+            await projects_groups_repository.delete_all_project_groups(
                 app, connection=conn, project_id=project_id
             )
-            await project_groups_db.update_or_insert_project_group(
+            await projects_groups_repository.update_or_insert_project_group(
                 app,
                 connection=conn,
                 project_id=project_id,

services/web/server/src/simcore_service_webserver/notifications/_rabbitmq_exclusive_queue_consumers.py

@@ -30,7 +30,7 @@
     send_message_to_user,
 )
 from ..socketio.models import WebSocketNodeProgress, WebSocketProjectProgress
-from ..wallets import api as wallets_api
+from ..wallets import api as wallets_service
 from ._rabbitmq_consumers_common import SubcribeArgumentsTuple, subscribe_to_rabbitmq
 
 _logger = logging.getLogger(__name__)
@@ -127,7 +127,7 @@ async def _events_message_parser(app: web.Application, data: bytes) -> bool:
 
 async def _osparc_credits_message_parser(app: web.Application, data: bytes) -> bool:
     rabbit_message = TypeAdapter(WalletCreditsMessage).validate_json(data)
-    wallet_groups = await wallets_api.list_wallet_groups_with_read_access_by_wallet(
+    wallet_groups = await wallets_service.list_wallet_groups_with_read_access_by_wallet(
         app, wallet_id=rabbit_message.wallet_id
     )
     rooms_to_notify: Generator[GroupID, None, None] = (

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

@@ -8,7 +8,7 @@
 from models_library.users import UserID
 from pydantic import BaseModel
 
-from ..users import api as users_api
+from ..users import api as users_service
 from . import _groups_respository as projects_groups_db
 from ._access_rights_service import check_user_project_permission
 from ._groups_respository import ProjectGroupGetDB
@@ -109,9 +109,9 @@ async def replace_project_group(
 
     project_db: ProjectDBAPI = app[APP_PROJECT_DBAPI]
     project = await project_db.get_project_db(project_id)
-    project_owner_user: dict = await users_api.get_user(app, project.prj_owner)
+    project_owner_user: dict = await users_service.get_user(app, project.prj_owner)
     if project_owner_user["primary_gid"] == group_id:
-        user: dict = await users_api.get_user(app, user_id)
+        user: dict = await users_service.get_user(app, user_id)
         if user["primary_gid"] != project_owner_user["primary_gid"]:
             # Only the owner of the project can modify the owner group
             raise ProjectInvalidRightsError(
@@ -143,7 +143,7 @@ async def delete_project_group(
     group_id: GroupID,
     product_name: ProductName,
 ) -> None:
-    user: dict = await users_api.get_user(app, user_id=user_id)
+    user: dict = await users_service.get_user(app, user_id=user_id)
     if user["primary_gid"] != group_id:
         await check_user_project_permission(
             app,
@@ -155,7 +155,7 @@ async def delete_project_group(
 
     project_db: ProjectDBAPI = app[APP_PROJECT_DBAPI]
     project = await project_db.get_project_db(project_id)
-    project_owner_user: dict = await users_api.get_user(app, project.prj_owner)
+    project_owner_user: dict = await users_service.get_user(app, project.prj_owner)
     if project_owner_user["primary_gid"] == group_id:
         if user["primary_gid"] != project_owner_user["primary_gid"]:
             # Only the owner of the project can delete the owner group

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

@@ -120,7 +120,7 @@
     UserDefaultWalletNotFoundError,
     get_frontend_user_preference,
 )
-from ..wallets import api as wallets_api
+from ..wallets import api as wallets_service
 from ..wallets.errors import WalletNotEnoughCreditsError
 from ..workspaces import _workspaces_repository as workspaces_db
 from . import (
@@ -682,13 +682,11 @@ async def _() -> None:
             else:
                 project_wallet_id = project_wallet.wallet_id
             # Check whether user has access to the wallet
-            wallet = (
-                await wallets_api.get_wallet_with_available_credits_by_user_and_wallet(
-                    request.app,
-                    user_id=user_id,
-                    wallet_id=project_wallet_id,
-                    product_name=product_name,
-                )
+            wallet = await wallets_service.get_wallet_with_available_credits_by_user_and_wallet(
+                request.app,
+                user_id=user_id,
+                wallet_id=project_wallet_id,
+                product_name=product_name,
             )
             wallet_info = WalletInfo(
                 wallet_id=project_wallet_id,

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

@@ -11,7 +11,7 @@
 from servicelib.redis._errors import ProjectLockError
 
 from ..director_v2 import api as director_v2_service
-from . import _projects_repository as _projects_repository
+from . import _projects_repository as projects_repository
 from . import _projects_service
 from .exceptions import ProjectDeleteError, ProjectNotFoundError
 
@@ -68,7 +68,7 @@ async def delete_project_as_admin(
     try:
         # 1. hide
         with _monitor_step(state, name="hide"):
-            project = await _projects_repository.patch_project(
+            project = await projects_repository.patch_project(
                 app,
                 project_uuid=project_uuid,
                 new_partial_project_data={"hidden": True},
@@ -83,7 +83,7 @@ async def delete_project_as_admin(
 
         # 3. delete
         with _monitor_step(state, name="delete"):
-            await _projects_repository.delete_project(app, project_uuid=project_uuid)
+            await projects_repository.delete_project(app, project_uuid=project_uuid)
 
     except ProjectNotFoundError as err:
         _logger.debug(

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

@@ -16,7 +16,7 @@
 from ..director_v2 import api as director_v2_api
 from ..dynamic_scheduler import api as dynamic_scheduler_api
 from . import _crud_api_read
-from . import _projects_repository as _projects_repository
+from . import _projects_repository as projects_repository
 from . import _projects_service, _projects_service_delete
 from ._access_rights_service import check_user_project_permission
 from ._projects_repository import _OLDEST_TRASHED_FIRST
@@ -243,7 +243,7 @@ async def batch_delete_trashed_projects_as_admin(
         (
             page_params.total_number_of_items,
             expired_trashed_projects,
-        ) = await _projects_repository.list_trashed_projects(
+        ) = await projects_repository.list_trashed_projects(
             app,
             # both implicit and explicitly trashed
             trashed_before=trashed_before,

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

@@ -16,8 +16,8 @@
 )
 
 from ..rabbitmq import get_rabbitmq_rpc_client
-from ..users import api as users_api
-from ..wallets import _api as wallets_api
+from ..users import api as users_service
+from ..wallets import _api as wallets_service
 from ._projects_repository_legacy import ProjectDBAPI
 from .exceptions import (
     ProjectInDebtCanNotChangeWalletError,
@@ -73,7 +73,7 @@ async def connect_wallet_to_project(
     db: ProjectDBAPI = ProjectDBAPI.get_from_app_context(app)
 
     # ensure the wallet can be used by the user
-    wallet: WalletGet = await wallets_api.get_wallet_by_user(
+    wallet: WalletGet = await wallets_service.get_wallet_by_user(
         app,
         user_id=user_id,
         wallet_id=wallet_id,
@@ -153,20 +153,20 @@ async def pay_debt_with_different_wallet(
     assert current_wallet_id != new_wallet_id  # nosec
 
     # ensure the wallets can be used by the user
-    new_wallet: WalletGet = await wallets_api.get_wallet_by_user(
+    new_wallet: WalletGet = await wallets_service.get_wallet_by_user(
         app,
         user_id=user_id,
         wallet_id=new_wallet_id,
         product_name=product_name,
     )
-    current_wallet: WalletGet = await wallets_api.get_wallet_by_user(
+    current_wallet: WalletGet = await wallets_service.get_wallet_by_user(
         app,
         user_id=user_id,
         wallet_id=current_wallet_id,
         product_name=product_name,
     )
 
-    user = await users_api.get_user(app, user_id=user_id)
+    user = await users_service.get_user(app, user_id=user_id)
 
     # Transfer credits from the source wallet to the connected wallet
     rpc_client = get_rabbitmq_rpc_client(app)

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

@@ -10,9 +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 as _folders_repository
-from . import _groups_respository as project_groups_db
-from . import _projects_repository
+from . import _folders_repository, _groups_respository, _projects_repository
 from ._access_rights_service import get_user_project_access_rights
 from .exceptions import ProjectInvalidRightsError
 
@@ -62,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 project_groups_db.delete_all_project_groups(
+        await _groups_respository.delete_all_project_groups(
             app, connection=conn, project_id=project_id
         )
-        await project_groups_db.update_or_insert_project_group(
+        await _groups_respository.update_or_insert_project_group(
             app,
             connection=conn,
             project_id=project_id,

services/web/server/src/simcore_service_webserver/resource_usage/_observer.py

@@ -1,7 +1,4 @@
-""" Handlers to events registered in servicelib.observer.event_registry
-
-"""
-
+"""Handlers to events registered in servicelib.observer.event_registry"""
 
 import logging
 
@@ -15,7 +12,7 @@
 from servicelib.utils import logged_gather
 
 from ..notifications import wallet_osparc_credits
-from ..wallets import api as wallets_api
+from ..wallets import api as wallets_service
 
 _logger = logging.getLogger(__name__)
 
@@ -30,7 +27,7 @@ async def _on_user_disconnected(
     assert client_session_id  # nosec
 
     # Get all user wallets and unsubscribe
-    user_wallet = await wallets_api.list_wallets_for_user(
+    user_wallet = await wallets_service.list_wallets_for_user(
         app, user_id=user_id, product_name=product_name
     )
     disconnect_tasks = [
@@ -44,7 +41,7 @@ async def _on_user_connected(
     user_id: int, app: web.Application, product_name: str
 ) -> None:
     # Get all user wallets and subscribe
-    user_wallet = await wallets_api.list_wallets_for_user(
+    user_wallet = await wallets_service.list_wallets_for_user(
         app, user_id=user_id, product_name=product_name
     )
     _logger.debug("Connecting user %s to wallets %s", f"{user_id}", f"{user_wallet}")