Merge pull request #2090 from tisnik/lcore-2755-initial-refactoring

LCORE-2755: initial refactoring of schema dumper

Author: tisnik

src/utils/json_schema_updater.py

@@ -0,0 +1,55 @@
+"""Function to transform a JSON Schema-like dictionary into an OpenAPI-compatible schema."""
+
+from typing import Any
+
+
+# pylint: disable=too-many-boolean-expressions
+def recursive_update(
+    original: dict[str, Any],
+) -> dict[str, Any]:
+    """Transform a JSON Schema-like dictionary into an OpenAPI-compatible schema.
+
+    Recursively walks the input mapping and applies compatibility fixes:
+    - converts patterns like `anyOf: [{ "type": X }, { "type": "null" }]` into
+      a single `"type": X` with `"nullable": True` (optional types)
+    - rewrites `"exclusiveMinimum"` to `"minimum"`
+    - otherwise preserves entries
+
+    Parameters:
+    ----------
+        original (dict[str, Any]): Input schema dictionary that is produced by
+        Pydantic.
+
+    Returns:
+    -------
+        dict[str, Any]: A new schema dictionary with all OpenAPI-compatible
+        transformations applied.
+    """
+    new: dict[str, Any] = {}
+    for key, value in original.items():
+        # recurse into sub-dictionaries
+        if isinstance(value, dict):
+            new[key] = recursive_update(value)
+        # optional types fixes
+        elif (
+            key == "anyOf"
+            and isinstance(value, list)
+            and len(value) >= 2
+            and isinstance(value[0], dict)
+            and "type" in value[0]
+            and isinstance(value[1], dict)
+            and value[1].get("type") == "null"
+        ):
+            # only the first type is correct,
+            # we need to ignore the second one
+            val = value[0]["type"]
+            new["type"] = val
+            # create new attribute
+            new["nullable"] = True
+        # exclusiveMinimum attribute handling is broken
+        # in Pydantic - this is simple fix
+        elif key == "exclusiveMinimum":
+            new["minimum"] = value
+        else:
+            new[key] = value
+    return new

src/utils/schema_dumper.py

@@ -1,63 +1,11 @@
 """Function to dump the configuration schema into OpenAPI-compatible format."""
 
 import json
-from typing import Any
 
 from pydantic.json_schema import models_json_schema
 
 from models.config import Configuration
-
-
-# pylint: disable=too-many-boolean-expressions
-def recursive_update(
-    original: dict[str, Any],
-) -> dict[str, Any]:
-    """Transform a JSON Schema-like dictionary into an OpenAPI-compatible schema.
-
-    Recursively walks the input mapping and applies compatibility fixes:
-    - converts patterns like `anyOf: [{ "type": X }, { "type": "null" }]` into
-      a single `"type": X` with `"nullable": True` (optional types)
-    - rewrites `"exclusiveMinimum"` to `"minimum"`
-    - otherwise preserves entries
-
-    Parameters:
-    ----------
-        original (dict[str, Any]): Input schema dictionary that is produced by
-        Pydantic.
-
-    Returns:
-    -------
-        dict[str, Any]: A new schema dictionary with all OpenAPI-compatible
-        transformations applied.
-    """
-    new: dict[str, Any] = {}
-    for key, value in original.items():
-        # recurse into sub-dictionaries
-        if isinstance(value, dict):
-            new[key] = recursive_update(value)
-        # optional types fixes
-        elif (
-            key == "anyOf"
-            and isinstance(value, list)
-            and len(value) >= 2
-            and isinstance(value[0], dict)
-            and "type" in value[0]
-            and isinstance(value[1], dict)
-            and value[1].get("type") == "null"
-        ):
-            # only the first type is correct,
-            # we need to ignore the second one
-            val = value[0]["type"]
-            new["type"] = val
-            # create new attribute
-            new["nullable"] = True
-        # exclusiveMinimum attribute handling is broken
-        # in Pydantic - this is simple fix
-        elif key == "exclusiveMinimum":
-            new["minimum"] = value
-        else:
-            new[key] = value
-    return new
+from utils.json_schema_updater import recursive_update
 
 
 def dump_schema(filename: str) -> None: