ibm_watson 1.6.0 → 2.1.0

data/test/unit/test_natural_language_understanding_v1.rb

@@ -144,4 +144,235 @@ class NaturalLanguageUnderstandingV1Test < Minitest::Test
     )
     assert_equal({ "deleted" => model_id }, service_response.result)
   end
+
+  def test_sentiment_models
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
+      username: "username",
+      password: "password"
+    )
+    service = IBMWatson::NaturalLanguageUnderstandingV1.new(
+      version: "2018-03-16",
+      authenticator: authenticator
+    )
+
+    stub_request(:post, "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/v1/models/sentiment?version=2018-03-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.natural-language-understanding.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { resulting_key: true }.to_json, headers: { "Content-Type" => "application/json" })
+    training_data = File.open(Dir.getwd + "/resources/weather_data_train.csv")
+    service_response = service.create_sentiment_model(
+      language: "en",
+      training_data: training_data
+    )
+    assert_equal({ "resulting_key" => true }, service_response.result)
+
+    stub_request(:get, "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/v1/models/sentiment?version=2018-03-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.natural-language-understanding.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { resulting_key: true }.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.list_sentiment_models
+    assert_equal({ "resulting_key" => true }, service_response.result)
+
+    stub_request(:get, "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/v1/models/sentiment/model_id?version=2018-03-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.natural-language-understanding.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { resulting_key: true }.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.get_sentiment_model(model_id: "model_id")
+    assert_equal({ "resulting_key" => true }, service_response.result)
+
+    stub_request(:put, "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/v1/models/sentiment/model_id?version=2018-03-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.natural-language-understanding.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { resulting_key: true }.to_json, headers: { "Content-Type" => "application/json" })
+    training_data = File.open(Dir.getwd + "/resources/weather_data_train.csv")
+    service_response = service.update_sentiment_model(
+      model_id: "model_id",
+      language: "en",
+      training_data: training_data
+    )
+    assert_equal({ "resulting_key" => true }, service_response.result)
+
+    stub_request(:delete, "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/v1/models/sentiment/model_id?version=2018-03-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.natural-language-understanding.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { resulting_key: true }.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.delete_sentiment_model(
+      model_id: "model_id"
+    )
+    assert_equal({ "resulting_key" => true }, service_response.result)
+  end
+
+  def test_categories_models
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
+      username: "username",
+      password: "password"
+    )
+    service = IBMWatson::NaturalLanguageUnderstandingV1.new(
+      version: "2018-03-16",
+      authenticator: authenticator
+    )
+
+    stub_request(:post, "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/v1/models/categories?version=2018-03-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.natural-language-understanding.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { resulting_key: true }.to_json, headers: { "Content-Type" => "application/json" })
+    training_data = File.open(Dir.getwd + "/resources/weather_data_train.csv")
+    service_response = service.create_categories_model(
+      language: "en",
+      training_data: training_data
+    )
+    assert_equal({ "resulting_key" => true }, service_response.result)
+
+    stub_request(:get, "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/v1/models/categories?version=2018-03-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.natural-language-understanding.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { resulting_key: true }.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.list_categories_models
+    assert_equal({ "resulting_key" => true }, service_response.result)
+
+    stub_request(:get, "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/v1/models/categories/model_id?version=2018-03-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.natural-language-understanding.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { resulting_key: true }.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.get_categories_model(model_id: "model_id")
+    assert_equal({ "resulting_key" => true }, service_response.result)
+
+    stub_request(:put, "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/v1/models/categories/model_id?version=2018-03-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.natural-language-understanding.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { resulting_key: true }.to_json, headers: { "Content-Type" => "application/json" })
+    training_data = File.open(Dir.getwd + "/resources/weather_data_train.csv")
+    service_response = service.update_categories_model(
+      model_id: "model_id",
+      language: "en",
+      training_data: training_data
+    )
+    assert_equal({ "resulting_key" => true }, service_response.result)
+
+    stub_request(:delete, "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/v1/models/categories/model_id?version=2018-03-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.natural-language-understanding.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { resulting_key: true }.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.delete_categories_model(
+      model_id: "model_id"
+    )
+    assert_equal({ "resulting_key" => true }, service_response.result)
+  end
+
+  def test_classifications_models
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
+      username: "username",
+      password: "password"
+    )
+    service = IBMWatson::NaturalLanguageUnderstandingV1.new(
+      version: "2018-03-16",
+      authenticator: authenticator
+    )
+
+    stub_request(:post, "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/v1/models/classifications?version=2018-03-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.natural-language-understanding.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { resulting_key: true }.to_json, headers: { "Content-Type" => "application/json" })
+    training_data = File.open(Dir.getwd + "/resources/weather_data_train.csv")
+    service_response = service.create_classifications_model(
+      language: "en",
+      training_data: training_data
+    )
+    assert_equal({ "resulting_key" => true }, service_response.result)
+
+    stub_request(:get, "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/v1/models/classifications?version=2018-03-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.natural-language-understanding.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { resulting_key: true }.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.list_classifications_models
+    assert_equal({ "resulting_key" => true }, service_response.result)
+
+    stub_request(:get, "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/v1/models/classifications/model_id?version=2018-03-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.natural-language-understanding.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { resulting_key: true }.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.get_classifications_model(model_id: "model_id")
+    assert_equal({ "resulting_key" => true }, service_response.result)
+
+    stub_request(:put, "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/v1/models/classifications/model_id?version=2018-03-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.natural-language-understanding.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { resulting_key: true }.to_json, headers: { "Content-Type" => "application/json" })
+    training_data = File.open(Dir.getwd + "/resources/weather_data_train.csv")
+    service_response = service.update_classifications_model(
+      model_id: "model_id",
+      language: "en",
+      training_data: training_data
+    )
+    assert_equal({ "resulting_key" => true }, service_response.result)
+
+    stub_request(:delete, "https://api.us-south.natural-language-understanding.watson.cloud.ibm.com/v1/models/classifications/model_id?version=2018-03-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.natural-language-understanding.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { resulting_key: true }.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.delete_classifications_model(
+      model_id: "model_id"
+    )
+    assert_equal({ "resulting_key" => true }, service_response.result)
+  end
 end

data/test/unit/test_text_to_speech_v1.rb

@@ -151,7 +151,7 @@ class TextToSpeechV1Test < Minitest::Test
     assert_equal(response, service_response.result)
   end
 
-  def test_custom_voice_models
+  def test_custom_custom_models
     response = { "customizations" => "yep" }
     authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
       username: "username",
@@ -170,7 +170,7 @@ class TextToSpeechV1Test < Minitest::Test
           "Host" => "api.us-south.text-to-speech.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
-    service_response = service.list_voice_models
+    service_response = service.list_custom_models
     assert_equal(response, service_response.result)
 
     stub_request(:get, "https://api.us-south.text-to-speech.watson.cloud.ibm.com/v1/customizations?language=en-US")
@@ -181,7 +181,7 @@ class TextToSpeechV1Test < Minitest::Test
           "Host" => "api.us-south.text-to-speech.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
-    service_response = service.list_voice_models(
+    service_response = service.list_custom_models(
       language: "en-US"
     )
     assert_equal(response, service_response.result)
@@ -196,7 +196,7 @@ class TextToSpeechV1Test < Minitest::Test
           "Host" => "api.us-south.text-to-speech.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
-    service_response = service.create_voice_model(
+    service_response = service.create_custom_model(
       name: "name",
       description: "description"
     )
@@ -210,7 +210,7 @@ class TextToSpeechV1Test < Minitest::Test
           "Host" => "api.us-south.text-to-speech.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: { "customization" => "yep, just one" }.to_json, headers: { "Content-Type" => "application/json" })
-    service_response = service.get_voice_model(
+    service_response = service.get_custom_model(
       customization_id: "custid"
     )
     assert_equal({ "customization" => "yep, just one" }, service_response.result)
@@ -225,7 +225,7 @@ class TextToSpeechV1Test < Minitest::Test
           "Host" => "api.us-south.text-to-speech.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: "", headers: {})
-    service_response = service.update_voice_model(
+    service_response = service.update_custom_model(
       customization_id: "custid",
       name: "name",
       description: "description"
@@ -239,7 +239,7 @@ class TextToSpeechV1Test < Minitest::Test
           "Host" => "api.us-south.text-to-speech.watson.cloud.ibm.com"
         }
       ).to_return(status: 200, body: "", headers: {})
-    service_response = service.delete_voice_model(
+    service_response = service.delete_custom_model(
       customization_id: "custid"
     )
     assert(service_response.nil?)
@@ -354,4 +354,149 @@ class TextToSpeechV1Test < Minitest::Test
     )
     assert(service_response.nil?)
   end
+
+  def test_custom_prompts
+    response = {
+      "prompt" => "Thank you and good-bye!",
+      "prompt_id" => "goodbye"
+    }
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
+      username: "username",
+      password: "password"
+    )
+    service = IBMWatson::TextToSpeechV1.new(
+      username: "username",
+      password: "password",
+      authenticator: authenticator
+    )
+    stub_request(:get, "https://api.us-south.text-to-speech.watson.cloud.ibm.com/v1/customizations/cust_id/prompts")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.text-to-speech.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.list_custom_prompts(
+      customization_id: "cust_id"
+    )
+    assert_equal(response, service_response.result)
+
+    stub_request(:get, "https://api.us-south.text-to-speech.watson.cloud.ibm.com/v1/customizations/cust_id/prompts/p_id")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.text-to-speech.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.get_custom_prompt(
+      customization_id: "cust_id",
+      prompt_id: "p_id"
+    )
+    assert_equal(response, service_response.result)
+
+    stub_request(:delete, "https://api.us-south.text-to-speech.watson.cloud.ibm.com/v1/customizations/cust_id/prompts/p_id")
+      .with(
+        headers: {
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.text-to-speech.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: "", headers: {})
+    service_response = service.delete_custom_prompt(
+      customization_id: "cust_id",
+      prompt_id: "p_id"
+    )
+    assert(service_response.nil?)
+
+    stub_request(:post, "https://api.us-south.text-to-speech.watson.cloud.ibm.com/v1/customizations/cust_id/prompts/p_id")
+      .with(
+        headers: {
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.text-to-speech.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, headers: { "Content-Type" => "application/json" })
+    audio_file = File.open(Dir.getwd + "/resources/speech.wav")
+    service_response = service.add_custom_prompt(
+      customization_id: "cust_id",
+      prompt_id: "p_id",
+      metadata: { "prompt_text" => "Thank you and good-bye!" },
+      file: audio_file
+    )
+    assert_equal(200, service_response.status)
+  end
+
+  def test_speaker_models
+    response = {
+      "speakers" => [
+        {
+          "speaker_id" => "56367f89-546d-4b37-891e-4eb0c13cc833",
+          "name" => "speaker_one"
+        },
+        {
+          "speaker_id" => "323e4476-63de-9825-7cd7-8120e45f8331",
+          "name" => "speaker_two"
+        }
+      ]
+    }
+
+    authenticator = IBMWatson::Authenticators::BasicAuthenticator.new(
+      username: "username",
+      password: "password"
+    )
+    service = IBMWatson::TextToSpeechV1.new(
+      username: "username",
+      password: "password",
+      authenticator: authenticator
+    )
+    stub_request(:get, "https://api.us-south.text-to-speech.watson.cloud.ibm.com/v1/speakers")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.text-to-speech.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.list_speaker_models
+    assert_equal(response, service_response.result)
+
+    stub_request(:get, "https://api.us-south.text-to-speech.watson.cloud.ibm.com/v1/speakers/speaker_id1")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.text-to-speech.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: response.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.get_speaker_model(
+      speaker_id: "speaker_id1"
+    )
+    assert_equal(response, service_response.result)
+
+    stub_request(:delete, "https://api.us-south.text-to-speech.watson.cloud.ibm.com/v1/speakers/speaker_id1")
+      .with(
+        headers: {
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.text-to-speech.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: "", headers: {})
+    service_response = service.delete_speaker_model(
+      speaker_id: "speaker_id1"
+    )
+    assert(service_response.nil?)
+
+    stub_request(:post, "https://api.us-south.text-to-speech.watson.cloud.ibm.com/v1/speakers?speaker_name=Russ")
+      .with(
+        headers: {
+          "Authorization" => "Basic dXNlcm5hbWU6cGFzc3dvcmQ=",
+          "Host" => "api.us-south.text-to-speech.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: "", headers: {})
+    audio_file = File.open(Dir.getwd + "/resources/speech.wav")
+    service_response = service.create_speaker_model(
+      speaker_name: "Russ",
+      audio: audio_file
+    )
+    assert_equal(200, service_response.status)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm_watson
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Max Nussbaum
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2021-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -44,42 +44,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.10'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.1.0
+        version: 4.4.0
 - !ruby/object:Gem::Dependency
   name: ibm_cloud_sdk_core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.1
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: jwt
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -346,7 +346,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubyforge_project: 
+rubygems_version: 2.7.6.3
 signing_key: 
 specification_version: 4
 summary: Official client library to use the IBM Watson Services