Skip to content

Commit c826a6d

Browse files
bisgaard-itisbisgaard-itis
committed
merge master into refactor-catalog-domain-in-webserver
2 parents 476657e + 6834382 commit c826a6d

File tree

67 files changed

+4310
-2313
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+4310
-2313
lines changed

‎.github/CODEOWNERS‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -4,45 +4,46 @@
44

55

66
# files and folders recursively
7-
.env-* @mrnicegyu11 @YuryHrytsuk
8-
Makefile @pcrespov @sanderegg
7+
.env-* @mrnicegyu11 @YuryHrytsuk
8+
Makefile @pcrespov @sanderegg
99

1010

1111
# NOTE: '/' denotes the root of the repository
12-
/.github/ @sanderegg @pcrespov
13-
/api/ @sanderegg @pcrespov @matusdrobuliak66
14-
/ci/ @sanderegg @pcrespov
15-
/docs/ @pcrespov
16-
/packages/common-library/ @giancarloromeo
17-
/packages/models-library/ @sanderegg @pcrespov @matusdrobuliak66 @giancarloromeo
18-
/packages/postgres-database/ @matusdrobuliak66
19-
/packages/pytest-simcore/ @pcrespov @sanderegg
20-
/packages/service-integration/ @pcrespov @sanderegg @GitHK
21-
/packages/service-library/ @pcrespov
22-
/packages/settings-library/ @pcrespov @sanderegg
23-
/requirements/ @pcrespov @matusdrobuliak66
24-
/services/agent/ @GitHK
25-
/services/api-server/ @pcrespov
26-
/services/autoscaling/ @sanderegg
27-
/services/catalog/ @pcrespov @sanderegg
28-
/services/clusters-keeper/ @sanderegg
29-
/services/datcore-adapter/ @sanderegg
30-
/services/director*/ @sanderegg @pcrespov @GitHK
31-
/services/docker-compose*.yml @sanderegg @mrnicegyu11 @YuryHrytsuk
32-
/services/dynamic-sidecar/ @GitHK
33-
/services/efs-guardian/ @matusdrobuliak66
34-
/services/invitations/ @pcrespov
35-
/services/migration/ @pcrespov
36-
/services/payments/ @pcrespov @matusdrobuliak66
37-
/services/resource-usage-tracker/ @matusdrobuliak66
38-
/services/static-webserver/ @GitHK
39-
/services/static-webserver/client/ @odeimaiz
40-
/services/storage/ @sanderegg
41-
/services/web/server/ @pcrespov @sanderegg @GitHK @matusdrobuliak66
42-
/tests/e2e-frontend/ @odeimaiz
43-
/tests/e2e-playwright/ @matusdrobuliak66
44-
/tests/environment-setup/ @pcrespov
45-
/tests/performance/ @pcrespov @sanderegg
46-
/tests/public-api/ @pcrespov
47-
requirements/* @pcrespov
48-
tools/* @pcrespov
12+
/.github/ @sanderegg @pcrespov
13+
/api/ @sanderegg @pcrespov @matusdrobuliak66
14+
/ci/ @sanderegg @pcrespov
15+
/docs/ @pcrespov
16+
/packages/common-library/ @giancarloromeo
17+
/packages/models-library/ @sanderegg @pcrespov @matusdrobuliak66 @giancarloromeo
18+
/packages/postgres-database/ @matusdrobuliak66
19+
/packages/pytest-simcore/ @pcrespov @sanderegg
20+
/packages/service-integration/ @pcrespov @sanderegg @GitHK
21+
/packages/service-library/ @pcrespov
22+
/packages/settings-library/ @pcrespov @sanderegg
23+
/requirements/ @pcrespov @matusdrobuliak66
24+
/services/agent/ @GitHK
25+
/services/api-server/ @pcrespov
26+
/services/api-server/tests/unit/pact_broker/ @matusdrobuliak66
27+
/services/autoscaling/ @sanderegg
28+
/services/catalog/ @pcrespov @sanderegg
29+
/services/clusters-keeper/ @sanderegg
30+
/services/datcore-adapter/ @sanderegg
31+
/services/director*/ @sanderegg @pcrespov @GitHK
32+
/services/docker-compose*.yml @sanderegg @mrnicegyu11 @YuryHrytsuk
33+
/services/dynamic-sidecar/ @GitHK
34+
/services/efs-guardian/ @matusdrobuliak66
35+
/services/invitations/ @pcrespov
36+
/services/migration/ @pcrespov
37+
/services/payments/ @pcrespov @matusdrobuliak66
38+
/services/resource-usage-tracker/ @matusdrobuliak66
39+
/services/static-webserver/ @GitHK
40+
/services/static-webserver/client/ @odeimaiz
41+
/services/storage/ @sanderegg
42+
/services/web/server/ @pcrespov @sanderegg @GitHK @matusdrobuliak66
43+
/tests/e2e-frontend/ @odeimaiz
44+
/tests/e2e-playwright/ @matusdrobuliak66
45+
/tests/environment-setup/ @pcrespov
46+
/tests/performance/ @pcrespov @sanderegg
47+
/tests/public-api/ @pcrespov
48+
requirements/* @pcrespov
49+
tools/* @pcrespov

‎.github/workflows/ci-pact-master.yml‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
# This workflow holds jobs which are required to pass before merging into master
2+
3+
name: CI PACT Master
4+
on:
5+
push:
6+
branches:
7+
- "master"
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
jobs:
14+
pact-tests:
15+
timeout-minutes: 10
16+
name: "Run PACT tests"
17+
runs-on: ubuntu-latest
18+
env:
19+
# secrets can be set in settings/secrets on github
20+
PACT_BROKER_URL: ${{ secrets.PACT_BROKER_URL }}
21+
PACT_BROKER_USERNAME: ${{ secrets.PACT_BROKER_USERNAME }}
22+
PACT_BROKER_PASSWORD: ${{ secrets.PACT_BROKER_PASSWORD }}
23+
steps:
24+
- name: setup python environment
25+
uses: actions/setup-python@v5
26+
with:
27+
python-version: "3.11"
28+
- name: install uv
29+
uses: astral-sh/setup-uv@v5
30+
with:
31+
version: "0.5.x"
32+
enable-cache: false
33+
- name: checkout source branch
34+
uses: actions/checkout@v4
35+
- name: Run pact tests
36+
run: |
37+
make devenv
38+
source .venv/bin/activate
39+
cd services/api-server
40+
make install-ci
41+
make test-pacts

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

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
from models_library.api_schemas_api_server.pricing_plans import ServicePricingPlanGet
55
from models_library.api_schemas_webserver.catalog import (
66
CatalogServiceGet,
7+
CatalogServiceListItem,
78
CatalogServiceUpdate,
89
ServiceInputGet,
910
ServiceInputKey,
@@ -31,33 +32,28 @@
3132
)
3233

3334

34-
#
35-
# /catalog/services/* COLLECTION
36-
#
37-
38-
3935
@router.get(
4036
"/catalog/services/-/latest",
41-
response_model=Page[CatalogServiceGet],
37+
response_model=Page[CatalogServiceListItem],
4238
)
43-
def list_services_latest(_query_params: Annotated[ListServiceParams, Depends()]):
39+
def list_services_latest(_query: Annotated[ListServiceParams, Depends()]):
4440
pass
4541

4642

4743
@router.get(
4844
"/catalog/services/{service_key}/{service_version}",
4945
response_model=Envelope[CatalogServiceGet],
5046
)
51-
def get_service(_path_params: Annotated[ServicePathParams, Depends()]): ...
47+
def get_service(_path: Annotated[ServicePathParams, Depends()]): ...
5248

5349

5450
@router.patch(
5551
"/catalog/services/{service_key}/{service_version}",
5652
response_model=Envelope[CatalogServiceGet],
5753
)
5854
def update_service(
59-
_path_params: Annotated[ServicePathParams, Depends()],
60-
_update: CatalogServiceUpdate,
55+
_path: Annotated[ServicePathParams, Depends()],
56+
_body: CatalogServiceUpdate,
6157
): ...
6258

6359

@@ -66,7 +62,7 @@ def update_service(
6662
response_model=Envelope[list[ServiceInputGet]],
6763
)
6864
def list_service_inputs(
69-
_path_params: Annotated[ServicePathParams, Depends()],
65+
_path: Annotated[ServicePathParams, Depends()],
7066
): ...
7167

7268

@@ -75,7 +71,7 @@ def list_service_inputs(
7571
response_model=Envelope[ServiceInputGet],
7672
)
7773
def get_service_input(
78-
_path_params: Annotated[_ServiceInputsPathParams, Depends()],
74+
_path: Annotated[_ServiceInputsPathParams, Depends()],
7975
): ...
8076

8177

@@ -84,8 +80,8 @@ def get_service_input(
8480
response_model=Envelope[list[ServiceInputKey]],
8581
)
8682
def get_compatible_inputs_given_source_output(
87-
_path_params: Annotated[ServicePathParams, Depends()],
88-
_query_params: Annotated[_FromServiceOutputParams, Depends()],
83+
_path: Annotated[ServicePathParams, Depends()],
84+
_query: Annotated[_FromServiceOutputParams, Depends()],
8985
): ...
9086

9187

@@ -94,7 +90,7 @@ def get_compatible_inputs_given_source_output(
9490
response_model=Envelope[list[ServiceOutputKey]],
9591
)
9692
def list_service_outputs(
97-
_path_params: Annotated[ServicePathParams, Depends()],
93+
_path: Annotated[ServicePathParams, Depends()],
9894
): ...
9995

10096

@@ -103,7 +99,7 @@ def list_service_outputs(
10399
response_model=Envelope[list[ServiceOutputGet]],
104100
)
105101
def get_service_output(
106-
_path_params: Annotated[_ServiceOutputsPathParams, Depends()],
102+
_path: Annotated[_ServiceOutputsPathParams, Depends()],
107103
): ...
108104

109105

@@ -112,8 +108,8 @@ def get_service_output(
112108
response_model=Envelope[list[ServiceOutputKey]],
113109
)
114110
def get_compatible_outputs_given_target_input(
115-
_path_params: Annotated[ServicePathParams, Depends()],
116-
_query_params: Annotated[_ToServiceInputsParams, Depends()],
111+
_path: Annotated[ServicePathParams, Depends()],
112+
_query: Annotated[_ToServiceInputsParams, Depends()],
117113
): ...
118114

119115

@@ -122,7 +118,7 @@ def get_compatible_outputs_given_target_input(
122118
response_model=Envelope[ServiceResourcesGet],
123119
)
124120
def get_service_resources(
125-
_params: Annotated[ServicePathParams, Depends()],
121+
_path: Annotated[ServicePathParams, Depends()],
126122
): ...
127123

128124

@@ -133,5 +129,5 @@ def get_service_resources(
133129
tags=["pricing-plans"],
134130
)
135131
async def get_service_pricing_plan(
136-
_params: Annotated[ServicePathParams, Depends()],
132+
_path: Annotated[ServicePathParams, Depends()],
137133
): ...

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

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
NodePatch,
1919
NodeRetrieve,
2020
NodeRetrieved,
21+
ProjectNodeServicesGet,
2122
ServiceResourcesDict,
2223
)
2324
from models_library.generics import Envelope
@@ -76,8 +77,7 @@ def delete_node(project_id: str, node_id: str): # noqa: ARG001
7677
)
7778
def retrieve_node(
7879
project_id: str, node_id: str, _retrieve: NodeRetrieve # noqa: ARG001
79-
):
80-
...
80+
): ...
8181

8282

8383
@router.post(
@@ -147,24 +147,29 @@ def get_node_resources(project_id: str, node_id: str): # noqa: ARG001
147147
)
148148
def replace_node_resources(
149149
project_id: str, node_id: str, _new: ServiceResourcesDict # noqa: ARG001
150-
):
151-
...
150+
): ...
152151

153152

154153
#
155154
# projects/*/nodes/-/services
156155
#
157156

