Round RH to zero decimal places

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

diff --git a/infoex-autowx.py b/infoex-autowx.py
index be66aa405e27d13e4cfd2e89f26d52df5d979063..b979287e1a38b12d6796a3b590098ee894ba44c8 100755 (executable)
--- a/infoex-autowx.py
+++ b/infoex-autowx.py
@@ -33,13 +33,15 @@ import time
 from ftplib import FTP
 from argparse import ArgumentParser
 
 from ftplib import FTP
 from argparse import ArgumentParser
 

+import pytz
+

 import requests
 
 import zeep
 import zeep.cache
 import zeep.transports
 
 import requests
 
 import zeep
 import zeep.cache
 import zeep.transports
 

-__version__ = '3.0.0'
+__version__ = '3.1.0'

 
 LOG = logging.getLogger(__name__)
 LOG.setLevel(logging.NOTSET)
 
 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']
 
         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)
     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)
 
                       "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:
 
     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(station['desired_data']),

-                  str(begin_date), str(end_date))
+                  str(begin_date), str(end_date), end_date.tzinfo.zone)

 
     time_all_elements = time.time()
 
 
     time_all_elements = time.time()
 


@@ -230,7 +243,7 @@ def main():
                     infoex['wx_data'] = []
             except Exception as exc:
                 LOG.error("Python program for custom Wx data failed in "
                     infoex['wx_data'] = []
             except Exception as exc:
                 LOG.error("Python program for custom Wx data failed in "

-                          "execution: " + str(exc))
+                          "execution: %s", str(exc))

                 sys.exit(1)
 
             LOG.info("Successfully executed external Python program")
                 sys.exit(1)
 
             LOG.info("Successfully executed external Python program")


@@ -243,7 +256,7 @@ def main():
             sys.exit(1)
         except Exception as exc:
             LOG.error("A problem was encountered when attempting to "
             sys.exit(1)
         except Exception as exc:
             LOG.error("A problem was encountered when attempting to "

-                      "load your custom Wx program: " + str(exc))
+                      "load your custom Wx program: %s", str(exc))

             sys.exit(1)
 
     LOG.info("Time taken to get all data : %.3f sec", time.time() -
             sys.exit(1)
 
     LOG.info("Time taken to get all data : %.3f sec", time.time() -


@@ -251,11 +264,14 @@ def main():
 
     LOG.debug("infoex[wx_data]: %s", str(infoex['wx_data']))
 
 
     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']
     # 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:
 
     for element_cd in infoex['wx_data']:
         if element_cd not in iemap:


@@ -265,13 +281,15 @@ def main():
         # Massage precision of certain values to fit InfoEx's
         # expectations
         #
         # Massage precision of certain values to fit InfoEx's
         # expectations
         #

-        # 0 decimal places: wind speed, wind direction, wind gust, snow depth
+        # 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',
         # 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', 'PRES', 'pressure']:
             infoex['wx_data'][element_cd] = round(infoex['wx_data'][element_cd], 1)
             infoex['wx_data'][element_cd] = round(infoex['wx_data'][element_cd])
         elif element_cd in ['TOBS', 'air_temp', 'PRES', 'pressure']:
             infoex['wx_data'][element_cd] = round(infoex['wx_data'][element_cd], 1)


@@ -289,7 +307,7 @@ def main():
 
     LOG.debug("final_data: %s", str(final_data))
 
 
     LOG.debug("final_data: %s", str(final_data))
 

-    if len(infoex['wx_data']) > 0:
+    if infoex['wx_data']:

         if not write_local_csv(infoex['csv_filename'], final_data):
             LOG.warning('Could not write local CSV file: %s',
                         infoex['csv_filename'])
         if not write_local_csv(infoex['csv_filename'], final_data):
             LOG.warning('Could not write local CSV file: %s',
                         infoex['csv_filename'])


@@ -403,6 +421,10 @@ def get_nrcs_data(begin, end, station):
     client = zeep.Client(wsdl=station['source'], transport=transport)
     remote_data = {}
 
     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()
 
     for element_cd in station['desired_data']:
         time_element = time.time()
 


@@ -411,8 +433,8 @@ def get_nrcs_data(begin, end, station):
             stationTriplets=[station['station_id']],
             elementCd=element_cd,
             ordinal=1,
             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)
 
         LOG.info("Time to get NRCS elementCd '%s': %.3f sec", element_cd,
                  time.time() - time_element)


@@ -452,6 +474,9 @@ def get_mesowest_data(begin, end, station):
 
     try:
         observations = json['STATION'][0]['OBSERVATIONS']
 
     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)
     except ValueError:
         LOG.error("Bad JSON in MesoWest response")
         sys.exit(1)


@@ -479,9 +504,11 @@ def get_mesowest_data(begin, end, station):
             if observations[key_name][pos]:
                 remote_data[element_cd] = observations[key_name][pos]
 
             if observations[key_name][pos]:
                 remote_data[element_cd] = observations[key_name][pos]
 

-                # mesowest provides wind_speed in m/s, we want mph
-                if 'wind_speed' == element_cd:
-                    remote_data[element_cd] = ms_to_mph(remote_data[element_cd])
+                # 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] = kn_to_mph(remote_data[element_cd])

             else:
                 remote_data[element_cd] = None
         else:
             else:
                 remote_data[element_cd] = None
         else:


@@ -530,10 +557,18 @@ def upload_csv(path_to_file, infoex_data):
     os.remove(path_to_file)
 
 # other miscellaneous routines
     os.remove(path_to_file)
 
 # other miscellaneous routines

-def setup_time_values():
+def setup_time_values(station):

     """establish time bounds of data request(s)"""
     """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
     # 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)
     end_date = date_time - datetime.timedelta(minutes=date_time.minute % 60,
                                               seconds=date_time.second,
                                               microseconds=date_time.microsecond)


@@ -544,5 +579,9 @@ def ms_to_mph(ms):
     """convert meters per second to miles per hour"""
     return ms * 2.236936
 
     """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())
 if __name__ == "__main__":
     sys.exit(main())