Merge pull request #357 from watson-developer-cloud/4182/visual-recognition-revisions

Support Core ML Models in Visual Recognition

Author: mediumTaj

Examples/ServiceExamples/Scripts/ExampleVisualRecognition.cs

@@ -42,7 +42,7 @@ public class ExampleVisualRecognition : MonoBehaviour
 
     private string _classifierID = "";
     private string _imageURL = "https://upload.wikimedia.org/wikipedia/commons/e/e9/Official_portrait_of_Barack_Obama.jpg";
-    //private string _imageTextURL = "http://i.stack.imgur.com/ZS6nH.png";
+    private string _coreMLDownloadPath = "";
 
 #if DELETE_TRAINED_CLASSIFIER
     private string _classifierToDelete;
@@ -60,6 +60,7 @@ public class ExampleVisualRecognition : MonoBehaviour
     private bool _classifyPostTested = false;
     private bool _detectFacesGetTested = false;
     private bool _detectFacesPostTested = false;
+    private bool _getCoreMLModelTested = false;
 
     void Start()
     {
@@ -78,32 +79,32 @@ private IEnumerator Examples()
     {
         //          Get all classifiers
         Log.Debug("ExampleVisualRecognition.Examples()", "Attempting to get all classifiers");
-        if (!_visualRecognition.GetClassifiers(OnGetClassifiers, OnFail))
+        if (!_visualRecognition.GetClassifiersBrief(OnGetClassifiers, OnFail))
             Log.Debug("ExampleVisualRecognition.GetClassifiers()", "Failed to get all classifiers!");
 
         while (!_getClassifiersTested)
             yield return null;
 
 #if TRAIN_CLASSIFIER
-        //          Train classifier
-        Log.Debug("ExampleVisualRecognition.Examples()", "Attempting to train classifier");
-        string positiveExamplesPath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/visual-recognition-classifiers/giraffe_positive_examples.zip";
-        string negativeExamplesPath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/visual-recognition-classifiers/negative_examples.zip";
-        Dictionary<string, string> positiveExamples = new Dictionary<string, string>();
-        positiveExamples.Add("giraffe", positiveExamplesPath);
-        if (!_visualRecognition.TrainClassifier(OnTrainClassifier, OnFail, "unity-test-classifier-example", positiveExamples, negativeExamplesPath))
-            Log.Debug("ExampleVisualRecognition.TrainClassifier()", "Failed to train classifier!");
-
-        while (!_trainClassifierTested)
-            yield return null;
-
-        //          Find classifier by ID
-        Log.Debug("ExampleVisualRecognition.Examples()", "Attempting to find classifier by ID");
-        if (!_visualRecognition.GetClassifier(OnGetClassifier, OnFail, _classifierID))
-            Log.Debug("ExampleVisualRecognition.GetClassifier()", "Failed to get classifier!");
-
-        while (!_getClassifierTested)
-            yield return null;
+                //          Train classifier
+                Log.Debug("ExampleVisualRecognition.Examples()", "Attempting to train classifier");
+                string positiveExamplesPath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/visual-recognition-classifiers/giraffe_positive_examples.zip";
+                string negativeExamplesPath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/visual-recognition-classifiers/negative_examples.zip";
+                Dictionary<string, string> positiveExamples = new Dictionary<string, string>();
+                positiveExamples.Add("giraffe", positiveExamplesPath);
+                if (!_visualRecognition.TrainClassifier(OnTrainClassifier, OnFail, "unity-test-classifier-example", positiveExamples, negativeExamplesPath))
+                    Log.Debug("ExampleVisualRecognition.TrainClassifier()", "Failed to train classifier!");
+
+                while (!_trainClassifierTested)
+                    yield return null;
+
+                //          Find classifier by ID
+                Log.Debug("ExampleVisualRecognition.Examples()", "Attempting to find classifier by ID");
+                if (!_visualRecognition.GetClassifier(OnGetClassifier, OnFail, _classifierID))
+                    Log.Debug("ExampleVisualRecognition.GetClassifier()", "Failed to get classifier!");
+
+                while (!_getClassifierTested)
+                    yield return null;
 #endif
 
         //          Classify get
@@ -144,29 +145,33 @@ private IEnumerator Examples()
 
 #if DELETE_TRAINED_CLASSIFIER
         #region Delay
-        Runnable.Run(Delay(_delayTime));
-        while (_isWaitingForDelay)
-            yield return null;
+                Runnable.Run(Delay(_delayTime));
+                while (_isWaitingForDelay)
+                    yield return null;
         #endregion
 
-        //          Delete classifier by ID
-        Log.Debug("ExampleVisualRecognition.Examples()", "Attempting to delete classifier");
-        if (!_visualRecognition.DeleteClassifier(OnDeleteClassifier, OnFail, _classifierToDelete))
-            Log.Debug("ExampleVisualRecognition.DeleteClassifier()", "Failed to delete classifier!");
+                //          Delete classifier by ID
+                Log.Debug("ExampleVisualRecognition.Examples()", "Attempting to delete classifier");
+                if (!_visualRecognition.DeleteClassifier(OnDeleteClassifier, OnFail, _classifierToDelete))
+                    Log.Debug("ExampleVisualRecognition.DeleteClassifier()", "Failed to delete classifier!");
 
-        while (!_deleteClassifierTested)
-            yield return null;
+                while (!_deleteClassifierTested)
+                    yield return null;
 #endif
 
+        _visualRecognition.DownloadCoreMLModel(_classifierID, _coreMLDownloadPath);
+        while (!_getCoreMLModelTested)
+            yield return null;
+
         Log.Debug("ExampleVisualRecognition.Examples()", "Visual Recogition tests complete");
     }
 
-    private void OnGetClassifiers(GetClassifiersTopLevelBrief classifiers, Dictionary<string, object> customData)
-    {
-        Log.Debug("ExampleVisualRecognition.OnGetClassifiers()", "VisualRecognition - GetClassifiers Response: {0}", customData["json"].ToString());
+private void OnGetClassifiers(ClassifiersBrief classifiers, Dictionary<string, object> customData)
+{
+    Log.Debug("ExampleVisualRecognition.OnGetClassifiers()", "VisualRecognition - GetClassifiers Response: {0}", customData["json"].ToString());
 
-        _getClassifiersTested = true;
-    }
+    _getClassifiersTested = true;
+}
 
 #if DELETE_TRAINED_CLASSIFIER
     private void OnGetClassifier(GetClassifiersPerClassifierVerbose classifier, Dictionary<string, object> customData)
@@ -197,34 +202,34 @@ private void OnTrainClassifier(GetClassifiersPerClassifierVerbose classifier, Di
     }
 #endif
 
-    private void OnClassifyGet(ClassifyTopLevelMultiple classify, Dictionary<string, object> customData)
-    {
-        Log.Debug("ExampleVisualRecognition.OnClassifyGet()", "{0}", customData["json"].ToString());
-        _classifyGetTested = true;
+private void OnClassifyGet(ClassifiedImages classify, Dictionary<string, object> customData)
+{
+    Log.Debug("ExampleVisualRecognition.OnClassifyGet()", "{0}", customData["json"].ToString());
+    _classifyGetTested = true;
 
-    }
+}
 
-    private void OnClassifyPost(ClassifyTopLevelMultiple classify, Dictionary<string, object> customData)
-    {
-        Log.Debug("ExampleVisualRecognition.OnClassifyPost()", "{0}", customData["json"].ToString());
-        _classifyPostTested = true;
-    }
+private void OnClassifyPost(ClassifiedImages classify, Dictionary<string, object> customData)
+{
+    Log.Debug("ExampleVisualRecognition.OnClassifyPost()", "{0}", customData["json"].ToString());
+    _classifyPostTested = true;
+}
 
-    private void OnDetectFacesGet(FacesTopLevelMultiple multipleImages, Dictionary<string, object> customData)
-    {
-        Log.Debug("ExampleVisualRecognition.OnDetectFacesGet()", "{0}", customData["json"].ToString());
-        _detectFacesGetTested = true;
-    }
+private void OnDetectFacesGet(DetectedFaces multipleImages, Dictionary<string, object> customData)
+{
+    Log.Debug("ExampleVisualRecognition.OnDetectFacesGet()", "{0}", customData["json"].ToString());
+    _detectFacesGetTested = true;
+}
 
-    private void OnDetectFacesPost(FacesTopLevelMultiple multipleImages, Dictionary<string, object> customData)
-    {
-        Log.Debug("ExampleVisualRecognition.OnDetectFacesPost()", "{0}", customData["json"].ToString());
-        _detectFacesPostTested = true;
-    }
+private void OnDetectFacesPost(DetectedFaces multipleImages, Dictionary<string, object> customData)
+{
+    Log.Debug("ExampleVisualRecognition.OnDetectFacesPost()", "{0}", customData["json"].ToString());
+    _detectFacesPostTested = true;
+}
 
-    #region Delay
-    //  Introducing a delay because of a known issue with Visual Recognition where newly created classifiers 
-    //  will disappear without being deleted if a delete is attempted less than ~10 seconds after creation.
+#region Delay
+//  Introducing a delay because of a known issue with Visual Recognition where newly created classifiers 
+//  will disappear without being deleted if a delete is attempted less than ~10 seconds after creation.
 #if DELETE_TRAINED_CLASSIFIER
     private float _delayTime = 15f;
     private bool _isWaitingForDelay = false;
@@ -238,10 +243,10 @@ private IEnumerator Delay(float delayTime)
         _isWaitingForDelay = false;
     }
 #endif
-    #endregion
+#endregion
 
-    private void OnFail(RESTConnector.Error error, Dictionary<string, object> customData)
-    {
-        Log.Error("ExampleRetrieveAndRank.OnFail()", "Error received: {0}", error.ToString());
-    }
+private void OnFail(RESTConnector.Error error, Dictionary<string, object> customData)
+{
+    Log.Error("ExampleRetrieveAndRank.OnFail()", "Error received: {0}", error.ToString());
+}
 }