Merge branch 'development' into gh-129-ReturnedErrorsIsDeserialized

Author: mediumTaj

appveyor.yml

@@ -13,12 +13,16 @@ environment:
   CRED_SECRET:
     secure: eEcA/09B7XzeTSb3GlaeqcWfQ/TemXxAq9/0AFM5+z8=
   VCAP_SERVICES: C:\projects\dotnet-standard-sdk\config
+init:
+- ps: '[System.IO.File]::AppendAllText("C:\Windows\System32\drivers\etc\hosts", "`n93.184.221.200  api.nuget.org")'
 install:
 - cmd: >-
     rm -rf packages
 
     mkdir packages
 
+    nuget restore
+
     nuget install -Verbosity quiet -OutputDirectory packages -Version 4.6.519 OpenCover
 
     nuget install -Verbosity quiet -OutputDirectory packages -Version 2.4.5.0 ReportGenerator

examples/IBM.WatsonDeveloperCloud.Conversation.v1.Example/ConversationContextExample.cs

@@ -0,0 +1,65 @@
+/**
+* Copyright 2017 IBM Corp. All Rights Reserved.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*
+*/
+
+using IBM.WatsonDeveloperCloud.Conversation.v1.Model;
+using Newtonsoft.Json;
+using System;
+
+namespace IBM.WatsonDeveloperCloud.Conversation.v1.Example
+{
+    public class ConversationContextExample
+    {
+        private ConversationService _conversation;
+        private string _workspaceID;
+        private string[] _questionArray = { "hello", "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" };
+        private int _questionIndex = 0;
+        private dynamic _questionContext = null;
+
+        public ConversationContextExample(string username, string password, string workspaceId)
+        {
+            _conversation = new ConversationService(username, password, ConversationService.CONVERSATION_VERSION_DATE_2017_05_26);
+            _workspaceID = workspaceId;
+
+            CallConversation(_questionIndex);
+        }
+
+        public void CallConversation(int questionIndex)
+        {
+            MessageRequest messageRequest = new MessageRequest()
+            {
+                Input = new InputData()
+                {
+                    Text = _questionArray[questionIndex]
+                }
+            };
+
+            if(_questionContext != null)
+            {
+                messageRequest.Context = _questionContext;
+            }
+
+            var result = _conversation.Message(_workspaceID, messageRequest);
+            Console.WriteLine(string.Format("result: {0}", JsonConvert.SerializeObject(result, Formatting.Indented)));
+            _questionIndex++;
+            _questionContext = result.Context;
+
+            if (questionIndex < _questionArray.Length - 1)
+                CallConversation(_questionIndex);
+        }
+    }
+}
+

examples/IBM.WatsonDeveloperCloud.Conversation.v1.Example/Example.cs

@@ -32,7 +32,8 @@ public static void Main(string[] args)
             var _password = vcapServices["conversation"][0]["credentials"]["password"];
             var _workspaceID = vcapServices["conversation"][0]["credentials"]["workspaceId"];
 
-            ConversationServiceExample _conversationExample = new ConversationServiceExample(_username.ToString(), _password.ToString(), _workspaceID.ToString());
+            //ConversationServiceExample _conversationExample = new ConversationServiceExample(_username.ToString(), _password.ToString(), _workspaceID.ToString());
+            ConversationContextExample _converationContextExample = new ConversationContextExample(_username.ToString(), _password.ToString(), _workspaceID.ToString());
             Console.ReadKey();
         }
     }

src/IBM.WatsonDeveloperCloud.Conversation.v1/Model/MessageRequest.cs

@@ -30,7 +30,7 @@ public class MessageRequest
         /// </summary>
         /// <value>An input object that includes the input text.</value>
         [JsonProperty("input", NullValueHandling = NullValueHandling.Ignore)]
-        public InputData Input { get; set; }
+        public dynamic Input { get; set; }
         /// <summary>
         /// Whether to return more than one intent. Set to `true` to return all matching intents.
         /// </summary>
@@ -42,7 +42,7 @@ public class MessageRequest
         /// </summary>
         /// <value>State information for the conversation. Continue a conversation by including the context object from the previous response.</value>
         [JsonProperty("context", NullValueHandling = NullValueHandling.Ignore)]
-        public Context Context { get; set; }
+        public dynamic Context { get; set; }
         /// <summary>
         /// Include the entities from the previous response when they do not need to change and to prevent Watson from trying to identify them.
         /// </summary>

src/IBM.WatsonDeveloperCloud.Conversation.v1/Model/MessageResponse.cs

@@ -30,7 +30,7 @@ public class MessageResponse
         /// </summary>
         /// <value>The user input from the request.</value>
         [JsonProperty("input", NullValueHandling = NullValueHandling.Ignore)]
-        public MessageInput Input { get; set; }
+        public dynamic Input { get; set; }
         /// <summary>
         /// An array of intents recognized in the user input, sorted in descending order of confidence.
         /// </summary>
@@ -54,7 +54,7 @@ public class MessageResponse
         /// </summary>
         /// <value>State information for the conversation.</value>
         [JsonProperty("context", NullValueHandling = NullValueHandling.Ignore)]
-        public RuntimeContext Context { get; set; }
+        public dynamic Context { get; set; }
         /// <summary>
         /// Output from the dialog, including the response to the user, the nodes that were triggered, and log messages.
         /// </summary>

src/IBM.WatsonDeveloperCloud/Constants.cs

@@ -26,6 +26,6 @@ public class Constants
         /// The version number for this SDK build. Added to the header in 
         /// each request as `User-Agent`.
         /// </summary>
-        public const string SDK_VERSION = "watson-apis-dotnet-standard-sdk/1.1.0";
+        public const string SDK_VERSION = "watson-apis-dotnet-sdk/1.2.0";
     }
 }