Merge branch 'timezone-support' into develop

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

diff --git a/infoex-autowx.py b/infoex-autowx.py
index d58baac635453d4fd06bd00f23a6e2ffc2d1620b..15adf0832a24cd757fd5b989edc729020ee8eee8 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.1'
+__version__ = '3.0.2'
 
 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()
+    (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:
@@ -404,6 +420,10 @@ def get_nrcs_data(begin, end, station):
     client = zeep.Client(wsdl=station['source'], transport=transport)
     remote_data = {}
 
+    # massage begin/end date format
+    begin_date_str = begin.strftime('%Y-%m-%d %H:%M:00')
+    end_date_str = end.strftime('%Y-%m-%d %H:%M:00')
+
     for element_cd in station['desired_data']:
         time_element = time.time()
 
@@ -412,8 +432,8 @@ def get_nrcs_data(begin, end, station):
             stationTriplets=[station['station_id']],
             elementCd=element_cd,
             ordinal=1,
-            beginDate=begin,
-            endDate=end)
+            beginDate=begin_date_str,
+            endDate=end_date_str)
 
         LOG.info("Time to get NRCS elementCd '%s': %.3f sec", element_cd,
                  time.time() - time_element)
@@ -480,9 +500,11 @@ def get_mesowest_data(begin, end, station):
             if observations[key_name][pos]:
                 remote_data[element_cd] = observations[key_name][pos]
 
-                # mesowest provides wind_speed in m/s, we want mph
+                # mesowest by default provides wind_speed in m/s, but
+                # we specify 'english' units in the request; either way,
+                # we want mph
                 if element_cd in ('wind_speed', 'wind_gust'):
-                    remote_data[element_cd] = ms_to_mph(remote_data[element_cd])
+                    remote_data[element_cd] = kn_to_mph(remote_data[element_cd])
             else:
                 remote_data[element_cd] = None
         else:
@@ -531,10 +553,18 @@ def upload_csv(path_to_file, infoex_data):
     os.remove(path_to_file)
 
 # other miscellaneous routines
-def setup_time_values():
+def setup_time_values(station):
     """establish time bounds of data request(s)"""
+
+    # default timezone to UTC (for MesoWest)
+    tz = pytz.utc
+
+    # 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()
+    date_time = datetime.datetime.now(tz=tz)
     end_date = date_time - datetime.timedelta(minutes=date_time.minute % 60,
                                               seconds=date_time.second,
                                               microseconds=date_time.microsecond)
@@ -545,5 +575,9 @@ def ms_to_mph(ms):
     """convert meters per second to miles per hour"""
     return ms * 2.236936
 
+def kn_to_mph(kn):
+    """convert knots to miles per hour"""
+    return kn * 1.150779
+
 if __name__ == "__main__":
     sys.exit(main())