frost-sta-client 1.1.46__tar.gz → 1.1.49__tar.gz

{frost_sta_client-1.1.46 → frost_sta_client-1.1.49}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: frost_sta_client
-Version: 1.1.46
+Version: 1.1.49
 Summary: a client library to facilitate interaction with a FROST SensorThingsAPI Server
 Home-page: https://github.com/FraunhoferIOSB/FROST-Python-Client
 Author: Fraunhofer IOSB
-Author-email: maximilian.zenner@iosb.fraunhofer.de
+Author-email: frost@iosb.fraunhofer.de
 License: LGPL3
 Keywords: sta,ogc,frost,sensorthingsapi,IoT
 Description-Content-Type: text/markdown
@@ -104,6 +104,7 @@ observations_list = datastream.get_observations().query().filter("result gt 10")
 ```
 
 ### Callback function in `EntityList`
+
 The progress of the loading process can be tracked by supplying a callback function along with a step size. The callback
 function and the step size must both be provided to the `list` function (see example below).
 

{frost_sta_client-1.1.46 → frost_sta_client-1.1.49}/README.md

@@ -75,6 +75,7 @@ observations_list = datastream.get_observations().query().filter("result gt 10")
 ```
 
 ### Callback function in `EntityList`
+
 The progress of the loading process can be tracked by supplying a callback function along with a step size. The callback
 function and the step size must both be provided to the `list` function (see example below).
 

{frost_sta_client-1.1.46 → frost_sta_client-1.1.49}/frost_sta_client/__version__.py

@@ -1,8 +1,8 @@
 __title__ = 'frost_sta_client'
-__version__ = '1.1.46'
+__version__ = '1.1.49'
 __license__ = 'LGPL3'
 __author__ = 'Fraunhofer IOSB'
 __copyright__ = 'Fraunhofer IOSB'
-__contact__ = 'maximilian.zenner@iosb.fraunhofer.de'
+__contact__ = 'frost@iosb.fraunhofer.de'
 __url__ = 'https://github.com/FraunhoferIOSB/FROST-Python-Client'
 __description__ = 'a client library to facilitate interaction with a FROST SensorThingsAPI Server'

{frost_sta_client-1.1.46 → frost_sta_client-1.1.49}/frost_sta_client/utils.py

