Skip to content

Commit 03b06ed

Browse files
KirylKovaliovKirylKovaliov
authored
Merge pull request #214 from regulaforensics/fix/sp-18211
SP-18211 - update models
2 parents 1ab57bc + 2533626 commit 03b06ed

31 files changed

Lines changed: 532 additions & 390 deletions

‎Pipfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ python-dateutil = ">=2.8.2"
1010
urllib3 = ">=1.25.3, <3.0.0"
1111
vistir = ">=0.4.0, <=0.6.1"
1212
idna = "==3.7"
13-
requests = ">=2.32.3"
13+
requests = ">=2.32.4"
1414
pydantic = ">=2"
1515
typing-extensions = ">=4.7.1"
1616

‎Pipfile.lock‎

Lines changed: 236 additions & 196 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎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: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from regula.documentreader.webclient.gen.models.critical import Critical
1515
from regula.documentreader.webclient.gen.models.light import Light
1616
from regula.documentreader.webclient.gen.models.rectangle_coordinates import RectangleCoordinates
17+
from regula.documentreader.webclient.gen.models.text_field_type import TextFieldType
1718
from typing import Optional, Set
1819
from typing_extensions import Self
1920

@@ -24,16 +25,15 @@ class OCRSecurityTextItem(BaseModel):
2425
critical_flag: Critical = Field(alias="CriticalFlag")
2526
light_type: Light = Field(alias="LightType")
2627
field_rect: RectangleCoordinates = Field(alias="FieldRect")
27-
etalon_result_type: StrictInt = Field(alias="EtalonResultType")
28-
etalon_field_type: StrictInt = Field(alias="EtalonFieldType")
29-
etalon_light_type: StrictInt = Field(alias="EtalonLightType")
28+
etalon_result_type: StrictInt = Field(description="Same as Result type, but used for safe parsing of not-described values. See Result type.", alias="EtalonResultType")
29+
etalon_field_type: TextFieldType = Field(alias="EtalonFieldType")
30+
etalon_light_type: Light = Field(alias="EtalonLightType")
3031
etalon_field_rect: RectangleCoordinates = Field(alias="EtalonFieldRect")
3132
security_text_result_ocr: StrictStr = Field(alias="SecurityTextResultOCR")
3233
etalon_result_ocr: StrictStr = Field(alias="EtalonResultOCR")
33-
result_code: Optional[StrictInt] = Field(default=None, alias="ResultCode")
3434
reserved1: Optional[StrictInt] = Field(default=None, alias="Reserved1")
3535
reserved2: Optional[StrictInt] = Field(default=None, alias="Reserved2")
36-
__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"]
3737

3838
model_config = ConfigDict(
3939
populate_by_name=True,
@@ -95,13 +95,12 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
9595
"CriticalFlag": obj.get("CriticalFlag"),
9696
"LightType": obj.get("LightType"),
9797
"FieldRect": RectangleCoordinates.from_dict(obj["FieldRect"]) if obj.get("FieldRect") is not None else None,
98-
"EtalonResultType": obj.get("EtalonResultType"),
98+
"EtalonResultType": obj.get("EtalonResultType") if obj.get("EtalonResultType") is not None else 0,
9999
"EtalonFieldType": obj.get("EtalonFieldType"),
100100
"EtalonLightType": obj.get("EtalonLightType"),
101101
"EtalonFieldRect": RectangleCoordinates.from_dict(obj["EtalonFieldRect"]) if obj.get("EtalonFieldRect") is not None else None,
102102
"SecurityTextResultOCR": obj.get("SecurityTextResultOCR"),
103103
"EtalonResultOCR": obj.get("EtalonResultOCR"),
104-
"ResultCode": obj.get("ResultCode"),
105104
"Reserved1": obj.get("Reserved1"),
106105
"Reserved2": obj.get("Reserved2")
107106
})

0 commit comments

Comments
 (0)