Merge pull request #13 from tfeseker/create_single_observation

Create single observation

Author: emdekatharina

frost_sta_client/dao/base.py

@@ -110,7 +110,7 @@ def create(self, entity):
                                                                             e.response.status_code,
                                                                             error_message))
             raise e
-        entity.id = int(frost_sta_client.utils.extract_value(response.headers['location']))
+        entity.id = frost_sta_client.utils.extract_value(response.headers['location'])
         entity.service = self.service
         logging.debug('Received response: ' + str(response.status_code))
 

frost_sta_client/dao/observation.py

@@ -34,19 +34,23 @@ def __init__(self, service):
         """
         base.BaseDao.__init__(self, service, EntityTypes["Observation"])
 
-    def create(self, data_array):
-        url = self.service.url.copy()
-        url.path.add(self.CREATE_OBSERVATIONS)
-        logging.debug('Posting to ' + str(url.url))
-        json_dict = transform_entity_to_json_dict(data_array.value)
-        try:
-            response = self.service.execute('post', url, json=json_dict)
-        except requests.exceptions.HTTPError as e:
-            error_json = e.response.json()
-            error_message = error_json['message']
-            logging.error("Creating {} failed with status-code {}, {}".format("Data Array",
+    def create(self, entity):
+        if isinstance(entity, frost_sta_client.model.observation.Observation):
+            super().create(entity)
+        else:
+            # entity is probably a data array
+            url = self.service.url.copy()
+            url.path.add(self.CREATE_OBSERVATIONS)
+            logging.debug('Posting to ' + str(url.url))
+            json_dict = transform_entity_to_json_dict(entity.value)
+            try:
+                response = self.service.execute('post', url, json=json_dict)
+            except requests.exceptions.HTTPError as e:
+                error_json = e.response.json()
+                error_message = error_json['message']
+                logging.error("Creating {} failed with status-code {}, {}".format("Data Array",
                                                                               e.response.status_code,
                                                                               error_message))
-        response_text_as_list = json.loads(response.text)
-        result = [frost_sta_client.model.observation.Observation(self_link=link) for link in response_text_as_list]
-        return result
+            response_text_as_list = json.loads(response.text)
+            result = [frost_sta_client.model.observation.Observation(self_link=link) for link in response_text_as_list]
+            return result

frost_sta_client/model/entity.py

@@ -42,7 +42,7 @@ def id(self, value):
         if isinstance(value, int) or isinstance(value, str):
             self._id = value
             return
-        raise ValueError('id of entity should be of type int!')
+        raise ValueError('id of entity should be of type int or str!')
 
     @property
     def self_link(self):

frost_sta_client/model/location.py

@@ -141,11 +141,11 @@ def things(self):
     @things.setter
     def things(self, values):
         if values is None:
-            self._thing = None
+            self._things = None
             return
         if isinstance(values, list) and all(isinstance(th, thing.Thing) for th in values):
             entity_class = entity_type.EntityTypes['Thing']['class']
-            self._thing = entity_list.EntityList(entity_class=entity_class, entities=values)
+            self._things = entity_list.EntityList(entity_class=entity_class, entities=values)
             return
         if not isinstance(values, entity_list.EntityList) or \
                 any((not isinstance(th, thing.Thing)) for th in values.entities):

frost_sta_client/utils.py

@@ -24,8 +24,11 @@
 
 
 def extract_value(location):
-    return location[location.find('(')+1: location.find(')')]
-
+    try:
+        value = int(location[location.find('(')+1: location.find(')')])
+    except ValueError:
+        value = str(location[location.find('(')+2: location.find(')')-1])
+    return value
 
 def transform_entity_to_json_dict(entity):
     json_str = jsonpickle.encode(entity, unpicklable=False)