@@ -1,119 +1,122 @@
-# Copyright (C) 2021 Fraunhofer Institut IOSB, Fraunhoferstr. 1, D 76131
-# Karlsruhe, Germany.
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-import jsonpickle
-import datetime
-from dateutil.parser import isoparse
-import geojson
-import logging
-import sys
-import frost_sta_client.model.ext.entity_list
-
-
-def extract_value(location):
-    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)
-    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):
-    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)
-    result_list = []
-    if isinstance(json_response, dict):
-        try:
-            response_list = json_response['value']
-            entity_list.next_link = json_response.get("@iot.nextLink", None)
-            entity_list.count = json_response.get("@iot.count", None)
-        except AttributeError as e:
-            raise e
-    elif isinstance(json_response, list):
-        response_list = json_response
-    else:
-        raise ValueError("expected json as a dict or list to transform into entity list")
-    entity_list.entities = [transform_json_to_entity(item, entity_list.entity_class) for item in response_list]
-    return entity_list
-
-
-def check_datetime(value, time_entity):
-    try:
-        parse_datetime(value)
-    except ValueError as e:
-        logging.error(f"error during {time_entity} check")
-        raise e
-    return value
-
-
-def parse_datetime(value) -> str:
-    if value is None:
-        return value
-    if isinstance(value, str):
-        if '/' in value:
-            try:
-                times = value.split('/')
-                if len(times) != 2:
-                    raise ValueError("If the time interval is provided as a string,"
-                                     " it should be in isoformat")
-                result = [isoparse(times[0]),
-                          isoparse(times[1])]
-            except ValueError:
-                raise ValueError("If the time entity interval is provided as a string,"
-                                 " it should be in isoformat")
-            result = result[0].isoformat() + '/' + result[1].isoformat()
-            return result
-        else:
-            try:
-                result = isoparse(value)
-            except ValueError:
-                raise ValueError("If the phenomenon time is provided as string, it should be in isoformat")
-            result = result.isoformat()
-            return result
-    if isinstance(value, datetime.datetime):
-        return value.isoformat()
-    if isinstance(value, list) and all(isinstance(v, datetime.datetime) for v in value):
-        return value[0].isoformat() + value[1].isoformat()
-    else:
-        raise ValueError('time entities should consist of one or two datetimes')
-
-
-def process_area(value):
-    if not isinstance(value, dict):
-        raise ValueError("geojsons can only be handled as dictionaries!")
-    if value.get("type", None) is None or value.get("coordinates", None) is None:
-        raise ValueError("Both type and coordinates need to be specified in the dictionary")
-    if value["type"] == "Point":
-        return geojson.geometry.Point(value["coordinates"])
-    if value["type"] == "Polygon":
-        return geojson.geometry.Polygon(value["coordinates"])
-    if value["type"] == "Geometry":
-        return geojson.geometry.Geometry(value["coordinates"])
-    if value["type"] == "LineString":
-        return geojson.geometry.LineString(value["coordinates"])
-    raise ValueError("can only handle geojson of type Point, Polygon, Geometry or LineString")
+# Copyright (C) 2021 Fraunhofer Institut IOSB, Fraunhoferstr. 1, D 76131
+# Karlsruhe, Germany.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+import jsonpickle
+import datetime
+from dateutil.parser import isoparse
+import geojson
+import logging
+import sys
+import frost_sta_client.model.ext.entity_list
+
+
+def extract_value(location):
+    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):
+    try:
+        data = entity.__getstate__()
+    except AttributeError:
+        data = entity.__dict__
+    return data
+
+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):
+    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)
+    result_list = []
+    if isinstance(json_response, dict):
+        try:
+            response_list = json_response['value']
+            entity_list.next_link = json_response.get("@iot.nextLink", None)
+            entity_list.count = json_response.get("@iot.count", None)
+        except AttributeError as e:
+            raise e
+    elif isinstance(json_response, list):
+        response_list = json_response
+    else:
+        raise ValueError("expected json as a dict or list to transform into entity list")
+    entity_list.entities = [transform_json_to_entity(item, entity_list.entity_class) for item in response_list]
+    return entity_list
+
+
+def check_datetime(value, time_entity):
+    try:
+        parse_datetime(value)
+    except ValueError as e:
+        logging.error(f"error during {time_entity} check")
+        raise e
+    return value
+
+
+def parse_datetime(value) -> str:
+    if value is None:
+        return value
+    if isinstance(value, str):
+        if '/' in value:
+            try:
+                times = value.split('/')
+                if len(times) != 2:
+                    raise ValueError("If the time interval is provided as a string,"
+                                     " it should be in isoformat")
+                result = [isoparse(times[0]),
+                          isoparse(times[1])]
+            except ValueError:
+                raise ValueError("If the time entity interval is provided as a string,"
+                                 " it should be in isoformat")
+            result = result[0].isoformat() + '/' + result[1].isoformat()
+            return result
+        else:
+            try:
+                result = isoparse(value)
+            except ValueError:
+                raise ValueError("If the phenomenon time is provided as string, it should be in isoformat")
+            result = result.isoformat()
+            return result
+    if isinstance(value, datetime.datetime):
+        return value.isoformat()
+    if isinstance(value, list) and all(isinstance(v, datetime.datetime) for v in value):
+        return value[0].isoformat() + value[1].isoformat()
+    else:
+        raise ValueError('time entities should consist of one or two datetimes')
+
+
+def process_area(value):
+    if not isinstance(value, dict):
+        raise ValueError("geojsons can only be handled as dictionaries!")
+    if value.get("type", None) is None or value.get("coordinates", None) is None:
+        raise ValueError("Both type and coordinates need to be specified in the dictionary")
+    if value["type"] == "Point":
+        return geojson.geometry.Point(value["coordinates"])
+    if value["type"] == "Polygon":
+        return geojson.geometry.Polygon(value["coordinates"])
+    if value["type"] == "Geometry":
+        return geojson.geometry.Geometry(value["coordinates"])
+    if value["type"] == "LineString":
+        return geojson.geometry.LineString(value["coordinates"])
+    raise ValueError("can only handle geojson of type Point, Polygon, Geometry or LineString")

{frost_sta_client-1.1.46 → frost_sta_client-1.1.49}/frost_sta_client.egg-info/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.4
 Name: frost_sta_client
-Version: 1.1.46
+Version: 1.1.49
 Summary: a client library to facilitate interaction with a FROST SensorThingsAPI Server
 Home-page: https://github.com/FraunhoferIOSB/FROST-Python-Client
 Author: Fraunhofer IOSB
-Author-email: maximilian.zenner@iosb.fraunhofer.de
+Author-email: frost@iosb.fraunhofer.de
 License: LGPL3
 Keywords: sta,ogc,frost,sensorthingsapi,IoT
 Description-Content-Type: text/markdown
@@ -104,6 +104,7 @@ observations_list = datastream.get_observations().query().filter("result gt 10")
 ```
 
 ### Callback function in `EntityList`
+
 The progress of the loading process can be tracked by supplying a callback function along with a step size. The callback
 function and the step size must both be provided to the `list` function (see example below).