Skip to content

Commit f38ea9b

Browse files
Merge branch 'master' of github.com:ITISFoundation/osparc-simcore
2 parents b6282fa + 973d6f4 commit f38ea9b

File tree

192 files changed

+3232
-1699
lines changed

Some content is hidden

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

192 files changed

+3232
-1699
lines changed

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,6 +109,10 @@ jobs:
109109
- 'mypy.ini'
110110
common-library:
111111
- 'packages/common-library/**'
112+
- 'packages/pytest-simcore/**'
113+
- 'services/docker-compose*'
114+
- 'scripts/mypy/*'
115+
- 'mypy.ini'
112116
notifications-library:
113117
- 'packages/notifications-library/**'
114118
- 'packages/postgres-database/**'
@@ -1695,7 +1699,11 @@ jobs:
16951699
with:
16961700
python-version: ${{ matrix.python }}
16971701
- name: install uv
1698-
uses: yezz123/setup-uv@v4
1702+
uses: astral-sh/setup-uv@v6
1703+
with:
1704+
version: "0.6.x"
1705+
enable-cache: false
1706+
cache-dependency-glob: "**/common-library/requirements/ci.txt"
16991707
- name: show system version
17001708
run: ./ci/helpers/show_system_versions.bash
17011709
- name: install
@@ -1705,6 +1713,9 @@ jobs:
17051713
- name: test
17061714
run: ./ci/github/unit-testing/common-library.bash test
17071715
- uses: codecov/codecov-action@v5
1716+
if: ${{ !cancelled() }}
1717+
env:
1718+
CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
17081719
with:
17091720
flags: unittests #optional
17101721

.vscode/extensions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"DevSoft.svg-viewer-vscode",
66
"eamodio.gitlens",
77
"exiasr.hadolint",
8-
"ms-azuretools.vscode-docker",
8+
"ms-azuretools.vscode-containers",
99
"ms-python.black-formatter",
1010
"ms-python.pylint",
1111
"ms-python.python",

api/specs/web-server/_functions.py

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
# pylint: disable=protected-access
2+
# pylint: disable=redefined-outer-name
3+
# pylint: disable=too-many-arguments
4+
# pylint: disable=unused-argument
5+
# pylint: disable=unused-variable
6+
7+
8+
from typing import Annotated
9+
10+
from fastapi import APIRouter, Depends, status
11+
from models_library.api_schemas_webserver.functions import (
12+
FunctionToRegister,
13+
RegisteredFunctionGet,
14+
)
15+
from models_library.generics import Envelope
16+
from simcore_service_webserver._meta import API_VTAG
17+
from simcore_service_webserver.functions._controller._functions_rest_schemas import (
18+
FunctionPathParams,
19+
)
20+
21+
router = APIRouter(
22+
prefix=f"/{API_VTAG}",
23+
tags=[
24+
"functions",
25+
],
26+
)
27+
28+
29+
@router.post(
30+
"/functions",
31+
response_model=Envelope[RegisteredFunctionGet],
32+
)
33+
async def register_function(
34+
_body: FunctionToRegister,
35+
) -> Envelope[RegisteredFunctionGet]: ...
36+
37+
38+
@router.get(
39+
"/functions/{function_id}",
40+
response_model=Envelope[RegisteredFunctionGet],
41+
)
42+
async def get_function(
43+
_path: Annotated[FunctionPathParams, Depends()],
44+
): ...
45+
46+
47+
@router.delete(
48+
"/functions/{function_id}",
49+
status_code=status.HTTP_204_NO_CONTENT,
50+
)
51+
async def delete_function(
52+
_path: Annotated[FunctionPathParams, Depends()],
53+
): ...

api/specs/web-server/openapi.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
"_computations",
3636
"_exporter",
3737
"_folders",
38+
"_functions",
3839
"_long_running_tasks",
3940
"_long_running_tasks_legacy",
4041
"_licensed_items",

api/tests/requirements.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,8 @@ pytest==8.3.5
8585
# pytest-cov
8686
# pytest-instafail
8787
# pytest-sugar
88-
pytest-asyncio==0.23.8
89-
# via
90-
# -c ../../requirements/constraints.txt
91-
# -r requirements.in
88+
pytest-asyncio==0.26.0
89+
# via -r requirements.in
9290
pytest-cov==6.0.0
9391
# via -r requirements.in
9492
pytest-instafail==0.5.0

packages/aws-library/requirements/_test.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,8 @@ pytest==8.3.5
196196
# pytest-instafail
197197
# pytest-mock
198198
# pytest-sugar
199-
pytest-asyncio==0.23.8
200-
# via
201-
# -c requirements/../../../requirements/constraints.txt
202-
# -r requirements/_test.in
199+
pytest-asyncio==0.26.0
200+
# via -r requirements/_test.in
203201
pytest-benchmark==5.1.0
204202
# via -r requirements/_test.in
205203
pytest-cov==6.0.0

packages/aws-library/setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ test = pytest
1515

1616
[tool:pytest]
1717
asyncio_mode = auto
18+
asyncio_default_fixture_loop_scope = function
1819

1920
[mypy]
2021
plugins =

