Skip to content

Commit 482f107

Browse files
committed
fixes node_rest imports
1 parent 8f49209 commit 482f107

File tree

1 file changed

+16
-21
lines changed
  • services/web/server/src/simcore_service_webserver/projects/_controller

1 file changed

+16
-21
lines changed

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

Lines changed: 16 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -56,29 +56,24 @@
5656
from servicelib.services_utils import get_status_as_dict
5757
from simcore_postgres_database.models.users import UserRole
5858

59+
from ..._meta import API_VTAG as VTAG
60+
from ...catalog import catalog_service
5961
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 (
7871
NodeNotFoundError,
7972
ProjectNodeResourcesInsufficientRightsError,
8073
ProjectNodeResourcesInvalidError,
8174
)
75+
from ._rest_exceptions import handle_plugin_requests_exceptions
76+
from ._rest_schemas import ProjectPathParams, RequestContext
8277

8378
_logger = logging.getLogger(__name__)
8479

@@ -324,7 +319,7 @@ async def stop_node(request: web.Request) -> web.Response:
324319
req_ctx = RequestContext.model_validate(request)
325320
path_params = parse_request_path_parameters_as(NodePathParams, request)
326321

327-
save_state = await has_user_project_access_rights(
322+
save_state = await _access_rights_service.has_user_project_access_rights(
328323
request.app,
329324
project_id=path_params.project_id,
330325
user_id=req_ctx.user_id,
@@ -483,7 +478,7 @@ async def get_project_services(request: web.Request) -> web.Response:
483478
req_ctx = RequestContext.model_validate(request)
484479
path_params = parse_request_path_parameters_as(ProjectPathParams, request)
485480

486-
await access_rights_service.check_user_project_permission(
481+
await _access_rights_service.check_user_project_permission(
487482
request.app,
488483
product_name=req_ctx.product_name,
489484
user_id=req_ctx.user_id,
@@ -654,7 +649,7 @@ async def list_project_nodes_previews(request: web.Request) -> web.Response:
654649
project = Project.model_validate(project_data)
655650

656651
for node_id, node in project.workbench.items():
657-
screenshots = await get_node_screenshots(
652+
screenshots = await _nodes_service.get_node_screenshots(
658653
app=request.app,
659654
user_id=req_ctx.user_id,
660655
project_id=path_params.project_id,

0 commit comments

Comments
 (0)