Skip to content

Commit ba8809d

Browse files
bisgaard-itisbisgaard-itis
committed
Merge branch 'master' into upgrade-api-server-dependencies
2 parents 78b1ebf + e05d046 commit ba8809d

File tree

203 files changed

+7933
-4910
lines changed

Some content is hidden

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

203 files changed

+7933
-4910
lines changed

‎.env-devel‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ DIRECTOR_V2_TRACING={}
126126
# DYNAMIC_SCHEDULER ----
127127
DYNAMIC_SCHEDULER_LOGLEVEL=DEBUG
128128
DYNAMIC_SCHEDULER_PROFILING=1
129+
DYNAMIC_SCHEDULER_USE_INTERNAL_SCHEDULER=0
129130
DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT=01:00:00
130131
DYNAMIC_SCHEDULER_TRACING={}
131132
DYNAMIC_SCHEDULER_UI_STORAGE_SECRET=adminadmin
@@ -211,7 +212,7 @@ RESOURCE_USAGE_TRACKER_S3=null
211212
RESOURCE_USAGE_TRACKER_TRACING={}
212213

213214
# NOTE: 172.17.0.1 is the docker0 interface, which redirect from inside a container onto the host network interface.
214-
R_CLONE_OPTION_BUFFER_SIZE=0M
215+
R_CLONE_OPTION_BUFFER_SIZE=16M
215216
R_CLONE_OPTION_RETRIES=3
216217
R_CLONE_OPTION_TRANSFERS=5
217218
R_CLONE_PROVIDER=MINIO

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

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
""" Helper script to generate OAS automatically
2+
"""
3+
4+
# pylint: disable=redefined-outer-name
5+
# pylint: disable=unused-argument
6+
# pylint: disable=unused-variable
7+
# pylint: disable=too-many-arguments
8+
9+
from typing import Annotated
10+
11+
from _common import as_query
12+
from fastapi import APIRouter, Depends, status
13+
from models_library.api_schemas_webserver.licensed_items import LicensedItemGet
14+
from models_library.generics import Envelope
15+
from models_library.rest_error import EnvelopedError
16+
from simcore_service_webserver._meta import API_VTAG
17+
from simcore_service_webserver.catalog.licenses._exceptions_handlers import (
18+
_TO_HTTP_ERROR_MAP,
19+
)
20+
from simcore_service_webserver.catalog.licenses._models import (
21+
LicensedItemsBodyParams,
22+
LicensedItemsListQueryParams,
23+
LicensedItemsPathParams,
24+
)
25+
26+
router = APIRouter(
27+
prefix=f"/{API_VTAG}",
28+
tags=[
29+
"licenses",
30+
"catalog",
31+
],
32+
responses={
33+
i.status_code: {"model": EnvelopedError} for i in _TO_HTTP_ERROR_MAP.values()
34+
},
35+
)
36+
37+
38+
@router.get(
39+
"/catalog/licensed-items",
40+
response_model=Envelope[list[LicensedItemGet]],
41+
)
42+
async def list_licensed_items(
43+
_query: Annotated[as_query(LicensedItemsListQueryParams), Depends()],
44+
):
45+
...
46+
47+
48+
@router.get(
49+
"/catalog/licensed-items/{licensed_item_id}",
50+
response_model=Envelope[LicensedItemGet],
51+
)
52+
async def get_licensed_item(
53+
_path: Annotated[LicensedItemsPathParams, Depends()],
54+
):
55+
...
56+
57+
58+
@router.post(
59+
"/catalog/licensed-items/{licensed_item_id}:purchase",
60+
status_code=status.HTTP_204_NO_CONTENT,
61+
)
62+
async def purchase_licensed_item(
63+
_path: Annotated[LicensedItemsPathParams, Depends()],
64+
_body: LicensedItemsBodyParams,
65+
):
66+
...

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
"_announcements",
3232
"_catalog",
3333
"_catalog_tags", # MUST BE after _catalog
34+
"_catalog_licensed_items",
3435
"_computations",
3536
"_exporter",
3637
"_folders",