158157

158+
@router.get(
159+
"/projects/{project_id}/nodes/-/services",
160+
response_model=Envelope[ProjectNodeServicesGet],
161+
)
162+
async def get_project_services(project_id: ProjectID): ...
163+
164+
159165
@router.get(
160166
"/projects/{project_id}/nodes/-/services:access",
161167
response_model=Envelope[_ProjectGroupAccess],
162168
description="Check whether provided group has access to the project services",
163169
)
164170
async def get_project_services_access_for_gid(
165171
project_id: ProjectID, for_gid: GroupID # noqa: ARG001
166-
):
167-
...
172+
): ...
168173

169174

170175
assert_handler_signature_against_model(
@@ -197,8 +202,7 @@ async def list_project_nodes_previews(project_id: ProjectID): # noqa: ARG001
197202
)
198203
async def get_project_node_preview(
199204
project_id: ProjectID, node_id: NodeID # noqa: ARG001
200-
):
201-
...
205+
): ...
202206

203207

204208
assert_handler_signature_against_model(get_project_node_preview, NodePathParams)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
from uuid import UUID
99

1010
from fastapi import APIRouter, Depends, Query, status
11-
from fastapi_pagination.cursor import CursorPage
1211
from models_library.api_schemas_storage.storage_schemas import (
1312
FileLocation,
1413
FileMetaDataGet,
@@ -32,6 +31,7 @@
3231
from models_library.projects_nodes_io import LocationID
3332
from models_library.users import UserID
3433
from pydantic import AnyUrl, ByteSize
34+
from servicelib.fastapi.rest_pagination import CustomizedPathsCursorPage
3535
from simcore_service_webserver._meta import API_VTAG
3636
from simcore_service_webserver.storage.schemas import DatasetMetaData, FileMetaData
3737

@@ -59,7 +59,7 @@ async def list_storage_locations():
5959

6060
@router.get(
6161
"/storage/locations/{location_id}/paths",
62-
response_model=CursorPage[PathMetaDataGet],
62+
response_model=CustomizedPathsCursorPage[PathMetaDataGet],
6363
)
6464
async def list_storage_paths(
6565
_path: Annotated[StorageLocationPathParams, Depends()],

0 commit comments

Comments
 (0)