Merge branch 'FraunhoferIOSB:master' into model_location_bugfix

Author: tfeseker

frost_sta_client/__version__.py

@@ -1,5 +1,5 @@
 __title__ = 'frost_sta_client'
-__version__ = '1.1.35'
+__version__ = '1.1.36'
 __license__ = 'LGPL3'
 __author__ = 'Katharina Emde'
 __copyright__ = 'Fraunhofer IOSB'

frost_sta_client/model/multi_datastream.py

@@ -344,7 +344,7 @@ def __setstate__(self, state):
                 self.multi_observation_data_types.append(value)
         if state.get('ObservedProperties', None) is not None and isinstance(state['ObservedProperties'], list):
             entity_class = entity_type.EntityTypes['ObservedProperty']['class']
-            self.observed_properties = utils.transform_json_to_entity_list(state['ObservedProperty'], entity_class)
+            self.observed_properties = utils.transform_json_to_entity_list(state['ObservedProperties'], entity_class)
             self.observed_properties.next_link = state.get('ObservedProperties@iot.nextLink')
             self.observed_properties.count = state.get('ObservedProperties@iot.count')
         if state.get('Observations', None) is not None and isinstance(state['Observations'], list):

frost_sta_client/query/query.py

@@ -17,10 +17,10 @@
 import frost_sta_client.utils
 import frost_sta_client.model.ext.entity_list
 
-from furl import furl
+
 import logging
-import json
 import requests
+from requests.exceptions import JSONDecodeError
 
 
 class Query:
@@ -153,7 +153,7 @@ def list(self, callback=None, step_size=None):
         logging.debug('Received response: {} from {}'.format(response.status_code, url))
         try:
             json_response = response.json()
-        except ValueError:
+        except JSONDecodeError:
             raise ValueError('Cannot find json in http response')
         entity_list = frost_sta_client.utils.transform_json_to_entity_list(json_response, self.entity_class)
         entity_list.set_service(self.service)

frost_sta_client/utils.py

@@ -19,6 +19,7 @@
 from dateutil.parser import isoparse
 import geojson
 import logging
+import sys
 import frost_sta_client.model.ext.entity_list
 
 
@@ -30,12 +31,15 @@ def transform_entity_to_json_dict(entity):
     json_str = jsonpickle.encode(entity, unpicklable=False)
     return jsonpickle.decode(json_str)
 
+def class_from_string(string):
+    module_name, class_name = string.rsplit(".", 1)
+    return getattr(sys.modules[module_name], class_name)
 
 def transform_json_to_entity(json_response, entity_class):
-    decodable_str = '{\'py/object\': \'' + entity_class + '\', \'py/state\': ' \
-                    + jsonpickle.encode(json_response, unpicklable=False) + '}'
-    return jsonpickle.decode(decodable_str)
-
+    cl = class_from_string(entity_class)
+    obj = cl()
+    obj.__setstate__(json_response)
+    return obj
 
 def transform_json_to_entity_list(json_response, entity_class):
     entity_list = frost_sta_client.model.ext.entity_list.EntityList(entity_class)
@@ -51,9 +55,7 @@ def transform_json_to_entity_list(json_response, entity_class):
         response_list = json_response
     else:
         raise ValueError("expected json as a dict or list to transform into entity list")
-    for item in response_list:
-        result_list.append(transform_json_to_entity(item, entity_list.entity_class))
-    entity_list.entities = result_list
+    entity_list.entities = [transform_json_to_entity(item, entity_list.entity_class) for item in response_list]
     return entity_list