✨ Deletion of trashed projects/folders upon expiration of retention time

packages/common-library/src/common_library/exclude.py

@@ -12,6 +12,10 @@ def is_unset(v: Any) -> bool:
     return isinstance(v, UnSet)
 
 
+def is_set(v: Any) -> bool:
+    return not isinstance(v, UnSet)
+
+
 def as_dict_exclude_unset(**params) -> dict[str, Any]:
     return {k: v for k, v in params.items() if not isinstance(v, UnSet)}
 

packages/models-library/src/models_library/licenses.py

@@ -26,16 +26,18 @@ class LicensedResourceType(StrAutoEnum):
     VIP_MODEL = auto()
 
 
-VIP_FEATURES_EXAMPLE = {
-    "name": "Duke",
-    "version": "V2.0",
-    "sex": "Mas bien poco",
+_VIP_FEATURES_EXAMPLE = {
+    # NOTE: this view is how it would be after parsed and validated
     "age": "34 years",
-    "weight": "70.2 Kg",
-    "height": "1.77 m",
     "date": "2015-03-01",
     "ethnicity": "Caucasian",
     "functionality": "Static",
+    "height": "1.77 m",
+    "name": "Duke",
+    "sex": "Male",
+    "version": "V2.0",
+    "weight": "70.2 Kg",
+    # other
     "additional_field": "allowed",
 }
 
@@ -58,7 +60,7 @@ class FeaturesDict(TypedDict):
     "id": 1,
     "description": "A detailed description of the VIP model",
     "thumbnail": "https://example.com/thumbnail.jpg",
-    "features": VIP_FEATURES_EXAMPLE,
+    "features": _VIP_FEATURES_EXAMPLE,
     "doi": "10.1000/xyz123",
     "license_key": "ABC123XYZ",
     "license_version": "1.0",

packages/pytest-simcore/src/pytest_simcore/helpers/assert_checks.py

@@ -29,8 +29,10 @@ async def assert_status(
     data, error = unwrap_envelope(json_response)
 
     assert response.status == expected_status_code, (
-        f"received {response.status}: ({data},{error})"
-        f", expected {get_code_display_name(expected_status_code)} : {expected_msg or ''}"
+        f"Expected: {get_code_display_name(expected_status_code)} : {expected_msg or ''}"
+        f"Got: {response.status}:\n"
+        f"  - data :{pformat(data)}\n"
+        f"  - error:{pformat(error)}\n)"
     )
 
     if is_error(expected_status_code):

services/docker-compose.yml

@@ -971,16 +971,15 @@ services:
     init: true
     hostname: "gc-{{.Node.Hostname}}-{{.Task.Slot}}" # the hostname is used in conjonction with other services and must be unique see https://github.com/ITISFoundation/osparc-simcore/pull/5931
     environment:
-      WEBSERVER_LOGLEVEL: ${WB_GC_LOGLEVEL}
 
-      WEBSERVER_HOST: ${WEBSERVER_HOST}
-      WEBSERVER_PORT: ${WEBSERVER_PORT}
+      # WEBSERVER_DIRECTOR_V2
+      DIRECTOR_V2_HOST: ${DIRECTOR_V2_HOST}
+      DIRECTOR_V2_PORT: ${DIRECTOR_V2_PORT}
 
-      # WEBSERVER_RESOURCE_USAGE_TRACKER
-      RESOURCE_USAGE_TRACKER_HOST: ${RESOURCE_USAGE_TRACKER_HOST}
-      RESOURCE_USAGE_TRACKER_PORT: ${RESOURCE_USAGE_TRACKER_EXTERNAL_PORT}
+      GUNICORN_CMD_ARGS: ${WEBSERVER_GUNICORN_CMD_ARGS}
 
-      REST_SWAGGER_API_DOC_ENABLED: ${WB_GC_REST_SWAGGER_API_DOC_ENABLED}
+      LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
+      LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
 
       # WEBSERVER_DB
       POSTGRES_DB: ${POSTGRES_DB}
@@ -990,47 +989,61 @@ services:
       POSTGRES_PORT: ${POSTGRES_PORT}
       POSTGRES_USER: ${POSTGRES_USER}
 
-      DIRECTOR_V2_HOST: ${DIRECTOR_V2_HOST}
-      DIRECTOR_V2_PORT: ${DIRECTOR_V2_PORT}
-
-      GUNICORN_CMD_ARGS: ${WEBSERVER_GUNICORN_CMD_ARGS}
-
-      LOG_FORMAT_LOCAL_DEV_ENABLED: ${LOG_FORMAT_LOCAL_DEV_ENABLED}
-      LOG_FILTER_MAPPING : ${LOG_FILTER_MAPPING}
-
-      STORAGE_HOST: ${STORAGE_HOST}
-      STORAGE_PORT: ${STORAGE_PORT}
+      # WEBSERVER_RABBITMQ
+      RABBIT_HOST: ${RABBIT_HOST}
+      RABBIT_PASSWORD: ${RABBIT_PASSWORD}
+      RABBIT_PORT: ${RABBIT_PORT}
+      RABBIT_SECURE: ${RABBIT_SECURE}
+      RABBIT_USER: ${RABBIT_USER}
 
+      # WEBSERVER_REDIS
       REDIS_HOST: ${REDIS_HOST}
+      REDIS_PASSWORD: ${REDIS_PASSWORD}
       REDIS_PORT: ${REDIS_PORT}
       REDIS_SECURE: ${REDIS_SECURE}
       REDIS_USER: ${REDIS_USER}
-      REDIS_PASSWORD: ${REDIS_PASSWORD}
-
-      SWARM_STACK_NAME: ${SWARM_STACK_NAME}
 
-      WEBSERVER_DB_LISTENER: ${WB_GC_DB_LISTENER}
+      # WEBSERVER_RESOURCE_MANAGER
+      RESOURCE_MANAGER_RESOURCE_TTL_S: ${WB_GC_RESOURCE_MANAGER_RESOURCE_TTL_S}
 
-      WEBSERVER_GARBAGE_COLLECTOR: ${WB_GC_GARBAGE_COLLECTOR}
+      # WEBSERVER_RESOURCE_USAGE_TRACKER
+      RESOURCE_USAGE_TRACKER_HOST: ${RESOURCE_USAGE_TRACKER_HOST}
+      RESOURCE_USAGE_TRACKER_PORT: ${RESOURCE_USAGE_TRACKER_EXTERNAL_PORT}
 
-      RESOURCE_MANAGER_RESOURCE_TTL_S: ${WB_GC_RESOURCE_MANAGER_RESOURCE_TTL_S}
+      REST_SWAGGER_API_DOC_ENABLED: ${WB_GC_REST_SWAGGER_API_DOC_ENABLED}
 
+      # WEBSERVER_SESSION
       SESSION_SECRET_KEY: ${WEBSERVER_SESSION_SECRET_KEY}
+
+      # WEBSERVER_STORAGE
+      STORAGE_HOST: ${STORAGE_HOST}
+      STORAGE_PORT: ${STORAGE_PORT}
+
+      SWARM_STACK_NAME: ${SWARM_STACK_NAME}
+
+      # WEBSERVER_TRASH
+      TRASH_RETENTION_DAYS: ${TRASH_RETENTION_DAYS}
+
       WEBSERVER_ACTIVITY: ${WB_GC_ACTIVITY}
       WEBSERVER_ANNOUNCEMENTS: ${WB_GC_ANNOUNCEMENTS}
       WEBSERVER_CATALOG: ${WB_GC_CATALOG}
       WEBSERVER_CLUSTERS: ${WB_GC_CLUSTERS}
+      WEBSERVER_DB_LISTENER: ${WB_GC_DB_LISTENER}
       WEBSERVER_DIAGNOSTICS: ${WB_GC_DIAGNOSTICS}
       WEBSERVER_EMAIL: ${WB_GC_EMAIL}
       WEBSERVER_EXPORTER: ${WB_GC_EXPORTER}
       WEBSERVER_FOLDERS: ${WB_GC_FOLDERS}
       WEBSERVER_FRONTEND: ${WB_GC_FRONTEND}
+      WEBSERVER_GARBAGE_COLLECTOR: ${WB_GC_GARBAGE_COLLECTOR}
       WEBSERVER_GROUPS: ${WB_GC_GROUPS}
+      WEBSERVER_HOST: ${WEBSERVER_HOST}
       WEBSERVER_INVITATIONS: ${WB_GC_INVITATIONS}
       WEBSERVER_LICENSES: null
       WEBSERVER_LOGIN: ${WB_GC_LOGIN}
+      WEBSERVER_LOGLEVEL: ${WB_GC_LOGLEVEL}
       WEBSERVER_NOTIFICATIONS: ${WB_GC_NOTIFICATIONS}
       WEBSERVER_PAYMENTS: ${WB_GC_PAYMENTS}
+      WEBSERVER_PORT: ${WEBSERVER_PORT}
       WEBSERVER_PRODUCTS: ${WB_GC_PRODUCTS}
       WEBSERVER_PROJECTS: ${WB_GC_PROJECTS}
       WEBSERVER_PUBLICATIONS: ${WB_GC_PUBLICATIONS}
@@ -1043,12 +1056,7 @@ services:
       WEBSERVER_USERS: ${WB_GC_USERS}
       WEBSERVER_WALLETS: ${WB_GC_WALLETS}
 
-      # WEBSERVER_RABBITMQ
-      RABBIT_HOST: ${RABBIT_HOST}
-      RABBIT_PASSWORD: ${RABBIT_PASSWORD}
-      RABBIT_PORT: ${RABBIT_PORT}
-      RABBIT_SECURE: ${RABBIT_SECURE}
-      RABBIT_USER: ${RABBIT_USER}
+
     networks:
       - default
       - interactive_services_subnet