ibm_watson 1.0.0 → 1.1.0

data/lib/ibm_watson/speech_to_text_v1.rb

@@ -1104,6 +1104,11 @@ module IBMWatson
     #   model is owned by the instance of the service whose credentials are used to create
     #   it.
     #
+    #   You can create a maximum of 1024 custom language models, per credential. The
+    #   service returns an error if you attempt to create more than 1024 models. You do
+    #   not lose any models, but you cannot create any more until your model count is
+    #   below the limit.
+    #
     #   **See also:** [Create a custom language
     #   model](https://cloud.ibm.com/docs/services/speech-to-text?topic=speech-to-text-languageCreate#createModel-language).
     # @param name [String] A user-defined name for the new custom language model. Use a name that is unique
@@ -2225,6 +2230,11 @@ module IBMWatson
     #   model is owned by the instance of the service whose credentials are used to create
     #   it.
     #
+    #   You can create a maximum of 1024 custom acoustic models, per credential. The
+    #   service returns an error if you attempt to create more than 1024 models. You do
+    #   not lose any models, but you cannot create any more until your model count is
+    #   below the limit.
+    #
     #   **See also:** [Create a custom acoustic
     #   model](https://cloud.ibm.com/docs/services/speech-to-text?topic=speech-to-text-acoustic#createModel-acoustic).
     # @param name [String] A user-defined name for the new custom acoustic model. Use a name that is unique

data/lib/ibm_watson/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IBMWatson
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/lib/ibm_watson/visual_recognition_v4.rb

@@ -16,11 +16,6 @@
 
 # Provide images to the IBM Watson™ Visual Recognition service for analysis. The
 # service detects objects based on a set of images with training data.
-#
-# **Beta:** The Visual Recognition v4 API and Object Detection model are beta features.
-# For more information about beta features, see the [Release
-# notes](https://cloud.ibm.com/docs/services/visual-recognition?topic=visual-recognition-release-notes#beta).
-# {: important}
 
 require "concurrent"
 require "erb"
@@ -503,7 +498,9 @@ module IBMWatson
     # Download a JPEG representation of an image.
     # @param collection_id [String] The identifier of the collection.
     # @param image_id [String] The identifier of the image.
-    # @param size [String] Specify the image size.
+    # @param size [String] The image size. Specify `thumbnail` to return a version that maintains the
+    #   original aspect ratio but is no larger than 200 pixels in the larger dimension.
+    #   For example, an original 800 x 1000 image is resized to 160 x 200 pixels.
     # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def get_jpeg_image(collection_id:, image_id:, size: nil)
       raise ArgumentError.new("collection_id must be provided") if collection_id.nil?
@@ -614,6 +611,42 @@ module IBMWatson
       )
       response
     end
+
+    ##
+    # @!method get_training_usage(start_time: nil, end_time: nil)
+    # Get training usage.
+    # Information about the completed training events. You can use this information to
+    #   determine how close you are to the training limits for the month.
+    # @param start_time [String] The earliest day to include training events. Specify dates in YYYY-MM-DD format.
+    #   If empty or not specified, the earliest training event is included.
+    # @param end_time [String] The most recent day to include training events. Specify dates in YYYY-MM-DD
+    #   format. All events for the day are included. If empty or not specified, the
+    #   current day is used. Specify the same value as `start_time` to request events for
+    #   a single day.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
+    def get_training_usage(start_time: nil, end_time: nil)
+      headers = {
+      }
+      sdk_headers = Common.new.get_sdk_headers("watson_vision_combined", "V4", "get_training_usage")
+      headers.merge!(sdk_headers)
+
+      params = {
+        "version" => @version,
+        "start_time" => start_time,
+        "end_time" => end_time
+      }
+
+      method_url = "/v4/training_usage"
+
+      response = request(
+        method: "GET",
+        url: method_url,
+        headers: headers,
+        params: params,
+        accept_json: true
+      )
+      response
+    end
     #########################
     # User data
     #########################

data/test/integration/test_assistant_v1.rb

@@ -11,10 +11,8 @@ if !ENV["ASSISTANT_APIKEY"].nil? && !ENV["ASSISTANT_URL"].nil?
     include Minitest::Hooks
     attr_accessor :service
     def before_all
