Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions dev.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 2 additions & 4 deletions generator-templates/model_generic.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -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}}
Expand Down Expand Up @@ -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}}
Expand Down
4 changes: 2 additions & 2 deletions regula/documentreader/webclient/gen/models/area_array.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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


Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:

_obj = cls.model_validate({
"nFields": obj.get("nFields"),
"pArrayFields": [PArrayField.from_dict(_item) for _item in obj["pArrayFields"]] if obj.get("pArrayFields") is not None else None
"pArrayFields": [PArrayField.from_dict(_item) for _item in obj.get("pArrayFields", []) if PArrayField.from_dict(_item) is not None]
})
return _obj

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
"wFieldType": obj.get("wFieldType"),
"FieldName": obj.get("FieldName"),
"StringsCount": obj.get("StringsCount"),
"StringsResult": [StringRecognitionResult.from_dict(_item) for _item in obj["StringsResult"]] if obj.get("StringsResult") is not None else None,
"StringsResult": [StringRecognitionResult.from_dict(_item) for _item in obj.get("StringsResult", []) if StringRecognitionResult.from_dict(_item) is not None],
"Buf_Length": obj.get("Buf_Length"),
"Buf_Text": obj.get("Buf_Text"),
"FieldMask": obj.get("FieldMask"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:

_obj = cls.model_validate({
"nFields": obj.get("nFields"),
"pArrayFields": [DocVisualExtendedField.from_dict(_item) for _item in obj["pArrayFields"]] if obj.get("pArrayFields") is not None else None
"pArrayFields": [DocVisualExtendedField.from_dict(_item) for _item in obj.get("pArrayFields", []) if DocVisualExtendedField.from_dict(_item) is not None]
})
return _obj

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:

_obj = cls.model_validate({
"RecResult": obj.get("RecResult"),
"Candidates": [OneCandidate.from_dict(_item) for _item in obj["Candidates"]] if obj.get("Candidates") is not None else None
"Candidates": [OneCandidate.from_dict(_item) for _item in obj.get("Candidates", []) if OneCandidate.from_dict(_item) is not None]
})
return _obj

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:

_obj = cls.model_validate({
"RecResult": obj.get("RecResult"),
"Candidates": [OneCandidate.from_dict(_item) for _item in obj["Candidates"]] if obj.get("Candidates") is not None else None
"Candidates": [OneCandidate.from_dict(_item) for _item in obj.get("Candidates", []) if OneCandidate.from_dict(_item) is not None]
})
return _obj

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
_obj = cls.model_validate({
"Count": obj.get("Count"),
"CountFalseDetection": obj.get("CountFalseDetection"),
"Res": [FaceItem.from_dict(_item) for _item in obj["Res"]] if obj.get("Res") is not None else None,
"Res": [FaceItem.from_dict(_item) for _item in obj.get("Res", []) if FaceItem.from_dict(_item) is not None],
"Reserved1": obj.get("Reserved1"),
"Reserved2": obj.get("Reserved2")
})
Expand Down
2 changes: 1 addition & 1 deletion regula/documentreader/webclient/gen/models/face_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
"FaceRect": RectangleCoordinates.from_dict(obj["FaceRect"]) if obj.get("FaceRect") is not None else None,
"FieldRect": RectangleCoordinates.from_dict(obj["FieldRect"]) if obj.get("FieldRect") is not None else None,
"GraphFieldNumber": obj.get("GraphFieldNumber"),
"Landmarks": [Point.from_dict(_item) for _item in obj["Landmarks"]] if obj.get("Landmarks") is not None else None,
"Landmarks": [Point.from_dict(_item) for _item in obj.get("Landmarks", []) if Point.from_dict(_item) is not None],
"LightType": obj.get("LightType"),
"Orientation": obj.get("Orientation"),
"Probability": obj.get("Probability")
Expand Down
2 changes: 1 addition & 1 deletion regula/documentreader/webclient/gen/models/fiber_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
"ExpectedCount": obj.get("ExpectedCount"),
"LightValue": obj.get("LightValue"),
"LightDisp": obj.get("LightDisp"),
"RectArray": [RectangleCoordinates.from_dict(_item) for _item in obj["RectArray"]] if obj.get("RectArray") is not None else None,
"RectArray": [RectangleCoordinates.from_dict(_item) for _item in obj.get("RectArray", []) if RectangleCoordinates.from_dict(_item) is not None],
"Width": obj.get("Width"),
"Length": obj.get("Length"),
"Area": obj.get("Area"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
"ExpectedCount": obj.get("ExpectedCount"),
"LightValue": obj.get("LightValue"),
"LightDisp": obj.get("LightDisp"),
"RectArray": [RectangleCoordinates.from_dict(_item) for _item in obj["RectArray"]] if obj.get("RectArray") is not None else None,
"RectArray": [RectangleCoordinates.from_dict(_item) for _item in obj.get("RectArray", []) if RectangleCoordinates.from_dict(_item) is not None],
"Width": obj.get("Width"),
"Length": obj.get("Length"),
"Area": obj.get("Area"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
return cls.model_validate(obj)

_obj = cls.model_validate({
"pArrayFields": [GraphicField.from_dict(_item) for _item in obj["pArrayFields"]] if obj.get("pArrayFields") is not None else None,
"pArrayFields": [GraphicField.from_dict(_item) for _item in obj.get("pArrayFields", []) if GraphicField.from_dict(_item) is not None],
"nFields": obj.get("nFields")
})
return _obj
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:

_obj = cls.model_validate({
"result": obj.get("result"),
"List": [ImageQualityCheck.from_dict(_item) for _item in obj["List"]] if obj.get("List") is not None else None,
"List": [ImageQualityCheck.from_dict(_item) for _item in obj.get("List", []) if ImageQualityCheck.from_dict(_item) is not None],
"Count": obj.get("Count")
})
return _obj
Expand Down
4 changes: 2 additions & 2 deletions regula/documentreader/webclient/gen/models/images.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,8 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
_obj = cls.model_validate({
"fieldCount": obj.get("fieldCount"),
"availableSourceCount": obj.get("availableSourceCount"),
"availableSourceList": [ImagesAvailableSource.from_dict(_item) for _item in obj["availableSourceList"]] if obj.get("availableSourceList") is not None else None,
"fieldList": [ImagesField.from_dict(_item) for _item in obj["fieldList"]] if obj.get("fieldList") is not None else None
"availableSourceList": [ImagesAvailableSource.from_dict(_item) for _item in obj.get("availableSourceList", []) if ImagesAvailableSource.from_dict(_item) is not None],
"fieldList": [ImagesField.from_dict(_item) for _item in obj.get("fieldList", []) if ImagesField.from_dict(_item) is not None]
})
return _obj

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
_obj = cls.model_validate({
"fieldName": obj.get("fieldName"),
"fieldType": obj.get("fieldType"),
"valueList": [ImagesFieldValue.from_dict(_item) for _item in obj["valueList"]] if obj.get("valueList") is not None else None,
"valueList": [ImagesFieldValue.from_dict(_item) for _item in obj.get("valueList", []) if ImagesFieldValue.from_dict(_item) is not None],
"valueCount": obj.get("valueCount")
})
return _obj
Expand Down
2 changes: 1 addition & 1 deletion regula/documentreader/webclient/gen/models/in_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:

_obj = cls.model_validate({
"video": InDataVideo.from_dict(obj["video"]) if obj.get("video") is not None else None,
"images": [InDataTransactionImagesFieldValue.from_dict(_item) for _item in obj["images"]] if obj.get("images") is not None else None
"images": [InDataTransactionImagesFieldValue.from_dict(_item) for _item in obj.get("images", []) if InDataTransactionImagesFieldValue.from_dict(_item) is not None]
})
return _obj

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
return cls.model_validate(obj)

_obj = cls.model_validate({
"items": [GetTransactionsByTagResponse.from_dict(_item) for _item in obj["items"]] if obj.get("items") is not None else None,
"items": [GetTransactionsByTagResponse.from_dict(_item) for _item in obj.get("items", []) if GetTransactionsByTagResponse.from_dict(_item) is not None],
"metadata": obj.get("metadata")
})
return _obj
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:

_obj = cls.model_validate({
"Count": obj.get("Count"),
"pFieldMaps": [VerifiedFieldMap.from_dict(_item) for _item in obj["pFieldMaps"]] if obj.get("pFieldMaps") is not None else None,
"pFieldMaps": [VerifiedFieldMap.from_dict(_item) for _item in obj.get("pFieldMaps", []) if VerifiedFieldMap.from_dict(_item) is not None],
"pDateFormat": obj.get("pDateFormat")
})
return _obj
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
_obj = cls.model_validate({
"length": obj.get("length"),
"maxLength": obj.get("maxLength"),
"symbols": [Symbol.from_dict(_item) for _item in obj["symbols"]] if obj.get("symbols") is not None else None
"symbols": [Symbol.from_dict(_item) for _item in obj.get("symbols", []) if Symbol.from_dict(_item) is not None]
})
return _obj

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
"STAIN_MRZ": obj.get("STAIN_MRZ"),
"SYMBOLS_PARAM": obj.get("SYMBOLS_PARAM"),
"StrCount": obj.get("StrCount"),
"Strings": [StringItem.from_dict(_item) for _item in obj["Strings"]] if obj.get("Strings") is not None else None,
"Strings": [StringItem.from_dict(_item) for _item in obj.get("Strings", []) if StringItem.from_dict(_item) is not None],
"TEXTUAL_FILLING": obj.get("TEXTUAL_FILLING")
})
return _obj
Expand Down
2 changes: 1 addition & 1 deletion regula/documentreader/webclient/gen/models/out_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:

_obj = cls.model_validate({
"url": obj.get("url"),
"images": [OutDataTransactionImagesFieldValue.from_dict(_item) for _item in obj["images"]] if obj.get("images") is not None else None
"images": [OutDataTransactionImagesFieldValue.from_dict(_item) for _item in obj.get("images", []) if OutDataTransactionImagesFieldValue.from_dict(_item) is not None]
})
return _obj

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
"bcAngle_DETECT": obj.get("bcAngle_DETECT"),
"bcCodeResult": obj.get("bcCodeResult"),
"bcCountModule": obj.get("bcCountModule"),
"bcDataModule": [DataModule.from_dict(_item) for _item in obj["bcDataModule"]] if obj.get("bcDataModule") is not None else None,
"bcDataModule": [DataModule.from_dict(_item) for _item in obj.get("bcDataModule", []) if DataModule.from_dict(_item) is not None],
"bcPDF417INFO": BcPDF417INFO.from_dict(obj["bcPDF417INFO"]) if obj.get("bcPDF417INFO") is not None else None,
"bcROI_DETECT": BcROIDETECT.from_dict(obj["bcROI_DETECT"]) if obj.get("bcROI_DETECT") is not None else None,
"bcTextDecoderTypes": obj.get("bcTextDecoderTypes"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
return cls.model_validate(obj)

_obj = cls.model_validate({
"PointsList": [Point.from_dict(_item) for _item in obj["PointsList"]] if obj.get("PointsList") is not None else None
"PointsList": [Point.from_dict(_item) for _item in obj.get("PointsList", []) if Point.from_dict(_item) is not None]
})
return _obj

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:

_obj = cls.model_validate({
"PointCount": obj.get("PointCount"),
"PointsList": [Point.from_dict(_item) for _item in obj["PointsList"]] if obj.get("PointsList") is not None else None
"PointsList": [Point.from_dict(_item) for _item in obj.get("PointsList", []) if Point.from_dict(_item) is not None]
})
return _obj

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
"imageDpiOutMax": obj.get("imageDpiOutMax"),
"alreadyCropped": obj.get("alreadyCropped"),
"customParams": obj.get("customParams"),
"config": [PerDocumentConfig.from_dict(_item) for _item in obj["config"]] if obj.get("config") is not None else None,
"config": [PerDocumentConfig.from_dict(_item) for _item in obj.get("config", []) if PerDocumentConfig.from_dict(_item) is not None],
"log": obj.get("log"),
"logLevel": obj.get("logLevel"),
"forceDocID": obj.get("forceDocID"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:

_obj = cls.model_validate({
"processParam": ProcessParams.from_dict(obj["processParam"]) if obj.get("processParam") is not None else None,
"List": [ProcessRequestImage.from_dict(_item) for _item in obj["List"]] if obj.get("List") is not None else None,
"List": [ProcessRequestImage.from_dict(_item) for _item in obj.get("List", []) if ProcessRequestImage.from_dict(_item) is not None],
"tag": obj.get("tag"),
"tenant": obj.get("tenant"),
"env": obj.get("env"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:

_obj = cls.model_validate({
"Count": obj.get("Count"),
"Images": [ImageData.from_dict(_item) for _item in obj["Images"]] if obj.get("Images") is not None else None
"Images": [ImageData.from_dict(_item) for _item in obj.get("Images", []) if ImageData.from_dict(_item) is not None]
})
return _obj

Expand Down
Loading