Skip to content

Commit f9c93a3

Browse files
merge master
2 parents a3e14b7 + 35e7048 commit f9c93a3

File tree

1,705 files changed

+62111
-28525
lines changed

Some content is hidden

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

1,705 files changed

+62111
-28525
lines changed

.codecov.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ 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/**
31+
- component_id: pkg_celery_library
32+
paths:
33+
- packages/celery-library/**
3434
- component_id: pkg_dask_task_models_library
3535
paths:
3636
- packages/dask-task-models-library/**
@@ -130,6 +130,7 @@ comment:
130130

131131

132132
ignore:
133+
- "api/tests"
133134
- "test_*.py"
134135
- "**/generated_models/*.py"
135136
- "**/generated_code/*.py"

.env-devel

Lines changed: 31 additions & 21 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"}}'
@@ -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
@@ -158,13 +159,13 @@ INVITATIONS_PORT=8000
158159
INVITATIONS_SECRET_KEY='REPLACE_ME_with_result__Fernet_generate_key='
159160
INVITATIONS_SWAGGER_API_DOC_ENABLED=1
160161
INVITATIONS_USERNAME=admin
161-
INVITATIONS_TRACING=null
162+
INVITATIONS_TRACING={}
162163

163164
LOG_FORMAT_LOCAL_DEV_ENABLED=1
164-
LOG_FILTER_MAPPING='{}'
165+
LOG_FILTER_MAPPING='{"gunicorn.access":[" /v0/ ", " /v0/health "], "uvicorn.access":[" / ", " /v0/ "]}'
165166

166167
NOTIFICATIONS_LOGLEVEL=INFO
167-
NOTIFICATIONS_TRACING=null
168+
NOTIFICATIONS_TRACING={}
168169

169170
PAYMENTS_ACCESS_TOKEN_EXPIRE_MINUTES=30
170171
PAYMENTS_ACCESS_TOKEN_SECRET_KEY=2c0411810565e063309be1457009fb39ce023946f6a354e6935107b57676
@@ -186,15 +187,16 @@ PAYMENTS_STRIPE_API_SECRET='REPLACE_ME_with_api_secret'
186187
PAYMENTS_STRIPE_URL=https://api.stripe.com
187188
PAYMENTS_SWAGGER_API_DOC_ENABLED=1
188189
PAYMENTS_USERNAME=admin
189-
PAYMENTS_TRACING=null
190+
PAYMENTS_TRACING={}
190191

191192
POSTGRES_DB=simcoredb
192193
POSTGRES_ENDPOINT=postgres:5432
193194
POSTGRES_HOST=postgres
194195
POSTGRES_PASSWORD=adminadmin
195196
POSTGRES_PORT=5432
196197
POSTGRES_USER=scu
197-
198+
POSTGRES_MINSIZE=2 # see https://github.com/ITISFoundation/osparc-simcore/pull/8199
199+
POSTGRES_MAXSIZE=50
198200
POSTGRES_READONLY_PASSWORD=readonly
199201
POSTGRES_READONLY_USER=postgres_readonly
200202

@@ -227,7 +229,7 @@ RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_CHECK_ENABLED=1
227229
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_COUNTER_FAIL=6
228230
RESOURCE_USAGE_TRACKER_MISSED_HEARTBEAT_INTERVAL_SEC=300
229231
RESOURCE_USAGE_TRACKER_S3=null
230-
RESOURCE_USAGE_TRACKER_TRACING=null
232+
RESOURCE_USAGE_TRACKER_TRACING={}
231233

232234
# NOTE: 172.17.0.1 is the docker0 interface, which redirect from inside a container onto the host network interface.
233235
R_CLONE_OPTION_BUFFER_SIZE=16M
@@ -259,7 +261,7 @@ STORAGE_HOST=storage
259261
STORAGE_LOGLEVEL=INFO
260262
STORAGE_PORT=8080
261263
STORAGE_PROFILING=1
262-
STORAGE_TRACING=null
264+
STORAGE_TRACING={}
263265
# STORAGE ----
264266

265267
SWARM_STACK_NAME=master-simcore
@@ -269,11 +271,18 @@ VENDOR_DEV_MANUAL_IMAGE=containous/whoami
269271
VENDOR_DEV_MANUAL_REPLICAS=1
270272
VENDOR_DEV_MANUAL_SUBDOMAIN=manual
271273

272-
## VENDOR DEVELOPMENT SERVICES ---
274+
## WEBSERVER SERVICES VARIANTS ---
273275

274276
WB_API_WEBSERVER_HOST=wb-api-server
275277
WB_API_WEBSERVER_PORT=8080
276278

279+
WB_AUTH_DIAGNOSTICS={}
280+
WB_AUTH_LOGLEVEL=INFO
281+
WB_AUTH_PROFILING=1
282+
WB_AUTH_TRACING={}
283+
WB_AUTH_WEBSERVER_HOST=wb-auth
284+
WB_AUTH_WEBSERVER_PORT=8080
285+
277286
WB_GC_ACTIVITY=null
278287
WB_GC_ANNOUNCEMENTS=0
279288
WB_GC_CATALOG=null
@@ -300,7 +309,7 @@ WB_GC_SOCKETIO=1
300309
WB_GC_STATICWEB=null
301310
WB_GC_STUDIES_DISPATCHER=null
302311
WB_GC_TAGS=0
303-
WB_GC_TRACING=null
312+
WB_GC_TRACING={}
304313
WB_GC_USERS={}
305314
WB_GC_WALLETS=0
306315

@@ -330,7 +339,7 @@ WB_DB_EL_STATICWEB=null
330339
WB_DB_EL_STORAGE=null
331340
WB_DB_EL_STUDIES_DISPATCHER=null
332341
WB_DB_EL_TAGS=0
333-
WB_DB_EL_TRACING=null
342+
WB_DB_EL_TRACING={}
334343
WB_DB_EL_USERS={}
335344
WB_DB_EL_WALLETS=0
336345

@@ -395,11 +404,12 @@ WEBSERVER_PROJECTS={}
395404
WEBSERVER_PROMETHEUS_API_VERSION=v1
396405
WEBSERVER_PROMETHEUS_URL=http://prometheus:9090
397406
WEBSERVER_PUBLICATIONS=1
407+
WEBSERVER_REALTIME_COLLABORATION='{"RTC_MAX_NUMBER_OF_USERS":3}'
398408
WEBSERVER_SCICRUNCH={}
399409
WEBSERVER_SESSION_SECRET_KEY='REPLACE_ME_with_result__Fernet_generate_key='
400410
WEBSERVER_SOCKETIO=1
401411
WEBSERVER_STATICWEB={}
402412
WEBSERVER_STUDIES_DISPATCHER={}
403413
WEBSERVER_TAGS=1
404-
WEBSERVER_TRACING=null
414+
WEBSERVER_TRACING={}
405415
WEBSERVER_USERS={}

.github/CODEOWNERS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Makefile @pcrespov @sanderegg
1313
/api/ @sanderegg @pcrespov @matusdrobuliak66
1414
/ci/ @sanderegg @pcrespov
1515
/docs/ @pcrespov
16+
/packages/celery-library/ @giancarloromeo
1617
/packages/common-library/ @giancarloromeo
1718
/packages/models-library/ @sanderegg @pcrespov @matusdrobuliak66 @giancarloromeo
1819
/packages/postgres-database/ @matusdrobuliak66

.github/ISSUE_TEMPLATE/1_bug_report.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,20 @@
11
name: 🐛 Bug
22
description: File a bug/issue
3-
labels: ["bug", "t:bug"]
4-
assignees: ["pcrespov"]
3+
title: "[Bug]: "
4+
labels:
5+
- bug
6+
- "t:bug"
7+
assignees:
8+
- bisgaard-itis
9+
- giancarloromeo
10+
- GitHK
11+
- matusdrobuliak66
12+
- odeimaiz
13+
- pcrespov
14+
- sanderegg
15+
projects:
16+
- "ITISFoundation/projects/15"
17+
type: "Bug"
518
body:
619
- type: checkboxes
720
attributes:
@@ -20,7 +33,7 @@ body:
2033
- "production aws (e.g. osparc.io)"
2134
- "staging aws (e.g. staging.osparc.io)"
2235
- "production on-premise (dalco)"
23-
- "stating on-premise (dalco)"
36+
- "staging on-premise (dalco)"
2437
- "development (master)"
2538
- "other (e.g. local)"
2639
validations:

.github/ISSUE_TEMPLATE/2_feature_request.yml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,17 @@
11
name: ✨ Feature request
2-
description: Suggest an idea to implement in the simcore plaform
3-
labels: ["t:enhancement"]
4-
assignees: ["pcrespov"]
2+
description: Suggest an idea to implement in the simcore platform
3+
title: "[Feature]: "
4+
labels:
5+
- t:enhancement
6+
assignees:
7+
- bisgaard-itis
8+
- giancarloromeo
9+
- GitHK
10+
- matusdrobuliak66
11+
- odeimaiz
12+
- pcrespov
13+
- sanderegg
14+
type: "Feature"
515
body:
616
- type: checkboxes
717
attributes:

.github/ISSUE_TEMPLATE/3_maintenance_issue.yml

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,19 @@
11
name: 🏗️ Maintenance
22
description: A change in the code to overcome technical debt
3-
labels: ["t:maintenance"]
4-
assignees: ["pcrespov"]
3+
title: "[Maintenance]: "
4+
labels:
5+
- "t:maintenance"
6+
assignees:
7+
- bisgaard-itis
8+
- giancarloromeo
9+
- GitHK
10+
- matusdrobuliak66
11+
- odeimaiz
12+
- pcrespov
13+
- sanderegg
14+
projects:
15+
- "ITISFoundation/projects/9"
16+
type: "Task"
517
body:
618
- type: checkboxes
719
attributes:

.github/ISSUE_TEMPLATE/4_pre_release.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
name: 🚀 Pre-release to staging (developers-only)
22
description: Issue to plan and log pre-release from master to staging deploy (including staging hotfixes)
33
title: "🚀 Pre-release master -> staging_<sprint_name><version>"
4-
labels: ["t:maintenance", "release"]
5-
assignees: ["matusdrobuliak66"]
4+
labels:
5+
- "t:maintenance"
6+
- release
7+
assignees:
8+
- matusdrobuliak66
9+
- YuryHrytsuk
10+
type: "Task"
611
body:
712
- type: dropdown
813
id: prerelease_kind
@@ -34,8 +39,8 @@ body:
3439
attributes:
3540
label: Commit SHA
3641
description: |
37-
Selets the commit from which the release takes placeholder. Check [commits](https://github.com/ITISFoundation/osparc-simcore/commits/master)
38-
IMPORTANT: make sure t (i.e. tests passed and images were built and pushed)
42+
Selects the commit from which the release takes place. Check [commits](https://github.com/ITISFoundation/osparc-simcore/commits/master)
43+
IMPORTANT: make sure CI (i.e. tests passed and images were built and pushed)
3944
placeholder: 7d9dcc313f9ced0bd1e6508363148841683b6d7c
4045
validations:
4146
required: true
@@ -49,7 +54,7 @@ body:
4954
required: true
5055
- type: checkboxes
5156
attributes:
52-
label: Did the commit CI suceeded?
57+
label: Did the commit CI succeed?
5358
description: Check the CI of the selected commit in the [repo commits](https://github.com/ITISFoundation/osparc-simcore/commits/master)
5459
options:
5560
- label: The commit CI succeeded.
@@ -159,3 +164,4 @@ body:
159164
``` md
160165
https://github.com/ITISFoundation/osparc-simcore/releases/tag/staging_<sprint_name><version>
161166
```
167+
```

.github/ISSUE_TEMPLATE/5_release.yml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
name: 🚀 Release to production (developers-only)
22
description: Creates an issue to plan and log the release from staging to production
33
title: "🚀 Release v<M.m.0>"
4-
labels: ["t:maintenance", "release"]
5-
assignees: ["matusdrobuliak66"]
4+
labels:
5+
- "t:maintenance"
6+
- release
7+
assignees:
8+
- matusdrobuliak66
9+
- YuryHrytsuk
10+
type: "Task"
611
body:
712
- type: input
813
id: version
@@ -17,8 +22,8 @@ body:
1722
attributes:
1823
label: Commit SHA
1924
description: |
20-
Selects the commit from which the release takes placeholder. Check [commits](https://github.com/ITISFoundation/osparc-simcore/commits/master)
21-
IMPORTANT: make sure t (i.e. tests passed and images were built and pushed)
25+
Selects the commit from which the release takes place. Check [commits](https://github.com/ITISFoundation/osparc-simcore/commits/master)
26+
IMPORTANT: make sure CI (i.e. tests passed and images were built and pushed)
2227
placeholder: 7d9dcc313f9ced0bd1e6508363148841683b6d7c
2328
validations:
2429
required: true
@@ -41,7 +46,7 @@ body:
4146
required: true
4247
- type: checkboxes
4348
attributes:
44-
label: Did the commit CI suceeded?
49+
label: Did the commit CI succeed?
4550
description: Check the CI of the selected commit in the [repo commits](https://github.com/ITISFoundation/osparc-simcore/commits/master) to make sure the images are built and ready
4651
options:
4752
- label: The commit CI succeeded.
@@ -162,3 +167,4 @@ body:
162167
``` md
163168
:tada: https://github.com/ITISFoundation/osparc-simcore/releases/tag/v<M.m.0>
164169
```
170+
```

0 commit comments

Comments
 (0)