Update to new API from the interaction library.

Author: johann-petrak

creole.xml

@@ -37,7 +37,7 @@ along with this software. If not, see <http://www.gnu.org/licenses/>.
   <JAR>lib/httpcore-4.4.4.jar</JAR>
   <JAR>lib/httpcore-nio-4.4.4.jar</JAR>
   <JAR>lib/httpmime-4.5.2.jar</JAR>
-  <JAR>lib/interaction-3.5.1.jar</JAR>
+  <JAR>lib/interaction-3.8.jar</JAR>
   <JAR>lib/jdom-1.1.jar</JAR>
   <JAR>lib/jgrapht-0.6.0.jar</JAR>
   <JAR>lib/json-20160212.jar</JAR>

lib/interaction-3.5.1.jar

@@ -88,6 +88,7 @@ public abstract class EnginePythonNetworksBase extends Engine {
    * The setting for the [wrappername] wrapper home can be relative in which case it
    * will be resolved relative to the dataDirectory
    * @param dataDirectory
+   * @param apply
    * @return 
    */
   protected File findWrapperCommand(File dataDirectory, boolean apply) {
@@ -180,7 +181,6 @@ protected void loadModel(File directory, String parms) {
     File commandFile = findWrapperCommand(directory, true);
     String modelFileName = new File(directory,MODEL_BASENAME).getAbsolutePath();
     finalCommand.add(commandFile.getAbsolutePath());
-    finalCommand.add(wrapperhome);
     finalCommand.add(modelFileName);
     finalCommand.add(mode);
     finalCommand.add(nrClasses.toString());
@@ -195,7 +195,9 @@ protected void loadModel(File directory, String parms) {
     //System.err.println("Running: "+finalCommand);
     // Create a fake Model jsut to make LF_Apply... happy which checks if this is null
     model = MODEL_INSTANCE;
-    process = new Process4JsonStream(directory,finalCommand);
+    Map<String,String> env = new HashMap<>();
+    env.put(ENV_WRAPPER_HOME, wrapperhome);
+    process = Process4JsonStream.create(directory,env,finalCommand);
   }
 
   @Override
@@ -232,7 +234,6 @@ public void trainModel(File dataDirectory, String instanceType, String parms) {
     String dataFileName = dataDirectory.getAbsolutePath()+File.separator;
     String modelFileName = new File(dataDirectory, MODEL_BASENAME).getAbsolutePath();
     finalCommand.add(commandFile.getAbsolutePath());
-    finalCommand.add(wrapperhome);
     finalCommand.add(dataFileName);
     finalCommand.add(modelFileName);
     finalCommand.add(mode);
@@ -255,8 +256,9 @@ public void trainModel(File dataDirectory, String instanceType, String parms) {
     //}
     // Create a fake Model jsut to make LF_Apply... happy which checks if this is null
     model = MODEL_INSTANCE;
-    
-    process = new ProcessSimple(dataDirectory,finalCommand);
+    Map<String,String> env = new HashMap<String,String>();
+    env.put(ENV_WRAPPER_HOME,wrapperhome);
+    process = ProcessSimple.create(dataDirectory,env,finalCommand);
     process.waitFor();
   }
 

lib/interaction-3.8.jar

@@ -173,7 +173,6 @@ protected void loadModel(File directory, String parms) {
     File commandFile = findWrapperCommand(directory, true);
     String modelFileName = new File(directory,MODEL_BASENAME).getAbsolutePath();
     finalCommand.add(commandFile.getAbsolutePath());
-    finalCommand.add(wrapperhome);
     finalCommand.add(modelFileName);
     // if we have a shell command prepend that, and if we have shell parms too, include them
     if(shellcmd != null) {
@@ -186,7 +185,9 @@ protected void loadModel(File directory, String parms) {
     //System.err.println("Running: "+finalCommand);
     // Create a fake Model jsut to make LF_Apply... happy which checks if this is null
     model = MODEL_INSTANCE;
-    process = new Process4JsonStream(directory,finalCommand);
+    Map<String,String> env = new HashMap<>();
+    env.put(ENV_WRAPPER_HOME, wrapperhome);
+    process = Process4JsonStream.create(directory,env,finalCommand);
   }
 
   @Override
@@ -227,7 +228,6 @@ public void trainModel(File dataDirectory, String instanceType, String parms) {
     String dataFileName = dataDirectory.getAbsolutePath()+File.separator;
     String modelFileName = new File(dataDirectory, MODEL_BASENAME).getAbsolutePath();
     finalCommand.add(commandFile.getAbsolutePath());
-    finalCommand.add(wrapperhome);
     finalCommand.add(dataFileName);
     finalCommand.add(modelFileName);
     finalCommand.add(sklearnClass);
@@ -249,8 +249,9 @@ public void trainModel(File dataDirectory, String instanceType, String parms) {
     //}
     // Create a fake Model jsut to make LF_Apply... happy which checks if this is null
     model = MODEL_INSTANCE;
-    
-    process = new ProcessSimple(dataDirectory,finalCommand);
+    Map<String,String> env = new HashMap<>();
+    env.put(ENV_WRAPPER_HOME,wrapperhome);
+    process = ProcessSimple.create(dataDirectory,env,finalCommand);
     process.waitFor();
   }
 

src/gate/plugin/learningframework/engines/EnginePythonNetworksBase.java

@@ -39,6 +39,7 @@
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.yaml.snakeyaml.Yaml;
@@ -71,6 +72,8 @@ public class EngineWekaWrapper extends Engine {
   private String wrapperhome = null;
   private boolean linuxLike = true;
   private boolean windowsLike = false;
+  
+  protected final String ENV_WRAPPER_HOME = "WEKA_WRAPPER_HOME";
 
   /**
    * Try to find the script running the Weka-Wrapper command.
@@ -87,7 +90,7 @@ public class EngineWekaWrapper extends Engine {
    * @return 
    */
   private File findWrapperCommand(File dataDirectory, boolean apply) {
-    String homeDir = System.getenv("WEKA_WRAPPER_HOME");
+    String homeDir = System.getenv(ENV_WRAPPER_HOME);
     String tmp = System.getProperty("gate.plugin.learningframework.wekawrapper.home");
     if(tmp!=null) homeDir = tmp;
     File wekaInfoFile = new File(dataDirectory,"weka.yaml");
@@ -182,14 +185,15 @@ protected void loadModel(File directory, String parms) {
     }
 
     finalCommand.add(commandFile.getAbsolutePath());
-    finalCommand.add(wrapperhome);
     finalCommand.add(modelFileName);
     finalCommand.add(header);
 
     //System.err.println("Running: "+finalCommand);
     // Create a fake Model jsut to make LF_Apply... happy which checks if this is null
     model = "ExternalWekaWrapperModel";
-    process = new Process4ObjectStream(directory,finalCommand);
+    Map<String,String> env = new HashMap<>();
+    env.put(ENV_WRAPPER_HOME,wrapperhome);
+    process = Process4ObjectStream.create(directory,env,finalCommand);
   }
 
   @Override
@@ -239,7 +243,6 @@ public void trainModel(File dataDirectory, String instanceType, String parms) {
     }
 
     finalCommand.add(commandFile.getAbsolutePath());
-    finalCommand.add(wrapperhome);
     finalCommand.add(dataFileName);
     finalCommand.add(modelFileName);
     finalCommand.add(wekaClass);
@@ -250,7 +253,9 @@ public void trainModel(File dataDirectory, String instanceType, String parms) {
     // Create a fake Model jsut to make LF_Apply... happy which checks if this is null
     model = "ExternalWekaWrapperModel";
 
-    process = new ProcessSimple(dataDirectory,finalCommand);
+    model = "ExternalWekaWrapperModel";
+    Map<String,String> env = new HashMap<>();
+    process = ProcessSimple.create(dataDirectory,env,finalCommand);
     process.waitFor();
   }