-      authenticator = IBMWatson::Authenticators::IamAuthenticator.new(
-        apikey: ENV["ASSISTANT_APIKEY"],
-        version: "2018-02-16"
-      )
+      puts "before"
+      authenticator = IBMWatson::Authenticators::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "assistant")
       @service = IBMWatson::AssistantV1.new(
         version: "2018-02-16",
         url: ENV["ASSISTANT_URL"],

data/test/integration/test_compare_comply_v1.rb

@@ -12,7 +12,7 @@ if !ENV["COMPARE_COMPLY_APIKEY"].nil?
 
     def before_all
       authenticator = IBMWatson::Authenticators::IamAuthenticator.new(
-        apikey: ENV["ASSISTANT_APIKEY"]
+        apikey: ENV["COMPARE_COMPLY_APIKEY"]
       )
       @service = IBMWatson::CompareComplyV1.new(
         version: "2018-10-15",

data/test/integration/test_discovery_v2.rb

@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+require_relative("./../test_helper.rb")
+require("minitest/hooks/test")
+
+if !ENV["DISCOVERY_V2_TOKEN"].nil?
+  # Integration tests for the Discovery V2 Service
+  class DiscoveryV2Test < Minitest::Test
+    include Minitest::Hooks
+    attr_accessor :service, :environment_id, :collection_id
+
+    def before_all
+      token = ENV["DISCOVERY_V2_TOKEN"]
+      authenticator = IBMWatson::Authenticators::BearerTokenAuthenticator.new(
+        bearer_token: token
+      )
+      @service = IBMWatson::DiscoveryV2.new(
+        authenticator: authenticator,
+        version: "2019-11-21"
+      )
+      @service.service_url = ENV["DISCOVERY_V2_URL"]
+      @service.configure_http_client(disable_ssl_verification: true)
+      @project_id = ENV["DISCOVERY_V2_PROJECT_ID"]
+      @collection_id = ENV["DISCOVERY_V2_COLLECTION_ID"]
+      @document_id = nil
+      @service.add_default_headers(
+        headers: {
+          "X-Watson-Learning-Opt-Out" => "1",
+          "X-Watson-Test" => "1"
+        }
+      )
+    end
+
+    def test_collections
+      service_response = service.list_collections(
+        project_id: @project_id
+      )
+      puts service_response.result
+      refute(service_response.result["collections"].nil?)
+    end
+
+    def test_query
+      service_response = service.query(
+        project_id: @project_id,
+        count: 10
+      )
+      refute(service_response.result["results"].nil?)
+    end
+
+    def test_get_autocompletion
+      service_response = service.get_autocompletion(
+        project_id: @project_id,
+        prefix: "hi how are "
+      )
+      refute(service_response.result["completions"].nil?)
+    end
+
+    def test_query_notices
+      service_response = service.query_notices(
+        project_id: @project_id
+      )
+      refute(service_response.result.nil?)
+    end
+
+    def test_list_fields
+      service_response = service.list_fields(
+        project_id: @project_id,
+        collection_ids: [@collection_id]
+      )
+      refute(service_response.result.nil?)
+    end
+
+    def test_get_component_settings
+      service_response = service.get_component_settings(
+        project_id: @project_id
+      )
+      refute(service_response.result.nil?)
+    end
+
+    def test_add_update_delete_document
+      File.open(Dir.getwd + "/resources/simple.html") do |file_info|
+        service_response = service.add_document(
+          project_id: @project_id,
+          collection_id: @collection_id,
+          file: file_info
+        )
+        refute(service_response.nil?)
+        @document_id = service_response.result["document_id"]
+      end
+      return if @document_id.nil?
+
+      service_response = service.update_document(
+        project_id: @project_id,
+        collection_id: @collection_id,
+        document_id: @document_id,
+        file: "file",
+        filename: "file.name"
+      )
+      refute(service_response.result.nil?)
+      service.delete_document(
+        project_id: @project_id,
+        collection_id: @collection_id,
+        document_id: @document_id
+      )
+    end
+
+    def test_list_training_queries
+      service_response = service.list_training_queries(
+        project_id: @project_id
+      )
+      refute(service_response.nil?)
+    end
+
+    def test_create_get_update_training_query
+      service_response = service.create_training_query(
+        project_id: @project_id,
+        natural_language_query: "How is the weather today?",
+        examples: []
+      )
+      query_id = service_response.result["query_id"]
+      refute(service_response.nil?)
+
+      service_response = service.get_training_query(
+        project_id: @project_id,
+        query_id: query_id
+      )
+      refute(service_response.nil?)
+
+      service_response = service.update_training_query(
+        project_id: @project_id,
+        query_id: query_id,
+        natural_language_query: "How is the weather tomorrow?",
+        examples: []
+      )
+      refute(service_response.nil?)
+    end
+  end
+else
+  class DiscoveryV2Test < Minitest::Test
+    def test_missing_credentials_skip_integration
+      skip "Skip discovery integration tests because credentials have not been provided"
+    end
+  end
+end

data/test/unit/test_assistant_v1.rb

@@ -10,6 +10,16 @@ WebMock.disable_net_connect!(allow_localhost: true)
 
 # Unit tests for the Watson Assistant V1 Service
 class AssistantV1Test < Minitest::Test
+  include Minitest::Hooks
+  attr_accessor :service
+  def before_all
+    authenticator = IBMWatson::Authenticators::NoAuthAuthenticator.new
+    @service = IBMWatson::AssistantV1.new(
+      version: "2018-02-16",
+      authenticator: authenticator
+    )
+  end
+
   def test_plain_to_json
     response = {
       "text" => "I want financial advice today.",
@@ -24,19 +34,10 @@ class AssistantV1Test < Minitest::Test
         body: "{\"text\":\"I want financial advice today.\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.create_counterexample(
       workspace_id: "boguswid",
       text: "I want financial advice today."
@@ -58,19 +59,10 @@ class AssistantV1Test < Minitest::Test
         body: "{\"text\":\"I want financial advice today.\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.create_counterexample(
       workspace_id: "boguswid",
       text: "I want financial advice today."
@@ -93,19 +85,10 @@ class AssistantV1Test < Minitest::Test
         body: "{\"text\":\"I want financial advice today.\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 429, body: error_response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     begin
       service.create_counterexample(
         workspace_id: "boguswid",
@@ -133,19 +116,10 @@ class AssistantV1Test < Minitest::Test
         body: "{\"text\":\"I want financial advice today.\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 407, body: error_response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     begin
       service.create_counterexample(
         workspace_id: "boguswid",
@@ -165,18 +139,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: {}.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.delete_counterexample(
       workspace_id: "boguswid",
       text: "I want financial advice today"
@@ -197,18 +162,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.get_counterexample(
       workspace_id: "boguswid",
       text: "What are you wearing?"
@@ -241,18 +197,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.list_counterexamples(
       workspace_id: "boguswid"
     )
@@ -273,19 +220,10 @@ class AssistantV1Test < Minitest::Test
         body: "{\"text\":\"What are you wearing?\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.update_counterexample(
       workspace_id: "boguswid",
       text: "What are you wearing?",
@@ -312,19 +250,10 @@ class AssistantV1Test < Minitest::Test
         body: "{\"entity\":\"pizza_toppings\",\"description\":\"Tasty pizza toppings\",\"metadata\":{\"property\":\"value\"}}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.create_entity(
       workspace_id: "boguswid",
       entity: "pizza_toppings",
@@ -344,18 +273,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "{}", headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.delete_entity(
       workspace_id: "boguswid",
       entity: "pizza_toppings"
@@ -380,18 +300,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.get_entity(
       workspace_id: "boguswid",
       entity: "pizza_toppings",
@@ -427,18 +338,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.list_entities(
       workspace_id: "boguswid",
       export: true
@@ -464,19 +366,10 @@ class AssistantV1Test < Minitest::Test
         body: "{\"entity\":\"pizza_toppings\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.update_entity(
       workspace_id: "boguswid",
       entity: "pizza_toppings",
@@ -499,19 +392,10 @@ class AssistantV1Test < Minitest::Test
         body: "{\"text\":\"Gimme a pizza with pepperoni\",\"mentions\":[{\"mentioned\":\"yes\"}]}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.create_example(
       workspace_id: "boguswid",
       intent: "pizza_order",
@@ -529,18 +413,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "{}", headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.delete_example(
       workspace_id: "boguswid",
       intent: "pizza_order",
@@ -562,18 +437,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.get_example(
       workspace_id: "boguswid",
       intent: "pizza_order",
@@ -607,18 +473,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.list_examples(
       workspace_id: "boguswid",
       intent: "pizza_order"
@@ -640,19 +497,10 @@ class AssistantV1Test < Minitest::Test
         body: "{\"text\":\"Gimme a pizza with pepperoni\",\"mentions\":[{\"mentioned\":\"yes\"}]}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.update_example(
       workspace_id: "boguswid",
       intent: "pizza_order",
@@ -678,19 +526,10 @@ class AssistantV1Test < Minitest::Test
         body: "{\"intent\":\"pizza_order\",\"description\":\"User wants to start a new pizza order\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.create_intent(
       workspace_id: "boguswid",
       intent: "pizza_order",
@@ -707,18 +546,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "{}", headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.delete_intent(
       workspace_id: "boguswid",
       intent: "pizza_order"
@@ -740,18 +570,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.get_intent(
       workspace_id: "boguswid",
       intent: "pizza_order",
@@ -782,18 +603,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.list_intents(
       workspace_id: "boguswid",
       export: false
@@ -816,7 +628,6 @@ class AssistantV1Test < Minitest::Test
         body: "{\"intent\":\"pizza_order\",\"description\":\"User wants to start a new pizza order\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
@@ -897,18 +708,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.list_logs(
       workspace_id: "boguswid"
     )
@@ -982,18 +784,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.list_all_logs(
       filter: "language::en,request.context.metadata.deployment::deployment_1"
     )
@@ -1001,14 +794,6 @@ class AssistantV1Test < Minitest::Test
   end
 
   def test_message
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     # service.set_default_headers("x-watson-learning-opt-out" => true)
     workspace_id = "f8fdbc65-e0bd-4e43-b9f8-2975a366d4ec"
     message_response = {
@@ -1036,7 +821,6 @@ class AssistantV1Test < Minitest::Test
         body: "{\"input\":{\"text\":\"Turn on the lights\"}}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
@@ -1063,7 +847,6 @@ class AssistantV1Test < Minitest::Test
         body: "{\"input\":{\"text\":\"Turn on the lights\"},\"context\":\"{\\\"conversation_id\\\":\\\"1b7b67c0-90ed-45dc-8508-9488bc483d5b\\\",\\\"system\\\":{\\\"dialog_stack\\\":[\\\"root\\\"],\\\"dialog_turn_counter\\\":2,\\\"dialog_request_counter\\\":1}}\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
@@ -1090,19 +873,10 @@ class AssistantV1Test < Minitest::Test
         body: "{\"synonym\":\"a\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.create_synonym(
       workspace_id: "boguswid",
       entity: "aeiou",
@@ -1120,18 +894,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "", headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.delete_synonym(
       workspace_id: "boguswid",
       entity: "aeiou",
@@ -1154,18 +919,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.get_synonym(
       workspace_id: "boguswid",
       entity: "grilling",
@@ -1203,18 +959,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.list_synonyms(
       workspace_id: "boguswid",
       entity: "grilling",
@@ -1237,19 +984,10 @@ class AssistantV1Test < Minitest::Test
         body: "{\"synonym\":\"barbecue\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.update_synonym(
       workspace_id: "boguswid",
       entity: "grilling",
@@ -1276,19 +1014,10 @@ class AssistantV1Test < Minitest::Test
         body: "{\"value\":\"aeiou\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.create_value(
       workspace_id: "boguswid",
       entity: "grilling",
@@ -1305,18 +1034,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "", headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.delete_value(
       workspace_id: "boguswid",
       entity: "grilling",
@@ -1342,18 +1062,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.get_value(
       workspace_id: "boguswid",
       entity: "grilling",
@@ -1390,18 +1101,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.list_values(
       workspace_id: "boguswid",
       entity: "grilling",
@@ -1428,19 +1130,10 @@ class AssistantV1Test < Minitest::Test
         body: "{\"value\":\"BBQ sauce\",\"metadata\":{\"code\":1422}}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.update_value(
       workspace_id: "boguswid",
       entity: "grilling",
@@ -1467,28 +1160,20 @@ class AssistantV1Test < Minitest::Test
     }
     stub_request(:post, "https://gateway.watsonplatform.net/assistant/api/v1/workspaces?version=2018-02-16")
       .with(
-        body: "{\"name\":\"Pizza app\",\"description\":\"Pizza app\",\"language\":\"en\",\"metadata\":{},\"system_settings\":{\"system_settings\":\"yes\"}}",
+        body: "{\"name\":\"Pizza app\",\"description\":\"Pizza app\",\"language\":\"en\",\"metadata\":{},\"system_settings\":{\"system_settings\":\"yes\"},\"webhooks\":[]}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 201, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.create_workspace(
       name: "Pizza app",
       description: "Pizza app",
       language: "en",
       metadata: {},
-      system_settings: { "system_settings" => "yes" }
+      system_settings: { "system_settings" => "yes" },
+      webhooks: []
     )
     assert_equal(response, service_response.result)
   end
@@ -1501,18 +1186,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "", headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.delete_workspace(
       workspace_id: "boguswid"
     )
@@ -1538,18 +1214,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.get_workspace(
       workspace_id: "boguswid",
       export: false
@@ -1582,18 +1249,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.list_workspaces
     assert_equal(response, service_response.result)
   end
@@ -1616,19 +1274,10 @@ class AssistantV1Test < Minitest::Test
         body: "{\"name\":\"Pizza app\",\"description\":\"Pizza app\",\"language\":\"en\",\"metadata\":{},\"system_settings\":{\"system_settings\":\"yes\"}}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.update_workspace(
       workspace_id: "pizza_app-e0f3",
       name: "Pizza app",
@@ -1641,14 +1290,6 @@ class AssistantV1Test < Minitest::Test
   end
 
   def test_dialog_nodes
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     headers = {
       "Content-Type" => "application/json"
     }
@@ -1658,7 +1299,6 @@ class AssistantV1Test < Minitest::Test
         body: "{\"dialog_node\":\"location-done\",\"user_label\":\"labeled\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
@@ -1674,7 +1314,6 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { "description" => "deleted successfully" }.to_json, headers: headers)
@@ -1688,7 +1327,6 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { "application/json" => { "dialog_node" => "location-atm" } }.to_json, headers: headers)
@@ -1702,7 +1340,6 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { "application/json" => { "dialog_node" => "location-atm" } }.to_json, headers: headers)
@@ -1720,18 +1357,9 @@ class AssistantV1Test < Minitest::Test
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: "", headers: headers)
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     service_response = service.delete_user_data(
       customer_id: "id"
     )
@@ -1739,20 +1367,11 @@ class AssistantV1Test < Minitest::Test
   end
 
   def test_update_dialog_node
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     stub_request(:post, "https://gateway.watsonplatform.net/assistant/api/v1/workspaces/workspace_id/dialog_nodes/dialog_node?version=2018-02-16")
       .with(
         body: "{\"description\":\"A new description\",\"user_label\":\"new_label\"}",
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"
         }
@@ -1767,19 +1386,10 @@ class AssistantV1Test < Minitest::Test
   end
 
   def test_list_mentions
-    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
-      username: "username",
-      password: "password"
-    )
-    service = IBMWatson::AssistantV1.new(
-      version: "2018-02-16",
-      authenticator: authenticator
-    )
     stub_request(:get, "https://gateway.watsonplatform.net/assistant/api/v1/workspaces/workspace_id/entities/entity/mentions?export=true&include_audit=true&version=2018-02-16")
       .with(
         headers: {
           "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Host" => "gateway.watsonplatform.net"
         }
       ).to_return(status: 200, body: { "list_mentions_response" => "yes" }.to_json, headers: { "Content-Type" => "application/json" })