Skip to content

Commit 6d5ba04

Browse files
pcrespovpcrespov
committed
rest handlers
1 parent 445c6de commit 6d5ba04

22 files changed

+80
-106
lines changed

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

Lines changed: 7 additions & 12 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
"""
@@ -17,7 +17,7 @@
1717
from models_library.projects_comments import CommentID, ProjectsCommentsAPI
1818
from pydantic import NonNegativeInt
1919
from simcore_service_webserver._meta import API_VTAG
20-
from simcore_service_webserver.projects._comments_handlers import (
20+
from simcore_service_webserver.projects._comments_rest import (
2121
_ProjectCommentsBodyParams,
2222
_ProjectCommentsPathParams,
2323
_ProjectCommentsWithCommentPathParams,
@@ -45,8 +45,7 @@
4545
)
4646
async def create_project_comment(
4747
project_uuid: ProjectID, body: _ProjectCommentsBodyParams
48-
):
49-
...
48+
): ...
5049

5150

5251
assert_handler_signature_against_model(
@@ -61,8 +60,7 @@ async def create_project_comment(
6160
)
6261
async def list_project_comments(
6362
project_uuid: ProjectID, limit: int = 20, offset: NonNegativeInt = 0
64-
):
65-
...
63+
): ...
6664

6765

6866
assert_handler_signature_against_model(
@@ -79,8 +77,7 @@ async def update_project_comment(
7977
project_uuid: ProjectID,
8078
comment_id: CommentID,
8179
body: _ProjectCommentsBodyParams,
82-
):
83-
...
80+
): ...
8481

8582

8683
assert_handler_signature_against_model(
@@ -93,8 +90,7 @@ async def update_project_comment(
9390
description="Delete a specific comment associated with a project.",
9491
status_code=204,
9592
)
96-
async def delete_project_comment(project_uuid: ProjectID, comment_id: CommentID):
97-
...
93+
async def delete_project_comment(project_uuid: ProjectID, comment_id: CommentID): ...
9894

9995

10096
assert_handler_signature_against_model(
@@ -107,8 +103,7 @@ async def delete_project_comment(project_uuid: ProjectID, comment_id: CommentID)
107103
response_model=Envelope[ProjectsCommentsAPI],
108104
description="Retrieve a specific comment by its ID within a project.",
109105
)
110-
async def get_project_comment(project_uuid: ProjectID, comment_id: CommentID):
111-
...
106+
async def get_project_comment(project_uuid: ProjectID, comment_id: CommentID): ...
112107

113108

114109
assert_handler_signature_against_model(

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

Lines changed: 3 additions & 4 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
"""
@@ -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_handlers import (
16+
from simcore_service_webserver.projects._folders_rest import (
1717
_ProjectsFoldersPathParams,
1818
)
1919

@@ -30,5 +30,4 @@
3030
)
3131
async def replace_project_folder(
3232
_path: Annotated[_ProjectsFoldersPathParams, Depends()],
33-
):
34-
...
33+
): ...

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
from simcore_service_webserver._meta import API_VTAG
1212
from simcore_service_webserver.projects._common.models import ProjectPathParams
1313
from simcore_service_webserver.projects._groups_api import ProjectGroupGet
14-
from simcore_service_webserver.projects._groups_handlers import (
14+
from simcore_service_webserver.projects._groups_rest import (
1515
_ProjectsGroupsBodyParams,
1616
_ProjectsGroupsPathParams,
1717
)
@@ -30,16 +30,14 @@
3030
async def create_project_group(
3131
_path: Annotated[_ProjectsGroupsPathParams, Depends()],
3232
_body: _ProjectsGroupsBodyParams,
33-
):
34-
...
33+
): ...
3534

3635

3736
@router.get(
3837
"/projects/{project_id}/groups",
3938
response_model=Envelope[list[ProjectGroupGet]],
4039
)
41-
async def list_project_groups(_path: Annotated[ProjectPathParams, Depends()]):
42-
...
40+
async def list_project_groups(_path: Annotated[ProjectPathParams, Depends()]): ...
4341

4442

4543
@router.put(
@@ -49,13 +47,13 @@ async def list_project_groups(_path: Annotated[ProjectPathParams, Depends()]):
4947
async def replace_project_group(
5048
_path: Annotated[_ProjectsGroupsPathParams, Depends()],
5149
_body: _ProjectsGroupsBodyParams,
52-
):
53-
...
50+
): ...
5451

5552

5653
@router.delete(
5754
"/projects/{project_id}/groups/{group_id}",
5855
status_code=status.HTTP_204_NO_CONTENT,
5956
)
60-
async def delete_project_group(_path: Annotated[_ProjectsGroupsPathParams, Depends()]):
61-
...
57+
async def delete_project_group(
58+
_path: Annotated[_ProjectsGroupsPathParams, Depends()],
59+
): ...

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

