test fixes

Author: bisgaard-itis

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

@@ -1,6 +1,7 @@
 from typing import Literal, TypeAlias
 
 from pydantic import BaseModel, ConfigDict
+from pydantic.config import JsonDict
 
 # NOTE: keep a list of possible unit, and please use correct official unit names
 ProgressUnit: TypeAlias = Literal["Byte"]
@@ -13,34 +14,38 @@ class ProgressStructuredMessage(BaseModel):
     unit: str | None = None
     sub: "ProgressStructuredMessage | None" = None
 
-    model_config = ConfigDict(
-        json_schema_extra={
-            "examples": [
-                {
-                    "description": "some description",
-                    "current": 12.2,
-                    "total": 123,
-                },
-                {
-                    "description": "some description",
-                    "current": 12.2,
-                    "total": 123,
-                    "unit": "Byte",
-                },
-                {
-                    "description": "downloading",
-                    "current": 2.0,
-                    "total": 5,
-                    "sub": {
-                        "description": "port 2",
+    @staticmethod
+    def _update_json_schema_extra(schema: JsonDict) -> None:
+        schema.update(
+            {
+                "examples": [
+                    {
+                        "description": "some description",
+                        "current": 12.2,
+                        "total": 123,
+                    },
+                    {
+                        "description": "some description",
                         "current": 12.2,
                         "total": 123,
                         "unit": "Byte",
                     },
-                },
-            ]
-        }
-    )
+                    {
+                        "description": "downloading",
+                        "current": 2.0,
+                        "total": 5,
+                        "sub": {
+                            "description": "port 2",
+                            "current": 12.2,
+                            "total": 123,
+                            "unit": "Byte",
+                        },
+                    },
+                ]
+            }
+        )
+
+    model_config = ConfigDict(json_schema_extra=_update_json_schema_extra)
 
 
 UNITLESS = None
@@ -96,7 +101,17 @@ def composed_message(self) -> str:
                 {
                     "actual_value": 0.3,
                     "total": 1.0,
-                    "message": ProgressStructuredMessage.model_config["json_schema_extra"]["examples"][2],  # type: ignore [index]
+                    "message": {
+                        "description": "downloading",
+                        "current": 2.0,
+                        "total": 5,
+                        "sub": {
+                            "description": "port 2",
+                            "current": 12.2,
+                            "total": 123,
+                            "unit": "Byte",
+                        },
+                    },
                 },
             ]
         },

services/api-server/tests/unit/api_functions/celery/test_functions.py

@@ -304,7 +304,7 @@ async def test_celery_error_propagation(
     with pytest.raises(HTTPStatusError) as exc_info:
         await poll_task_until_done(client, auth, f"{task_uuid}")
 
-    assert exc_info.value.response.status_code == status.HTTP_500_INTERNAL_SERVER_ERROR
+    assert exc_info.value.response.status_code == status.HTTP_503_SERVICE_UNAVAILABLE
 
 
 @pytest.mark.parametrize(

services/api-server/tests/unit/test_tasks.py

@@ -102,7 +102,7 @@ async def test_get_task_result(
             None,
             None,
             None,
-            status.HTTP_500_INTERNAL_SERVER_ERROR,
+            status.HTTP_503_SERVICE_UNAVAILABLE,
         ),
         (
             "GET",
@@ -111,7 +111,7 @@ async def test_get_task_result(
             CeleryError(),
             None,
             None,
-            status.HTTP_500_INTERNAL_SERVER_ERROR,
+            status.HTTP_503_SERVICE_UNAVAILABLE,
         ),
         (
             "POST",
@@ -120,7 +120,7 @@ async def test_get_task_result(
             None,
             CeleryError(),
             None,
-            status.HTTP_500_INTERNAL_SERVER_ERROR,
+            status.HTTP_503_SERVICE_UNAVAILABLE,
         ),
         (
             "GET",
@@ -129,7 +129,7 @@ async def test_get_task_result(
             CeleryError(),
             None,
             None,
-            status.HTTP_500_INTERNAL_SERVER_ERROR,
+            status.HTTP_503_SERVICE_UNAVAILABLE,
         ),
         (
             "GET",
@@ -142,9 +142,9 @@ async def test_get_task_result(
                     actual_value=0.5,
                     total=1.0,
                     unit="Byte",
-                    message=ProgressStructuredMessage.model_config["json_schema_extra"][
-                        "examples"
-                    ][0],
+                    message=ProgressStructuredMessage.model_json_schema()["examples"][
+                        0
+                    ],
                 ),
             ),
             None,
@@ -162,9 +162,9 @@ async def test_get_task_result(
                     actual_value=0.5,
                     total=1.0,
                     unit="Byte",
-                    message=ProgressStructuredMessage.model_config["json_schema_extra"][
-                        "examples"
-                    ][0],
+                    message=ProgressStructuredMessage.model_json_schema()["examples"][
+                        0
+                    ],
                 ),
             ),
             None,