Skip to content

Commit e696bce

Browse files
committed
Merge branch 'master' into mai/pydantic-upgrade-repo-wide
2 parents 00148b0 + 23ec8aa commit e696bce

File tree

653 files changed

+12727
-6553
lines changed

Some content is hidden

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

653 files changed

+12727
-6553
lines changed

.codecov.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,6 @@ component_management:
2525
branches:
2626
- "!master"
2727
individual_components:
28-
- component_id: api
29-
paths:
30-
- api/**
3128
- component_id: pkg_aws_library
3229
paths:
3330
- packages/aws-library/**
@@ -133,6 +130,7 @@ comment:
133130

134131

135132
ignore:
133+
- "api/tests"
136134
- "test_*.py"
137135
- "**/generated_models/*.py"
138136
- "**/generated_code/*.py"

.env-devel

Lines changed: 19 additions & 19 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
164-
LOG_FILTER_MAPPING='{}'
164+
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={}

.github/actions/setup-simcore-env/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ inputs:
1010
uv-version:
1111
description: 'UV version to use'
1212
required: false
13-
default: '0.6.x'
13+
default: '0.7.x'
1414

1515
cache-dependency-glob:
1616
description: 'Glob pattern for cache dependency files'

0 commit comments

Comments
 (0)