Skip to content

Commit 4707c97

Browse files
ArtsiomTsybulkoArtsiomTsybulko
committed
SP-18211 - update models
1 parent 30f829d commit 4707c97

24 files changed

+276
-167
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import re # noqa: F401
1010
import json
1111

12-
from pydantic import BaseModel, ConfigDict, Field, StrictStr
12+
from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr
1313
from typing import Any, ClassVar, Dict, List
1414
from typing import Optional, Set
1515
from typing_extensions import Self
@@ -19,7 +19,7 @@ class CertificateData(BaseModel):
1919
CertificateData
2020
""" # noqa: E501
2121
data: StrictStr = Field(alias="Data")
22-
length: StrictStr = Field(alias="Length")
22+
length: StrictInt = Field(alias="Length")
2323
__properties: ClassVar[List[str]] = ["Data", "Length"]
2424

2525
model_config = ConfigDict(

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ class DocVisualExtendedField(BaseModel):
2121
"""
2222
DocVisualExtendedField
2323
""" # noqa: E501
24-
field_type: StrictInt = Field(alias="FieldType")
2524
w_field_type: TextFieldType = Field(alias="wFieldType")
2625
field_name: StrictStr = Field(description="Field symbolic name (null-terminated string)", alias="FieldName")
2726
strings_count: Union[StrictFloat, StrictInt] = Field(description="Number of StringsResult array elements", alias="StringsCount")
@@ -35,7 +34,7 @@ class DocVisualExtendedField(BaseModel):
3534
reserved2: Optional[StrictInt] = Field(default=None, alias="Reserved2")
3635
reserved3: Optional[StrictInt] = Field(default=None, alias="Reserved3")
3736
field_rect: RectangleCoordinates = Field(alias="FieldRect")
38-
__properties: ClassVar[List[str]] = ["FieldType", "wFieldType", "FieldName", "StringsCount", "StringsResult", "Buf_Length", "Buf_Text", "FieldMask", "Validity", "InComparison", "wLCID", "Reserved2", "Reserved3", "FieldRect"]
37+
__properties: ClassVar[List[str]] = ["wFieldType", "FieldName", "StringsCount", "StringsResult", "Buf_Length", "Buf_Text", "FieldMask", "Validity", "InComparison", "wLCID", "Reserved2", "Reserved3", "FieldRect"]
3938

4039
model_config = ConfigDict(
4140
populate_by_name=True,
@@ -98,7 +97,6 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
9897
return cls.model_validate(obj)
9998

10099
_obj = cls.model_validate({
101-
"FieldType": obj.get("FieldType"),
102100
"wFieldType": obj.get("wFieldType"),
103101
"FieldName": obj.get("FieldName"),
104102
"StringsCount": obj.get("StringsCount"),

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ class FiberItem(BaseModel):
2929
length: List[StrictInt] = Field(description="Fibers length value for located areas (in pixels)", alias="Length")
3030
area: List[StrictInt] = Field(description="Fibers value for areas (in pixels)", alias="Area")
3131
color_values: List[StrictInt] = Field(description="Fibers color value", alias="ColorValues")
32-
error_code: Optional[StrictInt] = Field(default=None, alias="ErrorCode")
33-
__properties: ClassVar[List[str]] = ["RectCount", "ExpectedCount", "LightValue", "LightDisp", "RectArray", "Width", "Length", "Area", "ColorValues", "ErrorCode"]
32+
__properties: ClassVar[List[str]] = ["RectCount", "ExpectedCount", "LightValue", "LightDisp", "RectArray", "Width", "Length", "Area", "ColorValues"]
3433

3534
model_config = ConfigDict(
3635
populate_by_name=True,
@@ -98,8 +97,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
9897
"Width": obj.get("Width"),
9998
"Length": obj.get("Length"),
10099
"Area": obj.get("Area"),
101-
"ColorValues": obj.get("ColorValues"),
102-
"ErrorCode": obj.get("ErrorCode")
100+
"ColorValues": obj.get("ColorValues")
103101
})
104102
return _obj
105103

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ class FiberResult(AuthenticityCheckResultItem):
3333
length: List[StrictInt] = Field(description="Fibers length value for located areas (in pixels)", alias="Length")
3434
area: List[StrictInt] = Field(description="Fibers value for areas (in pixels)", alias="Area")
3535
color_values: List[StrictInt] = Field(description="Fibers color value", alias="ColorValues")
36-
error_code: Optional[StrictInt] = Field(default=None, alias="ErrorCode")
37-
__properties: ClassVar[List[str]] = ["Type", "ElementResult", "ElementDiagnose", "PercentValue", "RectCount", "ExpectedCount", "LightValue", "LightDisp", "RectArray", "Width", "Length", "Area", "ColorValues", "ErrorCode"]
36+
__properties: ClassVar[List[str]] = ["Type", "ElementResult", "ElementDiagnose", "PercentValue", "RectCount", "ExpectedCount", "LightValue", "LightDisp", "RectArray", "Width", "Length", "Area", "ColorValues"]
3837

3938
model_config = ConfigDict(
4039
populate_by_name=True,
@@ -106,8 +105,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
106105
"Width": obj.get("Width"),
107106
"Length": obj.get("Length"),
108107
"Area": obj.get("Area"),
109-
"ColorValues": obj.get("ColorValues"),
110-
"ErrorCode": obj.get("ErrorCode")
108+
"ColorValues": obj.get("ColorValues")
111109
})
112110
return _obj
113111

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ class IdentItem(BaseModel):
3030
etalon_image: ImageData = Field(alias="EtalonImage")
3131
area_list: Optional[AreaContainer] = Field(default=None, alias="AreaList")
3232
element_id: Optional[StrictInt] = Field(default=None, alias="ElementID")
33-
result: Optional[StrictInt] = Field(default=None, alias="Result")
34-
__properties: ClassVar[List[str]] = ["ElementType", "LightIndex", "Area", "Image", "EtalonImage", "AreaList", "ElementID", "Result"]
33+
__properties: ClassVar[List[str]] = ["ElementType", "LightIndex", "Area", "Image", "EtalonImage", "AreaList", "ElementID"]
3534

3635
model_config = ConfigDict(
3736
populate_by_name=True,
@@ -102,8 +101,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
102101
"Image": ImageData.from_dict(obj["Image"]) if obj.get("Image") is not None else None,
103102
"EtalonImage": ImageData.from_dict(obj["EtalonImage"]) if obj.get("EtalonImage") is not None else None,
104103
"AreaList": AreaContainer.from_dict(obj["AreaList"]) if obj.get("AreaList") is not None else None,
105-
"ElementID": obj.get("ElementID"),
106-
"Result": obj.get("Result")
104+
"ElementID": obj.get("ElementID")
107105
})
108106
return _obj
109107

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ class IdentResult(AuthenticityCheckResultItem):
3434
etalon_image: ImageData = Field(alias="EtalonImage")
3535
area_list: Optional[AreaContainer] = Field(default=None, alias="AreaList")
3636
element_id: Optional[StrictInt] = Field(default=None, alias="ElementID")
37-
result: Optional[StrictInt] = Field(default=None, alias="Result")
38-
__properties: ClassVar[List[str]] = ["Type", "ElementResult", "ElementDiagnose", "PercentValue", "ElementType", "LightIndex", "Area", "Image", "EtalonImage", "AreaList", "ElementID", "Result"]
37+
__properties: ClassVar[List[str]] = ["Type", "ElementResult", "ElementDiagnose", "PercentValue", "ElementType", "LightIndex", "Area", "Image", "EtalonImage", "AreaList", "ElementID"]
3938

4039
model_config = ConfigDict(
4140
populate_by_name=True,
@@ -110,8 +109,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
110109
"Image": ImageData.from_dict(obj["Image"]) if obj.get("Image") is not None else None,
111110
"EtalonImage": ImageData.from_dict(obj["EtalonImage"]) if obj.get("EtalonImage") is not None else None,
112111
"AreaList": AreaContainer.from_dict(obj["AreaList"]) if obj.get("AreaList") is not None else None,
113-
"ElementID": obj.get("ElementID"),
114-
"Result": obj.get("Result")
112+
"ElementID": obj.get("ElementID")
115113
})
116114
return _obj
117115

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ class Light(int, Enum):
1919
allowed enum values
2020
"""
2121
OFF = 0
22+
WHITE_TOP = 2
23+
WHITE_SIDE = 4
2224
WHITE = 6
2325
IR = 24
2426
UV = 128
25-
AXIAL_WHITE_FULL = 3072
27+
AXIAL_WHITE = 3072
2628

