Skip to content

Commit c11225c

Browse files
odeimaizodeimaiz
committed
Merge branch 'enh/study-store' of github.com:odeimaiz/osparc-simcore into enh/study-store
2 parents 17dfc14 + 3d1ce86 commit c11225c

File tree

86 files changed

+783
-506
lines changed

Some content is hidden

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

86 files changed

+783
-506
lines changed

‎.env-devel‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,12 @@ AGENT_VOLUMES_CLEANUP_S3_ENDPOINT=http://172.17.0.1:9001
1717
AGENT_VOLUMES_CLEANUP_S3_PROVIDER=MINIO
1818
AGENT_VOLUMES_CLEANUP_S3_REGION=us-east-1
1919
AGENT_VOLUMES_CLEANUP_S3_SECRET_KEY=12345678
20-
AGENT_TRACING=null
20+
AGENT_TRACING={}
2121

2222
API_SERVER_DEV_FEATURES_ENABLED=0
2323
API_SERVER_LOGLEVEL=INFO
2424
API_SERVER_PROFILING=1
25-
API_SERVER_TRACING=null
25+
API_SERVER_TRACING={}
2626
TRAEFIK_API_SERVER_INFLIGHTREQ_AMOUNT=25
2727

2828
AUTOSCALING_DASK=null
@@ -35,7 +35,7 @@ AUTOSCALING_LOGLEVEL=INFO
3535
AUTOSCALING_NODES_MONITORING=null
3636
AUTOSCALING_POLL_INTERVAL="00:00:10"
3737
AUTOSCALING_SSM_ACCESS=null
38-
AUTOSCALING_TRACING=null
38+
AUTOSCALING_TRACING={}
3939

4040
AWS_S3_CLI_S3=null
4141

@@ -47,7 +47,7 @@ CATALOG_PORT=8000
4747
CATALOG_PROFILING=1
4848
CATALOG_SERVICES_DEFAULT_RESOURCES='{"CPU": {"limit": 0.1, "reservation": 0.1}, "RAM": {"limit": 2147483648, "reservation": 2147483648}}'
4949
CATALOG_SERVICES_DEFAULT_SPECIFICATIONS='{}'
50-
CATALOG_TRACING=null
50+
CATALOG_TRACING={}
5151

5252
CELERY_RESULT_EXPIRES=P7D
5353

@@ -63,7 +63,7 @@ CLUSTERS_KEEPER_MAX_MISSED_HEARTBEATS_BEFORE_CLUSTER_TERMINATION=5
6363
CLUSTERS_KEEPER_PRIMARY_EC2_INSTANCES=null
6464
CLUSTERS_KEEPER_TASK_INTERVAL=00:00:30
6565
CLUSTERS_KEEPER_WORKERS_EC2_INSTANCES=null
66-
CLUSTERS_KEEPER_TRACING=null
66+
CLUSTERS_KEEPER_TRACING={}
6767

6868
DASK_SCHEDULER_HOST=dask-scheduler
6969
DASK_SCHEDULER_PORT=8786
@@ -83,7 +83,7 @@ DIRECTOR_PUBLISHED_HOST_NAME="127.0.0.1:9081"
8383
DIRECTOR_REGISTRY_CACHING_TTL=00:15:00
8484
DIRECTOR_REGISTRY_CACHING=True
8585
DIRECTOR_SERVICES_CUSTOM_CONSTRAINTS=null
86-
DIRECTOR_TRACING=null
86+
DIRECTOR_TRACING={}
8787

8888
DOCKER_API_PROXY_HOST=docker-api-proxy
8989
DOCKER_API_PROXY_PASSWORD=admin
@@ -98,11 +98,11 @@ EFS_GROUP_NAME=efs-group
9898
EFS_DNS_NAME=fs-xxx.efs.us-east-1.amazonaws.com
9999
EFS_MOUNTED_PATH=/tmp/efs
100100
EFS_PROJECT_SPECIFIC_DATA_DIRECTORY=project-specific-data
101-
EFS_GUARDIAN_TRACING=null
101+
EFS_GUARDIAN_TRACING={}
102102
EFS_DEFAULT_USER_SERVICE_SIZE_BYTES=10000
103103

