Skip to content

Commit 744e8c2

Browse files
matusdrobuliak66matusdrobuliak66
committed
Merge branch 'add-project-grouping-for-task-manager' of github.com:matusdrobuliak66/osparc-simcore into add-project-grouping-for-task-manager
2 parents d6bb65a + a67b0bc commit 744e8c2

File tree

47 files changed

+1107
-308
lines changed

Some content is hidden

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

47 files changed

+1107
-308
lines changed

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

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1544,14 +1544,13 @@ jobs:
15441544
]
15451545
runs-on: ubuntu-latest
15461546
steps:
1547-
- name: a previous unit-test job failed
1548-
if: ${{ contains(join(needs.*.result, ','), 'failure') }}
1547+
- name: a previous unit-test job failed or was cancelled
1548+
if: ${{ contains(join(needs.*.result, ','), 'failure') || contains(join(needs.*.result, ','), 'cancelled') }}
15491549
run: |
1550-
echo "::error title=ERROR::one of the unit-tests failed!"
1551-
echo "${{ join(needs.*.result, ',') }}"
1550+
echo "::error title=ERROR::one of the unit-tests failed or was cancelled!"
15521551
exit 1
15531552
- name: all the previous unit-tests were run successfully or skipped
1554-
if: ${{ !contains(join(needs.*.result, ','), 'failure') }}
1553+
if: ${{ !contains(join(needs.*.result, ','), 'failure') && !contains(join(needs.*.result, ','), 'cancelled') }}
15551554
run: echo "::notice All good!"
15561555

15571556
integration-test-webserver-01:
@@ -1876,13 +1875,13 @@ jobs:
18761875
]
18771876
runs-on: ubuntu-latest
18781877
steps:
1879-
- name: a previous integration-test job failed
1880-
if: ${{ contains(join(needs.*.result, ','), 'failure') }}
1878+
- name: a previous integration-test job failed or was cancelled
1879+
if: ${{ contains(join(needs.*.result, ','), 'failure') || contains(join(needs.*.result, ','), 'cancelled') }}
18811880
run: |
1882-
echo "::error title=ERROR::one of the integration-tests failed!"
1881+
echo "::error title=ERROR::one of the integration-tests failed or was cancelled!"
18831882
exit 1
18841883
- name: all the previous integration-tests were run successfully or skipped
1885-
if: ${{ !contains(join(needs.*.result, ','), 'failure') }}
1884+
if: ${{ !contains(join(needs.*.result, ','), 'failure') && !contains(join(needs.*.result, ','), 'cancelled') }}
18861885
run: echo "::notice All good!"
18871886

18881887
system-test-public-api:
@@ -2111,13 +2110,13 @@ jobs:
21112110
]
21122111
runs-on: ubuntu-latest
21132112
steps:
2114-
- name: a previous system-test job failed
2115-
if: ${{ contains(join(needs.*.result, ','), 'failure') }}
2113+
- name: a previous system-test job failed or was cancelled
2114+
if: ${{ contains(join(needs.*.result, ','), 'failure') || contains(join(needs.*.result, ','), 'cancelled') }}
21162115
run: |
2117-
echo "::error title=ERROR::one of the system-tests failed!"
2116+
echo "::error title=ERROR::one of the system-tests failed or was cancelled!"
21182117
exit 1
21192118
- name: all the previous system-tests were run successfully or skipped
2120-
if: ${{ !contains(join(needs.*.result, ','), 'failure') }}
2119+
if: ${{ !contains(join(needs.*.result, ','), 'failure') && !contains(join(needs.*.result, ','), 'cancelled') }}
21212120
run: echo "::notice All good!"
21222121

21232122
deploy:

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

Lines changed: 20 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ class SlideshowUI(TypedDict):
4040

4141

4242
class AnnotationUI(BaseModel):
43-
type: Literal["note", "rect", "text"]
44-
color: Annotated[Color, PlainSerializer(Color.as_hex)]
43+
type: Literal["note", "rect", "text", "conversation"]
44+
color: Annotated[Color | None, PlainSerializer(Color.as_hex)] = None
4545
attributes: Annotated[dict, Field(description="svg attributes")]
4646