Lines changed: 4 additions & 6 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
"""
@@ -18,7 +18,7 @@
1818
)
1919
from models_library.generics import Envelope
2020
from simcore_service_webserver._meta import API_VTAG
21-
from simcore_service_webserver.projects._metadata_handlers import ProjectPathParams
21+
from simcore_service_webserver.projects._metadata_rest import ProjectPathParams
2222

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

@@ -33,8 +33,7 @@
3333
response_model=Envelope[ProjectMetadataGet],
3434
status_code=status.HTTP_200_OK,
3535
)
36-
async def get_project_metadata(_params: Annotated[ProjectPathParams, Depends()]):
37-
...
36+
async def get_project_metadata(_params: Annotated[ProjectPathParams, Depends()]): ...
3837

3938

4039
@router.patch(
@@ -44,5 +43,4 @@ async def get_project_metadata(_params: Annotated[ProjectPathParams, Depends()])
4443
)
4544
async def update_project_metadata(
4645
_params: Annotated[ProjectPathParams, Depends()], _body: ProjectMetadataUpdate
47-
):
48-
...
46+
): ...

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
from models_library.projects_nodes_io import NodeID
2828
from simcore_service_webserver._meta import API_VTAG
2929
from simcore_service_webserver.projects._crud_handlers import ProjectPathParams
30-
from simcore_service_webserver.projects._nodes_handlers import (
30+
from simcore_service_webserver.projects._nodes_rest import (
3131
NodePathParams,
3232
_ProjectGroupAccess,
3333
_ProjectNodePreview,

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

Lines changed: 5 additions & 7 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
"""
@@ -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_handlers import NodePathParams
21-
from simcore_service_webserver.projects._projects_nodes_pricing_unit_handlers import (
20+
from simcore_service_webserver.projects._nodes_rest import NodePathParams
21+
from simcore_service_webserver.projects._projects_nodes_pricing_unit_rest import (
2222
_ProjectNodePricingUnitPathParams,
2323
)
2424

@@ -35,8 +35,7 @@
3535
response_model=Envelope[PricingUnitGet | None],
3636
description="Get currently connected pricing unit to the project node.",
3737
)
38-
async def get_project_node_pricing_unit(project_id: ProjectID, node_id: NodeID):
39-
...
38+
async def get_project_node_pricing_unit(project_id: ProjectID, node_id: NodeID): ...
4039

4140

4241
assert_handler_signature_against_model(get_project_node_pricing_unit, NodePathParams)
@@ -52,8 +51,7 @@ async def connect_pricing_unit_to_project_node(
5251
node_id: NodeID,
5352
pricing_plan_id: PricingPlanId,
5453
pricing_unit_id: PricingUnitId,
55-
):
56-
...
54+
): ...
5755

5856

5957
assert_handler_signature_against_model(

‎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_handlers import (
12+
from simcore_service_webserver.projects._ports_rest import (
1313
ProjectInputGet,
1414
ProjectInputUpdate,
1515
ProjectMetadataPortGet,

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

Lines changed: 5 additions & 8 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
"""
@@ -18,7 +18,7 @@
1818
from models_library.wallets import WalletID
1919
from simcore_service_webserver._meta import API_VTAG
2020
from simcore_service_webserver.projects._common.models import ProjectPathParams
21-
from simcore_service_webserver.projects._wallets_handlers import (
21+
from simcore_service_webserver.projects._wallets_rest import (
2222
_PayProjectDebtBody,
2323
_ProjectWalletPathParams,
2424
)
@@ -36,8 +36,7 @@
3636
response_model=Envelope[WalletGet | None],
3737
description="Get current connected wallet to the project.",
3838
)
39-
async def get_project_wallet(project_id: ProjectID):
40-
...
39+
async def get_project_wallet(project_id: ProjectID): ...
4140

4241

4342
assert_handler_signature_against_model(get_project_wallet, ProjectPathParams)
@@ -51,8 +50,7 @@ async def get_project_wallet(project_id: ProjectID):
5150
async def connect_wallet_to_project(
5251
project_id: ProjectID,
5352
wallet_id: WalletID,
54-
):
55-
...
53+
): ...
5654

5755

5856
assert_handler_signature_against_model(connect_wallet_to_project, ProjectPathParams)
@@ -65,8 +63,7 @@ async def connect_wallet_to_project(
6563
async def pay_project_debt(
6664
_path: Annotated[_ProjectWalletPathParams, Depends()],
6765
_body: Annotated[_PayProjectDebtBody, Depends()],
68-
):
69-
...
66+
): ...
7067

7168

7269
assert_handler_signature_against_model(connect_wallet_to_project, ProjectPathParams)

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

Lines changed: 3 additions & 4 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
"""
@@ -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_handlers import (
16+
from simcore_service_webserver.projects._workspaces_rest import (
1717
_ProjectWorkspacesPathParams,
1818
)
1919

@@ -30,5 +30,4 @@
3030
)
3131
async def move_project_to_workspace(
3232
_path: Annotated[_ProjectWorkspacesPathParams, Depends()],
33-
):
34-
...
33+
): ...

‎services/web/server/src/simcore_service_webserver/projects/_comments_handlers.py‎ renamed to ‎services/web/server/src/simcore_service_webserver/projects/_comments_rest.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
""" Handlers for project comments operations
2-
3-
"""
1+
"""Handlers for project comments operations"""
42

53
import logging
64
from typing import Any

0 commit comments

Comments
 (0)