From 0e6e09d9588e22f24432295af529c668a8e4b7c8 Mon Sep 17 00:00:00 2001
From: White <jtwhite1000@gmail.com>
Date: Thu, 23 Jul 2020 12:48:09 -0600
Subject: [PATCH] added PstFrom.add_py_function() to help get python functions
 needed for pre and post processing into the forward run script

---
 autotest/pst_from_tests.py |  18 ++++++++
 bin/.DS_Store              | Bin 12292 -> 12292 bytes
 pyemu/utils/pst_from.py    |  83 +++++++++++++++++++++++++++++++++++--
 3 files changed, 98 insertions(+), 3 deletions(-)

diff --git a/autotest/pst_from_tests.py b/autotest/pst_from_tests.py
index cb45699cb..873bd80fc 100644
--- a/autotest/pst_from_tests.py
+++ b/autotest/pst_from_tests.py
@@ -471,6 +471,14 @@ def freyberg_prior_build_test():
     #                              cleanup=False, port=4005)
 
 
+def generic_function():
+    import pandas as pd
+    onames = ["generic_obs_{0}".format(i) for i in range(100)]
+    df = pd.DataFrame({"obsval":1,"simval":2,"obsnme":onames},index=onames)
+    df.to_csv("generic.csv",index=False)
+    return df
+
+
 def mf6_freyberg_test():
     import numpy as np
     import pandas as pd
@@ -576,6 +584,16 @@ def mf6_freyberg_test():
     # pf.add_observations('freyberg.hds.dat', insfile='freyberg.hds.dat.ins2',
     #                     index_cols='obsnme', use_cols='obsval', prefix='hds')
 
+    # call generic once so that the output file exists
+    os.chdir(template_ws)
+    df = generic_function()
+    os.chdir("..")
+    # add the values in generic to the ctl file
+    pf.add_observations("generic.csv",insfile="generic.csv.ins",index_cols="obsnme",use_cols="simval")
+    # add the function call to make generic to the forward run script
+    pf.add_py_function("pst_from_tests.py","generic_function()",is_pre_cmd=False)
+
+    #pf.post_py_cmds.append("generic_function()")
     df = pd.read_csv(os.path.join(tmp_model_ws, "sfr.csv"), index_col=0)
     pf.add_observations("sfr.csv", insfile="sfr.csv.ins", index_cols="time", use_cols=list(df.columns.values))
     v = pyemu.geostats.ExpVario(contribution=1.0,a=1000)
diff --git a/bin/.DS_Store b/bin/.DS_Store
index 95825ac5273c76f01dee3ea3524a0bccd5a8d017..346c402a3ec5ae87b3c35849c1432b04bfe24720 100644
GIT binary patch
delta 70
zcmZokXi3;mCd^@KY@nlHWNbcJUfp@~LE#rX$RduLKPjlP!9_O9tN&n!^ME>@0szak
B6L|mt

delta 98
zcmZokXi3;mCM;rMYO14PXlPKYqfl*bZlI%JW^6uruY&33{lc$!u*z=Us}RM;VP<Hl
ZqhM@dHhH6h<K_hQ?d&KblM~dJ003bs8~^|S

diff --git a/pyemu/utils/pst_from.py b/pyemu/utils/pst_from.py
index 4004e8591..e610baec2 100644
--- a/pyemu/utils/pst_from.py
+++ b/pyemu/utils/pst_from.py
@@ -11,6 +11,7 @@
 import time
 from ..pyemu_warnings import PyemuWarning
 import copy
+import string
 
 
 #the tolerable percent difference (100 * (max - min)/mean)
@@ -119,7 +120,7 @@ def __init__(self, original_d, new_d, longnames=True,
         self._parfile_relations = []
         self._pp_facs = {}
         self.pst = None
-
+        self._function_lines_list = [] #each function is itself a list of lines
         self.direct_org_files = []
 
     @property
@@ -277,11 +278,19 @@ def write_forward_run(self):
                 "import os\nimport multiprocessing as mp\nimport numpy as np" + \
                 "\nimport pandas as pd\n")
             f.write("import pyemu\n")
+            for ex_imp in self.extra_py_imports:
+                f.write('import {0}\n'.format(ex_imp))
+
+
+            for func_lines in self._function_lines_list:
+                f.write("\n")
+                f.write("# function added thru PstFrom.add_py_function()\n")
+                for func_line in func_lines:
+                    f.write(func_line)
+                f.write("\n")
             f.write("def main():\n")
             f.write("\n")
             s = "    "
-            for ex_imp in self.extra_py_imports:
-                f.write(s + 'import {0}\n'.format(ex_imp))
             for tmp_file in self.tmp_files:
                 f.write(s + "try:\n")
                 f.write(s + "   os.remove('{0}')\n".format(tmp_file))
@@ -706,6 +715,74 @@ def _next_count(self, prefix):
 
         return self._prefix_count[prefix]
 
+
+    def add_py_function(self,file_name,function_name, is_pre_cmd=True):
+        """add a python function to the forward run script
+
+        Args:
+            file_name (`str`): a python source file
+            function_name (`str`): a python function in
+                `file_name`
+            is_pre_cmd (`bool`): flag to include `function_name` in
+                PstFrom.pre_py_cmds.  If False, `function_name` is
+                added to PstFrom.post_py_cmds instead. Default is True.
+        Returns:
+            None
+
+        Note:
+            `function_name` is expected to be standalone a function
+                that contains all the imports it needs or these imports
+                should have been added to the forward run script through the
+                `PstFrom.py_imports` list.
+            This function adds the `function_name` call to the forward
+                run script (either as a pre or post command). It is up to users
+                 to make sure `function_name` is a valid python function call
+                  that includes the parentheses and requisite arguments
+            This function expects "def " + `function_name` to be flushed left at the outer
+                most indentation level
+
+        Example::
+
+            pf = PstFrom()
+            pf.add_py_function("preprocess.py","mult_well_function()",is_pre_cmd=True)
+
+
+        """
+
+        if not os.path.exists(file_name):
+            self.logger.lraise("add_py_function(): couldnt find python source file '{0}'".\
+                               format(file_name))
+        if '(' not in function_name or ')' not in function_name:
+            self.logger.lraise("add_py_function(): function_name '{0}' missing paretheses".\
+                               format(function_name))
+
+        func_lines = []
+        search_str = "def " + function_name
+        abet_set = set(string.ascii_uppercase)
+        abet_set.update(set(string.ascii_lowercase))
+        with open(file_name,'r') as f:
+            while True:
+                line = f.readline()
+                if line == '':
+                    self.logger.lraise("add_py_function(): EOF while searching for function '[0}'".\
+                                       format(search_str))
+                if line.startswith(search_str): #case sens and no strip since 'def' should be flushed left
+                    func_lines.append(line)
+                    while True:
+                        line = f.readline()
+                        if line == '':
+                            break
+                        if line[0] in abet_set:
+                            break
+                        func_lines.append(line)
+                    break
+
+        self._function_lines_list.append(func_lines)
+        if is_pre_cmd:
+            self.pre_py_cmds.append(function_name)
+        else:
+            self.post_py_cmds.append(function_name)
+
     def add_observations(self, filename, insfile=None,
                          index_cols=None, use_cols=None,
                          use_rows=None, prefix='', ofile_skip=None,