Catch KeyError exception when interpreting json

[infoex-autowx.git] / infoex-autowx.py

diff --git a/infoex-autowx.py b/infoex-autowx.py
index dfb22a7be4db8b6abf20a093b3a7b9d667694025..9bd77c1f8315d1ad4528bd11859cad8eadeb3ae3 100755 (executable)
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -33,13 +33,15 @@ import time
 from ftplib import FTP
 from argparse import ArgumentParser
 
+import pytz
+
 import requests
 
 import zeep
 import zeep.cache
 import zeep.transports
 
-__version__ = '3.0.2'
+__version__ = '3.1.0'
 
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.NOTSET)
@@ -115,6 +117,17 @@ def setup_config(config):
         if station['provider'] == 'python':
             station['path'] = config['station']['path']
 
+        tz = 'America/Los_Angeles'
+
+        if 'tz' in config['station']:
+            tz = config['station']['tz']
+
+        try:
+            station['tz'] = pytz.timezone(tz)
+        except pytz.exceptions.UnknownTimeZoneError:
+            LOG.critical("%s is not a valid timezone", tz)
+            sys.exit(1)
+
     except KeyError as err:
         LOG.critical("%s not defined in configuration file", err)
         sys.exit(1)
@@ -196,14 +209,14 @@ def main():
                       "file")
             sys.exit(1)
 
-    (begin_date, end_date) = setup_time_values(station['provider'])
+    (begin_date, end_date) = setup_time_values(station)
 
     if station['provider'] == 'python':
         LOG.debug("Getting custom data from external Python program")
     else:
-        LOG.debug("Getting %s data from %s to %s",
+        LOG.debug("Getting %s data from %s to %s (%s)",
                   str(station['desired_data']),
-                  str(begin_date), str(end_date))
+                  str(begin_date), str(end_date), end_date.tzinfo.zone)
 
     time_all_elements = time.time()
 
@@ -251,11 +264,14 @@ def main():
 
     LOG.debug("infoex[wx_data]: %s", str(infoex['wx_data']))
 
+    # timezone massaging
+    final_end_date = end_date.astimezone(station['tz'])
+
     # Now we only need to add in what we want to change thanks to that
     # abomination of a variable declaration earlier
     final_data[fmap['Location UUID']] = infoex['location_uuid']
-    final_data[fmap['obDate']] = end_date.strftime('%m/%d/%Y')
-    final_data[fmap['obTime']] = end_date.strftime('%H:%M')
+    final_data[fmap['obDate']] = final_end_date.strftime('%m/%d/%Y')
+    final_data[fmap['obTime']] = final_end_date.strftime('%H:%M')
 
     for element_cd in infoex['wx_data']:
         if element_cd not in iemap:
@@ -457,6 +473,9 @@ def get_mesowest_data(begin, end, station):
 
     try:
         observations = json['STATION'][0]['OBSERVATIONS']
+    except KeyError:
+        LOG.error("Unexpected JSON in MesoWest response")
+        sys.exit(1)
     except ValueError:
         LOG.error("Bad JSON in MesoWest response")
         sys.exit(1)
@@ -537,14 +556,15 @@ def upload_csv(path_to_file, infoex_data):
     os.remove(path_to_file)
 
 # other miscellaneous routines
-def setup_time_values(provider):
+def setup_time_values(station):
     """establish time bounds of data request(s)"""
 
     # default timezone to UTC (for MesoWest)
-    tz = datetime.timezone.utc
+    tz = pytz.utc
 
-    if provider == 'nrcs':
-        tz = None
+    # but for NRCS, use the config-specified timezone
+    if station['provider'] == 'nrcs':
+        tz = station['tz']
 
     # floor time to nearest hour
     date_time = datetime.datetime.now(tz=tz)