start using GenerateResolvedJsonSchema

Author: bisgaard-itis

packages/models-library/src/models_library/utils/json_schema.py

@@ -96,10 +96,10 @@ def any_ref_key(obj):
     return False
 
 
-class ResolvedGenerateJsonSchema(GenerateJsonSchema):
+class GenerateResolvedJsonSchema(GenerateJsonSchema):
     def generate(self, schema: CoreSchema, mode: JsonSchemaMode) -> JsonSchemaValue:
         schema_value = super().generate(schema=schema, mode=mode)
-        schema_value = jsonref.replace_refs(schema_value)
+        schema_value = jsonref.replace_refs(schema_value, jsonschema=True)
         return JsonSchemaValue(schema_value)
 
 

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

@@ -11,6 +11,7 @@
 from httpx import AsyncClient, BasicAuth
 from models_library.api_schemas_long_running_tasks.tasks import TaskGet, TaskStatus
 from models_library.progress_bar import ProgressReport, ProgressStructuredMessage
+from models_library.utils.json_schema import GenerateResolvedJsonSchema
 from pytest_mock import MockerFixture, MockType
 from servicelib.celery.models import TaskState
 from servicelib.celery.models import TaskStatus as CeleryTaskStatus
@@ -143,11 +144,9 @@ async def test_get_task_result(
                     total=1.0,
                     unit="Byte",
                     message=ProgressStructuredMessage.model_validate(
-                        {
-                            "description": "some description",
-                            "current": 12.2,
-                            "total": 123,
-                        }
+                        ProgressStructuredMessage.model_json_schema(
+                            schema_generator=GenerateResolvedJsonSchema
+                        )["examples"][0]
                     ),
                 ),
             ),
@@ -167,11 +166,9 @@ async def test_get_task_result(
                     total=1.0,
                     unit="Byte",
                     message=ProgressStructuredMessage.model_validate(
-                        {
-                            "description": "some description",
-                            "current": 12.2,
-                            "total": 123,
-                        }
+                        ProgressStructuredMessage.model_json_schema(
+                            schema_generator=GenerateResolvedJsonSchema
+                        )["examples"][0]
                     ),
                 ),
             ),