Merge pull request #434 from watson-developer-cloud/august-2020-release

August 2020 release

Author: kevinkowa

appveyor.yml

@@ -17,7 +17,7 @@ environment:
         secure: Zkh0ZB9E5PB/Kq5maKln+aKSH0xqDjR2LTDaJRmMaUYVOV7nzYsON4KlkqCKCgGs #pragma: whitelist secret
     GITHUB_TOKEN:
         secure: +B2bs86RVtJtlbkB+cTf9bkqnNlFJi/PbBBPzR5jlUlLLZoOc+ZgqgQLwee4tCT+ #pragma: whitelist secret
-    IBM_CREDENTIALS_FILE: C:\projects\sdk-credentials\ibm-credentials.env
+    IBM_CREDENTIALS_FILE: C:/projects/sdk-credentials/ibm-credentials.env
 install:
 # Get the latest stable version of Node.js or io.js
 - ps: Install-Product node 12.13.0
@@ -59,7 +59,7 @@ before_build:
 - ps: >-
     if($env:APPVEYOR_PULL_REQUEST_NUMBER -eq $null)
     {
-      git clone https://$env:[email protected]/germanatt/sdk-credentials.git C:\projects\sdk-credentials -q
+      git clone https://$env:[email protected]/germanatt/sdk-credentials.git C:/projects/sdk-credentials -q
     }
 
     dotnet restore

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

@@ -27,8 +27,8 @@
     <ItemGroup>
         <PackageReference Include="IBM.Cloud.SDK.Core" Version="1.1.0" />
         <PackageReference Include="IBM.Watson.Common" Version="4.5.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
         <PackageReference Include="JsonSubTypes" Version="1.6.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
     </ItemGroup>
 
 </Project>

src/IBM.Watson.Assistant.v1/IBM.Watson.Assistant.v1.csproj

@@ -29,8 +29,7 @@ public class DialogNodeOutputGeneric
         /// The type of response returned by the dialog node. The specified response type must be supported by the
         /// client application or channel.
         ///
