RubyGems - ibm_watson - Versions diffs - 1.0.0.rc2 → 1.0.0.rc3 - Mend

ibm_watson 1.0.0.rc2 → 1.0.0.rc3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (44) hide show

checksums.yaml +4 -4
data/README.md +33 -27
data/lib/ibm_watson/assistant_v1.rb +6 -80
data/lib/ibm_watson/assistant_v2.rb +6 -38
data/lib/ibm_watson/compare_comply_v1.rb +6 -47
data/lib/ibm_watson/discovery_v1.rb +12 -297
data/lib/ibm_watson/language_translator_v3.rb +6 -41
data/lib/ibm_watson/natural_language_classifier_v1.rb +6 -35
data/lib/ibm_watson/natural_language_understanding_v1.rb +6 -38
data/lib/ibm_watson/personality_insights_v3.rb +6 -30
data/lib/ibm_watson/speech_to_text_v1.rb +9 -130
data/lib/ibm_watson/text_to_speech_v1.rb +6 -50
data/lib/ibm_watson/tone_analyzer_v3.rb +6 -31
data/lib/ibm_watson/version.rb +1 -1
data/lib/ibm_watson/visual_recognition_v3.rb +8 -103
data/lib/ibm_watson/websocket/speech_to_text_websocket_listener.rb +5 -5
data/lib/ibm_watson.rb +9 -0
data/test/integration/test_assistant_v1.rb +1 -1
data/test/integration/test_assistant_v2.rb +1 -1
data/test/integration/test_compare_comply_v1.rb +1 -1
data/test/integration/test_discovery_v1.rb +1 -4
data/test/integration/test_language_translator_v3.rb +1 -1
data/test/integration/test_natural_language_classifier_v1.rb +1 -1
data/test/integration/test_natural_language_understanding_v1.rb +1 -1
data/test/integration/test_personality_insights_v3.rb +1 -1
data/test/integration/test_speech_to_text_v1.rb +2 -2
data/test/integration/test_text_to_speech_v1.rb +1 -1
data/test/integration/test_tone_analyzer_v3.rb +1 -1
data/test/integration/test_visual_recognition_v3.rb +1 -8
data/test/unit/test_assistant_v1.rb +45 -45
data/test/unit/test_assistant_v2.rb +3 -3
data/test/unit/test_compare_comply_v1.rb +12 -12
data/test/unit/test_configure_http_client.rb +37 -13
data/test/unit/test_discovery_v1.rb +47 -139
data/test/unit/test_language_translator_v3.rb +13 -26
data/test/unit/test_natural_language_classifier_v1.rb +2 -2
data/test/unit/test_natural_language_understanding_v1.rb +5 -5
data/test/unit/test_personality_insights_v3.rb +8 -8
data/test/unit/test_speech_to_text_v1.rb +21 -21
data/test/unit/test_text_to_speech_v1.rb +5 -5
data/test/unit/test_tone_analyzer_v3.rb +9 -9
data/test/unit/test_vcap_using_personality_insights.rb +8 -8
data/test/unit/test_visual_recognition_v3.rb +8 -75
metadata +4 -4

data/lib/ibm_watson/discovery_v1.rb CHANGED Viewed

@@ -47,50 +47,21 @@ module IBMWatson
     #   Instead, specify a version date that is compatible with your
     #   application, and don't change it until your application is
     #   ready for a later version.
