Skip to content

Commit 8d4cf9b

Browse files
Merge branch 'master' into is8159/fix-redis-client-lifecycle
2 parents fec6e98 + 7881d83 commit 8d4cf9b

File tree

239 files changed

+4187
-1715
lines changed

Some content is hidden

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

239 files changed

+4187
-1715
lines changed

.env-devel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,7 @@ LICENSES_ITIS_VIP_API_URL=https://replace-with-itis-api/{category}
147147
LICENSES_ITIS_VIP_CATEGORIES='{"HumanWholeBody": "Humans", "HumanBodyRegion": "Humans (Region)", "AnimalWholeBody": "Animal"}'
148148
LICENSES_SPEAG_PHANTOMS_API_URL=https://replace-with-speag-api/{category}
149149
LICENSES_SPEAG_PHANTOMS_CATEGORIES='{"ComputationalPhantom": "Phantom of the Opera"}'
150+
LONG_RUNNING_TASKS_NAMESPACE_SUFFIX=development
150151

151152
# Can use 'docker run -it itisfoundation/invitations:latest simcore-service-invitations generate-dotenv --auto-password'
152153
INVITATIONS_DEFAULT_PRODUCT=osparc

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,7 @@ jobs:
12521252
unit-test-service-library:
12531253
needs: changes
12541254
if: ${{ needs.changes.outputs.service-library == 'true' || github.event_name == 'push' || github.event.inputs.force_all_builds == 'true' }}
1255-
timeout-minutes: 18 # if this timeout gets too small, then split the tests
1255+
timeout-minutes: 20 # if this timeout gets too small, then split the tests
12561256
name: "[unit] service-library"
12571257
runs-on: ${{ matrix.os }}
12581258
strategy:

api/specs/web-server/_long_running_tasks.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,44 +32,40 @@
3232
@router.get(
3333
"/tasks",
3434
response_model=Envelope[list[TaskGet]],
35-
name="list_tasks",
36-
description="Lists all long running tasks",
3735
responses=_export_data_responses,
3836
)
39-
def get_async_jobs(): ...
37+
def get_async_jobs():
38+
"""Lists all long running tasks"""
4039

4140

4241
@router.get(
4342
"/tasks/{task_id}",
4443
response_model=Envelope[TaskStatus],
45-
name="get_task_status",
46-
description="Retrieves the status of a task",
4744
responses=_export_data_responses,
4845
)
4946
def get_async_job_status(
5047
_path_params: Annotated[_PathParam, Depends()],
51-
): ...
48+
):
49+
"""Retrieves the status of a task"""
5250

5351

5452
@router.delete(
5553
"/tasks/{task_id}",
56-
name="cancel_and_delete_task",
57-
description="Cancels and deletes a task",
5854
responses=_export_data_responses,
5955
status_code=status.HTTP_204_NO_CONTENT,
6056
)
6157
def cancel_async_job(
6258
_path_params: Annotated[_PathParam, Depends()],
63-
): ...
59+
):
60+
"""Cancels and removes a task"""
6461

6562

6663
@router.get(
6764
"/tasks/{task_id}/result",
6865
response_model=Any,
69-
name="get_task_result",
70-
description="Retrieves the result of a task",
7166
responses=_export_data_responses,
7267
)
7368
def get_async_job_result(
7469
_path_params: Annotated[_PathParam, Depends()],
75-
): ...
70+
):
71+
"""Retrieves the result of a task"""

