Merge pull request #514 from watson-developer-cloud/6029-regenerate-sdk-2

Update SDK

Author: mediumTaj

README.md

@@ -179,20 +179,21 @@ void Start()
 }
 ```
 
-### ibm-credentials.env
-You can create an ibm-credentials.env file for authentication. This has the basic format
-```
-VISUAL_RECOGNITION_APIKEY=<visual-recognition-apikey>
-VISUAL_RECOGNITION_URL=<visual-recognition-service-url>
-ASSISTANT_APIKEY=<assistant-apikey>
-ASSISTANT_URL=<assistant-service-url>
-```
-The SDK will search for this file in the following order
-- Path specified by environmental variable `IBM_CREDENTIALS_FILE`
-- System home directory
-- Top level of the project directory
+### Supplying credentials
+
+There are two ways to supply the credentials you found above to the SDK for authentication.
+
+#### Credential file (easier!)
+
+With a credential file, you just need to put the file in the right place and the SDK will do the work of parsing it and authenticating. You can get this file by clicking the **Download** button for the credentials in the **Manage** tab of your service instance.
+
+The file downloaded will be called `ibm-credentials.env`. This is the name the SDK will search for and **must** be preserved unless you want to configure the file path (more on that later). The SDK will look for your `ibm-credentials.env` file in the following places (in order):
+
+- Your system's home directory
+- The top-level directory of the project you're using the SDK in
+
+As long as you set that up correctly, you don't have to worry about setting any authentication options in your code. So, for example, if you created and downloaded the credential file for your Discovery instance, you just need to do the following:
 
-Using a `ibm-credentials.env` file you can easily instantiate and authenticate a service. If you are using an IAM Apikey you will need to invoke this using a coroutine to wait for the authorization token.
 ```cs
 public IEnumerator ExampleAutoService()
 {
@@ -205,7 +206,23 @@ public IEnumerator ExampleAutoService()
 
     var listWorkspacesResult = assistantService.ListWorkspaces();
 }
-``` 
+```
+
+And that's it!
+
+If you're using more than one service at a time in your code and get two different `ibm-credentials.env` files, just put the contents together in one `ibm-credentials.env` file and the SDK will handle assigning credentials to their appropriate services.
+
+If you would like to configure the location/name of your credential file, you can set an environment variable called `IBM_CREDENTIALS_FILE`. **This will take precedence over the locations specified above.** Here's how you can do that:
+
+```bash
+export IBM_CREDENTIALS_FILE="<path>"
+```
+
+where `<path>` is something like `/home/user/Downloads/<file_name>.env`.
+
+#### Manually
+
+If you'd prefer to set authentication values manually in your code, the SDK supports that as well. The way you'll do this depends on what type of credentials your service instance gives you.
 
 ## Callbacks
 Success and failure callbacks are required. You can specify the return type in the callback.  

Scripts/Services/CompareComply/v1/Models/Attribute.cs

@@ -45,7 +45,12 @@ public enum Type
             /// Enum location for Location
             /// </summary>
             [EnumMember(Value = "Location")]
-            Location
+            Location,
+            /// <summary>
+            /// Enum ADDRESS for Address
+            /// </summary>
+            [EnumMember(Value = "Address")]
+            ADDRESS,
         }
 
         /// <summary>

Scripts/Services/CompareComply/v1/Models/BodyCells.cs

@@ -64,35 +64,42 @@ public class BodyCells
         [fsProperty("column_index_end")]
         public long? ColumnIndexEnd { get; set; }
         /// <summary>
-        /// Gets or Sets rowHeaderIds
+        /// An array of values, each being the `id` value of a row header that is applicable to this body cell.
         /// </summary>
         [fsProperty("row_header_ids")]
-        public List<RowHeaderIds> RowHeaderIds { get; set; }
+        public List<string> RowHeaderIds { get; set; }
         /// <summary>
-        /// Gets or Sets rowHeaderTexts
+        /// An array of values, each being the `text` value of a row header that is applicable to this body cell.
         /// </summary>
         [fsProperty("row_header_texts")]
-        public List<RowHeaderTexts> RowHeaderTexts { get; set; }
+        public List<string> RowHeaderTexts { get; set; }
         /// <summary>
-        /// Gets or Sets rowHeaderTextsNormalized
+        /// If you provide customization input, the normalized version of the row header texts according to the
+        /// customization; otherwise, the same value as `row_header_texts`.
         /// </summary>
         [fsProperty("row_header_texts_normalized")]
-        public List<RowHeaderTextsNormalized> RowHeaderTextsNormalized { get; set; }
+        public List<string> RowHeaderTextsNormalized { get; set; }
         /// <summary>
-        /// Gets or Sets columnHeaderIds
+        /// An array of values, each being the `id` value of a column header that is applicable to the current cell.
         /// </summary>
         [fsProperty("column_header_ids")]
-        public List<ColumnHeaderIds> ColumnHeaderIds { get; set; }
+        public List<string> ColumnHeaderIds { get; set; }
         /// <summary>
-        /// Gets or Sets columnHeaderTexts
+        /// An array of values, each being the `id` value of a column header that is applicable to the current cell.
         /// </summary>
         [fsProperty("column_header_texts")]
-        public List<ColumnHeaderTexts> ColumnHeaderTexts { get; set; }
+        public List<string> ColumnHeaderTexts { get; set; }
         /// <summary>
-        /// Gets or Sets columnHeaderTextsNormalized
+        /// If you provide customization input, the normalized version of the column header texts according to the
+        /// customization; otherwise, the same value as `column_header_texts`.
         /// </summary>
         [fsProperty("column_header_texts_normalized")]
-        public List<ColumnHeaderTextsNormalized> ColumnHeaderTextsNormalized { get; set; }
+        public List<string> ColumnHeaderTextsNormalized { get; set; }
+        /// <summary>
+        /// Gets or Sets Attributes
+        /// </summary>
+        [fsProperty("attributes")]
+        public List<Attribute> Attributes { get; set; }
     }
 
 }

Scripts/Services/CompareComply/v1/Models/ContractAmts.cs

@@ -25,6 +25,33 @@ namespace  IBM.Watson.DeveloperCloud.Services.CompareComply.v1
     [fsObject]
     public class ContractAmts
     {
+        /// <summary>
+        /// The confidence level in the identification of the contract amount.
+        /// </summary>
+        public enum ConfidenceLevelEnum
+        {
+
+            /// <summary>
+            /// Enum HIGH for High
+            /// </summary>
+            High,
+
+            /// <summary>
+            /// Enum MEDIUM for Medium
+            /// </summary>
+            Medium,
+
+            /// <summary>
+            /// Enum LOW for Low
+            /// </summary>
+            Low
+        }
+
+        /// <summary>
+        /// The confidence level in the identification of the contract amount.
+        /// </summary>
+        [fsProperty("confidence_level")]
+        public ConfidenceLevelEnum? ConfidenceLevel { get; set; }
         /// <summary>
         /// The monetary amount.
         /// </summary>

Scripts/Services/CompareComply/v1/Models/EffectiveDates.cs

@@ -25,6 +25,34 @@ namespace  IBM.Watson.DeveloperCloud.Services.CompareComply.v1
     [fsObject]
     public class EffectiveDates
     {
+        /// <summary>
+        /// The confidence level in the identification of the effective date.
+        /// </summary>
+        public enum ConfidenceLevelEnum
+        {
+
+            /// <summary>
+            /// Enum HIGH for High
+            /// </summary>
+            High,
+
+            /// <summary>
+            /// Enum MEDIUM for Medium
+            /// </summary>
+            Medium,
+
+            /// <summary>
+            /// Enum LOW for Low
+            /// </summary>
+            Low
+        }
+
+        /// <summary>
+        /// The confidence level in the identification of the effective date.
+        /// </summary>
+        [fsProperty("confidence_level")]
+        public ConfidenceLevelEnum? ConfidenceLevel { get; set; }
+
         /// <summary>
         /// The effective date, listed as a string.
         /// </summary>

Scripts/Services/CompareComply/v1/Models/Parties.cs

@@ -26,6 +26,28 @@ namespace  IBM.Watson.DeveloperCloud.Services.CompareComply.v1
     [fsObject]
     public class Parties
     {
+        /// <summary>
+        /// A string that identifies the importance of the party.
+        /// </summary>
+        public enum ImportanceEnum
+        {
+
+            /// <summary>
+            /// Enum PRIMARY for Primary
+            /// </summary>
+            Primary,
+
+            /// <summary>
+            /// Enum UNKNOWN for Unknown
+            /// </summary>
+            Unknown
+        }
+
+        /// <summary>
+        /// A string that identifies the importance of the party.
+        /// </summary>
+        [fsProperty("importance")]
+        public ImportanceEnum? Importance { get; set; }
         /// <summary>
         /// A string identifying the party.
         /// </summary>

Scripts/Services/CompareComply/v1/Models/TerminationDates.cs

@@ -25,6 +25,34 @@ namespace  IBM.Watson.DeveloperCloud.Services.CompareComply.v1
     [fsObject]
     public class TerminationDates
     {
+        /// <summary>
+        /// The confidence level in the identification of the termination date.
+        /// </summary>
+        public enum ConfidenceLevelEnum
+        {
+
+            /// <summary>
+            /// Enum HIGH for High
+            /// </summary>
+            High,
+
+            /// <summary>
+            /// Enum MEDIUM for Medium
+            /// </summary>
+            Medium,
+
+            /// <summary>
+            /// Enum LOW for Low
+            /// </summary>
+            Low
+        }
+
+        /// <summary>
+        /// The confidence level in the identification of the termination date.
+        /// </summary>
+        [fsProperty("confidence_level")]
+        public ConfidenceLevelEnum? ConfidenceLevel { get; set; }
+
         /// <summary>
         /// The termination date.
         /// </summary>

Scripts/Services/Discovery/v1/DataModels.cs

@@ -1005,6 +1005,10 @@ public class DocumentCounts
         /// The number of documents in the collection that failed to be ingested.
         /// </summary>
         public int failed { get; set; }
+        /// <summary>
+        /// The number of documents that have been uploaded to the collection, but have not yet started processing.
+        /// </summary>
+        public virtual long? pending { get; private set; }
     }
 
     /// <summary>

Scripts/Services/Discovery/v1/Discovery.cs

@@ -5649,6 +5649,99 @@ private void OnCreateStopwordListResponse(RESTConnector.Request req, RESTConnect
             }
         }
 
+        public bool GetStopwordListStatus(SuccessCallback<TokenDictStatusResponse> successCallback, FailCallback failCallback, string environmentID, string collectionId, Dictionary<string, object> customData = null)
+        {
+            if (successCallback == null)
+                throw new ArgumentNullException("successCallback");
+            if (failCallback == null)
+                throw new ArgumentNullException("failCallback");
+            if (string.IsNullOrEmpty(environmentID))
+                throw new ArgumentNullException("environmentID");
+            if (string.IsNullOrEmpty(collectionId))
+                throw new ArgumentNullException("collectionId");
+
+            GetStopwordListStatusRequest req = new GetStopwordListStatusRequest();
+            req.SuccessCallback = successCallback;
+            req.FailCallback = failCallback;
+            req.HttpMethod = UnityWebRequest.kHttpVerbGET;
+            req.DisableSslVerification = DisableSslVerification;
+            req.CustomData = customData == null ? new Dictionary<string, object>() : customData;
+            req.Headers["Content-Type"] = "application/json";
+            if (req.CustomData.ContainsKey(Constants.String.CUSTOM_REQUEST_HEADERS))
+            {
+                foreach (KeyValuePair<string, string> kvp in req.CustomData[Constants.String.CUSTOM_REQUEST_HEADERS] as Dictionary<string, string>)
+                {
+                    req.Headers.Add(kvp.Key, kvp.Value);
+                }
+            }
+            req.Parameters["version"] = VersionDate;
+            req.OnResponse = OnGetStopwordListStatusResponse;
+            req.Headers["X-IBMCloud-SDK-Analytics"] = "service_name=discovery;service_version=v1;operation_id=GetStopwordListStatus";
+
+            RESTConnector connector = RESTConnector.GetConnector(Credentials, string.Format("/v1/environments/{0}/collections/{1}/word_lists/stopwords", environmentID, collectionId));
+            if (connector == null)
+                return false;
+
+            return connector.Send(req);
+        }
+
+        private class GetStopwordListStatusRequest : RESTConnector.Request
+        {
+            /// <summary>
+            /// The success callback.
+            /// </summary>
+            public SuccessCallback<TokenDictStatusResponse> SuccessCallback { get; set; }
+            /// <summary>
+            /// The fail callback.
+            /// </summary>
+            public FailCallback FailCallback { get; set; }
+            /// <summary>
+            /// Custom data.
+            /// </summary>
+            public Dictionary<string, object> CustomData { get; set; }
+        }
+
+        private void OnGetStopwordListStatusResponse(RESTConnector.Request req, RESTConnector.Response resp)
+        {
+            TokenDictStatusResponse result = new TokenDictStatusResponse();
+            fsData data = null;
+            Dictionary<string, object> customData = ((GetStopwordListStatusRequest)req).CustomData;
+            customData.Add(Constants.String.RESPONSE_HEADERS, resp.Headers);
+
+            if (resp.Success)
+            {
+                try
+                {
+                    fsResult r = fsJsonParser.Parse(Encoding.UTF8.GetString(resp.Data), out data);
+                    if (!r.Succeeded)
+                        throw new WatsonException(r.FormattedMessages);
+
+                    object obj = result;
+                    r = _serializer.TryDeserialize(data, obj.GetType(), ref obj);
+                    if (!r.Succeeded)
+                        throw new WatsonException(r.FormattedMessages);
+
+                    customData.Add("json", data);
+                }
+                catch (Exception e)
+                {
+                    Log.Error("Discovery.OnGetStopwordListStatusResponse()", "OnGetStopwordListStatusResponse Exception: {0}", e.ToString());
+                    resp.Success = false;
+                }
+            }
+
+            if (resp.Success)
+            {
+                if (((GetStopwordListStatusRequest)req).SuccessCallback != null)
+                    ((GetStopwordListStatusRequest)req).SuccessCallback(result, customData);
+            }
+            else
+            {
+                if (((GetStopwordListStatusRequest)req).FailCallback != null)
+                    ((GetStopwordListStatusRequest)req).FailCallback(resp.Error, customData);
+            }
+        }
+
         /// <summary>
         /// Delete a custom stopword list.
         ///