rename

pcrespov · pcrespov · commit 0d34bb39cd9a · 2025-02-28T20:45:12.000+01:00
diff --git a/api/specs/web-server/_projects.py b/api/specs/web-server/_projects.py
@@ -31,11 +31,11 @@
 from models_library.rest_pagination import Page
 from pydantic import BaseModel
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._common.exceptions_handlers import (
+from simcore_service_webserver.projects._common.models import ProjectPathParams
+from simcore_service_webserver.projects._controller._rest_exceptions_handlers import (
     _TO_HTTP_ERROR_MAP,
 )
-from simcore_service_webserver.projects._common.models import ProjectPathParams
-from simcore_service_webserver.projects._controller._projects_rest import (
+from simcore_service_webserver.projects._controller.projects_rest import (
     ProjectCreateQueryParams,
 )
 from simcore_service_webserver.projects._projects_models import (
diff --git a/api/specs/web-server/_projects_comments.py b/api/specs/web-server/_projects_comments.py
@@ -17,7 +17,7 @@
 from models_library.projects_comments import CommentID, ProjectsCommentsAPI
 from pydantic import NonNegativeInt
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._controller._comments_rest import (
+from simcore_service_webserver.projects._controller.comments_rest import (
     _ProjectCommentsBodyParams,
     _ProjectCommentsPathParams,
     _ProjectCommentsWithCommentPathParams,
diff --git a/api/specs/web-server/_projects_folders.py b/api/specs/web-server/_projects_folders.py
@@ -13,7 +13,7 @@
 
 from fastapi import APIRouter, Depends, status
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._controller._folders_rest import (
+from simcore_service_webserver.projects._controller.folders_rest import (
     _ProjectsFoldersPathParams,
 )
 
diff --git a/api/specs/web-server/_projects_groups.py b/api/specs/web-server/_projects_groups.py
@@ -10,7 +10,7 @@
 from models_library.generics import Envelope
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.projects._common.models import ProjectPathParams
-from simcore_service_webserver.projects._controller._groups_rest import (
+from simcore_service_webserver.projects._controller.groups_rest import (
     _ProjectsGroupsBodyParams,
     _ProjectsGroupsPathParams,
 )
diff --git a/api/specs/web-server/_projects_metadata.py b/api/specs/web-server/_projects_metadata.py
@@ -18,7 +18,7 @@
 )
 from models_library.generics import Envelope
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._controller._metadata_rest import (
+from simcore_service_webserver.projects._controller.metadata_rest import (
     ProjectPathParams,
 )
 
diff --git a/api/specs/web-server/_projects_nodes.py b/api/specs/web-server/_projects_nodes.py
@@ -25,12 +25,12 @@
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._controller._nodes_rest import (
+from simcore_service_webserver.projects._controller.nodes_rest import (
     NodePathParams,
     _ProjectGroupAccess,
     _ProjectNodePreview,
 )
-from simcore_service_webserver.projects._controller._projects_rest import (
+from simcore_service_webserver.projects._controller.projects_rest import (
     ProjectPathParams,
 )
 
diff --git a/api/specs/web-server/_projects_nodes_pricing_unit.py b/api/specs/web-server/_projects_nodes_pricing_unit.py
@@ -17,10 +17,10 @@
 from models_library.projects_nodes_io import NodeID
 from models_library.resource_tracker import PricingPlanId, PricingUnitId
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._controller._nodes_pricing_unit_rest import (
+from simcore_service_webserver.projects._controller.nodes_pricing_unit_rest import (
     _ProjectNodePricingUnitPathParams,
 )
-from simcore_service_webserver.projects._controller._nodes_rest import NodePathParams
+from simcore_service_webserver.projects._controller.nodes_rest import NodePathParams
 
 router = APIRouter(
     prefix=f"/{API_VTAG}",
diff --git a/api/specs/web-server/_projects_ports.py b/api/specs/web-server/_projects_ports.py
@@ -9,7 +9,7 @@
 from models_library.projects import ProjectID
 from models_library.projects_nodes import NodeID
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._controller._ports_rest import (
+from simcore_service_webserver.projects._controller.ports_rest import (
     ProjectInputGet,
     ProjectInputUpdate,
     ProjectMetadataPortGet,
diff --git a/api/specs/web-server/_projects_states.py b/api/specs/web-server/_projects_states.py
@@ -14,7 +14,7 @@
 from servicelib.aiohttp import status
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.director_v2.exceptions import DirectorServiceError
-from simcore_service_webserver.projects._controller._projects_rest import (
+from simcore_service_webserver.projects._controller.projects_rest import (
     ProjectPathParams,
     _OpenProjectQuery,
 )
diff --git a/api/specs/web-server/_projects_wallet.py b/api/specs/web-server/_projects_wallet.py
@@ -18,7 +18,7 @@
 from models_library.wallets import WalletID
 from simcore_service_webserver._meta import API_VTAG
 from simcore_service_webserver.projects._common.models import ProjectPathParams
-from simcore_service_webserver.projects._controller._wallets_rest import (
+from simcore_service_webserver.projects._controller.wallets_rest import (
     _PayProjectDebtBody,
     _ProjectWalletPathParams,
 )
diff --git a/api/specs/web-server/_projects_workspaces.py b/api/specs/web-server/_projects_workspaces.py
@@ -13,7 +13,7 @@
 
 from fastapi import APIRouter, Depends, status
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.projects._controller._workspaces_rest import (
+from simcore_service_webserver.projects._controller.workspaces_rest import (
     _ProjectWorkspacesPathParams,
 )
 
diff --git a/api/specs/web-server/_trash.py b/api/specs/web-server/_trash.py
@@ -15,10 +15,10 @@
     FoldersPathParams,
     FolderTrashQueryParams,
 )
-from simcore_service_webserver.projects._common.exceptions_handlers import (
+from simcore_service_webserver.projects._controller._rest_exceptions_handlers import (
     _TO_HTTP_ERROR_MAP,
 )
-from simcore_service_webserver.projects._controller._trash_rest import ProjectPathParams
+from simcore_service_webserver.projects._controller.trash_rest import ProjectPathParams
 from simcore_service_webserver.workspaces._common.models import (
     WorkspacesPathParams,
     WorkspaceTrashQueryParams,
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/_rest_exceptions_handlers.py b/services/web/server/src/simcore_service_webserver/projects/_controller/_rest_exceptions_handlers.py
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/comments_rest.py b/services/web/server/src/simcore_service_webserver/projects/_controller/comments_rest.py
@@ -27,8 +27,8 @@
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
 from .. import _comments_service, _projects_service
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import RequestContext
+from ._rest_exceptions_handlers import handle_plugin_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/folders_rest.py b/services/web/server/src/simcore_service_webserver/projects/_controller/folders_rest.py
@@ -12,8 +12,8 @@
 from ...login.decorators import login_required
 from ...security.decorators import permission_required
 from .. import _folders_service
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import RequestContext
+from ._rest_exceptions_handlers import handle_plugin_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/groups_rest.py b/services/web/server/src/simcore_service_webserver/projects/_controller/groups_rest.py
@@ -17,9 +17,9 @@
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
 from .. import _groups_service
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import ProjectPathParams, RequestContext
 from .._groups_service import ProjectGroupGet
+from ._rest_exceptions_handlers import handle_plugin_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/metadata_rest.py b/services/web/server/src/simcore_service_webserver/projects/_controller/metadata_rest.py
@@ -28,8 +28,8 @@
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
 from .. import _metadata_service
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import ProjectPathParams, RequestContext
+from ._rest_exceptions_handlers import handle_plugin_requests_exceptions
 
 routes = web.RouteTableDef()
 
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/nodes_pricing_unit_rest.py b/services/web/server/src/simcore_service_webserver/projects/_controller/nodes_pricing_unit_rest.py
@@ -17,10 +17,10 @@
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
 from .. import _projects_service
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import RequestContext
 from .._projects_repository_legacy import ProjectDBAPI
-from ._nodes_rest import NodePathParams
+from ._rest_exceptions_handlers import handle_plugin_requests_exceptions
+from .nodes_rest import NodePathParams
 
 _logger = logging.getLogger(__name__)
 
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/nodes_rest.py b/services/web/server/src/simcore_service_webserver/projects/_controller/nodes_rest.py
@@ -63,14 +63,14 @@
 from ...utils_aiohttp import envelope_json_response
 from .. import _projects_service
 from .._access_rights_service import has_user_project_access_rights
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import ProjectPathParams, RequestContext
 from .._nodes_service import NodeScreenshot, get_node_screenshots
 from ..exceptions import (
     NodeNotFoundError,
     ProjectNodeResourcesInsufficientRightsError,
     ProjectNodeResourcesInvalidError,
 )
+from ._rest_exceptions_handlers import handle_plugin_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/ports_rest.py b/services/web/server/src/simcore_service_webserver/projects/_controller/ports_rest.py
@@ -31,10 +31,10 @@
 from ...utils_aiohttp import envelope_json_response
 from .. import _ports_service, _projects_service
 from .._access_rights_service import check_user_project_permission
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import ProjectPathParams, RequestContext
 from .._projects_repository_legacy import ProjectDBAPI
 from ..models import ProjectDict
+from ._rest_exceptions_handlers import handle_plugin_requests_exceptions
 
 log = logging.getLogger(__name__)
 
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/projects_rest.py b/services/web/server/src/simcore_service_webserver/projects/_controller/projects_rest.py
@@ -54,7 +54,6 @@
     _projects_service_read,
     _wallets_service,
 )
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import ProjectPathParams, RequestContext
 from .._projects_models import (
     ProjectActiveQueryParams,
@@ -70,6 +69,7 @@
 )
 from ..exceptions import ProjectStartsTooManyDynamicNodesError
 from ..models import ProjectDict
+from ._rest_exceptions_handlers import handle_plugin_requests_exceptions
 
 # When the user requests a project with a repo, the working copy might differ from
 # the repo project. A middleware in the meta module (if active) will resolve
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/projects_slots.py b/services/web/server/src/simcore_service_webserver/projects/_controller/projects_slots.py
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/tags_rest.py b/services/web/server/src/simcore_service_webserver/projects/_controller/tags_rest.py
@@ -11,7 +11,7 @@
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
 from .. import _tags_service
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
+from ._rest_exceptions_handlers import handle_plugin_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/trash_rest.py b/services/web/server/src/simcore_service_webserver/projects/_controller/trash_rest.py
@@ -18,9 +18,9 @@
 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 ._rest_exceptions_handlers import handle_plugin_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/wallets_rest.py b/services/web/server/src/simcore_service_webserver/projects/_controller/wallets_rest.py
@@ -20,8 +20,8 @@
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
 from .. import _projects_service, _wallets_service
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import ProjectPathParams, RequestContext
+from ._rest_exceptions_handlers import handle_plugin_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/workspaces_rest.py b/services/web/server/src/simcore_service_webserver/projects/_controller/workspaces_rest.py
@@ -13,8 +13,8 @@
 from ...login.decorators import login_required
 from ...security.decorators import permission_required
 from .. import _workspaces_service
-from .._common.exceptions_handlers import handle_plugin_requests_exceptions
 from .._common.models import RequestContext
+from ._rest_exceptions_handlers import handle_plugin_requests_exceptions
 
 _logger = logging.getLogger(__name__)
 
diff --git a/services/web/server/src/simcore_service_webserver/projects/plugin.py b/services/web/server/src/simcore_service_webserver/projects/plugin.py
@@ -9,6 +9,21 @@
 from aiohttp import web
 from servicelib.aiohttp.application_setup import ModuleCategory, app_module_setup
 
+from ._controller import (
+    comments_rest,
+    folders_rest,
+    groups_rest,
+    metadata_rest,
+    nodes_pricing_unit_rest,
+    nodes_rest,
+    ports_rest,
+    projects_rest,
+    projects_slots,
+    tags_rest,
+    trash_rest,
+    wallets_rest,
+)
+
 logger = logging.getLogger(__name__)
 
 
@@ -23,19 +38,7 @@ def setup_projects(app: web.Application) -> bool:
     from ..constants import APP_SETTINGS_KEY
     from . import _projects_repository_legacy, _security_service
     from ._controller import (
-        _comments_rest,
-        _folders_rest,
-        _groups_rest,
-        _metadata_rest,
-        _nodes_pricing_unit_rest,
-        _nodes_rest,
-        _ports_rest,
-        _projects_rest,
-        _projects_slots,
-        _tags_rest,
-        _trash_rest,
-        _wallets_rest,
-        _workspaces_rest,
+        workspaces_rest,
     )
 
     assert app[APP_SETTINGS_KEY].WEBSERVER_PROJECTS  # nosec
@@ -47,20 +50,20 @@ def setup_projects(app: web.Application) -> bool:
     _projects_repository_legacy.setup_projects_db(app)
 
     # slots: registers event handlers (e.g. on_user_disconnect)
-    _projects_slots.setup_project_observer_events(app)
+    projects_slots.setup_project_observer_events(app)
 
     # rest
-    app.router.add_routes(_projects_rest.routes)
-    app.router.add_routes(_comments_rest.routes)
-    app.router.add_routes(_groups_rest.routes)
-    app.router.add_routes(_metadata_rest.routes)
-    app.router.add_routes(_ports_rest.routes)
-    app.router.add_routes(_nodes_rest.routes)
-    app.router.add_routes(_tags_rest.routes)
-    app.router.add_routes(_wallets_rest.routes)
-    app.router.add_routes(_folders_rest.routes)
-    app.router.add_routes(_nodes_pricing_unit_rest.routes)
-    app.router.add_routes(_workspaces_rest.routes)
-    app.router.add_routes(_trash_rest.routes)
+    app.router.add_routes(projects_rest.routes)
+    app.router.add_routes(comments_rest.routes)
+    app.router.add_routes(groups_rest.routes)
+    app.router.add_routes(metadata_rest.routes)
+    app.router.add_routes(ports_rest.routes)
+    app.router.add_routes(nodes_rest.routes)
+    app.router.add_routes(tags_rest.routes)
+    app.router.add_routes(wallets_rest.routes)
+    app.router.add_routes(folders_rest.routes)
+    app.router.add_routes(nodes_pricing_unit_rest.routes)
+    app.router.add_routes(workspaces_rest.routes)
+    app.router.add_routes(trash_rest.routes)
 
     return True
diff --git a/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handler.py b/services/web/server/tests/unit/with_dbs/02/test_projects_nodes_handler.py
@@ -48,7 +48,7 @@
 from servicelib.common_headers import UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE
 from simcore_postgres_database.models.projects import projects as projects_db_model
 from simcore_service_webserver.db.models import UserRole
-from simcore_service_webserver.projects._controller._nodes_rest import (
+from simcore_service_webserver.projects._controller.nodes_rest import (
     _ProjectNodePreview,
 )
 from simcore_service_webserver.projects.models import ProjectDict

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`
`14`	`14`	`from fastapi import APIRouter, Depends, status`
`15`	`15`	`from simcore_service_webserver._meta import API_VTAG`
`16`		`-from simcore_service_webserver.projects._controller._folders_rest import (`
	`16`	`+from simcore_service_webserver.projects._controller.folders_rest import (`
`17`	`17`	`_ProjectsFoldersPathParams,`
`18`	`18`	`)`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@`
`10`	`10`	`from models_library.generics import Envelope`
`11`	`11`	`from simcore_service_webserver._meta import API_VTAG`
`12`	`12`	`from simcore_service_webserver.projects._common.models import ProjectPathParams`
`13`		`-from simcore_service_webserver.projects._controller._groups_rest import (`
	`13`	`+from simcore_service_webserver.projects._controller.groups_rest import (`
`14`	`14`	`_ProjectsGroupsBodyParams,`
`15`	`15`	`_ProjectsGroupsPathParams,`
`16`	`16`	`)`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`	`)`
`19`	`19`	`from models_library.generics import Envelope`
`20`	`20`	`from simcore_service_webserver._meta import API_VTAG`
`21`		`-from simcore_service_webserver.projects._controller._metadata_rest import (`
	`21`	`+from simcore_service_webserver.projects._controller.metadata_rest import (`
`22`	`22`	`ProjectPathParams,`
`23`	`23`	`)`
`24`	`24`
Original file line number	Diff line number	Diff line change
`@@ -25,12 +25,12 @@`
`25`	`25`	`from models_library.projects import ProjectID`
`26`	`26`	`from models_library.projects_nodes_io import NodeID`
`27`	`27`	`from simcore_service_webserver._meta import API_VTAG`
`28`		`-from simcore_service_webserver.projects._controller._nodes_rest import (`
	`28`	`+from simcore_service_webserver.projects._controller.nodes_rest import (`
`29`	`29`	`NodePathParams,`
`30`	`30`	`_ProjectGroupAccess,`
`31`	`31`	`_ProjectNodePreview,`
`32`	`32`	`)`
`33`		`-from simcore_service_webserver.projects._controller._projects_rest import (`
	`33`	`+from simcore_service_webserver.projects._controller.projects_rest import (`
`34`	`34`	`ProjectPathParams,`
`35`	`35`	`)`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`from servicelib.aiohttp import status`
`15`	`15`	`from simcore_service_webserver._meta import API_VTAG`
`16`	`16`	`from simcore_service_webserver.director_v2.exceptions import DirectorServiceError`
`17`		`-from simcore_service_webserver.projects._controller._projects_rest import (`
	`17`	`+from simcore_service_webserver.projects._controller.projects_rest import (`
`18`	`18`	`ProjectPathParams,`
`19`	`19`	`_OpenProjectQuery,`
`20`	`20`	`)`