From: Aleš <ales.mrazek@nic.cz>
Date: Thu, 27 Jan 2022 14:43:01 +0000 (+0100)
Subject: utils: modelling: serialization fix that broke json schema generation
X-Git-Tag: v6.0.0a1~45^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3616ed864241f59e15d80f5f7ea7b38c564a85c4;p=thirdparty%2Fknot-resolver.git

utils: modelling: serialization fix that broke json schema generation
---

diff --git a/manager/knot_resolver_manager/utils/modelling.py b/manager/knot_resolver_manager/utils/modelling.py
index 340f04790..ead9b18c1 100644
--- a/manager/knot_resolver_manager/utils/modelling.py
+++ b/manager/knot_resolver_manager/utils/modelling.py
@@ -58,20 +58,15 @@ class Serializable:
         )
 
     @staticmethod
-    def serialize(obj: Any, typ: Type[Any]) -> Any:
-        if inspect.isclass(typ) and issubclass(typ, Serializable):
-            return cast(Serializable, obj).to_dict()
+    def serialize(obj: Any) -> Any:
+        if isinstance(obj, Serializable):
+            return obj.to_dict()
 
-        elif inspect.isclass(typ) and issubclass(typ, CustomValueType):
-            return cast(CustomValueType, obj).serialize()
+        elif isinstance(obj, CustomValueType):
+            return obj.serialize()
 
-        elif inspect.isclass(typ) and issubclass(typ, SchemaNode):
-            node = cast(SchemaNode, obj)
-            return node.to_dict()
-
-        elif is_list(typ):
-            lst = cast(List[Any], obj)
-            res: List[Any] = [Serializable.serialize(i, get_generic_type_argument(typ)) for i in lst]
+        elif isinstance(obj, list):
+            res: List[Any] = [Serializable.serialize(i) for i in cast(List[Any], obj)]
             return res
 
         return obj
@@ -127,7 +122,7 @@ def _get_properties_schema(typ: Type[Any]) -> Dict[Any, Any]:
             assert Serializable.is_serializable(
                 python_type
             ), f"Type '{python_type}' does not appear to be JSON serializable"
-            schema[name]["default"] = Serializable.serialize(getattr(typ, name), python_type)
+            schema[name]["default"] = Serializable.serialize(getattr(typ, name))
 
     if attribute_documentation is not None and len(attribute_documentation) > 0:
         raise SchemaException(
@@ -579,6 +574,6 @@ class SchemaNode(Serializable):
         cls = self.__class__
         annot = cls.__dict__.get("__annotations__", {})
 
-        for name, python_type in annot.items():
-            res[name] = Serializable.serialize(getattr(self, name), python_type)
+        for name in annot:
+            res[name] = Serializable.serialize(getattr(self, name))
         return res