-        /// **Note:** The **search_skill** response type is available only for Plus and Premium users, and is used only
-        /// by the v2 runtime API.
+        /// **Note:** The **search_skill** response type is used only by the v2 runtime API.
         /// </summary>
         public class ResponseTypeEnumValue
         {
@@ -119,8 +118,7 @@ public class QueryTypeEnumValue
         /// The type of response returned by the dialog node. The specified response type must be supported by the
         /// client application or channel.
         ///
-        /// **Note:** The **search_skill** response type is available only for Plus and Premium users, and is used only
-        /// by the v2 runtime API.
+        /// **Note:** The **search_skill** response type is used only by the v2 runtime API.
         /// Constants for possible values can be found using DialogNodeOutputGeneric.ResponseTypeEnumValue
         /// </summary>
         [JsonProperty("response_type", NullValueHandling = NullValueHandling.Ignore)]

src/IBM.Watson.Assistant.v1/Model/DialogNodeOutputGeneric.cs

@@ -29,9 +29,7 @@ public class DialogSuggestionResponseGeneric
         /// The type of response returned by the dialog node. The specified response type must be supported by the
         /// client application or channel.
         ///
-        /// **Note:** The **suggestion** response type is part of the disambiguation feature, which is only available
-        /// for Plus and Premium users. The **search_skill** response type is available only for Plus and Premium users,
-        /// and is used only by the v2 runtime API.
+        /// **Note:** The **search_skill** response type is is used only by the v2 runtime API.
         /// </summary>
         public class ResponseTypeEnumValue
         {
@@ -82,9 +80,7 @@ public class PreferenceEnumValue
         /// The type of response returned by the dialog node. The specified response type must be supported by the
         /// client application or channel.
         ///
-        /// **Note:** The **suggestion** response type is part of the disambiguation feature, which is only available
-        /// for Plus and Premium users. The **search_skill** response type is available only for Plus and Premium users,
-        /// and is used only by the v2 runtime API.
+        /// **Note:** The **search_skill** response type is is used only by the v2 runtime API.
         /// Constants for possible values can be found using DialogSuggestionResponseGeneric.ResponseTypeEnumValue
         /// </summary>
         [JsonProperty("response_type", NullValueHandling = NullValueHandling.Ignore)]

src/IBM.Watson.Assistant.v1/Model/DialogSuggestionResponseGeneric.cs

@@ -28,9 +28,6 @@ public class RuntimeResponseGeneric
         /// <summary>
         /// The type of response returned by the dialog node. The specified response type must be supported by the
         /// client application or channel.
-        ///
-        /// **Note:** The **suggestion** response type is part of the disambiguation feature, which is only available
-        /// for Plus and Premium users.
         /// </summary>
         public class ResponseTypeEnumValue
         {
@@ -80,9 +77,6 @@ public class PreferenceEnumValue
         /// <summary>
         /// The type of response returned by the dialog node. The specified response type must be supported by the
         /// client application or channel.
-        ///
-        /// **Note:** The **suggestion** response type is part of the disambiguation feature, which is only available
-        /// for Plus and Premium users.
         /// Constants for possible values can be found using RuntimeResponseGeneric.ResponseTypeEnumValue
         /// </summary>
         [JsonProperty("response_type", NullValueHandling = NullValueHandling.Ignore)]
@@ -146,9 +140,6 @@ public class PreferenceEnumValue
         public string DialogNode { get; set; }
         /// <summary>
         /// An array of objects describing the possible matching dialog nodes from which the user can choose.
-        ///
-        /// **Note:** The **suggestions** property is part of the disambiguation feature, which is only available for
-        /// Plus and Premium users.
         /// </summary>
         [JsonProperty("suggestions", NullValueHandling = NullValueHandling.Ignore)]
         public List<DialogSuggestion> Suggestions { get; set; }

src/IBM.Watson.Assistant.v1/Model/RuntimeResponseGeneric.cs

@@ -32,8 +32,6 @@ public class WorkspaceSystemSettings
         public WorkspaceSystemSettingsTooling Tooling { get; set; }
         /// <summary>
         /// Workspace settings related to the disambiguation feature.
-        ///
-        /// **Note:** This feature is available only to Plus and Premium users.
         /// </summary>
         [JsonProperty("disambiguation", NullValueHandling = NullValueHandling.Ignore)]
         public WorkspaceSystemSettingsDisambiguation Disambiguation { get; set; }

src/IBM.Watson.Assistant.v1/Model/WorkspaceSystemSettings.cs

@@ -1,5 +1,5 @@
 /**
-* (C) Copyright IBM Corp. 2018, 2019.
+* (C) Copyright IBM Corp. 2018, 2020.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -21,8 +21,6 @@ namespace IBM.Watson.Assistant.v1.Model
 {
     /// <summary>
     /// Workspace settings related to the disambiguation feature.
-    ///
-    /// **Note:** This feature is available only to Plus and Premium users.
     /// </summary>
     public class WorkspaceSystemSettingsDisambiguation
     {

src/IBM.Watson.Assistant.v1/Model/WorkspaceSystemSettingsDisambiguation.cs

@@ -31,7 +31,7 @@ namespace IBM.Watson.Assistant.v2
     public partial class AssistantService : IBMService, IAssistantService
     {
         const string serviceName = "assistant";
-        private const string defaultServiceUrl = "https://gateway.watsonplatform.net/assistant/api";
+        private const string defaultServiceUrl = "https://api.us-south.assistant.watson.cloud.ibm.com";
         public string VersionDate { get; set; }
 
         public AssistantService(string versionDate) : this(versionDate, ConfigBasedAuthenticatorFactory.GetAuthenticator(serviceName)) { }
@@ -185,8 +185,6 @@ public DetailedResponse<object> DeleteSession(string assistantId, string session
         ///
         /// Send user input to an assistant and receive a response, with conversation state (including context data)
         /// stored by Watson Assistant for the duration of the session.
-        ///
-        /// There is no rate limit for this operation.
         /// </summary>
         /// <param name="assistantId">Unique identifier of the assistant. To find the assistant ID in the Watson
         /// Assistant user interface, open the assistant settings and click **API Details**. For information about
@@ -270,8 +268,6 @@ public DetailedResponse<MessageResponse> Message(string assistantId, string sess
         ///
         /// Send user input to an assistant and receive a response, with conversation state (including context data)
         /// managed by your application.
-        ///
-        /// There is no rate limit for this operation.
         /// </summary>
         /// <param name="assistantId">Unique identifier of the assistant. To find the assistant ID in the Watson
         /// Assistant user interface, open the assistant settings and click **API Details**. For information about
@@ -338,6 +334,148 @@ public DetailedResponse<MessageResponseStateless> MessageStateless(string assist
                 throw ae.Flatten();
             }
 
+            return result;
+        }
+        /// <summary>
+        /// List log events for an assistant.
+        ///
+        /// List the events from the log of an assistant.
+        ///
+        /// This method is available only with Premium plans.
+        /// </summary>
+        /// <param name="assistantId">Unique identifier of the assistant. To find the assistant ID in the Watson
+        /// Assistant user interface, open the assistant settings and click **API Details**. For information about
+        /// creating assistants, see the
+        /// [documentation](https://cloud.ibm.com/docs/assistant?topic=assistant-assistant-add#assistant-add-task).
+        ///
+        /// **Note:** Currently, the v2 API does not support creating assistants.</param>
+        /// <param name="sort">How to sort the returned log events. You can sort by **request_timestamp**. To reverse
+        /// the sort order, prefix the parameter value with a minus sign (`-`). (optional)</param>
+        /// <param name="filter">A cacheable parameter that limits the results to those matching the specified filter.
+        /// For more information, see the
+        /// [documentation](https://cloud.ibm.com/docs/assistant?topic=assistant-filter-reference#filter-reference).
+        /// (optional)</param>
+        /// <param name="pageLimit">The number of records to return in each page of results. (optional)</param>
+        /// <param name="cursor">A token identifying the page of results to retrieve. (optional)</param>
+        /// <returns><see cref="LogCollection" />LogCollection</returns>
+        public DetailedResponse<LogCollection> ListLogs(string assistantId, string sort = null, string filter = null, long? pageLimit = null, string cursor = null)
+        {
+            if (string.IsNullOrEmpty(assistantId))
+            {
+                throw new ArgumentNullException("`assistantId` is required for `ListLogs`");
+            }
+            else
+            {
+                assistantId = Uri.EscapeDataString(assistantId);
+            }
+
+            if (string.IsNullOrEmpty(VersionDate))
+            {
+                throw new ArgumentNullException("versionDate cannot be null.");
+            }
+
+            DetailedResponse<LogCollection> result = null;
+
+            try
+            {
+                IClient client = this.Client;
+                SetAuthentication();
+
+                var restRequest = client.GetAsync($"{this.Endpoint}/v2/assistants/{assistantId}/logs");
+
+                restRequest.WithArgument("version", VersionDate);
+                restRequest.WithHeader("Accept", "application/json");
+                if (!string.IsNullOrEmpty(sort))
+                {
+                    restRequest.WithArgument("sort", sort);
+                }
+                if (!string.IsNullOrEmpty(filter))
+                {
+                    restRequest.WithArgument("filter", filter);
+                }
+                if (pageLimit != null)
+                {
+                    restRequest.WithArgument("page_limit", pageLimit);
+                }
+                if (!string.IsNullOrEmpty(cursor))
+                {
+                    restRequest.WithArgument("cursor", cursor);
+                }
+
+                restRequest.WithHeaders(Common.GetSdkHeaders("conversation", "v2", "ListLogs"));
+                restRequest.WithHeaders(customRequestHeaders);
+                ClearCustomRequestHeaders();
+
+                result = restRequest.As<LogCollection>().Result;
+                if (result == null)
+                {
+                    result = new DetailedResponse<LogCollection>();
+                }
+            }
+            catch (AggregateException ae)
+            {
+                throw ae.Flatten();
+            }
+
+            return result;
+        }
+        /// <summary>
+        /// Delete labeled data.
+        ///
+        /// Deletes all data associated with a specified customer ID. The method has no effect if no data is associated
+        /// with the customer ID.
+        ///
+        /// You associate a customer ID with data by passing the `X-Watson-Metadata` header with a request that passes
+        /// data. For more information about personal data and customer IDs, see [Information
+        /// security](https://cloud.ibm.com/docs/assistant?topic=assistant-information-security#information-security).
+        ///
+        /// This operation is limited to 4 requests per minute. For more information, see **Rate limiting**.
+        /// </summary>
+        /// <param name="customerId">The customer ID for which all data is to be deleted.</param>
+        /// <returns><see cref="object" />object</returns>
+        public DetailedResponse<object> DeleteUserData(string customerId)
+        {
+            if (string.IsNullOrEmpty(customerId))
+            {
+                throw new ArgumentNullException("`customerId` is required for `DeleteUserData`");
+            }
+
+            if (string.IsNullOrEmpty(VersionDate))
+            {
+                throw new ArgumentNullException("versionDate cannot be null.");
+            }
+
+            DetailedResponse<object> result = null;
+
+            try
+            {
+                IClient client = this.Client;
+                SetAuthentication();
+
+                var restRequest = client.DeleteAsync($"{this.Endpoint}/v2/user_data");
+
+                restRequest.WithArgument("version", VersionDate);
+                restRequest.WithHeader("Accept", "application/json");
+                if (!string.IsNullOrEmpty(customerId))
+                {
+                    restRequest.WithArgument("customer_id", customerId);
+                }
+
+                restRequest.WithHeaders(Common.GetSdkHeaders("conversation", "v2", "DeleteUserData"));
+                restRequest.WithHeaders(customRequestHeaders);
+                ClearCustomRequestHeaders();
+
+                result = restRequest.As<object>().Result;
+                if (result == null)
+                {
+                    result = new DetailedResponse<object>();
+                }
+            }
+            catch (AggregateException ae)
+            {
+                throw ae.Flatten();
+            }
+
             return result;
         }
     }

src/IBM.Watson.Assistant.v2/AssistantService.cs

@@ -26,5 +26,7 @@ public partial interface IAssistantService
         DetailedResponse<object> DeleteSession(string assistantId, string sessionId);
         DetailedResponse<MessageResponse> Message(string assistantId, string sessionId, MessageInput input = null, MessageContext context = null);
         DetailedResponse<MessageResponseStateless> MessageStateless(string assistantId, MessageInputStateless input = null, MessageContextStateless context = null);
+        DetailedResponse<LogCollection> ListLogs(string assistantId, string sort = null, string filter = null, long? pageLimit = null, string cursor = null);
+        DetailedResponse<object> DeleteUserData(string customerId);
     }
 }