ibm_watson 1.1.0 → 1.5.0

data/test/integration/test_assistant_v2.rb

@@ -52,6 +52,13 @@ if !ENV["ASSISTANT_APIKEY"].nil? && !ENV["ASSISTANT_URL"].nil?
       )
       assert((200..299).cover?(service_response.status))
 
+      service_response = service.message_stateless(
+        assistant_id: ENV["ASSISTANT_ASSISTANT_ID"],
+        input: { "text" => "Turn on the lights" },
+        context: nil
+      )
+      assert((200..299).cover?(service_response.status))
+
       service.delete_session(
         assistant_id: ENV["ASSISTANT_ASSISTANT_ID"],
         session_id: session_id

data/test/integration/test_compare_comply_v1.rb

@@ -69,18 +69,7 @@ if !ENV["COMPARE_COMPLY_APIKEY"].nil?
     end
 
     def test_get_feedback
-      @service_dup = IBMWatson::CompareComplyV1.new(
-        iam_apikey: ENV["COMPARE_COMPLY_APIKEY"],
-        version: "2018-10-15"
-      )
-      @service_dup.add_default_headers(
-        headers: {
-          "X-Watson-Learning-Opt-Out" => "1",
-          "X-Watson-Test" => "1",
-          "x-watson-metadata" => "customer_id=sdk-test-customer-id"
-        }
-      )
-      response = @service_dup.get_feedback(
+      response = @service.get_feedback(
         feedback_id: ENV["COMPARE_COMPLY_FEEDBACK_ID"]
       ).result
       refute(response.nil?)

data/test/integration/test_speech_to_text_v1.rb

@@ -88,7 +88,7 @@ if !ENV["SPEECH_TO_TEXT_APIKEY"].nil? && !ENV["SPEECH_TO_TEXT_URL"].nil?
     end
 
     def test_recognize_with_single_keyword
-      file = File.open(Dir.getwd + "/resources/speech.wav")
+      file = File.open(Dir.getwd + "/resources/sound-with-pause.wav")
       output = nil
       File.open(file) do |audio_file|
         output = @service.recognize(
@@ -97,9 +97,12 @@ if !ENV["SPEECH_TO_TEXT_APIKEY"].nil? && !ENV["SPEECH_TO_TEXT_URL"].nil?
           timestamps: true,
           word_alternatives_threshold: 0.9,
           keywords: %w"[colorado]",
-          keywords_threshold: 0.5
+          keywords_threshold: 0.5,
+          split_transcript_at_phrase_end: true,
+          end_of_phrase_silence_time: nil
         )
         refute_nil(output.result["results"][0]["alternatives"][0]["transcript"])
+        assert(3, output.result["results"].length)
       end
     end
 
@@ -186,6 +189,7 @@ if !ENV["SPEECH_TO_TEXT_APIKEY"].nil? && !ENV["SPEECH_TO_TEXT_URL"].nil?
       end
       thr = Thread.new { speech.start }
       thr.join
+      assert(atomic_boolean.false?)
     end
 
     def test_recognize_websocket
@@ -203,6 +207,7 @@ if !ENV["SPEECH_TO_TEXT_APIKEY"].nil? && !ENV["SPEECH_TO_TEXT_URL"].nil?
       )
       thr = Thread.new { speech.start }
       thr.join
+      assert(atomic_boolean.false?)
     end
 
     def test_inactivity_timeout_using_websocket

data/test/integration/test_visual_recognition_v4.rb

@@ -68,6 +68,15 @@ if !ENV["VISUAL_RECOGNITION_APIKEY"].nil? && !ENV["VISUAL_RECOGNITION_URL"].nil?
       ).result
       refute(result.nil?)
     end
+
+    def test_get_model_file
+      result = @service.get_model_file(
+        collection_id: @collection_id,
+        feature: "objects",
+        model_format: "rscnn"
+      ).result
+      refute(result.nil?)
+    end
   end
 else
   class VisualRecognitionV4Test < Minitest::Test

data/test/unit/test_assistant_v2.rb

@@ -128,4 +128,70 @@ class AssistantV2Test < Minitest::Test
     )
     assert_nil(service_response)
   end
