ibm_watson 0.20.1 → 1.0.0.rc1

data/lib/ibm_watson/language_translator_v3.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2018 IBM All Rights Reserved.
+# (C) Copyright IBM Corp. 2019.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -71,12 +71,6 @@ module IBMWatson
     #   'https://iam.cloud.ibm.com/identity/token'.
     # @option args iam_client_id [String] An optional client id for the IAM service API.
     # @option args iam_client_secret [String] An optional client secret for the IAM service API.
-    # @option args icp4d_access_token [STRING]  A ICP4D(IBM Cloud Pak for Data) access token is
-    #   fully managed by the application. Responsibility falls on the application to
-    #   refresh the token, either before it expires or reactively upon receiving a 401
-    #   from the service as any requests made with an expired token will fail.
-    # @option args icp4d_url [STRING] In order to use an SDK-managed token with ICP4D authentication, this
-    #   URL must be passed in.
     # @option args authentication_type [STRING] Specifies the authentication pattern to use. Values that it
     #   takes are basic, iam or icp4d.
     def initialize(args = {})
@@ -84,21 +78,14 @@ module IBMWatson
       defaults = {}
       defaults[:version] = nil
       defaults[:url] = "https://gateway.watsonplatform.net/language-translator/api"
-      defaults[:username] = nil
-      defaults[:password] = nil
-      defaults[:iam_apikey] = nil
-      defaults[:iam_access_token] = nil
-      defaults[:iam_url] = nil
-      defaults[:iam_client_id] = nil
-      defaults[:iam_client_secret] = nil
-      defaults[:icp4d_access_token] = nil
-      defaults[:icp4d_url] = nil
+      defaults[:authenticator] = nil
       defaults[:authentication_type] = nil
       args = defaults.merge(args)
-      args[:vcap_services_name] = "language_translator"
+      @version = args[:version]
+      raise ArgumentError.new("version must be provided") if @version.nil?
+
       args[:display_name] = "Language Translator"
       super
-      @version = args[:version]
     end
 
     #########################
@@ -137,6 +124,7 @@ module IBMWatson
 
       method_url = "/v3/translate"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -169,6 +157,7 @@ module IBMWatson
 
       method_url = "/v3/identifiable_languages"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -202,6 +191,7 @@ module IBMWatson
 
       method_url = "/v3/identify"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -217,17 +207,17 @@ module IBMWatson
     #########################
 
     ##
-    # @!method list_models(source: nil, target: nil, default_models: nil)
+    # @!method list_models(source: nil, target: nil, default: nil)
     # List models.
     # Lists available translation models.
     # @param source [String] Specify a language code to filter results by source language.
     # @param target [String] Specify a language code to filter results by target language.
-    # @param default_models [Boolean] If the default parameter isn't specified, the service will return all models
+    # @param default [Boolean] If the default parameter isn't specified, the service will return all models
     #   (default and non-default) for each language pair. To return only default models,
     #   set this to `true`. To return only non-default models, set this to `false`. There
     #   is exactly one default model per language pair, the IBM provided base model.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def list_models(source: nil, target: nil, default_models: nil)
+    def list_models(source: nil, target: nil, default: nil)
       headers = {
       }
       sdk_headers = Common.new.get_sdk_headers("language_translator", "V3", "list_models")
@@ -237,11 +227,12 @@ module IBMWatson
         "version" => @version,
         "source" => source,
         "target" => target,
