Merge pull request #83 from ReagentX/develop

Release/1.2.5

.gitignore

@@ -6,6 +6,7 @@ dist/*
 
 # Requests cache
 cache.sqlite
+http_cache.sqlite
 
 # Dev env
 venv/*

purpleair/api_data.py

@@ -1,18 +1,6 @@
 """
 Constants for PurpleAir API
 """
-from datetime import timedelta
-from sqlite3 import OperationalError
-
-import requests_cache
-
-# Set up cache for requests
-requests_cache.install_cache(expire_after=timedelta(hours=1))
-try:
- requests_cache.core.remove_expired_responses()
-except OperationalError:
- requests_cache.core.uninstall_cache()
- print('Unable to open cache or purge cache database, requests will not be cached!!!')
 
 
 API_ROOT = 'https://www.purpleair.com/json'

purpleair/network.py

@@ -7,9 +7,10 @@
 import time
 from json.decoder import JSONDecodeError
 from typing import List, Optional, Union
+from datetime import timedelta
 
 import pandas as pd
-import requests
+from requests_cache import CachedSession
 
 from .api_data import API_ROOT
 from .sensor import Sensor
@@ -33,7 +34,8 @@ def get_all_data(self) -> None:
  """
  Get all data from the API
  """
- response = requests.get(f'{API_ROOT}?q=""')
+ session = CachedSession(expire_after=timedelta(hours=1))
+ response = session.get(f'{API_ROOT}?q=""')
  try:
  data = json.loads(response.content)
  except JSONDecodeError as err:

purpleair/sensor.py

@@ -7,8 +7,9 @@
 import os
 from re import sub
 from typing import Optional, List
+from datetime import timedelta
 
-import requests
+from requests_cache import CachedSession
 from geopy.geocoders import Nominatim
 
 from .api_data import API_ROOT
@@ -56,7 +57,8 @@ def get_data(self) -> Optional[list]:
  raise ValueError(f'Invalid sensor ID: {self.identifier}')
 
  # Fetch the JSON for parent and child sensors
- response = requests.get(f'{API_ROOT}?show={self.identifier}')
+ session = CachedSession(expire_after=timedelta(hours=1))
+ response = session.get(f'{API_ROOT}?show={self.identifier}')
  data = json.loads(response.content)
  channel_data: Optional[list] = data.get('results')
 
@@ -68,7 +70,7 @@ def get_data(self) -> Optional[list]:
  except IndexError:
  raise IndexError from IndexError(
  f'Parent sensor for {self.identifier} does not exist!')
- response = requests.get(f'{API_ROOT}?show={parent_id}')
+ response = session.get(f'{API_ROOT}?show={parent_id}')
  data = json.loads(response.content)
  channel_data = data.get('results')
  elif channel_data and len(channel_data) > 2:

requirements/common.txt

@@ -1,6 +1,6 @@
 # Usage requirements
-requests
-requests_cache
-thingspeak
-geopy
-pandas
+requests_cache==0.6.0
+thingspeak==1.0.0
+requests==2.25.1
+pandas==1.2.4
+geopy==2.1.0

setup.py

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