Redo of applying ext models

Author: hleb-albau

generator-templates/api_client.mustache

@@ -303,11 +303,10 @@ class ApiClient(object):
             # convert str to class
             if klass in self.NATIVE_TYPES_MAPPING:
                 klass = self.NATIVE_TYPES_MAPPING[klass]
-            elif hasattr({{modelPackage}}, klass):
-                klass = getattr({{modelPackage}}, klass)
+            elif hasattr({{extPackageName}}.models, klass):
+                klass = getattr({{extPackageName}}.models, klass)
             else:
-                import {{extPackageName}}.models as ext_models
-                klass = getattr(ext_models, klass)
+                klass = getattr({{modelPackage}}, klass)
         if klass in self.PRIMITIVE_TYPES:
             return self.__deserialize_primitive(data, klass)
         elif klass == object:

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

@@ -17,7 +17,7 @@ def __init__(self, process_response: ProcessResponse):
     def text(self) -> Optional[Text]:
         result = self.result_by_type(Result.TEXT)
         if result:
-            return Text(result.text)
+            return result.text
         return None
 
     @property

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

@@ -4,15 +4,12 @@
 from regula.documentreader.webclient.gen.models.text import Text as GenText
 
 
-class Text:
-
-    def __init__(self, payload: GenText):
-        self.__payload = payload
+class Text(GenText):
 
     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)
+        for field in self.field_list:
+            if field.field_type == field_type and field.lcid == lcid:
+                return field
         return None
 
     def get_field_value(self, field_type: int, lcid=0) -> Optional[str]:

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

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

regula/documentreader/webclient/gen/api_client.py

@@ -279,11 +279,10 @@ def __deserialize(self, data, klass):
             # convert str to class
             if klass in self.NATIVE_TYPES_MAPPING:
                 klass = self.NATIVE_TYPES_MAPPING[klass]
-            elif hasattr(regula.documentreader.webclient.gen.models, klass):
-                klass = getattr(regula.documentreader.webclient.gen.models, klass)
+            elif hasattr(regula.documentreader.webclient.ext.models, klass):
+                klass = getattr(regula.documentreader.webclient.ext.models, klass)
             else:
-                import regula.documentreader.webclient.ext.models as ext_models
-                klass = getattr(ext_models, klass)
+                klass = getattr(regula.documentreader.webclient.gen.models, klass)
         if klass in self.PRIMITIVE_TYPES:
             return self.__deserialize_primitive(data, klass)
         elif klass == object:

setup.py

@@ -8,6 +8,7 @@
 setup(
     name="regula.documentreader.webclient",
     version="5.2.0-beta.0",
+    python_requires=">=3.5",
     description="Regula's Document Reader python client",
     long_description=long_description,
     long_description_content_type="text/markdown",