From bf125850f0f911b69208d04507b64055d03c7d4e Mon Sep 17 00:00:00 2001 From: Sviataslau Dauhuchyts Date: Wed, 21 Aug 2024 16:55:53 +0300 Subject: [PATCH 01/10] Add SAST scan --- .github/workflows/sast.yaml | 58 +++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+) create mode 100644 .github/workflows/sast.yaml diff --git a/.github/workflows/sast.yaml b/.github/workflows/sast.yaml new file mode 100644 index 0000000..1e29f13 --- /dev/null +++ b/.github/workflows/sast.yaml @@ -0,0 +1,58 @@ +name: Semgrep SAST + +on: + pull_request: + branches: + - develop + - staging + - production + - stable + - main + - master + +env: + # Fail workflow or not if vulnerabilities found + FAIL_ON_VULNERABILITIES: true + # List of paths (space separated) to ignore + # Supports PATTERNS + # EXCLUDE_PATHS: 'foo bar/baz file.txt dir/*.yml' + EXCLUDE_PATHS: '' + # List of rules (space separated) to ignore + # EXCLUDE_RULES: 'generic.secrets.security.detected-aws-account-id.detected-aws-account-id' + # See https://github.com/semgrep/semgrep-rules for rules registry + EXCLUDE_RULES: '' + +jobs: + semgrep: + name: semgrep-oss/scan + runs-on: ubuntu-latest + container: + image: semgrep/semgrep + steps: + - uses: actions/checkout@v4 + - name: Scan + shell: bash + run: | + EXCLUDED_PATHS=() + if [[ ! -z $EXCLUDE_PATHS ]]; then + for path in $EXCLUDE_PATHS; do + EXCLUDED_PATHS+=("--exclude $path") + done + fi + + EXCLUDED_RULES=() + if [[ ! -z $EXCLUDE_RULES ]]; then + for rule in $EXCLUDE_RULES; do + EXCLUDED_RULES+=("--exclude-rule $rule") + done + fi + + if [[ $FAIL_ON_VULNERABILITIES == "true" ]]; then + semgrep scan --config auto ${EXCLUDED_PATHS[@]} ${EXCLUDED_RULES[@]} --error --verbose + elif [[ $FAIL_ON_VULNERABILITIES == "false" ]]; then + semgrep scan --config auto ${EXCLUDED_PATHS[@]} ${EXCLUDED_RULES[@]} --error --verbose || true + else + echo "Bad FAIL_ON_VULNERABILITIES env var value" + exit 1 + fi + From 8fa8747bc830336b07825aa76210da348a060eeb Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Thu, 5 Sep 2024 11:14:36 +0000 Subject: [PATCH 02/10] update-clients --- .openapi-generator/FILES | 1 + .../documentreader/webclient/gen/__init__.py | 1 + .../webclient/gen/api/transaction_api.py | 10 +- .../webclient/gen/models/__init__.py | 1 + .../models/authenticity_check_result_item.py | 32 +++- .../webclient/gen/models/fiber_result.py | 28 +++- .../webclient/gen/models/ident_result.py | 58 +++---- .../list_transactions_by_tag_response.py | 145 ++++++++++++++++++ .../gen/models/ocr_security_text_result.py | 28 +++- .../gen/models/photo_ident_result.py | 28 +++- .../gen/models/security_feature_result.py | 28 +++- 11 files changed, 319 insertions(+), 41 deletions(-) create mode 100644 regula/documentreader/webclient/gen/models/list_transactions_by_tag_response.py diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES index 8cf786a..796d723 100755 --- a/.openapi-generator/FILES +++ b/.openapi-generator/FILES @@ -88,6 +88,7 @@ regula/documentreader/webclient/gen/models/lexical_analysis_result_all_of.py regula/documentreader/webclient/gen/models/license_result.py regula/documentreader/webclient/gen/models/license_result_all_of.py regula/documentreader/webclient/gen/models/light.py +regula/documentreader/webclient/gen/models/list_transactions_by_tag_response.py regula/documentreader/webclient/gen/models/list_verified_fields.py regula/documentreader/webclient/gen/models/liveness_params.py regula/documentreader/webclient/gen/models/log_level.py diff --git a/regula/documentreader/webclient/gen/__init__.py b/regula/documentreader/webclient/gen/__init__.py index 4838373..65bb5de 100755 --- a/regula/documentreader/webclient/gen/__init__.py +++ b/regula/documentreader/webclient/gen/__init__.py @@ -106,6 +106,7 @@ from regula.documentreader.webclient.gen.models.license_result import LicenseResult from regula.documentreader.webclient.gen.models.license_result_all_of import LicenseResultAllOf from regula.documentreader.webclient.gen.models.light import Light +from regula.documentreader.webclient.gen.models.list_transactions_by_tag_response import ListTransactionsByTagResponse from regula.documentreader.webclient.gen.models.list_verified_fields import ListVerifiedFields from regula.documentreader.webclient.gen.models.liveness_params import LivenessParams from regula.documentreader.webclient.gen.models.log_level import LogLevel diff --git a/regula/documentreader/webclient/gen/api/transaction_api.py b/regula/documentreader/webclient/gen/api/transaction_api.py index cf99b0e..992003f 100644 --- a/regula/documentreader/webclient/gen/api/transaction_api.py +++ b/regula/documentreader/webclient/gen/api/transaction_api.py @@ -175,7 +175,7 @@ def api_v2_tag_tag_id_transactions_get(self, tag_id, **kwargs): # noqa: E501 >>> result = thread.get() :param tag_id: Tag id (required) - :type tag_id: int + :type tag_id: str :param async_req: Whether to execute the request asynchronously. :type async_req: bool, optional :param _preload_content: if False, the urllib3.HTTPResponse object will @@ -189,7 +189,7 @@ def api_v2_tag_tag_id_transactions_get(self, tag_id, **kwargs): # noqa: E501 :return: Returns the result object. If the method is called asynchronously, returns the request thread. - :rtype: list[GetTransactionsByTagResponse] + :rtype: ListTransactionsByTagResponse """ kwargs['_return_http_data_only'] = True return self.api_v2_tag_tag_id_transactions_get_with_http_info(tag_id, **kwargs) # noqa: E501 @@ -204,7 +204,7 @@ def api_v2_tag_tag_id_transactions_get_with_http_info(self, tag_id, **kwargs): >>> result = thread.get() :param tag_id: Tag id (required) - :type tag_id: int + :type tag_id: str :param async_req: Whether to execute the request asynchronously. :type async_req: bool, optional :param _return_http_data_only: response data without head status code @@ -225,7 +225,7 @@ def api_v2_tag_tag_id_transactions_get_with_http_info(self, tag_id, **kwargs): :return: Returns the result object. If the method is called asynchronously, returns the request thread. - :rtype: tuple(list[GetTransactionsByTagResponse], status_code(int), headers(HTTPHeaderDict)) + :rtype: tuple(ListTransactionsByTagResponse, status_code(int), headers(HTTPHeaderDict)) """ local_var_params = locals() @@ -278,7 +278,7 @@ def api_v2_tag_tag_id_transactions_get_with_http_info(self, tag_id, **kwargs): auth_settings = [] # noqa: E501 response_types_map = { - 200: "list[GetTransactionsByTagResponse]", + 200: "ListTransactionsByTagResponse", 400: None, 403: None, } diff --git a/regula/documentreader/webclient/gen/models/__init__.py b/regula/documentreader/webclient/gen/models/__init__.py index 3e92510..d8e11f0 100755 --- a/regula/documentreader/webclient/gen/models/__init__.py +++ b/regula/documentreader/webclient/gen/models/__init__.py @@ -89,6 +89,7 @@ from regula.documentreader.webclient.gen.models.license_result import LicenseResult from regula.documentreader.webclient.gen.models.license_result_all_of import LicenseResultAllOf from regula.documentreader.webclient.gen.models.light import Light +from regula.documentreader.webclient.gen.models.list_transactions_by_tag_response import ListTransactionsByTagResponse from regula.documentreader.webclient.gen.models.list_verified_fields import ListVerifiedFields from regula.documentreader.webclient.gen.models.liveness_params import LivenessParams from regula.documentreader.webclient.gen.models.log_level import LogLevel diff --git a/regula/documentreader/webclient/gen/models/authenticity_check_result_item.py b/regula/documentreader/webclient/gen/models/authenticity_check_result_item.py index af810ba..c95f1ac 100644 --- a/regula/documentreader/webclient/gen/models/authenticity_check_result_item.py +++ b/regula/documentreader/webclient/gen/models/authenticity_check_result_item.py @@ -34,13 +34,15 @@ class AuthenticityCheckResultItem(object): openapi_types = { 'type': 'int', 'element_result': 'CheckResult', - 'element_diagnose': 'CheckDiagnose' + 'element_diagnose': 'CheckDiagnose', + 'percent_value': 'int' } attribute_map = { 'type': 'Type', 'element_result': 'ElementResult', - 'element_diagnose': 'ElementDiagnose' + 'element_diagnose': 'ElementDiagnose', + 'percent_value': 'PercentValue' } discriminator_value_class_map = { 1 : 'SecurityFeatureResult', @@ -67,7 +69,7 @@ class AuthenticityCheckResultItem(object): 8388608 : 'SecurityFeatureResult', } - def __init__(self, type=0, element_result=None, element_diagnose=None, local_vars_configuration=None): # noqa: E501 + def __init__(self, type=0, element_result=None, element_diagnose=None, percent_value=None, local_vars_configuration=None): # noqa: E501 """AuthenticityCheckResultItem - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() @@ -76,6 +78,7 @@ def __init__(self, type=0, element_result=None, element_diagnose=None, local_var self._type = None self._element_result = None self._element_diagnose = None + self._percent_value = None self.discriminator = 'type' self.type = type @@ -83,6 +86,8 @@ def __init__(self, type=0, element_result=None, element_diagnose=None, local_var self.element_result = element_result if element_diagnose is not None: self.element_diagnose = element_diagnose + if percent_value is not None: + self.percent_value = percent_value @property def type(self): @@ -151,6 +156,27 @@ def element_diagnose(self, element_diagnose): self._element_diagnose = element_diagnose + @property + def percent_value(self): + """Gets the percent_value of this AuthenticityCheckResultItem. # noqa: E501 + + + :return: The percent_value of this AuthenticityCheckResultItem. # noqa: E501 + :rtype: int + """ + return self._percent_value + + @percent_value.setter + def percent_value(self, percent_value): + """Sets the percent_value of this AuthenticityCheckResultItem. + + + :param percent_value: The percent_value of this AuthenticityCheckResultItem. # noqa: E501 + :type percent_value: int + """ + + self._percent_value = percent_value + def get_real_child_model(self, data): """Returns the real base class specified by the discriminator""" discriminator_key = self.attribute_map[self.discriminator] diff --git a/regula/documentreader/webclient/gen/models/fiber_result.py b/regula/documentreader/webclient/gen/models/fiber_result.py index 4fc861c..ceb6149 100644 --- a/regula/documentreader/webclient/gen/models/fiber_result.py +++ b/regula/documentreader/webclient/gen/models/fiber_result.py @@ -35,6 +35,7 @@ class FiberResult(object): 'type': 'int', 'element_result': 'CheckResult', 'element_diagnose': 'CheckDiagnose', + 'percent_value': 'int', 'rect_count': 'int', 'expected_count': 'int', 'light_value': 'Light', @@ -50,6 +51,7 @@ class FiberResult(object): 'type': 'Type', 'element_result': 'ElementResult', 'element_diagnose': 'ElementDiagnose', + 'percent_value': 'PercentValue', 'rect_count': 'RectCount', 'expected_count': 'ExpectedCount', 'light_value': 'LightValue', @@ -61,7 +63,7 @@ class FiberResult(object): 'color_values': 'ColorValues' } - def __init__(self, type=0, element_result=None, element_diagnose=None, rect_count=None, expected_count=None, light_value=None, light_disp=None, rect_array=None, width=None, length=None, area=None, color_values=None, local_vars_configuration=None): # noqa: E501 + def __init__(self, type=0, element_result=None, element_diagnose=None, percent_value=None, rect_count=None, expected_count=None, light_value=None, light_disp=None, rect_array=None, width=None, length=None, area=None, color_values=None, local_vars_configuration=None): # noqa: E501 """FiberResult - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() @@ -70,6 +72,7 @@ def __init__(self, type=0, element_result=None, element_diagnose=None, rect_coun self._type = None self._element_result = None self._element_diagnose = None + self._percent_value = None self._rect_count = None self._expected_count = None self._light_value = None @@ -86,6 +89,8 @@ def __init__(self, type=0, element_result=None, element_diagnose=None, rect_coun self.element_result = element_result if element_diagnose is not None: self.element_diagnose = element_diagnose + if percent_value is not None: + self.percent_value = percent_value if rect_count is not None: self.rect_count = rect_count if expected_count is not None: @@ -172,6 +177,27 @@ def element_diagnose(self, element_diagnose): self._element_diagnose = element_diagnose + @property + def percent_value(self): + """Gets the percent_value of this FiberResult. # noqa: E501 + + + :return: The percent_value of this FiberResult. # noqa: E501 + :rtype: int + """ + return self._percent_value + + @percent_value.setter + def percent_value(self, percent_value): + """Sets the percent_value of this FiberResult. + + + :param percent_value: The percent_value of this FiberResult. # noqa: E501 + :type percent_value: int + """ + + self._percent_value = percent_value + @property def rect_count(self): """Gets the rect_count of this FiberResult. # noqa: E501 diff --git a/regula/documentreader/webclient/gen/models/ident_result.py b/regula/documentreader/webclient/gen/models/ident_result.py index 36121b8..3b28a47 100644 --- a/regula/documentreader/webclient/gen/models/ident_result.py +++ b/regula/documentreader/webclient/gen/models/ident_result.py @@ -35,12 +35,12 @@ class IdentResult(object): 'type': 'int', 'element_result': 'CheckResult', 'element_diagnose': 'CheckDiagnose', + 'percent_value': 'int', 'element_type': 'SecurityFeatureType', 'light_index': 'Light', 'area': 'RectangleCoordinates', 'image': 'ImageData', 'etalon_image': 'ImageData', - 'percent_value': 'int', 'area_list': 'AreaContainer' } @@ -48,16 +48,16 @@ class IdentResult(object): 'type': 'Type', 'element_result': 'ElementResult', 'element_diagnose': 'ElementDiagnose', + 'percent_value': 'PercentValue', 'element_type': 'ElementType', 'light_index': 'LightIndex', 'area': 'Area', 'image': 'Image', 'etalon_image': 'EtalonImage', - 'percent_value': 'PercentValue', 'area_list': 'AreaList' } - def __init__(self, type=0, element_result=None, element_diagnose=None, element_type=None, light_index=None, area=None, image=None, etalon_image=None, percent_value=None, area_list=None, local_vars_configuration=None): # noqa: E501 + def __init__(self, type=0, element_result=None, element_diagnose=None, percent_value=None, element_type=None, light_index=None, area=None, image=None, etalon_image=None, area_list=None, local_vars_configuration=None): # noqa: E501 """IdentResult - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() @@ -66,12 +66,12 @@ def __init__(self, type=0, element_result=None, element_diagnose=None, element_t self._type = None self._element_result = None self._element_diagnose = None + self._percent_value = None self._element_type = None self._light_index = None self._area = None self._image = None self._etalon_image = None - self._percent_value = None self._area_list = None self.discriminator = None @@ -80,6 +80,8 @@ def __init__(self, type=0, element_result=None, element_diagnose=None, element_t self.element_result = element_result if element_diagnose is not None: self.element_diagnose = element_diagnose + if percent_value is not None: + self.percent_value = percent_value if element_type is not None: self.element_type = element_type if light_index is not None: @@ -90,8 +92,6 @@ def __init__(self, type=0, element_result=None, element_diagnose=None, element_t self.image = image if etalon_image is not None: self.etalon_image = etalon_image - if percent_value is not None: - self.percent_value = percent_value if area_list is not None: self.area_list = area_list @@ -162,6 +162,29 @@ def element_diagnose(self, element_diagnose): self._element_diagnose = element_diagnose + @property + def percent_value(self): + """Gets the percent_value of this IdentResult. # noqa: E501 + + Probability percent for IMAGE_PATTERN check or element's visibility for IR_VISIBILITY # noqa: E501 + + :return: The percent_value of this IdentResult. # noqa: E501 + :rtype: int + """ + return self._percent_value + + @percent_value.setter + def percent_value(self, percent_value): + """Sets the percent_value of this IdentResult. + + Probability percent for IMAGE_PATTERN check or element's visibility for IR_VISIBILITY # noqa: E501 + + :param percent_value: The percent_value of this IdentResult. # noqa: E501 + :type percent_value: int + """ + + self._percent_value = percent_value + @property def element_type(self): """Gets the element_type of this IdentResult. # noqa: E501 @@ -267,29 +290,6 @@ def etalon_image(self, etalon_image): self._etalon_image = etalon_image - @property - def percent_value(self): - """Gets the percent_value of this IdentResult. # noqa: E501 - - Probability percent for IMAGE_PATTERN check or element's visibility for IR_VISIBILITY # noqa: E501 - - :return: The percent_value of this IdentResult. # noqa: E501 - :rtype: int - """ - return self._percent_value - - @percent_value.setter - def percent_value(self, percent_value): - """Sets the percent_value of this IdentResult. - - Probability percent for IMAGE_PATTERN check or element's visibility for IR_VISIBILITY # noqa: E501 - - :param percent_value: The percent_value of this IdentResult. # noqa: E501 - :type percent_value: int - """ - - self._percent_value = percent_value - @property def area_list(self): """Gets the area_list of this IdentResult. # noqa: E501 diff --git a/regula/documentreader/webclient/gen/models/list_transactions_by_tag_response.py b/regula/documentreader/webclient/gen/models/list_transactions_by_tag_response.py new file mode 100644 index 0000000..3ad24f1 --- /dev/null +++ b/regula/documentreader/webclient/gen/models/list_transactions_by_tag_response.py @@ -0,0 +1,145 @@ +# coding: utf-8 + +""" + Generated by: https://openapi-generator.tech +""" + +import pprint +import re # noqa: F401 + +import six + +from regula.documentreader.webclient.gen.configuration import Configuration +# this line was added to enable pycharm type hinting +from regula.documentreader.webclient.gen.models import * + + +""" + +""" +class ListTransactionsByTagResponse(object): + """NOTE: This class is auto generated by OpenAPI Generator. + Ref: https://openapi-generator.tech + + Do not edit the class manually. + """ + + """ + Attributes: + openapi_types (dict): The key is attribute name + and the value is attribute type. + attribute_map (dict): The key is attribute name + and the value is json key in definition. + """ + openapi_types = { + 'items': 'list[GetTransactionsByTagResponse]', + 'metadata': 'dict(str, object)' + } + + attribute_map = { + 'items': 'items', + 'metadata': 'metadata' + } + + def __init__(self, items=None, metadata=None, local_vars_configuration=None): # noqa: E501 + """ListTransactionsByTagResponse - a model defined in OpenAPI""" # noqa: E501 + if local_vars_configuration is None: + local_vars_configuration = Configuration() + self.local_vars_configuration = local_vars_configuration + + self._items = None + self._metadata = None + self.discriminator = None + + if items is not None: + self.items = items + if metadata is not None: + self.metadata = metadata + + @property + def items(self): + """Gets the items of this ListTransactionsByTagResponse. # noqa: E501 + + + :return: The items of this ListTransactionsByTagResponse. # noqa: E501 + :rtype: list[GetTransactionsByTagResponse] + """ + return self._items + + @items.setter + def items(self, items): + """Sets the items of this ListTransactionsByTagResponse. + + + :param items: The items of this ListTransactionsByTagResponse. # noqa: E501 + :type items: list[GetTransactionsByTagResponse] + """ + + self._items = items + + @property + def metadata(self): + """Gets the metadata of this ListTransactionsByTagResponse. # noqa: E501 + + + :return: The metadata of this ListTransactionsByTagResponse. # noqa: E501 + :rtype: dict(str, object) + """ + return self._metadata + + @metadata.setter + def metadata(self, metadata): + """Sets the metadata of this ListTransactionsByTagResponse. + + + :param metadata: The metadata of this ListTransactionsByTagResponse. # noqa: E501 + :type metadata: dict(str, object) + """ + + self._metadata = metadata + + def to_dict(self): + """Returns the model properties as a dict""" + result = {} + + for attr, _ in six.iteritems(self.openapi_types): + value = getattr(self, attr) + if isinstance(value, list): + result[attr] = list(map( + lambda x: x.to_dict() if hasattr(x, "to_dict") else x, + value + )) + elif hasattr(value, "to_dict"): + result[attr] = value.to_dict() + elif isinstance(value, dict): + result[attr] = dict(map( + lambda item: (item[0], item[1].to_dict()) + if hasattr(item[1], "to_dict") else item, + value.items() + )) + else: + result[attr] = value + + return result + + def to_str(self): + """Returns the string representation of the model""" + return pprint.pformat(self.to_dict()) + + def __repr__(self): + """For `print` and `pprint`""" + return self.to_str() + + def __eq__(self, other): + """Returns true if both objects are equal""" + if not isinstance(other, ListTransactionsByTagResponse): + return False + + return self.to_dict() == other.to_dict() + + def __ne__(self, other): + """Returns true if both objects are not equal""" + if not isinstance(other, ListTransactionsByTagResponse): + return True + + return self.to_dict() != other.to_dict() diff --git a/regula/documentreader/webclient/gen/models/ocr_security_text_result.py b/regula/documentreader/webclient/gen/models/ocr_security_text_result.py index 66da304..19f40b1 100644 --- a/regula/documentreader/webclient/gen/models/ocr_security_text_result.py +++ b/regula/documentreader/webclient/gen/models/ocr_security_text_result.py @@ -35,6 +35,7 @@ class OCRSecurityTextResult(object): 'type': 'int', 'element_result': 'CheckResult', 'element_diagnose': 'CheckDiagnose', + 'percent_value': 'int', 'critical_flag': 'Critical', 'light_type': 'Light', 'field_rect': 'RectangleCoordinates', @@ -51,6 +52,7 @@ class OCRSecurityTextResult(object): 'type': 'Type', 'element_result': 'ElementResult', 'element_diagnose': 'ElementDiagnose', + 'percent_value': 'PercentValue', 'critical_flag': 'CriticalFlag', 'light_type': 'LightType', 'field_rect': 'FieldRect', @@ -63,7 +65,7 @@ class OCRSecurityTextResult(object): 'reserved2': 'Reserved2' } - def __init__(self, type=0, element_result=None, element_diagnose=None, critical_flag=None, light_type=None, field_rect=None, etalon_result_type=None, etalon_field_type=None, etalon_light_type=None, security_text_result_ocr=None, etalon_result_ocr=None, reserved1=None, reserved2=None, local_vars_configuration=None): # noqa: E501 + def __init__(self, type=0, element_result=None, element_diagnose=None, percent_value=None, critical_flag=None, light_type=None, field_rect=None, etalon_result_type=None, etalon_field_type=None, etalon_light_type=None, security_text_result_ocr=None, etalon_result_ocr=None, reserved1=None, reserved2=None, local_vars_configuration=None): # noqa: E501 """OCRSecurityTextResult - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() @@ -72,6 +74,7 @@ def __init__(self, type=0, element_result=None, element_diagnose=None, critical_ self._type = None self._element_result = None self._element_diagnose = None + self._percent_value = None self._critical_flag = None self._light_type = None self._field_rect = None @@ -89,6 +92,8 @@ def __init__(self, type=0, element_result=None, element_diagnose=None, critical_ self.element_result = element_result if element_diagnose is not None: self.element_diagnose = element_diagnose + if percent_value is not None: + self.percent_value = percent_value if critical_flag is not None: self.critical_flag = critical_flag if light_type is not None: @@ -177,6 +182,27 @@ def element_diagnose(self, element_diagnose): self._element_diagnose = element_diagnose + @property + def percent_value(self): + """Gets the percent_value of this OCRSecurityTextResult. # noqa: E501 + + + :return: The percent_value of this OCRSecurityTextResult. # noqa: E501 + :rtype: int + """ + return self._percent_value + + @percent_value.setter + def percent_value(self, percent_value): + """Sets the percent_value of this OCRSecurityTextResult. + + + :param percent_value: The percent_value of this OCRSecurityTextResult. # noqa: E501 + :type percent_value: int + """ + + self._percent_value = percent_value + @property def critical_flag(self): """Gets the critical_flag of this OCRSecurityTextResult. # noqa: E501 diff --git a/regula/documentreader/webclient/gen/models/photo_ident_result.py b/regula/documentreader/webclient/gen/models/photo_ident_result.py index 1e959e1..6b14d4e 100644 --- a/regula/documentreader/webclient/gen/models/photo_ident_result.py +++ b/regula/documentreader/webclient/gen/models/photo_ident_result.py @@ -35,6 +35,7 @@ class PhotoIdentResult(object): 'type': 'int', 'element_result': 'CheckResult', 'element_diagnose': 'CheckDiagnose', + 'percent_value': 'int', 'light_index': 'Light', 'area': 'RectangleCoordinates', 'source_image': 'ImageData', @@ -50,6 +51,7 @@ class PhotoIdentResult(object): 'type': 'Type', 'element_result': 'ElementResult', 'element_diagnose': 'ElementDiagnose', + 'percent_value': 'PercentValue', 'light_index': 'LightIndex', 'area': 'Area', 'source_image': 'SourceImage', @@ -61,7 +63,7 @@ class PhotoIdentResult(object): 'reserved3': 'Reserved3' } - def __init__(self, type=0, element_result=None, element_diagnose=None, light_index=None, area=None, source_image=None, result_images=None, field_types_count=None, field_types_list=None, step=None, angle=None, reserved3=None, local_vars_configuration=None): # noqa: E501 + def __init__(self, type=0, element_result=None, element_diagnose=None, percent_value=None, light_index=None, area=None, source_image=None, result_images=None, field_types_count=None, field_types_list=None, step=None, angle=None, reserved3=None, local_vars_configuration=None): # noqa: E501 """PhotoIdentResult - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() @@ -70,6 +72,7 @@ def __init__(self, type=0, element_result=None, element_diagnose=None, light_ind self._type = None self._element_result = None self._element_diagnose = None + self._percent_value = None self._light_index = None self._area = None self._source_image = None @@ -86,6 +89,8 @@ def __init__(self, type=0, element_result=None, element_diagnose=None, light_ind self.element_result = element_result if element_diagnose is not None: self.element_diagnose = element_diagnose + if percent_value is not None: + self.percent_value = percent_value if light_index is not None: self.light_index = light_index if area is not None: @@ -172,6 +177,27 @@ def element_diagnose(self, element_diagnose): self._element_diagnose = element_diagnose + @property + def percent_value(self): + """Gets the percent_value of this PhotoIdentResult. # noqa: E501 + + + :return: The percent_value of this PhotoIdentResult. # noqa: E501 + :rtype: int + """ + return self._percent_value + + @percent_value.setter + def percent_value(self, percent_value): + """Sets the percent_value of this PhotoIdentResult. + + + :param percent_value: The percent_value of this PhotoIdentResult. # noqa: E501 + :type percent_value: int + """ + + self._percent_value = percent_value + @property def light_index(self): """Gets the light_index of this PhotoIdentResult. # noqa: E501 diff --git a/regula/documentreader/webclient/gen/models/security_feature_result.py b/regula/documentreader/webclient/gen/models/security_feature_result.py index 2abbdb2..4f60065 100644 --- a/regula/documentreader/webclient/gen/models/security_feature_result.py +++ b/regula/documentreader/webclient/gen/models/security_feature_result.py @@ -35,6 +35,7 @@ class SecurityFeatureResult(object): 'type': 'int', 'element_result': 'CheckResult', 'element_diagnose': 'CheckDiagnose', + 'percent_value': 'int', 'element_type': 'SecurityFeatureType', 'element_rect': 'RectangleCoordinates', 'visibility': 'Visibility', @@ -47,6 +48,7 @@ class SecurityFeatureResult(object): 'type': 'Type', 'element_result': 'ElementResult', 'element_diagnose': 'ElementDiagnose', + 'percent_value': 'PercentValue', 'element_type': 'ElementType', 'element_rect': 'ElementRect', 'visibility': 'Visibility', @@ -55,7 +57,7 @@ class SecurityFeatureResult(object): 'reserved2': 'Reserved2' } - def __init__(self, type=0, element_result=None, element_diagnose=None, element_type=None, element_rect=None, visibility=None, critical_flag=None, area_list=None, reserved2=None, local_vars_configuration=None): # noqa: E501 + def __init__(self, type=0, element_result=None, element_diagnose=None, percent_value=None, element_type=None, element_rect=None, visibility=None, critical_flag=None, area_list=None, reserved2=None, local_vars_configuration=None): # noqa: E501 """SecurityFeatureResult - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() @@ -64,6 +66,7 @@ def __init__(self, type=0, element_result=None, element_diagnose=None, element_t self._type = None self._element_result = None self._element_diagnose = None + self._percent_value = None self._element_type = None self._element_rect = None self._visibility = None @@ -77,6 +80,8 @@ def __init__(self, type=0, element_result=None, element_diagnose=None, element_t self.element_result = element_result if element_diagnose is not None: self.element_diagnose = element_diagnose + if percent_value is not None: + self.percent_value = percent_value if element_type is not None: self.element_type = element_type if element_rect is not None: @@ -157,6 +162,27 @@ def element_diagnose(self, element_diagnose): self._element_diagnose = element_diagnose + @property + def percent_value(self): + """Gets the percent_value of this SecurityFeatureResult. # noqa: E501 + + + :return: The percent_value of this SecurityFeatureResult. # noqa: E501 + :rtype: int + """ + return self._percent_value + + @percent_value.setter + def percent_value(self, percent_value): + """Sets the percent_value of this SecurityFeatureResult. + + + :param percent_value: The percent_value of this SecurityFeatureResult. # noqa: E501 + :type percent_value: int + """ + + self._percent_value = percent_value + @property def element_type(self): """Gets the element_type of this SecurityFeatureResult. # noqa: E501 From d29b2ca50273b4fd7f75c77bb22919328f378bc4 Mon Sep 17 00:00:00 2001 From: = <=> Date: Wed, 11 Sep 2024 18:24:36 +0300 Subject: [PATCH 03/10] update pip dependencies --- Pipfile | 4 +- Pipfile.lock | 372 +++++++++++++++++++++++++++------------------------ 2 files changed, 197 insertions(+), 179 deletions(-) diff --git a/Pipfile b/Pipfile index 856b3b1..81bcd76 100755 --- a/Pipfile +++ b/Pipfile @@ -14,11 +14,11 @@ requests = ">=2.32.3" [dev-packages] setuptools = ">=21.0.0" -pipenv-setup = "*" +pipenv-setup = ">=3.2.0" wheel = "*" twine = "*" chardet = "*" -packaging = ">=22.0" +packaging = "*" [requires] python_version = "3.8" diff --git a/Pipfile.lock b/Pipfile.lock index 322e187..11127de 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "f1b41660b7ccddbb57bdc8d771edecb32be5f0e37c25e66b577bfb93ad230356" + "sha256": "513a03441745bc3533191ed60eb7ee16facd34f9ad508cc2918cdc6db6be422b" }, "pipfile-spec": 6, "requires": { @@ -22,6 +22,7 @@ "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9" ], "index": "pypi", + "markers": "python_version >= '3.6'", "version": "==2024.8.30" }, "charset-normalizer": { @@ -134,6 +135,7 @@ "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0" ], "index": "pypi", + "markers": "python_version >= '3.5'", "version": "==3.7" }, "python-dateutil": { @@ -142,6 +144,7 @@ "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427" ], "index": "pypi", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.9.0.post0" }, "requests": { @@ -150,6 +153,7 @@ "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6" ], "index": "pypi", + "markers": "python_version >= '3.8'", "version": "==2.32.3" }, "six": { @@ -158,6 +162,7 @@ "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], "index": "pypi", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.16.0" }, "urllib3": { @@ -166,6 +171,7 @@ "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168" ], "index": "pypi", + "markers": "python_version >= '3.8'", "version": "==2.2.2" }, "vistir": { @@ -174,24 +180,18 @@ "sha256:a8beb7643d07779cdda3941a08dad77d48de94883dbd3cb2b9b5ecb7eb7c0994" ], "index": "pypi", + "markers": "python_version not in '3.0, 3.1, 3.2, 3.3' and python_version >= '3.7'", "version": "==0.6.1" } }, "develop": { - "appdirs": { - "hashes": [ - "sha256:9e5896d1372858f8dd3344faf4e5014d21849c756c8d5701f78f8a103b372d92", - "sha256:d8b24664561d0d34ddfaec54636d502d7cea6e29c3eaf68f3df6180863e2166e" - ], - "version": "==1.4.3" - }, "attrs": { "hashes": [ - "sha256:69c0dbf2ed392de1cb5ec704444b08a5ef81680a61cb899dc08127123af36a79", - "sha256:f0b870f674851ecbfbbbd364d6b5cbdff9dcedbc7f3f5e18a6891057f21fe399" + "sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346", + "sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==19.1.0" + "markers": "python_version >= '3.7'", + "version": "==24.2.0" }, "backports.tarfile": { "hashes": [ @@ -201,13 +201,19 @@ "markers": "python_version < '3.12'", "version": "==1.2.0" }, - "black": { + "cached-property": { "hashes": [ - "sha256:09a9dcb7c46ed496a9850b76e4e825d6049ecd38b611f1224857a79bd985a8cf", - "sha256:68950ffd4d9169716bcb8719a56c07a2f4485354fec061cdd5910aa07369731c" + "sha256:9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130", + "sha256:df4f613cf7ad9a588cc381aaf4a512d26265ecebd5eb9e1ba12f1319eb85a6a0" ], - "markers": "python_version >= '3.6'", - "version": "==19.3b0" + "version": "==1.5.2" + }, + "cerberus": { + "hashes": [ + "sha256:7649a5815024d18eb7c6aa5e7a95355c649a53aacfc9b050e9d0bf6bfa2af372", + "sha256:81011e10266ef71b6ec6d50e60171258a5b134d69f8fb387d16e4936d0d47642" + ], + "version": "==1.3.5" }, "certifi": { "hashes": [ @@ -215,88 +221,17 @@ "sha256:bec941d2aa8195e248a60b31ff9f0558284cf01a52591ceda73ea9afffd69fd9" ], "index": "pypi", + "markers": "python_version >= '3.6'", "version": "==2024.8.30" }, - "cffi": { - "hashes": [ - "sha256:011aff3524d578a9412c8b3cfaa50f2c0bd78e03eb7af7aa5e0df59b158efb2f", - "sha256:0a048d4f6630113e54bb4b77e315e1ba32a5a31512c31a273807d0027a7e69ab", - "sha256:0bb15e7acf8ab35ca8b24b90af52c8b391690ef5c4aec3d31f38f0d37d2cc499", - "sha256:0d46ee4764b88b91f16661a8befc6bfb24806d885e27436fdc292ed7e6f6d058", - "sha256:0e60821d312f99d3e1569202518dddf10ae547e799d75aef3bca3a2d9e8ee693", - "sha256:0fdacad9e0d9fc23e519efd5ea24a70348305e8d7d85ecbb1a5fa66dc834e7fb", - "sha256:14b9cbc8f7ac98a739558eb86fabc283d4d564dafed50216e7f7ee62d0d25377", - "sha256:17c6d6d3260c7f2d94f657e6872591fe8733872a86ed1345bda872cfc8c74885", - "sha256:1a2ddbac59dc3716bc79f27906c010406155031a1c801410f1bafff17ea304d2", - "sha256:2404f3de742f47cb62d023f0ba7c5a916c9c653d5b368cc966382ae4e57da401", - "sha256:24658baf6224d8f280e827f0a50c46ad819ec8ba380a42448e24459daf809cf4", - "sha256:24aa705a5f5bd3a8bcfa4d123f03413de5d86e497435693b638cbffb7d5d8a1b", - "sha256:2770bb0d5e3cc0e31e7318db06efcbcdb7b31bcb1a70086d3177692a02256f59", - "sha256:331ad15c39c9fe9186ceaf87203a9ecf5ae0ba2538c9e898e3a6967e8ad3db6f", - "sha256:3aa9d43b02a0c681f0bfbc12d476d47b2b2b6a3f9287f11ee42989a268a1833c", - "sha256:41f4915e09218744d8bae14759f983e466ab69b178de38066f7579892ff2a555", - "sha256:4304d4416ff032ed50ad6bb87416d802e67139e31c0bde4628f36a47a3164bfa", - "sha256:435a22d00ec7d7ea533db494da8581b05977f9c37338c80bc86314bec2619424", - "sha256:45f7cd36186db767d803b1473b3c659d57a23b5fa491ad83c6d40f2af58e4dbb", - "sha256:48b389b1fd5144603d61d752afd7167dfd205973a43151ae5045b35793232aa2", - "sha256:4e67d26532bfd8b7f7c05d5a766d6f437b362c1bf203a3a5ce3593a645e870b8", - "sha256:516a405f174fd3b88829eabfe4bb296ac602d6a0f68e0d64d5ac9456194a5b7e", - "sha256:5ba5c243f4004c750836f81606a9fcb7841f8874ad8f3bf204ff5e56332b72b9", - "sha256:5bdc0f1f610d067c70aa3737ed06e2726fd9d6f7bfee4a351f4c40b6831f4e82", - "sha256:6107e445faf057c118d5050560695e46d272e5301feffda3c41849641222a828", - "sha256:6327b572f5770293fc062a7ec04160e89741e8552bf1c358d1a23eba68166759", - "sha256:669b29a9eca6146465cc574659058ed949748f0809a2582d1f1a324eb91054dc", - "sha256:6ce01337d23884b21c03869d2f68c5523d43174d4fc405490eb0091057943118", - "sha256:6d872186c1617d143969defeadac5a904e6e374183e07977eedef9c07c8953bf", - "sha256:6f76a90c345796c01d85e6332e81cab6d70de83b829cf1d9762d0a3da59c7932", - "sha256:70d2aa9fb00cf52034feac4b913181a6e10356019b18ef89bc7c12a283bf5f5a", - "sha256:7cbc78dc018596315d4e7841c8c3a7ae31cc4d638c9b627f87d52e8abaaf2d29", - "sha256:856bf0924d24e7f93b8aee12a3a1095c34085600aa805693fb7f5d1962393206", - "sha256:8a98748ed1a1df4ee1d6f927e151ed6c1a09d5ec21684de879c7ea6aa96f58f2", - "sha256:93a7350f6706b31f457c1457d3a3259ff9071a66f312ae64dc024f049055f72c", - "sha256:964823b2fc77b55355999ade496c54dde161c621cb1f6eac61dc30ed1b63cd4c", - "sha256:a003ac9edc22d99ae1286b0875c460351f4e101f8c9d9d2576e78d7e048f64e0", - "sha256:a0ce71725cacc9ebf839630772b07eeec220cbb5f03be1399e0457a1464f8e1a", - "sha256:a47eef975d2b8b721775a0fa286f50eab535b9d56c70a6e62842134cf7841195", - "sha256:a8b5b9712783415695663bd463990e2f00c6750562e6ad1d28e072a611c5f2a6", - "sha256:a9015f5b8af1bb6837a3fcb0cdf3b874fe3385ff6274e8b7925d81ccaec3c5c9", - "sha256:aec510255ce690d240f7cb23d7114f6b351c733a74c279a84def763660a2c3bc", - "sha256:b00e7bcd71caa0282cbe3c90966f738e2db91e64092a877c3ff7f19a1628fdcb", - "sha256:b50aaac7d05c2c26dfd50c3321199f019ba76bb650e346a6ef3616306eed67b0", - "sha256:b7b6ea9e36d32582cda3465f54c4b454f62f23cb083ebc7a94e2ca6ef011c3a7", - "sha256:bb9333f58fc3a2296fb1d54576138d4cf5d496a2cc118422bd77835e6ae0b9cb", - "sha256:c1c13185b90bbd3f8b5963cd8ce7ad4ff441924c31e23c975cb150e27c2bf67a", - "sha256:c3b8bd3133cd50f6b637bb4322822c94c5ce4bf0d724ed5ae70afce62187c492", - "sha256:c5d97162c196ce54af6700949ddf9409e9833ef1003b4741c2b39ef46f1d9720", - "sha256:c815270206f983309915a6844fe994b2fa47e5d05c4c4cef267c3b30e34dbe42", - "sha256:cab2eba3830bf4f6d91e2d6718e0e1c14a2f5ad1af68a89d24ace0c6b17cced7", - "sha256:d1df34588123fcc88c872f5acb6f74ae59e9d182a2707097f9e28275ec26a12d", - "sha256:d6bdcd415ba87846fd317bee0774e412e8792832e7805938987e4ede1d13046d", - "sha256:db9a30ec064129d605d0f1aedc93e00894b9334ec74ba9c6bdd08147434b33eb", - "sha256:dbc183e7bef690c9abe5ea67b7b60fdbca81aa8da43468287dae7b5c046107d4", - "sha256:dca802c8db0720ce1c49cce1149ff7b06e91ba15fa84b1d59144fef1a1bc7ac2", - "sha256:dec6b307ce928e8e112a6bb9921a1cb00a0e14979bf28b98e084a4b8a742bd9b", - "sha256:df8bb0010fdd0a743b7542589223a2816bdde4d94bb5ad67884348fa2c1c67e8", - "sha256:e4094c7b464cf0a858e75cd14b03509e84789abf7b79f8537e6a72152109c76e", - "sha256:e4760a68cab57bfaa628938e9c2971137e05ce48e762a9cb53b76c9b569f1204", - "sha256:eb09b82377233b902d4c3fbeeb7ad731cdab579c6c6fda1f763cd779139e47c3", - "sha256:eb862356ee9391dc5a0b3cbc00f416b48c1b9a52d252d898e5b7696a5f9fe150", - "sha256:ef9528915df81b8f4c7612b19b8628214c65c9b7f74db2e34a646a0a2a0da2d4", - "sha256:f3157624b7558b914cb039fd1af735e5e8049a87c817cc215109ad1c8779df76", - "sha256:f3e0992f23bbb0be00a921eae5363329253c3b86287db27092461c887b791e5e", - "sha256:f9338cc05451f1942d0d8203ec2c346c830f8e86469903d5126c1f0a13a2bcbb", - "sha256:ffef8fd58a36fb5f1196919638f73dd3ae0db1a878982b27a9a5a176ede4ba91" - ], - "markers": "platform_python_implementation != 'PyPy'", - "version": "==1.17.0" - }, "chardet": { "hashes": [ - "sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7", - "sha256:e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970" + "sha256:0368df2bfd78b5fc20572bb4e9bb7fb53e2c094f60ae9993339e8671d0afb8aa", + "sha256:d3e64f022d254183001eccc5db4040520c0f23b1a3f33d6413e099eb7f126557" ], "index": "pypi", - "version": "==5.2.0" + "markers": "python_version >= '3.6'", + "version": "==5.0.0" }, "charset-normalizer": { "hashes": [ @@ -394,54 +329,28 @@ "markers": "python_full_version >= '3.7.0'", "version": "==3.3.2" }, - "click": { + "colorama": { "hashes": [ - "sha256:2335065e6395b9e67ca716de5f7526736bfa6ceead690adf616d925bdc622b13", - "sha256:5b94b49521f6456670fdb30cd82a4eca9412788a93fa6dd6df72c94d5a8ff2d7" + "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", + "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==7.0" - }, - "cryptography": { - "hashes": [ - "sha256:014f58110f53237ace6a408b5beb6c427b64e084eb451ef25a28308270086494", - "sha256:1bbcce1a551e262dfbafb6e6252f1ae36a248e615ca44ba302df077a846a8806", - "sha256:203e92a75716d8cfb491dc47c79e17d0d9207ccffcbcb35f598fbe463ae3444d", - "sha256:27e613d7077ac613e399270253259d9d53872aaf657471473ebfc9a52935c062", - "sha256:2bd51274dcd59f09dd952afb696bf9c61a7a49dfc764c04dd33ef7a6b502a1e2", - "sha256:38926c50cff6f533f8a2dae3d7f19541432610d114a70808f0926d5aaa7121e4", - "sha256:511f4273808ab590912a93ddb4e3914dfd8a388fed883361b02dea3791f292e1", - "sha256:58d4e9129985185a06d849aa6df265bdd5a74ca6e1b736a77959b498e0505b85", - "sha256:5b43d1ea6b378b54a1dc99dd8a2b5be47658fe9a7ce0a58ff0b55f4b43ef2b84", - "sha256:61ec41068b7b74268fa86e3e9e12b9f0c21fcf65434571dbb13d954bceb08042", - "sha256:666ae11966643886c2987b3b721899d250855718d6d9ce41b521252a17985f4d", - "sha256:68aaecc4178e90719e95298515979814bda0cbada1256a4485414860bd7ab962", - "sha256:7c05650fe8023c5ed0d46793d4b7d7e6cd9c04e68eabe5b0aeea836e37bdcec2", - "sha256:80eda8b3e173f0f247f711eef62be51b599b5d425c429b5d4ca6a05e9e856baa", - "sha256:8385d98f6a3bf8bb2d65a73e17ed87a3ba84f6991c155691c51112075f9ffc5d", - "sha256:88cce104c36870d70c49c7c8fd22885875d950d9ee6ab54df2745f83ba0dc365", - "sha256:9d3cdb25fa98afdd3d0892d132b8d7139e2c087da1712041f6b762e4f807cc96", - "sha256:a575913fb06e05e6b4b814d7f7468c2c660e8bb16d8d5a1faf9b33ccc569dd47", - "sha256:ac119bb76b9faa00f48128b7f5679e1d8d437365c5d26f1c2c3f0da4ce1b553d", - "sha256:c1332724be35d23a854994ff0b66530119500b6053d0bd3363265f7e5e77288d", - "sha256:d03a475165f3134f773d1388aeb19c2d25ba88b6a9733c5c590b9ff7bbfa2e0c", - "sha256:d75601ad10b059ec832e78823b348bfa1a59f6b8d545db3a24fd44362a1564cb", - "sha256:de41fd81a41e53267cb020bb3a7212861da53a7d39f863585d13ea11049cf277", - "sha256:e710bf40870f4db63c3d7d929aa9e09e4e7ee219e703f949ec4073b4294f6172", - "sha256:ea25acb556320250756e53f9e20a4177515f012c9eaea17eb7587a8c4d8ae034", - "sha256:f98bf604c82c416bc829e490c700ca1553eafdf2912a91e23a79d97d9801372a", - "sha256:fba1007b3ef89946dbbb515aeeb41e30203b004f0b4b00e5e16078b518563289" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'", + "version": "==0.4.6" + }, + "distlib": { + "hashes": [ + "sha256:034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784", + "sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64" ], - "markers": "python_version >= '3.7'", - "version": "==43.0.1" + "version": "==0.3.8" }, "docutils": { "hashes": [ - "sha256:3a6b18732edf182daa3cd12775bbb338cf5691468f91eeeb109deff6ebfa986f", - "sha256:dafca5b9e384f0e419294eb4d2ff9fa826435bf15f15b7bd45723e8ad76811b2" + "sha256:96f387a2c5562db4476f09f13bbab2192e764cac08ebbf3a34a95d9b1e4a59d6", + "sha256:f08a4e276c3a1583a86dce3e34aba3fe04d02bba2dd51ed16106244e8a923e3b" ], - "markers": "python_version >= '3.9'", - "version": "==0.21.2" + "markers": "python_version >= '3.7'", + "version": "==0.20.1" }, "idna": { "hashes": [ @@ -449,15 +358,24 @@ "sha256:82fee1fc78add43492d3a1898bfa6d8a904cc97d8427f683ed8e798d07761aa0" ], "index": "pypi", + "markers": "python_version >= '3.5'", "version": "==3.7" }, "importlib-metadata": { "hashes": [ - "sha256:66f342cc6ac9818fc6ff340576acd24d65ba0b3efabb2b4ac08b598965a4a2f1", - "sha256:9a547d3bc3608b025f93d403fdd1aae741c24fbb8314df4b155675742ce303c5" + "sha256:45e54197d28b7a7f1559e60b95e7c567032b602131fbd588f1497f47880aa68b", + "sha256:71522656f0abace1d072b9e5481a48f07c138e00f079c38c8f883823f9c26bd7" ], "markers": "python_version >= '3.8'", - "version": "==8.4.0" + "version": "==8.5.0" + }, + "importlib-resources": { + "hashes": [ + "sha256:980862a1d16c9e147a59603677fa2aa5fd82b87f223b6cb870695bcfce830065", + "sha256:ac29d5f956f01d5e4bb63102a5a19957f1b9175e45649977264a1416783bb717" + ], + "markers": "python_version < '3.9'", + "version": "==6.4.5" }, "jaraco.classes": { "hashes": [ @@ -483,14 +401,6 @@ "markers": "python_version >= '3.8'", "version": "==4.0.2" }, - "jeepney": { - "hashes": [ - "sha256:5efe48d255973902f6badc3ce55e2aa6c5c3b3bc642059ef3a91247bcfcc5806", - "sha256:c0a454ad016ca575060802ee4d590dd912e35c122fa04e70306de3d076cce755" - ], - "markers": "sys_platform == 'linux'", - "version": "==0.8.0" - }, "keyring": { "hashes": [ "sha256:8d85a1ea5d6db8515b59e1c5d1d1678b03cf7fc8b8dcfb1651e8c4a524eb42ef", @@ -517,11 +427,11 @@ }, "more-itertools": { "hashes": [ - "sha256:0f7d9f83a0a8dcfa8a2694a770590d98a67ea943e3d9f5298309a484758c4e27", - "sha256:fe0e63c4ab068eac62410ab05cccca2dc71ec44ba8ef29916a0090df061cf923" + "sha256:037b0d3203ce90cca8ab1defbbdac29d5f993fc20131f3664dc8d6acfa872aef", + "sha256:5482bfef7849c25dc3c6dd53a6173ae4795da2a41a80faea6700d9f5846c5da6" ], "markers": "python_version >= '3.8'", - "version": "==10.4.0" + "version": "==10.5.0" }, "nh3": { "hashes": [ @@ -544,20 +454,54 @@ ], "version": "==0.2.18" }, + "orderedmultidict": { + "hashes": [ + "sha256:04070bbb5e87291cc9bfa51df413677faf2141c73c61d2a5f7b26bea3cd882ad", + "sha256:43c839a17ee3cdd62234c47deca1a8508a3f2ca1d0678a3bf791c87cf84adbf3" + ], + "version": "==1.0.1" + }, "packaging": { "hashes": [ - "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002", - "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124" + "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5", + "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a" ], "index": "pypi", - "version": "==24.1" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==20.9" + }, + "pep517": { + "hashes": [ + "sha256:1b2fa2ffd3938bb4beffe5d6146cbcb2bda996a5a4da9f31abffd8b24e07b317", + "sha256:31b206f67165b3536dd577c5c3f1518e8fbaf38cbc57efff8369a392feff1721" + ], + "markers": "python_version >= '3.6'", + "version": "==0.13.1" + }, + "pip": { + "hashes": [ + "sha256:2cd581cf58ab7fcfca4ce8efa6dcacd0de5bf8d0a3eb9ec927e07405f4d9e2a2", + "sha256:5b5e490b5e9cb275c879595064adce9ebd31b854e3e803740b72f9ccf34a45b8" + ], + "markers": "python_version >= '3.8'", + "version": "==24.2" + }, + "pip-shims": { + "hashes": [ + "sha256:089e3586a92b1b8dbbc16b2d2859331dc1c412d3e3dbcd91d80e6b30d73db96c", + "sha256:2ae9f21c0155ca5c37d2734eb5f9a7d98c4c42a122d1ba3eddbacc9d9ea9fbae" + ], + "markers": "python_version >= '3.6'", + "version": "==0.7.3" }, "pipenv-setup": { "hashes": [ - "sha256:f65fe799297facfe5ac1b03e2f55525135e0bf521ca7c175331bb59133c302b3" + "sha256:0def7ec3363f58b38a43dc59b2078fcee67b47301fd51a41b8e34e6f79812b1a", + "sha256:6ceda7145a3088494d8ca68fded4b0473022dc62eb786a021c137632c44298b5" ], "index": "pypi", - "version": "==2.0.0" + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' and python_version < '4'", + "version": "==3.2.0" }, "pipfile": { "hashes": [ @@ -573,13 +517,24 @@ "markers": "python_version >= '3.6'", "version": "==1.10.0" }, - "pycparser": { + "platformdirs": { "hashes": [ - "sha256:491c8be9c040f5390f5bf44a5b07752bd07f56edf992381b05c701439eec10f6", - "sha256:c3702b6d3dd8c7abc1afa565d7e63d53a1d0bd86cdc24edd75470f4de499cfcc" + "sha256:9e5e27a08aa095dd127b9f2e764d74254f482fef22b0970773bfba79d091ab8c", + "sha256:eb1c8582560b34ed4ba105009a4badf7f6f85768b30126f351328507b2beb617" ], "markers": "python_version >= '3.8'", - "version": "==2.22" + "version": "==4.3.2" + }, + "plette": { + "extras": [ + "validation" + ], + "hashes": [ + "sha256:0e9898513eacbcf06c6b05e9e042a7733cfb2030335532044b9b3ff84431821c", + "sha256:65cea1259d69339e518481c9f59130cea2a6f712117bee340bc4c1c10e47f9e7" + ], + "markers": "python_version >= '3.7'", + "version": "==2.1.0" }, "pygments": { "hashes": [ @@ -589,13 +544,30 @@ "markers": "python_version >= '3.8'", "version": "==2.18.0" }, + "pyparsing": { + "hashes": [ + "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", + "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" + ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.4.7" + }, + "python-dateutil": { + "hashes": [ + "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", + "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427" + ], + "index": "pypi", + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.9.0.post0" + }, "readme-renderer": { "hashes": [ - "sha256:2fbca89b81a08526aadf1357a8c2ae889ec05fb03f5da67f9769c9a592166151", - "sha256:8712034eabbfa6805cacf1402b4eeb2a73028f72d1166d6f5cb7f9c047c5d1e1" + "sha256:1818dd28140813509eeed8d62687f7cd4f7bad90d4db586001c5dc09d4fde311", + "sha256:19db308d86ecd60e5affa3b2a98f017af384678c63c88e5d4556a380e674f3f9" ], - "markers": "python_version >= '3.9'", - "version": "==44.0" + "markers": "python_version >= '3.8'", + "version": "==43.0" }, "requests": { "hashes": [ @@ -603,6 +575,7 @@ "sha256:70761cfe03c773ceb22aa2f671b4757976145175cdfca038c02654d061d6dcc6" ], "index": "pypi", + "markers": "python_version >= '3.8'", "version": "==2.32.3" }, "requests-toolbelt": { @@ -613,6 +586,14 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.0.0" }, + "requirementslib": { + "hashes": [ + "sha256:28924cf11a2fa91adb03f8431d80c2a8c3dc386f1c48fb2be9a58e4c39072354", + "sha256:d26ec6ad45e1ffce9532303543996c9c71a99dc65f783908f112e3f2aae7e49c" + ], + "markers": "python_version >= '3.7'", + "version": "==1.6.9" + }, "rfc3986": { "hashes": [ "sha256:50b1502b60e289cb37883f3dfd34532b8873c7de9f49bb546641ce9cbd256ebd", @@ -623,36 +604,53 @@ }, "rich": { "hashes": [ - "sha256:2e85306a063b9492dffc86278197a60cbece75bcb766022f3436f567cae11bdc", - "sha256:a5ac1f1cd448ade0d59cc3356f7db7a7ccda2c8cbae9c7a90c28ff463d3e91f4" + "sha256:1760a3c0848469b97b558fc61c85233e3dafb69c7a071b4d60c38099d3cd4c06", + "sha256:8260cda28e3db6bf04d2d1ef4dbc03ba80a824c88b0e7668a0f23126a424844a" ], "markers": "python_full_version >= '3.7.0'", - "version": "==13.8.0" + "version": "==13.8.1" }, - "secretstorage": { + "setuptools": { "hashes": [ - "sha256:2403533ef369eca6d2ba81718576c5e0f564d5cca1b58f73a8b23e7d4eeebd77", - "sha256:f356e6628222568e3af06f2eba8df495efa13b3b63081dafd4f7d9a7b7bc9f99" + "sha256:5f4c08aa4d3ebcb57a50c33b1b07e94315d7fc7230f7115e47fc99776c8ce308", + "sha256:95b40ed940a1c67eb70fc099094bd6e99c6ee7c23aa2306f4d2697ba7916f9c6" ], - "markers": "sys_platform == 'linux'", - "version": "==3.3.3" + "index": "pypi", + "markers": "python_version >= '3.8'", + "version": "==74.1.2" }, - "setuptools": { + "six": { "hashes": [ - "sha256:2353af060c06388be1cecbf5953dcdb1f38362f87a2356c480b6b4d5fcfc8847", - "sha256:fc91b5f89e392ef5b77fe143b17e32f65d3024744fba66dc3afe07201684d766" + "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", + "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], "index": "pypi", - "version": "==74.1.1" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==1.16.0" }, "toml": { "hashes": [ - "sha256:229f81c57791a41d65e399fc06bf0848bab550a9dfd5ed66df18ce5f05e73d5c", - "sha256:235682dd292d5899d361a811df37e04a8828a5b1da3115886b73cf81ebc9100e", - "sha256:f1db651f9657708513243e61e6cc67d101a39bad662eaa9b5546f789338e07a3" + "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b", + "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" ], "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==0.10.0" + "version": "==0.10.2" + }, + "tomli": { + "hashes": [ + "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", + "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" + ], + "markers": "python_version < '3.11'", + "version": "==2.0.1" + }, + "tomlkit": { + "hashes": [ + "sha256:7a974427f6e119197f670fbbbeae7bef749a6c14e793db934baefc1b5f03efde", + "sha256:fff5fe59a87295b278abd31bec92c15d9bc4a06885ab12bcea52c71119392e79" + ], + "markers": "python_version >= '3.8'", + "version": "==0.13.2" }, "twine": { "hashes": [ @@ -660,22 +658,42 @@ "sha256:9aa0825139c02b3434d913545c7b847a21c835e11597f5255842d457da2322db" ], "index": "pypi", + "markers": "python_version >= '3.8'", "version": "==5.1.1" }, + "typing-extensions": { + "hashes": [ + "sha256:04e5ca0351e0f3f85c6853954072df659d0d13fac324d0072316b67d7794700d", + "sha256:1a7ead55c7e559dd4dee8856e3a88b41225abfe1ce8df57b7c13915fe121ffb8" + ], + "markers": "python_version < '3.9'", + "version": "==4.12.2" + }, "urllib3": { "hashes": [ "sha256:a448b2f64d686155468037e1ace9f2d2199776e17f0a46610480d311f73e3472", "sha256:dd505485549a7a552833da5e6063639d0d177c04f23bc3864e41e5dc5f612168" ], "index": "pypi", + "markers": "python_version >= '3.8'", "version": "==2.2.2" }, + "vistir": { + "hashes": [ + "sha256:1a89a612fb667c26ed6b4ed415b01e0261e13200a350c43d1990ace0ef44d35b", + "sha256:a8beb7643d07779cdda3941a08dad77d48de94883dbd3cb2b9b5ecb7eb7c0994" + ], + "index": "pypi", + "markers": "python_version not in '3.0, 3.1, 3.2, 3.3' and python_version >= '3.7'", + "version": "==0.6.1" + }, "wheel": { "hashes": [ "sha256:2376a90c98cc337d18623527a97c31797bd02bad0033d41547043a1cbfbe448f", "sha256:a29c3f2817e95ab89aa4660681ad547c0e9547f20e75b0562fe7723c9a2a9d49" ], "index": "pypi", + "markers": "python_version >= '3.8'", "version": "==0.44.0" }, "zipp": { From 9483054c58106693c69dac876b76bb2869c8dbde Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 12 Sep 2024 11:34:43 +0300 Subject: [PATCH 04/10] check flow --- .github/workflows/pypi-publish-test.yml | 29 +++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100755 .github/workflows/pypi-publish-test.yml diff --git a/.github/workflows/pypi-publish-test.yml b/.github/workflows/pypi-publish-test.yml new file mode 100755 index 0000000..1a7d389 --- /dev/null +++ b/.github/workflows/pypi-publish-test.yml @@ -0,0 +1,29 @@ +name: test publish pypi package + +on: + push: + branches: + fix/black-vuln + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Set up Python + uses: actions/setup-python@v2 + with: + python-version: 3.8 + - name: Install pipenv + run: | + python -m pip install --upgrade pip + python -m pip install --upgrade setuptools wheel + python -m pip install --upgrade pipenv + - name: Install dependencies + run: pipenv install --dev + - name: Publish package + run: | + pipenv run pipenv install + pipenv run python setup.py sdist bdist_wheel + env: + PACKAGE_VERSION_TO_PUBLISH: "7.4.6" From 570916d92dac86a64bf5adce6dab06d4ad6c4fc3 Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 12 Sep 2024 11:46:59 +0300 Subject: [PATCH 05/10] check --- Pipfile | 4 +- Pipfile.lock | 185 +++------------------------------------------------ 2 files changed, 10 insertions(+), 179 deletions(-) diff --git a/Pipfile b/Pipfile index 81bcd76..9556b03 100755 --- a/Pipfile +++ b/Pipfile @@ -13,12 +13,12 @@ idna = "==3.7" requests = ">=2.32.3" [dev-packages] +#pipenv-setup = ">=2.1.0" setuptools = ">=21.0.0" -pipenv-setup = ">=3.2.0" wheel = "*" twine = "*" chardet = "*" -packaging = "*" +packaging = ">=22.0" [requires] python_version = "3.8" diff --git a/Pipfile.lock b/Pipfile.lock index 11127de..26cb336 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "513a03441745bc3533191ed60eb7ee16facd34f9ad508cc2918cdc6db6be422b" + "sha256": "125615b8b1d4eb7533b2f6b0e3a66d2510d510370f4599308dde65a30d22d9e1" }, "pipfile-spec": 6, "requires": { @@ -185,14 +185,6 @@ } }, "develop": { - "attrs": { - "hashes": [ - "sha256:5cfb1b9148b5b086569baec03f20d7b6bf3bcacc9a42bebf87ffaaca362f6346", - "sha256:81921eb96de3191c8258c199618104dd27ac608d9366f5e35d011eae1867ede2" - ], - "markers": "python_version >= '3.7'", - "version": "==24.2.0" - }, "backports.tarfile": { "hashes": [ "sha256:77e284d754527b01fb1e6fa8a1afe577858ebe4e9dad8919e34c862cb399bc34", @@ -201,20 +193,6 @@ "markers": "python_version < '3.12'", "version": "==1.2.0" }, - "cached-property": { - "hashes": [ - "sha256:9fa5755838eecbb2d234c3aa390bd80fbd3ac6b6869109bfc1b499f7bd89a130", - "sha256:df4f613cf7ad9a588cc381aaf4a512d26265ecebd5eb9e1ba12f1319eb85a6a0" - ], - "version": "==1.5.2" - }, - "cerberus": { - "hashes": [ - "sha256:7649a5815024d18eb7c6aa5e7a95355c649a53aacfc9b050e9d0bf6bfa2af372", - "sha256:81011e10266ef71b6ec6d50e60171258a5b134d69f8fb387d16e4936d0d47642" - ], - "version": "==1.3.5" - }, "certifi": { "hashes": [ "sha256:922820b53db7a7257ffbda3f597266d435245903d80737e34f8a45ff3e3230d8", @@ -226,12 +204,12 @@ }, "chardet": { "hashes": [ - "sha256:0368df2bfd78b5fc20572bb4e9bb7fb53e2c094f60ae9993339e8671d0afb8aa", - "sha256:d3e64f022d254183001eccc5db4040520c0f23b1a3f33d6413e099eb7f126557" + "sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7", + "sha256:e1cf59446890a00105fe7b7912492ea04b6e6f06d4b742b2c788469e34c82970" ], "index": "pypi", - "markers": "python_version >= '3.6'", - "version": "==5.0.0" + "markers": "python_version >= '3.7'", + "version": "==5.2.0" }, "charset-normalizer": { "hashes": [ @@ -329,21 +307,6 @@ "markers": "python_full_version >= '3.7.0'", "version": "==3.3.2" }, - "colorama": { - "hashes": [ - "sha256:08695f5cb7ed6e0531a20572697297273c47b8cae5a63ffc6d6ed5c201be6e44", - "sha256:4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6" - ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5, 3.6'", - "version": "==0.4.6" - }, - "distlib": { - "hashes": [ - "sha256:034db59a0b96f8ca18035f36290806a9a6e6bd9d1ff91e45a7f172eb17e51784", - "sha256:1530ea13e350031b6312d8580ddb6b27a104275a31106523b8f123787f494f64" - ], - "version": "==0.3.8" - }, "docutils": { "hashes": [ "sha256:96f387a2c5562db4476f09f13bbab2192e764cac08ebbf3a34a95d9b1e4a59d6", @@ -454,60 +417,14 @@ ], "version": "==0.2.18" }, - "orderedmultidict": { - "hashes": [ - "sha256:04070bbb5e87291cc9bfa51df413677faf2141c73c61d2a5f7b26bea3cd882ad", - "sha256:43c839a17ee3cdd62234c47deca1a8508a3f2ca1d0678a3bf791c87cf84adbf3" - ], - "version": "==1.0.1" - }, "packaging": { "hashes": [ - "sha256:5b327ac1320dc863dca72f4514ecc086f31186744b84a230374cc1fd776feae5", - "sha256:67714da7f7bc052e064859c05c595155bd1ee9f69f76557e21f051443c20947a" + "sha256:026ed72c8ed3fcce5bf8950572258698927fd1dbda10a5e981cdf0ac37f4f002", + "sha256:5b8f2217dbdbd2f7f384c41c628544e6d52f2d0f53c6d0c3ea61aa5d1d7ff124" ], "index": "pypi", - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==20.9" - }, - "pep517": { - "hashes": [ - "sha256:1b2fa2ffd3938bb4beffe5d6146cbcb2bda996a5a4da9f31abffd8b24e07b317", - "sha256:31b206f67165b3536dd577c5c3f1518e8fbaf38cbc57efff8369a392feff1721" - ], - "markers": "python_version >= '3.6'", - "version": "==0.13.1" - }, - "pip": { - "hashes": [ - "sha256:2cd581cf58ab7fcfca4ce8efa6dcacd0de5bf8d0a3eb9ec927e07405f4d9e2a2", - "sha256:5b5e490b5e9cb275c879595064adce9ebd31b854e3e803740b72f9ccf34a45b8" - ], "markers": "python_version >= '3.8'", - "version": "==24.2" - }, - "pip-shims": { - "hashes": [ - "sha256:089e3586a92b1b8dbbc16b2d2859331dc1c412d3e3dbcd91d80e6b30d73db96c", - "sha256:2ae9f21c0155ca5c37d2734eb5f9a7d98c4c42a122d1ba3eddbacc9d9ea9fbae" - ], - "markers": "python_version >= '3.6'", - "version": "==0.7.3" - }, - "pipenv-setup": { - "hashes": [ - "sha256:0def7ec3363f58b38a43dc59b2078fcee67b47301fd51a41b8e34e6f79812b1a", - "sha256:6ceda7145a3088494d8ca68fded4b0473022dc62eb786a021c137632c44298b5" - ], - "index": "pypi", - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3' and python_version < '4'", - "version": "==3.2.0" - }, - "pipfile": { - "hashes": [ - "sha256:f7d9f15de8b660986557eb3cc5391aa1a16207ac41bc378d03f414762d36c984" - ], - "version": "==0.0.2" + "version": "==24.1" }, "pkginfo": { "hashes": [ @@ -517,25 +434,6 @@ "markers": "python_version >= '3.6'", "version": "==1.10.0" }, - "platformdirs": { - "hashes": [ - "sha256:9e5e27a08aa095dd127b9f2e764d74254f482fef22b0970773bfba79d091ab8c", - "sha256:eb1c8582560b34ed4ba105009a4badf7f6f85768b30126f351328507b2beb617" - ], - "markers": "python_version >= '3.8'", - "version": "==4.3.2" - }, - "plette": { - "extras": [ - "validation" - ], - "hashes": [ - "sha256:0e9898513eacbcf06c6b05e9e042a7733cfb2030335532044b9b3ff84431821c", - "sha256:65cea1259d69339e518481c9f59130cea2a6f712117bee340bc4c1c10e47f9e7" - ], - "markers": "python_version >= '3.7'", - "version": "==2.1.0" - }, "pygments": { "hashes": [ "sha256:786ff802f32e91311bff3889f6e9a86e81505fe99f2735bb6d60ae0c5004f199", @@ -544,23 +442,6 @@ "markers": "python_version >= '3.8'", "version": "==2.18.0" }, - "pyparsing": { - "hashes": [ - "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", - "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" - ], - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==2.4.7" - }, - "python-dateutil": { - "hashes": [ - "sha256:37dd54208da7e1cd875388217d5e00ebd4179249f90fb72437e91a35459a0ad3", - "sha256:a8b2bc7bffae282281c8140a97d3aa9c14da0b136dfe83f850eea9a5f7470427" - ], - "index": "pypi", - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==2.9.0.post0" - }, "readme-renderer": { "hashes": [ "sha256:1818dd28140813509eeed8d62687f7cd4f7bad90d4db586001c5dc09d4fde311", @@ -586,14 +467,6 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.0.0" }, - "requirementslib": { - "hashes": [ - "sha256:28924cf11a2fa91adb03f8431d80c2a8c3dc386f1c48fb2be9a58e4c39072354", - "sha256:d26ec6ad45e1ffce9532303543996c9c71a99dc65f783908f112e3f2aae7e49c" - ], - "markers": "python_version >= '3.7'", - "version": "==1.6.9" - }, "rfc3986": { "hashes": [ "sha256:50b1502b60e289cb37883f3dfd34532b8873c7de9f49bb546641ce9cbd256ebd", @@ -619,39 +492,6 @@ "markers": "python_version >= '3.8'", "version": "==74.1.2" }, - "six": { - "hashes": [ - "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", - "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" - ], - "index": "pypi", - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==1.16.0" - }, - "toml": { - "hashes": [ - "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b", - "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" - ], - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", - "version": "==0.10.2" - }, - "tomli": { - "hashes": [ - "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", - "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f" - ], - "markers": "python_version < '3.11'", - "version": "==2.0.1" - }, - "tomlkit": { - "hashes": [ - "sha256:7a974427f6e119197f670fbbbeae7bef749a6c14e793db934baefc1b5f03efde", - "sha256:fff5fe59a87295b278abd31bec92c15d9bc4a06885ab12bcea52c71119392e79" - ], - "markers": "python_version >= '3.8'", - "version": "==0.13.2" - }, "twine": { "hashes": [ "sha256:215dbe7b4b94c2c50a7315c0275d2258399280fbb7d04182c7e55e24b5f93997", @@ -678,15 +518,6 @@ "markers": "python_version >= '3.8'", "version": "==2.2.2" }, - "vistir": { - "hashes": [ - "sha256:1a89a612fb667c26ed6b4ed415b01e0261e13200a350c43d1990ace0ef44d35b", - "sha256:a8beb7643d07779cdda3941a08dad77d48de94883dbd3cb2b9b5ecb7eb7c0994" - ], - "index": "pypi", - "markers": "python_version not in '3.0, 3.1, 3.2, 3.3' and python_version >= '3.7'", - "version": "==0.6.1" - }, "wheel": { "hashes": [ "sha256:2376a90c98cc337d18623527a97c31797bd02bad0033d41547043a1cbfbe448f", From 91f2dc29281235bb18128d925195b722bdb17ade Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 12 Sep 2024 12:09:39 +0300 Subject: [PATCH 06/10] check --- Pipfile | 1 - setup.py => asd.py | 0 2 files changed, 1 deletion(-) rename setup.py => asd.py (100%) diff --git a/Pipfile b/Pipfile index 9556b03..e773f29 100755 --- a/Pipfile +++ b/Pipfile @@ -13,7 +13,6 @@ idna = "==3.7" requests = ">=2.32.3" [dev-packages] -#pipenv-setup = ">=2.1.0" setuptools = ">=21.0.0" wheel = "*" twine = "*" diff --git a/setup.py b/asd.py similarity index 100% rename from setup.py rename to asd.py From f0d6024e5108471e7d8a70ce5f5e83b485572e32 Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 12 Sep 2024 12:40:24 +0300 Subject: [PATCH 07/10] check --- asd.py => setup.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) rename asd.py => setup.py (71%) diff --git a/asd.py b/setup.py similarity index 71% rename from asd.py rename to setup.py index 5dfab95..f29382f 100644 --- a/asd.py +++ b/setup.py @@ -8,14 +8,14 @@ setup( name="regula.documentreader.webclient", - version=os.getenv("PACKAGE_VERSION_TO_PUBLISH", "5.2.0-beta.0"), + version=os.getenv("PACKAGE_VERSION_TO_PUBLISH", "7.4.45"), python_requires=">=3.8", description="Regula's Document Reader python client", long_description=long_description, long_description_content_type="text/markdown", author="Regula Forensics, Inc.", author_email="support@regulaforensics.com", - url="https://mobile.regulaforensics.com", + url="https://regulaforensics.com", keywords=[ "document-reader-client", "document reader", @@ -24,10 +24,13 @@ "regula", ], install_requires=[ - "certifi>=2023.7.22", - "python-dateutil>=2.8.1", - "six>=1.15.0", - "urllib3>=1.26.5", + "certifi>=2024.07.04", + "six>=1.10", + "python-dateutil>=2.5.3", + "urllib3>=1.26.19", + "vistir>=0.4.0, <=0.6.1", + "idna==3.7", + "requests>=2.32.3", ], packages=find_packages(exclude=["test", "tests", "example"]), include_package_data=True, From 5c1945ff2f2e38ae05bb27cc64eaa9a1a87529dd Mon Sep 17 00:00:00 2001 From: = <=> Date: Thu, 12 Sep 2024 12:42:38 +0300 Subject: [PATCH 08/10] final --- .github/workflows/pypi-publish-test.yml | 29 ------------------------- 1 file changed, 29 deletions(-) delete mode 100755 .github/workflows/pypi-publish-test.yml diff --git a/.github/workflows/pypi-publish-test.yml b/.github/workflows/pypi-publish-test.yml deleted file mode 100755 index 1a7d389..0000000 --- a/.github/workflows/pypi-publish-test.yml +++ /dev/null @@ -1,29 +0,0 @@ -name: test publish pypi package - -on: - push: - branches: - fix/black-vuln - -jobs: - build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Set up Python - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - name: Install pipenv - run: | - python -m pip install --upgrade pip - python -m pip install --upgrade setuptools wheel - python -m pip install --upgrade pipenv - - name: Install dependencies - run: pipenv install --dev - - name: Publish package - run: | - pipenv run pipenv install - pipenv run python setup.py sdist bdist_wheel - env: - PACKAGE_VERSION_TO_PUBLISH: "7.4.6" From 6e5f9cb277200d4d2da3f71cc1ddeef5e5987145 Mon Sep 17 00:00:00 2001 From: GitHub Action Date: Mon, 23 Sep 2024 10:19:03 +0000 Subject: [PATCH 09/10] update-clients --- .../webclient/gen/models/ident_result.py | 2 -- .../gen/models/ident_result_all_of.py | 30 +------------------ 2 files changed, 1 insertion(+), 31 deletions(-) diff --git a/regula/documentreader/webclient/gen/models/ident_result.py b/regula/documentreader/webclient/gen/models/ident_result.py index 3b28a47..c005f01 100644 --- a/regula/documentreader/webclient/gen/models/ident_result.py +++ b/regula/documentreader/webclient/gen/models/ident_result.py @@ -166,7 +166,6 @@ def element_diagnose(self, element_diagnose): def percent_value(self): """Gets the percent_value of this IdentResult. # noqa: E501 - Probability percent for IMAGE_PATTERN check or element's visibility for IR_VISIBILITY # noqa: E501 :return: The percent_value of this IdentResult. # noqa: E501 :rtype: int @@ -177,7 +176,6 @@ def percent_value(self): def percent_value(self, percent_value): """Sets the percent_value of this IdentResult. - Probability percent for IMAGE_PATTERN check or element's visibility for IR_VISIBILITY # noqa: E501 :param percent_value: The percent_value of this IdentResult. # noqa: E501 :type percent_value: int diff --git a/regula/documentreader/webclient/gen/models/ident_result_all_of.py b/regula/documentreader/webclient/gen/models/ident_result_all_of.py index 63bbd7a..2686db8 100644 --- a/regula/documentreader/webclient/gen/models/ident_result_all_of.py +++ b/regula/documentreader/webclient/gen/models/ident_result_all_of.py @@ -37,7 +37,6 @@ class IdentResultAllOf(object): 'area': 'RectangleCoordinates', 'image': 'ImageData', 'etalon_image': 'ImageData', - 'percent_value': 'int', 'area_list': 'AreaContainer' } @@ -47,11 +46,10 @@ class IdentResultAllOf(object): 'area': 'Area', 'image': 'Image', 'etalon_image': 'EtalonImage', - 'percent_value': 'PercentValue', 'area_list': 'AreaList' } - def __init__(self, element_type=None, light_index=None, area=None, image=None, etalon_image=None, percent_value=None, area_list=None, local_vars_configuration=None): # noqa: E501 + def __init__(self, element_type=None, light_index=None, area=None, image=None, etalon_image=None, area_list=None, local_vars_configuration=None): # noqa: E501 """IdentResultAllOf - a model defined in OpenAPI""" # noqa: E501 if local_vars_configuration is None: local_vars_configuration = Configuration() @@ -62,7 +60,6 @@ def __init__(self, element_type=None, light_index=None, area=None, image=None, e self._area = None self._image = None self._etalon_image = None - self._percent_value = None self._area_list = None self.discriminator = None @@ -76,8 +73,6 @@ def __init__(self, element_type=None, light_index=None, area=None, image=None, e self.image = image if etalon_image is not None: self.etalon_image = etalon_image - if percent_value is not None: - self.percent_value = percent_value if area_list is not None: self.area_list = area_list @@ -186,29 +181,6 @@ def etalon_image(self, etalon_image): self._etalon_image = etalon_image - @property - def percent_value(self): - """Gets the percent_value of this IdentResultAllOf. # noqa: E501 - - Probability percent for IMAGE_PATTERN check or element's visibility for IR_VISIBILITY # noqa: E501 - - :return: The percent_value of this IdentResultAllOf. # noqa: E501 - :rtype: int - """ - return self._percent_value - - @percent_value.setter - def percent_value(self, percent_value): - """Sets the percent_value of this IdentResultAllOf. - - Probability percent for IMAGE_PATTERN check or element's visibility for IR_VISIBILITY # noqa: E501 - - :param percent_value: The percent_value of this IdentResultAllOf. # noqa: E501 - :type percent_value: int - """ - - self._percent_value = percent_value - @property def area_list(self): """Gets the area_list of this IdentResultAllOf. # noqa: E501 From 9a41332479cffdec43044edb8ecec2de574c647b Mon Sep 17 00:00:00 2001 From: rchxx <=> Date: Fri, 4 Oct 2024 14:48:16 +0300 Subject: [PATCH 10/10] Add lacked object init parameter --- .../webclient/ext/models/raw_authenticity_result_item.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/regula/documentreader/webclient/ext/models/raw_authenticity_result_item.py b/regula/documentreader/webclient/ext/models/raw_authenticity_result_item.py index bd91335..9cdf967 100644 --- a/regula/documentreader/webclient/ext/models/raw_authenticity_result_item.py +++ b/regula/documentreader/webclient/ext/models/raw_authenticity_result_item.py @@ -10,8 +10,8 @@ class RawAuthenticityCheckResultItem(AuthenticityCheckResultItem): attribute_map = copy(AuthenticityCheckResultItem.attribute_map) attribute_map["raw"] = "raw" - def __init__(self, type=0, element_result=None, element_diagnose=None, raw=None, local_vars_configuration=None): - super().__init__(type, element_result, element_diagnose, local_vars_configuration) + def __init__(self, type=0, element_result=None, element_diagnose=None, raw=None, percent_value=None, local_vars_configuration=None): + super().__init__(type, element_result, element_diagnose, percent_value, local_vars_configuration) self.__raw = raw @property