Merge pull request #254 from regulaforensics/develop

Develop -> Stable

Author: KirylKovaliov

.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

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

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

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
+
+

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
+
+