Skip to content

Commit 1045d95

Browse files
authored
Merge branch 'master' into fix/reevaluate-study-menu-buttons
2 parents 899f509 + c6d1b64 commit 1045d95

File tree

79 files changed

+1136
-912
lines changed

Some content is hidden

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

79 files changed

+1136
-912
lines changed

api/tests/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
aiohappyeyeballs==2.6.1
22
# via aiohttp
3-
aiohttp==3.12.7
3+
aiohttp==3.11.18
44
# via
55
# -c ../../requirements/constraints.txt
66
# -r requirements.in

ci/helpers/requirements/requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
aiohappyeyeballs==2.6.1
22
# via aiohttp
3-
aiohttp==3.12.7
3+
aiohttp==3.11.18
44
# via
55
# -c requirements/../../../requirements/constraints.txt
66
# -r requirements/requirements.in

packages/aws-library/requirements/_base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ aiofiles==24.1.0
1818
# aioboto3
1919
aiohappyeyeballs==2.6.1
2020
# via aiohttp
21-
aiohttp==3.12.7
21+
aiohttp==3.11.18
2222
# via
2323
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
2424
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt

packages/models-library/src/models_library/functions.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import datetime
12
from collections.abc import Mapping
23
from enum import Enum
34
from typing import Annotated, Any, Literal, TypeAlias
@@ -75,7 +76,10 @@ class FunctionClass(str, Enum):
7576
# see here https://github.com/ITISFoundation/osparc-simcore/issues/7659
7677
FunctionInputs: TypeAlias = dict[str, Any] | None
7778

78-
FunctionInputsList: TypeAlias = list[FunctionInputs]
79+
FunctionInputsList: TypeAlias = Annotated[
80+
list[FunctionInputs],
81+
Field(max_length=50),
82+
]
7983

8084
FunctionOutputs: TypeAlias = dict[str, Any] | None
8185

@@ -93,6 +97,7 @@ class FunctionBase(BaseModel):
9397

9498
class RegisteredFunctionBase(FunctionBase):
9599
uid: FunctionID
100+
created_at: datetime.datetime
96101

97102

98103
class ProjectFunction(FunctionBase):
@@ -149,6 +154,7 @@ class FunctionJobBase(BaseModel):
149154

150155
class RegisteredFunctionJobBase(FunctionJobBase):
151156
uid: FunctionJobID
157+
created_at: datetime.datetime
152158

153159

154160
class ProjectFunctionJob(FunctionJobBase):
@@ -204,6 +210,7 @@ class FunctionJobCollection(BaseModel):
204210

205211
class RegisteredFunctionJobCollection(FunctionJobCollection):
206212
uid: FunctionJobCollectionID
213+
created_at: datetime.datetime
207214

208215

209216
class FunctionJobCollectionStatus(BaseModel):
@@ -222,6 +229,7 @@ class FunctionJobDB(BaseModel):
222229

223230
class RegisteredFunctionJobDB(FunctionJobDB):
224231
uuid: FunctionJobID
232+
created: datetime.datetime
225233

226234

227235
class FunctionDB(BaseModel):
@@ -236,6 +244,7 @@ class FunctionDB(BaseModel):
236244

237245
class RegisteredFunctionDB(FunctionDB):
238246
uuid: FunctionID
247+
created: datetime.datetime
239248

240249

241250
class FunctionJobCollectionDB(BaseModel):
@@ -245,6 +254,7 @@ class FunctionJobCollectionDB(BaseModel):
245254

246255
class RegisteredFunctionJobCollectionDB(FunctionJobCollectionDB):
247256
uuid: FunctionJobCollectionID
257+
created: datetime.datetime
248258

249259

250260
class FunctionIDString(ConstrainedStr):

packages/notifications-library/requirements/_test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ aiodocker==0.24.0
22
# via -r requirements/_test.in
33
aiohappyeyeballs==2.6.1
44
# via aiohttp
5-
aiohttp==3.12.7
5+
aiohttp==3.11.18
66
# via
77
# -c requirements/../../../requirements/constraints.txt
88
# aiodocker

packages/service-library/requirements/_aiohttp.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
aiohappyeyeballs==2.6.1
22
# via aiohttp
3-
aiohttp==3.12.7
3+
aiohttp==3.11.18
44
# via -r requirements/_aiohttp.in
55
aiopg==1.4.0
66
# via -r requirements/_aiohttp.in

packages/service-library/requirements/_base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ aiofiles==24.1.0
1010
# via -r requirements/_base.in
1111
aiohappyeyeballs==2.6.1
1212
# via aiohttp
13-
aiohttp==3.12.7
13+
aiohttp==3.11.18
1414
# via
1515
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
1616
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt

packages/service-library/requirements/_test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ aiohappyeyeballs==2.6.1
33
# -c requirements/_aiohttp.txt
44
# -c requirements/_base.txt
55
# aiohttp
6-
aiohttp==3.12.7
6+
aiohttp==3.11.18
77
# via
88
# -c requirements/../../../requirements/constraints.txt
99
# -c requirements/_aiohttp.txt

packages/simcore-sdk/requirements/_base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ aiofiles==24.1.0
1414
# -r requirements/_base.in
1515
aiohappyeyeballs==2.6.1
1616
# via aiohttp
17-
aiohttp==3.12.7
17+
aiohttp==3.11.18
1818
# via
1919
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
2020
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt

packages/simcore-sdk/requirements/_test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ aiohappyeyeballs==2.6.1
1010
# via
1111
# -c requirements/_base.txt
1212
# aiohttp
13-
aiohttp==3.12.7
13+
aiohttp==3.11.18
1414
# via
1515
# -c requirements/../../../requirements/constraints.txt
1616
# -c requirements/_base.txt

0 commit comments

Comments
 (0)