Skip to content

Commit a451223

Browse files
ArtsiomTsybulkoArtsiomTsybulko
authored
Merge pull request #279 from regulaforensics/develop
Develop -> Stable
2 parents f3b2be8 + 2b05863 commit a451223

File tree

7 files changed

+211
-11
lines changed

7 files changed

+211
-11
lines changed

‎.openapi-generator/FILES‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ regula/documentreader/webclient/gen/models/liveness_params.py
126126
regula/documentreader/webclient/gen/models/log_level.py
127127
regula/documentreader/webclient/gen/models/mdl_device_engagement.py
128128
regula/documentreader/webclient/gen/models/mdl_device_retrieval.py
129+
regula/documentreader/webclient/gen/models/mdl_item.py
130+
regula/documentreader/webclient/gen/models/mdl_result.py
129131
regula/documentreader/webclient/gen/models/mdl_server_retrieval.py
130132
regula/documentreader/webclient/gen/models/measure_system.py
131133
regula/documentreader/webclient/gen/models/message.py

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,8 @@
138138
"LogLevel",
139139
"MDLDeviceEngagement",
140140
"MDLDeviceRetrieval",
141+
"MDLItem",
142+
"MDLResult",
141143
"MDLServerRetrieval",
142144
"MRZDetectorResult",
143145
"MRZFormat",
@@ -404,6 +406,8 @@
404406
from regula.documentreader.webclient.gen.models.log_level import LogLevel as LogLevel
405407
from regula.documentreader.webclient.gen.models.mdl_device_engagement import MDLDeviceEngagement as MDLDeviceEngagement
406408
from regula.documentreader.webclient.gen.models.mdl_device_retrieval import MDLDeviceRetrieval as MDLDeviceRetrieval
409+
from regula.documentreader.webclient.gen.models.mdl_item import MDLItem as MDLItem
410+
from regula.documentreader.webclient.gen.models.mdl_result import MDLResult as MDLResult
407411
from regula.documentreader.webclient.gen.models.mdl_server_retrieval import MDLServerRetrieval as MDLServerRetrieval
408412
from regula.documentreader.webclient.gen.models.mrz_detector_result import MRZDetectorResult as MRZDetectorResult
409413
from regula.documentreader.webclient.gen.models.mrz_format import MRZFormat as MRZFormat
@@ -676,6 +680,8 @@
676680
from regula.documentreader.webclient.gen.models.log_level import LogLevel as LogLevel
677681
from regula.documentreader.webclient.gen.models.mdl_device_engagement import MDLDeviceEngagement as MDLDeviceEngagement
678682
from regula.documentreader.webclient.gen.models.mdl_device_retrieval import MDLDeviceRetrieval as MDLDeviceRetrieval
683+
from regula.documentreader.webclient.gen.models.mdl_item import MDLItem as MDLItem
684+
from regula.documentreader.webclient.gen.models.mdl_result import MDLResult as MDLResult
679685
from regula.documentreader.webclient.gen.models.mdl_server_retrieval import MDLServerRetrieval as MDLServerRetrieval
680686
from regula.documentreader.webclient.gen.models.mrz_detector_result import MRZDetectorResult as MRZDetectorResult
681687
from regula.documentreader.webclient.gen.models.mrz_format import MRZFormat as MRZFormat

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@
122122
from regula.documentreader.webclient.gen.models.log_level import LogLevel
123123
from regula.documentreader.webclient.gen.models.mdl_device_engagement import MDLDeviceEngagement
124124
from regula.documentreader.webclient.gen.models.mdl_device_retrieval import MDLDeviceRetrieval
125+
from regula.documentreader.webclient.gen.models.mdl_item import MDLItem
126+
from regula.documentreader.webclient.gen.models.mdl_result import MDLResult
125127
from regula.documentreader.webclient.gen.models.mdl_server_retrieval import MDLServerRetrieval
126128
from regula.documentreader.webclient.gen.models.mrz_detector_result import MRZDetectorResult
127129
from regula.documentreader.webclient.gen.models.mrz_format import MRZFormat
@@ -375,6 +377,8 @@
375377
from regula.documentreader.webclient.gen.models.log_level import LogLevel
376378
from regula.documentreader.webclient.gen.models.mdl_device_engagement import MDLDeviceEngagement
377379
from regula.documentreader.webclient.gen.models.mdl_device_retrieval import MDLDeviceRetrieval
380+
from regula.documentreader.webclient.gen.models.mdl_item import MDLItem
381+
from regula.documentreader.webclient.gen.models.mdl_result import MDLResult
378382
from regula.documentreader.webclient.gen.models.mdl_server_retrieval import MDLServerRetrieval
379383
from regula.documentreader.webclient.gen.models.mrz_detector_result import MRZDetectorResult
380384
from regula.documentreader.webclient.gen.models.mrz_format import MRZFormat

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

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
from regula.documentreader.webclient.gen.models.images_result import ImagesResult
2626
from regula.documentreader.webclient.gen.models.lexical_analysis_result import LexicalAnalysisResult
2727
from regula.documentreader.webclient.gen.models.license_result import LicenseResult
28+
from regula.documentreader.webclient.gen.models.mdl_result import MDLResult
2829
from regula.documentreader.webclient.gen.models.mrz_detector_result import MRZDetectorResult
2930
from regula.documentreader.webclient.gen.models.mrz_position_result import MRZPositionResult
3031
from regula.documentreader.webclient.gen.models.mrz_test_quality_result import MRZTestQualityResult
@@ -39,7 +40,7 @@
3940
from typing import Union, List, Set, Optional, Dict
4041
from typing_extensions import Literal, Self
4142

