fix mypy

Author: pcrespov

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

@@ -7,20 +7,20 @@
     parse_request_query_parameters_as,
 )
 
-from .._meta import API_VTAG as VTAG
-from ..exception_handling import (
+from ..._meta import API_VTAG as VTAG
+from ...exception_handling import (
     ExceptionToHttpErrorMap,
     HttpErrorInfo,
     exception_handling_decorator,
     to_exceptions_handlers_map,
 )
-from ..login.decorators import get_user_id, login_required
-from ..products import products_web
-from ..security.decorators import permission_required
-from . import _trash_service
-from ._common.exceptions_handlers import handle_plugin_requests_exceptions
-from ._common.models import ProjectPathParams, RemoveQueryParams
-from .exceptions import ProjectRunningConflictError, ProjectStoppingError
+from ...login.decorators import get_user_id, login_required
+from ...products import products_web
+from ...security.decorators import permission_required
+from .. import _trash_service
+from ..exceptions import ProjectRunningConflictError, ProjectStoppingError
+from ._rest_exceptions import handle_plugin_requests_exceptions
+from ._rest_schemas import ProjectPathParams, RemoveQueryParams
 
 _logger = logging.getLogger(__name__)
 

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

@@ -15,14 +15,13 @@
     parse_request_path_parameters_as,
 )
 
-from .._meta import API_VTAG
-from ..login.decorators import login_required
-from ..security.decorators import permission_required
-from ..utils_aiohttp import envelope_json_response
-from . import _wallets_api as wallets_api
-from . import projects_service
-from ._common.exceptions_handlers import handle_plugin_requests_exceptions
-from ._common.models import ProjectPathParams, RequestContext
+from ..._meta import API_VTAG
+from ...login.decorators import login_required
+from ...security.decorators import permission_required
+from ...utils_aiohttp import envelope_json_response
+from .. import _projects_service, _wallets_service
+from ._rest_exceptions import handle_plugin_requests_exceptions
+from ._rest_schemas import ProjectPathParams, RequestContext
 
 _logger = logging.getLogger(__name__)
 
@@ -39,13 +38,13 @@ async def get_project_wallet(request: web.Request):
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
 
     # ensure the project exists
-    await projects_service.get_project_for_user(
+    await _projects_service.get_project_for_user(
         request.app,
         project_uuid=f"{path_params.project_id}",
         user_id=req_ctx.user_id,
         include_state=False,
     )
-    wallet: WalletGet | None = await wallets_api.get_project_wallet(
+    wallet: WalletGet | None = await _wallets_service.get_project_wallet(
         request.app, path_params.project_id
     )
 
@@ -70,14 +69,14 @@ async def connect_wallet_to_project(request: web.Request):
     path_params = parse_request_path_parameters_as(_ProjectWalletPathParams, request)
 
     # ensure the project exists
-    await projects_service.get_project_for_user(
+    await _projects_service.get_project_for_user(
         request.app,
         project_uuid=f"{path_params.project_id}",
         user_id=req_ctx.user_id,
         include_state=False,
     )
 
-    wallet: WalletGet = await wallets_api.connect_wallet_to_project(
+    wallet: WalletGet = await _wallets_service.connect_wallet_to_project(
         request.app,
         product_name=req_ctx.product_name,
         project_id=path_params.project_id,
@@ -106,15 +105,15 @@ async def pay_project_debt(request: web.Request):
     body_params = await parse_request_body_as(_PayProjectDebtBody, request)
 
     # Ensure the project exists
-    await projects_service.get_project_for_user(
+    await _projects_service.get_project_for_user(
         request.app,
         project_uuid=f"{path_params.project_id}",
         user_id=req_ctx.user_id,
         include_state=False,
     )
 
     # Get curently associated wallet with the project
-    current_wallet: WalletGet | None = await wallets_api.get_project_wallet(
+    current_wallet: WalletGet | None = await _wallets_service.get_project_wallet(
         request.app, path_params.project_id
     )
     if not current_wallet:
@@ -137,7 +136,7 @@ async def pay_project_debt(request: web.Request):
     # Steps:
     # 1. Transfer the required credits from the specified wallet to the connected wallet.
     # 2. Mark the project transactions as billed
-    await wallets_api.pay_debt_with_different_wallet(
+    await _wallets_service.pay_debt_with_different_wallet(
         app=request.app,
         product_name=req_ctx.product_name,
         project_id=path_params.project_id,