Remove python export/peek model and related artifacts (#1311)

* Remove python export/peek model and related artifacts

Remove legacy Python export/peek model phases and related resources, update client wiring and argument handling.  ZinggOptions (assess/peek/export) and the Spark Python phase runner mapping were removed; python/exportModel script, Python-related helpers (argument write/JSON methods) and many test/resources/docs for the peek/export flows were deleted

* Fix typo in JVM arguments package

Corrects a typo in python/zingg/client.py by changing the JVM package path from zingg.common.client.argumentst to zingg.common.client.arguments so ArgumentServiceImpl.loadArguments is called from the correct package

Author: padam-prakash

common/client/src/main/java/zingg/common/client/Client.java

@@ -59,7 +59,7 @@ public Client(IZArgs args, ClientOptions options, String zFactory) throws ZinggC
     	setOptions(options);
 		try {
 			buildAndSetArguments(args, options);
-			setZingg(args, options);					
+			setZingg(options);
 		}
 		catch (Exception e) {
 			throw new ZinggClientException("An error has occured while setting up the client", e);
@@ -91,14 +91,14 @@ public IZinggFactory getZinggFactory() throws InstantiationException, IllegalAcc
 
 
 
-	public void setZingg(IZArgs args, ClientOptions options) throws Exception{
+	public void setZingg(ClientOptions options) throws Exception{
 		IZinggFactory zf = getZinggFactory();
 		try{
 			setZingg(zf.get(ZinggOptions.getByValue(options.get(ClientOptions.PHASE).value.trim())));
 		}
 		catch(Exception e) {
-			//set default
-			setZingg(zf.get(ZinggOptions.getByValue(ZinggOptions.PEEK_MODEL.getName())));
+			LOG.error("Error creating zingg instance for phase " + options.get(ClientOptions.PHASE).value.trim(), e);
+			throw e;
 		}
 	}
 

common/client/src/main/java/zingg/common/client/arguments/ArgumentServiceImpl.java

@@ -45,7 +45,7 @@ public A loadArguments(String path) throws ZinggClientException, NoSuchObjectExc
 
     @Override
     public void writeArguments(String path, IZArgs args) throws ZinggClientException, NoSuchObjectException {
-        ArgumentsWriter<A> argumentsWriter = writerFactory.getArgumentsWriter(WriterType.JSON);
+        ArgumentsWriter<A> argumentsWriter = writerFactory.getArgumentsWriter(WriterType.FILE);
         argumentsWriter.write(path, args);
     }
 

common/client/src/main/java/zingg/common/client/options/ZinggOptions.java

@@ -1,11 +1,11 @@
 package zingg.common.client.options;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import zingg.common.client.ZinggClientException;
 import zingg.common.client.util.Util;
 
+import java.util.HashMap;
+import java.util.Map;
+
 public class ZinggOptions {
 
     public final static ZinggOption TRAIN = new ZinggOption("train");
@@ -18,9 +18,6 @@ public class ZinggOptions {
     public final static ZinggOption RECOMMEND = new ZinggOption("recommend");
     public final static ZinggOption UPDATE_LABEL = new ZinggOption("updateLabel");
     public final static ZinggOption FIND_AND_LABEL = new ZinggOption("findAndLabel");
-    public final static ZinggOption ASSESS_MODEL = new ZinggOption("assessModel");
-    public final static ZinggOption PEEK_MODEL = new ZinggOption("peekModel");
-    public final static ZinggOption EXPORT_MODEL = new ZinggOption("exportModel");
 
 
     public static Map<String, ZinggOption> allZinggOptions;// = new HashMap<String, ZinggOption>();

common/core/src/test/resources/testPeekModel/config.json

@@ -43,7 +43,6 @@
     * [Using Pre-existing Training Data](setup/training/addOwnTrainingData.md)
     * [Updating Labeled Pairs](updatingLabels.md)
     * [Documenting The Training Data](stepbystep/createtrainingdata/generatingdocumentation.md)
-    * [Exporting Labeled Data](setup/training/exportLabeledData.md)
     * [Model Difference](stepbystep/createtrainingdata/modeldiff.md)
   * [Ensuring Scalability](verifyBlocking.md)
   * [Building And Saving The Model](setup/train.md)

common/core/src/test/resources/testPeekModel/test.csv

@@ -17,6 +17,4 @@ Here, the first column specifies the z_cluster, the second column specifies the
 
 The above training data can be specified using [trainingSamples attribute in the configuration.](../../../examples/febrl/configWithTrainingSamples.json)
 
-In addition, labeled data of one model can also be exported and used as training data for another model. For details, check out [exporting labeled data](exportLabeledData.md).
-
 **Note**: It is advisable to still run [findTrainingData](findTrainingData.md) and [label](label.md) a few rounds to tune Zingg with the supplied training data as well as patterns it needs to learn independently.

docs/SUMMARY.md

@@ -670,14 +670,6 @@ def setLabelDataSampleSize(self, labelDataSampleSize):
         """
         self.args.setLabelDataSampleSize(labelDataSampleSize)
 
-    def writeArgumentsToJSON(self, fileName):
-        """Method to write JSON file from the object of this class
-
-        :param fileName: The CONF parameter value of ClientOption object or file address of json file
-        :type fileName: String
-        """
-        getJVM().zingg.common.client.arguments.ArgumentServiceImpl().writeArguments(fileName, self.args)
-
     def setStopWordsCutoff(self, stopWordsCutoff):
         """Method to set stopWordsCutoff parameter value
         By default, Zingg extracts 10% of the high frequency unique words from a dataset. If user wants different selection, they should set up StopWordsCutoff property
@@ -708,32 +700,9 @@ def createArgumentsFromJSON(fileName, phase):
         :rtype: pointer(Arguments)
         """
         obj = Arguments()
-        obj.args = getJVM().zingg.common.client.argumentst.ArgumentServiceImpl().loadArguments(fileName)
+        obj.args = getJVM().zingg.common.client.arguments.ArgumentServiceImpl().loadArguments(fileName)
         return obj
 
-    def writeArgumentsToJSONString(self):
-        """Method to create an object of this class from the JSON file and phase parameter value.
-
-        :param fileName: The CONF parameter value of ClientOption object
-        :type fileName: String
-        :param phase: The PHASE parameter value of ClientOption object
-        :type phase: String
-        :return: The pointer containing address of the this class object
-        :rtype: pointer(Arguments)
-        """
-        jsonString = getJVM().java.lang.String()
-        return getJVM().zingg.common.client.arguments.ArgumentServiceImpl().writeArguments(jsonString, self.args)
-
-    @staticmethod
-    def createArgumentsFromJSONString(jsonArgs, phase):
-        obj = Arguments()
-        obj.args = getJVM().zingg.common.client.arguments.ArgumentServiceImpl().loadArguments(jsonArgs)
-        return obj
-
-    def copyArgs(self, phase):
-        argsString = self.writeArgumentsToJSONString()
-        return self.createArgumentsFromJSONString(argsString, phase)
-
 
 class ClientOptions:
     """Class that contains Client options for Zingg object
@@ -770,7 +739,6 @@ def __init__(self, argsSent=None):
             args = argsSent.copy()
         if self.PHASE not in args:
             args.append(self.PHASE)
-            args.append("peekModel")
         if self.LICENSE not in args:
             args.append(self.LICENSE)
             args.append("zinggLic.txt")
@@ -922,7 +890,7 @@ def parseArguments(argv):
     """
     parser = argparse.ArgumentParser(description="Zingg's python APIs")
     mandatoryOptions = parser.add_argument_group("mandatory arguments")
-    mandatoryOptions.add_argument("--phase", required=True, help="python phase e.g. assessModel")
+    mandatoryOptions.add_argument("--phase", required=True)
     mandatoryOptions.add_argument(
         "--conf",
         required=True,