Pydantic: fix datetime imports; fix Null fields in pydantic

Author: bogdandm

json_to_models/dynamic_typing/typing.py

@@ -1,4 +1,5 @@
 import operator
+from datetime import date, datetime, time
 from inspect import isclass
 from typing import Dict, Set, Tuple
 
@@ -16,7 +17,10 @@ def metadata_to_typing(t: MetaData) -> Tuple[ImportPathList, str]:
         if issubclass(t, StringSerializable):
             return t.to_typing_code()
         else:
-            return ([], t.__name__)
+            imports = []
+            if issubclass(t, (date, datetime, time)):
+                imports.append((t.__module__, [t.__name__]))
+            return (imports, t.__name__)
     elif isinstance(t, dict):
         raise ValueError("Can not convert dict instance to typing code. It should be wrapped into ModelMeta instance")
     else:

json_to_models/models/base.py

@@ -152,12 +152,16 @@ def fields(self) -> Tuple[ImportPathList, List[str]]:
         imports: ImportPathList = []
         strings: List[str] = []
         for is_optional, fields in enumerate((required, optional)):
+            fields = self._filter_fields(fields)
             for field in fields:
                 field_imports, data = self.field_data(field, self.model.type[field], bool(is_optional))
                 imports.extend(field_imports)
                 strings.append(self.FIELD.render(**data))
         return imports, strings
 
+    def _filter_fields(self, fields):
+        return fields
+
     @property
     def string_field_paths(self) -> List[str]:
         """

json_to_models/models/pydantic.py

@@ -2,7 +2,7 @@
 from typing import List, Optional, Tuple
 
 from .base import GenericModelCodeGenerator, KWAGRS_TEMPLATE, sort_kwargs, template
-from ..dynamic_typing import BaseType, DDict, DList, DOptional, ImportPathList, MetaData, ModelMeta, StringSerializable
+from ..dynamic_typing import BaseType, DDict, DList, DOptional, ImportPathList, MetaData, ModelMeta, Null, StringSerializable, Unknown
 
 DEFAULT_ORDER = (
     "*",
@@ -32,6 +32,16 @@ def generate(self, nested_classes: List[str] = None, extra: str = "", **kwargs)
         imports.append(('pydantic', ['BaseModel', 'Field']))
         return imports, body
 
+    def _filter_fields(self, fields):
+        fields = super()._filter_fields(fields)
+        filtered = []
+        for field in fields:
+            field_type = self.model.type[field]
+            if field_type in (Unknown, Null):
+                continue
+            filtered.append(field)
+        return filtered
+
     def field_data(self, name: str, meta: MetaData, optional: bool) -> Tuple[ImportPathList, dict]:
         """
         Form field data for template

setup.py

@@ -50,6 +50,6 @@ def run_tests(self):
     },
     install_requires=required,
     cmdclass={"test": PyTest},
-    tests_require=["pytest>=4.4.0", "pytest-xdist", "requests", "attrs"],
+    tests_require=["pytest>=4.4.0", "pytest-xdist", "requests", "attrs", "pydantic>=1.3"],
     data_files=[('', ['requirements.txt', 'pytest.ini', '.coveragerc', 'LICENSE', 'README.md', 'CHANGELOG.md'])]
 )

test/test_cli/test_script.py

@@ -98,7 +98,10 @@ def _validate_result(proc: subprocess.Popen, output=None, output_file: Path = No
     # Note: imp package is deprecated but I can't find a way to create dummy module using importlib
     module = imp.new_module("test_model")
     sys.modules["test_model"] = module
-    exec(compile(stdout, "test_model.py", "exec"), module.__dict__)
+    try:
+        exec(compile(stdout, "test_model.py", "exec"), module.__dict__)
+    except Exception as e:
+        assert not e, stdout
     return stdout, stderr
 
 
@@ -126,6 +129,17 @@ def test_script_attrs(command):
     print(stdout)
 
 
+@pytest.mark.parametrize("command", test_commands)
+def test_script_pydantic(command):
+    command += " -f pydantic"
+    # Pydantic has native (str) -> (builtin_type) converters
+    command = command.replace('--strings-converters', '')
+    proc = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    stdout, stderr = _validate_result(proc)
+    assert "(BaseModel):" in stdout
+    print(stdout)
+
+
 @pytest.mark.parametrize("command", test_commands)
 def test_script_dataclasses(command):
     command += " -f dataclasses"

testing_tools/real_apis/f1.py

@@ -8,8 +8,8 @@
 from json_to_models.dynamic_typing import register_datetime_classes
 from json_to_models.generator import MetadataGenerator
 from json_to_models.models.base import generate_code
-from json_to_models.models.dataclasses import DataclassModelCodeGenerator
-from json_to_models.models.structure import compose_models
+from json_to_models.models.pydantic import PydanticModelCodeGenerator
+from json_to_models.models.structure import compose_models_flat
 from json_to_models.registry import ModelRegistry
 from testing_tools.pprint_meta_data import pretty_format_meta
 from testing_tools.real_apis import dump_response
@@ -56,11 +56,11 @@ def main():
         print(pretty_format_meta(model))
         print("=" * 20, end='')
 
-    structure = compose_models(reg.models_map)
+    structure = compose_models_flat(reg.models_map)
     # print('\n', json_format([structure[0], {str(a): str(b) for a, b in structure[1].items()}]))
     # print("=" * 20)
 
-    print(generate_code(structure, DataclassModelCodeGenerator, class_generator_kwargs={"post_init_converters": True}))
+    print(generate_code(structure, PydanticModelCodeGenerator, class_generator_kwargs={}))
 
 
 if __name__ == '__main__':