ibm_watson 1.2.0 → 1.6.0

data/test/unit/test_visual_recognition_v4.rb

@@ -20,7 +20,7 @@ class VisualRecognitionV4Test < Minitest::Test
 
   def test_analyze
     file = File.open(Dir.getwd + "/resources/cnc_test.pdf")
-    stub_request(:post, "https://gateway.watsonplatform.net/visual-recognition/api/v4/analyze?version=2018-03-19").with do |req|
+    stub_request(:post, "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/analyze?version=2018-03-19").with do |req|
       assert_equal(req.headers["Accept"], "application/json")
       assert_match(%r{\Amultipart/form-data}, req.headers["Content-Type"])
       assert_match(/Content-Disposition: form-data/, req.body)
@@ -40,7 +40,7 @@ class VisualRecognitionV4Test < Minitest::Test
   end
 
   def test_analyze_url
-    stub_request(:post, "https://gateway.watsonplatform.net/visual-recognition/api/v4/analyze?version=2018-03-19").with do |req|
+    stub_request(:post, "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/analyze?version=2018-03-19").with do |req|
       assert_equal(req.headers["Accept"], "application/json")
       assert_match(%r{\Amultipart/form-data}, req.headers["Content-Type"])
       assert_match(/Content-Disposition: form-data; name="image_url"/, req.body)
@@ -67,11 +67,11 @@ class VisualRecognitionV4Test < Minitest::Test
         }
       ]
     }
