Fix fields sorting with unicode model ref;

Author: bogdandm

README.md

@@ -162,13 +162,17 @@ Arguments:
     * **Example**: `-l Car - cars.json -l Person fetch_results.items.persons result.json`
     * **Note**: Models names under this arguments should be unique.
 
+* `-o`, `--output` - Output file
+    * **Format**: `-o <FILE>`
+    * **Example**: `-o car_model.py`
+    
 * `-f`, `--framework` - Model framework for which python code is generated. 
     `base` (default) mean no framework so code will be generated without any decorators and additional meta-data.
     * **Format**: `-f {base,attrs,dataclasses,custom}`
     * **Example**: `-f attrs`
     * **Default**: `-f base`
 
-* `-s , --structure` - Models composition style.
+* `-s`, `--structure` - Models composition style.
     * **Format**: `-s {nested, flat}` 
     * **Example**: `-s flat`
     * **Default**: `-s nested`
@@ -177,6 +181,9 @@ Arguments:
     * **Default**: disabled
     * **Warning**: This can lead to 6-7 times slowdown on large datasets. Be sure that you really need this option.
 
+* `--disable-unicode-conversion`, `--no-unidecode` - Disable unicode conversion in field labels and class names
+    * **Default**: enabled
+    
 * `--strings-converters` - Enable generation of string types converters (i.e. `IsoDatetimeString` or `BooleanString`).
     * **Default**: disabled
 
@@ -196,7 +203,7 @@ Arguments:
     * **Format**: `--dkr RegEx [RegEx ...]`
     * **Example**: `--dkr node_\d+ \d+_\d+_\d+`
     * **Note**: `^` and `$` (string borders) tokens will be added automatically but you 
-        have escape to other special characters manually.
+        have to escape other special characters manually.
     * **Optional**
 
 * `--dict-keys-fields`, `--dkf` - List of model fields names that will be marked as dict fields

json_to_models/dynamic_typing/base.py

@@ -1,5 +1,5 @@
 from inspect import isclass
-from typing import Iterable, List, Tuple, Union
+from typing import Any, Generator, Iterable, List, Tuple, Union
 
 ImportPathList = List[Tuple[str, Union[Iterable[str], str, None]]]
 
@@ -50,6 +50,14 @@ def _to_hash_string(self) -> str:
         """
         raise NotImplementedError()
 
+    def iter_child(self) -> Generator['MetaData', Any, None]:
+        yield self
+        for child in self:
+            if isinstance(child, BaseType):
+                yield from child.iter_child()
+            else:
+                yield child
+
 
 class UnknownType(BaseType):
     __slots__ = []

json_to_models/models/base.py

@@ -143,7 +143,7 @@ def fields(self) -> Tuple[ImportPathList, List[str]]:
 
         :return: imports, list of fields as string
         """
-        required, optional = sort_fields(self.model)
+        required, optional = sort_fields(self.model, unicode_fix=not self.convert_unicode)
         imports: ImportPathList = []
         strings: List[str] = []
         for is_optional, fields in enumerate((required, optional)):

json_to_models/models/structure.py

@@ -2,7 +2,7 @@
 
 from . import Index, ModelsStructureType
 from .utils import ListEx, PositionsDict
-from ..dynamic_typing import DOptional, ModelMeta, ModelPtr
+from ..dynamic_typing import BaseType, DOptional, ModelMeta, ModelPtr
 
 
 def compose_models(models_map: Dict[str, ModelMeta]) -> ModelsStructureType:
@@ -137,18 +137,24 @@ def extract_root(model: ModelMeta) -> Set[Index]:
     return roots
 
 
-def sort_fields(model_meta: ModelMeta) -> Tuple[List[str], List[str]]:
+def sort_fields(model_meta: ModelMeta, unicode_fix=False) -> Tuple[List[str], List[str]]:
     """
     Split fields into required and optional groups
 
     :return: two list of fields names: required fields, optional fields
     """
     fields = model_meta.type
     required = []
+    required_2 = []
     optional = []
     for key, meta in fields.items():
         if isinstance(meta, DOptional):
             optional.append(key)
+        elif unicode_fix and isinstance(meta, BaseType) and any(
+                isinstance(node, ModelMeta)
+                for node in meta.iter_child()
+        ):
+            required_2.append(key)
         else:
             required.append(key)
-    return required, optional
+    return required + required_2, optional