Merge pull request #594 from watson-developer-cloud/feat/dynamic-model

Feat/dynamic model

Author: mamoonraja

Examples/GenericSerialization.cs

@@ -33,21 +33,8 @@ void Start()
             LogSystem.InstallDefaultReactors();
 
             MessageResponse messageResponse = JsonConvert.DeserializeObject<MessageResponse>(responseJson);
-            //Dictionary<string, object> e = Json.Deserialize(responseJson) as Dictionary<string, object>;
-            //Dictionary<string, object> context = e["context"] as Dictionary<string, object>;
-            //Dictionary<string, object> skills = context["skills"] as Dictionary<string, object>;
-            //Dictionary<string, object> main_skill = skills["main skill"] as Dictionary<string, object>;
-            //Dictionary<string, object> user_defined = main_skill["user_defined"] as Dictionary<string, object>;
 
-            //string name = user_defined["name"] as string;
-
-            //var user_defined = messageResponse.Context.Skills["main skill"]["user_defined"].ToString();
-            //var uDefinedObject = JsonConvert.DeserializeObject<Dictionary<string, object>>(user_defined);
-
-            //Log.Debug("GenericSerialization", "main skill: {0}", uDefinedObject["name"]);
-            //Log.Debug("GenericSerialization", "test: {0}", messageResponse);
-
-            var name = messageResponse.Context.Skills["main skill"]["user_defined"]["name"].ToString();
+            var name = messageResponse.Context.Skills.Get("main skill").UserDefined["name"].ToString();
             Log.Debug("GenericSerialization", "name: {0}", name);
 
         }

Scripts/Services/Assistant/V1/AssistantService.cs

@@ -15,15 +15,15 @@
 *
 */
 
+using IBM.Cloud.SDK.Model;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace IBM.Watson.Assistant.V1.Model
 {
     /// <summary>
     /// State information for the conversation. To maintain state, include the context from the previous response.
     /// </summary>
-    public class Context
+    public class Context: DynamicModel<object>
     {
         /// <summary>
         /// The unique identifier of the conversation.
@@ -34,7 +34,7 @@ public class Context
         /// For internal use only.
         /// </summary>
         [JsonProperty("system", NullValueHandling = NullValueHandling.Ignore)]
-        public JObject System { get; set; }
+        public SystemResponse System { get; set; }
         /// <summary>
         /// Metadata related to the message.
         /// </summary>

Scripts/Services/Assistant/V1/Model/Context.cs

@@ -17,7 +17,6 @@
 
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 using System;
 
 namespace IBM.Watson.Assistant.V1.Model
@@ -226,7 +225,7 @@ public class DigressOutSlotsValue
         /// [documentation](https://cloud.ibm.com/docs/services/assistant?topic=assistant-dialog-overview#dialog-overview-responses).
         /// </summary>
         [JsonProperty("output", NullValueHandling = NullValueHandling.Ignore)]
-        public JObject Output { get; set; }
+        public DialogNodeOutput Output { get; set; }
         /// <summary>
         /// The context for the dialog node.
         /// </summary>

Scripts/Services/Assistant/V1/Model/DialogNode.cs

@@ -16,6 +16,7 @@
 */
 
 using System.Collections.Generic;
+using IBM.Cloud.SDK.Model;
 using Newtonsoft.Json;
 
 namespace IBM.Watson.Assistant.V1.Model
@@ -24,7 +25,7 @@ namespace IBM.Watson.Assistant.V1.Model
     /// The output of the dialog node. For more information about how to specify dialog node output, see the
     /// [documentation](https://cloud.ibm.com/docs/services/assistant?topic=assistant-dialog-overview#dialog-overview-responses).
     /// </summary>
-    public class DialogNodeOutput
+    public class DialogNodeOutput: DynamicModel<object>
     {
         /// <summary>
         /// An array of objects describing the output defined for the dialog node.

Scripts/Services/Assistant/V1/Model/DialogNodeOutput.cs

@@ -17,7 +17,6 @@
 
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace IBM.Watson.Assistant.V1.Model
 {
@@ -31,22 +30,22 @@ public class DialogNodeOutputOptionsElementValue
         /// An input object that includes the input text.
         /// </summary>
         [JsonProperty("input", NullValueHandling = NullValueHandling.Ignore)]
-        public JObject Input { get; set; }
+        public MessageInput Input { get; set; }
         /// <summary>
         /// An array of intents to be used while processing the input.
         ///
         /// **Note:** This property is supported for backward compatibility with applications that use the v1 **Get
         /// response to user input** method.
         /// </summary>
         [JsonProperty("intents", NullValueHandling = NullValueHandling.Ignore)]
-        public List<JObject> Intents { get; set; }
+        public List<RuntimeIntent> Intents { get; set; }
         /// <summary>
         /// An array of entities to be used while processing the user input.
         ///
         /// **Note:** This property is supported for backward compatibility with applications that use the v1 **Get
         /// response to user input** method.
         /// </summary>
         [JsonProperty("entities", NullValueHandling = NullValueHandling.Ignore)]
-        public List<JObject> Entities { get; set; }
+        public List<RuntimeEntity> Entities { get; set; }
     }
 }

Scripts/Services/Assistant/V1/Model/DialogNodeOutputOptionsElementValue.cs

@@ -16,7 +16,6 @@
 */
 
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace IBM.Watson.Assistant.V1.Model
 {
@@ -42,7 +41,7 @@ public class DialogSuggestion
         /// corresponding option.
         /// </summary>
         [JsonProperty("output", NullValueHandling = NullValueHandling.Ignore)]
-        public JObject Output { get; set; }
+        public DialogSuggestionOutput Output { get; set; }
         /// <summary>
         /// The ID of the dialog node that the **label** property is taken from. The **label** property is populated
         /// using the value of the dialog node's **user_label** property.

Scripts/Services/Assistant/V1/Model/DialogSuggestion.cs

@@ -16,6 +16,7 @@
 */
 
 using System.Collections.Generic;
+using IBM.Cloud.SDK.Model;
 using Newtonsoft.Json;
 
 namespace IBM.Watson.Assistant.V1.Model
@@ -24,7 +25,7 @@ namespace IBM.Watson.Assistant.V1.Model
     /// The dialog output that will be returned from the Watson Assistant service if the user selects the corresponding
     /// option.
     /// </summary>
-    public class DialogSuggestionOutput
+    public class DialogSuggestionOutput: DynamicModel<object>
     {
         /// <summary>
         /// An array of the nodes that were triggered to create the response, in the order in which they were visited.

Scripts/Services/Assistant/V1/Model/DialogSuggestionOutput.cs

@@ -17,7 +17,6 @@
 
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using Newtonsoft.Json.Linq;
 
 namespace IBM.Watson.Assistant.V1.Model
 {
@@ -31,7 +30,7 @@ public class DialogSuggestionValue
         /// An input object that includes the input text.
         /// </summary>
         [JsonProperty("input", NullValueHandling = NullValueHandling.Ignore)]
-        public JObject Input { get; set; }
+        public MessageInput Input { get; set; }
         /// <summary>
         /// An array of intents to be sent along with the user input.
         /// </summary>

Scripts/Services/Assistant/V1/Model/DialogSuggestionValue.cs

@@ -15,14 +15,15 @@
 *
 */
 
+using IBM.Cloud.SDK.Model;
 using Newtonsoft.Json;
 
 namespace IBM.Watson.Assistant.V1.Model
 {
     /// <summary>
     /// An input object that includes the input text.
     /// </summary>
-    public class MessageInput
+    public class MessageInput: DynamicModel<object>
     {
         /// <summary>
         /// The text of the user input. This string cannot contain carriage return, newline, or tab characters.