Skip to content

Commit b7ac4d2

Browse files
matusdrobuliak66matusdrobuliak66
authored
Merge branch 'master' into add-fix
2 parents fe35d72 + 5539d0a commit b7ac4d2

File tree

17 files changed

+172
-119
lines changed

17 files changed

+172
-119
lines changed

‎services/catalog/requirements/_base.txt‎

Lines changed: 73 additions & 61 deletions
Large diffs are not rendered by default.

‎services/catalog/requirements/_test.txt‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,53 @@
1-
aiohappyeyeballs==2.4.4
1+
aiohappyeyeballs==2.6.1
22
# via
33
# -c requirements/_base.txt
44
# aiohttp
5-
aiohttp==3.11.10
5+
aiohttp==3.11.13
66
# via
77
# -c requirements/../../../requirements/constraints.txt
88
# -c requirements/_base.txt
99
# pytest-aiohttp
10-
aiosignal==1.3.1
10+
aiosignal==1.3.2
1111
# via
1212
# -c requirements/_base.txt
1313
# aiohttp
14-
alembic==1.14.0
14+
alembic==1.15.1
1515
# via
1616
# -c requirements/_base.txt
1717
# -r requirements/_test.in
18-
anyio==4.7.0
18+
anyio==4.8.0
1919
# via
2020
# -c requirements/_base.txt
2121
# httpx
2222
asgi-lifespan==2.1.0
2323
# via -r requirements/_test.in
24-
attrs==24.2.0
24+
attrs==25.2.0
2525
# via
2626
# -c requirements/_base.txt
2727
# aiohttp
2828
# jsonschema
2929
# pytest-docker
3030
# referencing
31-
certifi==2024.8.30
31+
certifi==2025.1.31
3232
# via
3333
# -c requirements/../../../requirements/constraints.txt
3434
# -c requirements/_base.txt
3535
# httpcore
3636
# httpx
3737
# requests
38-
charset-normalizer==3.4.0
38+
charset-normalizer==3.4.1
3939
# via
4040
# -c requirements/_base.txt
4141
# requests
42-
click==8.1.7
42+
click==8.1.8
4343
# via
4444
# -c requirements/_base.txt
4545
# -r requirements/_test.in
4646
coverage==7.6.12
4747
# via pytest-cov
4848
docker==7.1.0
4949
# via -r requirements/_test.in
50-
faker==36.1.1
50+
faker==37.0.0
5151
# via -r requirements/_test.in
5252
frozenlist==1.5.0
5353
# via
@@ -66,7 +66,7 @@ httpcore==1.0.7
6666
# via
6767
# -c requirements/_base.txt
6868
# httpx
69-
httpx==0.27.2
69+
httpx==0.28.1
7070
# via
7171
# -c requirements/../../../requirements/constraints.txt
7272
# -c requirements/_base.txt
@@ -88,7 +88,7 @@ jsonschema-specifications==2024.10.1
8888
# via
8989
# -c requirements/_base.txt
9090
# jsonschema
91-
mako==1.3.7
91+
mako==1.3.9
9292
# via
9393
# -c requirements/../../../requirements/constraints.txt
9494
# -c requirements/_base.txt
@@ -112,7 +112,7 @@ packaging==24.2
112112
# pytest
113113
pluggy==1.5.0
114114
# via pytest
115-
propcache==0.2.1
115+
propcache==0.3.0
116116
# via
117117
# -c requirements/_base.txt
118118
# aiohttp
@@ -158,7 +158,7 @@ requests==2.32.3
158158
# docker
159159
respx==0.22.0
160160
# via -r requirements/_test.in
161-
rpds-py==0.22.3
161+
rpds-py==0.23.1
162162
# via
163163
# -c requirements/_base.txt
164164
# jsonschema
@@ -168,7 +168,6 @@ sniffio==1.3.1
168168
# -c requirements/_base.txt
169169
# anyio
170170
# asgi-lifespan
171-
# httpx
172171
sqlalchemy==1.4.54
173172
# via
174173
# -c requirements/../../../requirements/constraints.txt
@@ -190,7 +189,7 @@ typing-extensions==4.12.2
190189
# sqlalchemy2-stubs
191190
tzdata==2025.1
192191
# via faker
193-
urllib3==2.2.3
192+
urllib3==2.3.0
194193
# via
195194
# -c requirements/../../../requirements/constraints.txt
196195
# -c requirements/_base.txt

‎services/catalog/requirements/_tools.txt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
astroid==3.3.8
1+
astroid==3.3.9
22
# via pylint
33
black==25.1.0
44
# via -r requirements/../../../requirements/devenv.txt
@@ -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.7
11+
click==8.1.8
1212
# via
1313
# -c requirements/_base.txt
1414
# -c requirements/_test.txt
@@ -20,7 +20,7 @@ distlib==0.3.9
2020
# via virtualenv
2121
filelock==3.17.0
2222
# via virtualenv
23-
identify==2.6.8
23+
identify==2.6.9
2424
# via pre-commit
2525
isort==6.0.1
2626
# via
@@ -58,7 +58,7 @@ platformdirs==4.3.6
5858
# virtualenv
5959
pre-commit==4.1.0
6060
# via -r requirements/../../../requirements/devenv.txt
61-
pylint==3.3.4
61+
pylint==3.3.5
6262
# via -r requirements/../../../requirements/devenv.txt
6363
pyproject-hooks==1.2.0
6464
# via
@@ -69,9 +69,9 @@ pyyaml==6.0.2
6969
# -c requirements/_base.txt
7070
# pre-commit
7171
# watchdog
72-
ruff==0.9.9
72+
ruff==0.9.10
7373
# via -r requirements/../../../requirements/devenv.txt
74-
setuptools==75.8.2
74+
setuptools==76.0.0
7575
# via pip-tools
7676
tomlkit==0.13.2
7777
# via pylint
@@ -80,7 +80,7 @@ typing-extensions==4.12.2
8080
# -c requirements/_base.txt
8181
# -c requirements/_test.txt
8282
# mypy
83-
virtualenv==20.29.2
83+
virtualenv==20.29.3
8484
# via pre-commit
8585
watchdog==6.0.0
8686
# via -r requirements/_tools.in