-        "default" => default_models
+        "default" => default
       }
 
       method_url = "/v3/models"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -318,6 +309,7 @@ module IBMWatson
 
       method_url = "/v3/models"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -349,6 +341,7 @@ module IBMWatson
 
       method_url = "/v3/models/%s" % [ERB::Util.url_encode(model_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "DELETE",
         url: method_url,
@@ -381,6 +374,7 @@ module IBMWatson
 
       method_url = "/v3/models/%s" % [ERB::Util.url_encode(model_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -411,6 +405,7 @@ module IBMWatson
 
       method_url = "/v3/documents"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -444,7 +439,6 @@ module IBMWatson
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def translate_document(file:, filename: nil, file_content_type: nil, model_id: nil, source: nil, target: nil, document_id: nil)
       raise ArgumentError.new("file must be provided") if file.nil?
-      raise ArgumentError.new("filename must be provided") if filename.nil?
 
       headers = {
       }
@@ -473,6 +467,7 @@ module IBMWatson
 
       method_url = "/v3/documents"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -504,6 +499,7 @@ module IBMWatson
 
       method_url = "/v3/documents/%s" % [ERB::Util.url_encode(document_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -534,6 +530,7 @@ module IBMWatson
 
       method_url = "/v3/documents/%s" % [ERB::Util.url_encode(document_id)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,
@@ -578,6 +575,7 @@ module IBMWatson
 
       method_url = "/v3/documents/%s/translated_document" % [ERB::Util.url_encode(document_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,

data/lib/ibm_watson/natural_language_classifier_v1.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2018 IBM All Rights Reserved.
+# (C) Copyright IBM Corp. 2019.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -60,30 +60,15 @@ module IBMWatson
     #   'https://iam.cloud.ibm.com/identity/token'.
     # @option args iam_client_id [String] An optional client id for the IAM service API.
     # @option args iam_client_secret [String] An optional client secret for the IAM service API.
-    # @option args icp4d_access_token [STRING]  A ICP4D(IBM Cloud Pak for Data) access token is
-    #   fully managed by the application. Responsibility falls on the application to
-    #   refresh the token, either before it expires or reactively upon receiving a 401
-    #   from the service as any requests made with an expired token will fail.
-    # @option args icp4d_url [STRING] In order to use an SDK-managed token with ICP4D authentication, this
-    #   URL must be passed in.
     # @option args authentication_type [STRING] Specifies the authentication pattern to use. Values that it
     #   takes are basic, iam or icp4d.
     def initialize(args = {})
       @__async_initialized__ = false
       defaults = {}
       defaults[:url] = "https://gateway.watsonplatform.net/natural-language-classifier/api"
-      defaults[:username] = nil
-      defaults[:password] = nil
-      defaults[:iam_apikey] = nil
-      defaults[:iam_access_token] = nil
-      defaults[:iam_url] = nil
-      defaults[:iam_client_id] = nil
-      defaults[:iam_client_secret] = nil
-      defaults[:icp4d_access_token] = nil
-      defaults[:icp4d_url] = nil
+      defaults[:authenticator] = nil
       defaults[:authentication_type] = nil
       args = defaults.merge(args)
-      args[:vcap_services_name] = "natural_language_classifier"
       args[:display_name] = "Natural Language Classifier"
       super
     end
@@ -116,6 +101,7 @@ module IBMWatson
 
       method_url = "/v1/classifiers/%s/classify" % [ERB::Util.url_encode(classifier_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -152,6 +138,7 @@ module IBMWatson
 
       method_url = "/v1/classifiers/%s/classify_collection" % [ERB::Util.url_encode(classifier_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -166,11 +153,11 @@ module IBMWatson
     #########################
 
     ##
-    # @!method create_classifier(metadata:, training_data:)
+    # @!method create_classifier(training_metadata:, training_data:)
     # Create classifier.
     # Sends data to create and train a classifier and returns information about the new
     #   classifier.
-    # @param metadata [File] Metadata in JSON format. The metadata identifies the language of the data, and an
+    # @param training_metadata [File] Metadata in JSON format. The metadata identifies the language of the data, and an
     #   optional name to identify the classifier. Specify the language with the 2-letter
     #   primary language code as assigned in ISO standard 639.
     #
@@ -181,8 +168,8 @@ module IBMWatson
     #   data can include up to 3,000 classes and 20,000 records. For details, see [Data
     #   preparation](https://cloud.ibm.com/docs/services/natural-language-classifier?topic=natural-language-classifier-using-your-data).
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def create_classifier(metadata:, training_data:)
-      raise ArgumentError.new("metadata must be provided") if metadata.nil?
+    def create_classifier(training_metadata:, training_data:)
+      raise ArgumentError.new("training_metadata must be provided") if training_metadata.nil?
 
       raise ArgumentError.new("training_data must be provided") if training_data.nil?
 
@@ -193,10 +180,10 @@ module IBMWatson
 
       form_data = {}
 
-      unless metadata.instance_of?(StringIO) || metadata.instance_of?(File)
-        metadata = metadata.respond_to?(:to_json) ? StringIO.new(metadata.to_json) : StringIO.new(metadata)
+      unless training_metadata.instance_of?(StringIO) || training_metadata.instance_of?(File)
+        training_metadata = training_metadata.respond_to?(:to_json) ? StringIO.new(training_metadata.to_json) : StringIO.new(training_metadata)
       end
-      form_data[:training_metadata] = HTTP::FormData::File.new(metadata, content_type: "application/json", filename: metadata.respond_to?(:path) ? metadata.path : nil)
+      form_data[:training_metadata] = HTTP::FormData::File.new(training_metadata, content_type: "application/json", filename: training_metadata.respond_to?(:path) ? training_metadata.path : nil)
 
       unless training_data.instance_of?(StringIO) || training_data.instance_of?(File)
         training_data = training_data.respond_to?(:to_json) ? StringIO.new(training_data.to_json) : StringIO.new(training_data)
@@ -205,6 +192,7 @@ module IBMWatson
 
       method_url = "/v1/classifiers"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -228,6 +216,7 @@ module IBMWatson
 
       method_url = "/v1/classifiers"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -253,6 +242,7 @@ module IBMWatson
 
       method_url = "/v1/classifiers/%s" % [ERB::Util.url_encode(classifier_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -277,6 +267,7 @@ module IBMWatson
 
       method_url = "/v1/classifiers/%s" % [ERB::Util.url_encode(classifier_id)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,

data/lib/ibm_watson/natural_language_understanding_v1.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2018 IBM All Rights Reserved.
+# (C) Copyright IBM Corp. 2019.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -88,21 +88,14 @@ module IBMWatson
       defaults = {}
       defaults[:version] = nil
       defaults[:url] = "https://gateway.watsonplatform.net/natural-language-understanding/api"
-      defaults[:username] = nil
-      defaults[:password] = nil
-      defaults[:iam_apikey] = nil
-      defaults[:iam_access_token] = nil
-      defaults[:iam_url] = nil
-      defaults[:iam_client_id] = nil
-      defaults[:iam_client_secret] = nil
-      defaults[:icp4d_access_token] = nil
-      defaults[:icp4d_url] = nil
+      defaults[:authenticator] = nil
       defaults[:authentication_type] = nil
       args = defaults.merge(args)
-      args[:vcap_services_name] = "natural-language-understanding"
+      @version = args[:version]
+      raise ArgumentError.new("version must be provided") if @version.nil?
+
       args[:display_name] = "Natural Language Understanding"
       super
-      @version = args[:version]
     end
 
     #########################
@@ -175,6 +168,7 @@ module IBMWatson
 
       method_url = "/v1/analyze"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -208,6 +202,7 @@ module IBMWatson
 
       method_url = "/v1/models"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -238,6 +233,7 @@ module IBMWatson
 
       method_url = "/v1/models/%s" % [ERB::Util.url_encode(model_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "DELETE",
         url: method_url,

data/lib/ibm_watson/personality_insights_v3.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2018 IBM All Rights Reserved.
+# (C) Copyright IBM Corp. 2019.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -86,12 +86,6 @@ module IBMWatson
     #   'https://iam.cloud.ibm.com/identity/token'.
     # @option args iam_client_id [String] An optional client id for the IAM service API.
     # @option args iam_client_secret [String] An optional client secret for the IAM service API.
-    # @option args icp4d_access_token [STRING]  A ICP4D(IBM Cloud Pak for Data) access token is
-    #   fully managed by the application. Responsibility falls on the application to
-    #   refresh the token, either before it expires or reactively upon receiving a 401
-    #   from the service as any requests made with an expired token will fail.
-    # @option args icp4d_url [STRING] In order to use an SDK-managed token with ICP4D authentication, this
-    #   URL must be passed in.
     # @option args authentication_type [STRING] Specifies the authentication pattern to use. Values that it
     #   takes are basic, iam or icp4d.
     def initialize(args = {})
@@ -99,21 +93,14 @@ module IBMWatson
       defaults = {}
       defaults[:version] = nil
       defaults[:url] = "https://gateway.watsonplatform.net/personality-insights/api"
-      defaults[:username] = nil
-      defaults[:password] = nil
-      defaults[:iam_apikey] = nil
-      defaults[:iam_access_token] = nil
-      defaults[:iam_url] = nil
-      defaults[:iam_client_id] = nil
-      defaults[:iam_client_secret] = nil
-      defaults[:icp4d_access_token] = nil
-      defaults[:icp4d_url] = nil
+      defaults[:authenticator] = nil
       defaults[:authentication_type] = nil
       args = defaults.merge(args)
-      args[:vcap_services_name] = "personality_insights"
+      @version = args[:version]
+      raise ArgumentError.new("version must be provided") if @version.nil?
+
       args[:display_name] = "Personality Insights"
       super
-      @version = args[:version]
     end
 
     #########################
@@ -121,7 +108,7 @@ module IBMWatson
     #########################
 
     ##
-    # @!method profile(content:, accept:, content_language: nil, accept_language: nil, raw_scores: nil, csv_headers: nil, consumption_preferences: nil, content_type: nil)
+    # @!method profile(content:, accept:, content_type: nil, content_language: nil, accept_language: nil, raw_scores: nil, csv_headers: nil, consumption_preferences: nil)
     # Get profile.
     # Generates a personality profile for the author of the input text. The service
     #   accepts a maximum of 20 MB of input content, but it requires much less text to
@@ -172,6 +159,8 @@ module IBMWatson
     #   For JSON input, provide an object of type `Content`.
     # @param accept [String] The type of the response. For more information, see **Accept types** in the method
     #   description.
+    # @param content_type [String] The type of the input. For more information, see **Content types** in the method
+    #   description.
     # @param content_language [String] The language of the input text for the request: Arabic, English, Japanese, Korean,
     #   or Spanish. Regional variants are treated as their parent language; for example,
     #   `en-US` is interpreted as `en`.
@@ -196,19 +185,17 @@ module IBMWatson
     #   (`text/csv`).
     # @param consumption_preferences [Boolean] Indicates whether consumption preferences are returned with the results. By
     #   default, no consumption preferences are returned.
-    # @param content_type [String] The type of the input. For more information, see **Content types** in the method
-    #   description.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def profile(content:, accept:, content_language: nil, accept_language: nil, raw_scores: nil, csv_headers: nil, consumption_preferences: nil, content_type: nil)
+    def profile(content:, accept:, content_type: nil, content_language: nil, accept_language: nil, raw_scores: nil, csv_headers: nil, consumption_preferences: nil)
       raise ArgumentError.new("content must be provided") if content.nil?
 
       raise ArgumentError.new("accept must be provided") if accept.nil?
 
       headers = {
         "Accept" => accept,
+        "Content-Type" => content_type,
         "Content-Language" => content_language,
-        "Accept-Language" => accept_language,
-        "Content-Type" => content_type
+        "Accept-Language" => accept_language
       }
       sdk_headers = Common.new.get_sdk_headers("personality_insights", "V3", "profile")
       headers.merge!(sdk_headers)
@@ -228,6 +215,7 @@ module IBMWatson
 
       method_url = "/v3/profile"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,

data/lib/ibm_watson/speech_to_text_v1.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-# Copyright 2018 IBM All Rights Reserved.
+# (C) Copyright IBM Corp. 2019.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -91,18 +91,9 @@ module IBMWatson
       @__async_initialized__ = false
       defaults = {}
       defaults[:url] = "https://stream.watsonplatform.net/speech-to-text/api"
-      defaults[:username] = nil
-      defaults[:password] = nil
-      defaults[:iam_apikey] = nil
-      defaults[:iam_access_token] = nil
-      defaults[:iam_url] = nil
-      defaults[:iam_client_id] = nil
-      defaults[:iam_client_secret] = nil
-      defaults[:icp4d_access_token] = nil
-      defaults[:icp4d_url] = nil
+      defaults[:authenticator] = nil
       defaults[:authentication_type] = nil
       args = defaults.merge(args)
-      args[:vcap_services_name] = "speech_to_text"
       args[:display_name] = "Speech to Text"
       super
     end
@@ -129,6 +120,7 @@ module IBMWatson
 
       method_url = "/v1/models"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -160,6 +152,7 @@ module IBMWatson
 
       method_url = "/v1/models/%s" % [ERB::Util.url_encode(model_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -173,7 +166,7 @@ module IBMWatson
     #########################
 
     ##
-    # @!method recognize(audio:, model: nil, language_customization_id: nil, acoustic_customization_id: nil, base_model_version: nil, customization_weight: nil, inactivity_timeout: nil, keywords: nil, keywords_threshold: nil, max_alternatives: nil, word_alternatives_threshold: nil, word_confidence: nil, timestamps: nil, profanity_filter: nil, smart_formatting: nil, speaker_labels: nil, customization_id: nil, grammar_name: nil, redaction: nil, audio_metrics: nil, content_type: nil)
+    # @!method recognize(audio:, content_type: nil, model: nil, language_customization_id: nil, acoustic_customization_id: nil, base_model_version: nil, customization_weight: nil, inactivity_timeout: nil, keywords: nil, keywords_threshold: nil, max_alternatives: nil, word_alternatives_threshold: nil, word_confidence: nil, timestamps: nil, profanity_filter: nil, smart_formatting: nil, speaker_labels: nil, customization_id: nil, grammar_name: nil, redaction: nil, audio_metrics: nil)
     # Recognize audio.
     # Sends audio and returns transcription results for a recognition request. You can
     #   pass a maximum of 100 MB and a minimum of 100 bytes of audio with a request. The
@@ -212,7 +205,7 @@ module IBMWatson
     #   * For all other formats, you can omit the `Content-Type` header or specify
     #   `application/octet-stream` with the header to have the service automatically
     #   detect the format of the audio. (With the `curl` command, you can specify either
-    #   `\"Content-Type:\"` or `\"Content-Type: application/octet-stream\"`.)
+    #   `"Content-Type:"` or `"Content-Type: application/octet-stream"`.)
     #
     #   Where indicated, the format that you specify must include the sampling rate and
     #   can optionally include the number of channels and the endianness of the audio.
@@ -262,6 +255,8 @@ module IBMWatson
     #   **See also:** [Making a multipart HTTP
     #   request](https://cloud.ibm.com/docs/services/speech-to-text?topic=speech-to-text-http#HTTP-multi).
     # @param audio [String] The audio to transcribe.
+    # @param content_type [String] The format (MIME type) of the audio. For more information about specifying an
+    #   audio format, see **Audio formats (content types)** in the method description.
     # @param model [String] The identifier of the model that is to be used for the recognition request. See
     #   [Languages and
     #   models](https://cloud.ibm.com/docs/services/speech-to-text?topic=speech-to-text-models#models).
@@ -327,7 +322,7 @@ module IBMWatson
     #   the service uses the default value, `1`. See [Maximum
     #   alternatives](https://cloud.ibm.com/docs/services/speech-to-text?topic=speech-to-text-output#max_alternatives).
     # @param word_alternatives_threshold [Float] A confidence value that is the lower bound for identifying a hypothesis as a
-    #   possible word alternative (also known as \"Confusion Networks\"). An alternative
+    #   possible word alternative (also known as "Confusion Networks"). An alternative
     #   word is considered if its confidence is greater than or equal to the threshold.
     #   Specify a probability between 0.0 and 1.0. By default, the service computes no
     #   alternative words. See [Word
@@ -359,7 +354,8 @@ module IBMWatson
     #   parameter to be `true`, regardless of whether you specify `false` for the
     #   parameter.
     #
-    #   **Note:** Applies to US English, Japanese, and Spanish transcription only. To
+    #   **Note:** Applies to US English, Japanese, and Spanish (both broadband and
+    #   narrowband models) and UK English (narrowband model) transcription only. To
     #   determine whether a language model supports speaker labels, you can also use the
     #   **Get a model** method and check that the attribute `speaker_labels` is set to
     #   `true`.
@@ -393,10 +389,8 @@ module IBMWatson
     # @param audio_metrics [Boolean] If `true`, requests detailed information about the signal characteristics of the
     #   input audio. The service returns audio metrics with the final transcription
     #   results. By default, the service returns no audio metrics.
-    # @param content_type [String] The format (MIME type) of the audio. For more information about specifying an
-    #   audio format, see **Audio formats (content types)** in the method description.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def recognize(audio:, model: nil, language_customization_id: nil, acoustic_customization_id: nil, base_model_version: nil, customization_weight: nil, inactivity_timeout: nil, keywords: nil, keywords_threshold: nil, max_alternatives: nil, word_alternatives_threshold: nil, word_confidence: nil, timestamps: nil, profanity_filter: nil, smart_formatting: nil, speaker_labels: nil, customization_id: nil, grammar_name: nil, redaction: nil, audio_metrics: nil, content_type: nil)
+    def recognize(audio:, content_type: nil, model: nil, language_customization_id: nil, acoustic_customization_id: nil, base_model_version: nil, customization_weight: nil, inactivity_timeout: nil, keywords: nil, keywords_threshold: nil, max_alternatives: nil, word_alternatives_threshold: nil, word_confidence: nil, timestamps: nil, profanity_filter: nil, smart_formatting: nil, speaker_labels: nil, customization_id: nil, grammar_name: nil, redaction: nil, audio_metrics: nil)
       raise ArgumentError.new("audio must be provided") if audio.nil?
 
       headers = {
@@ -432,6 +426,7 @@ module IBMWatson
 
       method_url = "/v1/recognize"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -541,12 +536,7 @@ module IBMWatson
       require_relative("./websocket/speech_to_text_websocket_listener.rb")
       headers = {}
       headers = conn.default_options.headers.to_hash unless conn.default_options.headers.to_hash.empty?
-      if !token_manager.nil?
-        access_token = token_manager.token
-        headers["Authorization"] = "Bearer #{access_token}"
-      elsif !username.nil? && !password.nil?
-        headers["Authorization"] = "Basic " + Base64.strict_encode64("#{username}:#{password}")
-      end
+      headers = authenticator.authenticate(headers)
       url = @url.gsub("https:", "wss:")
       params = {
         "model" => model,
@@ -697,6 +687,7 @@ module IBMWatson
 
       method_url = "/v1/register_callback"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -732,6 +723,7 @@ module IBMWatson
 
       method_url = "/v1/unregister_callback"
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "POST",
         url: method_url,
@@ -743,7 +735,7 @@ module IBMWatson
     end
 
     ##
-    # @!method create_job(audio:, model: nil, callback_url: nil, events: nil, user_token: nil, results_ttl: nil, language_customization_id: nil, acoustic_customization_id: nil, base_model_version: nil, customization_weight: nil, inactivity_timeout: nil, keywords: nil, keywords_threshold: nil, max_alternatives: nil, word_alternatives_threshold: nil, word_confidence: nil, timestamps: nil, profanity_filter: nil, smart_formatting: nil, speaker_labels: nil, customization_id: nil, grammar_name: nil, redaction: nil, audio_metrics: nil, content_type: nil)
+    # @!method create_job(audio:, content_type: nil, model: nil, callback_url: nil, events: nil, user_token: nil, results_ttl: nil, language_customization_id: nil, acoustic_customization_id: nil, base_model_version: nil, customization_weight: nil, inactivity_timeout: nil, keywords: nil, keywords_threshold: nil, max_alternatives: nil, word_alternatives_threshold: nil, word_confidence: nil, timestamps: nil, profanity_filter: nil, smart_formatting: nil, speaker_labels: nil, customization_id: nil, grammar_name: nil, redaction: nil, processing_metrics: nil, processing_metrics_interval: nil, audio_metrics: nil)
     # Create a job.
     # Creates a job for a new asynchronous recognition request. The job is owned by the
     #   instance of the service whose credentials are used to create it. How you learn the
@@ -811,7 +803,7 @@ module IBMWatson
     #   * For all other formats, you can omit the `Content-Type` header or specify
     #   `application/octet-stream` with the header to have the service automatically
     #   detect the format of the audio. (With the `curl` command, you can specify either
-    #   `\"Content-Type:\"` or `\"Content-Type: application/octet-stream\"`.)
+    #   `"Content-Type:"` or `"Content-Type: application/octet-stream"`.)
     #
     #   Where indicated, the format that you specify must include the sampling rate and
     #   can optionally include the number of channels and the endianness of the audio.
@@ -842,6 +834,8 @@ module IBMWatson
     #    **See also:** [Audio
     #   formats](https://cloud.ibm.com/docs/services/speech-to-text?topic=speech-to-text-audio-formats#audio-formats).
     # @param audio [String] The audio to transcribe.
+    # @param content_type [String] The format (MIME type) of the audio. For more information about specifying an
+    #   audio format, see **Audio formats (content types)** in the method description.
     # @param model [String] The identifier of the model that is to be used for the recognition request. See
     #   [Languages and
     #   models](https://cloud.ibm.com/docs/services/speech-to-text?topic=speech-to-text-models#models).
@@ -941,7 +935,7 @@ module IBMWatson
     #   the service uses the default value, `1`. See [Maximum
     #   alternatives](https://cloud.ibm.com/docs/services/speech-to-text?topic=speech-to-text-output#max_alternatives).
     # @param word_alternatives_threshold [Float] A confidence value that is the lower bound for identifying a hypothesis as a
-    #   possible word alternative (also known as \"Confusion Networks\"). An alternative
+    #   possible word alternative (also known as "Confusion Networks"). An alternative
     #   word is considered if its confidence is greater than or equal to the threshold.
     #   Specify a probability between 0.0 and 1.0. By default, the service computes no
     #   alternative words. See [Word
@@ -973,7 +967,8 @@ module IBMWatson
     #   parameter to be `true`, regardless of whether you specify `false` for the
     #   parameter.
     #
-    #   **Note:** Applies to US English, Japanese, and Spanish transcription only. To
+    #   **Note:** Applies to US English, Japanese, and Spanish (both broadband and
+    #   narrowband models) and UK English (narrowband model) transcription only. To
     #   determine whether a language model supports speaker labels, you can also use the
     #   **Get a model** method and check that the attribute `speaker_labels` is set to
     #   `true`.
@@ -1004,7 +999,6 @@ module IBMWatson
     #
     #   See [Numeric
     #   redaction](https://cloud.ibm.com/docs/services/speech-to-text?topic=speech-to-text-output#redaction).
-    #
     # @param processing_metrics [Boolean] If `true`, requests processing metrics about the service's transcription of the
     #   input audio. The service returns processing metrics at the interval specified by
     #   the `processing_metrics_interval` parameter. It also returns processing metrics
@@ -1012,7 +1006,7 @@ module IBMWatson
     #   the service returns no processing metrics.
     # @param processing_metrics_interval [Float] Specifies the interval in real wall-clock seconds at which the service is to
     #   return processing metrics. The parameter is ignored unless the
-    #   `processing_metrics` parameter is set to `true`.    #   The parameter accepts a minimum value of 0.1 seconds. The level of precision is
+    #   `processing_metrics` parameter is set to `true`.
     #
     #   The parameter accepts a minimum value of 0.1 seconds. The level of precision is
     #   not restricted, so you can specify values such as 0.25 and 0.125.
@@ -1024,10 +1018,8 @@ module IBMWatson
     # @param audio_metrics [Boolean] If `true`, requests detailed information about the signal characteristics of the
     #   input audio. The service returns audio metrics with the final transcription
     #   results. By default, the service returns no audio metrics.
-    # @param content_type [String] The format (MIME type) of the audio. For more information about specifying an
-    #   audio format, see **Audio formats (content types)** in the method description.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def create_job(audio:, model: nil, callback_url: nil, events: nil, user_token: nil, results_ttl: nil, language_customization_id: nil, acoustic_customization_id: nil, base_model_version: nil, customization_weight: nil, inactivity_timeout: nil, keywords: nil, keywords_threshold: nil, max_alternatives: nil, word_alternatives_threshold: nil, word_confidence: nil, timestamps: nil, profanity_filter: nil, smart_formatting: nil, speaker_labels: nil, customization_id: nil, grammar_name: nil, redaction: nil, processing_metrics: nil, processing_metrics_interval: nil, audio_metrics: nil, content_type: nil)
+    def create_job(audio:, content_type: nil, model: nil, callback_url: nil, events: nil, user_token: nil, results_ttl: nil, language_customization_id: nil, acoustic_customization_id: nil, base_model_version: nil, customization_weight: nil, inactivity_timeout: nil, keywords: nil, keywords_threshold: nil, max_alternatives: nil, word_alternatives_threshold: nil, word_confidence: nil, timestamps: nil, profanity_filter: nil, smart_formatting: nil, speaker_labels: nil, customization_id: nil, grammar_name: nil, redaction: nil, processing_metrics: nil, processing_metrics_interval: nil, audio_metrics: nil)
       raise ArgumentError.new("audio must be provided") if audio.nil?
 
       headers = {
@@ -1068,6 +1060,7 @@ module IBMWatson
 
       method_url = "/v1/recognitions"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -1102,6 +1095,7 @@ module IBMWatson
 
       method_url = "/v1/recognitions"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -1142,6 +1136,7 @@ module IBMWatson
 
       method_url = "/v1/recognitions/%s" % [ERB::Util.url_encode(id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -1176,6 +1171,7 @@ module IBMWatson
 
       method_url = "/v1/recognitions/%s" % [ERB::Util.url_encode(id)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,
@@ -1211,16 +1207,24 @@ module IBMWatson
     #   to `true`. You can also refer to [Language support for
     #   customization](https://cloud.ibm.com/docs/services/speech-to-text?topic=speech-to-text-customization#languageSupport).
     # @param dialect [String] The dialect of the specified language that is to be used with the custom language
-    #   model. The parameter is meaningful only for Spanish models, for which the service
-    #   creates a custom language model that is suited for speech in one of the following
-    #   dialects:
-    #   * `es-ES` for Castilian Spanish (the default)
-    #   * `es-LA` for Latin American Spanish
-    #   * `es-US` for North American (Mexican) Spanish
-    #
-    #   A specified dialect must be valid for the base model. By default, the dialect
-    #   matches the language of the base model; for example, `en-US` for either of the US
-    #   English language models.
+    #   model. For most languages, the dialect matches the language of the base model by
+    #   default. For example, `en-US` is used for either of the US English language
+    #   models.
+    #
+    #   For a Spanish language, the service creates a custom language model that is suited
+    #   for speech in one of the following dialects:
+    #   * `es-ES` for Castilian Spanish (`es-ES` models)
+    #   * `es-LA` for Latin American Spanish (`es-AR`, `es-CL`, `es-CO`, and `es-PE`
+    #   models)
+    #   * `es-US` for Mexican (North American) Spanish (`es-MX` models)
+    #
+    #   The parameter is meaningful only for Spanish models, for which you can always
+    #   safely omit the parameter to have the service create the correct mapping.
+    #
+    #   If you specify the `dialect` parameter for non-Spanish language models, its value
+    #   must match the language of the base model. If you specify the `dialect` for
+    #   Spanish language models, its value must match one of the defined mappings as
+    #   indicated (`es-ES`, `es-LA`, or `es-MX`). All dialect values are case-insensitive.
     # @param description [String] A description of the new custom language model. Use a localized description that
     #   matches the language of the custom model.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
@@ -1243,6 +1247,7 @@ module IBMWatson
 
       method_url = "/v1/customizations"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -1280,6 +1285,7 @@ module IBMWatson
 
       method_url = "/v1/customizations"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -1312,6 +1318,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s" % [ERB::Util.url_encode(customization_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -1345,6 +1352,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s" % [ERB::Util.url_encode(customization_id)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,
@@ -1433,6 +1441,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s/train" % [ERB::Util.url_encode(customization_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -1469,6 +1478,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s/reset" % [ERB::Util.url_encode(customization_id)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "POST",
         url: method_url,
@@ -1513,6 +1523,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s/upgrade_model" % [ERB::Util.url_encode(customization_id)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "POST",
         url: method_url,
@@ -1549,6 +1560,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s/corpora" % [ERB::Util.url_encode(customization_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -1665,6 +1677,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s/corpora/%s" % [ERB::Util.url_encode(customization_id), ERB::Util.url_encode(corpus_name)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "POST",
         url: method_url,
@@ -1703,6 +1716,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s/corpora/%s" % [ERB::Util.url_encode(customization_id), ERB::Util.url_encode(corpus_name)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -1743,6 +1757,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s/corpora/%s" % [ERB::Util.url_encode(customization_id), ERB::Util.url_encode(corpus_name)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,
@@ -1799,6 +1814,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s/words" % [ERB::Util.url_encode(customization_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -1890,6 +1906,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s/words" % [ERB::Util.url_encode(customization_id)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "POST",
         url: method_url,
@@ -1986,6 +2003,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s/words/%s" % [ERB::Util.url_encode(customization_id), ERB::Util.url_encode(word_name)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "PUT",
         url: method_url,
@@ -2024,6 +2042,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s/words/%s" % [ERB::Util.url_encode(customization_id), ERB::Util.url_encode(word_name)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2065,6 +2084,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s/words/%s" % [ERB::Util.url_encode(customization_id), ERB::Util.url_encode(word_name)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,
@@ -2101,6 +2121,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s/grammars" % [ERB::Util.url_encode(customization_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2212,6 +2233,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s/grammars/%s" % [ERB::Util.url_encode(customization_id), ERB::Util.url_encode(grammar_name)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "POST",
         url: method_url,
@@ -2250,6 +2272,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s/grammars/%s" % [ERB::Util.url_encode(customization_id), ERB::Util.url_encode(grammar_name)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2289,6 +2312,7 @@ module IBMWatson
 
       method_url = "/v1/customizations/%s/grammars/%s" % [ERB::Util.url_encode(customization_id), ERB::Util.url_encode(grammar_name)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,
@@ -2344,6 +2368,7 @@ module IBMWatson
 
       method_url = "/v1/acoustic_customizations"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -2381,6 +2406,7 @@ module IBMWatson
 
       method_url = "/v1/acoustic_customizations"
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2413,6 +2439,7 @@ module IBMWatson
 
       method_url = "/v1/acoustic_customizations/%s" % [ERB::Util.url_encode(customization_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2446,6 +2473,7 @@ module IBMWatson
 
       method_url = "/v1/acoustic_customizations/%s" % [ERB::Util.url_encode(customization_id)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,
@@ -2537,6 +2565,7 @@ module IBMWatson
 
       method_url = "/v1/acoustic_customizations/%s/train" % [ERB::Util.url_encode(customization_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -2575,6 +2604,7 @@ module IBMWatson
 
       method_url = "/v1/acoustic_customizations/%s/reset" % [ERB::Util.url_encode(customization_id)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "POST",
         url: method_url,
@@ -2643,6 +2673,7 @@ module IBMWatson
 
       method_url = "/v1/acoustic_customizations/%s/upgrade_model" % [ERB::Util.url_encode(customization_id)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "POST",
         url: method_url,
@@ -2682,6 +2713,7 @@ module IBMWatson
 
       method_url = "/v1/acoustic_customizations/%s/audio" % [ERB::Util.url_encode(customization_id)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2692,7 +2724,7 @@ module IBMWatson
     end
 
     ##
-    # @!method add_audio(customization_id:, audio_name:, audio_resource:, contained_content_type: nil, allow_overwrite: nil, content_type: nil)
+    # @!method add_audio(customization_id:, audio_name:, audio_resource:, content_type: nil, contained_content_type: nil, allow_overwrite: nil)
     # Add an audio resource.
     # Adds an audio resource to a custom acoustic model. Add audio content that reflects
     #   the acoustic characteristics of the audio that you plan to transcribe. You must
@@ -2816,6 +2848,13 @@ module IBMWatson
     #
     #   With the `curl` command, use the `--data-binary` option to upload the file for the
     #   request.
+    # @param content_type [String] For an audio-type resource, the format (MIME type) of the audio. For more
+    #   information, see **Content types for audio-type resources** in the method
+    #   description.
+    #
+    #   For an archive-type resource, the media type of the archive file. For more
+    #   information, see **Content types for archive-type resources** in the method
+    #   description.
     # @param contained_content_type [String] **For an archive-type resource,** specify the format of the audio files that are
     #   contained in the archive file if they are of type `audio/alaw`, `audio/basic`,
     #   `audio/l16`, or `audio/mulaw`. Include the `rate`, `channels`, and `endianness`
@@ -2835,15 +2874,8 @@ module IBMWatson
     #   the same name. If `false`, the request fails if an audio resource with the same
     #   name already exists. The parameter has no effect if an audio resource with the
     #   same name does not already exist.
-    # @param content_type [String] For an audio-type resource, the format (MIME type) of the audio. For more
-    #   information, see **Content types for audio-type resources** in the method
-    #   description.
-    #
-    #   For an archive-type resource, the media type of the archive file. For more
-    #   information, see **Content types for archive-type resources** in the method
-    #   description.
     # @return [nil]
-    def add_audio(customization_id:, audio_name:, audio_resource:, contained_content_type: nil, allow_overwrite: nil, content_type: nil)
+    def add_audio(customization_id:, audio_name:, audio_resource:, content_type: nil, contained_content_type: nil, allow_overwrite: nil)
       raise ArgumentError.new("customization_id must be provided") if customization_id.nil?
 
       raise ArgumentError.new("audio_name must be provided") if audio_name.nil?
@@ -2851,8 +2883,8 @@ module IBMWatson
       raise ArgumentError.new("audio_resource must be provided") if audio_resource.nil?
 
       headers = {
-        "Contained-Content-Type" => contained_content_type,
-        "Content-Type" => content_type
+        "Content-Type" => content_type,
+        "Contained-Content-Type" => contained_content_type
       }
       sdk_headers = Common.new.get_sdk_headers("speech_to_text", "V1", "add_audio")
       headers.merge!(sdk_headers)
@@ -2865,6 +2897,7 @@ module IBMWatson
 
       method_url = "/v1/acoustic_customizations/%s/audio/%s" % [ERB::Util.url_encode(customization_id), ERB::Util.url_encode(audio_name)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "POST",
         url: method_url,
@@ -2919,6 +2952,7 @@ module IBMWatson
 
       method_url = "/v1/acoustic_customizations/%s/audio/%s" % [ERB::Util.url_encode(customization_id), ERB::Util.url_encode(audio_name)]
 
+      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2960,6 +2994,7 @@ module IBMWatson
 
       method_url = "/v1/acoustic_customizations/%s/audio/%s" % [ERB::Util.url_encode(customization_id), ERB::Util.url_encode(audio_name)]
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,
@@ -3002,6 +3037,7 @@ module IBMWatson
 
       method_url = "/v1/user_data"
 
+      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,