X-Git-Url: https://wylark.com/src/infoex-autowx.git/blobdiff_plain/4ff0ba46542bd16c486f1759b81f9b171da6d1b6..8210e35384e3f5bad451c7eeeed8d70c3bcf8e60:/infoex-autowx.py?ds=inline

diff --git a/infoex-autowx.py b/infoex-autowx.py
index dfb22a7..abdf14a 100755
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -29,17 +29,20 @@ import logging
 import os
 import sys
 import time
+import importlib.util
 
 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.1'
 
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.NOTSET)
@@ -115,6 +118,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 +210,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()
 
@@ -215,8 +229,6 @@ def main():
                                               station)
     elif station['provider'] == 'python':
         try:
-            import importlib.util
-
             spec = importlib.util.spec_from_file_location('custom_wx',
                                                           station['path'])
             mod = importlib.util.module_from_spec(spec)
@@ -251,11 +263,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:
@@ -265,16 +280,17 @@ def main():
         # Massage precision of certain values to fit InfoEx's
         # expectations
         #
-        # 0 decimal places: wind speed, wind direction, wind gust, snow depth
-        # 1 decimal place:  air temp, relative humidity, baro
+        # 0 decimal places: relative humidity, wind speed, wind
+        #                   direction, wind gust, snow depth
+        # 1 decimal place:  air temp, baro
         # Avoid transforming None values
         if infoex['wx_data'][element_cd] is None:
             continue
         elif element_cd in ['wind_speed', 'WSPD', 'wind_direction',
-                            'WDIR', 'wind_gust', 'SNWD', 'snow_depth']:
+                            'RHUM', 'relative_humidity', 'WDIR',
+                            'wind_gust', 'SNWD', 'snow_depth']:
             infoex['wx_data'][element_cd] = round(infoex['wx_data'][element_cd])
-        elif element_cd in ['TOBS', 'air_temp', 'RHUM',
-                            'relative_humidity', 'PRES', 'pressure']:
+        elif element_cd in ['TOBS', 'air_temp', 'PRES', 'pressure']:
             infoex['wx_data'][element_cd] = round(infoex['wx_data'][element_cd], 1)
 
         # CONSIDER: Casting every value to Float() -- need to investigate if
@@ -457,8 +473,19 @@ def get_mesowest_data(begin, end, station):
 
     try:
         observations = json['STATION'][0]['OBSERVATIONS']
-    except ValueError:
-        LOG.error("Bad JSON in MesoWest response")
+    except KeyError as exc:
+        LOG.error("Unexpected JSON in MesoWest response: '%s'", exc)
+        sys.exit(1)
+    except IndexError as exc:
+        LOG.error("Unexpected JSON in MesoWest response: '%s'", exc)
+        try:
+            LOG.error("Detailed MesoWest response: '%s'",
+                      json['SUMMARY']['RESPONSE_MESSAGE'])
+        except KeyError:
+            pass
+        sys.exit(1)
+    except ValueError as exc:
+        LOG.error("Bad JSON in MesoWest response: '%s'", exc)
         sys.exit(1)
 
     pos = len(observations['date_time']) - 1
@@ -537,14 +564,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)