removing overload message with only conversationID, helper methods in data model to create objects, rewirte ExampleConversation as loop to ensure conversation is iterating

Author: mediumTaj

Examples/ServiceExamples/Scripts/ExampleConversation.cs

@@ -16,7 +16,6 @@
 */
 
 using UnityEngine;
-using System.Collections;
 using IBM.Watson.DeveloperCloud.Services.Conversation.v1;
 using IBM.Watson.DeveloperCloud.Utilities;
 using IBM.Watson.DeveloperCloud.Logging;
@@ -26,53 +25,60 @@ 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 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);
-
-        //  Message by creating message request
-        //MessageRequest messageRequest = new MessageRequest();
-        //messageRequest.inputText = m_Input;
-        //m_Conversation.Message(OnMessage, m_WorkspaceID, messageRequest);
-
-        //  Message by passing input, alternate intents and conversationID
-        m_Conversation.Message(OnMessage, m_WorkspaceID, m_Input, false, null);
-
-        Converse("is there traffic today?");
+        Debug.Log("**********User: Hello!");
+		MessageWithOnlyInput("Hello!");
     }
 
-	void OnMessage (MessageResponse resp, string customData)
+	private void MessageWithOnlyInput(string input)
 	{
-        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);
+		if (string.IsNullOrEmpty(input))
+			throw new ArgumentNullException("input");
 
-            m_ConversationID = resp.context.conversation_id;
-            
-        }
-        else
-        {
-            Debug.Log("Failed to invoke Message();");
-        }
+		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);
 
-    private void Converse(string input)
-    {
-        if (string.IsNullOrEmpty(input))
-            throw new ArgumentNullException("input");
+			if (resp.output != null && resp.output.text.Length > 0)
+				foreach (string txt in resp.output.text)
+					Debug.Log("output: " + txt);
 
-        m_Conversation.Message(OnMessage, m_WorkspaceID, input, true, m_ConversationID);
-    }
+			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;
+
+			MessageWithFullMessageRequest(messageRequest);
+		}
+		else
+		{
+			Debug.Log("Failed to invoke Message();");
+		}
+	}
+
+	private void MessageWithFullMessageRequest(MessageRequest messageRequest)
+	{
+		if (messageRequest == null)
+			throw new ArgumentNullException("messageRequest");
+		m_Conversation.Message(OnMessageWithOnlyInput, m_WorkspaceID, messageRequest);
+	}
 }

Scripts/Services/Conversation/Conversation.cs

@@ -126,33 +126,6 @@ public class Conversation : IWatsonService
             return connector.Send(req);
         }
 
-        public bool Message(OnMessage callback, string workspaceID, string input, bool useAlternateIntents, string conversationID = default(string), string customData = default(string))
-        {
-            if (string.IsNullOrEmpty(workspaceID))
-                throw new ArgumentNullException("workspaceId");
-            if (string.IsNullOrEmpty(input))
-                throw new ArgumentNullException("input");
-            if (callback == null)
-                throw new ArgumentNullException("callback");
-
-            RESTConnector connector = RESTConnector.GetConnector(SERVICE_ID, SERVICE_MESSAGE);
-            if (connector == null)
-                return false;
-
-            string reqJson = "{\"input\":{\"text\":\"" + input + "\"},\"alternate_intents\":" + useAlternateIntents.ToString().ToLower() + ",\"context\":{\"conversation_id\":\"" + conversationID + "\"}}";
-
-            MessageReq req = new MessageReq();
-            req.Callback = callback;
-            req.Headers["Content-Type"] = "application/json";
-            req.Headers["Accept"] = "application/json";
-            req.Parameters["version"] = Version.VERSION;
-            req.Function = "/" + workspaceID + "/message";
-            req.Data = customData;
-            req.Send = Encoding.UTF8.GetBytes(reqJson);
-            req.OnResponse = MessageResp;
-
-            return connector.Send(req);
-        }
 
 		private class MessageReq : RESTConnector.Request
 		{

Scripts/Services/Conversation/DataModels.cs

@@ -127,6 +127,15 @@ public class LogMessageResponse
     [fsObject]
     public class MessageRequest
     {
+		///// <summary>
+		///// Default constructor.
+		///// </summary>
+		//public MessageRequest()
+		//{
+		//	input = new InputData();
+		//	context = new Context();
+		//}
+
         /// <summary>
         /// The input text. 
         /// </summary>
@@ -143,9 +152,19 @@ public class MessageRequest
         /// <summary>
         /// Creates the input object and sets the InputText.
         /// </summary>
-        public string inputText
+        public string InputText
         {
-            get { return input != null ? input.text : null; }
+            get {
+				if (input == null)
+				{
+					input = new InputData();
+					return "";
+				}
+				else
+				{
+					return input.text;
+				}
+			}
             set
             {
                 if (input == null)
@@ -155,6 +174,21 @@ public string inputText
             }
         }
 
+		/// <summary>
+		/// Gets and sets the input value and creates the InputData object if it hasn't been created.
+		/// </summary>
+		public InputData InputData
+		{
+			get { return input != null ? input : input = new InputData(); }
+			set
+			{
+				if (input == null)
+					input = new InputData();
+
+				input = value;
+			}
+		}
+
         /// <summary>
         /// Creates the Context object and sets the conversation_id.
         /// </summary>
@@ -169,6 +203,21 @@ public string conversationID
                 context.conversation_id = value;
             }
         }
