frost-sta-client 1.1.39__tar.gz → 1.1.41__tar.gz

{frost_sta_client-1.1.39 → frost_sta_client-1.1.41}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: frost_sta_client
-Version: 1.1.39
+Version: 1.1.41
 Summary: a client library to facilitate interaction with a FROST SensorThingsAPI Server
 Home-page: https://github.com/FraunhoferIOSB/FROST-Python-Client
 Author: Jonathan Vogl
@@ -27,14 +27,14 @@ identified by a URI.
 
 ### CRUD operations
 The source code below demonstrates the CRUD operations for Thing objects. Operations for other entities work similarly.
-```
+```python
 import frost_sta_client as fsc
 
 url = "exampleserver.com/FROST-Server/v1.1"
 service = fsc.SensorThingsService(url)
 ```
 #### Creating Entities
-```
+```python
 from geojson import Point
 
 point = Point((-115.81, 37.24))
@@ -49,7 +49,7 @@ service.create(thing)
 #### Querying Entities
 Queries to the FROST Server can be modified to include filters, selections or expansions. The return value is always
 an EntityList object, containing the parsed json response of the server.
-```
+```python
 things_list = service.things().query().filter('id eq 1').list()
 
 for thing in things_list:
@@ -62,7 +62,7 @@ replaying to the request with the first chunk accompanied by the link to the nex
 
 The class `EntityList` implements the function `__iter__` and `__next__` which makes it capable of iterating 
 through the entire list of entities, including the calls to all chunks.
-```
+```python
 things_list = service.things().query().list()
 
 for thing in things_list:
@@ -71,7 +71,7 @@ for thing in things_list:
 
 In a case where only the current chunk is supposed to be iterated, the `entities` list can be used.
 
-```
+```python
 things_list = service.things().query().top(20).list()
 
 for thing in things_list.entities:
@@ -81,7 +81,7 @@ for thing in things_list.entities:
 ### Queries to related entity lists
 
 For example the Observations of a given Datastream can be queried via
-```
+```python
 datastream = service.datastreams().find(1)
 observations_list = datastream.get_observations().query().filter("result gt 10").list()
 ```
@@ -96,7 +96,7 @@ combination with a for-loop).
 
 The callback function is called with one argument, which is the current index of the iteration.
 
-```
+```python
 def callback_func(loaded_entities):
     print("loaded {} entities!".format(loaded_entities))
 
@@ -112,13 +112,13 @@ DataArrays can be used to make the creation of Observations easier, because with
 has to be created.
 
 An example usage looks as follows:
-```
+```python
     import frost_sta_client as fsc
     
     service = fsc.SensorThingsService("exampleserver.com/FROST-Server/v1.1")
     dav = fsc.model.ext.data_array_value.DataArrayValue()
     datastream = service.datastreams().find(1)
-    foi = service.feature_of_interest().find(1)
+    foi = service.features_of_interest().find(1)
     components = {dav.Property.PHENOMENON_TIME, dav.Property.RESULT, dav.Property.FEATURE_OF_INTEREST}
     dav.components = components
     dav.datastream = datastream
@@ -127,7 +127,7 @@ An example usage looks as follows:
                            datastream=datastream,
                            feature_of_interest=foi)
     obs2 = fsc.Observation(result=5,
-                           phenomenon_time='2022-12-19T17:00:00Z',
+                           phenomenon_time='2022-12-19T10:00:00Z/2022-12-19T11:00:00Z',
                            datastream=datastream,
                            feature_of_interest=foi)
     dav.add_observation(obs1)

{frost_sta_client-1.1.39 → frost_sta_client-1.1.41}/README.md

@@ -15,14 +15,14 @@ identified by a URI.
 
 ### CRUD operations
 The source code below demonstrates the CRUD operations for Thing objects. Operations for other entities work similarly.
