Feature 1700 python

met/data/wrappers/Makefile.am

@@ -21,13 +21,12 @@ SUBDIRS =
 wrappersdir = $(pkgdatadir)/wrappers
 
 wrappers_DATA = \
-     generic_python.py \
-     generic_pickle.py \
+     set_python_env.py \
      read_tmp_dataplane.py \
-     write_tmp_dataplane.py \
-     write_pickle_mpr.py \
      read_tmp_ascii.py \
-     write_tmp_point.py
+     write_tmp_dataplane.py \
+     write_tmp_point.py \
+     write_tmp_mpr.py
 
 EXTRA_DIST = ${wrappers_DATA}
 

met/data/wrappers/read_tmp_ascii.py

@@ -8,6 +8,8 @@
     Message_Type, Station_ID, Valid_Time, Lat, Lon, Elevation,
     GRIB_Code or Variable_Name, Level, Height, QC_String, Observation_Value
 
+MPR format: See documentation of the MPR line type
+
 Version  Date
 1.0.0    2021/02/18  David Fillmore  Initial version
 """
@@ -18,25 +20,22 @@
 
 import argparse
 
-point_data = None
-
 def read_tmp_ascii(filename):
     """
     Arguments:
-        filename (string): temporary file created by write_tmp_point.py
+        filename (string): temporary file created by write_tmp_point.py or write_tmp_mpr.py
 
     Returns:
-        (list of lists): point data
+        (list of lists): point or mpr data
     """
-    print('read_tmp_ascii:' + filename)
     f = open(filename, 'r')
     lines = f.readlines()
     f.close()
 
-    global point_data
-    point_data = [eval(line.strip('\n')) for line in lines]
-
-    return point_data
+    global ascii_data
+    ascii_data = [eval(line.strip('\n')) for line in lines]
+    
+    return ascii_data
 
 if __name__ == '__main__':
     """

met/data/wrappers/generic_python.py → met/data/wrappers/set_python_env.py

@@ -1,11 +1,9 @@
 ########################################################################
 #
-# When MET_PYTHON_EXE is not defined, this script initializes
-# MET's python runtime environment.
+# This script initializes MET's python runtime environment.
 #
 ########################################################################
 
 import os
 import sys
 import numpy as np
-import pickle

met/data/wrappers/write_tmp_dataplane.py

@@ -13,6 +13,10 @@
 import importlib.util
 import netCDF4 as nc
 
+print("Python Script:\t"  + repr(sys.argv[0]))
+print("User Command:\t"   + repr(' '.join(sys.argv[2:])))
+print("Temporary File:\t" + repr(sys.argv[1]))
+
 netcdf_filename = sys.argv[1]
 pyembed_module_name = sys.argv[2]
 sys.argv = sys.argv[2:]

met/data/wrappers/write_tmp_mpr.py

@@ -0,0 +1,39 @@
+########################################################################
+#
+#    Adapted from a script provided by George McCabe
+#    Adapted by Randy Bullock
+#
+#    usage:  /path/to/python write_tmp_mpr.py \
+#            tmp_output_filename <user_python_script>.py <args>
+#
+########################################################################
+
+import os
+import sys
+import importlib.util
+
+print("Python Script:\t"  + repr(sys.argv[0]))
+print("User Command:\t"   + repr(' '.join(sys.argv[2:])))
+print("Temporary File:\t" + repr(sys.argv[1]))
+
+tmp_filename = sys.argv[1]
+pyembed_module_name = sys.argv[2]
+sys.argv = sys.argv[2:]
+
+# append user script dir to system path
+pyembed_dir, pyembed_file = os.path.split(pyembed_module_name)
+if pyembed_dir:
+    sys.path.insert(0, pyembed_dir)
+
+if not pyembed_module_name.endswith('.py'):
+    pyembed_module_name += '.py'
+
+user_base = os.path.basename(pyembed_module_name).replace('.py','')
+
+spec = importlib.util.spec_from_file_location(user_base, pyembed_module_name)
+met_in = importlib.util.module_from_spec(spec)
+spec.loader.exec_module(met_in)
+
+f = open(tmp_filename, 'w')
+for line in met_in.mpr_data:
+    f.write(str(line) + '\n')