2729
@classmethod
2830
def from_json(cls, json_str: str) -> Self:

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,9 @@ class OCRSecurityTextItem(BaseModel):
3131
etalon_field_rect: RectangleCoordinates = Field(alias="EtalonFieldRect")
3232
security_text_result_ocr: StrictStr = Field(alias="SecurityTextResultOCR")
3333
etalon_result_ocr: StrictStr = Field(alias="EtalonResultOCR")
34-
result_code: Optional[StrictInt] = Field(default=None, alias="ResultCode")
3534
reserved1: Optional[StrictInt] = Field(default=None, alias="Reserved1")
3635
reserved2: Optional[StrictInt] = Field(default=None, alias="Reserved2")
37-
__properties: ClassVar[List[str]] = ["CriticalFlag", "LightType", "FieldRect", "EtalonResultType", "EtalonFieldType", "EtalonLightType", "EtalonFieldRect", "SecurityTextResultOCR", "EtalonResultOCR", "ResultCode", "Reserved1", "Reserved2"]
36+
__properties: ClassVar[List[str]] = ["CriticalFlag", "LightType", "FieldRect", "EtalonResultType", "EtalonFieldType", "EtalonLightType", "EtalonFieldRect", "SecurityTextResultOCR", "EtalonResultOCR", "Reserved1", "Reserved2"]
3837