104104
# DATCORE_ADAPTER
105-
DATCORE_ADAPTER_TRACING=null
105+
DATCORE_ADAPTER_TRACING={}
106106

107107
# DIRECTOR_V2 ----
108108
COMPUTATIONAL_BACKEND_DEFAULT_CLUSTER_AUTH='{"type":"tls","tls_ca_file":"/home/scu/.dask/dask-crt.pem","tls_client_cert":"/home/scu/.dask/dask-crt.pem","tls_client_key":"/home/scu/.dask/dask-key.pem"}'
@@ -128,14 +128,14 @@ DYNAMIC_SIDECAR_LOG_LEVEL=DEBUG
128128
DYNAMIC_SIDECAR_PROMETHEUS_MONITORING_NETWORKS=[]
129129
DYNAMIC_SIDECAR_PROMETHEUS_SERVICE_LABELS={}
130130
DYNAMIC_SIDECAR_API_SAVE_RESTORE_STATE_TIMEOUT=01:00:00
131-
DIRECTOR_V2_TRACING=null
131+
DIRECTOR_V2_TRACING={}
132132

133133
# DYNAMIC_SCHEDULER ----
134134
DYNAMIC_SCHEDULER_LOGLEVEL=INFO
135135
DYNAMIC_SCHEDULER_PROFILING=1
136136
DYNAMIC_SCHEDULER_USE_INTERNAL_SCHEDULER=0
137137
DYNAMIC_SCHEDULER_STOP_SERVICE_TIMEOUT=01:00:00
138-
DYNAMIC_SCHEDULER_TRACING=null
138+
DYNAMIC_SCHEDULER_TRACING={}
139139
DYNAMIC_SCHEDULER_UI_STORAGE_SECRET=adminadmin
140140

141141
FUNCTION_SERVICES_AUTHORS='{"UN": {"name": "Unknown", "email": "[email protected]", "affiliation": "unknown"}}'
@@ -158,13 +158,13 @@ INVITATIONS_PORT=8000
158158
INVITATIONS_SECRET_KEY='REPLACE_ME_with_result__Fernet_generate_key='
159159
INVITATIONS_SWAGGER_API_DOC_ENABLED=1
160160
INVITATIONS_USERNAME=admin
161-
INVITATIONS_TRACING=null
161+
INVITATIONS_TRACING={}
162162

163163
LOG_FORMAT_LOCAL_DEV_ENABLED=1
164164
LOG_FILTER_MAPPING='{"gunicorn.access":[" /v0/ ", " /v0/health "], "uvicorn.access":[" / "]}'
165165

166166
NOTIFICATIONS_LOGLEVEL=INFO
167-
NOTIFICATIONS_TRACING=null
167+
NOTIFICATIONS_TRACING={}
168168

169169
PAYMENTS_ACCESS_TOKEN_EXPIRE_MINUTES=30
170170
PAYMENTS_ACCESS_TOKEN_SECRET_KEY=2c0411810565e063309be1457009fb39ce023946f6a354e6935107b57676
@@ -186,7 +186,7 @@ PAYMENTS_STRIPE_API_SECRET='REPLACE_ME_with_api_secret'
186186
PAYMENTS_STRIPE_URL=https://api.stripe.com
187187
PAYMENTS_SWAGGER_API_DOC_ENABLED=1
188188
PAYMENTS_USERNAME=admin
189-
PAYMENTS_TRACING=null
189+
PAYMENTS_TRACING={}
190190

191191
POSTGRES_DB=simcoredb
192192
POSTGRES_ENDPOINT=postgres:5432
@@ -227,7 +227,7 @@ RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED=1
227227
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_COUNTER_FAIL=6
228228
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC=300
229229
RESOURCE_USAGE_TRACKER_S3=null
230-
RESOURCE_USAGE_TRACKER_TRACING=null
230+
RESOURCE_USAGE_TRACKER_TRACING={}
231231

