Skip to content

Commit 072562f

Browse files
pcrespovpcrespov
committed
moves to controlers folder
1 parent 6d5ba04 commit 072562f

24 files changed

+141
-142
lines changed

‎api/specs/web-server/_projects.py‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
""" Helper script to automatically generate OAS
1+
"""Helper script to automatically generate OAS
22
33
This OAS are the source of truth
44
"""
@@ -35,7 +35,9 @@
3535
_TO_HTTP_ERROR_MAP,
3636
)
3737
from simcore_service_webserver.projects._common.models import ProjectPathParams
38-
from simcore_service_webserver.projects._crud_handlers import ProjectCreateQueryParams
38+
from simcore_service_webserver.projects._controller._crud_handlers import (
39+
ProjectCreateQueryParams,
40+
)
3941
from simcore_service_webserver.projects._crud_handlers_models import (
4042
ProjectActiveQueryParams,
4143
ProjectsListQueryParams,
@@ -83,8 +85,7 @@ async def create_project(
8385
_h: Annotated[_ProjectCreateHeaderParams, Depends()],
8486
_query: Annotated[ProjectCreateQueryParams, Depends()],
8587
_body: ProjectCreateNew | ProjectCopyOverride,
86-
):
87-
...
88+
): ...
8889

8990

9091
@router.get(
@@ -93,8 +94,7 @@ async def create_project(
9394
)
9495
async def list_projects(
9596
_query: Annotated[as_query(ProjectsListQueryParams), Depends()],
96-
):
97-
...
97+
): ...
9898

9999

100100
@router.get(
@@ -103,8 +103,7 @@ async def list_projects(
103103
)
104104
async def get_active_project(
105105
_query: Annotated[ProjectActiveQueryParams, Depends()],
106-
):
107-
...
106+
): ...
108107

109108

110109
@router.get(
@@ -113,8 +112,7 @@ async def get_active_project(
113112
)
114113
async def get_project(
115114
_path: Annotated[ProjectPathParams, Depends()],
116-
):
117-
...
115+
): ...
118116

119117

120118
@router.patch(
@@ -125,8 +123,7 @@ async def get_project(
125123
async def patch_project(
126124
_path: Annotated[ProjectPathParams, Depends()],
127125
_body: ProjectPatch,
128-
):
129-
...
126+
): ...
130127

131128

132129
@router.delete(
@@ -135,8 +132,7 @@ async def patch_project(
135132
)
136133
async def delete_project(
137134
_path: Annotated[ProjectPathParams, Depends()],
138-
):
139-
...
135+
): ...
140136

141137

142138
@router.post(
@@ -146,8 +142,7 @@ async def delete_project(
146142
)
147143
async def clone_project(
148144
_path: Annotated[ProjectPathParams, Depends()],
149-
):
150-
...
145+
): ...
151146

152147

153148
@router.get(
@@ -156,8 +151,7 @@ async def clone_project(
156151
)
157152
async def list_projects_full_search(
158153
_query: Annotated[as_query(ProjectsSearchQueryParams), Depends()],
159-
):
160-
...
154+
): ...
161155

162156

163157
@router.get(
@@ -167,5 +161,4 @@ async def list_projects_full_search(
167161
)
168162
async def get_project_inactivity(
169163
_path: Annotated[ProjectPathParams, Depends()],
170-
):
171-
...
164+
): ...

‎api/specs/web-server/_projects_folders.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from fastapi import APIRouter, Depends, status
1515
from simcore_service_webserver._meta import API_VTAG
16-
from simcore_service_webserver.projects._folders_rest import (
16+
from simcore_service_webserver.projects._controller._folders_rest import (
1717
_ProjectsFoldersPathParams,
1818
)
1919

‎api/specs/web-server/_projects_groups.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
from models_library.generics import Envelope
1111
from simcore_service_webserver._meta import API_VTAG
1212
from simcore_service_webserver.projects._common.models import ProjectPathParams
13-
from simcore_service_webserver.projects._groups_api import ProjectGroupGet
14-
from simcore_service_webserver.projects._groups_rest import (
13+
from simcore_service_webserver.projects._controller._groups_rest import (
1514
_ProjectsGroupsBodyParams,
1615
_ProjectsGroupsPathParams,
1716
)
17+
from simcore_service_webserver.projects._groups_api import ProjectGroupGet
1818

1919
router = APIRouter(
2020
prefix=f"/{API_VTAG}",

‎api/specs/web-server/_projects_metadata.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,9 @@
1818
)
1919
from models_library.generics import Envelope
2020
from simcore_service_webserver._meta import API_VTAG
21-
from simcore_service_webserver.projects._metadata_rest import ProjectPathParams
21+
from simcore_service_webserver.projects._controller._metadata_rest import (
22+
ProjectPathParams,
23+
)
2224

2325
router = APIRouter(prefix=f"/{API_VTAG}", tags=["projects", "metadata"])
2426

‎api/specs/web-server/_projects_nodes.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@
2626
from models_library.projects import ProjectID
2727
from models_library.projects_nodes_io import NodeID
2828
from simcore_service_webserver._meta import API_VTAG
29-
from simcore_service_webserver.projects._crud_handlers import ProjectPathParams
30-
from simcore_service_webserver.projects._nodes_rest import (
29+
from simcore_service_webserver.projects._controller._crud_handlers import (
30+
ProjectPathParams,
31+
)
32+
from simcore_service_webserver.projects._controller._nodes_rest import (
3133
NodePathParams,
3234
_ProjectGroupAccess,
3335
_ProjectNodePreview,

‎api/specs/web-server/_projects_nodes_pricing_unit.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
from models_library.projects_nodes_io import NodeID
1818
from models_library.resource_tracker import PricingPlanId, PricingUnitId
1919
from simcore_service_webserver._meta import API_VTAG
20-
from simcore_service_webserver.projects._nodes_rest import NodePathParams
21-
from simcore_service_webserver.projects._projects_nodes_pricing_unit_rest import (
20+
from simcore_service_webserver.projects._controller._nodes_rest import NodePathParams
21+
from simcore_service_webserver.projects._controller._projects_nodes_pricing_unit_rest import (
2222
_ProjectNodePricingUnitPathParams,
2323
)
2424

‎api/specs/web-server/_projects_ports.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from models_library.projects import ProjectID
1010
from models_library.projects_nodes import NodeID
1111
from simcore_service_webserver._meta import API_VTAG
12-
from simcore_service_webserver.projects._ports_rest import (
12+
from simcore_service_webserver.projects._controller._ports_rest import (
1313
ProjectInputGet,
1414
ProjectInputUpdate,
1515
ProjectMetadataPortGet,

‎api/specs/web-server/_projects_states.py‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from servicelib.aiohttp import status
1515
from simcore_service_webserver._meta import API_VTAG
1616
from simcore_service_webserver.director_v2.exceptions import DirectorServiceError
17-
from simcore_service_webserver.projects._states_handlers import (
17+
from simcore_service_webserver.projects._controller._states_handlers import (
1818
ProjectPathParams,
1919
_OpenProjectQuery,
2020
)
@@ -70,20 +70,17 @@ def open_project(
7070
client_session_id: Annotated[str, Body(...)],
7171
_path_params: Annotated[ProjectPathParams, Depends()],
7272
_query_params: Annotated[_OpenProjectQuery, Depends()],
73-
):
74-
...
73+
): ...
7574

7675

7776
@router.post("/projects/{project_id}:close", status_code=status.HTTP_204_NO_CONTENT)
7877
def close_project(
7978
_path_params: Annotated[ProjectPathParams, Depends()],
8079
client_session_id: Annotated[str, Body(...)],
81-
):
82-
...
80+
): ...
8381

8482

8583
@router.get("/projects/{project_id}/state", response_model=Envelope[ProjectState])
8684
def get_project_state(
8785
_path_params: Annotated[ProjectPathParams, Depends()],
88-
):
89-
...
86+
): ...

‎api/specs/web-server/_projects_workspaces.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
from fastapi import APIRouter, Depends, status
1515
from simcore_service_webserver._meta import API_VTAG
16-
from simcore_service_webserver.projects._workspaces_rest import (
16+
from simcore_service_webserver.projects._controller._workspaces_rest import (
1717
_ProjectWorkspacesPathParams,
1818
)
1919

‎services/web/server/src/simcore_service_webserver/projects/_crud_handlers.py‎ renamed to ‎services/web/server/src/simcore_service_webserver/projects/_controller/_crud_handlers.py‎

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,30 @@
3333
)
3434
from servicelib.redis import get_project_locked_state
3535

36-
from .._meta import API_VTAG as VTAG
37-
from ..catalog import catalog_service
38-
from ..login.decorators import login_required
39-
from ..redis import get_redis_lock_manager_client_sdk
40-
from ..resource_manager.user_sessions import PROJECT_ID_KEY, managed_resource
41-
from ..security.api import check_user_permission
42-
from ..security.decorators import permission_required
43-
from ..users.api import get_user_fullname
44-
from ..utils_aiohttp import envelope_json_response
45-
from . import _crud_api_create, _crud_api_read, _crud_handlers_utils, projects_service
46-
from ._common.exceptions_handlers import handle_plugin_requests_exceptions
47-
from ._common.models import ProjectPathParams, RequestContext
48-
from ._crud_handlers_models import (
36+
from ..._meta import API_VTAG as VTAG
37+
from ...catalog import catalog_service
38+
from ...login.decorators import login_required
39+
from ...redis import get_redis_lock_manager_client_sdk
40+
from ...resource_manager.user_sessions import PROJECT_ID_KEY, managed_resource
41+
from ...security.api import check_user_permission
42+
from ...security.decorators import permission_required
43+
from ...users.api import get_user_fullname
44+
from ...utils_aiohttp import envelope_json_response
45+
from .. import _crud_api_create, _crud_api_read, projects_service
46+
from .._common.exceptions_handlers import handle_plugin_requests_exceptions
47+
from .._common.models import ProjectPathParams, RequestContext
48+
from .._crud_handlers_models import (
4949
ProjectActiveQueryParams,
5050
ProjectCreateHeaders,
5151
ProjectCreateQueryParams,
5252
ProjectFilters,
5353
ProjectsListQueryParams,
5454
ProjectsSearchQueryParams,
5555
)
56-
from ._permalink_service import update_or_pop_permalink_in_project
57-
from .models import ProjectDict
58-
from .utils import get_project_unavailable_services, project_uses_available_services
56+
from .._permalink_service import update_or_pop_permalink_in_project
57+
from ..models import ProjectDict
58+
from ..utils import get_project_unavailable_services, project_uses_available_services
59+
from . import _crud_handlers_utils
5960

6061
# When the user requests a project with a repo, the working copy might differ from
6162
# the repo project. A middleware in the meta module (if active) will resolve

0 commit comments

Comments
 (0)