3938
model_config = ConfigDict(
4039
populate_by_name=True,
@@ -102,7 +101,6 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
102101
"EtalonFieldRect": RectangleCoordinates.from_dict(obj["EtalonFieldRect"]) if obj.get("EtalonFieldRect") is not None else None,
103102
"SecurityTextResultOCR": obj.get("SecurityTextResultOCR"),
104103
"EtalonResultOCR": obj.get("EtalonResultOCR"),
105-
"ResultCode": obj.get("ResultCode"),
106104
"Reserved1": obj.get("Reserved1"),
107105
"Reserved2": obj.get("Reserved2")
108106
})

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,9 @@ class OCRSecurityTextResult(AuthenticityCheckResultItem):
3535
etalon_field_rect: RectangleCoordinates = Field(alias="EtalonFieldRect")
3636
security_text_result_ocr: StrictStr = Field(alias="SecurityTextResultOCR")
3737
etalon_result_ocr: StrictStr = Field(alias="EtalonResultOCR")
38-
result_code: Optional[StrictInt] = Field(default=None, alias="ResultCode")
3938
reserved1: Optional[StrictInt] = Field(default=None, alias="Reserved1")
4039
reserved2: Optional[StrictInt] = Field(default=None, alias="Reserved2")
41-
__properties: ClassVar[List[str]] = ["Type", "ElementResult", "ElementDiagnose", "PercentValue", "CriticalFlag", "LightType", "FieldRect", "EtalonResultType", "EtalonFieldType", "EtalonLightType", "EtalonFieldRect", "SecurityTextResultOCR", "EtalonResultOCR", "ResultCode", "Reserved1", "Reserved2"]
40+
__properties: ClassVar[List[str]] = ["Type", "ElementResult", "ElementDiagnose", "PercentValue", "CriticalFlag", "LightType", "FieldRect", "EtalonResultType", "EtalonFieldType", "EtalonLightType", "EtalonFieldRect", "SecurityTextResultOCR", "EtalonResultOCR", "Reserved1", "Reserved2"]
4241

4342
model_config = ConfigDict(
4443
populate_by_name=True,
@@ -110,7 +109,6 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
110109
"EtalonFieldRect": RectangleCoordinates.from_dict(obj["EtalonFieldRect"]) if obj.get("EtalonFieldRect") is not None else None,
111110
"SecurityTextResultOCR": obj.get("SecurityTextResultOCR"),
112111
"EtalonResultOCR": obj.get("EtalonResultOCR"),
113-
"ResultCode": obj.get("ResultCode"),
114112
"Reserved1": obj.get("Reserved1"),
115113
"Reserved2": obj.get("Reserved2")
116114
})

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,14 @@ class ParsingErrorCodes(int, Enum):
4848
errLDS_ASN_SignerInfo_SignAlg_IncorrectData = 2147483685
4949
errLDS_ASN_SignerInfo_Signature_IncorrectData = 2147483686
5050
errLDS_ASN_SignerInfo_UnsignedAttrs_IncorrectData = 2147483687
51+
errLDS_ASN_DTC_SignerInfo_IncorrectData = 2147483712
52+
errLDS_ASN_DTC_SignerInfo_Certificate_IncorrectData = 2147483713
53+
errLDS_ASN_DTC_SignerInfo_DigestAlg_IncorrectData = 2147483714
54+
errLDS_ASN_DTC_SignerInfo_SignedAttrs_IncorrectData = 2147483715
55+
errLDS_ASN_DTC_SignerInfo_SignAlg_IncorrectData = 2147483716
56+
errLDS_ASN_DTC_SignerInfo_Signature_IncorrectData = 2147483717
57+
errLDS_ASN_DTC_SecurityInfo_IncorrectData = 2147483718
58+
errLDS_ASN_DTC_ContentInfo_IncorrectData = 2147483719
5159
errLDS_ICAO_LDSObject_UnsupportedDigestAlgorithm = 2147483696
5260
errLDS_ICAO_SignedData_SignerInfos_Empty = 2147483697
5361
errLDS_ICAO_SignerInfo_UnsupportedDigestAlgorithm = 2147483698

0 commit comments

Comments
 (0)