232232
# NOTE: 172.17.0.1 is the docker0 interface, which redirect from inside a container onto the host network interface.
233233
R_CLONE_OPTION_BUFFER_SIZE=16M
@@ -259,7 +259,7 @@ STORAGE_HOST=storage
259259
STORAGE_LOGLEVEL=INFO
260260
STORAGE_PORT=8080
261261
STORAGE_PROFILING=1
262-
STORAGE_TRACING=null
262+
STORAGE_TRACING={}
263263
# STORAGE ----
264264

265265
SWARM_STACK_NAME=master-simcore
@@ -300,7 +300,7 @@ WB_GC_SOCKETIO=1
300300
WB_GC_STATICWEB=null
301301
WB_GC_STUDIES_DISPATCHER=null
302302
WB_GC_TAGS=0
303-
WB_GC_TRACING=null
303+
WB_GC_TRACING={}
304304
WB_GC_USERS={}
305305
WB_GC_WALLETS=0
306306

@@ -330,7 +330,7 @@ WB_DB_EL_STATICWEB=null
330330
WB_DB_EL_STORAGE=null
331331
WB_DB_EL_STUDIES_DISPATCHER=null
332332
WB_DB_EL_TAGS=0
333-
WB_DB_EL_TRACING=null
333+
WB_DB_EL_TRACING={}
334334
WB_DB_EL_USERS={}
335335
WB_DB_EL_WALLETS=0
336336

@@ -401,5 +401,5 @@ WEBSERVER_SOCKETIO=1
401401
WEBSERVER_STATICWEB={}
402402
WEBSERVER_STUDIES_DISPATCHER={}
403403
WEBSERVER_TAGS=1
404-
WEBSERVER_TRACING=null
404+
WEBSERVER_TRACING={}
405405
WEBSERVER_USERS={}