‎services/docker-compose.devel.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,15 @@ services:
189189
STORAGE_PROFILING : ${STORAGE_PROFILING}
190190
STORAGE_LOGLEVEL: DEBUG
191191

192+
sto-worker:
193+
volumes:
194+
- ./storage:/devel/services/storage
195+
- ../packages:/devel/packages
196+
environment:
197+
<<: *common-environment
198+
STORAGE_PROFILING : ${STORAGE_PROFILING}
199+
STORAGE_LOGLEVEL: DEBUG
200+
192201
agent:
193202
environment:
194203
<<: *common-environment

‎services/docker-compose.local.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,13 @@ services:
126126
- "8080"
127127
- "3003:3000"
128128

129+
sto-worker:
130+
environment:
131+
<<: *common_environment
132+
STORAGE_REMOTE_DEBUGGING_PORT : 3000
133+
ports:
134+
- "8080"
135+
- "3021:3000"
129136
webserver:
130137
environment: &webserver_environment_local
131138
<<: *common_environment

‎services/storage/docker/boot.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if [ "${SC_BOOT_MODE}" = "debug" ]; then
4747

4848
exec sh -c "
4949
cd services/storage/src/simcore_service_storage && \
50-
python -m debugpy --listen 0.0.0.0:${STORAGE_REMOTE_DEBUGGING_PORT} -m uvicorn main:the_app \
50+
python -m debugpy --listen 0.0.0.0:${STORAGE_REMOTE_DEBUGGING_PORT} -m uvicorn main:app \
5151
--host 0.0.0.0 \
5252
--port ${STORAGE_PORT} \
5353
--reload \

‎services/storage/src/simcore_service_storage/_meta.py‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,17 @@
2828
f"v{__version__}"
2929
)
3030

31+
APP_WORKER_STARTED_BANNER_MSG = r"""
32+
33+
____ _ __ __ _
34+
/ ___|| |_ ___ _ __ __ _ __ _ ___ \ \ / /__ _ __| | _____ _ __
35+
\___ \| __/ _ \| '__/ _` |/ _` |/ _ \____\ \ /\ / / _ \| '__| |/ / _ \ '__|
36+
___) | || (_) | | | (_| | (_| | __/_____\ V V / (_) | | | < __/ |
37+
|____/ \__\___/|_| \__,_|\__, |\___| \_/\_/ \___/|_| |_|\_\___|_|
38+
|___/ {}
39+
40+
""".format(
41+
f"v{__version__}"
42+
)
43+
3144
APP_FINISHED_BANNER_MSG = info.get_finished_banner()

‎services/storage/src/simcore_service_storage/core/application.py‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
APP_FINISHED_BANNER_MSG,
2727
APP_NAME,
2828
APP_STARTED_BANNER_MSG,
29+
APP_WORKER_STARTED_BANNER_MSG,
2930
)
3031
from ..api.rest.routes import setup_rest_api_routes
3132
from ..api.rpc.routes import setup_rpc_api_routes
@@ -114,7 +115,10 @@ def create_app(settings: ApplicationSettings) -> FastAPI:
114115
setup_prometheus_instrumentation(app)
115116

116117
async def _on_startup() -> None:
117-
print(APP_STARTED_BANNER_MSG, flush=True) # noqa: T201
118+
if settings.STORAGE_WORKER_MODE:
119+
print(APP_WORKER_STARTED_BANNER_MSG, flush=True) # noqa: T201
120+
else:
121+
print(APP_STARTED_BANNER_MSG, flush=True) # noqa: T201
118122

119123
async def _on_shutdown() -> None:
120124
print(APP_FINISHED_BANNER_MSG, flush=True) # noqa: T201

‎services/storage/src/simcore_service_storage/main.py‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
import logging
44

55
from servicelib.logging_utils import config_all_loggers
6+
from simcore_service_storage.core.application import create_app
7+
from simcore_service_storage.core.settings import ApplicationSettings
68
from simcore_service_storage.modules.celery import setup_celery
79

8-
from .core.application import create_app
9-
from .core.settings import ApplicationSettings
10-
1110
_settings = ApplicationSettings.create_from_envs()
1211

1312
# SEE https://github.com/ITISFoundation/osparc-simcore/issues/3148

‎services/storage/src/simcore_service_storage/modules/celery/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
from asyncio import AbstractEventLoop
33

44
from fastapi import FastAPI
5-
from simcore_service_storage.modules.celery._common import create_app
6-
from simcore_service_storage.modules.celery.client import CeleryTaskQueueClient
75

86
from ...core.settings import get_application_settings
7+
from ._common import create_app
8+
from .client import CeleryTaskQueueClient
99

1010
_logger = logging.getLogger(__name__)
1111

0 commit comments

Comments
 (0)