Merge pull request #21 from ReagentX/develop

Release/1.0.4

purpleair/api_data.py

@@ -1,5 +1,17 @@
 """
 Constants for PurpleAir API
 """
+from datetime import timedelta
+from sqlite3 import OperationalError
+
+import requests_cache
+
+# Setup cache for requests
+requests_cache.install_cache(expire_after=timedelta(hours=1))
+try:
+    requests_cache.core.remove_expired_responses()
+except OperationalError:
+    print('Unable to purge cache database, cache may contain old data!!!')
+
 
 API_ROOT = 'https://www.purpleair.com/json'

purpleair/network.py

@@ -4,20 +4,14 @@
 
 
 import json
-from datetime import timedelta
 from json.decoder import JSONDecodeError
 
 import pandas as pd
 import requests
-import requests_cache
 
 from .api_data import API_ROOT
 from .sensor import Sensor
 
-# Setup cache for requests
-requests_cache.install_cache(expire_after=timedelta(hours=1))
-requests_cache.core.remove_expired_responses()
-
 
 class SensorList():
     """
@@ -41,7 +35,8 @@ def get_all_data(self):
         try:
             data = json.loads(response.content)
         except JSONDecodeError as err:
-            raise ValueError('Invalid JSON data returned from network!') from err
+            raise ValueError(
+                'Invalid JSON data returned from network!') from err
         print(f"Initialized {len(data['results']):,} sensors!")
         self.data = data['results']
 
@@ -53,10 +48,13 @@ def to_dataframe(self, sensor_group: str) -> pd.DataFrame:
         if sensor_group not in {'useful', 'outside', 'all'}:
             raise ValueError(f'{sensor_group} is an invalid sensor group!')
         if sensor_group == 'all':
-            sensor_data = pd.DataFrame([s.as_flat_dict() for s in self.all_sensors])
+            sensor_data = pd.DataFrame([s.as_flat_dict()
+                                        for s in self.all_sensors])
         elif sensor_group == 'outside':
-            sensor_data = pd.DataFrame([s.as_flat_dict() for s in self.outside_sensors])
+            sensor_data = pd.DataFrame([s.as_flat_dict()
+                                        for s in self.outside_sensors])
         elif sensor_group == 'useful':
-            sensor_data = pd.DataFrame([s.as_flat_dict() for s in self.useful_sensors])
+            sensor_data = pd.DataFrame([s.as_flat_dict()
+                                        for s in self.useful_sensors])
         sensor_data.index = sensor_data.pop('id')
         return sensor_data

purpleair/sensor.py

@@ -6,24 +6,14 @@
 import json
 from typing import Optional
 from datetime import datetime, timedelta
-from sqlite3 import OperationalError
 
 import pandas as pd
 import requests
-import requests_cache
 import thingspeak
 from geopy.geocoders import Nominatim
 
 from .api_data import API_ROOT
 
-# Setup cache for requests
-try:
-    requests_cache.install_cache(expire_after=timedelta(hours=1))
-    requests_cache.core.remove_expired_responses()
-except OperationalError:
-    print('Unable to open cache database, requests will not be cached!!!')
-
-
 class Sensor():
     """
     Class for a single PurpleAir sensor; set initialize=True to fetch data from the API

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='purpleair',
-    version='1.0.3',
+    version='1.0.4',
     description='Python API Client to get and transform PurpleAir data.',
     long_description=LONG_DESCRIPTION,
     long_description_content_type="text/markdown",