Merge remote-tracking branch 'origin/develop' into stable

Author: regula-bot

Pipfile

@@ -7,7 +7,7 @@ name = "pypi"
 certifi = ">=2024.07.04"
 six = ">=1.10"
 python-dateutil = ">=2.8.2"
-urllib3 = ">=1.25.3, <3.0.0"
+urllib3 = ">=2.5.0, <3.0.0"
 vistir = ">=0.4.0, <=0.6.1"
 idna = "==3.7"
 requests = ">=2.32.4"

Pipfile.lock

@@ -20,6 +20,10 @@ class with ours using typeMappings in the generator config.
 2. The generator treats the discriminator value as a string, 
 but in our case it's numbers. To solve this problem, changes 
 have been made to the model_generic.mustache template.
+3. By default, when the discriminator was unknown, the client
+threw an error. To avoid this, such models will be skipped.
+To solve this problem, changes have been made
+to the model_generic.mustache template.
 
 ## Problem solving 
 

dev.md

@@ -264,9 +264,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
             return import_module("{{packageName}}.models.{{model.classFilename}}").{{modelName}}.from_dict(obj)
         {{/mappedModels}}
 
-        raise ValueError("{{{classname}}} failed to lookup discriminator value from " +
-                            json.dumps(obj) + ". Discriminator property name: " + cls.__discriminator_property_name +
-                            ", mapping: " + json.dumps(cls.__discriminator_value_class_map))
+        return None
         {{/discriminator}}
     {{/hasChildren}}
     {{^hasChildren}}
@@ -309,7 +307,7 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
             "{{{baseName}}}": obj.get("{{{baseName}}}"){{^-last}},{{/-last}}
             {{/items.isEnumOrRef}}
             {{^items.isEnumOrRef}}
-            "{{{baseName}}}": [{{{items.dataType}}}.from_dict(_item) for _item in obj["{{{baseName}}}"]] if obj.get("{{{baseName}}}") is not None else None{{^-last}},{{/-last}}
+            "{{{baseName}}}": [{{{items.dataType}}}.from_dict(_item) for _item in obj.get("{{{baseName}}}", []) if {{{items.dataType}}}.from_dict(_item) is not None]{{^-last}},{{/-last}}
             {{/items.isEnumOrRef}}
             {{/items.isPrimitiveType}}
             {{#items.isPrimitiveType}}

generator-templates/model_generic.mustache

@@ -91,8 +91,8 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
 
         _obj = cls.model_validate({
             "Count": obj.get("Count"),
-            "List": [RectangleCoordinates.from_dict(_item) for _item in obj["List"]] if obj.get("List") is not None else None,
-            "Points": [PointArray.from_dict(_item) for _item in obj["Points"]] if obj.get("Points") is not None else None
+            "List": [RectangleCoordinates.from_dict(_item) for _item in obj.get("List", []) if RectangleCoordinates.from_dict(_item) is not None],
+            "Points": [PointArray.from_dict(_item) for _item in obj.get("Points", []) if PointArray.from_dict(_item) is not None]
         })
         return _obj
 

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

@@ -91,8 +91,8 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
 
         _obj = cls.model_validate({
             "Count": obj.get("Count"),
-            "List": [RectangleCoordinates.from_dict(_item) for _item in obj["List"]] if obj.get("List") is not None else None,
-            "Points": [PointsContainer.from_dict(_item) for _item in obj["Points"]] if obj.get("Points") is not None else None
+            "List": [RectangleCoordinates.from_dict(_item) for _item in obj.get("List", []) if RectangleCoordinates.from_dict(_item) is not None],
+            "Points": [PointsContainer.from_dict(_item) for _item in obj.get("Points", []) if PointsContainer.from_dict(_item) is not None]
         })
         return _obj
 

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

@@ -82,7 +82,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
 
         _obj = cls.model_validate({
             "Count": obj.get("Count"),
-            "List": [AuthenticityCheckResult.from_dict(_item) for _item in obj["List"]] if obj.get("List") is not None else None
+            "List": [AuthenticityCheckResult.from_dict(_item) for _item in obj.get("List", []) if AuthenticityCheckResult.from_dict(_item) is not None]
         })
         return _obj
 

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

@@ -88,7 +88,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             "Type": obj.get("Type"),
             "Result": obj.get("Result"),
             "Count": obj.get("Count"),
-            "List": [AuthenticityCheckResultItem.from_dict(_item) for _item in obj["List"]] if obj.get("List") is not None else None
+            "List": [AuthenticityCheckResultItem.from_dict(_item) for _item in obj.get("List", []) if AuthenticityCheckResultItem.from_dict(_item) is not None]
         })
         return _obj
 

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

@@ -161,8 +161,6 @@ def from_dict(cls, obj: Dict[str, Any]) -> Optional[Union[SecurityFeatureResult,
         if object_type ==  'SecurityFeatureResult':
             return import_module("regula.documentreader.webclient.gen.models.security_feature_result").SecurityFeatureResult.from_dict(obj)
 
-        raise ValueError("AuthenticityCheckResultItem failed to lookup discriminator value from " +
-                            json.dumps(obj) + ". Discriminator property name: " + cls.__discriminator_property_name +
-                            ", mapping: " + json.dumps(cls.__discriminator_value_class_map))
+        return None
 
 

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

@@ -82,7 +82,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
 
         _obj = cls.model_validate({
             "Count": obj.get("Count"),
-            "List": [ResultItem.from_dict(_item) for _item in obj["List"]] if obj.get("List") is not None else None
+            "List": [ResultItem.from_dict(_item) for _item in obj.get("List", []) if ResultItem.from_dict(_item) is not None]
         })
         return _obj