PyTransportNSWv2 0.8.4__tar.gz → 0.8.5__tar.gz

{PyTransportNSWv2-0.8.4 → PyTransportNSWv2-0.8.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyTransportNSWv2
-Version: 0.8.4
+Version: 0.8.5
 Summary: Get detailed per-trip transport information from TransportNSW
 Home-page: https://github.com/andystewart999/TransportNSW
 Author: andystewart999

{PyTransportNSWv2-0.8.4 → PyTransportNSWv2-0.8.5}/PyTransportNSWv2.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: PyTransportNSWv2
-Version: 0.8.4
+Version: 0.8.5
 Summary: Get detailed per-trip transport information from TransportNSW
 Home-page: https://github.com/andystewart999/TransportNSW
 Author: andystewart999

{PyTransportNSWv2-0.8.4 → PyTransportNSWv2-0.8.5}/TransportNSWv2/TransportNSWv2.py

@@ -8,8 +8,9 @@ import requests.exceptions
 import requests
 import logging
 import re
-import json #For the output
+import json					#For the output
 import time
+#from ratelimit import limits, sleep_and_retry	# API rate limiting
 
 ATTR_DUE_IN = 'due'
 
@@ -119,7 +120,7 @@ class TransportNSWv2(object):
                 logger.error("Network or Timeout error when calling /v1/tp/stop_finder API")
                 return None
 
-            # If we get bad status code, log error and return with n/a or an empty string
+            # If we get bad status code, log error and return with None
             if response.status_code != 200:
                 if response.status_code == 429:
                     logger.error("Error " + str(response.status_code) + " calling /v1/tp/stop_finder API; rate limit exceeded")
@@ -135,9 +136,9 @@ class TransportNSWv2(object):
             if 'systemMessages' in result:
                 logger.error("Stop ID " + stop + " does not exist")
 
-            # Put in a quick pause here to try and make sure we stay under the 5 minute calls/second limit
+            # Put in a pause here to try and make sure we stay under the 5 API calls/second limit
             # Not usually an issue but if multiple processes are running multiple calls we might hit it
-            time.sleep(0.5)
+            time.sleep(1.0)
 
         # We don't control how many journeys are returned any more, so need to be careful of running out of valid journeys if there is a filter in place, particularly a strict filter
         # It would be more efficient to return one journey, check if the filter is met and then retrieve the next one via a new query if not, but for now we'll only be making use of the journeys we've been given
@@ -158,13 +159,17 @@ class TransportNSWv2(object):
         try:
             response = requests.get(url, headers=header, timeout=20)
         except:
-            logger.error("Network or Timeout error")
+            logger.error("Network or timeout error")
             return None
 
         # If we get bad status code, log error and return with n/a or an empty string
         if response.status_code != 200:
-            logger.error("Error " + str(response.status_code) + " calling /v1/tp/trip API; check api key")
-            return None
+           if response.status_code == 429:
+               logger.error("Error " + str(response.status_code) + " calling /v1/tp/stop_finder API; rate limit exceeded")
+           else:
+               logger.error("Error " + str(response.status_code) + " calling /v1/tp/stop_finder API; check api key")
+
+           return None
 
         # Parse the result as a JSON object
         result = response.json()
@@ -266,10 +271,11 @@ class TransportNSWv2(object):
                     url_list = self.get_url_path(origin_mode)
                     bFoundTripID = False
 
+                    auth = 'apikey ' + self.api_key
+                    header = {'Authorization': auth}
+
                     for mode_url in url_list:
                         url = url_path + mode_url
-                        auth = 'apikey ' + self.api_key
-                        header = {'Authorization': auth}
 
                         response = requests.get(url, headers=header, timeout=10)
 
@@ -295,14 +301,11 @@ class TransportNSWv2(object):
                             # No need to look any further
                             break
 
-
-                        # Put in a quick pause here to try and make sure we stay under the 5 minute calls/second limit
+                        # Put in a quick pause here to try and make sure we stay under the 5 API calls/second limit
                         # Not usually an issue but if multiple processes are running multiple calls we might hit it
                         time.sleep(0.5)
 
 
-
-
                 self.info = {
                     ATTR_DUE_IN: due,
                     ATTR_DELAY: delay,

{PyTransportNSWv2-0.8.4 → PyTransportNSWv2-0.8.5}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="PyTransportNSWv2",
-    version="0.8.4",
+    version="0.8.5",
     author="andystewart999",
     author_email="andy.stewart@live.com",
     description="Get detailed per-trip transport information from TransportNSW",