api/specs/web-server/_long_running_tasks_legacy.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ async def get_task_status(
4242

4343
@router.delete(
4444
"/{task_id}",
45-
name="cancel_and_delete_task",
46-
description="Cancels and deletes a task",
45+
name="remove_task",
46+
description="Cancels and removes a task",
4747
status_code=status.HTTP_204_NO_CONTENT,
4848
)
49-
async def cancel_and_delete_task(
49+
async def remove_task(
5050
_path_params: Annotated[_PathParam, Depends()],
5151
): ...
5252

ci/helpers/requirements/requirements.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ charset-normalizer==3.4.1
2020
# via requests
2121
docker==7.1.0
2222
# via -r requirements/requirements.in
23-
fastapi==0.115.12
23+
fastapi==0.116.1
2424
# via -r requirements/requirements.in
2525
frozenlist==1.4.1
2626
# via
@@ -49,7 +49,7 @@ requests==2.32.4
4949
# via docker
5050
sniffio==1.3.1
5151
# via anyio
52-
starlette==0.46.2
52+
starlette==0.47.2
5353
# via
5454
# -c requirements/../../../requirements/constraints.txt
5555
# fastapi
@@ -58,6 +58,7 @@ typing-extensions==4.14.1
5858
# fastapi
5959
# pydantic
6060
# pydantic-core
61+
# starlette
6162
# typing-inspection
6263
typing-inspection==0.4.1
6364
# via pydantic

packages/aws-library/requirements/_base.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ certifi==2025.1.31
8383
# requests
8484
charset-normalizer==3.4.1
8585
# via requests
86-
click==8.1.8
86+
click==8.2.1
8787
# via typer
8888
dnspython==2.7.0
8989
# via email-validator
@@ -356,7 +356,7 @@ referencing==0.35.1
356356
# jsonschema-specifications
357357
requests==2.32.4
358358
# via opentelemetry-exporter-otlp-proto-http
359-
rich==13.9.4
359+
rich==14.1.0
360360
# via
361361
# -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
362362
# -r requirements/../../../packages/settings-library/requirements/_base.in
@@ -383,7 +383,7 @@ toolz==1.0.0
383383
# via -r requirements/../../../packages/service-library/requirements/_base.in
384384
tqdm==4.67.1
385385
# via -r requirements/../../../packages/service-library/requirements/_base.in
386-
typer==0.15.2
386+
typer==0.16.1
387387
# via
388388
# -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
389389
# -r requirements/../../../packages/settings-library/requirements/_base.in

packages/aws-library/requirements/_test.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ charset-normalizer==3.4.1
5353
# via
5454
# -c requirements/_base.txt
5555
# requests
56-
click==8.1.8
56+
click==8.2.1
5757
# via
5858
# -c requirements/_base.txt
5959
# flask
@@ -70,7 +70,7 @@ docker==7.1.0
7070
# via moto
7171
faker==36.1.1
7272
# via -r requirements/_test.in
73-
fastapi==0.115.12
73+
fastapi==0.116.1
7474
# via -r requirements/_test.in
7575
flask==3.1.0
7676
# via
@@ -276,7 +276,7 @@ sniffio==1.3.1
276276
# via
277277
# -c requirements/_base.txt
278278
# anyio
279-
starlette==0.46.0
279+
starlette==0.47.2
280280
# via
281281
# -c requirements/../../../requirements/constraints.txt
282282
# fastapi
@@ -312,6 +312,7 @@ typing-extensions==4.14.1
312312
# pint
313313
# pydantic
314314
# pydantic-core
315+
# starlette
315316
# types-aioboto3
316317
# types-aiobotocore
317318
# types-boto3

packages/aws-library/requirements/_tools.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ bump2version==1.0.1
88
# via -r requirements/../../../requirements/devenv.txt
99
cfgv==3.4.0
1010
# via pre-commit
11-
click==8.1.8
11+
click==8.2.1
1212
# via
1313
# -c requirements/_base.txt
1414
# -c requirements/_test.txt

packages/celery-library/requirements/_base.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ certifi==2025.4.26
6868
# requests
6969
charset-normalizer==3.4.2
7070
# via requests
71-
click==8.1.8
71+
click==8.2.1
7272
# via
7373
# celery
7474
# click-didyoumean
@@ -343,7 +343,7 @@ referencing==0.35.1
343343
# jsonschema-specifications
344344
requests==2.32.4
345345
# via opentelemetry-exporter-otlp-proto-http
346-
rich==14.0.0
346+
rich==14.1.0
347347
# via
348348
# -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
349349
# -r requirements/../../../packages/settings-library/requirements/_base.in
@@ -366,7 +366,7 @@ toolz==1.0.0
366366
# via -r requirements/../../../packages/service-library/requirements/_base.in
367367
tqdm==4.67.1
368368
# via -r requirements/../../../packages/service-library/requirements/_base.in
369-
typer==0.15.4
369+
typer==0.16.1
370370
# via
371371
# -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
372372
# -r requirements/../../../packages/settings-library/requirements/_base.in

packages/celery-library/requirements/_test.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ charset-normalizer==3.4.2
2525
# via
2626
# -c requirements/_base.txt
2727
# requests
28-
click==8.1.8
28+
click==8.2.1
2929
# via
3030
# -c requirements/_base.txt
3131
# celery

0 commit comments

Comments
 (0)