Skip to content

Commit 65ee01c

Browse files
author
Andrei Neagu
committed
Merge remote-tracking branch 'upstream/master' into pr-osparc-redirect-remain-dv2-calls-via-dynamic-scheduler
2 parents 7edad2b + 3ade7ef commit 65ee01c

File tree

139 files changed

+6034
-4466
lines changed

Some content is hidden

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

139 files changed

+6034
-4466
lines changed

‎.env-devel‎

Lines changed: 1 addition & 0 deletions
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

‎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

‎packages/models-library/src/models_library/api_schemas_directorv2/clusters.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
from typing import Any, TypeAlias
1+
from typing import Annotated, Any, TypeAlias
22

33
from pydantic import (
44
BaseModel,
@@ -55,7 +55,7 @@ class Worker(BaseModel):
5555

5656
class Scheduler(BaseModel):
5757
status: str = Field(..., description="The running status of the scheduler")
58-
workers: WorkersDict | None = Field(default_factory=dict)
58+
workers: Annotated[WorkersDict | None, Field(default_factory=dict)]
5959

6060
@field_validator("workers", mode="before")
6161
@classmethod

‎packages/models-library/src/models_library/api_schemas_webserver/activity.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from typing import TypeAlias
22

3-
from pydantic import BaseModel, Field, PositiveFloat
3+
from pydantic import BaseModel, PositiveFloat
44

55
from ..projects_nodes_io import NodeID
66

@@ -18,7 +18,7 @@ class Limits(BaseModel):
1818
class Activity(BaseModel):
1919
stats: Stats
2020
limits: Limits
21-
queued: bool = Field(None) # TODO: review since it in NOT filled
21+
queued: bool | None = None # TODO: review since it in NOT filled
2222

2323

2424
ActivityStatusDict: TypeAlias = dict[NodeID, Activity]

0 commit comments

Comments
 (0)