|
56 | 56 | from servicelib.services_utils import get_status_as_dict |
57 | 57 | from simcore_postgres_database.models.users import UserRole |
58 | 58 |
|
| 59 | +from ..._meta import API_VTAG as VTAG |
| 60 | +from ...catalog import catalog_service |
59 | 61 | from ...dynamic_scheduler import api as dynamic_scheduler_service |
60 | | -from .. import _projects_service |
61 | | -from .._access_rights_service import has_user_project_access_rights |
62 | | -from .._meta import API_VTAG as VTAG |
63 | | -from ..catalog import catalog_service |
64 | | -from ..groups.api import get_group_from_gid, list_all_user_groups_ids |
65 | | -from ..groups.exceptions import GroupNotFoundError |
66 | | -from ..login.decorators import login_required |
67 | | -from ..security.decorators import permission_required |
68 | | -from ..users.api import get_user_id_from_gid, get_user_role |
69 | | -from ..utils_aiohttp import envelope_json_response |
70 | | -from . import _access_rights_api as access_rights_service |
71 | | -from . import _nodes_api as _nodes_service |
72 | | -from ._common.exceptions_handlers import handle_plugin_requests_exceptions |
73 | | -from ._common.models import ProjectPathParams, RequestContext |
74 | | -from ._nodes_api import NodeScreenshot, get_node_screenshots |
75 | | -from ._rest_exceptions import handle_plugin_requests_exceptions |
76 | | -from ._rest_schemas import ProjectPathParams, RequestContext |
77 | | -from .exceptions import ( |
| 62 | +from ...groups.api import get_group_from_gid, list_all_user_groups_ids |
| 63 | +from ...groups.exceptions import GroupNotFoundError |
| 64 | +from ...login.decorators import login_required |
| 65 | +from ...security.decorators import permission_required |
| 66 | +from ...users.api import get_user_id_from_gid, get_user_role |
| 67 | +from ...utils_aiohttp import envelope_json_response |
| 68 | +from .. import _access_rights_service, _nodes_service, _projects_service |
| 69 | +from .._nodes_service import NodeScreenshot |
| 70 | +from ..exceptions import ( |
78 | 71 | NodeNotFoundError, |
79 | 72 | ProjectNodeResourcesInsufficientRightsError, |
80 | 73 | ProjectNodeResourcesInvalidError, |
81 | 74 | ) |
| 75 | +from ._rest_exceptions import handle_plugin_requests_exceptions |
| 76 | +from ._rest_schemas import ProjectPathParams, RequestContext |
82 | 77 |
|
83 | 78 | _logger = logging.getLogger(__name__) |
84 | 79 |
|
@@ -324,7 +319,7 @@ async def stop_node(request: web.Request) -> web.Response: |
324 | 319 | req_ctx = RequestContext.model_validate(request) |
325 | 320 | path_params = parse_request_path_parameters_as(NodePathParams, request) |
326 | 321 |
|
327 | | - save_state = await has_user_project_access_rights( |
| 322 | + save_state = await _access_rights_service.has_user_project_access_rights( |
328 | 323 | request.app, |
329 | 324 | project_id=path_params.project_id, |
330 | 325 | user_id=req_ctx.user_id, |
@@ -483,7 +478,7 @@ async def get_project_services(request: web.Request) -> web.Response: |
483 | 478 | req_ctx = RequestContext.model_validate(request) |
484 | 479 | path_params = parse_request_path_parameters_as(ProjectPathParams, request) |
485 | 480 |
|
486 | | - await access_rights_service.check_user_project_permission( |
| 481 | + await _access_rights_service.check_user_project_permission( |
487 | 482 | request.app, |
488 | 483 | product_name=req_ctx.product_name, |
489 | 484 | user_id=req_ctx.user_id, |
@@ -654,7 +649,7 @@ async def list_project_nodes_previews(request: web.Request) -> web.Response: |
654 | 649 | project = Project.model_validate(project_data) |
655 | 650 |
|
656 | 651 | for node_id, node in project.workbench.items(): |
657 | | - screenshots = await get_node_screenshots( |
| 652 | + screenshots = await _nodes_service.get_node_screenshots( |
658 | 653 | app=request.app, |
659 | 654 | user_id=req_ctx.user_id, |
660 | 655 | project_id=path_params.project_id, |
|
0 commit comments