Skip to content

Commit ab3f0bd

Browse files
author
Andrei Neagu
committed
Merge remote-tracking branch 'upstream/master' into pr-osparc-long-running-tasks-refactor-6
2 parents 6ee1d9f + b1c1848 commit ab3f0bd

File tree

29 files changed

+389
-233
lines changed

29 files changed

+389
-233
lines changed

‎.env-devel‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ WB_API_WEBSERVER_PORT=8080
277277
WB_AUTH_WEBSERVER_HOST=wb-auth
278278
WB_AUTH_WEBSERVER_PORT=8080
279279
WB_AUTH_LOGLEVEL=INFO
280+
WB_AUTH_TRACING={}
280281

281282
WB_GC_ACTIVITY=null
282283
WB_GC_ANNOUNCEMENTS=0

‎.github/ISSUE_TEMPLATE/1_bug_report.yml‎

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
name: 🐛 Bug
22
description: File a bug/issue
3-
labels: ["bug", "t:bug"]
4-
assignees: ["pcrespov"]
3+
title: "[Bug]: "
4+
labels:
5+
- bug
6+
- "t:bug"
7+
assignees:
8+
- bisgaard-itis
9+
- giancarloromeo
10+
- GitHK
11+
- matusdrobuliak66
12+
- odeimaiz
13+
- pcrespov
14+
- sanderegg
15+
projects:
16+
- "ITISFoundation/projects/15"
17+
type: "Bug"
518
body:
619
- type: checkboxes
720
attributes:
@@ -20,7 +33,7 @@ body:
2033
- "production aws (e.g. osparc.io)"
2134
- "staging aws (e.g. staging.osparc.io)"
2235
- "production on-premise (dalco)"
23-
- "stating on-premise (dalco)"
36+
- "staging on-premise (dalco)"
2437
- "development (master)"
2538
- "other (e.g. local)"
2639
validations:

‎.github/ISSUE_TEMPLATE/2_feature_request.yml‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
name: ✨ Feature request
2-
description: Suggest an idea to implement in the simcore plaform
3-
labels: ["t:enhancement"]
4-
assignees: ["pcrespov"]
2+
description: Suggest an idea to implement in the simcore platform
3+
title: "[Feature]: "
4+
labels:
5+
- t:enhancement
6+
assignees:
7+
- bisgaard-itis
8+
- giancarloromeo
9+
- GitHK
10+
- matusdrobuliak66
11+
- odeimaiz
12+
- pcrespov
13+
- sanderegg
14+
type: "Feature"
515
body:
616
- type: checkboxes
717
attributes:

‎.github/ISSUE_TEMPLATE/3_maintenance_issue.yml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
name: 🏗️ Maintenance
22
description: A change in the code to overcome technical debt
3-
labels: ["t:maintenance"]
4-
assignees: ["pcrespov"]
3+
title: "[Maintenance]: "
4+
labels:
5+
- "t:maintenance"
6+
assignees:
7+
- bisgaard-itis
8+
- giancarloromeo
9+
- GitHK
10+
- matusdrobuliak66
11+
- odeimaiz
12+
- pcrespov
13+
- sanderegg
14+
projects:
15+
- "ITISFoundation/projects/9"
16+
type: "Task"
517
body:
618
- type: checkboxes
719
attributes:

‎.github/ISSUE_TEMPLATE/4_pre_release.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
name: 🚀 Pre-release to staging (developers-only)
22
description: Issue to plan and log pre-release from master to staging deploy (including staging hotfixes)
33
title: "🚀 Pre-release master -> staging_<sprint_name><version>"
4-
labels: ["t:maintenance", "release"]
5-
assignees: ["matusdrobuliak66"]
4+
labels:
5+
- "t:maintenance"
6+
- release
7+
assignees:
8+
- matusdrobuliak66
9+
- YuryHrytsuk
10+
type: "Task"
611
body:
712
- type: dropdown
813
id: prerelease_kind
@@ -34,8 +39,8 @@ body:
3439
attributes:
3540
label: Commit SHA
3641
description: |
37-
Selets the commit from which the release takes placeholder. Check [commits](https://github.com/ITISFoundation/osparc-simcore/commits/master)
38-
IMPORTANT: make sure t (i.e. tests passed and images were built and pushed)
42+
Selects the commit from which the release takes place. Check [commits](https://github.com/ITISFoundation/osparc-simcore/commits/master)
43+
IMPORTANT: make sure CI (i.e. tests passed and images were built and pushed)
3944
placeholder: 7d9dcc313f9ced0bd1e6508363148841683b6d7c
4045
validations:
4146
required: true
@@ -49,7 +54,7 @@ body:
4954
required: true
5055
- type: checkboxes
5156
attributes:
52-
label: Did the commit CI suceeded?
57+
label: Did the commit CI succeed?
5358
description: Check the CI of the selected commit in the [repo commits](https://github.com/ITISFoundation/osparc-simcore/commits/master)
5459
options:
5560
- label: The commit CI succeeded.
@@ -159,3 +164,4 @@ body:
159164
``` md
160165
https://github.com/ITISFoundation/osparc-simcore/releases/tag/staging_<sprint_name><version>
161166
```
167+
```

‎.github/ISSUE_TEMPLATE/5_release.yml‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
name: 🚀 Release to production (developers-only)
22
description: Creates an issue to plan and log the release from staging to production
33
title: "🚀 Release v<M.m.0>"
4-
labels: ["t:maintenance", "release"]
5-
assignees: ["matusdrobuliak66"]
4+
labels:
5+
- "t:maintenance"
6+
- release
7+
assignees:
8+
- matusdrobuliak66
9+
- YuryHrytsuk
10+
type: "Task"
611
body:
712
- type: input
813
id: version
@@ -17,8 +22,8 @@ body:
1722
attributes:
1823
label: Commit SHA
1924
description: |
20-
Selects the commit from which the release takes placeholder. Check [commits](https://github.com/ITISFoundation/osparc-simcore/commits/master)
21-
IMPORTANT: make sure t (i.e. tests passed and images were built and pushed)
25+
Selects the commit from which the release takes place. Check [commits](https://github.com/ITISFoundation/osparc-simcore/commits/master)
26+
IMPORTANT: make sure CI (i.e. tests passed and images were built and pushed)
2227
placeholder: 7d9dcc313f9ced0bd1e6508363148841683b6d7c
2328
validations:
2429
required: true
@@ -41,7 +46,7 @@ body:
4146
required: true
4247
- type: checkboxes
4348
attributes:
44-
label: Did the commit CI suceeded?
49+
label: Did the commit CI succeed?
4550
description: Check the CI of the selected commit in the [repo commits](https://github.com/ITISFoundation/osparc-simcore/commits/master) to make sure the images are built and ready
4651
options:
4752
- label: The commit CI succeeded.
@@ -162,3 +167,4 @@ body:
162167
``` md
163168
:tada: https://github.com/ITISFoundation/osparc-simcore/releases/tag/v<M.m.0>
164169
```
170+
```

‎.github/ISSUE_TEMPLATE/6_hotfix.yml‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
name: 🚑️ Hotfix (developers-only)
22
description: Critical hotfix to staging or production
33
title: "🚑️ Release hotfix/v<version> (hotfix)"
4-
labels: ["t:maintenance", "release"]
5-
assignees: ["matusdrobuliak66"]
4+
labels:
5+
- "t:maintenance"
6+
- release
7+
assignees:
8+
- matusdrobuliak66
9+
- YuryHrytsuk
10+
type: "Task"
611
body:
712
- type: input
813
id: version
@@ -17,8 +22,8 @@ body:
1722
attributes:
1823
label: Branching Commit SHA
1924
description: |
20-
Select the commit from which the hot-fix branch needs to emerge . Check [commits](https://github.com/ITISFoundation/osparc-simcore/commits/master)
21-
IMPORTANT: make sure t (i.e. tests passed and images were built and pushed)
25+
Select the commit from which the hot-fix branch needs to emerge. Check [commits](https://github.com/ITISFoundation/osparc-simcore/commits/master)
26+
IMPORTANT: make sure CI (i.e. tests passed and images were built and pushed)
2227
placeholder: e.g. `8d9a27ebb3e64956e6a41f31839748b3f6a27074`
2328
validations:
2429
required: true
@@ -78,8 +83,8 @@ body:
7883
attributes:
7984
label: Hotfix Commit SHA
8085
description: |
81-
Selects the the head commit of the hotfix branch
82-
IMPORTANT: make sure t (i.e. tests passed and images were built and pushed)
86+
Selects the head commit of the hotfix branch
87+
IMPORTANT: make sure CI (i.e. tests passed and images were built and pushed)
8388
placeholder: e.g. `d1f2e9ed-3b82-424e-8afa-17940614f042`
8489
validations:
8590
required: false
@@ -108,3 +113,4 @@ body:
108113
``` md
109114
:tada: https://github.com/ITISFoundation/osparc-simcore/releases/tag/v<version>
110115
```
116+
```

‎.github/ISSUE_TEMPLATE/7_regular_maintenance.yml‎

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
11
name: ⬆️ Regular maintenance (developers-only)
22
description: Creates an issue to plan a regular maintenance each sprint
3-
title: " ⬆️ Regular maintenance <sprint_name>"
4-
labels: ["t:maintenance"]
5-
assignees: ["matusdrobuliak66"]
3+
title: "⬆️ Regular maintenance <sprint_name>"
4+
labels:
5+
- "t:maintenance"
6+
assignees:
7+
- bisgaard-itis
8+
- giancarloromeo
9+
- GitHK
10+
- matusdrobuliak66
11+
- odeimaiz
12+
- pcrespov
13+
- sanderegg
14+
type: "Task"
15+
projects:
16+
- "ITISFoundation/projects/9"
617
body:
718
- type: input
819
id: sprint
@@ -13,13 +24,13 @@ body:
1324
required: true
1425
- type: textarea
1526
attributes:
16-
label: ⬆️ Requirements
27+
label: ⬆️ Requirements
1728
description: |
1829
Upgrade of Requirements
1930
value: |
2031
- Update of test & tools dependencies repository-wise
2132
- [ ] ``make reqs``
22-
- Update of most important libraries repository-wise make ``reqs-all upgrade=foo==1.2.3``
33+
- Update of most important libraries repository-wise make ``reqs-all startswith=pydantic``
2334
- [ ] fastapi
2435
- [ ] pydantic
2536
- [ ] aio-pika

‎.github/workflows/ci-testing-deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1890,7 +1890,7 @@ jobs:
18901890
with:
18911891
python-version: ${{ matrix.python }}
18921892
cache-dependency-glob: "**/e2e/requirements/requirements.txt"
1893-
- uses: actions/setup-node@v4.1.0
1893+
- uses: actions/setup-node@v4.4.0
18941894
with:
18951895
node-version: ${{ matrix.node }}
18961896
cache: "npm"

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,8 @@
114114
]
115115

116116

117-
class RegisteredSolverFunctionGet(RegisteredSolverFunction, OutputSchema): ...
117+
class RegisteredSolverFunctionGet(RegisteredSolverFunction, OutputSchema):
118+
uid: Annotated[FunctionID, Field(alias="uuid")]
118119

119120

120121
class RegisteredProjectFunctionGet(RegisteredProjectFunction, OutputSchema):

0 commit comments

Comments
 (0)