+
+		/// <summary>
+		/// Gets and sets the context value and creates the Context object if it hasn't been created.
+		/// </summary>
+		public Context ContextData
+		{
+			get { return context != null ? context : context = new Context(); }
+			set
+			{
+				if (context == null)
+					context = new Context();
+
+				context = value;
+			}
+		}
     }
     #endregion
 
@@ -191,6 +240,13 @@ public class InputData
     [fsObject]
     public class Context
     {
+		///// <summary>
+		///// Default constructor.
+		///// </summary>
+		//public Context()
+		//{
+		//	system = new SystemResponse();
+		//}
         /// <summary>
         /// The unique identifier of the conversation. 
         /// </summary>
@@ -199,7 +255,22 @@ public class Context
         /// Information about the dialog
         /// </summary>
         public SystemResponse system { get; set; }
-    }
+
+		/// <summary>
+		/// Creates the SystemResponse object and sets it.
+		/// </summary>
+		public SystemResponse SystemResponse
+		{
+			get { return system != null ? system : system = new SystemResponse(); }
+			set
+			{
+				if (system == null)
+					system = new SystemResponse();
+
+				system = value;
+			}
+		}
+	}
 
     /// <summary>
     /// Dialog information.

Scripts/UnitTests/TestConversation.cs

@@ -29,7 +29,6 @@ public class TestConversation : UnitTest
 	private string m_Input = "Can you unlock the door?";
 	private bool m_MessageInputTested = false;
     private bool m_MessageObjectTested = false;
-    private bool m_MessageTested = false;
 
 	public override IEnumerator RunTest()
 	{
@@ -48,19 +47,12 @@ public override IEnumerator RunTest()
         if (!m_MessageObjectTested)
         {
             MessageRequest messageRequest = new MessageRequest();
-            messageRequest.inputText = m_Input;
+            messageRequest.InputText = m_Input;
             m_Conversation.Message(OnMessageObject, m_WorkspaceID, messageRequest);
             while (!m_MessageObjectTested)
                 yield return null;
         }
-
-        if (!m_MessageTested)
-        {
-            m_Conversation.Message(OnMessage, m_WorkspaceID, m_Input, false);
-            while (!m_MessageTested)
-                yield return null;
-        }
-
+		
         yield break;
     }
 
@@ -93,19 +85,4 @@ private void OnMessageObject(MessageResponse resp, string customData)
 
         m_MessageObjectTested = true;
     }
-
-    private void OnMessage(MessageResponse resp, string customData)
-    {
-        Test(resp != null);
-        if (resp != null)
-        {
-            foreach (Intent mi in resp.intents)
-                Log.Debug("TestConversation", "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_MessageTested = true;
-    }
 }