schemas

Author: pcrespov

api/specs/web-server/_projects.py

@@ -31,10 +31,12 @@
 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.models import ProjectPathParams
 from simcore_service_webserver.projects._controller._rest_exceptions import (
     _TO_HTTP_ERROR_MAP,
 )
+from simcore_service_webserver.projects._controller._rest_schemas import (
+    ProjectPathParams,
+)
 from simcore_service_webserver.projects._controller.projects_rest import (
     ProjectCreateQueryParams,
 )

api/specs/web-server/_projects_groups.py

@@ -9,7 +9,9 @@
 from fastapi import APIRouter, Depends, status
 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._rest_schemas import (
+    ProjectPathParams,
+)
 from simcore_service_webserver.projects._controller.groups_rest import (
     _ProjectsGroupsBodyParams,
     _ProjectsGroupsPathParams,

api/specs/web-server/_projects_wallet.py

@@ -17,7 +17,9 @@
 from models_library.projects import ProjectID
 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._rest_schemas import (
+    ProjectPathParams,
+)
 from simcore_service_webserver.projects._wallets_rest import (
     _PayProjectDebtBody,
     _ProjectWalletPathParams,

services/web/server/src/simcore_service_webserver/projects/_common/models.py renamed to services/web/server/src/simcore_service_webserver/projects/_controller/_rest_schemas.py

@@ -1,4 +1,4 @@
-""" Handlers for STANDARD methods on /projects colletions
+"""Handlers for STANDARD methods on /projects colletions
 
 Standard methods or CRUD that states for Create+Read(Get&List)+Update+Delete
 

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.models import RequestContext
 from ._rest_exceptions import handle_plugin_requests_exceptions
+from ._rest_schemas import RequestContext
 
 _logger = logging.getLogger(__name__)
 

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.models import RequestContext
 from ._rest_exceptions import handle_plugin_requests_exceptions
+from ._rest_schemas import RequestContext
 
 _logger = logging.getLogger(__name__)
 

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.models import ProjectPathParams, RequestContext
 from .._groups_service import ProjectGroupGet
 from ._rest_exceptions import handle_plugin_requests_exceptions
+from ._rest_schemas import ProjectPathParams, RequestContext
 
 _logger = logging.getLogger(__name__)
 

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.models import ProjectPathParams, RequestContext
 from ._rest_exceptions import handle_plugin_requests_exceptions
+from ._rest_schemas import ProjectPathParams, RequestContext
 
 routes = web.RouteTableDef()
 

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

@@ -17,9 +17,9 @@
 from ...security.decorators import permission_required
 from ...utils_aiohttp import envelope_json_response
 from .. import projects_service
-from .._common.models import RequestContext
 from ..db import ProjectDBAPI
 from ._rest_exceptions import handle_plugin_requests_exceptions
+from ._rest_schemas import RequestContext
 from .nodes_rest import NodePathParams
 
 _logger = logging.getLogger(__name__)

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

@@ -68,7 +68,6 @@
 from .. import _access_rights_service as access_rights_service
 from .. import _nodes_service as _nodes_service
 from .. import nodes_utils, projects_service
-from .._common.models import ProjectPathParams, RequestContext
 from .._nodes_service import NodeScreenshot, get_node_screenshots
 from ..api import has_user_project_access_rights
 from ..exceptions import (
@@ -77,6 +76,7 @@
     ProjectNodeResourcesInvalidError,
 )
 from ._rest_exceptions import handle_plugin_requests_exceptions
+from ._rest_schemas import ProjectPathParams, RequestContext
 
 _logger = logging.getLogger(__name__)