Merge pull request #284 from regulaforensics/develop

Develop -> Stable

Author: ArtsiomTsybulko

generator-templates/lenient/model_generic.mustache

@@ -191,7 +191,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
         _items = []
         if self.{{{name}}}:
             for _item_{{{name}}} in self.{{{name}}}:
-                if _item_{{{name}}}:
+                if _item_{{{name}}} and hasattr(_item_{{{name}}}, "to_dict"):
                     _items.append(_item_{{{name}}}.to_dict())
             _dict['{{{baseName}}}'] = _items
         {{/items.isEnumOrRef}}
@@ -231,7 +231,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
         {{^isPrimitiveType}}
         {{^isEnumOrRef}}
         # override the default output from pydantic by calling `to_dict()` of {{{name}}}
-        if self.{{{name}}}:
+        if self.{{{name}}} and isinstance(self.{{{name}}}, {{{dataType}}}):
             _dict['{{{baseName}}}'] = self.{{{name}}}.to_dict()
         {{/isEnumOrRef}}
         {{/isPrimitiveType}}

regula/documentreader/webclient/gen/models/area_array.py

@@ -71,14 +71,14 @@ def to_dict(self) -> Dict[str, Any]:
         _items = []
         if self.list:
             for _item_list in self.list:
-                if _item_list:
+                if _item_list and hasattr(_item_list, "to_dict"):
                     _items.append(_item_list.to_dict())
             _dict['List'] = _items
         # override the default output from pydantic by calling `to_dict()` of each item in points (list)
         _items = []
         if self.points:
             for _item_points in self.points:
-                if _item_points:
+                if _item_points and hasattr(_item_points, "to_dict"):
                     _items.append(_item_points.to_dict())
             _dict['Points'] = _items
         return _dict

regula/documentreader/webclient/gen/models/area_container.py

@@ -71,14 +71,14 @@ def to_dict(self) -> Dict[str, Any]:
         _items = []
         if self.list:
             for _item_list in self.list:
-                if _item_list:
+                if _item_list and hasattr(_item_list, "to_dict"):
                     _items.append(_item_list.to_dict())
             _dict['List'] = _items
         # override the default output from pydantic by calling `to_dict()` of each item in points (list)
         _items = []
         if self.points:
             for _item_points in self.points:
-                if _item_points:
+                if _item_points and hasattr(_item_points, "to_dict"):
                     _items.append(_item_points.to_dict())
             _dict['Points'] = _items
         return _dict

regula/documentreader/webclient/gen/models/auth_params.py

@@ -80,7 +80,7 @@ def to_dict(self) -> Dict[str, Any]:
             exclude_none=True,
         )
         # override the default output from pydantic by calling `to_dict()` of liveness_params
-        if self.liveness_params:
+        if self.liveness_params and isinstance(self.liveness_params, LivenessParams):
             _dict['livenessParams'] = self.liveness_params.to_dict()
         return _dict
 

regula/documentreader/webclient/gen/models/authenticity_check_list.py

@@ -69,7 +69,7 @@ def to_dict(self) -> Dict[str, Any]:
         _items = []
         if self.list:
             for _item_list in self.list:
-                if _item_list:
+                if _item_list and hasattr(_item_list, "to_dict"):
                     _items.append(_item_list.to_dict())
             _dict['List'] = _items
         return _dict

regula/documentreader/webclient/gen/models/authenticity_check_list_item.py

@@ -65,7 +65,7 @@ def to_dict(self) -> Dict[str, Any]:
             exclude_none=True,
         )
         # override the default output from pydantic by calling `to_dict()` of authenticity_check_list
-        if self.authenticity_check_list:
+        if self.authenticity_check_list and isinstance(self.authenticity_check_list, AuthenticityCheckList):
             _dict['AuthenticityCheckList'] = self.authenticity_check_list.to_dict()
         return _dict
 

regula/documentreader/webclient/gen/models/authenticity_check_result.py

@@ -73,7 +73,7 @@ def to_dict(self) -> Dict[str, Any]:
         _items = []
         if self.list:
             for _item_list in self.list:
-                if _item_list:
+                if _item_list and hasattr(_item_list, "to_dict"):
                     _items.append(_item_list.to_dict())
             _dict['List'] = _items
         return _dict

regula/documentreader/webclient/gen/models/authenticity_result.py

@@ -67,7 +67,7 @@ def to_dict(self) -> Dict[str, Any]:
             exclude_none=True,
         )
         # override the default output from pydantic by calling `to_dict()` of authenticity_check_list
-        if self.authenticity_check_list:
+        if self.authenticity_check_list and isinstance(self.authenticity_check_list, AuthenticityCheckList):
             _dict['AuthenticityCheckList'] = self.authenticity_check_list.to_dict()
         return _dict
 

regula/documentreader/webclient/gen/models/barcode_position_item.py

@@ -65,7 +65,7 @@ def to_dict(self) -> Dict[str, Any]:
             exclude_none=True,
         )
         # override the default output from pydantic by calling `to_dict()` of barcode_position
-        if self.barcode_position:
+        if self.barcode_position and isinstance(self.barcode_position, DocumentPosition):
             _dict['BarcodePosition'] = self.barcode_position.to_dict()
         return _dict
 

regula/documentreader/webclient/gen/models/barcode_position_result.py

@@ -67,7 +67,7 @@ def to_dict(self) -> Dict[str, Any]:
             exclude_none=True,
         )
         # override the default output from pydantic by calling `to_dict()` of barcode_position
-        if self.barcode_position:
+        if self.barcode_position and isinstance(self.barcode_position, DocumentPosition):
             _dict['BarcodePosition'] = self.barcode_position.to_dict()
         return _dict