‎packages/aws-library/requirements/_base.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ email-validator==2.2.0
9797
# via pydantic
9898
fast-depends==2.4.12
9999
# via faststream
100-
faststream==0.5.28
100+
faststream==0.5.31
101101
# via -r requirements/../../../packages/service-library/requirements/_base.in
102102
frozenlist==1.4.1
103103
# via
@@ -218,7 +218,7 @@ protobuf==4.25.5
218218
# opentelemetry-proto
219219
psutil==6.0.0
220220
# via -r requirements/../../../packages/service-library/requirements/_base.in
221-
pydantic==2.9.2
221+
pydantic==2.10.3
222222
# via
223223
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
224224
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
@@ -247,7 +247,7 @@ pydantic==2.9.2
247247
# fast-depends
248248
# pydantic-extra-types
249249
# pydantic-settings
250-
pydantic-core==2.23.4
250+
pydantic-core==2.27.1
251251
# via pydantic
252252
pydantic-extra-types==2.9.0
253253
# via
@@ -307,7 +307,6 @@ redis==5.0.4
307307
# -r requirements/../../../packages/service-library/requirements/_base.in
308308
referencing==0.29.3
309309
# via
310-
# -c requirements/../../../packages/service-library/requirements/./constraints.txt
311310
# jsonschema
312311
# jsonschema-specifications
313312
repro-zipfile==0.3.1
@@ -393,6 +392,7 @@ wrapt==1.16.0
393392
# opentelemetry-instrumentation-redis
394393
yarl==1.12.1
395394
# via
395+
# -r requirements/../../../packages/service-library/requirements/_base.in
396396
# aio-pika
397397
# aiohttp
398398
# aiormq

‎packages/aws-library/requirements/_test.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -158,12 +158,12 @@ py-partiql-parser==0.5.6
158158
# via moto
159159
pycparser==2.22
160160
# via cffi
161-
pydantic==2.9.2
161+
pydantic==2.10.3
162162
# via
163163
# -c requirements/../../../requirements/constraints.txt
164164
# -c requirements/_base.txt
165165
# aws-sam-translator
166-
pydantic-core==2.23.4
166+
pydantic-core==2.27.1
167167
# via
168168
# -c requirements/_base.txt
169169
# pydantic

‎packages/common-library/requirements/_base.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@ orjson==3.10.10
44
# via
55
# -c requirements/../../../requirements/constraints.txt
66
# -r requirements/_base.in
7-
pydantic==2.9.2
7+
pydantic==2.10.3
88
# via
99
# -c requirements/../../../requirements/constraints.txt
1010
# -r requirements/_base.in
1111
# pydantic-extra-types
12-
pydantic-core==2.23.4
12+
pydantic-core==2.27.1
1313
# via pydantic
1414
pydantic-extra-types==2.9.0
1515
# via -r requirements/_base.in

‎packages/common-library/requirements/_test.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ pluggy==1.5.0
2020
# via pytest
2121
pprintpp==0.4.0
2222
# via pytest-icdiff
23-
pydantic==2.9.2
23+
pydantic==2.10.3
2424
# via
2525
# -c requirements/../../../requirements/constraints.txt
2626
# -c requirements/_base.txt
2727
# pydantic-settings
28-
pydantic-core==2.23.4
28+
pydantic-core==2.27.1
2929
# via
3030
# -c requirements/_base.txt
3131
# pydantic

‎packages/common-library/src/common_library/basic_types.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
11
from enum import StrEnum
2+
from typing import Any
3+
4+
from pydantic_core import PydanticUndefined
5+
6+
# SEE https://github.com/fastapi/fastapi/blob/master/fastapi/_compat.py#L75-L78
7+
Undefined = PydanticUndefined
8+
DEFAULT_FACTORY: Any = Undefined
9+
# Use `UNSET` as default when default_factory
10+
# SEE https://github.com/ITISFoundation/osparc-simcore/pull/6882
211

312

413
class LogLevel(StrEnum):

‎packages/dask-task-models-library/requirements/_base.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ partd==1.4.2
7676
# via dask
7777
psutil==6.0.0
7878
# via distributed
79-
pydantic==2.9.2
79+
pydantic==2.10.3
8080
# via
8181
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
8282
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
@@ -92,7 +92,7 @@ pydantic==2.9.2
9292
# -r requirements/_base.in
9393
# pydantic-extra-types
9494
# pydantic-settings
95-
pydantic-core==2.23.4
95+
pydantic-core==2.27.1
9696
# via pydantic
9797
pydantic-extra-types==2.9.0
9898
# via

‎packages/models-library/requirements/_base.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@ orjson==3.10.7
2222
# -c requirements/../../../requirements/constraints.txt
2323
# -r requirements/../../../packages/common-library/requirements/_base.in
2424
# -r requirements/_base.in
25-
pydantic==2.9.2
25+
pydantic==2.10.3
2626
# via
2727
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
2828
# -c requirements/../../../requirements/constraints.txt
2929
# -r requirements/../../../packages/common-library/requirements/_base.in
3030
# -r requirements/_base.in
3131
# pydantic-extra-types
3232
# pydantic-settings
33-
pydantic-core==2.23.4
33+
pydantic-core==2.27.1
3434
# via pydantic
3535
pydantic-extra-types==2.9.0
3636
# via

0 commit comments

Comments
 (0)