watson-developer-cloud · mediumTaj · Sep 23, 2016 · Aug 25, 2016 · Aug 26, 2016 · Aug 27, 2016
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 Change Log
 ==========
+## Version 0.10.0
+_2016_09_23_
+
+* New: Added `similarity search` to the `Visual Recognition` service.
+* Fix: `Touch Widget` improvmements.
+* Fix: Disabled 3rd Party plugin warnings.
+* Fix: Removed `Conversation` Message overload method that takes only input and conversationID.
+* Fix: Rewrote `Conversation` example script to show how to create MessageRequest object. 
+
 ## Version 0.9.0
 _2016-08-26_
 

diff --git a/Config.json.enc b/Config.json.enc
diff --git a/Examples/ServiceExamples/Scripts/ExampleAlchemyLanguage.cs b/Examples/ServiceExamples/Scripts/ExampleAlchemyLanguage.cs
@@ -20,6 +20,8 @@
 using IBM.Watson.DeveloperCloud.Services.AlchemyAPI.v1;
 using IBM.Watson.DeveloperCloud.Logging;
 
+#pragma warning disable 0219
+#pragma warning disable 0414
 public class ExampleAlchemyLanguage : MonoBehaviour
 {
     private AlchemyAPI m_AlchemyAPI = new AlchemyAPI();
@@ -52,7 +54,7 @@ void Start()
         //    Log.Debug("ExampleAlchemyLanguage", "Failed to get concepts HTML POST!");
 
         ////Get Concepts URL POST
-        //if (!m_AlchemyAPI.GetRankedConcepts(OnGetConcepts, m_ExampleURL_watsonJeopardy))
+        //if (!m_AlchemyAPI.GetRankedConcepts(OnGetCzoncepts, m_ExampleURL_watsonJeopardy))
         //    Log.Debug("ExampleAlchemyLanguage", "Failed to get concepts HTML POST!");
 
         ////Get Date URL POST

diff --git a/Examples/ServiceExamples/Scripts/ExampleConversation.cs b/Examples/ServiceExamples/Scripts/ExampleConversation.cs
@@ -16,48 +16,69 @@
 */
 
 using UnityEngine;
-using System.Collections;
 using IBM.Watson.DeveloperCloud.Services.Conversation.v1;
 using IBM.Watson.DeveloperCloud.Utilities;
 using IBM.Watson.DeveloperCloud.Logging;
+using System;
 
 public class ExampleConversation : MonoBehaviour
 {
 	private Conversation m_Conversation = new Conversation();
     private string m_WorkspaceID;
-	private string m_Input = "Can you unlock the door?";
+	private string m_ConversationID;
+	private bool m_UseAlternateIntents = true;
+	private string[] questionArray = { "can you turn up the AC", "can you turn on the wipers", "can you turn off the wipers", "can you turn down the ac", "can you unlock the door"};
 
 	void Start () {
         LogSystem.InstallDefaultReactors();
         m_WorkspaceID = Config.Instance.GetVariableValue("ConversationV1_ID");
-        Debug.Log("User: " + m_Input);
 
-        //  Message with input only
-        //m_Conversation.Message(OnMessage, m_WorkspaceID, m_Input);
+        Debug.Log("**********User: Hello!");
+		MessageWithOnlyInput("Hello!");
+    }
 
-        //  Message by creating message request
-        //MessageRequest messageRequest = new MessageRequest();
-        //messageRequest.inputText = m_Input;
-        //m_Conversation.Message(OnMessage, m_WorkspaceID, messageRequest);
+	private void MessageWithOnlyInput(string input)
+	{
+		if (string.IsNullOrEmpty(input))
+			throw new ArgumentNullException("input");
+
+		m_Conversation.Message(OnMessageWithOnlyInput, m_WorkspaceID, input);
+	}
+
+
+	private void OnMessageWithOnlyInput(MessageResponse resp, string customData)
+	{
+		if (resp != null)
+		{
+			foreach (Intent mi in resp.intents)
+				Debug.Log("intent: " + mi.intent + ", confidence: " + mi.confidence);
+
+			if (resp.output != null && resp.output.text.Length > 0)
+				foreach (string txt in resp.output.text)
+					Debug.Log("output: " + txt);
+
+			m_ConversationID = resp.context.conversation_id;
+
+			string questionStr = questionArray[UnityEngine.Random.Range(0, questionArray.Length - 1)];
+			Debug.Log(string.Format("**********User: {0}", questionStr));
+
+			MessageRequest messageRequest = new MessageRequest();
+			messageRequest.InputText = questionStr;
+			messageRequest.alternate_intents = m_UseAlternateIntents;
+			messageRequest.ContextData = resp.context;
 
-        //  Message by passing input, alternate intents and conversationID
-        m_Conversation.Message(OnMessage, m_WorkspaceID, m_Input, false, null);
+			MessageWithFullMessageRequest(messageRequest);
+		}
+		else
+		{
+			Debug.Log("Failed to invoke Message();");
+		}
 	}
 
-	void OnMessage (MessageResponse resp, string customData)
+	private void MessageWithFullMessageRequest(MessageRequest messageRequest)
 	{
-        if(resp != null)
-        {
-    		foreach(Intent mi in resp.intents)
-    			Debug.Log("intent: " + mi.intent + ", confidence: " + mi.confidence);
-
-            if(resp.output != null && resp.output.text.Length > 0)
-                foreach(string txt in resp.output.text)
-    		        Debug.Log("output: " + txt);
-        }
-        else
-        {
-            Debug.Log("Failed to invoke Message();");
-        }
+		if (messageRequest == null)
+			throw new ArgumentNullException("messageRequest");
+		m_Conversation.Message(OnMessageWithOnlyInput, m_WorkspaceID, messageRequest);
 	}
 }
diff --git a/Examples/ServiceExamples/Scripts/ExampleRetrieveAndRank.cs b/Examples/ServiceExamples/Scripts/ExampleRetrieveAndRank.cs
@@ -25,6 +25,7 @@
 using UnityEditor;
 #endif
 
+#pragma warning disable 219
 public class ExampleRetrieveAndRank : MonoBehaviour
 {
     private RetrieveAndRank m_RetrieveAndRank = new RetrieveAndRank();

diff --git a/Examples/ServiceExamples/Scripts/ExampleTextToSpeech.cs b/Examples/ServiceExamples/Scripts/ExampleTextToSpeech.cs
@@ -18,6 +18,7 @@
 using UnityEngine;
 using IBM.Watson.DeveloperCloud.Services.TextToSpeech.v1;
 using IBM.Watson.DeveloperCloud.Logging;
+#pragma warning disable 0414
 
 public class ExampleTextToSpeech : MonoBehaviour
 {

diff --git a/Examples/ServiceExamples/Scripts/ExampleVisualRecognition.cs b/Examples/ServiceExamples/Scripts/ExampleVisualRecognition.cs
@@ -22,12 +22,14 @@
 using IBM.Watson.DeveloperCloud.Logging;
 using IBM.Watson.DeveloperCloud.Utilities;
 
+#pragma warning disable 0414
+
 public class ExampleVisualRecognition : MonoBehaviour
 {
     private VisualRecognition m_VisualRecognition = new VisualRecognition();
-    private string m_classifierName = "Apples_OptionalParams";
-    private string m_classifierID = "ApplesClassifierNameWithSpaces_73100404";
-    private string m_classifierToDelete = "unitytestclassifier2b_37849361";
+    private string m_classifierName = "unity-test-classifier-example";
+    private string m_classifierID = "unitytestclassifierexample_487365485";
+    private string m_classifierToDelete = "unitytestclassifierexample_263072401";
     private string m_imageURL = "https://upload.wikimedia.org/wikipedia/commons/e/e9/Official_portrait_of_Barack_Obama.jpg";
     private string m_imageTextURL = "http://i.stack.imgur.com/ZS6nH.png";
 
@@ -65,37 +67,37 @@ void Start()
 
         ////          Classify get
         //Log.Debug("ExampleVisualRecognition", "Attempting to get classify via URL");
-        //if (!m_VisualRecognition.Classify(m_imageURL, OnClassify))
+        //if (!m_VisualRecognition.Classify(OnClassify, m_imageURL))
         //    Log.Debug("ExampleVisualRecognition", "Classify image failed!");
 
         ////          Classify post image
-        //Log.Debug("ExampleVisualRecognition", "Attempting to classify via image on file system");
-        //string imagesPath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/visual-recognition-classifiers/obama.jpg";
-        //string[] owners = { "IBM", "me" };
-        //string[] classifierIDs = { "default" };
-        //if (!m_VisualRecognition.Classify(OnClassify, imagesPath, owners, classifierIDs, 0.5f))
-        //    Log.Debug("ExampleVisualRecognition", "Classify image failed!");
+        Log.Debug("ExampleVisualRecognition", "Attempting to classify via image on file system");
+        string imagesPath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/visual-recognition-classifiers/giraffe_to_classify.jpg";
+        string[] owners = { "IBM", "me" };
+        string[] classifierIDs = { "default", m_classifierID };
+        if (!m_VisualRecognition.Classify(imagesPath, OnClassify, owners, classifierIDs, 0.5f))
+            Log.Debug("ExampleVisualRecognition", "Classify image failed!");
 
         ////          Detect faces get
         //Log.Debug("ExampleVisualRecognition", "Attempting to detect faces via URL");
-        //if (!m_VisualRecognition.DetectFaces(m_imageURL, OnDetectFaces))
+        //if (!m_VisualRecognition.DetectFaces(OnDetectFaces, m_imageURL))
         //    Log.Debug("ExampleVisualRecogntiion", "Detect faces failed!");
 
         ////          Detect faces post image
         //Log.Debug("ExampleVisualRecognition", "Attempting to detect faces via image");
         //string faceExamplePath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/visual-recognition-classifiers/obama.jpg";
-        //if (!m_VisualRecognition.DetectFaces(OnDetectFaces, faceExamplePath))
+        //if (!m_VisualRecognition.DetectFaces(faceExamplePath, OnDetectFaces))
         //    Log.Debug("ExampleVisualRecognition", "Detect faces failed!");
 
         ////          Recognize text get
         //Log.Debug("ExampleVisualRecognition", "Attempting to recognizeText via URL");
-        //if (!m_VisualRecognition.RecognizeText(m_imageTextURL, OnRecognizeText))
+        //if (!m_VisualRecognition.RecognizeText(OnRecognizeText, m_imageTextURL))
         //    Log.Debug("ExampleVisualRecognition", "Recognize text failed!");
 
         ////          Recognize text post image
         //Log.Debug("ExampleVisualRecognition", "Attempting to recognizeText via image");
         //string textExamplePath = Application.dataPath + "/Watson/Examples/ServiceExamples/TestData/visual-recognition-classifiers/from_platos_apology.png";
-        //if (!m_VisualRecognition.RecognizeText(OnRecognizeText, textExamplePath))
+        //if (!m_VisualRecognition.RecognizeText(textExamplePath, OnRecognizeText))
         //    Log.Debug("ExampleVisualRecognition", "Recognize text failed!");
     }
 
@@ -170,11 +172,14 @@ private void OnClassify(ClassifyTopLevelMultiple classify, string data)
             foreach (ClassifyTopLevelSingle image in classify.images)
             {
                 Log.Debug("ExampleVisualRecognition", "\tsource_url: " + image.source_url + ", resolved_url: " + image.resolved_url);
-                foreach (ClassifyPerClassifier classifier in image.classifiers)
+                if (image.classifiers != null && image.classifiers.Length > 0)
                 {
-                    Log.Debug("ExampleVisualRecognition", "\t\tclassifier_id: " + classifier.classifier_id + ", name: " + classifier.name);
-                    foreach (ClassResult classResult in classifier.classes)
-                        Log.Debug("ExampleVisualRecognition", "\t\t\tclass: " + classResult.m_class + ", score: " + classResult.score + ", type_hierarchy: " + classResult.type_hierarchy);
+                    foreach (ClassifyPerClassifier classifier in image.classifiers)
+                    {
+                        Log.Debug("ExampleVisualRecognition", "\t\tclassifier_id: " + classifier.classifier_id + ", name: " + classifier.name);
+                        foreach (ClassResult classResult in classifier.classes)
+                            Log.Debug("ExampleVisualRecognition", "\t\t\tclass: " + classResult.m_class + ", score: " + classResult.score + ", type_hierarchy: " + classResult.type_hierarchy);
+                    }
                 }
             }
         }

diff --git a/Examples/ServiceExamples/ServiceExamples.unity b/Examples/ServiceExamples/ServiceExamples.unity
@@ -37,7 +37,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.3735644, g: 0.38112032, b: 0.35887682, a: 1}
+  m_IndirectSpecularColor: {r: 0.3735645, g: 0.38112062, b: 0.35887584, a: 1}
 --- !u!157 &3
 LightmapSettings:
   m_ObjectHideFlags: 0
@@ -352,7 +352,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &859102723
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -633,7 +633,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!114 &1740459832
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -658,47 +658,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_RootOrder: 1
---- !u!1 &1979050314
-GameObject:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  serializedVersion: 4
-  m_Component:
-  - 4: {fileID: 1979050316}
-  - 114: {fileID: 1979050315}
-  m_Layer: 0
-  m_Name: ExampleDialog
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!114 &1979050315
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1979050314}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e8b52562568714a48a89536c62fb978e, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_DialogID: 61343031353936302d333963322d346436622d393537312d333863373461656366666664
---- !u!4 &1979050316
-Transform:
-  m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
-  m_GameObject: {fileID: 1979050314}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1, z: -10}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 2
 --- !u!1 &2004886371
 GameObject:
   m_ObjectHideFlags: 0