-    stub_request(:post, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections?version=2018-03-19")
+    stub_request(:post, "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections?version=2018-03-19")
       .with(
         headers: {
           "Accept" => "application/json",
-          "Host" => "gateway.watsonplatform.net"
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.create_collection(
@@ -85,11 +85,11 @@ class VisualRecognitionV4Test < Minitest::Test
     response = {
       "collections" => []
     }
-    stub_request(:get, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections?version=2018-03-19")
+    stub_request(:get, "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections?version=2018-03-19")
       .with(
         headers: {
           "Accept" => "application/json",
-          "Host" => "gateway.watsonplatform.net"
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.list_collections
@@ -109,11 +109,11 @@ class VisualRecognitionV4Test < Minitest::Test
         }
       ]
     }
-    stub_request(:get, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections/collid?version=2018-03-19")
+    stub_request(:get, "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections/collid?version=2018-03-19")
       .with(
         headers: {
           "Accept" => "application/json",
-          "Host" => "gateway.watsonplatform.net"
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.get_collection(
@@ -135,11 +135,11 @@ class VisualRecognitionV4Test < Minitest::Test
         }
       ]
     }
-    stub_request(:post, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections/collid?version=2018-03-19")
+    stub_request(:post, "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections/collid?version=2018-03-19")
       .with(
         headers: {
           "Accept" => "application/json",
-          "Host" => "gateway.watsonplatform.net"
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.update_collection(
@@ -150,11 +150,11 @@ class VisualRecognitionV4Test < Minitest::Test
 
   def test_delete_collection
     response = {}
-    stub_request(:delete, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections/collid?version=2018-03-19")
+    stub_request(:delete, "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections/collid?version=2018-03-19")
       .with(
         headers: {
           "Accept" => "application/json",
-          "Host" => "gateway.watsonplatform.net"
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.delete_collection(
@@ -168,11 +168,11 @@ class VisualRecognitionV4Test < Minitest::Test
       "collection_id" => "collid"
     }
     file = File.open(Dir.getwd + "/resources/cnc_test.pdf")
-    stub_request(:post, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections/collid/images?version=2018-03-19")
+    stub_request(:post, "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections/collid/images?version=2018-03-19")
       .with(
         headers: {
           "Accept" => "application/json",
-          "Host" => "gateway.watsonplatform.net"
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.add_images(
@@ -192,11 +192,11 @@ class VisualRecognitionV4Test < Minitest::Test
     response = {
       "collections" => []
     }
-    stub_request(:get, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections/collid/images?version=2018-03-19")
+    stub_request(:get, "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections/collid/images?version=2018-03-19")
       .with(
         headers: {
           "Accept" => "application/json",
-          "Host" => "gateway.watsonplatform.net"
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.list_images(
@@ -209,11 +209,11 @@ class VisualRecognitionV4Test < Minitest::Test
     response = {
       "collection_id" => "collid"
     }
-    stub_request(:get, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections/collid/images/imageid?version=2018-03-19")
+    stub_request(:get, "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections/collid/images/imageid?version=2018-03-19")
       .with(
         headers: {
           "Accept" => "application/json",
-          "Host" => "gateway.watsonplatform.net"
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.get_image_details(
@@ -225,11 +225,11 @@ class VisualRecognitionV4Test < Minitest::Test
 
   def test_delete_image
     response = {}
-    stub_request(:delete, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections/collid/images/imageid?version=2018-03-19")
+    stub_request(:delete, "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections/collid/images/imageid?version=2018-03-19")
       .with(
         headers: {
           "Accept" => "application/json",
-          "Host" => "gateway.watsonplatform.net"
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.delete_image(
@@ -243,10 +243,10 @@ class VisualRecognitionV4Test < Minitest::Test
     response = {
       "collection_id" => "collid"
     }
-    stub_request(:get, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections/collid/images/imageid/jpeg?version=2018-03-19")
+    stub_request(:get, "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections/collid/images/imageid/jpeg?version=2018-03-19")
       .with(
         headers: {
-          "Host" => "gateway.watsonplatform.net"
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.get_jpeg_image(
@@ -260,10 +260,10 @@ class VisualRecognitionV4Test < Minitest::Test
     response = {
       "collection_id" => "collid"
     }
-    stub_request(:post, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections/collid/train?version=2018-03-19")
+    stub_request(:post, "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections/collid/train?version=2018-03-19")
       .with(
         headers: {
-          "Host" => "gateway.watsonplatform.net"
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.train(
@@ -276,11 +276,11 @@ class VisualRecognitionV4Test < Minitest::Test
     response = {
       "collection_id" => "collid"
     }
-    stub_request(:post, "https://gateway.watsonplatform.net/visual-recognition/api/v4/collections/collid/images/imageid/training_data?version=2018-03-19")
+    stub_request(:post, "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections/collid/images/imageid/training_data?version=2018-03-19")
       .with(
         headers: {
           "Accept" => "application/json",
-          "Host" => "gateway.watsonplatform.net"
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.add_image_training_data(
@@ -303,11 +303,11 @@ class VisualRecognitionV4Test < Minitest::Test
 
   def test_delete_user_data
     response = {}
-    stub_request(:delete, "https://gateway.watsonplatform.net/visual-recognition/api/v4/user_data?version=2018-03-19&customer_id=customer")
+    stub_request(:delete, "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/user_data?version=2018-03-19&customer_id=customer")
       .with(
         headers: {
           "Accept" => "application/json",
-          "Host" => "gateway.watsonplatform.net"
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.delete_user_data(
@@ -320,10 +320,10 @@ class VisualRecognitionV4Test < Minitest::Test
     response = {
       "usage" => "usage"
     }
-    stub_request(:get, "https://gateway.watsonplatform.net/visual-recognition/api/v4/training_usage?end_time=end&start_time=start&version=2018-03-19")
+    stub_request(:get, "https://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/training_usage?end_time=end&start_time=start&version=2018-03-19")
       .with(
         headers: {
-          "Host" => "gateway.watsonplatform.net"
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
     service_response = service.get_training_usage(
@@ -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://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections/collid/objects?version=2018-03-19")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
+        }
+      ).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://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections/collid/objects/old_object?version=2018-03-19")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
+        }
+      ).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://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections/collid/objects/object?version=2018-03-19")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
+        }
+      ).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://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections/collid/objects/object?version=2018-03-19")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
+        }
+      ).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://api.us-south.visual-recognition.watson.cloud.ibm.com/v4/collections/collid/model?feature=objects&model_format=rscnn_ready&version=2018-03-19")
+      .with(
+        headers: {
+          "Host" => "api.us-south.visual-recognition.watson.cloud.ibm.com"
+        }
+      ).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.2.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Max Nussbaum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-15 00:00:00.000000000 Z
+date: 2020-08-26 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.1.2
+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