-    # @option args url [String] The base url to use when contacting the service (e.g.
-    #   "https://gateway.watsonplatform.net/discovery/api").
-    #   The base url may differ between IBM Cloud regions.
-    # @option args username [String] The username used to authenticate with the service.
-    #   Username and password credentials are only required to run your
-    #   application locally or outside of IBM Cloud. When running on
-    #   IBM Cloud, the credentials will be automatically loaded from the
-    #   `VCAP_SERVICES` environment variable.
-    # @option args password [String] The password used to authenticate with the service.
-    #   Username and password credentials are only required to run your
-    #   application locally or outside of IBM Cloud. When running on
-    #   IBM Cloud, the credentials will be automatically loaded from the
-    #   `VCAP_SERVICES` environment variable.
-    # @option args iam_apikey [String] An API key that can be used to request IAM tokens. If
-    #   this API key is provided, the SDK will manage the token and handle the
-    #   refreshing.
-    # @option args iam_access_token [String] An IAM 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 iam_url [String] An optional URL for the IAM service API. Defaults to
-    #   '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.
+    # @option args service_url [String] The base service URL to use when contacting the service.
+    #   The base service_url may differ between IBM Cloud regions.
+    # @option args authenticator [Object] The Authenticator instance to be configured for this service.
     def initialize(args = {})
       @__async_initialized__ = false
       defaults = {}
       defaults[:version] = nil
-      defaults[:url] = "https://gateway.watsonplatform.net/discovery/api"
+      defaults[:service_url] = "https://gateway.watsonplatform.net/discovery/api"
       defaults[:authenticator] = nil
-      defaults[:authentication_type] = nil
       args = defaults.merge(args)
       @version = args[:version]
       raise ArgumentError.new("version must be provided") if @version.nil?
-      args[:display_name] = "Discovery"
+      args[:service_name] = "discovery"
+      args[:authenticator] = IBMCloudSdkCore::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: args[:service_name]) if args[:authenticator].nil?
       super
     end