42-
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", "VDSDataResult", "VDSNCDataResult"]
43+
CONTAINERLISTLISTINNER_ONE_OF_SCHEMAS = ["AuthenticityResult", "BarcodePositionResult", "ByteArrayResult", "ChosenDocumentTypeResult", "DocBarCodeInfo", "DocumentBinaryInfoResult", "DocumentImageResult", "DocumentPositionResult", "DocumentTypesCandidatesResult", "EncryptedRCLResult", "FaceDetectionResult", "GraphicsResult", "ImageQualityResult", "ImagesResult", "LexicalAnalysisResult", "LicenseResult", "MDLResult", "MRZDetectorResult", "MRZPositionResult", "MRZTestQualityResult", "RFIDGraphicsInfoResult", "RFIDTextDataResult", "StatusResult", "TextDataResult", "TextResult", "VDSDataResult", "VDSNCDataResult"]
4344

4445
class ContainerListListInner(BaseModel):
4546
"""
@@ -97,8 +98,10 @@ class ContainerListListInner(BaseModel):
9798
oneof_schema_25_validator: Optional[VDSNCDataResult] = None
9899
# data type: VDSDataResult
99100
oneof_schema_26_validator: Optional[VDSDataResult] = None
100-
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, VDSDataResult, VDSNCDataResult]] = None
101-
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", "VDSDataResult", "VDSNCDataResult" }
101+
# data type: MDLResult
102+
oneof_schema_27_validator: Optional[MDLResult] = None
103+
actual_instance: Optional[Union[AuthenticityResult, BarcodePositionResult, ByteArrayResult, ChosenDocumentTypeResult, DocBarCodeInfo, DocumentBinaryInfoResult, DocumentImageResult, DocumentPositionResult, DocumentTypesCandidatesResult, EncryptedRCLResult, FaceDetectionResult, GraphicsResult, ImageQualityResult, ImagesResult, LexicalAnalysisResult, LicenseResult, MDLResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult, VDSDataResult, VDSNCDataResult]] = None
104+
one_of_schemas: Set[str] = { "AuthenticityResult", "BarcodePositionResult", "ByteArrayResult", "ChosenDocumentTypeResult", "DocBarCodeInfo", "DocumentBinaryInfoResult", "DocumentImageResult", "DocumentPositionResult", "DocumentTypesCandidatesResult", "EncryptedRCLResult", "FaceDetectionResult", "GraphicsResult", "ImageQualityResult", "ImagesResult", "LexicalAnalysisResult", "LicenseResult", "MDLResult", "MRZDetectorResult", "MRZPositionResult", "MRZTestQualityResult", "RFIDGraphicsInfoResult", "RFIDTextDataResult", "StatusResult", "TextDataResult", "TextResult", "VDSDataResult", "VDSNCDataResult" }
102105

103106
model_config = ConfigDict(
104107
validate_assignment=True,
@@ -254,12 +257,17 @@ def actual_instance_must_validate_oneof(cls, v):
254257
error_messages.append(f"Error! Input type `{type(v)}` is not `VDSDataResult`")
255258
else:
256259
match += 1
260+
# validate data type: MDLResult
261+
if not isinstance(v, MDLResult):
262+
error_messages.append(f"Error! Input type `{type(v)}` is not `MDLResult`")
263+
else:
264+
match += 1
257265
if match > 1:
258266
# more than 1 match
259-
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, VDSDataResult, VDSNCDataResult. Details: " + ", ".join(error_messages))
267+
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, MDLResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult, VDSDataResult, VDSNCDataResult. Details: " + ", ".join(error_messages))
260268
elif match == 0:
261269
# no match
262-
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, VDSDataResult, VDSNCDataResult. Details: " + ", ".join(error_messages))
270+
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, MDLResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult, VDSDataResult, VDSNCDataResult. Details: " + ", ".join(error_messages))
263271
else:
264272
return v
265273

@@ -430,13 +438,19 @@ def from_json(cls, json_str: str) -> Self:
430438
match += 1
431439
except (ValidationError, ValueError) as e:
432440
error_messages.append(str(e))
441+
# deserialize data into MDLResult
442+
try:
443+
instance.actual_instance = MDLResult.from_json(json_str)
444+
match += 1
445+
except (ValidationError, ValueError) as e:
446+
error_messages.append(str(e))
433447

434448
if match > 1:
435449
# more than 1 match
436-
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, VDSDataResult, VDSNCDataResult. Details: " + ", ".join(error_messages))
450+
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, MDLResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult, VDSDataResult, VDSNCDataResult. Details: " + ", ".join(error_messages))
437451
elif match == 0:
438452
# no match
439-
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, VDSDataResult, VDSNCDataResult. Details: " + ", ".join(error_messages))
453+
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, MDLResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult, VDSDataResult, VDSNCDataResult. Details: " + ", ".join(error_messages))
440454
else:
441455
return instance
442456

@@ -450,7 +464,7 @@ def to_json(self) -> str:
450464
else:
451465
return json.dumps(self.actual_instance)
452466

453-
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, VDSDataResult, VDSNCDataResult]]:
467+
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, MDLResult, MRZDetectorResult, MRZPositionResult, MRZTestQualityResult, RFIDGraphicsInfoResult, RFIDTextDataResult, StatusResult, TextDataResult, TextResult, VDSDataResult, VDSNCDataResult]]:
454468
"""Returns the dict representation of the actual instance"""
455469
if self.actual_instance is None:
456470
return None

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

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
# coding: utf-8
2+
3+
"""
4+
Generated by: https://openapi-generator.tech
5+
"""
6+
7+
from __future__ import annotations
8+
import pprint
9+
import re # noqa: F401
10+
import json
11+
12+
from pydantic import BaseModel, ConfigDict, Field
13+
from typing import Any, ClassVar, Dict, List
14+
from typing import Optional, Set
15+
from typing_extensions import Self
16+
from pydantic import SkipValidation, Field
17+
18+
class MDLItem(BaseModel):
19+
"""
20+
MDLItem
21+
""" # noqa: E501
22+
mdl_parsed_response: SkipValidation[Dict[str, object]] = Field(alias="MDLParsedResponse")
23+
__properties: ClassVar[List[str]] = ["MDLParsedResponse"]
24+
25+
model_config = ConfigDict(
26+
populate_by_name=True,
27+
validate_assignment=True,
28+
protected_namespaces=(),
29+
arbitrary_types_allowed=True,
30+
use_enum_values=True
31+
)
32+
33+
34+
def to_str(self) -> str:
35+
"""Returns the string representation of the model using alias"""
36+
return pprint.pformat(self.model_dump(by_alias=True))
37+
38+
def to_json(self) -> str:
39+
"""Returns the JSON representation of the model using alias"""
40+
# TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead
41+
return json.dumps(self.to_dict())
42+
43+
@classmethod
44+
def from_json(cls, json_str: str) -> Optional[Self]:
45+
"""Create an instance of MDLItem from a JSON string"""
46+
return cls.from_dict(json.loads(json_str))
47+
48+
def to_dict(self) -> Dict[str, Any]:
49+
"""Return the dictionary representation of the model using alias.
50+
51+
This has the following differences from calling pydantic's
52+
`self.model_dump(by_alias=True)`:
53+
54+
* `None` is only added to the output dict for nullable fields that
55+
were set at model initialization. Other fields with value `None`
56+
are ignored.
57+
"""
58+
excluded_fields: Set[str] = set([
59+
])
60+
61+
_dict = self.model_dump(
62+
by_alias=True,
63+
exclude=excluded_fields,
64+
exclude_none=True,
65+
)
66+
return _dict
67+
68+
@classmethod
69+
def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
70+
"""Create an instance of MDLItem from a dict"""
71+
if obj is None:
72+
return None
73+
74+
if not isinstance(obj, dict):
75+
return cls.model_validate(obj)
76+
77+
_obj = cls.model_validate({
78+
"MDLParsedResponse": obj.get("MDLParsedResponse")
79+
})
80+
return _obj
81+
82+

0 commit comments

Comments
 (0)