Merge branch 'develop' into Models

Author: mediumTaj

Scripts/Connection/RESTConnector.cs

@@ -784,7 +784,7 @@ public IEnumerator Send(string url, Dictionary<string, string> headers)
                     };
                 }
 
-                Success = postReq.responseCode == HTTP_STATUS_OK || postReq.responseCode == HTTP_STATUS_OK || postReq.responseCode == HTTP_STATUS_NO_CONTENT || postReq.responseCode == HTTP_STATUS_ACCEPTED;
+                Success = postReq.responseCode == HTTP_STATUS_OK || postReq.responseCode == HTTP_STATUS_CREATED || postReq.responseCode == HTTP_STATUS_NO_CONTENT || postReq.responseCode == HTTP_STATUS_ACCEPTED;
                 HttpResponseCode = postReq.responseCode;
                 ResponseHeaders = postReq.GetResponseHeaders();
                 Data = postReq.downloadHandler.data;

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; }
+    }
+
+}

…itTests/TestLanguageTranslatorV2.cs.meta …es/Discovery/v1/Models/TokenDict.cs.metaScripts/UnitTests/TestLanguageTranslatorV2.cs.meta renamed to Scripts/Services/Discovery/v1/Models/TokenDict.cs.meta 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; }
+    }
+
+}