ibm_watson 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f3ea96d0530c44debcae0d8eb39eaf614c94643e767d226f474377da33d3f09
-  data.tar.gz: f133f5b9a4536331c9a84abcf56c85d7837602af161a2c3816fa79c987728ba4
+  metadata.gz: 39e925f6844d37eeebbebfb1e39ff405a88e73d98c9ac17132b4884c8d36c6ab
+  data.tar.gz: cd57ff7e6d36132f415aad355ebae50f09b79c64f649e08b6d3bd3e5559fa926
 SHA512:
-  metadata.gz: d561ca5bf849d5c9a626b5983d7ca79301e1d6b1db3118122ed847f7199ac7bed73f87f05bcb0fb07d7ddf6aa2f247056b00a7792996674188c369d9ce9f2d3f
-  data.tar.gz: 6d1b1025b78e068a4824bba18134422800879ba2a935900d140dcfcfbabb8524aeb0d1c1a69934f6c716c437f05541b5ab3fdedabf6ef55ff9075a2a7c37b505
+  metadata.gz: a86e448912a28076ff77fc3a81de35b0c022da99bf25595c171f80767315c5941867937cc44c1275b2790c8f0316cc557ea65457e7dc1a8c3141658cc795420e
+  data.tar.gz: c1903e079f5f41a3218ea182ffd99f00b043521ff57798ad25282e033407e73a8685d44a434063190db7b81743b21d080bd7e4196b6f488f6a8a850e4d7d6675

data/README.md

@@ -207,8 +207,8 @@ p "Result: #{response.result}"
 This would give an output of `DetailedResponse` having the structure:
 ```ruby
 Status: 200
-Headers: <http response headers>
-Result: <response returned by service>
+Headers: "<http response headers>"
+Result: "<response returned by service>"
 ```
 
 ## Using Websockets

data/lib/ibm_watson/assistant_v1.rb

@@ -25,6 +25,7 @@ require_relative "./detailed_response"
 
 require_relative "./watson_service"
 
+# Module for the Watson APIs
 module IBMWatson
   ##
   # The Assistant V1 service.

data/lib/ibm_watson/discovery_v1.rb

@@ -27,6 +27,7 @@ require_relative "./detailed_response"
 
 require_relative "./watson_service"
 
+# Module for the Watson APIs
 module IBMWatson
   ##
   # The Discovery V1 service.

data/lib/ibm_watson/iam_token_manager.rb

@@ -43,15 +43,6 @@ class IAMTokenManager
         headers: headers,
         params: params
       )
-    else
-      data = data.to_json if data.respond_to?(:to_json)
-      response = HTTP.request(
-        method,
-        url,
-        headers: headers,
-        body: data,
-        params: params
-      )
     end
     return JSON.parse(response.body.to_s) if (200..299).cover?(response.code)
     require_relative("./watson_api_exception.rb")

data/lib/ibm_watson/language_translator_v3.rb

@@ -27,6 +27,7 @@ require_relative "./detailed_response"
 
 require_relative "./watson_service"
 
+# Module for the Watson APIs
 module IBMWatson
   ##
   # The Language Translator V3 service.

data/lib/ibm_watson/natural_language_classifier_v1.rb

@@ -26,6 +26,7 @@ require_relative "./detailed_response"
 
 require_relative "./watson_service"
 
+# Module for the Watson APIs
 module IBMWatson
   ##
   # The Natural Language Classifier V1 service.

data/lib/ibm_watson/natural_language_understanding_v1.rb

@@ -31,6 +31,7 @@ require_relative "./detailed_response"
 
 require_relative "./watson_service"
 
+# Module for the Watson APIs
 module IBMWatson
   ##
   # The Natural Language Understanding V1 service.

data/lib/ibm_watson/personality_insights_v3.rb

@@ -42,6 +42,7 @@ require_relative "./detailed_response"
 
 require_relative "./watson_service"
 
+# Module for the Watson APIs
 module IBMWatson
   ##
   # The Personality Insights V3 service.

data/lib/ibm_watson/speech_to_text_v1.rb

@@ -74,6 +74,7 @@ require_relative "./detailed_response"
 
 require_relative "./watson_service"
 
+# Module for the Watson APIs
 module IBMWatson
   ##
   # The Speech to Text V1 service.
@@ -408,6 +409,7 @@ module IBMWatson
       response
     end
 
+    ##
     # @!method recognize_with_websocket(audio: nil,chunk_data: false,content_type: "audio/l16; rate=44100",model: "en-US_BroadbandModel",recognize_callback: nil,customization_id: nil,acoustic_customization_id: nil,customization_weight: nil,version: nil,inactivity_timeout: 30,interim_results: false,keywords: nil,keywords_threshold: nil,max_alternatives: 1,word_alternatives_threshold: nil,word_confidence: false,timestamps: false,profanity_filter: nil,smart_formatting: false,speaker_labels: nil)
     # Sends audio for speech recognition using web sockets.
     # @param audio [IO] Audio to transcribe in the format specified by the `Content-Type` header.
@@ -455,13 +457,16 @@ module IBMWatson
     )
       raise ArgumentError("Audio must be provided") if audio.nil? && !chunk_data
       raise ArgumentError("Recognize callback must be provided") if recognize_callback.nil?
-      raise TypeError("Callback is not a derived class of RecognizeCallback") unless recognize_callback.is_a?(RecognizeCallback)
-
+      raise TypeError("Callback is not a derived class of RecognizeCallback") unless recognize_callback.is_a?(IBMWatson::RecognizeCallback)
       require_relative("./websocket/speech_to_text_websocket_listener.rb")
