ibm_watson 0.12.0 → 0.13.0

data/lib/ibm_watson/tone_analyzer_v3.rb

@@ -30,6 +30,7 @@ require "concurrent"
 require "erb"
 require "json"
 require_relative "./detailed_response"
+require_relative "./common.rb"
 
 require_relative "./watson_service"
 
@@ -154,7 +155,7 @@ module IBMWatson
         "Content-Language" => content_language,
         "Accept-Language" => accept_language
       }
-      headers["X-IBMCloud-SDK-Analytics"] = "service_name=tone_analyzer;service_version=V3;operation_id=tone"
+      headers = Common.new.get_default_headers(headers: headers, service_name: "tone_analyzer", service_version: "V3", operation_id: "tone")
 
       params = {
         "version" => @version,
@@ -219,7 +220,7 @@ module IBMWatson
         "Content-Language" => content_language,
         "Accept-Language" => accept_language
       }
-      headers["X-IBMCloud-SDK-Analytics"] = "service_name=tone_analyzer;service_version=V3;operation_id=tone_chat"
+      headers = Common.new.get_default_headers(headers: headers, service_name: "tone_analyzer", service_version: "V3", operation_id: "tone_chat")
 
       params = {
         "version" => @version

data/lib/ibm_watson/version.rb

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

data/lib/ibm_watson/visual_recognition_v3.rb

@@ -22,6 +22,7 @@ require "concurrent"
 require "erb"
 require "json"
 require_relative "./detailed_response"
+require_relative "./common.rb"
 
 require_relative "./watson_service"
 
@@ -120,7 +121,7 @@ module IBMWatson
       headers = {
         "Accept-Language" => accept_language
       }
-      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=classify"
+      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "classify")
 
       params = {
         "version" => @version
@@ -199,7 +200,7 @@ module IBMWatson
       headers = {
         "Accept-Language" => accept_language
       }
-      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=detect_faces"
+      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "detect_faces")
 
       params = {
         "version" => @version
@@ -274,7 +275,7 @@ module IBMWatson
 
       headers = {
       }
-      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=create_classifier"
+      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "create_classifier")
 
       params = {
         "version" => @version
@@ -324,7 +325,7 @@ module IBMWatson
     def list_classifiers(verbose: nil)
       headers = {
       }
-      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=list_classifiers"
+      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "list_classifiers")
 
       params = {
         "version" => @version,
@@ -354,7 +355,7 @@ module IBMWatson
 
       headers = {
       }
-      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=get_classifier"
+      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "get_classifier")
 
       params = {
         "version" => @version
@@ -418,7 +419,7 @@ module IBMWatson
 
       headers = {
       }
-      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=update_classifier"
+      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "update_classifier")
 
       params = {
         "version" => @version
@@ -467,7 +468,7 @@ module IBMWatson
 
       headers = {
       }
-      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=delete_classifier"
+      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "delete_classifier")
 
       params = {
         "version" => @version
@@ -500,7 +501,7 @@ module IBMWatson
 
       headers = {
       }
-      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=get_core_ml_model"
+      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "get_core_ml_model")
 
       params = {
         "version" => @version
@@ -538,7 +539,7 @@ module IBMWatson
 
       headers = {
       }
-      headers["X-IBMCloud-SDK-Analytics"] = "service_name=watson_vision_combined;service_version=V3;operation_id=delete_user_data"
+      headers = Common.new.get_default_headers(headers: headers, service_name: "watson_vision_combined", service_version: "V3", operation_id: "delete_user_data")
 
       params = {
         "version" => @version,

data/lib/ibm_watson/watson_service.rb

@@ -8,6 +8,7 @@ require_relative("./detailed_response.rb")
 require_relative("./watson_api_exception.rb")
 require_relative("./iam_token_manager.rb")
 require_relative("./version.rb")
+require_relative("./common.rb")
 # require("httplog")
 # HttpLog.configure do |config|
 #   config.log_connect   = true
@@ -19,6 +20,9 @@ require_relative("./version.rb")
 # end
 
 DEFAULT_CREDENTIALS_FILE_NAME = "ibm-credentials.env"
+NORMALIZER = lambda do |uri| # Custom URI normalizer when using HTTP Client
+  HTTP::URI.parse uri
+end
 
 # Class for interacting with the Watson API
 class WatsonService
@@ -46,14 +50,6 @@ class WatsonService
     @disable_ssl = false
     @display_name = vars[:display_name]
 
-    user_agent_string = "watson-apis-ruby-sdk-" + IBMWatson::VERSION
-    user_agent_string += " #{RbConfig::CONFIG["host"]}"
-    user_agent_string += " #{RbConfig::CONFIG["RUBY_BASE_NAME"]}-#{RbConfig::CONFIG["RUBY_PROGRAM_VERSION"]}"
-
-    headers = {
-      "User-Agent" => user_agent_string
-    }
-
     if !vars[:iam_access_token].nil? || !vars[:iam_apikey].nil?
       set_token_manager(iam_apikey: vars[:iam_apikey], iam_access_token: vars[:iam_access_token], iam_url: vars[:iam_url])
     elsif !vars[:username].nil? && !vars[:password].nil?
@@ -88,8 +84,8 @@ class WatsonService
     raise ArgumentError.new('The apikey shouldn\'t start or end with curly brackets or quotes. Be sure to remove any {} and \" characters surrounding your apikey') if check_bad_first_or_last_char(@iam_apikey)
 
     @conn = HTTP::Client.new(
-      headers: headers
-    )
+      headers: {}
+    ).use normalize_uri: { normalizer: NORMALIZER }
   end
 
   # Initiates the credentials based on the credential file
@@ -267,11 +263,11 @@ class WatsonService
         read: 0
       }
       time = defaults.merge(timeout[:per_operation])
