chore: merge in develop

Author: mediumTaj

Scripts/Services/Assistant/v1/Models/DialogNodeAction.cs

@@ -43,7 +43,19 @@ public enum ActionTypeEnum
             /// Enum SERVER for server
             /// </summary>
             [EnumMember(Value = "server")]
-            SERVER
+            SERVER,
+
+            /// <summary>
+            /// Enum CLOUD_FUNCTION for cloud_function
+            /// </summary>
+            [EnumMember(Value = "cloud_function")]
+            CLOUD_FUNCTION,
+
+            /// <summary>
+            /// Enum WEB_ACTION for web_action
+            /// </summary>
+            [EnumMember(Value = "web_action")]
+            WEB_ACTION
         }
 
         /// <summary>

Scripts/Services/Assistant/v2/Models/DialogNodeAction.cs

@@ -40,7 +40,19 @@ public enum ActionTypeEnum
             /// Enum server for server
             /// </summary>
             [EnumMember(Value = "server")]
-            server
+            server,
+
+            /// <summary>
+            /// Enum WEB_ACTION for web-action
+            /// </summary>
+            [EnumMember(Value = "web-action")]
+            web_action,
+
+            /// <summary>
+            /// Enum CLOUD_FUNCTION for cloud-function
+            /// </summary>
+            [EnumMember(Value = "cloud-function")]
+            cloud_function
         }
 
         /// <summary>

Scripts/Services/Discovery/v1/Discovery.cs

