Merge pull request #2462 from dtcenter/bugfix_2428_python_from_env_2

Bugfix 2428 python embedding with MET_PYTHON_EXE defined

data/wrappers/Makefile.am

@@ -24,8 +24,10 @@ wrappers_DATA = \
      set_python_env.py \
      read_tmp_dataplane.py \
      read_tmp_ascii.py \
+     read_tmp_point_nc.py \
      write_tmp_dataplane.py \
      write_tmp_point.py \
+     write_tmp_point_nc.py \
      write_tmp_mpr.py
 
 EXTRA_DIST = ${wrappers_DATA}

data/wrappers/Makefile.in

@@ -360,8 +360,10 @@ wrappers_DATA = \
      set_python_env.py \
      read_tmp_dataplane.py \
      read_tmp_ascii.py \
+     read_tmp_point_nc.py \
      write_tmp_dataplane.py \
      write_tmp_point.py \
+     write_tmp_point_nc.py \
      write_tmp_mpr.py
 
 EXTRA_DIST = ${wrappers_DATA}

data/wrappers/read_tmp_point_nc.py

@@ -0,0 +1,26 @@
+########################################################################
+#
+#    Reads temporary point obs. file into memory.
+#
+#    usage:  /path/to/python read_tmp_point_nc.py tmp_output_filename
+#
+########################################################################
+
+import os
+import sys
+
+# add share/met/python directory to system path to find met_point_obs
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__),
+                                             os.pardir, 'python')))
+from met_point_obs import met_point_obs
+from met_point_obs_nc import nc_point_obs
+
+netcdf_filename = sys.argv[1]
+
+# read NetCDF file
+print('{p}  reading{f}'.format(p=met_point_obs.get_prompt(), f=netcdf_filename))
+point_obs_data = nc_point_obs()
+point_obs_data.read_data(netcdf_filename)
+
+met_point_data = point_obs_data.get_point_data() 
+met_point_data['met_point_data'] = point_obs_data

data/wrappers/write_tmp_point_nc.py

@@ -0,0 +1,55 @@
+########################################################################
+#
+#    Adapted from a script provided by George McCabe
+#    Adapted by Howard Soh
+#
+#    usage:  /path/to/python write_tmp_point_nc.py \
+#            tmp_output_filename <user_python_script>.py <args>
+#
+########################################################################
+
+import os
+import sys
+import importlib.util
+
+# add share/met/python directory to system path to find met_point_obs
+sys.path.append(os.path.abspath(os.path.join(os.path.dirname(__file__),
+                                             os.pardir, 'python')))
+
+from met_point_obs import met_point_obs
+from met_point_obs_nc import nc_point_obs
+
+PROMPT = met_point_obs.get_prompt()
+print("{p} Python Script:\t".format(p=PROMPT)  + repr(sys.argv[0]))
+print("{p} User Command:\t".format(p=PROMPT)   + repr(' '.join(sys.argv[2:])))
+print("{p} Temporary File:\t".format(p=PROMPT) + 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)
+
+if hasattr(met_in, 'point_obs_data'):
+    met_in.point_obs_data.save_ncfile(tmp_filename)
+else:
+    if hasattr(met_in.met_point_data, 'point_obs_data'):
+        met_in.met_point_data['point_obs_data'].save_ncfile(tmp_filename)
+    else:
+        tmp_point_obs = nc_point_obs()
+        tmp_point_obs.put_data(met_in.met_point_data)
+        tmp_point_obs.save_ncfile(tmp_filename)
+
+#print('{p} writing {f}'.format(p=PROMPT, f=tmp_filename))

docs/Users_Guide/appendixF.rst

@@ -260,7 +260,7 @@ The ASCII2NC tool supports the "-format python" option. With this option, point
                 "MET_BASE/python/read_ascii_point.py sample_ascii_obs.txt" \
                 sample_ascii_obs_python.nc
 
-The Point2Grid, Plot-Point-Obs, Ensemble-Stat, and Point-Stat tools also process point observations. They support POython embedding of point observations directly on the command line by replacing the input MET NetCDF point observation file name with the Python command to be run. The Python command must begin with the prefix 'PYTHON_NUMPY=' and be followed by the path to the User's Python script and any arguments. The full command should be enclosed in single quotes to prevent embedded whitespace from causing parsing errors. An example of this is shown below:
+The Point2Grid, Plot-Point-Obs, Ensemble-Stat, and Point-Stat tools also process point observations. They support Python embedding of point observations directly on the command line by replacing the input MET NetCDF point observation file name with the Python command to be run. The Python command must begin with the prefix 'PYTHON_NUMPY=' and be followed by the path to the User's Python script and any arguments. The full command should be enclosed in single quotes to prevent embedded whitespace from causing parsing errors. An example of this is shown below:
 
 .. code-block:: none
 

internal/test_unit/xml/unit_python.xml

@@ -495,6 +495,25 @@
     </output>
   </test>
 
+  <!-- Invokes user-python logic to read a point obs -->
+  <test name="python_point2grid_pb2nc_TMP_user_python">
+    <exec>&MET_BIN;/point2grid</exec>
+    <env>
+      <pair><name>MET_PYTHON_EXE</name> <value>&MET_PYTHON_EXE;</value></pair>
+    </env>
+    <param> \
+      'PYTHON_NUMPY=&MET_BASE;/python/read_met_point_obs.py &OUTPUT_DIR;/pb2nc/ndas.20120409.t12z.prepbufr.tm00.nc' \
+      G212 \
+      &OUTPUT_DIR;/python/pb2nc_TMP_user_python.nc \
+      -field 'name="TMP"; level="*"; valid_time="20120409_120000"; censor_thresh=[ &lt;0 ]; censor_val=[0];' \
+      -name TEMP \
+      -v 1
+    </param>
+    <output>
+      <grid_nc>&OUTPUT_DIR;/python/pb2nc_TMP_user_python.nc</grid_nc>
+    </output>
+  </test>
+
   <test name="python_plot_point_obs_with_point_data">
     <exec>&MET_BIN;/plot_point_obs</exec>
     <env>

scripts/python/Makefile.am

@@ -27,6 +27,7 @@ pythonscriptsdir = $(pkgdatadir)/python
 
 pythonscripts_DATA = \
 	met_point_obs.py \
+	met_point_obs_nc.py \
 	read_ascii_numpy.py \
 	read_ascii_numpy_grid.py \
 	read_ascii_xarray.py \

scripts/python/Makefile.in

@@ -299,6 +299,7 @@ top_srcdir = @top_srcdir@
 pythonscriptsdir = $(pkgdatadir)/python
 pythonscripts_DATA = \
 	met_point_obs.py \
+	met_point_obs_nc.py \
 	read_ascii_numpy.py \
 	read_ascii_numpy_grid.py \
 	read_ascii_xarray.py \