-      @conn = @conn.timeout(:per_operation, write: time[:write], connect: time[:connect], read: time[:read])
+      @conn = @conn.timeout(write: time[:write], connect: time[:connect], read: time[:read])
     else
       raise TypeError("global in timeout must be an Integer") unless timeout[:global].is_a?(Integer)
 
-      @conn = @conn.timeout(:global, write: timeout[:global], connect: 0, read: 0)
+      @conn = @conn.timeout(timeout[:global])
     end
   end
 

data/lib/ibm_watson.rb

@@ -15,4 +15,5 @@ module IBMWatson
   require_relative("./ibm_watson/language_translator_v3.rb")
   require_relative("./ibm_watson/compare_comply_v1.rb")
   require_relative("./ibm_watson/websocket/recognize_callback.rb")
+  require_relative("./ibm_watson/common.rb")
 end

data/test/integration/test_speech_to_text_v1.rb

@@ -281,6 +281,27 @@ if !ENV["SPEECH_TO_TEXT_USERNAME"].nil? && !ENV["SPEECH_TO_TEXT_PASSWORD"].nil?
         customization_id: customization_id
       )
     end
+
+    def test_add_word_double
+      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: "ＡＢＣ"
+      )
+      assert_nil(service_response)
+      service_response = @service.get_word(
+        customization_id: customization_id,
+        word_name: "ＡＢＣ"
+      )
+      refute_nil(service_response)
+      @service.delete_language_model(
+        customization_id: customization_id
+      )
+    end
   end
 else
   class SpeechToTextV1Test < Minitest::Test

data/test/unit/test_configure_http_client.rb

@@ -134,9 +134,7 @@ class HTTPConfigTest < Minitest::Test
     assert_equal(HTTP::Timeout::Global, timeout_class)
 
     expected_timeouts = {
-      read_timeout: 0,
-      write_timeout: 20,
-      connect_timeout: 0
+      global_timeout: 20
     }
     timeout = service.conn.default_options.timeout_options
     assert_equal(expected_timeouts, timeout)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_watson
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Max Nussbaum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -246,6 +246,7 @@ files:
 - lib/ibm_watson.rb
 - lib/ibm_watson/assistant_v1.rb
 - lib/ibm_watson/assistant_v2.rb
+- lib/ibm_watson/common.rb
 - lib/ibm_watson/compare_comply_v1.rb
 - lib/ibm_watson/detailed_response.rb
 - lib/ibm_watson/discovery_v1.rb
@@ -317,7 +318,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Official client library to use the IBM Watson Services