packages/common-library/requirements/_test.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,8 @@ pytest==8.3.5
4242
# pytest-instafail
4343
# pytest-mock
4444
# pytest-sugar
45-
pytest-asyncio==0.23.8
46-
# via
47-
# -c requirements/../../../requirements/constraints.txt
48-
# -r requirements/_test.in
45+
pytest-asyncio==0.26.0
46+
# via -r requirements/_test.in
4947
pytest-cov==6.0.0
5048
# via -r requirements/_test.in
5149
pytest-icdiff==0.9

packages/common-library/setup.cfg

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ test = pytest
1515

1616
[tool:pytest]
1717
asyncio_mode = auto
18+
asyncio_default_fixture_loop_scope = function
1819
markers =
1920
diagnostics: "can be used to run diagnostics against deployed data (e.g. database, registry etc)"
2021
testit: "marks test to run during development"

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

Lines changed: 24 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ annotated-types==0.7.0
22
# via pydantic
33
arrow==1.3.0
44
# via -r requirements/../../../packages/models-library/requirements/_base.in
5-
attrs==25.1.0
5+
attrs==25.3.0
66
# via
77
# jsonschema
88
# referencing
@@ -15,23 +15,23 @@ cloudpickle==3.1.1
1515
# via
1616
# dask
1717
# distributed
18-
dask==2025.2.0
18+
dask==2025.5.0
1919
# via
2020
# -r requirements/_base.in
2121
# distributed
22-
distributed==2025.2.0
22+
distributed==2025.5.0
2323
# via dask
2424
dnspython==2.7.0
2525
# via email-validator
2626
email-validator==2.2.0
2727
# via pydantic
28-
fsspec==2025.2.0
28+
fsspec==2025.3.2
2929
# via dask
3030
idna==3.10
3131
# via email-validator
32-
importlib-metadata==8.6.1
32+
importlib-metadata==8.7.0
3333
# via dask
34-
jinja2==3.1.5
34+
jinja2==3.1.6
3535
# via
3636
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
3737
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
@@ -42,7 +42,7 @@ jinja2==3.1.5
4242
# distributed
4343
jsonschema==4.23.0
4444
# via -r requirements/../../../packages/models-library/requirements/_base.in
45-
jsonschema-specifications==2024.10.1
45+
jsonschema-specifications==2025.4.1
4646
# via jsonschema
4747
locket==1.0.0
4848
# via
@@ -56,7 +56,7 @@ mdurl==0.1.2
5656
# via markdown-it-py
5757
msgpack==1.1.0
5858
# via distributed
59-
orjson==3.10.15
59+
orjson==3.10.18
6060
# via
6161
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
6262
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
@@ -68,15 +68,15 @@ orjson==3.10.15
6868
# -r requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/_base.in
6969
# -r requirements/../../../packages/models-library/requirements/_base.in
7070
# -r requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in
71-
packaging==24.2
71+
packaging==25.0
7272
# via
7373
# dask
7474
# distributed
7575
partd==1.4.2
7676
# via dask
7777
psutil==7.0.0
7878
# via distributed
79-
pydantic==2.10.6
79+
pydantic==2.11.4
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,9 +92,9 @@ pydantic==2.10.6
9292
# -r requirements/_base.in
9393
# pydantic-extra-types
9494
# pydantic-settings
95-
pydantic-core==2.27.2
95+
pydantic-core==2.33.2
9696
# via pydantic
97-
pydantic-extra-types==2.10.2
97+
pydantic-extra-types==2.10.4
9898
# via
9999
# -r requirements/../../../packages/common-library/requirements/_base.in
100100
# -r requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/_base.in
@@ -114,7 +114,7 @@ pygments==2.19.1
114114
# via rich
115115
python-dateutil==2.9.0.post0
116116
# via arrow
117-
python-dotenv==1.0.1
117+
python-dotenv==1.1.0
118118
# via pydantic-settings
119119
pyyaml==6.0.2
120120
# via
@@ -136,11 +136,11 @@ referencing==0.35.1
136136
# -c requirements/../../../requirements/constraints.txt
137137
# jsonschema
138138
# jsonschema-specifications
139-
rich==13.9.4
139+
rich==14.0.0
140140
# via
141141
# -r requirements/../../../packages/settings-library/requirements/_base.in
142142
# typer
143-
rpds-py==0.23.1
143+
rpds-py==0.25.0
144144
# via
145145
# jsonschema
146146
# referencing
@@ -150,26 +150,29 @@ six==1.17.0
150150
# via python-dateutil
151151
sortedcontainers==2.4.0
152152
# via distributed
153-
tblib==3.0.0
153+
tblib==3.1.0
154154
# via distributed
155155
toolz==1.0.0
156156
# via
157157
# dask
158158
# distributed
159159
# partd
160-
tornado==6.4.2
160+
tornado==6.5
161161
# via distributed
162-
typer==0.15.2
162+
typer==0.15.4
163163
# via -r requirements/../../../packages/settings-library/requirements/_base.in
164-
types-python-dateutil==2.9.0.20241206
164+
types-python-dateutil==2.9.0.20250516
165165
# via arrow
166-
typing-extensions==4.12.2
166+
typing-extensions==4.13.2
167167
# via
168168
# pydantic
169169
# pydantic-core
170170
# pydantic-extra-types
171171
# typer
172-
urllib3==2.3.0
172+
# typing-inspection
173+
typing-inspection==0.4.0
174+
# via pydantic
175+
urllib3==2.4.0
173176
# via
174177
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
175178
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt

0 commit comments

Comments
 (0)