fix cyclic dependencies

Author: matusdrobuliak66

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

@@ -6,7 +6,7 @@
 
 from ..application_settings import get_application_settings
 from ..products.models import Product
-from ..projects import api as projects_api
+from ..projects import projects_wallets_service
 from ..users import preferences_api as user_preferences_api
 from ..users.exceptions import UserDefaultWalletNotFoundError
 from ..wallets import api as wallets_service
@@ -25,7 +25,9 @@ async def get_wallet_info(
         product.is_payment_enabled and app_settings.WEBSERVER_CREDIT_COMPUTATION_ENABLED
     ):
         return None
-    project_wallet = await projects_api.get_project_wallet(app, project_id=project_id)
+    project_wallet = await projects_wallets_service.get_project_wallet(
+        app, project_id=project_id
+    )
     if project_wallet is None:
         user_default_wallet_preference = await user_preferences_api.get_frontend_user_preference(
             app,
@@ -38,7 +40,7 @@ async def get_wallet_info(
         project_wallet_id = TypeAdapter(WalletID).validate_python(
             user_default_wallet_preference.value
         )
-        await projects_api.connect_wallet_to_project(
+        await projects_wallets_service.connect_wallet_to_project(
             app,
             product_name=product_name,
             project_id=project_id,

services/web/server/src/simcore_service_webserver/projects/_controller/projects_states_rest.py

@@ -28,8 +28,7 @@
 from ...security.decorators import permission_required
 from ...users import api
 from ...utils_aiohttp import envelope_json_response
-from .. import _projects_service
-from .. import api as projects_api
+from .. import _projects_service, projects_wallets_service
 from ..exceptions import ProjectStartsTooManyDynamicNodesError
 from ._rest_exceptions import handle_plugin_requests_exceptions
 from ._rest_schemas import ProjectPathParams, RequestContext
@@ -87,7 +86,7 @@ async def open_project(request: web.Request) -> web.Response:
             ),
         )
 
-        await projects_api.check_project_financial_status(
+        await projects_wallets_service.check_project_financial_status(
             request.app,
             project_id=path_params.project_id,
             product_name=req_ctx.product_name,

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

@@ -11,19 +11,11 @@
     delete_project_group_without_checking_permissions,
 )
 from ._projects_service import delete_project_by_user
-from ._wallets_service import (
-    check_project_financial_status,
-    connect_wallet_to_project,
-    get_project_wallet,
-)
 
 __all__: tuple[str, ...] = (
-    "check_project_financial_status",
     "check_user_project_permission",
-    "connect_wallet_to_project",
     "create_project_group_without_checking_permissions",
     "delete_project_group_without_checking_permissions",
-    "get_project_wallet",
     "has_user_project_access_rights",
     "list_projects",
     "delete_project_by_user",

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

@@ -0,0 +1,14 @@
+from ._wallets_service import (
+    check_project_financial_status,
+    connect_wallet_to_project,
+    get_project_wallet,
+)
+
+__all__: tuple[str, ...] = (
+    "check_project_financial_status",
+    "connect_wallet_to_project",
+    "get_project_wallet",
+)
+
+
+# nopycln: file

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

@@ -12,7 +12,7 @@
 from . import _groups_repository as workspaces_groups_db
 from . import _workspaces_repository as workspaces_workspaces_repository
 from ._groups_repository import WorkspaceGroupGetDB
-from ._workspaces_service import check_user_workspace_access
+from ._workspaces_service_crud_read import check_user_workspace_access
 from .errors import WorkspaceAccessForbiddenError
 
 log = logging.getLogger(__name__)