‎api/specs/web-server/_auth.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
from models_library.rest_error import EnvelopedError, Log
1616
from pydantic import BaseModel, Field, confloat
1717
from simcore_service_webserver._meta import API_VTAG
18-
from simcore_service_webserver.login._controller.rest.auth import (
18+
from simcore_service_webserver.login._controller.rest.auth_schemas import (
1919
LoginBody,
2020
LoginNextPage,
2121
LoginTwoFactorAuthBody,
@@ -30,7 +30,7 @@
3030
PhoneConfirmationBody,
3131
ResetPasswordConfirmation,
3232
)
33-
from simcore_service_webserver.login._controller.rest.registration import (
33+
from simcore_service_webserver.login._controller.rest.registration_schemas import (
3434
InvitationCheck,
3535
InvitationInfo,
3636
RegisterBody,

‎packages/aws-library/requirements/_base.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ opentelemetry-api==1.34.1
140140
# opentelemetry-exporter-otlp-proto-http
141141
# opentelemetry-instrumentation
142142
# opentelemetry-instrumentation-aio-pika
143+
# opentelemetry-instrumentation-asyncpg
143144
# opentelemetry-instrumentation-botocore
144145
# opentelemetry-instrumentation-logging
145146
# opentelemetry-instrumentation-redis
@@ -160,12 +161,15 @@ opentelemetry-exporter-otlp-proto-http==1.34.1
160161
opentelemetry-instrumentation==0.55b1
161162
# via
162163
# opentelemetry-instrumentation-aio-pika
164+
# opentelemetry-instrumentation-asyncpg
163165
# opentelemetry-instrumentation-botocore
164166
# opentelemetry-instrumentation-logging
165167
# opentelemetry-instrumentation-redis
166168
# opentelemetry-instrumentation-requests
167169
opentelemetry-instrumentation-aio-pika==0.55b1
168170
# via -r requirements/../../../packages/service-library/requirements/_base.in
171+
opentelemetry-instrumentation-asyncpg==0.55b1
172+
# via -r requirements/../../../packages/service-library/requirements/_base.in
169173
opentelemetry-instrumentation-botocore==0.55b1
170174
# via -r requirements/_base.in
171175
opentelemetry-instrumentation-logging==0.55b1
@@ -189,6 +193,7 @@ opentelemetry-sdk==1.34.1
189193
opentelemetry-semantic-conventions==0.55b1
190194
# via
191195
# opentelemetry-instrumentation
196+
# opentelemetry-instrumentation-asyncpg
192197
# opentelemetry-instrumentation-botocore
193198
# opentelemetry-instrumentation-redis
194199
# opentelemetry-instrumentation-requests

‎packages/celery-library/requirements/_base.txt‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,7 @@ opentelemetry-api==1.34.1
132132
# opentelemetry-exporter-otlp-proto-http
133133
# opentelemetry-instrumentation
134134
# opentelemetry-instrumentation-aio-pika
135+
# opentelemetry-instrumentation-asyncpg
135136
# opentelemetry-instrumentation-logging
136137
# opentelemetry-instrumentation-redis
137138
# opentelemetry-instrumentation-requests
@@ -150,11 +151,14 @@ opentelemetry-exporter-otlp-proto-http==1.34.1
150151
opentelemetry-instrumentation==0.55b1
151152
# via
152153
# opentelemetry-instrumentation-aio-pika
154+
# opentelemetry-instrumentation-asyncpg
153155
# opentelemetry-instrumentation-logging
154156
# opentelemetry-instrumentation-redis
155157
# opentelemetry-instrumentation-requests
156158
opentelemetry-instrumentation-aio-pika==0.55b1
157159
# via -r requirements/../../../packages/service-library/requirements/_base.in
160+
opentelemetry-instrumentation-asyncpg==0.55b1
161+
# via -r requirements/../../../packages/service-library/requirements/_base.in
158162
opentelemetry-instrumentation-logging==0.55b1
159163
# via -r requirements/../../../packages/service-library/requirements/_base.in
160164
opentelemetry-instrumentation-redis==0.55b1
@@ -174,6 +178,7 @@ opentelemetry-sdk==1.34.1
174178
opentelemetry-semantic-conventions==0.55b1
175179
# via
176180
# opentelemetry-instrumentation
181+
# opentelemetry-instrumentation-asyncpg
177182
# opentelemetry-instrumentation-redis
178183
# opentelemetry-instrumentation-requests
179184
# opentelemetry-sdk

‎packages/notifications-library/requirements/_base.txt‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ idna==3.10
2626
# via
2727
# email-validator
2828
# yarl
29-
importlib-metadata==8.5.0
30-
# via opentelemetry-api
3129
jinja2==3.1.5
3230
# via
3331
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
@@ -64,19 +62,6 @@ mdurl==0.1.2
6462
# via markdown-it-py
6563
multidict==6.1.0
6664
# via yarl
67-
opentelemetry-api==1.34.1
68-
# via
69-
# opentelemetry-instrumentation
70-
# opentelemetry-instrumentation-asyncpg
71-
# opentelemetry-semantic-conventions
72-
opentelemetry-instrumentation==0.55b1
73-
# via opentelemetry-instrumentation-asyncpg
74-
opentelemetry-instrumentation-asyncpg==0.55b1
75-
# via -r requirements/../../../packages/postgres-database/requirements/_base.in
76-
opentelemetry-semantic-conventions==0.55b1
77-
# via
78-
# opentelemetry-instrumentation
79-
# opentelemetry-instrumentation-asyncpg
8065
orjson==3.10.15
8166
# via
8267
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
@@ -92,8 +77,6 @@ orjson==3.10.15
9277
# -r requirements/../../../packages/models-library/requirements/_base.in
9378
# -r requirements/../../../packages/postgres-database/requirements/../../../packages/common-library/requirements/_base.in
9479
# -r requirements/../../../packages/settings-library/requirements/../../../packages/common-library/requirements/_base.in
95-
packaging==24.2
96-
# via opentelemetry-instrumentation
9780
propcache==0.3.0
9881
# via yarl
9982
psycopg2-binary==2.9.10
@@ -187,15 +170,9 @@ types-python-dateutil==2.9.0.20241206
187170
typing-extensions==4.14.1
188171
# via
189172
# alembic
190-
# opentelemetry-api
191-
# opentelemetry-semantic-conventions
192173
# pydantic
193174
# pydantic-core
194175
# pydantic-extra-types
195176
# typer
196-
wrapt==1.17.2
197-
# via opentelemetry-instrumentation
198177
yarl==1.18.3
199178
# via -r requirements/../../../packages/postgres-database/requirements/_base.in
200-
zipp==3.21.0
201-
# via importlib-metadata

‎packages/notifications-library/requirements/_test.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ mypy-extensions==1.1.0
5454
# via mypy
5555
packaging==24.2
5656
# via
57-
# -c requirements/_base.txt
5857
# pytest
5958
# pytest-sugar
6059
pathspec==0.12.1

‎packages/notifications-library/requirements/_tools.txt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ nodeenv==1.9.1
4040
# via pre-commit
4141
packaging==24.2
4242
# via
43-
# -c requirements/_base.txt
4443
# -c requirements/_test.txt
4544
# black
4645
# build

‎packages/postgres-database/requirements/_base.in‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
--requirement ../../../packages/common-library/requirements/_base.in
77

88
alembic
9-
opentelemetry-instrumentation-asyncpg
109
pydantic
1110
sqlalchemy[postgresql_psycopg2binary,postgresql_asyncpg] # SEE extras in https://github.com/sqlalchemy/sqlalchemy/blob/main/setup.cfg#L43
1211
yarl

‎packages/postgres-database/requirements/_base.txt‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ greenlet==3.1.1
88
# via sqlalchemy
99
idna==3.10
1010
# via yarl
11-
importlib-metadata==8.5.0
12-
# via opentelemetry-api
1311
mako==1.3.10
1412
# via
1513
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
@@ -19,26 +17,11 @@ markupsafe==3.0.2
1917
# via mako
2018
multidict==6.1.0
2119
# via yarl
22-
opentelemetry-api==1.34.1
23-
# via
24-
# opentelemetry-instrumentation
25-
# opentelemetry-instrumentation-asyncpg
26-
# opentelemetry-semantic-conventions
27-
opentelemetry-instrumentation==0.55b1
28-
# via opentelemetry-instrumentation-asyncpg
29-
opentelemetry-instrumentation-asyncpg==0.55b1
30-
# via -r requirements/_base.in
31-
opentelemetry-semantic-conventions==0.55b1
32-
# via
33-
# opentelemetry-instrumentation
34-
# opentelemetry-instrumentation-asyncpg
3520
orjson==3.10.15
3621
# via
3722
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
3823
# -c requirements/../../../requirements/constraints.txt
3924
# -r requirements/../../../packages/common-library/requirements/_base.in
40-
packaging==24.2
41-
# via opentelemetry-instrumentation
4225
propcache==0.3.0
4326
# via yarl
4427
psycopg2-binary==2.9.10
@@ -63,14 +46,8 @@ sqlalchemy==1.4.54
6346
typing-extensions==4.14.1
6447
# via
6548
# alembic
66-
# opentelemetry-api
67-
# opentelemetry-semantic-conventions
6849
# pydantic
6950
# pydantic-core
7051
# pydantic-extra-types
71-
wrapt==1.17.2
72-
# via opentelemetry-instrumentation
7352
yarl==1.18.3
7453
# via -r requirements/_base.in
75-
zipp==3.21.0
76-
# via importlib-metadata

‎packages/postgres-database/requirements/_test.txt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ mypy==1.16.1
2424
mypy-extensions==1.1.0
2525
# via mypy
2626
packaging==24.2
27-
# via
28-
# -c requirements/_base.txt
29-
# pytest
27+
# via pytest
3028
pathspec==0.12.1
3129
# via mypy
3230
pluggy==1.5.0

0 commit comments

Comments
 (0)