met/data/wrappers/write_tmp_point.py

@@ -4,23 +4,30 @@
 #    Adapted by Randy Bullock
 #
 #    usage:  /path/to/python write_tmp_point.py \
-#            tmp_ascii_output_filename <user_python_script>.py <args>
+#            tmp_output_filename <user_python_script>.py <args>
 #
 ########################################################################
 
 import os
 import sys
 import importlib.util
 
-print('Python Script:\t', sys.argv[0])
-print('User Command:\t',  sys.argv[2:])
-print('Write Temporary Ascii:\t',  sys.argv[1])
+print("Python Script:\t"  + repr(sys.argv[0]))
+print("User Command:\t"   + repr(' '.join(sys.argv[2:])))
+print("Temporary File:\t" + repr(sys.argv[1]))
 
 tmp_filename = sys.argv[1]
-
 pyembed_module_name = sys.argv[2]
 sys.argv = sys.argv[2:]
 
+# append user script dir to system path
+pyembed_dir, pyembed_file = os.path.split(pyembed_module_name)
+if pyembed_dir:
+    sys.path.insert(0, pyembed_dir)
+
+if not pyembed_module_name.endswith('.py'):
+    pyembed_module_name += '.py'
+
 user_base = os.path.basename(pyembed_module_name).replace('.py','')
 
 spec = importlib.util.spec_from_file_location(user_base, pyembed_module_name)

met/docs/Users_Guide/appendixF.rst

@@ -35,11 +35,11 @@ The types of Python embedding supported in MET are described below. In all cases
 
 Setting this environment variable triggers slightly different processing logic in MET. Rather than executing the user-specified script with compiled Python instance directly, MET does the following:
 
-1. Wrap the user's Python script and arguments with a wrapper script (write_pickle_mpr.py, write_pickle_point.py, or write_pickle_dataplane.py) and specify the name of a temporary file to be written.
+1. Wrap the user's Python script and arguments with a wrapper script (write_tmp_mpr.py, write_tmp_point.py, or write_tmp_dataplane.py) and specify the name of a temporary file to be written.
 
-2. Use a system call to the **MET_PYTHON_EXE** Python instance to execute these commands and write the resulting data objects to a temporary Python pickle file.
+2. Use a system call to the **MET_PYTHON_EXE** Python instance to execute these commands and write the resulting data objects to a temporary ASCII or NetCDF file.
 
-3. Use the compiled Python instance to read data from that temporary pickle file.
+3. Use the compiled Python instance to run a wrapper script (read_tmp_ascii.py or read_tmp_dataplane.py) to read data from that temporary file.
 
 With this approach, users should be able to execute Python scripts in their own custom environments.
 

met/scripts/python/read_ascii_mpr.py

@@ -6,7 +6,7 @@
 
 ########################################################################
 
-print('Python Script:\t', sys.argv[0])
+print("Python Script:\t" + repr(sys.argv[0]))
 
    ##
    ##  input file specified on the command line

met/scripts/python/read_ascii_numpy.py

@@ -6,7 +6,7 @@
 
 ###########################################
 
-print('Python Script:\t', sys.argv[0])
+print("Python Script:\t" + repr(sys.argv[0]))
 
    ##
    ##  input file specified on the command line

met/scripts/python/read_ascii_numpy_grid.py

@@ -6,7 +6,7 @@
 
 ###########################################
 
-print('Python Script:\t', sys.argv[0])
+print("Python Script:\t" + repr(sys.argv[0]))
 
    ##
    ##  input file specified on the command line

met/scripts/python/read_ascii_point.py

@@ -6,7 +6,7 @@
 
 ########################################################################
 
-print('Python Script:\t', sys.argv[0])
+print("Python Script:\t" + repr(sys.argv[0]))
 
    ##
    ##  input file specified on the command line

met/scripts/python/read_ascii_xarray.py

@@ -7,7 +7,7 @@
 
 ###########################################
 
-print('Python Script:\t', sys.argv[0])
+print("Python Script:\t" + repr(sys.argv[0]))
 
    ##
    ##  input file specified on the command line