Fix RawResultItem raw field should be result item itself

Author: hleb-albau

.openapi-generator/FILES

@@ -77,5 +77,3 @@ regula/documentreader/webclient/gen/models/transaction_info.py
 regula/documentreader/webclient/gen/models/verification_result.py
 regula/documentreader/webclient/gen/models/verified_field_map.py
 regula/documentreader/webclient/gen/rest.py
-requirements.txt
-setup.py

example/example.py

@@ -14,7 +14,7 @@
 with DocumentReaderApi(host) as api:
     api.license = license
 
-    process_params = ProcessParams(Scenario.FULL_PROCESS, [Result.STATUS, Result.TEXT, Result.IMAGES])
+    process_params = ProcessParams(Scenario.FULL_PROCESS, [Result.STATUS, Result.TEXT, Result.IMAGES, 6])
     process_images = [RecognitionImage(image_payload, Light.WHITE)]
     request = RecognitionRequest(process_params, process_images)
 

generator-templates/api_client.mustache

@@ -631,25 +631,14 @@ class ApiClient(object):
                 klass.openapi_types is not None and
                 isinstance(data, (list, dict))):
 
-            is_other_enable = "OTHER" in six.iterkeys(klass.openapi_types)
-            if is_other_enable:
-                tmp_data = copy(data)
-            else:
-                tmp_data = {}
+            if "raw" in six.iterkeys(klass.openapi_types):
+                kwargs[klass.attribute_map["raw"]] = copy(data)
 
             for attr, attr_type in six.iteritems(klass.openapi_types):
-
-                if klass.attribute_map[attr] in data and tmp_data:
-                    value = tmp_data.pop(klass.attribute_map[attr])
-                    kwargs[attr] = self.__deserialize(value, attr_type)
-
-                elif klass.attribute_map[attr] in data:
+                if klass.attribute_map[attr] in data:
                     value = data[klass.attribute_map[attr]]
                     kwargs[attr] = self.__deserialize(value, attr_type)
 
-            if tmp_data:
-                kwargs[klass.attribute_map["OTHER"]] = tmp_data.popitem()[1]
-
         instance = klass(**kwargs)
         if has_discriminator:
             klass_name = instance.get_real_child_model(data)

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

@@ -1,96 +1,28 @@
-import pprint
 from copy import copy
 
 from regula.documentreader.webclient.gen.models.result_item import ResultItem
 
 
-class RawResultItem:
+class RawResultItem(ResultItem):
     openapi_types = copy(ResultItem.openapi_types)
-    openapi_types["OTHER"] = "Any"
+    openapi_types["raw"] = "dict"
 
     attribute_map = copy(ResultItem.attribute_map)
-    attribute_map["OTHER"] = "raw"
+    attribute_map["raw"] = "raw"
 
     def __init__(self, buf_length=None, light=None, list_idx=None, page_idx=None, result_type=None, raw=None,
                  local_vars_configuration=None):
-        self.result_item = ResultItem(buf_length, light, list_idx, page_idx, result_type, local_vars_configuration)
+        super().__init__(buf_length, light, list_idx, page_idx, result_type, local_vars_configuration)
         self.__raw = raw
 
-    @property
-    def result_item(self):
-        return self.__result_item
-
-    @result_item.setter
-    def result_item(self, value):
-        self.__result_item = value
-
-    @property
-    def buf_length(self):
-        return self.result_item.buf_length
-
-    @buf_length.setter
-    def buf_length(self, value):
-        self.result_item.buf_length = value
-
-    @property
-    def light(self):
-        return self.result_item.light
-
-    @light.setter
-    def light(self, value):
-        self.result_item.light = value
-
-    @property
-    def list_idx(self):
-        return self.result_item.list_idx
-
-    @list_idx.setter
-    def list_idx(self, value):
-        self.result_item.list_idx = value
-
-    @property
-    def page_idx(self):
-        return self.result_item.page_idx
-
-    @page_idx.setter
-    def page_idx(self, value):
-        self.result_item.page_idx = value
-
-    @property
-    def result_type(self):
-        return self.result_item.result_type
-
-    @result_type.setter
-    def result_type(self, value):
-        self.result_item.result_type = value
-
     @property
     def raw(self):
         return self.__raw
 
-    @raw.setter
-    def raw(self, value):
-        self.__raw = value
-
     def to_dict(self):
-        result = self.result_item.to_dict()
+        result = super(RawResultItem, self).to_dict()
         result["raw"] = self.__raw
         return result
 
-    def to_str(self):
-        return pprint.pformat(self.to_dict())
-
-    def __repr__(self):
-        return self.to_str()
-
-    def __eq__(self, other):
-        if not isinstance(other, RawResultItem):
-            return False
-
-        return self.to_dict() == other.to_dict()
-
-    def __ne__(self, other):
-        if not isinstance(other, RawResultItem):
-            return False
-
-        return self.to_dict() != other.to_dict()
+    def get_real_child_model(self, data):
+        return None

regula/documentreader/webclient/gen/api_client.py

@@ -607,25 +607,14 @@ def __deserialize_model(self, data, klass):
                 klass.openapi_types is not None and
                 isinstance(data, (list, dict))):
 
-            is_other_enable = "OTHER" in six.iterkeys(klass.openapi_types)
-            if is_other_enable:
-                tmp_data = copy(data)
-            else:
-                tmp_data = {}
+            if "raw" in six.iterkeys(klass.openapi_types):
+                kwargs[klass.attribute_map["raw"]] = copy(data)
 
             for attr, attr_type in six.iteritems(klass.openapi_types):
-
-                if klass.attribute_map[attr] in data and tmp_data:
-                    value = tmp_data.pop(klass.attribute_map[attr])
-                    kwargs[attr] = self.__deserialize(value, attr_type)
-
-                elif klass.attribute_map[attr] in data:
+                if klass.attribute_map[attr] in data:
                     value = data[klass.attribute_map[attr]]
                     kwargs[attr] = self.__deserialize(value, attr_type)
 
-            if tmp_data:
-                kwargs[klass.attribute_map["OTHER"]] = tmp_data.popitem()[1]
-
         instance = klass(**kwargs)
         if has_discriminator:
             klass_name = instance.get_real_child_model(data)