Skip to content

Commit 8f64571

Browse files
KirylKovaliovKirylKovaliov
authored
Merge pull request #222 from regulaforensics/29fe2a61
Commit: 29fe2a61
2 parents dc6bc66 + 8f69d25 commit 8f64571

11 files changed

Lines changed: 32 additions & 30 deletions

‎.openapi-generator/FILES‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ regula/documentreader/webclient/gen/models/measure_system.py
120120
regula/documentreader/webclient/gen/models/mrz_detect_mode_enum.py
121121
regula/documentreader/webclient/gen/models/mrz_detector_result.py
122122
regula/documentreader/webclient/gen/models/mrz_format.py
123-
regula/documentreader/webclient/gen/models/mrz_position.py
124123
regula/documentreader/webclient/gen/models/mrz_position_item.py
125124
regula/documentreader/webclient/gen/models/mrz_position_result.py
126125
regula/documentreader/webclient/gen/models/mrz_rows_item.py

‎regula/documentreader/webclient/gen/__init__.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@
140140
from regula.documentreader.webclient.gen.models.mrz_test_quality_result import MRZTestQualityResult
141141
from regula.documentreader.webclient.gen.models.measure_system import MeasureSystem
142142
from regula.documentreader.webclient.gen.models.mrz_detect_mode_enum import MrzDetectModeEnum
143-
from regula.documentreader.webclient.gen.models.mrz_position import MrzPosition
144143
from regula.documentreader.webclient.gen.models.mrz_position_item import MrzPositionItem
145144
from regula.documentreader.webclient.gen.models.ocr_security_text_item import OCRSecurityTextItem
146145
from regula.documentreader.webclient.gen.models.ocr_security_text_result import OCRSecurityTextResult

‎regula/documentreader/webclient/gen/models/__init__.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
from regula.documentreader.webclient.gen.models.mrz_test_quality_result import MRZTestQualityResult
122122
from regula.documentreader.webclient.gen.models.measure_system import MeasureSystem
123123
from regula.documentreader.webclient.gen.models.mrz_detect_mode_enum import MrzDetectModeEnum
124-
from regula.documentreader.webclient.gen.models.mrz_position import MrzPosition
125124
from regula.documentreader.webclient.gen.models.mrz_position_item import MrzPositionItem
126125
from regula.documentreader.webclient.gen.models.ocr_security_text_item import OCRSecurityTextItem
127126
from regula.documentreader.webclient.gen.models.ocr_security_text_result import OCRSecurityTextResult

‎regula/documentreader/webclient/gen/models/doc_visual_extended_field.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr
1313
from typing import Any, ClassVar, Dict, List, Optional, Union
14+
from regula.documentreader.webclient.gen.models.lcid import LCID
1415
from regula.documentreader.webclient.gen.models.rectangle_coordinates import RectangleCoordinates
1516
from regula.documentreader.webclient.gen.models.string_recognition_result import StringRecognitionResult
1617
from regula.documentreader.webclient.gen.models.text_field_type import TextFieldType
@@ -30,7 +31,7 @@ class DocVisualExtendedField(BaseModel):
3031
field_mask: Optional[StrictStr] = Field(default=None, alias="FieldMask")
3132
validity: Optional[StrictInt] = Field(default=None, alias="Validity")
3233
in_comparison: Optional[StrictInt] = Field(default=None, alias="InComparison")
33-
w_lcid: Optional[StrictInt] = Field(default=None, alias="wLCID")
34+
w_lcid: Optional[LCID] = Field(default=None, alias="wLCID")
3435
reserved2: Optional[StrictInt] = Field(default=None, alias="Reserved2")
3536
reserved3: Optional[StrictInt] = Field(default=None, alias="Reserved3")
3637
field_rect: RectangleCoordinates = Field(alias="FieldRect")

‎regula/documentreader/webclient/gen/models/mrz_position_item.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@
1111

1212
from pydantic import BaseModel, ConfigDict, Field
1313
from typing import Any, ClassVar, Dict, List
14-
from regula.documentreader.webclient.gen.models.mrz_position import MrzPosition
14+
from regula.documentreader.webclient.gen.models.document_position import DocumentPosition
1515
from typing import Optional, Set
1616
from typing_extensions import Self
1717

1818
class MrzPositionItem(BaseModel):
1919
"""
2020
MrzPositionItem
2121
""" # noqa: E501
22-
mrz_position: MrzPosition = Field(alias="MrzPosition")
22+
mrz_position: DocumentPosition = Field(alias="MrzPosition")
2323
__properties: ClassVar[List[str]] = ["MrzPosition"]
2424

