diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index 0586f22..16fa86d 100755 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -120,7 +120,6 @@ regula/documentreader/webclient/gen/models/measure_system.py regula/documentreader/webclient/gen/models/mrz_detect_mode_enum.py regula/documentreader/webclient/gen/models/mrz_detector_result.py regula/documentreader/webclient/gen/models/mrz_format.py -regula/documentreader/webclient/gen/models/mrz_position.py regula/documentreader/webclient/gen/models/mrz_position_item.py regula/documentreader/webclient/gen/models/mrz_position_result.py regula/documentreader/webclient/gen/models/mrz_rows_item.py diff --git a/regula/documentreader/webclient/gen/__init__.py b/regula/documentreader/webclient/gen/__init__.py index a72d263..801fb65 100644 --- a/regula/documentreader/webclient/gen/__init__.py +++ b/regula/documentreader/webclient/gen/__init__.py @@ -140,7 +140,6 @@ from regula.documentreader.webclient.gen.models.mrz_test_quality_result import MRZTestQualityResult from regula.documentreader.webclient.gen.models.measure_system import MeasureSystem from regula.documentreader.webclient.gen.models.mrz_detect_mode_enum import MrzDetectModeEnum -from regula.documentreader.webclient.gen.models.mrz_position import MrzPosition from regula.documentreader.webclient.gen.models.mrz_position_item import MrzPositionItem from regula.documentreader.webclient.gen.models.ocr_security_text_item import OCRSecurityTextItem from regula.documentreader.webclient.gen.models.ocr_security_text_result import OCRSecurityTextResult diff --git a/regula/documentreader/webclient/gen/models/__init__.py b/regula/documentreader/webclient/gen/models/__init__.py index 7d776e1..e22cefc 100644 --- a/regula/documentreader/webclient/gen/models/__init__.py +++ b/regula/documentreader/webclient/gen/models/__init__.py @@ -121,7 +121,6 @@ from regula.documentreader.webclient.gen.models.mrz_test_quality_result import MRZTestQualityResult from regula.documentreader.webclient.gen.models.measure_system import MeasureSystem from regula.documentreader.webclient.gen.models.mrz_detect_mode_enum import MrzDetectModeEnum -from regula.documentreader.webclient.gen.models.mrz_position import MrzPosition from regula.documentreader.webclient.gen.models.mrz_position_item import MrzPositionItem from regula.documentreader.webclient.gen.models.ocr_security_text_item import OCRSecurityTextItem from regula.documentreader.webclient.gen.models.ocr_security_text_result import OCRSecurityTextResult diff --git a/regula/documentreader/webclient/gen/models/doc_visual_extended_field.py b/regula/documentreader/webclient/gen/models/doc_visual_extended_field.py index 17033f3..b03b588 100644 --- a/regula/documentreader/webclient/gen/models/doc_visual_extended_field.py +++ b/regula/documentreader/webclient/gen/models/doc_visual_extended_field.py @@ -11,6 +11,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union +from regula.documentreader.webclient.gen.models.lcid import LCID from regula.documentreader.webclient.gen.models.rectangle_coordinates import RectangleCoordinates from regula.documentreader.webclient.gen.models.string_recognition_result import StringRecognitionResult from regula.documentreader.webclient.gen.models.text_field_type import TextFieldType @@ -30,7 +31,7 @@ class DocVisualExtendedField(BaseModel): field_mask: Optional[StrictStr] = Field(default=None, alias="FieldMask") validity: Optional[StrictInt] = Field(default=None, alias="Validity") in_comparison: Optional[StrictInt] = Field(default=None, alias="InComparison") - w_lcid: Optional[StrictInt] = Field(default=None, alias="wLCID") + w_lcid: Optional[LCID] = Field(default=None, alias="wLCID") reserved2: Optional[StrictInt] = Field(default=None, alias="Reserved2") reserved3: Optional[StrictInt] = Field(default=None, alias="Reserved3") field_rect: RectangleCoordinates = Field(alias="FieldRect") diff --git a/regula/documentreader/webclient/gen/models/mrz_position.py b/regula/documentreader/webclient/gen/models/mrz_position.py deleted file mode 100644 index adf1a25..0000000 --- a/regula/documentreader/webclient/gen/models/mrz_position.py +++ /dev/null @@ -1,124 +0,0 @@ -# coding: utf-8 - -""" - Generated by: https://openapi-generator.tech -""" - -from __future__ import annotations -import pprint -import re # noqa: F401 -import json - -from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt -from typing import Any, ClassVar, Dict, List, Optional, Union -from regula.documentreader.webclient.gen.models.document_format import DocumentFormat -from regula.documentreader.webclient.gen.models.point import Point -from typing import Optional, Set -from typing_extensions import Self - -class MrzPosition(BaseModel): - """ - MrzPosition - """ # noqa: E501 - doc_format: DocumentFormat = Field(alias="docFormat") - angle: Union[StrictFloat, StrictInt] = Field(description="Document rotation angle", alias="Angle") - width: StrictInt = Field(description="Document width", alias="Width") - height: StrictInt = Field(description="Document height", alias="Height") - center: Point = Field(alias="Center") - left_bottom: Point = Field(alias="LeftBottom") - left_top: Point = Field(alias="LeftTop") - right_bottom: Point = Field(alias="RightBottom") - right_top: Point = Field(alias="RightTop") - dpi: StrictInt = Field(alias="Dpi") - inverse: Optional[StrictInt] = Field(default=None, alias="Inverse") - obj_area: Optional[StrictInt] = Field(default=None, alias="ObjArea") - obj_int_angle_dev: Optional[StrictInt] = Field(default=None, alias="ObjIntAngleDev") - perspective_tr: Optional[StrictInt] = Field(default=None, alias="PerspectiveTr") - result_status: Optional[StrictInt] = Field(default=None, alias="ResultStatus") - __properties: ClassVar[List[str]] = ["docFormat", "Angle", "Width", "Height", "Center", "LeftBottom", "LeftTop", "RightBottom", "RightTop", "Dpi", "Inverse", "ObjArea", "ObjIntAngleDev", "PerspectiveTr", "ResultStatus"] - - model_config = ConfigDict( - populate_by_name=True, - validate_assignment=True, - protected_namespaces=(), - ) - - - def to_str(self) -> str: - """Returns the string representation of the model using alias""" - return pprint.pformat(self.model_dump(by_alias=True)) - - def to_json(self) -> str: - """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) - - @classmethod - def from_json(cls, json_str: str) -> Optional[Self]: - """Create an instance of MrzPosition from a JSON string""" - return cls.from_dict(json.loads(json_str)) - - def to_dict(self) -> Dict[str, Any]: - """Return the dictionary representation of the model using alias. - - This has the following differences from calling pydantic's - `self.model_dump(by_alias=True)`: - - * `None` is only added to the output dict for nullable fields that - were set at model initialization. Other fields with value `None` - are ignored. - """ - excluded_fields: Set[str] = set([ - ]) - - _dict = self.model_dump( - by_alias=True, - exclude=excluded_fields, - exclude_none=True, - ) - # override the default output from pydantic by calling `to_dict()` of center - if self.center: - _dict['Center'] = self.center.to_dict() - # override the default output from pydantic by calling `to_dict()` of left_bottom - if self.left_bottom: - _dict['LeftBottom'] = self.left_bottom.to_dict() - # override the default output from pydantic by calling `to_dict()` of left_top - if self.left_top: - _dict['LeftTop'] = self.left_top.to_dict() - # override the default output from pydantic by calling `to_dict()` of right_bottom - if self.right_bottom: - _dict['RightBottom'] = self.right_bottom.to_dict() - # override the default output from pydantic by calling `to_dict()` of right_top - if self.right_top: - _dict['RightTop'] = self.right_top.to_dict() - return _dict - - @classmethod - def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: - """Create an instance of MrzPosition from a dict""" - if obj is None: - return None - - if not isinstance(obj, dict): - return cls.model_validate(obj) - - _obj = cls.model_validate({ - "docFormat": obj.get("docFormat"), - "Angle": obj.get("Angle"), - "Width": obj.get("Width"), - "Height": obj.get("Height"), - "Center": Point.from_dict(obj["Center"]) if obj.get("Center") is not None else None, - "LeftBottom": Point.from_dict(obj["LeftBottom"]) if obj.get("LeftBottom") is not None else None, - "LeftTop": Point.from_dict(obj["LeftTop"]) if obj.get("LeftTop") is not None else None, - "RightBottom": Point.from_dict(obj["RightBottom"]) if obj.get("RightBottom") is not None else None, - "RightTop": Point.from_dict(obj["RightTop"]) if obj.get("RightTop") is not None else None, - "Dpi": obj.get("Dpi"), - "Inverse": obj.get("Inverse"), - "ObjArea": obj.get("ObjArea"), - "ObjIntAngleDev": obj.get("ObjIntAngleDev"), - "PerspectiveTr": obj.get("PerspectiveTr"), - "ResultStatus": obj.get("ResultStatus") - }) - return _obj - - diff --git a/regula/documentreader/webclient/gen/models/mrz_position_item.py b/regula/documentreader/webclient/gen/models/mrz_position_item.py index 66d2299..b3ff8b9 100644 --- a/regula/documentreader/webclient/gen/models/mrz_position_item.py +++ b/regula/documentreader/webclient/gen/models/mrz_position_item.py @@ -11,7 +11,7 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List -from regula.documentreader.webclient.gen.models.mrz_position import MrzPosition +from regula.documentreader.webclient.gen.models.document_position import DocumentPosition from typing import Optional, Set from typing_extensions import Self @@ -19,7 +19,7 @@ class MrzPositionItem(BaseModel): """ MrzPositionItem """ # noqa: E501 - mrz_position: MrzPosition = Field(alias="MrzPosition") + mrz_position: DocumentPosition = Field(alias="MrzPosition") __properties: ClassVar[List[str]] = ["MrzPosition"] model_config = ConfigDict( @@ -76,7 +76,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: return cls.model_validate(obj) _obj = cls.model_validate({ - "MrzPosition": MrzPosition.from_dict(obj["MrzPosition"]) if obj.get("MrzPosition") is not None else None + "MrzPosition": DocumentPosition.from_dict(obj["MrzPosition"]) if obj.get("MrzPosition") is not None else None }) return _obj diff --git a/regula/documentreader/webclient/gen/models/mrz_position_result.py b/regula/documentreader/webclient/gen/models/mrz_position_result.py index f7eebed..074a172 100644 --- a/regula/documentreader/webclient/gen/models/mrz_position_result.py +++ b/regula/documentreader/webclient/gen/models/mrz_position_result.py @@ -11,7 +11,7 @@ from pydantic import ConfigDict, Field from typing import Any, ClassVar, Dict, List -from regula.documentreader.webclient.gen.models.mrz_position import MrzPosition +from regula.documentreader.webclient.gen.models.document_position import DocumentPosition from regula.documentreader.webclient.gen.models.result import Result from regula.documentreader.webclient.gen.models.result_item import ResultItem from typing import Optional, Set @@ -21,7 +21,7 @@ class MRZPositionResult(ResultItem): """ MRZPositionResult """ # noqa: E501 - mrz_position: MrzPosition = Field(alias="MrzPosition") + mrz_position: DocumentPosition = Field(alias="MrzPosition") __properties: ClassVar[List[str]] = ["buf_length", "light", "list_idx", "page_idx", "result_type", "MrzPosition"] model_config = ConfigDict( @@ -83,7 +83,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: "list_idx": obj.get("list_idx"), "page_idx": obj.get("page_idx"), "result_type": obj.get("result_type"), - "MrzPosition": MrzPosition.from_dict(obj["MrzPosition"]) if obj.get("MrzPosition") is not None else None + "MrzPosition": DocumentPosition.from_dict(obj["MrzPosition"]) if obj.get("MrzPosition") is not None else None }) return _obj diff --git a/regula/documentreader/webclient/gen/models/mrz_test_quality.py b/regula/documentreader/webclient/gen/models/mrz_test_quality.py index b5ab351..cc75232 100644 --- a/regula/documentreader/webclient/gen/models/mrz_test_quality.py +++ b/regula/documentreader/webclient/gen/models/mrz_test_quality.py @@ -11,6 +11,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictInt from typing import Any, ClassVar, Dict, List +from regula.documentreader.webclient.gen.models.check_result import CheckResult from regula.documentreader.webclient.gen.models.string_item import StringItem from typing import Optional, Set from typing_extensions import Self @@ -19,16 +20,16 @@ class MRZTestQuality(BaseModel): """ MRZTestQuality """ # noqa: E501 - check_sums: StrictInt = Field(alias="CHECK_SUMS") - contrast_print: StrictInt = Field(alias="CONTRAST_PRINT") + check_sums: CheckResult = Field(alias="CHECK_SUMS") + contrast_print: CheckResult = Field(alias="CONTRAST_PRINT") doc_format: StrictInt = Field(alias="DOC_FORMAT") mrz_format: StrictInt = Field(alias="MRZ_FORMAT") - print_position: StrictInt = Field(alias="PRINT_POSITION") - stain_mrz: StrictInt = Field(alias="STAIN_MRZ") - symbols_param: StrictInt = Field(alias="SYMBOLS_PARAM") + print_position: CheckResult = Field(alias="PRINT_POSITION") + stain_mrz: CheckResult = Field(alias="STAIN_MRZ") + symbols_param: CheckResult = Field(alias="SYMBOLS_PARAM") str_count: StrictInt = Field(alias="StrCount") strings: List[StringItem] = Field(alias="Strings") - textual_filling: StrictInt = Field(alias="TEXTUAL_FILLING") + textual_filling: CheckResult = Field(alias="TEXTUAL_FILLING") __properties: ClassVar[List[str]] = ["CHECK_SUMS", "CONTRAST_PRINT", "DOC_FORMAT", "MRZ_FORMAT", "PRINT_POSITION", "STAIN_MRZ", "SYMBOLS_PARAM", "StrCount", "Strings", "TEXTUAL_FILLING"] model_config = ConfigDict( diff --git a/regula/documentreader/webclient/gen/models/rfid_data_file_type.py b/regula/documentreader/webclient/gen/models/rfid_data_file_type.py index f498230..28150d0 100644 --- a/regula/documentreader/webclient/gen/models/rfid_data_file_type.py +++ b/regula/documentreader/webclient/gen/models/rfid_data_file_type.py @@ -94,8 +94,8 @@ class RfidDataFileType(int, Enum): AUTHENTICITY_V2 = 302 ATR = 400 DIR = 401 - _E_SIGN_PK = 500 - _E_SIGN_SIGNED_DATA = 501 + E_SIGN_PK = 500 + E_SIGN_SIGNED_DATA = 501 CERTIFICATE = 600 MASTER_LIST = 601 DEFECT_LIST = 602 diff --git a/regula/documentreader/webclient/gen/models/rfid_doc_visual_extended_field.py b/regula/documentreader/webclient/gen/models/rfid_doc_visual_extended_field.py index 2b5832f..0de3c68 100644 --- a/regula/documentreader/webclient/gen/models/rfid_doc_visual_extended_field.py +++ b/regula/documentreader/webclient/gen/models/rfid_doc_visual_extended_field.py @@ -11,6 +11,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union +from regula.documentreader.webclient.gen.models.lcid import LCID from regula.documentreader.webclient.gen.models.string_recognition_result import StringRecognitionResult from regula.documentreader.webclient.gen.models.text_field_type import TextFieldType from typing import Optional, Set @@ -29,7 +30,7 @@ class RFIDDocVisualExtendedField(BaseModel): field_mask: Optional[StrictStr] = Field(default=None, alias="FieldMask") validity: Optional[StrictInt] = Field(default=None, alias="Validity") in_comparison: Optional[StrictInt] = Field(default=None, alias="InComparison") - w_lcid: Optional[StrictInt] = Field(default=None, alias="wLCID") + w_lcid: Optional[LCID] = Field(default=None, alias="wLCID") reserved2: Optional[StrictInt] = Field(default=None, alias="Reserved2") reserved3: Optional[StrictInt] = Field(default=None, alias="Reserved3") origin_dg: StrictInt = Field(alias="OriginDG") diff --git a/regula/documentreader/webclient/gen/models/string_item.py b/regula/documentreader/webclient/gen/models/string_item.py index 54fe5d4..d2efd97 100644 --- a/regula/documentreader/webclient/gen/models/string_item.py +++ b/regula/documentreader/webclient/gen/models/string_item.py @@ -10,7 +10,8 @@ import json from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt -from typing import Any, ClassVar, Dict, List, Union +from typing import Any, ClassVar, Dict, List, Optional, Union +from regula.documentreader.webclient.gen.models.check_result import CheckResult from regula.documentreader.webclient.gen.models.error_coordinates import ErrorCoordinates from regula.documentreader.webclient.gen.models.field_item import FieldItem from regula.documentreader.webclient.gen.models.rectangle_coordinates import RectangleCoordinates @@ -22,16 +23,16 @@ class StringItem(BaseModel): """ StringItem """ # noqa: E501 - alignment_symbols_in_string: StrictInt = Field(alias="ALIGNMENT_SYMBOLS_IN_STRING") - check_sums: StrictInt = Field(alias="CHECK_SUMS") + alignment_symbols_in_string: CheckResult = Field(alias="ALIGNMENT_SYMBOLS_IN_STRING") + check_sums: CheckResult = Field(alias="CHECK_SUMS") error_position: ErrorCoordinates = Field(alias="ErrorPOSITION") field_count: StrictInt = Field(alias="FieldCount") fields: List[FieldItem] = Field(alias="Fields") - strings_distance: StrictInt = Field(alias="STRINGS_DISTANCE") - strings_interval: StrictInt = Field(alias="STRINGS_INTERVAL") - string_filling: StrictInt = Field(alias="STRING_FILLING") - string_position: StrictInt = Field(alias="STRING_POSITION") - symbols_param: StrictInt = Field(alias="SYMBOLS_PARAM") + strings_distance: CheckResult = Field(alias="STRINGS_DISTANCE") + strings_interval: CheckResult = Field(alias="STRINGS_INTERVAL") + string_filling: CheckResult = Field(alias="STRING_FILLING") + strings_position: Optional[CheckResult] = Field(default=None, alias="STRINGS_POSITION") + symbols_param: CheckResult = Field(alias="SYMBOLS_PARAM") size_error_alignment: Union[StrictFloat, StrictInt] = Field(alias="SizeError_ALIGNMENT") size_error_distance: Union[StrictFloat, StrictInt] = Field(alias="SizeError_DISTANCE") size_error_interval: Union[StrictFloat, StrictInt] = Field(alias="SizeError_INTERVAL") @@ -39,7 +40,7 @@ class StringItem(BaseModel): string_borders: RectangleCoordinates = Field(alias="StringBorders") symbols_count: StrictInt = Field(alias="SymbolsCount") symbols_estimations: List[SymbolEstimationItem] = Field(alias="SymbolsEstimations") - __properties: ClassVar[List[str]] = ["ALIGNMENT_SYMBOLS_IN_STRING", "CHECK_SUMS", "ErrorPOSITION", "FieldCount", "Fields", "STRINGS_DISTANCE", "STRINGS_INTERVAL", "STRING_FILLING", "STRING_POSITION", "SYMBOLS_PARAM", "SizeError_ALIGNMENT", "SizeError_DISTANCE", "SizeError_INTERVAL", "StringAngle", "StringBorders", "SymbolsCount", "SymbolsEstimations"] + __properties: ClassVar[List[str]] = ["ALIGNMENT_SYMBOLS_IN_STRING", "CHECK_SUMS", "ErrorPOSITION", "FieldCount", "Fields", "STRINGS_DISTANCE", "STRINGS_INTERVAL", "STRING_FILLING", "STRINGS_POSITION", "SYMBOLS_PARAM", "SizeError_ALIGNMENT", "SizeError_DISTANCE", "SizeError_INTERVAL", "StringAngle", "StringBorders", "SymbolsCount", "SymbolsEstimations"] model_config = ConfigDict( populate_by_name=True, @@ -120,7 +121,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: "STRINGS_DISTANCE": obj.get("STRINGS_DISTANCE"), "STRINGS_INTERVAL": obj.get("STRINGS_INTERVAL"), "STRING_FILLING": obj.get("STRING_FILLING"), - "STRING_POSITION": obj.get("STRING_POSITION"), + "STRINGS_POSITION": obj.get("STRINGS_POSITION"), "SYMBOLS_PARAM": obj.get("SYMBOLS_PARAM"), "SizeError_ALIGNMENT": obj.get("SizeError_ALIGNMENT"), "SizeError_DISTANCE": obj.get("SizeError_DISTANCE"), diff --git a/regula/documentreader/webclient/gen/models/visual_extended_field_item.py b/regula/documentreader/webclient/gen/models/visual_extended_field_item.py index 784d220..58f97b8 100644 --- a/regula/documentreader/webclient/gen/models/visual_extended_field_item.py +++ b/regula/documentreader/webclient/gen/models/visual_extended_field_item.py @@ -11,6 +11,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Optional, Union +from regula.documentreader.webclient.gen.models.lcid import LCID from regula.documentreader.webclient.gen.models.string_recognition_result import StringRecognitionResult from regula.documentreader.webclient.gen.models.text_field_type import TextFieldType from typing import Optional, Set @@ -29,7 +30,7 @@ class VisualExtendedFieldItem(BaseModel): field_mask: Optional[StrictStr] = Field(default=None, alias="FieldMask") validity: Optional[StrictInt] = Field(default=None, alias="Validity") in_comparison: Optional[StrictInt] = Field(default=None, alias="InComparison") - w_lcid: Optional[StrictInt] = Field(default=None, alias="wLCID") + w_lcid: Optional[LCID] = Field(default=None, alias="wLCID") reserved2: Optional[StrictInt] = Field(default=None, alias="Reserved2") reserved3: Optional[StrictInt] = Field(default=None, alias="Reserved3") __properties: ClassVar[List[str]] = ["wFieldType", "FieldName", "StringsCount", "StringsResult", "Buf_Length", "Buf_Text", "FieldMask", "Validity", "InComparison", "wLCID", "Reserved2", "Reserved3"]