Merge branch 'master' into 7795-add-osparc-trace-id-to-response-headers

Author: bisgaard-itis

.vscode/settings.template.json

@@ -1,7 +1,6 @@
 // This is a template. Clone and replace extension ".template.json" by ".json"
 {
   "autoDocstring.docstringFormat": "pep257",
-
   "editor.tabSize": 2,
   "editor.insertSpaces": true,
   "editor.detectIndentation": false,
@@ -34,6 +33,8 @@
   "python.analysis.typeCheckingMode": "basic",
   "python.analysis.extraPaths": [
     "./packages/aws-library/src",
+    "./packages/common-library/src",
+    "./packages/dask-task-models-library/src",
     "./packages/models-library/src",
     "./packages/postgres-database/src",
     "./packages/postgres-database/tests",

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

@@ -4,6 +4,7 @@
 from common_library.basic_types import DEFAULT_FACTORY
 from models_library.generics import Envelope
 from pydantic import BaseModel, ConfigDict, Field
+from pydantic.config import JsonDict
 
 from .basic_types import IDStr, LogLevel
 
@@ -72,39 +73,55 @@ class ErrorGet(BaseModel):
             description="Message displayed to the user",
         ),
     ]
+
     support_id: Annotated[
         IDStr | None,
         Field(description="ID to track the incident during support", alias="supportId"),
     ] = None
-    status: int
 
-    # NOTE: The fields blow are DEPRECATED. Still here to keep compatibilty with front-end until updated
+    status: Annotated[
+        int,
+        Field(
+            description="Redundant HTTP status code of the error."
+            "Must be the same as in the HTTP response"
+        ),
+    ]
+
+    # NOTE: The fields below are DEPRECATED.
+    #  Still here to keep compatibilty with front-end until updated
     errors: Annotated[
         list[ErrorItemType],
         Field(deprecated=True, default_factory=list, json_schema_extra={"default": []}),
     ] = DEFAULT_FACTORY
+
     logs: Annotated[
         list[LogMessageType],
         Field(deprecated=True, default_factory=list, json_schema_extra={"default": []}),
     ] = DEFAULT_FACTORY
 
+    @staticmethod
+    def _update_json_schema_extra(schema: JsonDict) -> None:
+        schema.update(
+            {
+                "examples": [
+                    {
+                        "message": "Sorry you do not have sufficient access rights for product",
+                        "status": 401,
+                    },
+                    {
+                        "message": "Opps this error was unexpected. We are working on that!",
+                        "supportId": "OEC:12346789",
+                        "status": 500,
+                    },
+                ]
+            }
+        )
+
     model_config = ConfigDict(
         populate_by_name=True,
         extra="ignore",  # Used to prune extra fields from internal data
         frozen=True,
-        json_schema_extra={
-            "examples": [
-                {
-                    "message": "Sorry you do not have sufficient access rights for product",
-                    "status": 401,
-                },
-                {
-                    "message": "Opps this error was unexpected. We are working on that!",
-                    "supportId": "OEC:12346789",
-                    "status": 500,
-                },
-            ]
-        },
+        json_schema_extra=_update_json_schema_extra,
     )
 
 

services/docker-compose.local.yml

@@ -158,7 +158,8 @@ services:
       - "3001:3000"
     deploy:
       labels:
-        - traefik.http.services.${SWARM_STACK_NAME}_webserver.loadbalancer.sticky.cookie.secure=false
+        # locally webserver is accessible through http://
+        - traefik.http.services.${SWARM_STACK_NAME}_webserver_sticky.loadbalancer.sticky.cookie.secure=false
         - traefik.http.routers.${SWARM_STACK_NAME}_webserver_local.service=${SWARM_STACK_NAME}_webserver
         - traefik.http.routers.${SWARM_STACK_NAME}_webserver_local.entrypoints=http
         - traefik.http.routers.${SWARM_STACK_NAME}_webserver_local.rule=PathPrefix(`/dev/`)