@@ -27,28 +27,6 @@ namespace IBM.Watson.DeveloperCloud.Services.Discovery.v1
     [fsObject]
     public class LogQueryResponseResult
     {
-        /// <summary>
-        /// The type of log entry returned.
-        ///
-        ///  **query** indicates that the log represents the results of a call to the single collection **query**
-        /// method.
-        ///
-        ///  **event** indicates that the log represents  a call to the **events** API.
-        /// </summary>
-        public enum DocumentTypeEnum
-        {
-            /// <summary>
-            /// Enum query for query
-            /// </summary>
-            [EnumMember(Value = "query")]
-            query,
-            /// <summary>
-            /// Enum _event for event
-            /// </summary>
-            [EnumMember(Value = "event")]
-            _event
-        }
-
         /// <summary>
         /// The type of event that this object respresents. Possible values are
         ///
@@ -91,7 +69,7 @@ public enum ResultTypeEnum
         ///  **event** indicates that the log represents  a call to the **events** API.
         /// </summary>
         [fsProperty("document_type")]
-        public DocumentTypeEnum? DocumentType { get; set; }
+        public string DocumentType { get; set; }
         /// <summary>
         /// The type of event that this object respresents. Possible values are
         ///

Scripts/Services/Discovery/v1/Models/LogQueryResponseResult.cs

@@ -0,0 +1,37 @@
+/**
+* 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 FullSerializer;
+using System.Collections.Generic;
+
+namespace IBM.Watson.DeveloperCloud.Services.Discovery.v1
+{
+    /// <summary>
+    /// Tokenization dictionary describing how words are tokenized during ingestion and at query time.
+    /// </summary>
+    [fsObject]
+    public class TokenDict
+    {
+        /// <summary>
+        /// An array of tokenization rules. Each rule contains, the original `text` string, component `tokens`, any
+        /// alternate character set `readings`, and which `part_of_speech` the text is from.
+        /// </summary>
+        [fsProperty("tokenization_rules")]
+        public List<TokenDictRule> TokenizationRules { get; set; }
+    }
+
+}

Scripts/Services/Discovery/v1/Models/TokenDict.cs

@@ -0,0 +1,52 @@
+/**
+* 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 FullSerializer;
+using System.Collections.Generic;
+
+namespace IBM.Watson.DeveloperCloud.Services.Discovery.v1
+{
+    /// <summary>
+    /// An object defining a single tokenizaion rule.
+    /// </summary>
+    [fsObject]
+    public class TokenDictRule
+    {
+        /// <summary>
+        /// The string to tokenize.
+        /// </summary>
+        [fsProperty("text")]
+        public string Text { get; set; }
+        /// <summary>
+        /// Array of tokens that the `text` field is split into when found.
+        /// </summary>
+        [fsProperty("tokens")]
+        public List<string> Tokens { get; set; }
+        /// <summary>
+        /// Array of tokens that represent the content of the `text` field in an alternate character set.
+        /// </summary>
+        [fsProperty("readings")]
+        public List<string> Readings { get; set; }
+        /// <summary>
+        /// The part of speech that the `text` string belongs to. For example `noun`. Custom parts of speech can be
+        /// specified.
+        /// </summary>
+        [fsProperty("part_of_speech")]
+        public string PartOfSpeech { get; set; }
+    }
+
+}

Scripts/UnitTests/TestLanguageTranslatorV2.cs.meta renamed to Scripts/Services/Discovery/v1/Models/TokenDict.cs.meta

@@ -0,0 +1,41 @@
+/**
+* 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 FullSerializer;
+using System.Runtime.Serialization;
+
+namespace IBM.Watson.DeveloperCloud.Services.Discovery.v1
+{
+    /// <summary>
+    /// Object describing the current status of the tokenization dictionary.
+    /// </summary>
+    [fsObject]
+    public class TokenDictStatusResponse
+    {
+        /// <summary>
+        /// Current tokenization dictionary status for the specified collection.
+        /// </summary>
+        [fsProperty("status")]
+        public string Status { get; set; }
+        /// <summary>
+        /// The type for this dictionary. Always returns `tokenization_dictionary`.
+        /// </summary>
+        [fsProperty("type")]
+        public string Type { get; set; }
+    }
+
+}

Scripts/Services/Discovery/v1/Models/TokenDictRule.cs

@@ -117,8 +117,9 @@ public bool DisableSslVerification
         private int _recordingHZ = -1;
         private int _inactivityTimeout = 60;
         private string _customization_id = null;
+        private string _languageCustomizationId = null;
         private string _acoustic_customization_id = null;
-        private float _customization_weight = 0.3f;
+        private float? _customization_weight = null;
         private bool _streamMultipart = false;           //  If true sets `Transfer-Encoding` header of multipart request to `chunked`.
         private float _silenceDuration = 0.0f;
         private float _silenceCutoff = 1.0f;
@@ -253,15 +254,20 @@ public Credentials Credentials
         /// <summary>
         /// Specifies the Globally Unique Identifier (GUID) of a custom language model that is to be used for all requests sent over the connection. The base model of the custom language model must match the value of the model parameter. By default, no custom language model is used. For more information, see https://console.bluemix.net/docs/services/speech-to-text/custom.html.
         /// </summary>
+        [Obsolete("Use LanguageCustomizationId instead.")]
         public string CustomizationId { get { return _customization_id; } set { _customization_id = value; } }
         /// <summary>
+        /// Specifies the Globally Unique Identifier (GUID) of a custom language model that is to be used for all requests sent over the connection. The base model of the custom language model must match the value of the model parameter. By default, no custom language model is used. For more information, see https://console.bluemix.net/docs/services/speech-to-text/custom.html.
+        /// </summary>
+        public string LanguageCustomizationId { get { return _languageCustomizationId; } set { _languageCustomizationId = value; } }
+        /// <summary>
         /// Specifies the Globally Unique Identifier (GUID) of a custom acoustic model that is to be used for all requests sent over the connection. The base model of the custom acoustic model must match the value of the model parameter. By default, no custom acoustic model is used. For more information, see https://console.bluemix.net/docs/services/speech-to-text/custom.html.
         /// </summary>
         public string AcousticCustomizationId { get { return _acoustic_customization_id; } set { _acoustic_customization_id = value; } }
         /// <summary>
         /// Specifies the weight the service gives to words from a specified custom language model compared to those from the base model for all requests sent over the connection. Specify a value between 0.0 and 1.0; the default value is 0.3. For more information, see https://console.bluemix.net/docs/services/speech-to-text/language-use.html#weight.
         /// </summary>
-        public float CustomizationWeight { get { return _customization_weight; } set { _customization_weight = value; } }
+        public float? CustomizationWeight { get { return _customization_weight; } set { _customization_weight = value; } }
         /// <summary>
         /// If true sets `Transfer-Encoding` request header to `chunked` causing the audio to be streamed to the service. By default, audio is sent all at once as a one-shot delivery. See https://console.bluemix.net/docs/services/speech-to-text/input.html#transmission.
         /// </summary>
@@ -665,11 +671,21 @@ private bool CreateListenConnector()
             {
                 Dictionary<string, string> queryParams = new Dictionary<string, string>();
                 if (!string.IsNullOrEmpty(CustomizationId))
+                {
                     queryParams["customization_id"] = CustomizationId;
+                }
+                if (!string.IsNullOrEmpty(LanguageCustomizationId))
+                {
+                    queryParams["language_customization_id"] = LanguageCustomizationId;
+                }
                 if (!string.IsNullOrEmpty(AcousticCustomizationId))
+                {
                     queryParams["acoustic_customization_id"] = AcousticCustomizationId;
-                if (!string.IsNullOrEmpty(CustomizationId))
+                }
+                if (CustomizationWeight != null)
+                {
                     queryParams["customization_weight"] = CustomizationWeight.ToString();
+                }
 
                 string parsedParams = "";
 
@@ -955,12 +971,21 @@ public bool Recognize(SuccessCallback<SpeechRecognitionEvent> successCallback, F
                 return false;
             }
             if (!string.IsNullOrEmpty(AcousticCustomizationId))
+            {
                 req.Parameters["acoustic_customization_id"] = AcousticCustomizationId;
+            }
             if (!string.IsNullOrEmpty(CustomizationId))
             {
                 req.Parameters["customization_id"] = CustomizationId;
+            }
+            if (CustomizationWeight != null)
+            {
                 req.Parameters["customization_weight"] = CustomizationWeight;
             }
+            if (!string.IsNullOrEmpty(LanguageCustomizationId))
+            {
+                req.Parameters["language_customization_id"] = LanguageCustomizationId;
+            }
             req.Parameters["inactivity_timeout"] = InactivityTimeout;
             req.Parameters["keywords"] = string.Join(",", Keywords);
             req.Parameters["keywords_threshold"] = KeywordsThreshold;