-```
+```python
 import frost_sta_client as fsc
 
 url = "exampleserver.com/FROST-Server/v1.1"
 service = fsc.SensorThingsService(url)
 ```
 #### Creating Entities
-```
+```python
 from geojson import Point
 
 point = Point((-115.81, 37.24))
@@ -37,7 +37,7 @@ service.create(thing)
 #### Querying Entities
 Queries to the FROST Server can be modified to include filters, selections or expansions. The return value is always
 an EntityList object, containing the parsed json response of the server.
-```
+```python
 things_list = service.things().query().filter('id eq 1').list()
 
 for thing in things_list:
@@ -50,7 +50,7 @@ replaying to the request with the first chunk accompanied by the link to the nex
 
 The class `EntityList` implements the function `__iter__` and `__next__` which makes it capable of iterating 
 through the entire list of entities, including the calls to all chunks.
-```
+```python
 things_list = service.things().query().list()
 
 for thing in things_list:
@@ -59,7 +59,7 @@ for thing in things_list:
 
 In a case where only the current chunk is supposed to be iterated, the `entities` list can be used.
 
-```
+```python
 things_list = service.things().query().top(20).list()
 
 for thing in things_list.entities:
@@ -69,7 +69,7 @@ for thing in things_list.entities:
 ### Queries to related entity lists
 
 For example the Observations of a given Datastream can be queried via
-```
+```python
 datastream = service.datastreams().find(1)
 observations_list = datastream.get_observations().query().filter("result gt 10").list()
 ```
@@ -84,7 +84,7 @@ combination with a for-loop).
 
 The callback function is called with one argument, which is the current index of the iteration.
 
-```
+```python
 def callback_func(loaded_entities):
     print("loaded {} entities!".format(loaded_entities))
 
@@ -100,13 +100,13 @@ DataArrays can be used to make the creation of Observations easier, because with
 has to be created.
 
 An example usage looks as follows:
-```
+```python
     import frost_sta_client as fsc
     
     service = fsc.SensorThingsService("exampleserver.com/FROST-Server/v1.1")
     dav = fsc.model.ext.data_array_value.DataArrayValue()
     datastream = service.datastreams().find(1)
-    foi = service.feature_of_interest().find(1)
+    foi = service.features_of_interest().find(1)
     components = {dav.Property.PHENOMENON_TIME, dav.Property.RESULT, dav.Property.FEATURE_OF_INTEREST}
     dav.components = components
     dav.datastream = datastream
@@ -115,7 +115,7 @@ An example usage looks as follows:
                            datastream=datastream,
                            feature_of_interest=foi)
     obs2 = fsc.Observation(result=5,
-                           phenomenon_time='2022-12-19T17:00:00Z',
+                           phenomenon_time='2022-12-19T10:00:00Z/2022-12-19T11:00:00Z',
                            datastream=datastream,
                            feature_of_interest=foi)
     dav.add_observation(obs1)

{frost_sta_client-1.1.39 → frost_sta_client-1.1.41}/frost_sta_client/__version__.py

@@ -1,5 +1,5 @@
 __title__ = 'frost_sta_client'
-__version__ = '1.1.39'
+__version__ = '1.1.41'
 __license__ = 'LGPL3'
 __author__ = 'Jonathan Vogl'
 __copyright__ = 'Fraunhofer IOSB'

{frost_sta_client-1.1.39 → frost_sta_client-1.1.41}/frost_sta_client/model/multi_datastream.py

@@ -345,5 +345,5 @@ class MultiDatastream(entity.Entity):
             self.observed_properties.next_link = state.get('Observations@iot.nextLink')
             self.observed_properties.count = state.get('Observations@iot.count')
 
-    def get_dao(self):
-        return MultiDatastreamDao(self)
+    def get_dao(self, service):
+        return MultiDatastreamDao(service)

{frost_sta_client-1.1.39 → frost_sta_client-1.1.41}/frost_sta_client/service/sensorthingsservice.py

@@ -25,9 +25,10 @@ from frost_sta_client.model.ext import entity_type
 
 class SensorThingsService:
 
-    def __init__(self, url, auth_handler=None):
+    def __init__(self, url, auth_handler=None, proxies=None):
         self.url = url
         self.auth_handler = auth_handler
+        self.proxies = proxies
 
     @property
     def url(self):
@@ -58,11 +59,26 @@ class SensorThingsService:
             raise ValueError('auth should be of type AuthHandler!')
         self._auth_handler = value
 
