Make lib compatible with python 3.5+

Author: hleb-albau

Pipfile.lock

@@ -12,4 +12,4 @@ name = "test-pypi"
 "regula.documentreader.webclient" = {editable = true,path = "./.."}
 
 [requires]
-python_version = "3.8"
+python_version = "3.5"

example/Pipfile

@@ -38,7 +38,7 @@
 
     response_images = response.images
 
-    print(f"""
+    print("""
     ---------------------------------------------------------------------------
                    Document Overall Status: {doc_overall_status}
                     Document Number Visual: {doc_number_visual}
@@ -47,4 +47,8 @@
            Validity Of Document Number MRZ: {doc_number_mrz_validity}
               MRZ-Visual values comparison: {doc_number_mrz_visual_matching}
     ---------------------------------------------------------------------------
-    """)
+    """.format(
+        doc_overall_status=doc_overall_status, doc_number_visual=doc_number_visual,
+        doc_number_mrz=doc_number_mrz, doc_number_visual_validity=doc_number_mrz_validity,
+        doc_number_mrz_validity=doc_number_mrz_validity, doc_number_mrz_visual_matching=doc_number_mrz_visual_matching,
+    ))

example/Pipfile.lock

@@ -1 +1 @@
-from regula.documentreader.webclient.ext.api.document_reader_api import DocumentReaderApi
+from regula.documentreader.webclient.ext.api.document_reader_api import DocumentReaderApi

example/example.py

@@ -5,7 +5,6 @@
 
 
 class DocumentReaderApi(DefaultApi):
-    __license: str
 
     def __init__(self, host=None, debug=False, verify_ssl=False, api_client=None):
         if api_client:
@@ -16,6 +15,7 @@ def __init__(self, host=None, debug=False, verify_ssl=False, api_client=None):
             configuration.verify_ssl = verify_ssl
 
             super().__init__(ApiClient(configuration=configuration))
+        self.__license = None
 
     def __enter__(self):
         return self
@@ -24,11 +24,11 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         self.api_client.close()
 
     @property
-    def license(self):
+    def license(self) -> str:
         return self.__license
 
     @license.setter
-    def license(self, value):
+    def license(self, value: str):
         self.__license = value
 
     def process(self, process_request: ProcessRequest) -> RecognitionResponse:

regula/documentreader/webclient/ext/api/__init__.py

@@ -1,15 +1,14 @@
-import uuid
 from typing import Optional
 
 from regula.documentreader.webclient.ext.models.text import Text
+from regula.documentreader.webclient.gen import ResultItem
 from regula.documentreader.webclient.gen.models.images import Images
 from regula.documentreader.webclient.gen.models.process_response import ProcessResponse
 from regula.documentreader.webclient.gen.models.result import Result
 from regula.documentreader.webclient.gen.models.status import Status
 
 
 class RecognitionResponse:
-    __process_response: ProcessResponse
 
     def __init__(self, process_response: ProcessResponse):
         self.__process_response = process_response
@@ -18,8 +17,7 @@ def __init__(self, process_response: ProcessResponse):
     def text(self) -> Optional[Text]:
         result = self.result_by_type(Result.TEXT)
         if result:
-            i = result.text
-            return Text(i)
+            return Text(result.text)
         return None
 
     @property
@@ -36,7 +34,7 @@ def images(self) -> Optional[Images]:
             return result.images
         return None
 
-    def result_by_type(self, result_type):
+    def result_by_type(self, result_type) -> Optional[ResultItem]:
         for i in self.__process_response.container_list.list:
             if i.result_type == result_type:
                 return i

regula/documentreader/webclient/ext/api/document_reader_api.py

@@ -5,18 +5,17 @@
 
 
 class Text:
-    __payload: GenText
 
-    def __init__(self, payload):
+    def __init__(self, payload: GenText):
         self.__payload = payload
 
-    def get_field(self, field_type, lcid=0) -> Optional[TextField]:
+    def get_field(self, field_type: int, lcid=0) -> Optional[TextField]:
         for i in self.__payload.field_list:
             if i.field_type == field_type and i.lcid == lcid:
                 return TextField(i)
         return None
 
-    def get_field_value(self, field_type, lcid=0):
+    def get_field_value(self, field_type: int, lcid=0) -> Optional[str]:
         field = self.get_field(field_type, lcid)
         if field:
             return "todo"

regula/documentreader/webclient/ext/models/recognition_response.py

@@ -1,14 +1,15 @@
+from typing import Optional
+
 from regula.documentreader.webclient.gen.models.check_result import CheckResult
 from regula.documentreader.webclient.gen.models.text_field import TextField as GenTextField
 
 
 class TextField:
-    __payload: GenTextField
 
-    def __init__(self, payload):
+    def __init__(self, payload: GenTextField):
         self.__payload = payload
 
-    def get_value(self, source, original=False):
+    def get_value(self, source: str, original=False) -> Optional[str]:
         for i in self.__payload.value_list:
             if i.source == source:
                 if original:
@@ -17,13 +18,13 @@ def get_value(self, source, original=False):
                     return i.value
         return None
 
-    def get_validity(self, source):
+    def get_validity(self, source) -> CheckResult:
         for i in self.__payload.validity_list:
             if i.source == source:
                 return i.status
         return CheckResult.WAS_NOT_DONE
 
-    def get_comparison(self, one, other):
+    def get_comparison(self, one, other) -> CheckResult:
         for i in self.__payload.comparison_list:
             a = i.source_left == one and i.source_right == other
             b = i.source_right == one and i.source_left == other