2525
model_config = ConfigDict(
@@ -76,7 +76,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
7676
return cls.model_validate(obj)
7777

7878
_obj = cls.model_validate({
79-
"MrzPosition": MrzPosition.from_dict(obj["MrzPosition"]) if obj.get("MrzPosition") is not None else None
79+
"MrzPosition": DocumentPosition.from_dict(obj["MrzPosition"]) if obj.get("MrzPosition") is not None else None
8080
})
8181
return _obj
8282

‎regula/documentreader/webclient/gen/models/mrz_position_result.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
from pydantic import ConfigDict, Field
1313
from typing import Any, ClassVar, Dict, List
14-
from regula.documentreader.webclient.gen.models.mrz_position import MrzPosition
14+
from regula.documentreader.webclient.gen.models.document_position import DocumentPosition
1515
from regula.documentreader.webclient.gen.models.result import Result
1616
from regula.documentreader.webclient.gen.models.result_item import ResultItem
1717
from typing import Optional, Set
@@ -21,7 +21,7 @@ class MRZPositionResult(ResultItem):
2121
"""
2222
MRZPositionResult
2323
""" # noqa: E501
24-
mrz_position: MrzPosition = Field(alias="MrzPosition")
24+
mrz_position: DocumentPosition = Field(alias="MrzPosition")
2525
__properties: ClassVar[List[str]] = ["buf_length", "light", "list_idx", "page_idx", "result_type", "MrzPosition"]
2626

2727
model_config = ConfigDict(
@@ -83,7 +83,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
8383
"list_idx": obj.get("list_idx"),
8484
"page_idx": obj.get("page_idx"),
8585
"result_type": obj.get("result_type"),
86-
"MrzPosition": MrzPosition.from_dict(obj["MrzPosition"]) if obj.get("MrzPosition") is not None else None
86+
"MrzPosition": DocumentPosition.from_dict(obj["MrzPosition"]) if obj.get("MrzPosition") is not None else None
8787
})
8888
return _obj
8989

‎regula/documentreader/webclient/gen/models/mrz_test_quality.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
from pydantic import BaseModel, ConfigDict, Field, StrictInt
1313
from typing import Any, ClassVar, Dict, List
14+
from regula.documentreader.webclient.gen.models.check_result import CheckResult
1415
from regula.documentreader.webclient.gen.models.string_item import StringItem
1516
from typing import Optional, Set
1617
from typing_extensions import Self
@@ -19,16 +20,16 @@ class MRZTestQuality(BaseModel):
1920
"""
2021
MRZTestQuality
2122
""" # noqa: E501
22-
check_sums: StrictInt = Field(alias="CHECK_SUMS")
23-
contrast_print: StrictInt = Field(alias="CONTRAST_PRINT")
23+
check_sums: CheckResult = Field(alias="CHECK_SUMS")
24+
contrast_print: CheckResult = Field(alias="CONTRAST_PRINT")
2425
doc_format: StrictInt = Field(alias="DOC_FORMAT")
2526
mrz_format: StrictInt = Field(alias="MRZ_FORMAT")
26-
print_position: StrictInt = Field(alias="PRINT_POSITION")
27-
stain_mrz: StrictInt = Field(alias="STAIN_MRZ")
28-
symbols_param: StrictInt = Field(alias="SYMBOLS_PARAM")
27+
print_position: CheckResult = Field(alias="PRINT_POSITION")
28+
stain_mrz: CheckResult = Field(alias="STAIN_MRZ")
29+
symbols_param: CheckResult = Field(alias="SYMBOLS_PARAM")
2930
str_count: StrictInt = Field(alias="StrCount")
3031
strings: List[StringItem] = Field(alias="Strings")
31-
textual_filling: StrictInt = Field(alias="TEXTUAL_FILLING")
32+
textual_filling: CheckResult = Field(alias="TEXTUAL_FILLING")
3233
__properties: ClassVar[List[str]] = ["CHECK_SUMS", "CONTRAST_PRINT", "DOC_FORMAT", "MRZ_FORMAT", "PRINT_POSITION", "STAIN_MRZ", "SYMBOLS_PARAM", "StrCount", "Strings", "TEXTUAL_FILLING"]
3334