4747
@staticmethod
@@ -71,6 +71,15 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
7171
"color": "#0000FF",
7272
"attributes": {"x": 415, "y": 100, "text": "Hey!"},
7373
},
74+
{
75+
"type": "conversation",
76+
"attributes": {
77+
"conversationId": 2,
78+
"x": 415,
79+
"y": 100,
80+
"title": "My chat",
81+
},
82+
},
7483
]
7584
},
7685
)
@@ -169,6 +178,15 @@ def _update_json_schema_extra(schema: JsonDict) -> None:
169178
"fontSize": 12,
170179
},
171180
},
181+
"cf94f068-259c-4192-89f9-b2a56d51249d": {
182+
"type": "conversation",
183+
"attributes": {
184+
"conversationId": 2,
185+
"x": 119,
186+
"y": 223,
187+
"title": "My chat",
188+
},
189+
},
172190
},
173191
"current_node_id": "4b3345e5-861f-47b0-8b52-a4508449be79",
174192
"template_type": "hypertool",

‎packages/postgres-database/src/simcore_postgres_database/migration/versions/d159ac30983c_make_func_api_access_non_nullable.py‎

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
"""Make func api access non-nullable
2+
3+
Revision ID: d159ac30983c
4+
Revises: 4f6fd2586491
5+
Create Date: 2025-07-01 08:50:29.095068+00:00
6+
7+
"""
8+
9+
import sqlalchemy as sa
10+
from alembic import op
11+
12+
# revision identifiers, used by Alembic.
13+
revision = "d159ac30983c"
14+
down_revision = "4f6fd2586491"
15+
branch_labels = None
16+
depends_on = None
17+
18+
19+
def upgrade():
20+
# ### commands auto generated by Alembic - please adjust! ###
21+
op.execute(
22+
"""
23+
UPDATE funcapi_group_api_access_rights
24+
SET read_functions = false
25+
WHERE read_functions IS NULL
26+
"""
27+
)
28+
op.execute(
29+
"""
30+
UPDATE funcapi_group_api_access_rights
31+
SET write_functions = false
32+
WHERE write_functions IS NULL
33+
"""
34+
)
35+
op.execute(
36+
"""
37+
UPDATE funcapi_group_api_access_rights
38+
SET execute_functions = false
39+
WHERE execute_functions IS NULL
40+
"""
41+
)
42+
op.execute(
43+
"""
44+
UPDATE funcapi_group_api_access_rights
45+
SET read_function_jobs = false
46+
WHERE read_function_jobs IS NULL
47+
"""
48+
)
49+
op.execute(
50+
"""
51+
UPDATE funcapi_group_api_access_rights
52+
SET write_function_jobs = false
53+
WHERE write_function_jobs IS NULL
54+
"""
55+
)
56+
op.execute(
57+
"""
58+
UPDATE funcapi_group_api_access_rights
59+
SET execute_function_jobs = false
60+
WHERE execute_function_jobs IS NULL
61+
"""
62+
)
63+
op.execute(
64+
"""
65+
UPDATE funcapi_group_api_access_rights
66+
SET read_function_job_collections = false
67+
WHERE read_function_job_collections IS NULL
68+
"""
69+
)
70+
op.execute(
71+
"""
72+
UPDATE funcapi_group_api_access_rights
73+
SET write_function_job_collections = false
74+
WHERE write_function_job_collections IS NULL
75+
"""
76+
)
77+
op.execute(
78+
"""
79+
UPDATE funcapi_group_api_access_rights
80+
SET execute_function_job_collections = false
81+
WHERE execute_function_job_collections IS NULL
82+
"""
83+
)
84+
op.alter_column(
85+
"funcapi_group_api_access_rights",
86+
"write_functions",
87+
existing_type=sa.BOOLEAN(),
88+
nullable=False,
89+
)
90+
op.alter_column(
91+
"funcapi_group_api_access_rights",
92+
"execute_functions",
93+
existing_type=sa.BOOLEAN(),
94+
nullable=False,
95+
)
96+
op.alter_column(
97+
"funcapi_group_api_access_rights",
98+
"read_function_jobs",
99+
existing_type=sa.BOOLEAN(),
100+
nullable=False,
101+
)
102+
op.alter_column(
103+
"funcapi_group_api_access_rights",
104+
"write_function_jobs",
105+
existing_type=sa.BOOLEAN(),
106+
nullable=False,
107+
)
108+
op.alter_column(
109+
"funcapi_group_api_access_rights",
110+
"execute_function_jobs",
111+
existing_type=sa.BOOLEAN(),
112+
nullable=False,
113+
)
114+
op.alter_column(
115+
"funcapi_group_api_access_rights",
116+
"read_function_job_collections",
117+
existing_type=sa.BOOLEAN(),
118+
nullable=False,
119+
)
120+
op.alter_column(
121+
"funcapi_group_api_access_rights",
122+
"write_function_job_collections",
123+
existing_type=sa.BOOLEAN(),
124+
nullable=False,
125+
)
126+
op.alter_column(
127+
"funcapi_group_api_access_rights",
128+
"execute_function_job_collections",
129+
existing_type=sa.BOOLEAN(),
130+
nullable=False,
131+
)
132+
# ### end Alembic commands ###
133+
134+
135+
def downgrade():
136+
# ### commands auto generated by Alembic - please adjust! ###
137+
op.alter_column(
138+
"funcapi_group_api_access_rights",
139+
"execute_function_job_collections",
140+
existing_type=sa.BOOLEAN(),
141+
nullable=True,
142+
)
143+
op.alter_column(
144+
"funcapi_group_api_access_rights",
145+
"write_function_job_collections",
146+
existing_type=sa.BOOLEAN(),
147+
nullable=True,
148+
)
149+
op.alter_column(
150+
"funcapi_group_api_access_rights",
151+
"read_function_job_collections",
152+
existing_type=sa.BOOLEAN(),
153+
nullable=True,
154+
)
155+
op.alter_column(
156+
"funcapi_group_api_access_rights",
157+
"execute_function_jobs",
158+
existing_type=sa.BOOLEAN(),
159+
nullable=True,
160+
)
161+
op.alter_column(
162+
"funcapi_group_api_access_rights",
163+
"write_function_jobs",
164+
existing_type=sa.BOOLEAN(),
165+
nullable=True,
166+
)
167+
op.alter_column(
168+
"funcapi_group_api_access_rights",
169+
"read_function_jobs",
170+
existing_type=sa.BOOLEAN(),
171+
nullable=True,
172+
)
173+
op.alter_column(
174+
"funcapi_group_api_access_rights",
175+
"execute_functions",
176+
existing_type=sa.BOOLEAN(),
177+
nullable=True,
178+
)
179+
op.alter_column(
180+
"funcapi_group_api_access_rights",
181+
"write_functions",
182+
existing_type=sa.BOOLEAN(),
183+
nullable=True,
184+
)
185+
op.alter_column(
186+
"funcapi_group_api_access_rights",
187+
"read_functions",
188+
existing_type=sa.BOOLEAN(),
189+
nullable=True,
190+
)
191+
# ### end Alembic commands ###