-
       headers = {}
       headers = @watson_service.conn.default_options.headers.to_hash unless @watson_service.conn.default_options.headers.to_hash.empty?
-      headers["Authorization"] = "Basic " + Base64.strict_encode64("#{@watson_service.username}:#{@watson_service.password}")
+      if !@watson_service.token_manager.nil?
+        access_token = @watson_service.token_manager._token
+        headers["Authorization"] = "Bearer #{access_token}"
+      elsif !@watson_service.username.nil? && !@watson_service.password.nil?
+        headers["Authorization"] = "Basic " + Base64.strict_encode64("#{@watson_service.username}:#{@watson_service.password}")
+      end
       url = @watson_service.url.gsub("https:", "wss:")
       params = {
         "model" => model,
@@ -472,7 +477,6 @@ module IBMWatson
       }
       params.delete_if { |_, v| v.nil? }
       url += "/v1/recognize?" + HTTP::URI.form_encode(params)
-
       options = {
         "content_type" => content_type,
         "inactivity_timeout" => inactivity_timeout,
@@ -490,7 +494,6 @@ module IBMWatson
       options.delete_if { |_, v| v.nil? }
       WebSocketClient.new(audio: audio, chunk_data: chunk_data, options: options, recognize_callback: recognize_callback, url: url, headers: headers)
     end
-
     #########################
     # Asynchronous
     #########################
@@ -1467,7 +1470,7 @@ module IBMWatson
     end
 
     ##
-    # @!method add_word(customization_id:, word_name:, word: nil, sounds_like: nil, display_as: nil)
+    # @!method add_word(customization_id:, word_name:, sounds_like: nil, display_as: nil)
     # Add a custom word.
     # Adds a custom word to a custom language model. The service populates the words
     #   resource for a custom model with out-of-vocabulary (OOV) words found in each
@@ -1509,11 +1512,6 @@ module IBMWatson
     # @param word_name [String] The custom word for the custom language model. When you add or update a custom
     #   word with the **Add a custom word** method, do not include spaces in the word. Use
     #   a `-` (dash) or `_` (underscore) to connect the tokens of compound words.
-    # @param word [String] For the **Add custom words** method, you must specify the custom word that is to
-    #   be added to or updated in the custom model. Do not include spaces in the word. Use
-    #   a `-` (dash) or `_` (underscore) to connect the tokens of compound words.
-    #
-    #   Omit this field for the **Add a custom word** method.
     # @param sounds_like [Array[String]] An array of sounds-like pronunciations for the custom word. Specify how words that
     #   are difficult to pronounce, foreign words, acronyms, and so on can be pronounced
     #   by users. For a word that is not in the service's base vocabulary, omit the
@@ -1528,13 +1526,13 @@ module IBMWatson
     #   the parameter when you want the word to have a spelling that is different from its
     #   usual representation or from its spelling in corpora training data.
     # @return [nil]
-    def add_word(customization_id:, word_name:, word: nil, sounds_like: nil, display_as: nil)
+    def add_word(customization_id:, word_name:, sounds_like: nil, display_as: nil)
       raise ArgumentError("customization_id must be provided") if customization_id.nil?
       raise ArgumentError("word_name must be provided") if word_name.nil?
       headers = {
       }
       data = {
-        "word" => word,
+        "word" => word_name,
         "sounds_like" => sounds_like,
         "display_as" => display_as
       }

data/lib/ibm_watson/text_to_speech_v1.rb

@@ -75,6 +75,7 @@ require_relative "./detailed_response"
 
 require_relative "./watson_service"
 
+# Module for the Watson APIs
 module IBMWatson
   ##
   # The Text to Speech V1 service.

data/lib/ibm_watson/tone_analyzer_v3.rb

@@ -33,6 +33,7 @@ require_relative "./detailed_response"
 
 require_relative "./watson_service"
 
+# Module for the Watson APIs
 module IBMWatson
   ##
   # The Tone Analyzer V3 service.

data/lib/ibm_watson/version.rb

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

data/lib/ibm_watson/visual_recognition_v3.rb

@@ -25,6 +25,7 @@ require_relative "./detailed_response"
 
 require_relative "./watson_service"
 
+# Module for the Watson APIs
 module IBMWatson
   ##
   # The Visual Recognition V3 service.
@@ -288,7 +289,7 @@ module IBMWatson
     #########################
 
     ##
-    # @!method create_classifier(name:, classname_positive_examples:, negative_examples: nil, classname_positive_examples_filename: nil, negative_examples_filename: nil)
+    # @!method create_classifier(name:, **args)
     # Create a classifier.
     # Train a new multi-faceted classifier on the uploaded image data. Create your
     #   custom classifier with positive or negative examples. Include at least two sets of
@@ -299,7 +300,8 @@ module IBMWatson
     #   file names, and classifier and class names). The service assumes UTF-8 encoding if
     #   it encounters non-ASCII characters.
     # @param name [String] The name of the new classifier. Encode special characters in UTF-8.
-    # @param classname_positive_examples [File] A .zip file of images that depict the visual subject of a class in the new
+    # @param args [Hash] Hash for optional parameters
+    # @option args classname_positive_examples [File] A .zip file of images that depict the visual subject of a class in the new
     #   classifier. You can include more than one positive example file in a call.
     #
     #   Specify the parameter name by appending `_positive_examples` to the class name.
@@ -315,48 +317,51 @@ module IBMWatson
     #   of the new classifier. Must contain a minimum of 10 images.
     #
     #   Encode special characters in the file name in UTF-8.
-    # @param classname_positive_examples_filename [String] The filename for classname_positive_examples.
-    # @param negative_examples_filename [String] The filename for negative_examples.
+    # @option args classname_positive_examples_filename [String] The filename for classname_positive_examples.
+    # @option args negative_examples_filename [String] The filename for negative_examples.
     # @return [DetailedResponse] A `DetailedResponse` object representing the response.
-    def create_classifier(name:, classname_positive_examples:, negative_examples: nil, classname_positive_examples_filename: nil, negative_examples_filename: nil)
+    def create_classifier(name:, **args)
       raise ArgumentError("name must be provided") if name.nil?
-      raise ArgumentError("classname_positive_examples must be provided") if classname_positive_examples.nil?
+      raise ArgumentError("<classname>_positive_examples must be provided") unless args.keys.any? { |key| key.to_s.end_with?("_positive_examples") }
+      positive_keys = args.keys
+      positive_keys.keep_if { |key| key.to_s.end_with?("_positive_examples") }
       headers = {
       }
       params = {
         "version" => @version
       }
       mime_type = "application/octet-stream"
-      unless classname_positive_examples.instance_of?(StringIO) || classname_positive_examples.instance_of?(File)
-        classname_positive_examples = classname_positive_examples.respond_to?(:to_json) ? StringIO.new(classname_positive_examples.to_json) : StringIO.new(classname_positive_examples)
-      end
-      if classname_positive_examples_filename
-        classname_positive_examples = classname_positive_examples.instance_of?(StringIO) ? HTTP::FormData::File.new(classname_positive_examples, content_type: mime_type, filename: classname_positive_examples_filename) : HTTP::FormData::File.new(classname_positive_examples.path, content_type: mime_type, filename: classname_positive_examples_filename)
-      else
-        classname_positive_examples = classname_positive_examples.instance_of?(StringIO) ? HTTP::FormData::File.new(classname_positive_examples, content_type: mime_type) : HTTP::FormData::File.new(classname_positive_examples.path, content_type: mime_type)
+      positive_keys.each do |k|
+        unless args[k].instance_of?(StringIO) || args[k].instance_of?(File)
+          args[k] = args[k].respond_to?(:to_json) ? StringIO.new(args[k].to_json) : StringIO.new(args[k])
+        end
+        if !args[(k.to_s + "_filename").to_sym].nil?
+          args[k] = args[k].instance_of?(StringIO) ? HTTP::FormData::File.new(args[k], content_type: mime_type, filename: args[(k.to_s + "_filename").to_sym]) : HTTP::FormData::File.new(args[k].path, content_type: mime_type, filename: args[(k.to_s + "_filename").to_sym])
+        else
+          args[k] = args[k].instance_of?(StringIO) ? HTTP::FormData::File.new(args[k], content_type: mime_type) : HTTP::FormData::File.new(args[k].path, content_type: mime_type)
+        end
       end
-      unless negative_examples.nil?
+      unless args[:negative_examples].nil?
         mime_type = "application/octet-stream"
-        unless negative_examples.instance_of?(StringIO) || negative_examples.instance_of?(File)
-          negative_examples = negative_examples.respond_to?(:to_json) ? StringIO.new(negative_examples.to_json) : StringIO.new(negative_examples)
+        unless args[:negative_examples].instance_of?(StringIO) || args[:negative_examples].instance_of?(File)
+          args[:negative_examples] = args[:negative_examples].respond_to?(:to_json) ? StringIO.new(args[:negative_examples].to_json) : StringIO.new(args[:negative_examples])
         end
-        if negative_examples_filename
-          negative_examples = negative_examples.instance_of?(StringIO) ? HTTP::FormData::File.new(negative_examples, content_type: mime_type, filename: negative_examples_filename) : HTTP::FormData::File.new(negative_examples.path, content_type: mime_type, filename: negative_examples_filename)
+        if args[:negative_examples_filename]
+          args[:negative_examples] = args[:negative_examples].instance_of?(StringIO) ? HTTP::FormData::File.new(args[:negative_examples], content_type: mime_type, filename: args[:negative_examples_filename]) : HTTP::FormData::File.new(args[:negative_examples].path, content_type: mime_type, filename: args[:negative_examples_filename])
         else
-          negative_examples = negative_examples.instance_of?(StringIO) ? HTTP::FormData::File.new(negative_examples, content_type: mime_type) : HTTP::FormData::File.new(negative_examples.path, content_type: mime_type)
+          args[:negative_examples] = args[:negative_examples].instance_of?(StringIO) ? HTTP::FormData::File.new(args[:negative_examples], content_type: mime_type) : HTTP::FormData::File.new(args[:negative_examples].path, content_type: mime_type)
         end
       end
+      form_hash = { name: name }
+      positive_keys.each { |k| form_hash[k] = args[k] }
+      form_hash[:negative_examples] = args[:negative_examples] unless args[:negative_examples].nil?
       method_url = "/v3/classifiers"
       response = request(
         method: "POST",
         url: method_url,
         headers: headers,
         params: params,
-        form: {
-          name: name,
-          classname_positive_examples: classname_positive_examples,
-          negative_examples: negative_examples
-        },
+        form: form_hash,
         accept_json: true
       )
       response
@@ -411,7 +416,7 @@ module IBMWatson
     end
 
     ##
-    # @!method update_classifier(classifier_id:, classname_positive_examples: nil, negative_examples: nil, classname_positive_examples_filename: nil, negative_examples_filename: nil)
+    # @!method update_classifier(classifier_id:, **args)
     # Update a classifier.
     # Update a custom classifier by adding new positive or negative classes (examples)
     #   or by adding new images to existing classes. You must supply at least one set of
@@ -427,7 +432,7 @@ module IBMWatson
     #   previous requests. The retrained property shows the last time the classifier
     #   retraining finished.
     # @param classifier_id [String] The ID of the classifier.
-    # @param classname_positive_examples [File] A .zip file of images that depict the visual subject of a class in the classifier.
+    # @option args classname_positive_examples [File] A .zip file of images that depict the visual subject of a class in the classifier.
     #   The positive examples create or update classes in the classifier. You can include
     #   more than one positive example file in a call.
     #
@@ -440,52 +445,54 @@ module IBMWatson
     #   MB per .zip file.
     #
     #   Encode special characters in the file name in UTF-8.
-    # @param negative_examples [File] A .zip file of images that do not depict the visual subject of any of the classes
+    # @option args negative_examples [File] A .zip file of images that do not depict the visual subject of any of the classes
     #   of the new classifier. Must contain a minimum of 10 images.
     #
     #   Encode special characters in the file name in UTF-8.
-    # @param classname_positive_examples_filename [String] The filename for classname_positive_examples.
-    # @param negative_examples_filename [String] The filename for negative_examples.
+    # @option args classname_positive_examples_filename [String] The filename for classname_positive_examples.
+    # @option args negative_examples_filename [String] The filename for negative_examples.
     # @return [DetailedResponse] A `DetailedResponse` object representing the response.
-    def update_classifier(classifier_id:, classname_positive_examples: nil, negative_examples: nil, classname_positive_examples_filename: nil, negative_examples_filename: nil)
+    def update_classifier(classifier_id:, **args)
       raise ArgumentError("classifier_id must be provided") if classifier_id.nil?
       headers = {
       }
       params = {
         "version" => @version
       }
-      unless classname_positive_examples.nil?
-        mime_type = "application/octet-stream"
-        unless classname_positive_examples.instance_of?(StringIO) || classname_positive_examples.instance_of?(File)
-          classname_positive_examples = classname_positive_examples.respond_to?(:to_json) ? StringIO.new(classname_positive_examples.to_json) : StringIO.new(classname_positive_examples)
+      positive_keys = args.keys
+      positive_keys.keep_if { |key| key.to_s.end_with?("_positive_examples") }
+      mime_type = "application/octet-stream"
+      positive_keys.each do |k|
+        unless args[k].instance_of?(StringIO) || args[k].instance_of?(File)
+          args[k] = args[k].respond_to?(:to_json) ? StringIO.new(args[k].to_json) : StringIO.new(args[k])
         end
-        if classname_positive_examples_filename
-          classname_positive_examples = classname_positive_examples.instance_of?(StringIO) ? HTTP::FormData::File.new(classname_positive_examples, content_type: mime_type, filename: classname_positive_examples_filename) : HTTP::FormData::File.new(classname_positive_examples.path, content_type: mime_type, filename: classname_positive_examples_filename)
+        if !args[(k.to_s + "_filename").to_sym].nil?
+          args[k] = args[k].instance_of?(StringIO) ? HTTP::FormData::File.new(args[k], content_type: mime_type, filename: args[(k.to_s + "_filename").to_sym]) : HTTP::FormData::File.new(args[k].path, content_type: mime_type, filename: args[(k.to_s + "_filename").to_sym])
         else
-          classname_positive_examples = classname_positive_examples.instance_of?(StringIO) ? HTTP::FormData::File.new(classname_positive_examples, content_type: mime_type) : HTTP::FormData::File.new(classname_positive_examples.path, content_type: mime_type)
+          args[k] = args[k].instance_of?(StringIO) ? HTTP::FormData::File.new(args[k], content_type: mime_type) : HTTP::FormData::File.new(args[k].path, content_type: mime_type)
         end
       end
-      unless negative_examples.nil?
+      unless args[:negative_examples].nil?
         mime_type = "application/octet-stream"
-        unless negative_examples.instance_of?(StringIO) || negative_examples.instance_of?(File)
-          negative_examples = negative_examples.respond_to?(:to_json) ? StringIO.new(negative_examples.to_json) : StringIO.new(negative_examples)
+        unless args[:negative_examples].instance_of?(StringIO) || args[:negative_examples].instance_of?(File)
+          args[:negative_examples] = args[:negative_examples].respond_to?(:to_json) ? StringIO.new(args[:negative_examples].to_json) : StringIO.new(args[:negative_examples])
         end
-        if negative_examples_filename
-          negative_examples = negative_examples.instance_of?(StringIO) ? HTTP::FormData::File.new(negative_examples, content_type: mime_type, filename: negative_examples_filename) : HTTP::FormData::File.new(negative_examples.path, content_type: mime_type, filename: negative_examples_filename)
+        if args[:negative_examples_filename]
+          args[:negative_examples] = args[:negative_examples].instance_of?(StringIO) ? HTTP::FormData::File.new(args[:negative_examples], content_type: mime_type, filename: args[:negative_examples_filename]) : HTTP::FormData::File.new(args[:negative_examples].path, content_type: mime_type, filename: args[:negative_examples_filename])
         else
-          negative_examples = negative_examples.instance_of?(StringIO) ? HTTP::FormData::File.new(negative_examples, content_type: mime_type) : HTTP::FormData::File.new(negative_examples.path, content_type: mime_type)
+          args[:negative_examples] = args[:negative_examples].instance_of?(StringIO) ? HTTP::FormData::File.new(args[:negative_examples], content_type: mime_type) : HTTP::FormData::File.new(args[:negative_examples].path, content_type: mime_type)
         end
       end
+      form_hash = {}
+      positive_keys.each { |k| form_hash[k] = args[k] }
+      form_hash[:negative_examples] = args[:negative_examples] unless args[:negative_examples].nil?
       method_url = "/v3/classifiers/%s" % [ERB::Util.url_encode(classifier_id)]
       response = request(
         method: "POST",
         url: method_url,
         headers: headers,
         params: params,
-        form: {
-          classname_positive_examples: classname_positive_examples,
-          negative_examples: negative_examples
-        },
+        form: form_hash,
         accept_json: true
       )
       response

data/lib/ibm_watson/watson_api_exception.rb

@@ -11,9 +11,9 @@ class WatsonApiException < StandardError
       @error = response.reason
       unless response.body.empty?
         body_hash = JSON.parse(response.body.to_s)
-        @code = body_hash["code"] || body_hash["error_code"]
-        @error = body_hash["error"] || body_hash["error_message"]
-        %w[code error_code error error_message].each { |k| body_hash.delete(k) }
+        @code = body_hash["code"] || body_hash["error_code"] || body_hash["status"]
+        @error = body_hash["error"] || body_hash["error_message"] || body_hash["statusInfo"] || body_hash["description"]
+        %w[code error_code status error error_message statusInfo description].each { |k| body_hash.delete(k) }
         @info = body_hash
       end
       @transaction_id = transaction_id

data/lib/ibm_watson/watson_service.rb

@@ -21,7 +21,7 @@ require_relative("./version.rb")
 # Class for interacting with the Watson API
 class WatsonService
   attr_accessor :password, :url, :username
-  attr_reader :conn
+  attr_reader :conn, :token_manager
   def initialize(vars)
     defaults = {
       vcap_services_name: nil,
@@ -123,7 +123,7 @@ class WatsonService
     args[:json] = args[:data].merge(args[:json]) if args[:data].respond_to?(:merge)
     args[:json] = args[:data] if args[:json].empty? || (args[:data].instance_of?(String) && !args[:data].empty?)
     args[:json].delete_if { |_k, v| v.nil? } if args[:json].instance_of?(Hash)
-    args[:headers]["Accept"] = "application/json" if args[:accept_json]
+    args[:headers]["Accept"] = "application/json" if args[:accept_json] && args[:headers]["Accept"].nil?
     args[:headers]["Content-Type"] = "application/json" unless args[:headers].key?("Content-Type")
     args[:json] = args[:json].to_json if args[:json].instance_of?(Hash)
     args[:headers].delete_if { |_k, v| v.nil? } if args[:headers].instance_of?(Hash)

data/lib/ibm_watson/websocket/speech_to_text_websocket_listener.rb

@@ -72,7 +72,7 @@ class WebSocketClient
     end
 
     on_error = lambda do |event|
-      p event.message
+      @callback.on_error(error: event)
     end
 
     EM&.reactor_thread&.join
@@ -127,12 +127,9 @@ class WebSocketClient
       end
     else
       if @bytes_sent + ONE_KB >= @data_size
-        if @data_size > @bytes_sent
-          send_chunk(chunk: data.read(ONE_KB), final: true)
-          @timer.cancel if @timer.respond_to?(:cancel)
-          return
-        end
+        send_chunk(chunk: data.read(ONE_KB), final: true)
         @timer.cancel if @timer.respond_to?(:cancel)
+        return
       end
       send_chunk(chunk: data.read(ONE_KB), final: false)
     end

data/rakefile

@@ -37,7 +37,7 @@ end
 
 desc "Run tests and generate a code coverage report"
 task :coverage do
-  ENV["COVERAGE"] = "true" if ENV["TRAVIS_RUBY_VERSION"] == "2.5.1"
+  ENV["COVERAGE"] = "true" if ENV["TRAVIS_RUBY_VERSION"] == "2.5.1" || ENV["CI"].nil?
   Rake::Task["test"].execute
 end
 

data/test/integration/test_assistant_v1.rb

@@ -7,6 +7,7 @@ unless ENV["ASSISTANT_USERNAME"].nil? || ENV["ASSISTANT_PASSWORD"].nil?
   # Integration tests for the Watson Assistant V1 Service
   class AssistantV1Test < Minitest::Test
     def test_create_update_delete_workspace
+      skip "Skip to allow for concurrent travis jobs"
       service = IBMWatson::AssistantV1.new(
         username: ENV["ASSISTANT_USERNAME"],
         password: ENV["ASSISTANT_PASSWORD"],
@@ -78,6 +79,7 @@ unless ENV["ASSISTANT_USERNAME"].nil? || ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_create_update_delete_counterexample
+      skip "Skip to allow for concurrent travis jobs"
       service = IBMWatson::AssistantV1.new(
         version: "2018-02-16",
         username: ENV["ASSISTANT_USERNAME"],
@@ -147,6 +149,7 @@ unless ENV["ASSISTANT_USERNAME"].nil? || ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_create_update_delete_entity
+      skip "Skip to allow for concurrent travis jobs"
       service = IBMWatson::AssistantV1.new(
         username: ENV["ASSISTANT_USERNAME"],
         password: ENV["ASSISTANT_PASSWORD"],
@@ -222,6 +225,7 @@ unless ENV["ASSISTANT_USERNAME"].nil? || ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_create_update_delete_example
+      skip "Skip to allow for concurrent travis jobs"
       service = IBMWatson::AssistantV1.new(
         username: ENV["ASSISTANT_USERNAME"],
         password: ENV["ASSISTANT_PASSWORD"],
@@ -296,6 +300,7 @@ unless ENV["ASSISTANT_USERNAME"].nil? || ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_create_update_delete_intent
+      skip "Skip to allow for concurrent travis jobs"
       service = IBMWatson::AssistantV1.new(
         username: ENV["ASSISTANT_USERNAME"],
         password: ENV["ASSISTANT_PASSWORD"],
@@ -433,6 +438,7 @@ unless ENV["ASSISTANT_USERNAME"].nil? || ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_create_update_delete_synonym
+      skip "Skip to allow for concurrent travis jobs"
       service = IBMWatson::AssistantV1.new(
         username: ENV["ASSISTANT_USERNAME"],
         password: ENV["ASSISTANT_PASSWORD"],
@@ -512,6 +518,7 @@ unless ENV["ASSISTANT_USERNAME"].nil? || ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_create_update_delete_value
+      skip "Skip to allow for concurrent travis jobs"
       service = IBMWatson::AssistantV1.new(
         username: ENV["ASSISTANT_USERNAME"],
         password: ENV["ASSISTANT_PASSWORD"],
@@ -590,6 +597,7 @@ unless ENV["ASSISTANT_USERNAME"].nil? || ENV["ASSISTANT_PASSWORD"].nil?
     end
 
     def test_dialog_nodes
+      skip "Skip to allow for concurrent travis jobs"
       service = IBMWatson::AssistantV1.new(
         username: ENV["ASSISTANT_USERNAME"],
         password: ENV["ASSISTANT_PASSWORD"],

data/test/integration/test_discovery_v1.rb

@@ -45,6 +45,7 @@ unless ENV["DISCOVERY_USERNAME"].nil? || ENV["DISCOVERY_PASSWORD"].nil?
       ).result
       refute(configs.nil?)
 
+      skip "Skip to allow for concurrent travis jobs"
       name = "test" + ("A".."Z").to_a.sample
       new_configuration_id = @service.create_configuration(
         environment_id: @environment_id,
@@ -199,5 +200,12 @@ unless ENV["DISCOVERY_USERNAME"].nil? || ENV["DISCOVERY_PASSWORD"].nil?
       ).result
       refute(query_results.nil?)
     end
+
+    def test_list_credentials
+      credentials = @service.list_credentials(
+        environment_id: @environment_id
+      ).result
+      refute(credentials.nil?)
+    end
   end
 end

data/test/integration/test_iam_assistant_v1.rb

@@ -6,6 +6,7 @@ unless ENV["ASSISTANT_IAM_URL"].nil? || ENV["ASSISTANT_IAM_APIKEY"].nil?
   # Integration tests for the Watson Assistant V1 Service
   class IAMAssistantV1Test < Minitest::Test
     def test_create_update_delete_workspace
+      skip "Skip to allow for concurrent travis jobs"
       service = IBMWatson::AssistantV1.new(
         url: ENV["ASSISTANT_IAM_URL"],
         version: "2018-02-16"
@@ -44,10 +45,11 @@ unless ENV["ASSISTANT_IAM_URL"].nil? || ENV["ASSISTANT_IAM_APIKEY"].nil?
 
     def test_get_workspace
       service = IBMWatson::AssistantV1.new(
-        iam_api_key: ENV["ASSISTANT_IAM_APIKEY"],
         url: ENV["ASSISTANT_IAM_URL"],
         version: "2018-02-16"
       )
+      service._iam_api_key(iam_api_key: ENV["ASSISTANT_IAM_APIKEY"])
+      service._iam_api_key(iam_api_key: ENV["ASSISTANT_IAM_APIKEY"])
       service.add_default_headers(
         headers: {
           "X-Watson-Learning-Opt-Out" => "1",
@@ -78,6 +80,7 @@ unless ENV["ASSISTANT_IAM_URL"].nil? || ENV["ASSISTANT_IAM_APIKEY"].nil?
     end
 
     def test_create_update_delete_counterexample
+      skip "Skip to allow for concurrent travis jobs"
       service = IBMWatson::AssistantV1.new(
         version: "2018-02-16",
         iam_api_key: ENV["ASSISTANT_IAM_APIKEY"],
@@ -147,6 +150,7 @@ unless ENV["ASSISTANT_IAM_URL"].nil? || ENV["ASSISTANT_IAM_APIKEY"].nil?
     end
 
     def test_create_update_delete_entity
+      skip "Skip to allow for concurrent travis jobs"
       service = IBMWatson::AssistantV1.new(
         iam_api_key: ENV["ASSISTANT_IAM_APIKEY"],
         url: ENV["ASSISTANT_IAM_URL"],
@@ -222,6 +226,7 @@ unless ENV["ASSISTANT_IAM_URL"].nil? || ENV["ASSISTANT_IAM_APIKEY"].nil?
     end
 
     def test_create_update_delete_example
+      skip "Skip to allow for concurrent travis jobs"
       service = IBMWatson::AssistantV1.new(
         iam_api_key: ENV["ASSISTANT_IAM_APIKEY"],
         url: ENV["ASSISTANT_IAM_URL"],
@@ -296,6 +301,7 @@ unless ENV["ASSISTANT_IAM_URL"].nil? || ENV["ASSISTANT_IAM_APIKEY"].nil?
     end
 
     def test_create_update_delete_intent
+      skip "Skip to allow for concurrent travis jobs"
       service = IBMWatson::AssistantV1.new(
         iam_api_key: ENV["ASSISTANT_IAM_APIKEY"],
         url: ENV["ASSISTANT_IAM_URL"],
@@ -433,6 +439,7 @@ unless ENV["ASSISTANT_IAM_URL"].nil? || ENV["ASSISTANT_IAM_APIKEY"].nil?
     end
 
     def test_create_update_delete_synonym
+      skip "Skip to allow for concurrent travis jobs"
       service = IBMWatson::AssistantV1.new(
         iam_api_key: ENV["ASSISTANT_IAM_APIKEY"],
         url: ENV["ASSISTANT_IAM_URL"],
@@ -512,6 +519,7 @@ unless ENV["ASSISTANT_IAM_URL"].nil? || ENV["ASSISTANT_IAM_APIKEY"].nil?
     end
 
     def test_create_update_delete_value
+      skip "Skip to allow for concurrent travis jobs"
       service = IBMWatson::AssistantV1.new(
         iam_api_key: ENV["ASSISTANT_IAM_APIKEY"],
         url: ENV["ASSISTANT_IAM_URL"],
@@ -590,6 +598,7 @@ unless ENV["ASSISTANT_IAM_URL"].nil? || ENV["ASSISTANT_IAM_APIKEY"].nil?
     end
 
     def test_dialog_nodes
+      skip "Skip to allow for concurrent travis jobs"
       service = IBMWatson::AssistantV1.new(
         iam_api_key: ENV["ASSISTANT_IAM_APIKEY"],
         url: ENV["ASSISTANT_IAM_URL"],

data/test/integration/test_speech_to_text_v1.rb

@@ -13,8 +13,8 @@ class MyRecognizeCallback < IBMWatson::RecognizeCallback
     @atomic_boolean = atomic_boolean
   end
 
-  def on_error(error:)
-    puts "Error received: #{error}"
+  def on_error(*)
+    @atomic_boolean.make_true
   end
 
   def on_inactivity_timeout(*)
@@ -86,6 +86,7 @@ unless ENV["SPEECH_TO_TEXT_USERNAME"].nil? || ENV["SPEECH_TO_TEXT_PASSWORD"].nil
     end
 
     def test_custom_corpora
+      skip "Skip to allow for concurrent travis jobs"
       model = @service.create_language_model(
         name: "integration_test_model",
         base_model_name: "en-US_BroadbandModel"
@@ -106,6 +107,7 @@ unless ENV["SPEECH_TO_TEXT_USERNAME"].nil? || ENV["SPEECH_TO_TEXT_PASSWORD"].nil
       list_models = @service.list_acoustic_models.result
       refute_nil(list_models)
 
+      skip "Skip to allow for concurrent travis jobs"
       create_acoustic_model = @service.create_acoustic_model(
         name: "integration_test_model_ruby",
         base_model_name: "en-US_BroadbandModel"
@@ -184,5 +186,68 @@ unless ENV["SPEECH_TO_TEXT_USERNAME"].nil? || ENV["SPEECH_TO_TEXT_PASSWORD"].nil
       thr.join
       assert(atomic_boolean.true?)
     end
+
+    def test_broken_audio_with_websocket
+      audio_file = File.open(Dir.getwd + "/resources/car.jpg")
+      atomic_boolean = Concurrent::AtomicBoolean.new
+      mycallback = MyRecognizeCallback.new(atomic_boolean: atomic_boolean)
+      speech = @service.recognize_with_websocket(
+        audio: audio_file,
+        recognize_callback: mycallback,
+        interim_results: true,
+        timestamps: true,
+        max_alternatives: 2,
+        word_alternatives_threshold: 0.5,
+        model: "en-US_BroadbandModel"
+      )
+      thr = Thread.new { speech.start }
+      thr.join
+      assert(atomic_boolean.true?)
+    end
+
+    def test_invalid_auth_with_websocket
+      audio_file = File.open(Dir.getwd + "/resources/speech.wav")
+      atomic_boolean = Concurrent::AtomicBoolean.new
+      mycallback = MyRecognizeCallback.new(atomic_boolean: atomic_boolean)
+      temp_service = IBMWatson::SpeechToTextV1.new(
+        iam_access_token: "bogus_iam_access_token"
+      )
+      temp_service.add_default_headers(
+        headers: {
+          "X-Watson-Learning-Opt-Out" => "1",
+          "X-Watson-Test" => "1"
+        }
+      )
+      speech = temp_service.recognize_with_websocket(
+        audio: audio_file,
+        recognize_callback: mycallback,
+        interim_results: true,
+        timestamps: true,
+        max_alternatives: 2,
+        word_alternatives_threshold: 0.5,
+        model: "en-US_BroadbandModel"
+      )
+      thr = Thread.new { speech.start }
+      thr.join
+      assert(atomic_boolean.true?)
+    end
+
+    def test_add_word
+      model = @service.create_language_model(
+        name: "integration_test_model",
+        base_model_name: "en-US_BroadbandModel"
+      ).result
+      customization_id = model["customization_id"]
+      service_response = @service.add_word(
+        customization_id: customization_id,
+        word_name: "IEEE",
+        sounds_like: ["i triple e"],
+        display_as: "IEEE"
+      )
+      assert_nil(service_response)
+      @service.delete_language_model(
+        customization_id: customization_id
+      )
+    end
   end
 end

data/test/integration/test_text_to_speech_v1.rb

@@ -50,6 +50,7 @@ unless ENV["TEXT_TO_SPEECH_USERNAME"].nil? || ENV["TEXT_TO_SPEECH_PASSWORD"].nil
     end
 
     def test_custom_words
+      skip "Skip to allow for concurrent travis jobs"
       customization_id = @service.create_voice_model(
         name: "test_integration_customization",
         description: "customization for tests"

data/test/integration/test_visual_recognition_v3.rb

@@ -47,7 +47,7 @@ unless ENV["VISUAL_RECOGNITION_IAM_APIKEY"].nil? || ENV["VISUAL_RECOGNITION_IAM_
       trucks = File.open(Dir.getwd + "/resources/trucks.zip")
       classifier = @service.create_classifier(
         name: "CarsVsTrucks",
-        classname_positive_examples: cars,
+        cars_positive_examples: cars,
         negative_examples: trucks
       ).result
       refute(classifier.nil?)

data/test/unit/test_personality_insights_v3.rb

@@ -62,9 +62,9 @@ class PersonalityInsightsV3Test < Minitest::Test
     profile_response = File.read(Dir.getwd + "/resources/personality-v3-expect2.txt")
     personality_text = File.read(Dir.getwd + "/resources/personality-v3.json")
     headers = {
-      "Content-Type" => "applicaiton/json"
+      "Content-Type" => "application/json"
     }
-    expected_response = DetailedResponse.new(status: 200, body: profile_response, headers: headers)
+    expected_response = DetailedResponse.new(status: 200, body: JSON.parse(profile_response), headers: headers)
     stub_request(:post, "https://gateway.watsonplatform.net/personality-insights/api/v3/profile?consumption_preferences=true&raw_scores=true&version=2017-10-13")
       .with(
         body: personality_text,
@@ -105,7 +105,7 @@ class PersonalityInsightsV3Test < Minitest::Test
       .with(
         body: personality_text,
         headers: {
-          "Accept" => "application/json",
+          "Accept" => "text/csv",
           "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"

data/test/unit/test_speech_to_text_v1.rb

@@ -408,7 +408,7 @@ class SpeechToTextV1Test < Minitest::Test
     )
     stub_request(:put, "https://stream.watsonplatform.net/speech-to-text/api/v1/customizations/custid/words/IEEE")
       .with(
-        body: "{\"sounds_like\":[\"i triple e\"],\"display_as\":\"IEEE\"}",
+        body: "{\"word\":\"IEEE\",\"sounds_like\":[\"i triple e\"],\"display_as\":\"IEEE\"}",
         headers: {
           "Accept" => "application/json",
           "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
@@ -752,4 +752,21 @@ class SpeechToTextV1Test < Minitest::Test
     service_response = service.upgrade_acoustic_model(customization_id: "customization_id")
     assert_nil(service_response)
   end
+
+  def test_reset_acoustic_model
+    service = IBMWatson::SpeechToTextV1.new(
+      username: "username",
+      password: "password"
+    )
+    stub_request(:post, "https://stream.watsonplatform.net/speech-to-text/api/v1/acoustic_customizations/customization_id/reset")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "stream.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: "", headers: {})
+    service_response = service.reset_acoustic_model(customization_id: "customization_id")
+    assert_nil(service_response)
+  end
 end

data/test/unit/test_vcap_using_personality_insights.rb

@@ -87,7 +87,7 @@ class VcapPersonalityInsightsV3Test < Minitest::Test
       .with(
         body: personality_text,
         headers: {
-          "Accept" => "application/json",
+          "Accept" => "text/csv",
           "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
           "Content-Type" => "application/json",
           "Host" => "gateway.watsonplatform.net"

data/test/unit/test_visual_recognition_v3.rb

@@ -124,8 +124,8 @@ class VisualRecognitionV3Test < Minitest::Test
 
     service_response = service.create_classifier(
       name: "Cars vs Trucks",
-      classname_positive_examples: "cars",
-      classname_positive_examples_filename: "cars",
+      cars_positive_examples: "cars",
+      cars_positive_examples_filename: "cars",
       negative_examples: "trucks",
       negative_examples_filename: "trucks"
     )
@@ -159,15 +159,15 @@ class VisualRecognitionV3Test < Minitest::Test
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.update_classifier(
       classifier_id: "bogusid",
-      classname_positive_examples: "positive examples classname",
+      positive_positive_examples: "positive examples classname",
       negative_examples: "negative examples"
     )
     assert_equal(response, service_response.result)
 
     service_response = service.update_classifier(
       classifier_id: "bogusid",
-      classname_positive_examples: "positive examples file",
-      classname_positive_examples_filename: "positive_filename",
+      positive_positive_examples: "positive examples file",
+      positive_positive_examples_filename: "positive_filename",
       negative_examples: "negative examples",
       negative_examples_filename: "negative_filename"
     )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_watson
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Max Nussbaum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-07-09 00:00:00.000000000 Z
+date: 2018-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby