Merge pull request #273 from watson-developer-cloud/5094-regenerate-sdk

Regenerate SDK with new Discovery and Assistant features

Author: mediumTaj

src/IBM.WatsonDeveloperCloud.Assistant.v1/AssistantService.cs

@@ -908,7 +908,7 @@ public Example GetExample(string workspaceId, string intent, string text, bool?
         /// <summary>
         /// List user input examples.
         ///
-        /// List the user input examples for an intent.
+        /// List the user input examples for an intent, optionally including contextual entity mentions.
         ///
         /// This operation is limited to 2500 requests per 30 minutes. For more information, see **Rate limiting**.
         /// </summary>
@@ -1628,6 +1628,67 @@ public Entity UpdateEntity(string workspaceId, string entity, UpdateEntity prope
             return result;
         }
         /// <summary>
+        /// List entity mentions.
+        ///
+        /// List mentions for a contextual entity. An entity mention is an occurrence of a contextual entity in the
+        /// context of an intent user input example.
+        ///
+        /// This operation is limited to 200 requests per 30 minutes. For more information, see **Rate limiting**.
+        /// </summary>
+        /// <param name="workspaceId">Unique identifier of the workspace.</param>
+        /// <param name="entity">The name of the entity.</param>
+        /// <param name="export">Whether to include all element content in the returned data. If **export**=`false`, the
+        /// returned data includes only information about the element itself. If **export**=`true`, all content,
+        /// including subelements, is included. (optional, default to false)</param>
+        /// <param name="includeAudit">Whether to include the audit properties (`created` and `updated` timestamps) in
+        /// the response. (optional, default to false)</param>
+        /// <param name="customData">Custom data object to pass data including custom request headers.</param>
+        /// <returns><see cref="EntityMentionCollection" />EntityMentionCollection</returns>
+        public EntityMentionCollection ListMentions(string workspaceId, string entity, bool? export = null, bool? includeAudit = null, Dictionary<string, object> customData = null)
+        {
+            if (string.IsNullOrEmpty(workspaceId))
+                throw new ArgumentNullException(nameof(workspaceId));
+            if (string.IsNullOrEmpty(entity))
+                throw new ArgumentNullException(nameof(entity));
+
+            if(string.IsNullOrEmpty(VersionDate))
+                throw new ArgumentNullException("versionDate cannot be null.");
+
+            EntityMentionCollection result = null;
+
+            try
+            {
+                IClient client;
+                if(_tokenManager == null)
+                {
+                    client = this.Client.WithAuthentication(this.UserName, this.Password);
+                }
+                else
+                {
+                    client = this.Client.WithAuthentication(_tokenManager.GetToken());
+                }
+                var restRequest = client.GetAsync($"{this.Endpoint}/v1/workspaces/{workspaceId}/entities/{entity}/mentions");
+
+                restRequest.WithArgument("version", VersionDate);
+                if (export != null)
+                    restRequest.WithArgument("export", export);
+                if (includeAudit != null)
+                    restRequest.WithArgument("include_audit", includeAudit);
+                if (customData != null)
+                    restRequest.WithCustomData(customData);
+                result = restRequest.As<EntityMentionCollection>().Result;
+                if(result == null)
+                    result = new EntityMentionCollection();
+                result.CustomData = restRequest.CustomData;
+            }
+            catch(AggregateException ae)
+            {
+                throw ae.Flatten();
+            }
+
+            return result;
+        }
+        /// <summary>
         /// Add entity value.
         ///
         /// Create a new value for an entity.

src/IBM.WatsonDeveloperCloud.Assistant.v1/IAssistantService.cs

@@ -254,7 +254,7 @@ public partial interface IAssistantService
         /// <summary>
         /// List user input examples.
         ///
-        /// List the user input examples for an intent.
+        /// List the user input examples for an intent, optionally including contextual entity mentions.
         ///
         /// This operation is limited to 2500 requests per 30 minutes. For more information, see **Rate limiting**.
         /// </summary>
@@ -450,6 +450,24 @@ public partial interface IAssistantService
         /// <returns><see cref="Entity" />Entity</returns>
         Entity UpdateEntity(string workspaceId, string entity, UpdateEntity properties, Dictionary<string, object> customData = null);
         /// <summary>
+        /// List entity mentions.
+        ///
+        /// List mentions for a contextual entity. An entity mention is an occurrence of a contextual entity in the
+        /// context of an intent user input example.
+        ///
+        /// This operation is limited to 200 requests per 30 minutes. For more information, see **Rate limiting**.
+        /// </summary>
+        /// <param name="workspaceId">Unique identifier of the workspace.</param>
+        /// <param name="entity">The name of the entity.</param>
+        /// <param name="export">Whether to include all element content in the returned data. If **export**=`false`, the
+        /// returned data includes only information about the element itself. If **export**=`true`, all content,
+        /// including subelements, is included. (optional, default to false)</param>
+        /// <param name="includeAudit">Whether to include the audit properties (`created` and `updated` timestamps) in
+        /// the response. (optional, default to false)</param>
+        /// <param name="customData">Custom data object to pass data including custom request headers.</param>
+        /// <returns><see cref="EntityMentionCollection" />EntityMentionCollection</returns>
+        EntityMentionCollection ListMentions(string workspaceId, string entity, bool? export = null, bool? includeAudit = null, Dictionary<string, object> customData = null);
+        /// <summary>
         /// Add entity value.
         ///
         /// Create a new value for an entity.

src/IBM.WatsonDeveloperCloud.Assistant.v1/Model/CreateDialogNode.cs

@@ -323,7 +323,7 @@ public enum DigressOutSlotsEnum
         /// [documentation](https://console.bluemix.net/docs/services/conversation/dialog-overview.html#complex).
         /// </value>
         [JsonProperty("output", NullValueHandling = NullValueHandling.Ignore)]
-        public object Output { get; set; }
+        public dynamic Output { get; set; }
         /// <summary>
         /// The context for the dialog node.
         /// </summary>
@@ -376,6 +376,14 @@ public enum DigressOutSlotsEnum
         /// </value>
         [JsonProperty("variable", NullValueHandling = NullValueHandling.Ignore)]
         public string Variable { get; set; }
+        /// <summary>
+        /// A label that can be displayed externally to describe the purpose of the node to users.
+        /// </summary>
+        /// <value>
+        /// A label that can be displayed externally to describe the purpose of the node to users.
+        /// </value>
+        [JsonProperty("user_label", NullValueHandling = NullValueHandling.Ignore)]
+        public string UserLabel { get; set; }
     }
 
 }

src/IBM.WatsonDeveloperCloud.Assistant.v1/Model/CreateExample.cs

@@ -15,6 +15,7 @@
 *
 */
 
+using System.Collections.Generic;
 using Newtonsoft.Json;
 
 namespace IBM.WatsonDeveloperCloud.Assistant.v1.Model
@@ -38,6 +39,14 @@ public class CreateExample : BaseModel
         /// </value>
         [JsonProperty("text", NullValueHandling = NullValueHandling.Ignore)]
         public string Text { get; set; }
+        /// <summary>
+        /// An array of contextual entity mentions.
+        /// </summary>
+        /// <value>
+        /// An array of contextual entity mentions.
+        /// </value>
+        [JsonProperty("mentions", NullValueHandling = NullValueHandling.Ignore)]
+        public List<Mentions> Mentions { get; set; }
     }
 
 }

src/IBM.WatsonDeveloperCloud.Assistant.v1/Model/CreateWorkspace.cs

@@ -103,6 +103,14 @@ public class CreateWorkspace : BaseModel
         /// </value>
         [JsonProperty("learning_opt_out", NullValueHandling = NullValueHandling.Ignore)]
         public bool? LearningOptOut { get; set; }
+        /// <summary>
+        /// Global settings for the workspace.
+        /// </summary>
+        /// <value>
+        /// Global settings for the workspace.
+        /// </value>
+        [JsonProperty("system_settings", NullValueHandling = NullValueHandling.Ignore)]
+        public WorkspaceSystemSettings SystemSettings { get; set; }
     }
 
 }

src/IBM.WatsonDeveloperCloud.Assistant.v1/Model/DialogNode.cs

@@ -310,13 +310,15 @@ public enum DigressOutSlotsEnum
         [JsonProperty("previous_sibling", NullValueHandling = NullValueHandling.Ignore)]
         public string PreviousSibling { get; set; }
         /// <summary>
-        /// The output of the dialog node.
+        /// The output of the dialog node. For more information about how to specify dialog node output, see the
+        /// [documentation](https://console.bluemix.net/docs/services/conversation/dialog-overview.html#complex).
         /// </summary>
         /// <value>
-        /// The output of the dialog node.
+        /// The output of the dialog node. For more information about how to specify dialog node output, see the
+        /// [documentation](https://console.bluemix.net/docs/services/conversation/dialog-overview.html#complex).
         /// </value>
         [JsonProperty("output", NullValueHandling = NullValueHandling.Ignore)]
-        public object Output { get; set; }
+        public DialogNodeOutput Output { get; set; }
         /// <summary>
         /// The context (if defined) for the dialog node.
         /// </summary>
@@ -381,6 +383,14 @@ public enum DigressOutSlotsEnum
         /// </value>
         [JsonProperty("variable", NullValueHandling = NullValueHandling.Ignore)]
         public string Variable { get; set; }
+        /// <summary>
+        /// A label that can be displayed externally to describe the purpose of the node to users.
+        /// </summary>
+        /// <value>
+        /// A label that can be displayed externally to describe the purpose of the node to users.
+        /// </value>
+        [JsonProperty("user_label", NullValueHandling = NullValueHandling.Ignore)]
+        public string UserLabel { get; set; }
     }
 
 }

src/IBM.WatsonDeveloperCloud.Assistant.v1/Model/DialogNodeOutput.cs

@@ -0,0 +1,47 @@
+/**
+* Copyright 2018 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 System.Collections.Generic;
+using Newtonsoft.Json;
+
+namespace IBM.WatsonDeveloperCloud.Assistant.v1.Model
+{
+    /// <summary>
+    /// The output of the dialog node. For more information about how to specify dialog node output, see the
+    /// [documentation](https://console.bluemix.net/docs/services/conversation/dialog-overview.html#complex).
+    /// </summary>
+    public class DialogNodeOutput : BaseModel
+    {
+        /// <summary>
+        /// An array of objects describing the output defined for the dialog node.
+        /// </summary>
+        /// <value>
+        /// An array of objects describing the output defined for the dialog node.
+        /// </value>
+        [JsonProperty("generic", NullValueHandling = NullValueHandling.Ignore)]
+        public dynamic Generic { get; set; }
+        /// <summary>
+        /// Options that modify how specified output is handled.
+        /// </summary>
+        /// <value>
+        /// Options that modify how specified output is handled.
+        /// </value>
+        [JsonProperty("modifiers", NullValueHandling = NullValueHandling.Ignore)]
+        public dynamic Modifiers { get; set; }
+    }
+
+}