+    
+    @property
+    def proxies(self):
+        return self._proxies
+
+    @proxies.setter
+    def proxies(self, value):
+        if value is None:
+            self._proxies = None
+            return
+        elif not isinstance(value, dict):
+            raise ValueError('Proxies must be a Dictionary!')
+        self._proxies = value
+    
+    
     def execute(self, method, url, **kwargs):
         if self.auth_handler is not None:
-            response = requests.request(method, url, auth=self.auth_handler.add_auth_header(), **kwargs)
+            response = requests.request(method, url, proxies=self.proxies, auth=self.auth_handler.add_auth_header(), **kwargs)
         else:
-            response = requests.request(method, url, **kwargs)
+            response = requests.request(method, url, proxies=self.proxies, **kwargs)
         try:
             response.raise_for_status()
         except requests.exceptions.HTTPError as e:

{frost_sta_client-1.1.39 → frost_sta_client-1.1.41}/frost_sta_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: frost-sta-client
-Version: 1.1.39
+Version: 1.1.41
 Summary: a client library to facilitate interaction with a FROST SensorThingsAPI Server
 Home-page: https://github.com/FraunhoferIOSB/FROST-Python-Client
 Author: Jonathan Vogl
@@ -27,14 +27,14 @@ identified by a URI.
 
 ### CRUD operations
 The source code below demonstrates the CRUD operations for Thing objects. Operations for other entities work similarly.
-```
+```python
 import frost_sta_client as fsc
 
 url = "exampleserver.com/FROST-Server/v1.1"
 service = fsc.SensorThingsService(url)
 ```
 #### Creating Entities
-```
+```python
 from geojson import Point
 
 point = Point((-115.81, 37.24))
@@ -49,7 +49,7 @@ service.create(thing)
 #### Querying Entities
 Queries to the FROST Server can be modified to include filters, selections or expansions. The return value is always
 an EntityList object, containing the parsed json response of the server.
-```
+```python
 things_list = service.things().query().filter('id eq 1').list()
 
 for thing in things_list:
@@ -62,7 +62,7 @@ replaying to the request with the first chunk accompanied by the link to the nex
 
 The class `EntityList` implements the function `__iter__` and `__next__` which makes it capable of iterating 
 through the entire list of entities, including the calls to all chunks.
-```
+```python
 things_list = service.things().query().list()
 
 for thing in things_list:
@@ -71,7 +71,7 @@ for thing in things_list:
 
 In a case where only the current chunk is supposed to be iterated, the `entities` list can be used.
 
-```
+```python
 things_list = service.things().query().top(20).list()
 
 for thing in things_list.entities:
@@ -81,7 +81,7 @@ for thing in things_list.entities:
 ### Queries to related entity lists
 
 For example the Observations of a given Datastream can be queried via
-```
+```python
 datastream = service.datastreams().find(1)
 observations_list = datastream.get_observations().query().filter("result gt 10").list()
 ```
@@ -96,7 +96,7 @@ combination with a for-loop).
 
 The callback function is called with one argument, which is the current index of the iteration.
 
-```
+```python
 def callback_func(loaded_entities):
     print("loaded {} entities!".format(loaded_entities))
 
@@ -112,13 +112,13 @@ DataArrays can be used to make the creation of Observations easier, because with
 has to be created.
 
 An example usage looks as follows:
-```
+```python
     import frost_sta_client as fsc
     
     service = fsc.SensorThingsService("exampleserver.com/FROST-Server/v1.1")
     dav = fsc.model.ext.data_array_value.DataArrayValue()
     datastream = service.datastreams().find(1)
-    foi = service.feature_of_interest().find(1)
+    foi = service.features_of_interest().find(1)
     components = {dav.Property.PHENOMENON_TIME, dav.Property.RESULT, dav.Property.FEATURE_OF_INTEREST}
     dav.components = components
     dav.datastream = datastream
@@ -127,7 +127,7 @@ An example usage looks as follows:
                            datastream=datastream,
                            feature_of_interest=foi)
     obs2 = fsc.Observation(result=5,
-                           phenomenon_time='2022-12-19T17:00:00Z',
+                           phenomenon_time='2022-12-19T10:00:00Z/2022-12-19T11:00:00Z',
                            datastream=datastream,
                            feature_of_interest=foi)
     dav.add_observation(obs1)