Fix Union optimization in merged models;

Add 2 swagger examples;

Author: bogdandm

json_to_models/registry.py

@@ -179,8 +179,7 @@ def merge_models(self, generator, strict=False) -> List[Tuple[ModelMeta, Set[Mod
             replaces.append((model_meta, group))
 
         for model_meta in self.models:
-            if model_meta.index not in replaces_ids:
-                generator.optimize_type(model_meta)
+            generator.optimize_type(model_meta)
         return replaces
 
     def _merge(self, generator, *models: ModelMeta):

testing_tools/real_apis/spotify-swagger.py

@@ -0,0 +1,51 @@
+from pathlib import Path
+
+import yaml
+
+from json_to_models.dynamic_typing.string_serializable import StringSerializable, registry
+from json_to_models.generator import MetadataGenerator
+from json_to_models.models.attr import AttrsModelCodeGenerator
+from json_to_models.models.base import generate_code
+from json_to_models.models.structure import compose_models_flat
+from json_to_models.registry import ModelFieldsNumberMatch, ModelFieldsPercentMatch, ModelRegistry
+
+
+@registry.add()
+class SwaggerRef(StringSerializable, str):
+    @classmethod
+    def to_internal_value(cls, value: str) -> 'SwaggerRef':
+        if not value.startswith("#/"):
+            raise ValueError(f"invalid literal for SwaggerRef: '{value}'")
+        return cls(value)
+
+    def to_representation(self) -> str:
+        return str(self)
+
+
+def load_data() -> dict:
+    with (Path(__file__) / ".." / ".." / "spotify-swagger.yaml").open() as f:
+        data = yaml.load(f, Loader=yaml.SafeLoader)
+    return data
+
+
+def main():
+    data = load_data()
+    del data["paths"]
+
+    gen = MetadataGenerator(
+        dict_keys_regex=[],
+        dict_keys_fields=["securityDefinitions", "paths", "responses", "definitions", "properties", "scopes"]
+    )
+    reg = ModelRegistry(ModelFieldsPercentMatch(.5), ModelFieldsNumberMatch(10))
+    fields = gen.generate(data)
+    reg.process_meta_data(fields, model_name="Swagger")
+    reg.merge_models(generator=gen)
+    reg.generate_names()
+
+    structure = compose_models_flat(reg.models_map)
+    code = generate_code(structure, AttrsModelCodeGenerator)
+    print(code)
+
+
+if __name__ == '__main__':
+    main()

testing_tools/real_apis/swagger.py

@@ -0,0 +1,50 @@
+import json
+from pathlib import Path
+
+from json_to_models.dynamic_typing.string_serializable import StringSerializable, registry
+from json_to_models.generator import MetadataGenerator
+from json_to_models.models.attr import AttrsModelCodeGenerator
+from json_to_models.models.base import generate_code
+from json_to_models.models.structure import compose_models_flat
+from json_to_models.registry import ModelFieldsNumberMatch, ModelFieldsPercentMatch, ModelRegistry
+
+
+@registry.add()
+class SwaggerRef(StringSerializable, str):
+    @classmethod
+    def to_internal_value(cls, value: str) -> 'SwaggerRef':
+        if not value.startswith("#/"):
+            raise ValueError(f"invalid literal for SwaggerRef: '{value}'")
+        return cls(value)
+
+    def to_representation(self) -> str:
+        return str(self)
+
+
+def load_data() -> dict:
+    with (Path(__file__) / ".." / ".." / "swagger.json").open() as f:
+        data = json.load(f)
+    return data
+
+
+def main():
+    data = load_data()
+    del data["paths"]
+
+    gen = MetadataGenerator(
+        dict_keys_regex=[],
+        dict_keys_fields=["securityDefinitions", "paths", "responses", "definitions", "properties"]
+    )
+    reg = ModelRegistry(ModelFieldsPercentMatch(.5), ModelFieldsNumberMatch(10))
+    fields = gen.generate(data)
+    reg.process_meta_data(fields, model_name="Swagger")
+    reg.merge_models(generator=gen)
+    reg.generate_names()
+
+    structure = compose_models_flat(reg.models_map)
+    code = generate_code(structure, AttrsModelCodeGenerator)
+    print(code)
+
+
+if __name__ == '__main__':
+    main()