+
+  def test_message_stateless
+    # service.set_default_headers("x-watson-learning-opt-out" => true)
+    assistant_id = "f8fdbc65-e0bd-4e43-b9f8-2975a366d4ec"
+    message_response = {
+      "context" => {
+        "conversation_id" => "1b7b67c0-90ed-45dc-8508-9488bc483d5b",
+        "system" => {
+          "dialog_stack" => ["root"],
+          "dialog_turn_counter" => 1,
+          "dialog_request_counter" => 1
+        }
+      },
+      "intents" => [],
+      "entities" => [],
+      "input" => {},
+      "output" => {
+        "text" => "okay",
+        "log_messages" => []
+      }
+    }
+    headers = {
+      "Content-Type" => "application/json"
+    }
+    stub_request(:post, "https://gateway.watsonplatform.net/assistant/api/v2/assistants/f8fdbc65-e0bd-4e43-b9f8-2975a366d4ec/message?version=2018-02-16")
+      .with(
+        body: "{\"input\":{\"text\":\"Turn on the lights\"}}",
+        headers: {
+          "Accept" => "application/json",
+          "Content-Type" => "application/json",
+          "Host" => "gateway.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: message_response.to_json, headers: headers)
+    service_response = service.message_stateless(
+      assistant_id: assistant_id,
+      input: { "text" => "Turn on the lights" },
+      context: nil
+    )
+    assert_equal(message_response, service_response.result)
+
+    message_ctx = {
+      "context" => {
+        "conversation_id" => "1b7b67c0-90ed-45dc-8508-9488bc483d5b",
+        "system" => {
+          "dialog_stack" => ["root"],
+          "dialog_turn_counter" => 2,
+          "dialog_request_counter" => 1
+        }
+      }
+    }
+    stub_request(:post, "https://gateway.watsonplatform.net/assistant/api/v2/assistants/f8fdbc65-e0bd-4e43-b9f8-2975a366d4ec/message?version=2018-02-16")
+      .with(
+        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",
+          "Content-Type" => "application/json",
+          "Host" => "gateway.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: message_response.to_json, headers: headers)
+    service_response = service.message_stateless(
+      assistant_id: assistant_id,
+      input: { "text" => "Turn on the lights" },
+      context: message_ctx["context"].to_json
+    )
+    assert_equal(message_response, service_response.result)
+  end
 end

data/test/unit/test_personality_insights_v3.rb

@@ -33,6 +33,7 @@ class PersonalityInsightsV3Test < Minitest::Test
       version: "2017-10-13",
       authenticator: authenticator
     )
+    service.service_url = "https://gateway.watsonplatform.net/personality-insights/api"
     service_response = service.profile(
       accept: "application/json",
       content: personality_text,
@@ -88,6 +89,7 @@ class PersonalityInsightsV3Test < Minitest::Test
       version: "2017-10-13",
       authenticator: authenticator
     )
+    service.service_url = "https://gateway.watsonplatform.net/personality-insights/api"
     service_response = service.profile(
       accept: "application/json",
       content: personality_text,
@@ -128,6 +130,7 @@ class PersonalityInsightsV3Test < Minitest::Test
       version: "2017-10-13",
       authenticator: authenticator
     )
+    service.service_url = "https://gateway.watsonplatform.net/personality-insights/api"
     service_response = service.profile(
       content: personality_text,
       content_type: "application/json",
@@ -171,6 +174,7 @@ class PersonalityInsightsV3Test < Minitest::Test
       version: "2017-10-13",
       authenticator: authenticator
     )
+    service.service_url = "https://gateway.watsonplatform.net/personality-insights/api"
     service_response = service.profile(
       accept: "application/json",
       content: personality_text,

data/test/unit/test_visual_recognition_v4.rb

@@ -332,4 +332,91 @@ class VisualRecognitionV4Test < Minitest::Test
     )
     assert_equal(response, service_response.result)
   end
+
+  def test_list_object_metadata
+    response = {
+      "objects" => []
+    }
+    stub_request(:get, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections/collid/objects?version=2018-03-19")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Host" => "gateway.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.list_object_metadata(
+      collection_id: "collid"
+    )
+    assert_equal(response, service_response.result)
+  end
+
+  def test_update_object_metadata
+    response = {
+      "objects" => []
+    }
+    stub_request(:post, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections/collid/objects/old_object?version=2018-03-19")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Host" => "gateway.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.update_object_metadata(
+      collection_id: "collid",
+      object: "old_object",
+      new_object: "new_object"
+    )
+    assert_equal(response, service_response.result)
+  end
+
+  def test_get_object_metadata
+    response = {
+      "objects" => []
+    }
+    stub_request(:get, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections/collid/objects/object?version=2018-03-19")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Host" => "gateway.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.get_object_metadata(
+      collection_id: "collid",
+      object: "object"
+    )
+    assert_equal(response, service_response.result)
+  end
+
+  def test_delete_object
+    stub_request(:delete, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections/collid/objects/object?version=2018-03-19")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Host" => "gateway.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: {}.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.delete_object(
+      collection_id: "collid",
+      object: "object"
+    )
+    assert_nil(service_response)
+  end
+
+  def test_get_model_file
+    response = {
+      "binary" => []
+    }
+    stub_request(:get, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections/collid/model?feature=objects&model_format=rscnn_ready&version=2018-03-19")
+      .with(
+        headers: {
+          "Host" => "gateway.watsonplatform.net"
+        }
+      ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.get_model_file(
+      collection_id: "collid",
+      feature: "objects",
+      model_format: "rscnn_ready"
+    )
+    assert_equal(response, service_response.result)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_watson
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Max Nussbaum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -322,7 +322,6 @@ files:
 - test/unit/test_speech_to_text_v1.rb
 - test/unit/test_text_to_speech_v1.rb
 - test/unit/test_tone_analyzer_v3.rb
-- test/unit/test_vcap_using_personality_insights.rb
 - test/unit/test_visual_recognition_v3.rb
 - test/unit/test_visual_recognition_v4.rb
 homepage: https://www.github.com/watson-developer-cloud
@@ -347,7 +346,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Official client library to use the IBM Watson Services

data/test/unit/test_vcap_using_personality_insights.rb

@@ -1,161 +0,0 @@
-# frozen_string_literal: true
-
-require("json")
-require_relative("./../test_helper.rb")
-require("webmock/minitest")
-
-WebMock.disable_net_connect!(allow_localhost: true)
-
-ENV["VCAP_SERVICES"] = JSON.parse(File.read(Dir.getwd + "/resources/vcap-testing.json")).to_json
-
-# Unit tests for VCAP Services using the Personality Insights V3 Service
-class VcapPersonalityInsightsV3Test < Minitest::Test
-  def test_plain_to_json
-    profile_response = File.read(Dir.getwd + "/resources/personality-v3-expect1.txt")
-    personality_text = File.read(Dir.getwd + "/resources/personality-v3.txt")
-    headers = {
-      "Content-Type" => "application/json"
-    }
-    expected_response = IBMWatson::DetailedResponse.new(status: 200, body: JSON.parse(profile_response), headers: headers)
-    stub_request(:post, "https://gateway.watsonplatform.net/personality-insights/api/v3/profile?version=2017-10-13")
-      .with(
-        body: personality_text,
-        headers: {
-          "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
-          "Content-Type" => "text/plain;charset=utf-8",
-          "Host" => "gateway.watsonplatform.net"
-        }
-      ).to_return(status: 200, body: profile_response, headers: headers)
-    authenticator = IBMWatson::Authenticators::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "sample_service")
-    service = IBMWatson::PersonalityInsightsV3.new(
-      version: "2017-10-13",
-      authenticator: authenticator
-    )
-    service_response = service.profile(
-      accept: "application/json",
-      content: personality_text,
-      content_type: "text/plain;charset=utf-8"
-    )
-    assert_equal(expected_response.status, service_response.status)
-    assert_equal(expected_response.result, service_response.result)
-    expected_response.headers.each_key do |key|
-      assert(service_response.headers.key?(key))
-      assert(expected_response.headers[key] == service_response.headers[key])
-    end
-  end
-
-  def test_json_to_json
-    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"
-    }
-    expected_response = IBMWatson::DetailedResponse.new(status: 200, body: 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,
-        headers: {
-          "Accept" => "application/json",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
-          "Content-Type" => "application/json",
-          "Host" => "gateway.watsonplatform.net"
-        }
-      ).to_return(status: 200, body: profile_response, headers: headers)
-    authenticator = IBMWatson::Authenticators::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "sample_service")
-    service = IBMWatson::PersonalityInsightsV3.new(
-      version: "2017-10-13",
-      authenticator: authenticator
-    )
-    service_response = service.profile(
-      accept: "application/json",
-      content: personality_text,
-      content_type: "application/json",
-      raw_scores: true,
-      consumption_preferences: true
-    )
-    assert_equal(expected_response.status, service_response.status)
-    assert_equal(expected_response.result, service_response.result)
-    expected_response.headers.each_key do |key|
-      assert(service_response.headers.key?(key))
-      assert(expected_response.headers[key] == service_response.headers[key])
-    end
-  end
-
-  def test_json_to_csv
-    profile_response = File.read(Dir.getwd + "/resources/personality-v3-expect3.txt")
-    personality_text = File.read(Dir.getwd + "/resources/personality-v3.json")
-    headers = {
-      "Content-Type" => "text/csv"
-    }
-    expected_response = IBMWatson::DetailedResponse.new(status: 200, body: profile_response, headers: headers)
-    stub_request(:post, "https://gateway.watsonplatform.net/personality-insights/api/v3/profile?consumption_preferences=true&csv_headers=true&raw_scores=true&version=2017-10-13")
-      .with(
-        body: personality_text,
-        headers: {
-          "Accept" => "text/csv",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
-          "Content-Type" => "application/json",
-          "Host" => "gateway.watsonplatform.net"
-        }
-      ).to_return(status: 200, body: profile_response, headers: headers)
-    authenticator = IBMWatson::Authenticators::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "sample_service")
-    service = IBMWatson::PersonalityInsightsV3.new(
-      version: "2017-10-13",
-      authenticator: authenticator
-    )
-    service_response = service.profile(
-      content: personality_text,
-      content_type: "application/json",
-      accept: "text/csv",
-      csv_headers: true,
-      raw_scores: true,
-      consumption_preferences: true
-    )
-    assert_equal(expected_response.status, service_response.status)
-    assert_equal(expected_response.result, service_response.result)
-    expected_response.headers.each_key do |key|
-      assert(service_response.headers.key?(key))
-      assert(expected_response.headers[key] == service_response.headers[key])
-    end
-  end
-
-  def test_plain_to_json_es
-    profile_response = JSON.parse(File.read(Dir.getwd + "/resources/personality-v3-expect4.txt"))
-    personality_text = File.read(Dir.getwd + "/resources/personality-v3-es.txt")
-    headers = {
-      "Content-Type" => "application/json"
-    }
-    expected_response = IBMWatson::DetailedResponse.new(status: 200, body: profile_response, headers: headers)
-    stub_request(:post, "https://gateway.watsonplatform.net/personality-insights/api/v3/profile?version=2017-10-13")
-      .with(
-        body: personality_text,
-        headers: {
-          "Accept" => "application/json",
-          "Accept-Language" => "es",
-          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
-          "Content-Language" => "es",
-          "Content-Type" => "text/plain;charset=utf-8",
-          "Host" => "gateway.watsonplatform.net"
-        }
-      ).to_return(status: 200, body: profile_response.to_json, headers: headers)
-    authenticator = IBMWatson::Authenticators::ConfigBasedAuthenticatorFactory.new.get_authenticator(service_name: "sample_service")
-    service = IBMWatson::PersonalityInsightsV3.new(
-      version: "2017-10-13",
-      authenticator: authenticator
-    )
-    service_response = service.profile(
-      accept: "application/json",
-      content: personality_text,
-      content_type: "text/plain;charset=utf-8",
-      content_language: "es",
-      accept_language: "es"
-    )
-    assert_equal(expected_response.status, service_response.status)
-    assert_equal(expected_response.result, service_response.result)
-    expected_response.headers.each_key do |key|
-      assert(service_response.headers.key?(key))
-      assert(expected_response.headers[key] == service_response.headers[key])
-    end
-  end
-end