3435
model_config = ConfigDict(

‎regula/documentreader/webclient/gen/models/rfid_data_file_type.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@ class RfidDataFileType(int, Enum):
9494
AUTHENTICITY_V2 = 302
9595
ATR = 400
9696
DIR = 401
97-
_E_SIGN_PK = 500
98-
_E_SIGN_SIGNED_DATA = 501
97+
E_SIGN_PK = 500
98+
E_SIGN_SIGNED_DATA = 501
9999
CERTIFICATE = 600
100100
MASTER_LIST = 601
101101
DEFECT_LIST = 602

‎regula/documentreader/webclient/gen/models/rfid_doc_visual_extended_field.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111

1212
from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr
1313
from typing import Any, ClassVar, Dict, List, Optional, Union
14+
from regula.documentreader.webclient.gen.models.lcid import LCID
1415
from regula.documentreader.webclient.gen.models.string_recognition_result import StringRecognitionResult
1516
from regula.documentreader.webclient.gen.models.text_field_type import TextFieldType
1617
from typing import Optional, Set
@@ -29,7 +30,7 @@ class RFIDDocVisualExtendedField(BaseModel):
2930
field_mask: Optional[StrictStr] = Field(default=None, alias="FieldMask")
3031
validity: Optional[StrictInt] = Field(default=None, alias="Validity")
3132
in_comparison: Optional[StrictInt] = Field(default=None, alias="InComparison")
32-
w_lcid: Optional[StrictInt] = Field(default=None, alias="wLCID")
33+
w_lcid: Optional[LCID] = Field(default=None, alias="wLCID")
3334
reserved2: Optional[StrictInt] = Field(default=None, alias="Reserved2")
3435
reserved3: Optional[StrictInt] = Field(default=None, alias="Reserved3")
3536
origin_dg: StrictInt = Field(alias="OriginDG")

‎regula/documentreader/webclient/gen/models/string_item.py‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
import json
1111

1212
from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt
13-
from typing import Any, ClassVar, Dict, List, Union
13+
from typing import Any, ClassVar, Dict, List, Optional, Union
14+
from regula.documentreader.webclient.gen.models.check_result import CheckResult
1415
from regula.documentreader.webclient.gen.models.error_coordinates import ErrorCoordinates
1516
from regula.documentreader.webclient.gen.models.field_item import FieldItem
1617
from regula.documentreader.webclient.gen.models.rectangle_coordinates import RectangleCoordinates
@@ -22,24 +23,24 @@ class StringItem(BaseModel):
2223
"""
2324
StringItem
2425
""" # noqa: E501
25-
alignment_symbols_in_string: StrictInt = Field(alias="ALIGNMENT_SYMBOLS_IN_STRING")
26-
check_sums: StrictInt = Field(alias="CHECK_SUMS")
26+
alignment_symbols_in_string: CheckResult = Field(alias="ALIGNMENT_SYMBOLS_IN_STRING")
27+
check_sums: CheckResult = Field(alias="CHECK_SUMS")
2728
error_position: ErrorCoordinates = Field(alias="ErrorPOSITION")
2829
field_count: StrictInt = Field(alias="FieldCount")
2930
fields: List[FieldItem] = Field(alias="Fields")
30-
strings_distance: StrictInt = Field(alias="STRINGS_DISTANCE")
31-
strings_interval: StrictInt = Field(alias="STRINGS_INTERVAL")
32-
string_filling: StrictInt = Field(alias="STRING_FILLING")
33-
string_position: StrictInt = Field(alias="STRING_POSITION")
34-
symbols_param: StrictInt = Field(alias="SYMBOLS_PARAM")
31+
strings_distance: CheckResult = Field(alias="STRINGS_DISTANCE")
32+
strings_interval: CheckResult = Field(alias="STRINGS_INTERVAL")
33+
string_filling: CheckResult = Field(alias="STRING_FILLING")
34+
strings_position: Optional[CheckResult] = Field(default=None, alias="STRINGS_POSITION")
35+
symbols_param: CheckResult = Field(alias="SYMBOLS_PARAM")
3536
size_error_alignment: Union[StrictFloat, StrictInt] = Field(alias="SizeError_ALIGNMENT")
3637
size_error_distance: Union[StrictFloat, StrictInt] = Field(alias="SizeError_DISTANCE")
3738
size_error_interval: Union[StrictFloat, StrictInt] = Field(alias="SizeError_INTERVAL")
3839
string_angle: Union[StrictFloat, StrictInt] = Field(alias="StringAngle")
3940
string_borders: RectangleCoordinates = Field(alias="StringBorders")
4041
symbols_count: StrictInt = Field(alias="SymbolsCount")
4142
symbols_estimations: List[SymbolEstimationItem] = Field(alias="SymbolsEstimations")
42-
__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"]
43+
__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"]
4344

4445
model_config = ConfigDict(
4546
populate_by_name=True,
@@ -120,7 +121,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
120121
"STRINGS_DISTANCE": obj.get("STRINGS_DISTANCE"),
121122
"STRINGS_INTERVAL": obj.get("STRINGS_INTERVAL"),
122123
"STRING_FILLING": obj.get("STRING_FILLING"),
123-
"STRING_POSITION": obj.get("STRING_POSITION"),
124+
"STRINGS_POSITION": obj.get("STRINGS_POSITION"),
124125
"SYMBOLS_PARAM": obj.get("SYMBOLS_PARAM"),
125126
"SizeError_ALIGNMENT": obj.get("SizeError_ALIGNMENT"),
126127
"SizeError_DISTANCE": obj.get("SizeError_DISTANCE"),

0 commit comments

Comments
 (0)