@@ -131,7 +102,6 @@ module IBMWatson
       method_url = "/v1/environments"
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -162,7 +132,6 @@ module IBMWatson
       method_url = "/v1/environments"
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -192,7 +161,6 @@ module IBMWatson
       method_url = "/v1/environments/%s" % [ERB::Util.url_encode(environment_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -235,7 +203,6 @@ module IBMWatson
       method_url = "/v1/environments/%s" % [ERB::Util.url_encode(environment_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "PUT",
         url: method_url,
@@ -266,7 +233,6 @@ module IBMWatson
       method_url = "/v1/environments/%s" % [ERB::Util.url_encode(environment_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "DELETE",
         url: method_url,
@@ -302,7 +268,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/fields" % [ERB::Util.url_encode(environment_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -366,7 +331,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/configurations" % [ERB::Util.url_encode(environment_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -400,7 +364,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/configurations" % [ERB::Util.url_encode(environment_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -433,7 +396,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/configurations/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(configuration_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -494,7 +456,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/configurations/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(configuration_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "PUT",
         url: method_url,
@@ -534,7 +495,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/configurations/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(configuration_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "DELETE",
         url: method_url,
@@ -545,85 +505,6 @@ module IBMWatson
       response
     end
     #########################
-    # Test your configuration on a document
-    #########################
-    ##
-    # @!method test_configuration_in_environment(environment_id:, configuration: nil, file: nil, filename: nil, file_content_type: nil, metadata: nil, step: nil, configuration_id: nil)
-    # Test configuration.
-    # **Deprecated** This method is no longer supported and is scheduled to be removed
-    #   from service on July 31st 2019.
-    #
-    #    Runs a sample document through the default or your configuration and returns
-    #   diagnostic information designed to help you understand how the document was
-    #   processed. The document is not added to the index.
-    # @param environment_id [String] The ID of the environment.
-    # @param configuration [String] The configuration to use to process the document. If this part is provided, then
-    #   the provided configuration is used to process the document. If the
-    #   **configuration_id** is also provided (both are present at the same time), then
-    #   request is rejected. The maximum supported configuration size is 1 MB.
-    #   Configuration parts larger than 1 MB are rejected. See the `GET
-    #   /configurations/{configuration_id}` operation for an example configuration.
-    # @param file [File] The content of the document to ingest. The maximum supported file size when adding
-    #   a file to a collection is 50 megabytes, the maximum supported file size when
-    #   testing a confiruration is 1 megabyte. Files larger than the supported size are
-    #   rejected.
-    # @param filename [String] The filename for file.
-    # @param file_content_type [String] The content type of file.
-    # @param metadata [String] The maximum supported metadata file size is 1 MB. Metadata parts larger than 1 MB
-    #   are rejected. Example:  ``` {
-    #     "Creator": "Johnny Appleseed",
-    #     "Subject": "Apples"
-    #   } ```.
-    # @param step [String] Specify to only run the input document through the given step instead of running
-    #   the input document through the entire ingestion workflow. Valid values are
-    #   `convert`, `enrich`, and `normalize`.
-    # @param configuration_id [String] The ID of the configuration to use to process the document. If the
-    #   **configuration** form part is also provided (both are present at the same time),
-    #   then the request will be rejected.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def test_configuration_in_environment(environment_id:, configuration: nil, file: nil, filename: nil, file_content_type: nil, metadata: nil, step: nil, configuration_id: nil)
-      raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
-      headers = {
-      }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "test_configuration_in_environment")
-      headers.merge!(sdk_headers)
-      params = {
-        "version" => @version,
-        "step" => step,
-        "configuration_id" => configuration_id
-      }
-      form_data = {}
-      form_data[:configuration] = HTTP::FormData::Part.new(configuration.to_s, content_type: "text/plain") unless configuration.nil?
-      unless file.nil?
-        unless file.instance_of?(StringIO) || file.instance_of?(File)
-          file = file.respond_to?(:to_json) ? StringIO.new(file.to_json) : StringIO.new(file)
-        end
-        filename = file.path if filename.nil? && file.respond_to?(:path)
-        form_data[:file] = HTTP::FormData::File.new(file, content_type: file_content_type.nil? ? "application/octet-stream" : file_content_type, filename: filename)
-      end
-      form_data[:metadata] = HTTP::FormData::Part.new(metadata.to_s, content_type: "text/plain") unless metadata.nil?
-      method_url = "/v1/environments/%s/preview" % [ERB::Util.url_encode(environment_id)]
-      headers = authenticator.authenticate(headers)
-      response = request(
-        method: "POST",
-        url: method_url,
-        headers: headers,
-        params: params,
-        form: form_data,
-        accept_json: true
-      )
-      response
-    end
-    #########################
     # Collections
     #########################
@@ -660,7 +541,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections" % [ERB::Util.url_encode(environment_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -694,7 +574,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections" % [ERB::Util.url_encode(environment_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -727,7 +606,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -769,7 +647,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "PUT",
         url: method_url,
@@ -803,7 +680,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "DELETE",
         url: method_url,
@@ -837,7 +713,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/fields" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -875,7 +750,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/expansions" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -933,7 +807,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/expansions" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -969,7 +842,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/expansions" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,
@@ -1004,7 +876,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/word_lists/tokenization_dictionary" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -1045,7 +916,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/word_lists/tokenization_dictionary" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -1080,7 +950,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/word_lists/tokenization_dictionary" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,
@@ -1114,7 +983,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/word_lists/stopwords" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -1160,7 +1028,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/word_lists/stopwords" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -1196,7 +1063,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/word_lists/stopwords" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,
@@ -1283,7 +1149,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/documents" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -1324,7 +1189,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/documents/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(document_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -1388,7 +1252,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/documents/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(document_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -1428,7 +1291,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/documents/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(document_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "DELETE",
         url: method_url,
@@ -1443,7 +1305,7 @@ module IBMWatson
     #########################
     ##
-    # @!method query(environment_id:, collection_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, _return: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate: nil, deduplicate_field: nil, collection_ids: nil, similar: nil, similar_document_ids: nil, similar_fields: nil, bias: nil, x_watson_logging_opt_out: nil)
+    # @!method query(environment_id:, collection_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, _return: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate: nil, deduplicate_field: nil, similar: nil, similar_document_ids: nil, similar_fields: nil, bias: nil, x_watson_logging_opt_out: nil)
     # Query a collection.
     # By using this method, you can construct long queries. For details, see the
     #   [Discovery
@@ -1485,8 +1347,6 @@ module IBMWatson
     # @param deduplicate_field [String] When specified, duplicate results based on the field specified are removed from
     #   the returned results. Duplicate comparison is limited to the current query only,
     #   **offset** is not considered. This parameter is currently Beta functionality.
-    # @param collection_ids [String] A comma-separated list of collection IDs to be queried against. Required when
-    #   querying multiple collections, invalid when performing a single collection query.
     # @param similar [Boolean] When `true`, results are returned based on their similarity to the document IDs
     #   specified in the **similar.document_ids** parameter.
     # @param similar_document_ids [String] A comma-separated list of document IDs to find similar documents.
@@ -1506,7 +1366,7 @@ module IBMWatson
     #   parameter.
     # @param x_watson_logging_opt_out [Boolean] If `true`, queries are not stored in the Discovery **Logs** endpoint.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def query(environment_id:, collection_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, _return: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate: nil, deduplicate_field: nil, collection_ids: nil, similar: nil, similar_document_ids: nil, similar_fields: nil, bias: nil, x_watson_logging_opt_out: nil)
+    def query(environment_id:, collection_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, _return: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate: nil, deduplicate_field: nil, similar: nil, similar_document_ids: nil, similar_fields: nil, bias: nil, x_watson_logging_opt_out: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
@@ -1537,7 +1397,6 @@ module IBMWatson
         "passages.characters" => passages_characters,
         "deduplicate" => deduplicate,
         "deduplicate.field" => deduplicate_field,
-        "collection_ids" => collection_ids,
         "similar" => similar,
         "similar.document_ids" => similar_document_ids,
         "similar.fields" => similar_fields,
@@ -1546,7 +1405,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/query" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -1644,7 +1502,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/notices" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -1656,12 +1513,13 @@ module IBMWatson
     end
     ##
-    # @!method federated_query(environment_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, _return: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate: nil, deduplicate_field: nil, collection_ids: nil, similar: nil, similar_document_ids: nil, similar_fields: nil, bias: nil, x_watson_logging_opt_out: nil)
+    # @!method federated_query(environment_id:, collection_ids:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, _return: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate: nil, deduplicate_field: nil, similar: nil, similar_document_ids: nil, similar_fields: nil, bias: nil, x_watson_logging_opt_out: nil)
     # Query multiple collections.
     # By using this method, you can construct long queries that search multiple
     #   collection. For details, see the [Discovery
     #   documentation](https://cloud.ibm.com/docs/services/discovery?topic=discovery-query-concepts#query-concepts).
     # @param environment_id [String] The ID of the environment.
+    # @param collection_ids [String] A comma-separated list of collection IDs to be queried against.
     # @param filter [String] A cacheable query that excludes documents that don't mention the query content.
     #   Filter searches are better for metadata-type searches and for assessing the
     #   concepts in the data set.
@@ -1697,8 +1555,6 @@ module IBMWatson
     # @param deduplicate_field [String] When specified, duplicate results based on the field specified are removed from
     #   the returned results. Duplicate comparison is limited to the current query only,
     #   **offset** is not considered. This parameter is currently Beta functionality.
-    # @param collection_ids [String] A comma-separated list of collection IDs to be queried against. Required when
-    #   querying multiple collections, invalid when performing a single collection query.
     # @param similar [Boolean] When `true`, results are returned based on their similarity to the document IDs
     #   specified in the **similar.document_ids** parameter.
     # @param similar_document_ids [String] A comma-separated list of document IDs to find similar documents.
@@ -1718,7 +1574,7 @@ module IBMWatson
     #   parameter.
     # @param x_watson_logging_opt_out [Boolean] If `true`, queries are not stored in the Discovery **Logs** endpoint.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def federated_query(environment_id:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, _return: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate: nil, deduplicate_field: nil, collection_ids: nil, similar: nil, similar_document_ids: nil, similar_fields: nil, bias: nil, x_watson_logging_opt_out: nil)
+    def federated_query(environment_id:, collection_ids:, filter: nil, query: nil, natural_language_query: nil, passages: nil, aggregation: nil, count: nil, _return: nil, offset: nil, sort: nil, highlight: nil, passages_fields: nil, passages_count: nil, passages_characters: nil, deduplicate: nil, deduplicate_field: nil, similar: nil, similar_document_ids: nil, similar_fields: nil, bias: nil, x_watson_logging_opt_out: nil)
       raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
       headers = {
@@ -1732,6 +1588,7 @@ module IBMWatson
       }
       data = {
+        "collection_ids" => collection_ids,
         "filter" => filter,
         "query" => query,
         "natural_language_query" => natural_language_query,
@@ -1747,7 +1604,6 @@ module IBMWatson
         "passages.characters" => passages_characters,
         "deduplicate" => deduplicate,
         "deduplicate.field" => deduplicate_field,
-        "collection_ids" => collection_ids,
         "similar" => similar,
         "similar.document_ids" => similar_document_ids,
         "similar.fields" => similar_fields,
@@ -1756,7 +1612,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/query" % [ERB::Util.url_encode(environment_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -1845,7 +1700,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/notices" % [ERB::Util.url_encode(environment_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -1855,118 +1709,6 @@ module IBMWatson
       )
       response
     end
-    ##
-    # @!method query_entities(environment_id:, collection_id:, feature: nil, entity: nil, context: nil, count: nil, evidence_count: nil)
-    # Knowledge Graph entity query.
-    # See the [Knowledge Graph
-    #   documentation](https://cloud.ibm.com/docs/services/discovery?topic=discovery-kg#kg)
-    #   for more details.
-    # @param environment_id [String] The ID of the environment.
-    # @param collection_id [String] The ID of the collection.
-    # @param feature [String] The entity query feature to perform. Supported features are `disambiguate` and
-    #   `similar_entities`.
-    # @param entity [QueryEntitiesEntity] A text string that appears within the entity text field.
-    # @param context [QueryEntitiesContext] Entity text to provide context for the queried entity and rank based on that
-    #   association. For example, if you wanted to query the city of London in England
-    #   your query would look for `London` with the context of `England`.
-    # @param count [Fixnum] The number of results to return. The default is `10`. The maximum is `1000`.
-    # @param evidence_count [Fixnum] The number of evidence items to return for each result. The default is `0`. The
-    #   maximum number of evidence items per query is 10,000.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def query_entities(environment_id:, collection_id:, feature: nil, entity: nil, context: nil, count: nil, evidence_count: nil)
-      raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
-      raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
-      headers = {
-      }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "query_entities")
-      headers.merge!(sdk_headers)
-      params = {
-        "version" => @version
-      }
-      data = {
-        "feature" => feature,
-        "entity" => entity,
-        "context" => context,
-        "count" => count,
-        "evidence_count" => evidence_count
-      }
-      method_url = "/v1/environments/%s/collections/%s/query_entities" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
-      response = request(
-        method: "POST",
-        url: method_url,
-        headers: headers,
-        params: params,
-        json: data,
-        accept_json: true
-      )
-      response
-    end
-    ##
-    # @!method query_relations(environment_id:, collection_id:, entities: nil, context: nil, sort: nil, filter: nil, count: nil, evidence_count: nil)
-    # Knowledge Graph relationship query.
-    # See the [Knowledge Graph
-    #   documentation](https://cloud.ibm.com/docs/services/discovery?topic=discovery-kg#kg)
-    #   for more details.
-    # @param environment_id [String] The ID of the environment.
-    # @param collection_id [String] The ID of the collection.
-    # @param entities [Array[QueryRelationsEntity]] An array of entities to find relationships for.
-    # @param context [QueryEntitiesContext] Entity text to provide context for the queried entity and rank based on that
-    #   association. For example, if you wanted to query the city of London in England
-    #   your query would look for `London` with the context of `England`.
-    # @param sort [String] The sorting method for the relationships, can be `score` or `frequency`.
-    #   `frequency` is the number of unique times each entity is identified. The default
-    #   is `score`. This parameter cannot be used in the same query as the **bias**
-    #   parameter.
-    # @param filter [QueryRelationsFilter]
-    # @param count [Fixnum] The number of results to return. The default is `10`. The maximum is `1000`.
-    # @param evidence_count [Fixnum] The number of evidence items to return for each result. The default is `0`. The
-    #   maximum number of evidence items per query is 10,000.
-    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
-    def query_relations(environment_id:, collection_id:, entities: nil, context: nil, sort: nil, filter: nil, count: nil, evidence_count: nil)
-      raise ArgumentError.new("environment_id must be provided") if environment_id.nil?
-      raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
-      headers = {
-      }
-      sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "query_relations")
-      headers.merge!(sdk_headers)
-      params = {
-        "version" => @version
-      }
-      data = {
-        "entities" => entities,
-        "context" => context,
-        "sort" => sort,
-        "filter" => filter,
-        "count" => count,
-        "evidence_count" => evidence_count
-      }
-      method_url = "/v1/environments/%s/collections/%s/query_relations" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
-      response = request(
-        method: "POST",
-        url: method_url,
-        headers: headers,
-        params: params,
-        json: data,
-        accept_json: true
-      )
-      response
-    end
     #########################
     # Training data
     #########################
@@ -1994,7 +1736,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/training_data" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2039,7 +1780,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/training_data" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -2074,7 +1814,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/training_data" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
-      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,
@@ -2112,7 +1851,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/training_data/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2150,7 +1888,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/training_data/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id)]
-      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,
@@ -2187,7 +1924,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/training_data/%s/examples" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2233,7 +1969,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/training_data/%s/examples" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -2274,7 +2009,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/training_data/%s/examples/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id), ERB::Util.url_encode(example_id)]
-      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,
@@ -2321,7 +2055,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/training_data/%s/examples/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id), ERB::Util.url_encode(example_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "PUT",
         url: method_url,
@@ -2362,7 +2095,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/collections/%s/training_data/%s/examples/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id), ERB::Util.url_encode(query_id), ERB::Util.url_encode(example_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2403,7 +2135,6 @@ module IBMWatson
       method_url = "/v1/user_data"
-      headers = authenticator.authenticate(headers)
       request(
         method: "DELETE",
         url: method_url,
@@ -2447,7 +2178,6 @@ module IBMWatson
       method_url = "/v1/events"
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -2497,7 +2227,6 @@ module IBMWatson
       method_url = "/v1/logs"
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2534,7 +2263,6 @@ module IBMWatson
       method_url = "/v1/metrics/number_of_queries"
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2572,7 +2300,6 @@ module IBMWatson
       method_url = "/v1/metrics/number_of_queries_with_event"
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2609,7 +2336,6 @@ module IBMWatson
       method_url = "/v1/metrics/number_of_queries_with_no_search_results"
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2647,7 +2373,6 @@ module IBMWatson
       method_url = "/v1/metrics/event_rate"
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2681,7 +2406,6 @@ module IBMWatson
       method_url = "/v1/metrics/top_query_tokens_with_event_rate"
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2718,7 +2442,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/credentials" % [ERB::Util.url_encode(environment_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2775,7 +2498,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/credentials" % [ERB::Util.url_encode(environment_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -2813,7 +2535,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/credentials/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(credential_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2872,7 +2593,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/credentials/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(credential_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "PUT",
         url: method_url,
@@ -2907,7 +2627,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/credentials/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(credential_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "DELETE",
         url: method_url,
@@ -2941,7 +2660,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/gateways" % [ERB::Util.url_encode(environment_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -2977,7 +2695,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/gateways" % [ERB::Util.url_encode(environment_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "POST",
         url: method_url,
@@ -3012,7 +2729,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/gateways/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(gateway_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "GET",
         url: method_url,
@@ -3046,7 +2762,6 @@ module IBMWatson
       method_url = "/v1/environments/%s/gateways/%s" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(gateway_id)]
-      headers = authenticator.authenticate(headers)
       response = request(
         method: "DELETE",
         url: method_url,