‎packages/postgres-database/src/simcore_postgres_database/models/funcapi_api_access_rights_table.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,46 +36,55 @@
3636
"read_functions",
3737
sa.Boolean,
3838
default=False,
39+
nullable=False,
3940
),
4041
sa.Column(
4142
"write_functions",
4243
sa.Boolean,
4344
default=False,
45+
nullable=False,
4446
),
4547
sa.Column(
4648
"execute_functions",
4749
sa.Boolean,
4850
default=False,
51+
nullable=False,
4952
),
5053
sa.Column(
5154
"read_function_jobs",
5255
sa.Boolean,
5356
default=False,
57+
nullable=False,
5458
),
5559
sa.Column(
5660
"write_function_jobs",
5761
sa.Boolean,
5862
default=False,
63+
nullable=False,
5964
),
6065
sa.Column(
6166
"execute_function_jobs",
6267
sa.Boolean,
6368
default=False,
69+
nullable=False,
6470
),
6571
sa.Column(
6672
"read_function_job_collections",
6773
sa.Boolean,
6874
default=False,
75+
nullable=False,
6976
),
7077
sa.Column(
7178
"write_function_job_collections",
7279
sa.Boolean,
7380
default=False,
81+
nullable=False,
7482
),
7583
sa.Column(
7684
"execute_function_job_collections",
7785
sa.Boolean,
7886
default=False,
87+
nullable=False,
7988
),
8089
column_created_datetime(),
8190
column_modified_datetime(),

0 commit comments

Comments
 (0)