From d46dc518b24324b459b52aa08d9f7dbe04c6e529 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 11 Sep 2025 06:38:24 +0000 Subject: [PATCH] Commit: c19a94c4 --- .openapi-generator/FILES | 3 +- .../documentreader/webclient/gen/__init__.py | 3 +- .../webclient/gen/models/__init__.py | 3 +- .../gen/models/barcode_position_item.py | 83 +++++++++++++++++ .../gen/models/barcode_position_result.py | 90 +++++++++++++++++++ .../gen/models/container_list_list_inner.py | 54 ++++++----- .../webclient/gen/models/result_item.py | 12 +-- .../gen/models/rfid_application_type.py | 3 +- .../webclient/gen/models/rfid_dg1.py | 3 +- 9 files changed, 221 insertions(+), 33 deletions(-) create mode 100644 regula/documentreader/webclient/gen/models/barcode_position_item.py create mode 100644 regula/documentreader/webclient/gen/models/barcode_position_result.py diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index 16fa86d..0ce93f5 100755 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -21,6 +21,8 @@ regula/documentreader/webclient/gen/models/authenticity_check_result_list_inner. regula/documentreader/webclient/gen/models/authenticity_result.py regula/documentreader/webclient/gen/models/authenticity_result_type.py regula/documentreader/webclient/gen/models/bar_code_module_type.py +regula/documentreader/webclient/gen/models/barcode_position_item.py +regula/documentreader/webclient/gen/models/barcode_position_result.py regula/documentreader/webclient/gen/models/barcode_type.py regula/documentreader/webclient/gen/models/bc_pdf417_info.py regula/documentreader/webclient/gen/models/bc_roidetect.py @@ -173,7 +175,6 @@ regula/documentreader/webclient/gen/models/rfid_certificate_origin.py regula/documentreader/webclient/gen/models/rfid_certificate_type.py regula/documentreader/webclient/gen/models/rfid_data_file.py regula/documentreader/webclient/gen/models/rfid_data_file_type.py -regula/documentreader/webclient/gen/models/rfid_data_group_type_tag.py regula/documentreader/webclient/gen/models/rfid_dg1.py regula/documentreader/webclient/gen/models/rfid_distinguished_name.py regula/documentreader/webclient/gen/models/rfid_doc_visual_extended_field.py diff --git a/regula/documentreader/webclient/gen/__init__.py b/regula/documentreader/webclient/gen/__init__.py index 801fb65..7264513 100644 --- a/regula/documentreader/webclient/gen/__init__.py +++ b/regula/documentreader/webclient/gen/__init__.py @@ -36,6 +36,8 @@ from regula.documentreader.webclient.gen.models.authenticity_result import AuthenticityResult from regula.documentreader.webclient.gen.models.authenticity_result_type import AuthenticityResultType from regula.documentreader.webclient.gen.models.bar_code_module_type import BarCodeModuleType +from regula.documentreader.webclient.gen.models.barcode_position_item import BarcodePositionItem +from regula.documentreader.webclient.gen.models.barcode_position_result import BarcodePositionResult from regula.documentreader.webclient.gen.models.barcode_type import BarcodeType from regula.documentreader.webclient.gen.models.bc_pdf417_info import BcPDF417INFO from regula.documentreader.webclient.gen.models.bc_roidetect import BcROIDETECT @@ -197,7 +199,6 @@ from regula.documentreader.webclient.gen.models.rfid_dg1 import RfidDG1 from regula.documentreader.webclient.gen.models.rfid_data_file import RfidDataFile from regula.documentreader.webclient.gen.models.rfid_data_file_type import RfidDataFileType -from regula.documentreader.webclient.gen.models.rfid_data_group_type_tag import RfidDataGroupTypeTag from regula.documentreader.webclient.gen.models.rfid_distinguished_name import RfidDistinguishedName from regula.documentreader.webclient.gen.models.rfid_location import RfidLocation from regula.documentreader.webclient.gen.models.rfid_origin import RfidOrigin diff --git a/regula/documentreader/webclient/gen/models/__init__.py b/regula/documentreader/webclient/gen/models/__init__.py index e22cefc..1b4434d 100644 --- a/regula/documentreader/webclient/gen/models/__init__.py +++ b/regula/documentreader/webclient/gen/models/__init__.py @@ -17,6 +17,8 @@ from regula.documentreader.webclient.gen.models.authenticity_result import AuthenticityResult from regula.documentreader.webclient.gen.models.authenticity_result_type import AuthenticityResultType from regula.documentreader.webclient.gen.models.bar_code_module_type import BarCodeModuleType +from regula.documentreader.webclient.gen.models.barcode_position_item import BarcodePositionItem +from regula.documentreader.webclient.gen.models.barcode_position_result import BarcodePositionResult from regula.documentreader.webclient.gen.models.barcode_type import BarcodeType from regula.documentreader.webclient.gen.models.bc_pdf417_info import BcPDF417INFO from regula.documentreader.webclient.gen.models.bc_roidetect import BcROIDETECT @@ -178,7 +180,6 @@ from regula.documentreader.webclient.gen.models.rfid_dg1 import RfidDG1 from regula.documentreader.webclient.gen.models.rfid_data_file import RfidDataFile from regula.documentreader.webclient.gen.models.rfid_data_file_type import RfidDataFileType -from regula.documentreader.webclient.gen.models.rfid_data_group_type_tag import RfidDataGroupTypeTag from regula.documentreader.webclient.gen.models.rfid_distinguished_name import RfidDistinguishedName from regula.documentreader.webclient.gen.models.rfid_location import RfidLocation from regula.documentreader.webclient.gen.models.rfid_origin import RfidOrigin diff --git a/regula/documentreader/webclient/gen/models/barcode_position_item.py b/regula/documentreader/webclient/gen/models/barcode_position_item.py new file mode 100644 index 0000000..fe6dcb5 --- /dev/null +++ b/regula/documentreader/webclient/gen/models/barcode_position_item.py @@ -0,0 +1,83 @@ +# 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 +from typing import Any, ClassVar, Dict, List +from regula.documentreader.webclient.gen.models.document_position import DocumentPosition +from typing import Optional, Set +from typing_extensions import Self + +class BarcodePositionItem(BaseModel): + """ + BarcodePositionItem + """ # noqa: E501 + barcode_position: DocumentPosition = Field(alias="BarcodePosition") + __properties: ClassVar[List[str]] = ["BarcodePosition"] + + 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 BarcodePositionItem 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 barcode_position + if self.barcode_position: + _dict['BarcodePosition'] = self.barcode_position.to_dict() + return _dict + + @classmethod + def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: + """Create an instance of BarcodePositionItem from a dict""" + if obj is None: + return None + + if not isinstance(obj, dict): + return cls.model_validate(obj) + + _obj = cls.model_validate({ + "BarcodePosition": DocumentPosition.from_dict(obj["BarcodePosition"]) if obj.get("BarcodePosition") is not None else None + }) + return _obj + + diff --git a/regula/documentreader/webclient/gen/models/barcode_position_result.py b/regula/documentreader/webclient/gen/models/barcode_position_result.py new file mode 100644 index 0000000..b291804 --- /dev/null +++ b/regula/documentreader/webclient/gen/models/barcode_position_result.py @@ -0,0 +1,90 @@ +# coding: utf-8 + +""" + Generated by: https://openapi-generator.tech +""" + +from __future__ import annotations +import pprint +import re # noqa: F401 +import json + +from pydantic import ConfigDict, Field +from typing import Any, ClassVar, Dict, List +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 +from typing_extensions import Self + +class BarcodePositionResult(ResultItem): + """ + Contains information about barcode position on the input image, its center, angle, etc + """ # noqa: E501 + barcode_position: DocumentPosition = Field(alias="BarcodePosition") + __properties: ClassVar[List[str]] = ["buf_length", "light", "list_idx", "page_idx", "result_type", "BarcodePosition"] + + 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 BarcodePositionResult 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 barcode_position + if self.barcode_position: + _dict['BarcodePosition'] = self.barcode_position.to_dict() + return _dict + + @classmethod + def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: + """Create an instance of BarcodePositionResult from a dict""" + if obj is None: + return None + + if not isinstance(obj, dict): + return cls.model_validate(obj) + + _obj = cls.model_validate({ + "buf_length": obj.get("buf_length"), + "light": obj.get("light"), + "list_idx": obj.get("list_idx"), + "page_idx": obj.get("page_idx"), + "result_type": obj.get("result_type"), + "BarcodePosition": DocumentPosition.from_dict(obj["BarcodePosition"]) if obj.get("BarcodePosition") is not None else None + }) + return _obj + + diff --git a/regula/documentreader/webclient/gen/models/container_list_list_inner.py b/regula/documentreader/webclient/gen/models/container_list_list_inner.py index 878c3d8..7a77fc8 100644 --- a/regula/documentreader/webclient/gen/models/container_list_list_inner.py +++ b/regula/documentreader/webclient/gen/models/container_list_list_inner.py @@ -10,6 +10,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator from typing import Any, List, Optional from regula.documentreader.webclient.gen.models.authenticity_result import AuthenticityResult +from regula.documentreader.webclient.gen.models.barcode_position_result import BarcodePositionResult from regula.documentreader.webclient.gen.models.byte_array_result import ByteArrayResult from regula.documentreader.webclient.gen.models.chosen_document_type_result import ChosenDocumentTypeResult from regula.documentreader.webclient.gen.models.doc_bar_code_info import DocBarCodeInfo @@ -36,7 +37,7 @@ from typing import Union, List, Set, Optional, Dict from typing_extensions import Literal, Self -CONTAINERLISTLISTINNER_ONE_OF_SCHEMAS = ["AuthenticityResult", "ByteArrayResult", "ChosenDocumentTypeResult", "DocBarCodeInfo", "DocumentBinaryInfoResult", "DocumentImageResult", "DocumentPositionResult", "DocumentTypesCandidatesResult", "EncryptedRCLResult", "FaceDetectionResult", "GraphicsResult", "ImageQualityResult", "ImagesResult", "LexicalAnalysisResult", "LicenseResult", "MRZDetectorResult", "MRZPositionResult", "MRZTestQualityResult", "RFIDGraphicsInfoResult", "RFIDTextDataResult", "StatusResult", "TextDataResult", "TextResult"] +CONTAINERLISTLISTINNER_ONE_OF_SCHEMAS = ["AuthenticityResult", "BarcodePositionResult", "ByteArrayResult", "ChosenDocumentTypeResult", "DocBarCodeInfo", "DocumentBinaryInfoResult", "DocumentImageResult", "DocumentPositionResult", "DocumentTypesCandidatesResult", "EncryptedRCLResult", "FaceDetectionResult", "GraphicsResult", "ImageQualityResult", "ImagesResult", "LexicalAnalysisResult", "LicenseResult", "MRZDetectorResult", "MRZPositionResult", "MRZTestQualityResult", "RFIDGraphicsInfoResult", "RFIDTextDataResult", "StatusResult", "TextDataResult", "TextResult"] class ContainerListListInner(BaseModel): """ @@ -64,32 +65,34 @@ class ContainerListListInner(BaseModel): oneof_schema_10_validator: Optional[AuthenticityResult] = None # data type: ImageQualityResult oneof_schema_11_validator: Optional[ImageQualityResult] = None + # data type: BarcodePositionResult + oneof_schema_12_validator: Optional[BarcodePositionResult] = None # data type: DocumentPositionResult - oneof_schema_12_validator: Optional[DocumentPositionResult] = None + oneof_schema_13_validator: Optional[DocumentPositionResult] = None # data type: DocBarCodeInfo - oneof_schema_13_validator: Optional[DocBarCodeInfo] = None + oneof_schema_14_validator: Optional[DocBarCodeInfo] = None # data type: LicenseResult - oneof_schema_14_validator: Optional[LicenseResult] = None + oneof_schema_15_validator: Optional[LicenseResult] = None # data type: EncryptedRCLResult - oneof_schema_15_validator: Optional[EncryptedRCLResult] = None + oneof_schema_16_validator: Optional[EncryptedRCLResult] = None # data type: DocumentBinaryInfoResult - oneof_schema_16_validator: Optional[DocumentBinaryInfoResult] = None + oneof_schema_17_validator: Optional[DocumentBinaryInfoResult] = None # data type: ByteArrayResult - oneof_schema_17_validator: Optional[ByteArrayResult] = None + oneof_schema_18_validator: Optional[ByteArrayResult] = None # data type: FaceDetectionResult - oneof_schema_18_validator: Optional[FaceDetectionResult] = None + oneof_schema_19_validator: Optional[FaceDetectionResult] = None # data type: MRZDetectorResult - oneof_schema_19_validator: Optional[MRZDetectorResult] = None + oneof_schema_20_validator: Optional[MRZDetectorResult] = None # data type: MRZPositionResult - oneof_schema_20_validator: Optional[MRZPositionResult] = None + oneof_schema_21_validator: Optional[MRZPositionResult] = None # data type: MRZTestQualityResult - oneof_schema_21_validator: Optional[MRZTestQualityResult] = None + oneof_schema_22_validator: Optional[MRZTestQualityResult] = None # data type: RFIDGraphicsInfoResult - oneof_schema_22_validator: Optional[RFIDGraphicsInfoResult] = None + oneof_schema_23_validator: Optional[RFIDGraphicsInfoResult] = None # data type: RFIDTextDataResult - oneof_schema_23_validator: Optional[RFIDTextDataResult] = None - actual_instance: Optional[Union[AuthenticityResult, ByteArrayResult, ChosenDocumentTypeResult, DocBarCodeInfo, DocumentBinaryInfoResult, DocumentImageResult, DocumentPositionResult, DocumentTypesCandidatesResult, EncryptedRCLResult, FaceDetectionResult, GraphicsResult, ImageQualityResult, ImagesResult, LexicalAnalysisResult, LicenseResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult]] = None - one_of_schemas: Set[str] = { "AuthenticityResult", "ByteArrayResult", "ChosenDocumentTypeResult", "DocBarCodeInfo", "DocumentBinaryInfoResult", "DocumentImageResult", "DocumentPositionResult", "DocumentTypesCandidatesResult", "EncryptedRCLResult", "FaceDetectionResult", "GraphicsResult", "ImageQualityResult", "ImagesResult", "LexicalAnalysisResult", "LicenseResult", "MRZDetectorResult", "MRZPositionResult", "MRZTestQualityResult", "RFIDGraphicsInfoResult", "RFIDTextDataResult", "StatusResult", "TextDataResult", "TextResult" } + oneof_schema_24_validator: Optional[RFIDTextDataResult] = None + actual_instance: Optional[Union[AuthenticityResult, BarcodePositionResult, ByteArrayResult, ChosenDocumentTypeResult, DocBarCodeInfo, DocumentBinaryInfoResult, DocumentImageResult, DocumentPositionResult, DocumentTypesCandidatesResult, EncryptedRCLResult, FaceDetectionResult, GraphicsResult, ImageQualityResult, ImagesResult, LexicalAnalysisResult, LicenseResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult]] = None + one_of_schemas: Set[str] = { "AuthenticityResult", "BarcodePositionResult", "ByteArrayResult", "ChosenDocumentTypeResult", "DocBarCodeInfo", "DocumentBinaryInfoResult", "DocumentImageResult", "DocumentPositionResult", "DocumentTypesCandidatesResult", "EncryptedRCLResult", "FaceDetectionResult", "GraphicsResult", "ImageQualityResult", "ImagesResult", "LexicalAnalysisResult", "LicenseResult", "MRZDetectorResult", "MRZPositionResult", "MRZTestQualityResult", "RFIDGraphicsInfoResult", "RFIDTextDataResult", "StatusResult", "TextDataResult", "TextResult" } model_config = ConfigDict( validate_assignment=True, @@ -170,6 +173,11 @@ def actual_instance_must_validate_oneof(cls, v): error_messages.append(f"Error! Input type `{type(v)}` is not `ImageQualityResult`") else: match += 1 + # validate data type: BarcodePositionResult + if not isinstance(v, BarcodePositionResult): + error_messages.append(f"Error! Input type `{type(v)}` is not `BarcodePositionResult`") + else: + match += 1 # validate data type: DocumentPositionResult if not isinstance(v, DocumentPositionResult): error_messages.append(f"Error! Input type `{type(v)}` is not `DocumentPositionResult`") @@ -232,10 +240,10 @@ def actual_instance_must_validate_oneof(cls, v): match += 1 if match > 1: # more than 1 match - raise ValueError("Multiple matches found when setting `actual_instance` in ContainerListListInner with oneOf schemas: AuthenticityResult, ByteArrayResult, ChosenDocumentTypeResult, DocBarCodeInfo, DocumentBinaryInfoResult, DocumentImageResult, DocumentPositionResult, DocumentTypesCandidatesResult, EncryptedRCLResult, FaceDetectionResult, GraphicsResult, ImageQualityResult, ImagesResult, LexicalAnalysisResult, LicenseResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult. Details: " + ", ".join(error_messages)) + raise ValueError("Multiple matches found when setting `actual_instance` in ContainerListListInner with oneOf schemas: AuthenticityResult, BarcodePositionResult, ByteArrayResult, ChosenDocumentTypeResult, DocBarCodeInfo, DocumentBinaryInfoResult, DocumentImageResult, DocumentPositionResult, DocumentTypesCandidatesResult, EncryptedRCLResult, FaceDetectionResult, GraphicsResult, ImageQualityResult, ImagesResult, LexicalAnalysisResult, LicenseResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult. Details: " + ", ".join(error_messages)) elif match == 0: # no match - raise ValueError("No match found when setting `actual_instance` in ContainerListListInner with oneOf schemas: AuthenticityResult, ByteArrayResult, ChosenDocumentTypeResult, DocBarCodeInfo, DocumentBinaryInfoResult, DocumentImageResult, DocumentPositionResult, DocumentTypesCandidatesResult, EncryptedRCLResult, FaceDetectionResult, GraphicsResult, ImageQualityResult, ImagesResult, LexicalAnalysisResult, LicenseResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult. Details: " + ", ".join(error_messages)) + raise ValueError("No match found when setting `actual_instance` in ContainerListListInner with oneOf schemas: AuthenticityResult, BarcodePositionResult, ByteArrayResult, ChosenDocumentTypeResult, DocBarCodeInfo, DocumentBinaryInfoResult, DocumentImageResult, DocumentPositionResult, DocumentTypesCandidatesResult, EncryptedRCLResult, FaceDetectionResult, GraphicsResult, ImageQualityResult, ImagesResult, LexicalAnalysisResult, LicenseResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult. Details: " + ", ".join(error_messages)) else: return v @@ -316,6 +324,12 @@ def from_json(cls, json_str: str) -> Self: match += 1 except (ValidationError, ValueError) as e: error_messages.append(str(e)) + # deserialize data into BarcodePositionResult + try: + instance.actual_instance = BarcodePositionResult.from_json(json_str) + match += 1 + except (ValidationError, ValueError) as e: + error_messages.append(str(e)) # deserialize data into DocumentPositionResult try: instance.actual_instance = DocumentPositionResult.from_json(json_str) @@ -391,10 +405,10 @@ def from_json(cls, json_str: str) -> Self: if match > 1: # more than 1 match - raise ValueError("Multiple matches found when deserializing the JSON string into ContainerListListInner with oneOf schemas: AuthenticityResult, ByteArrayResult, ChosenDocumentTypeResult, DocBarCodeInfo, DocumentBinaryInfoResult, DocumentImageResult, DocumentPositionResult, DocumentTypesCandidatesResult, EncryptedRCLResult, FaceDetectionResult, GraphicsResult, ImageQualityResult, ImagesResult, LexicalAnalysisResult, LicenseResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult. Details: " + ", ".join(error_messages)) + raise ValueError("Multiple matches found when deserializing the JSON string into ContainerListListInner with oneOf schemas: AuthenticityResult, BarcodePositionResult, ByteArrayResult, ChosenDocumentTypeResult, DocBarCodeInfo, DocumentBinaryInfoResult, DocumentImageResult, DocumentPositionResult, DocumentTypesCandidatesResult, EncryptedRCLResult, FaceDetectionResult, GraphicsResult, ImageQualityResult, ImagesResult, LexicalAnalysisResult, LicenseResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult. Details: " + ", ".join(error_messages)) elif match == 0: # no match - raise ValueError("No match found when deserializing the JSON string into ContainerListListInner with oneOf schemas: AuthenticityResult, ByteArrayResult, ChosenDocumentTypeResult, DocBarCodeInfo, DocumentBinaryInfoResult, DocumentImageResult, DocumentPositionResult, DocumentTypesCandidatesResult, EncryptedRCLResult, FaceDetectionResult, GraphicsResult, ImageQualityResult, ImagesResult, LexicalAnalysisResult, LicenseResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult. Details: " + ", ".join(error_messages)) + raise ValueError("No match found when deserializing the JSON string into ContainerListListInner with oneOf schemas: AuthenticityResult, BarcodePositionResult, ByteArrayResult, ChosenDocumentTypeResult, DocBarCodeInfo, DocumentBinaryInfoResult, DocumentImageResult, DocumentPositionResult, DocumentTypesCandidatesResult, EncryptedRCLResult, FaceDetectionResult, GraphicsResult, ImageQualityResult, ImagesResult, LexicalAnalysisResult, LicenseResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult. Details: " + ", ".join(error_messages)) else: return instance @@ -408,7 +422,7 @@ def to_json(self) -> str: else: return json.dumps(self.actual_instance) - def to_dict(self) -> Optional[Union[Dict[str, Any], AuthenticityResult, ByteArrayResult, ChosenDocumentTypeResult, DocBarCodeInfo, DocumentBinaryInfoResult, DocumentImageResult, DocumentPositionResult, DocumentTypesCandidatesResult, EncryptedRCLResult, FaceDetectionResult, GraphicsResult, ImageQualityResult, ImagesResult, LexicalAnalysisResult, LicenseResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult]]: + def to_dict(self) -> Optional[Union[Dict[str, Any], AuthenticityResult, BarcodePositionResult, ByteArrayResult, ChosenDocumentTypeResult, DocBarCodeInfo, DocumentBinaryInfoResult, DocumentImageResult, DocumentPositionResult, DocumentTypesCandidatesResult, EncryptedRCLResult, FaceDetectionResult, GraphicsResult, ImageQualityResult, ImagesResult, LexicalAnalysisResult, LicenseResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult]]: """Returns the dict representation of the actual instance""" if self.actual_instance is None: return None diff --git a/regula/documentreader/webclient/gen/models/result_item.py b/regula/documentreader/webclient/gen/models/result_item.py index d8ad2a7..ac1db4b 100644 --- a/regula/documentreader/webclient/gen/models/result_item.py +++ b/regula/documentreader/webclient/gen/models/result_item.py @@ -47,7 +47,7 @@ from regula.documentreader.webclient.gen.models.license_result import LicenseResult from regula.documentreader.webclient.gen.models.graphics_result import GraphicsResult from regula.documentreader.webclient.gen.models.mrz_position_result import MRZPositionResult - from regula.documentreader.webclient.gen.models.document_position_result import DocumentPositionResult + from regula.documentreader.webclient.gen.models.barcode_position_result import BarcodePositionResult from regula.documentreader.webclient.gen.models.mrz_test_quality_result import MRZTestQualityResult from regula.documentreader.webclient.gen.models.document_types_candidates_result import DocumentTypesCandidatesResult from regula.documentreader.webclient.gen.models.document_position_result import DocumentPositionResult @@ -78,7 +78,7 @@ class ResultItem(BaseModel): # discriminator mappings __discriminator_value_class_map: ClassVar[Dict[str, str]] = { - '1': 'DocumentImageResult','101': 'DocumentBinaryInfoResult','102': 'RFIDTextDataResult','103': 'GraphicsResult','104': 'DocumentBinaryInfoResult','105': 'RFIDGraphicsInfoResult','109': 'ByteArrayResult','15': 'LexicalAnalysisResult','16': 'DocumentImageResult','17': 'TextDataResult','18': 'TextDataResult','19': 'GraphicsResult','20': 'AuthenticityResult','26': 'TextDataResult','3': 'TextDataResult','30': 'ImageQualityResult','32': 'GraphicsResult','33': 'StatusResult','34': 'AuthenticityResult','35': 'GraphicsResult','36': 'TextResult','37': 'ImagesResult','38': 'GraphicsResult','39': 'AuthenticityResult','49': 'EncryptedRCLResult','5': 'DocBarCodeInfo','50': 'LicenseResult','6': 'GraphicsResult','61': 'MRZPositionResult','62': 'DocumentPositionResult','7': 'MRZTestQualityResult','8': 'DocumentTypesCandidatesResult','85': 'DocumentPositionResult','87': 'MRZDetectorResult','9': 'ChosenDocumentTypeResult','97': 'FaceDetectionResult' + '1': 'DocumentImageResult','101': 'DocumentBinaryInfoResult','102': 'RFIDTextDataResult','103': 'GraphicsResult','104': 'DocumentBinaryInfoResult','105': 'RFIDGraphicsInfoResult','109': 'ByteArrayResult','15': 'LexicalAnalysisResult','16': 'DocumentImageResult','17': 'TextDataResult','18': 'TextDataResult','19': 'GraphicsResult','20': 'AuthenticityResult','26': 'TextDataResult','3': 'TextDataResult','30': 'ImageQualityResult','32': 'GraphicsResult','33': 'StatusResult','34': 'AuthenticityResult','35': 'GraphicsResult','36': 'TextResult','37': 'ImagesResult','38': 'GraphicsResult','39': 'AuthenticityResult','49': 'EncryptedRCLResult','5': 'DocBarCodeInfo','50': 'LicenseResult','6': 'GraphicsResult','61': 'MRZPositionResult','62': 'BarcodePositionResult','7': 'MRZTestQualityResult','8': 'DocumentTypesCandidatesResult','85': 'DocumentPositionResult','87': 'MRZDetectorResult','9': 'ChosenDocumentTypeResult','97': 'FaceDetectionResult' } @classmethod @@ -100,7 +100,7 @@ def to_json(self) -> str: return json.dumps(self.to_dict()) @classmethod - def from_json(cls, json_str: str) -> Optional[Union[DocumentImageResult, DocumentBinaryInfoResult, RFIDTextDataResult, GraphicsResult, DocumentBinaryInfoResult, RFIDGraphicsInfoResult, ByteArrayResult, LexicalAnalysisResult, DocumentImageResult, TextDataResult, TextDataResult, GraphicsResult, AuthenticityResult, TextDataResult, TextDataResult, ImageQualityResult, GraphicsResult, StatusResult, AuthenticityResult, GraphicsResult, TextResult, ImagesResult, GraphicsResult, AuthenticityResult, EncryptedRCLResult, DocBarCodeInfo, LicenseResult, GraphicsResult, MRZPositionResult, DocumentPositionResult, MRZTestQualityResult, DocumentTypesCandidatesResult, DocumentPositionResult, MRZDetectorResult, ChosenDocumentTypeResult, FaceDetectionResult]]: + def from_json(cls, json_str: str) -> Optional[Union[DocumentImageResult, DocumentBinaryInfoResult, RFIDTextDataResult, GraphicsResult, DocumentBinaryInfoResult, RFIDGraphicsInfoResult, ByteArrayResult, LexicalAnalysisResult, DocumentImageResult, TextDataResult, TextDataResult, GraphicsResult, AuthenticityResult, TextDataResult, TextDataResult, ImageQualityResult, GraphicsResult, StatusResult, AuthenticityResult, GraphicsResult, TextResult, ImagesResult, GraphicsResult, AuthenticityResult, EncryptedRCLResult, DocBarCodeInfo, LicenseResult, GraphicsResult, MRZPositionResult, BarcodePositionResult, MRZTestQualityResult, DocumentTypesCandidatesResult, DocumentPositionResult, MRZDetectorResult, ChosenDocumentTypeResult, FaceDetectionResult]]: """Create an instance of ResultItem from a JSON string""" return cls.from_dict(json.loads(json_str)) @@ -125,7 +125,7 @@ def to_dict(self) -> Dict[str, Any]: return _dict @classmethod - def from_dict(cls, obj: Dict[str, Any]) -> Optional[Union[DocumentImageResult, DocumentBinaryInfoResult, RFIDTextDataResult, GraphicsResult, DocumentBinaryInfoResult, RFIDGraphicsInfoResult, ByteArrayResult, LexicalAnalysisResult, DocumentImageResult, TextDataResult, TextDataResult, GraphicsResult, AuthenticityResult, TextDataResult, TextDataResult, ImageQualityResult, GraphicsResult, StatusResult, AuthenticityResult, GraphicsResult, TextResult, ImagesResult, GraphicsResult, AuthenticityResult, EncryptedRCLResult, DocBarCodeInfo, LicenseResult, GraphicsResult, MRZPositionResult, DocumentPositionResult, MRZTestQualityResult, DocumentTypesCandidatesResult, DocumentPositionResult, MRZDetectorResult, ChosenDocumentTypeResult, FaceDetectionResult]]: + def from_dict(cls, obj: Dict[str, Any]) -> Optional[Union[DocumentImageResult, DocumentBinaryInfoResult, RFIDTextDataResult, GraphicsResult, DocumentBinaryInfoResult, RFIDGraphicsInfoResult, ByteArrayResult, LexicalAnalysisResult, DocumentImageResult, TextDataResult, TextDataResult, GraphicsResult, AuthenticityResult, TextDataResult, TextDataResult, ImageQualityResult, GraphicsResult, StatusResult, AuthenticityResult, GraphicsResult, TextResult, ImagesResult, GraphicsResult, AuthenticityResult, EncryptedRCLResult, DocBarCodeInfo, LicenseResult, GraphicsResult, MRZPositionResult, BarcodePositionResult, MRZTestQualityResult, DocumentTypesCandidatesResult, DocumentPositionResult, MRZDetectorResult, ChosenDocumentTypeResult, FaceDetectionResult]]: """Create an instance of ResultItem from a dict""" # look up the object type based on discriminator mapping object_type = cls.get_discriminator_value(obj) @@ -187,8 +187,8 @@ def from_dict(cls, obj: Dict[str, Any]) -> Optional[Union[DocumentImageResult, D return import_module("regula.documentreader.webclient.gen.models.graphics_result").GraphicsResult.from_dict(obj) if object_type == 'MRZPositionResult': return import_module("regula.documentreader.webclient.gen.models.mrz_position_result").MRZPositionResult.from_dict(obj) - if object_type == 'DocumentPositionResult': - return import_module("regula.documentreader.webclient.gen.models.document_position_result").DocumentPositionResult.from_dict(obj) + if object_type == 'BarcodePositionResult': + return import_module("regula.documentreader.webclient.gen.models.barcode_position_result").BarcodePositionResult.from_dict(obj) if object_type == 'MRZTestQualityResult': return import_module("regula.documentreader.webclient.gen.models.mrz_test_quality_result").MRZTestQualityResult.from_dict(obj) if object_type == 'DocumentTypesCandidatesResult': diff --git a/regula/documentreader/webclient/gen/models/rfid_application_type.py b/regula/documentreader/webclient/gen/models/rfid_application_type.py index aa563c3..70e9fb6 100644 --- a/regula/documentreader/webclient/gen/models/rfid_application_type.py +++ b/regula/documentreader/webclient/gen/models/rfid_application_type.py @@ -18,7 +18,7 @@ class RfidApplicationType(int, Enum): """ allowed enum values """ - UNSPECIFIED = 0 + ROOT_FILES = 0 E_PASSPORT = 1 E_ID = 2 E_SIGN = 3 @@ -27,7 +27,6 @@ class RfidApplicationType(int, Enum): LDS2_VisaRecords = 6 LDS2_AddBiometrics = 7 eDTC_PC = 8 - ROOT_FILES = 0 @classmethod def from_json(cls, json_str: str) -> Self: diff --git a/regula/documentreader/webclient/gen/models/rfid_dg1.py b/regula/documentreader/webclient/gen/models/rfid_dg1.py index 0127773..d4f7ba9 100644 --- a/regula/documentreader/webclient/gen/models/rfid_dg1.py +++ b/regula/documentreader/webclient/gen/models/rfid_dg1.py @@ -12,7 +12,6 @@ from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr from typing import Any, ClassVar, Dict, List, Union from regula.documentreader.webclient.gen.models.document_format import DocumentFormat -from regula.documentreader.webclient.gen.models.rfid_data_group_type_tag import RfidDataGroupTypeTag from typing import Optional, Set from typing_extensions import Self @@ -20,7 +19,7 @@ class RfidDG1(BaseModel): """ Structure used to store the contents of EF.DG1 informational data group of ePassport application – document MRZ data """ # noqa: E501 - type: RfidDataGroupTypeTag = Field(alias="Type") + type: StrictInt = Field(alias="Type") document_id: DocumentFormat = Field(alias="DocumentID") document_type: StrictStr = Field(description="Symbolic code of document type", alias="DocumentType") state: StrictStr = Field(description="Symbolic code of document issuing state", alias="State")