ibm_watson 1.6.0 → 2.1.0

data/test/integration/test_assistant_v1.rb

@@ -382,6 +382,15 @@ if !ENV["ASSISTANT_APIKEY"].nil? && !ENV["ASSISTANT_URL"].nil?
       )
       assert(service_response.nil?)
     end
+
+    def test_bulk_classify
+      skip "Covered with the unit test.  No need to run it here"
+
+      service_response = service.bulk_classify(
+        workspace_id: ENV["ASSISTANT_WORKSPACE_ID"]
+      )
+      assert(service_response.nil?)
+    end
   end
 else
   class AssistantV1Test < Minitest::Test

data/test/integration/test_assistant_v2.rb

@@ -82,5 +82,14 @@ if !ENV["ASSISTANT_APIKEY"].nil? && !ENV["ASSISTANT_URL"].nil?
       )
       assert(service_response.nil?)
     end
+
+    def test_bulk_classify
+      skip "Covered with the unit test.  No need to run it here"
+
+      service_response = service.bulk_classify(
+        skill_id: ENV["ASSISTANT_WORKSPACE_ID"]
+      )
+      assert(service_response.nil?)
+    end
   end
 end

data/test/integration/test_discovery_v2.rb

@@ -120,6 +120,7 @@ if !ENV["DISCOVERY_V2_APIKEY"].nil?
       )
       query_id = service_response.result["query_id"]
       refute(service_response.nil?)
+      # puts JSON.pretty_generate(service_response.result)
 
       service_response = service.get_training_query(
         project_id: @project_id,
@@ -134,6 +135,12 @@ if !ENV["DISCOVERY_V2_APIKEY"].nil?
         examples: []
       )
       refute(service_response.nil?)
+
+      service_response = service.delete_training_query(
+        project_id: @project_id,
+        query_id: query_id
+      )
+      assert(service_response.nil?)
     end
 
     def test_create_get_update_delete_collection
@@ -238,6 +245,14 @@ if !ENV["DISCOVERY_V2_APIKEY"].nil?
       assert(service_response.nil?)
     end
 
+    def test_query_collection_notices
+      service_response = service.query_collection_notices(
+        project_id: @project_id,
+        collection_id: @collection_id
+      )
+      refute(service_response.result.nil?)
+    end
+
     def test_delete_user_data
       skip "Covered with the unit test.  No need to run it here"
 
@@ -246,6 +261,20 @@ if !ENV["DISCOVERY_V2_APIKEY"].nil?
       )
       assert(service_response.nil?)
     end
+
+    def test_analyze_document
+      skip "CPD only.  Do not run on premium"
+      analyze_data = File.open(Dir.getwd + "/resources/problem.json")
+
+      service_response = service.analyze_document(
+        project_id: @project_id,
+        collection_id: @collection_id,
+        file: analyze_data,
+        file_content_type: "application/json"
+      )
+      assert((200..299).cover?(service_response.status))
+      refute(service_response.nil?)
+    end
   end
 else
   class DiscoveryV2Test < Minitest::Test

data/test/integration/test_natural_language_understanding_v1.rb

@@ -86,7 +86,7 @@ if !ENV["NATURAL_LANGUAGE_UNDERSTANDING_APIKEY"].nil? && !ENV["NATURAL_LANGUAGE_
     end
 
     def test_list_models
-      skip
+      # skip
       service.add_default_headers(
         headers: {
           "X-Watson-Learning-Opt-Out" => "1",
@@ -96,6 +96,139 @@ if !ENV["NATURAL_LANGUAGE_UNDERSTANDING_APIKEY"].nil? && !ENV["NATURAL_LANGUAGE_
       service_response = service.list_models
       assert((200..299).cover?(service_response.status))
     end
+
+    def test_check_orphands
+      skip "Use to help delete old models"
+      service.add_default_headers(
+        headers: {
+          "X-Watson-Learning-Opt-Out" => "1",
+          "X-Watson-Test" => "1"
+        }
+      )
+      service_response = service.list_sentiment_models
+      puts JSON.pretty_generate(service_response.result)
+      service_response = service.list_categories_models
+      puts JSON.pretty_generate(service_response.result)
+      service_response = service.list_classifications_models
+      puts JSON.pretty_generate(service_response.result)
+
+      # service.delete_sentiment_model(model_id: "model_id1")
+      # service.delete_categories_model(model_id: "0122b971-94c9-4468-a98f-930f4ce28c32")
+      # service.delete_classifications_model(model_id: "0122b971-94c9-4468-a98f-930f4ce28c32")
+    end
+
+    def test_sentiment_models
+      # skip "test_sentiment_models"
+      service.add_default_headers(
+        headers: {
+          "X-Watson-Learning-Opt-Out" => "1",
+          "X-Watson-Test" => "1"
+        }
+      )
+      training_data = File.open(Dir.getwd + "/resources/nlu_sentiment_data.csv")
+      service_response = service.create_sentiment_model(
+        language: "en",
+        training_data: training_data
+      )
+      assert((200..299).cover?(service_response.status))
+
+      service_response = service.list_sentiment_models
+      model_id = service_response.result["models"][0]["model_id"]
+      assert((200..299).cover?(service_response.status))
+
+      service_response = service.get_sentiment_model(model_id: model_id)
+      assert((200..299).cover?(service_response.status))
+
+      service_response = service.update_sentiment_model(
+        model_id: model_id,
+        language: "en",
+        training_data: training_data
+      )
+      assert((200..299).cover?(service_response.status))
+
+      service_response = service.delete_sentiment_model(
+        model_id: model_id
+      )
+      assert((200..299).cover?(service_response.status))
+    end
+
+    def test_categories_models
+      # skip "test_categories_models"
+      service.add_default_headers(
+        headers: {
+          "X-Watson-Learning-Opt-Out" => "1",
+          "X-Watson-Test" => "1"
+        }
+      )
+      training_data = File.open(Dir.getwd + "/resources/nlu_categories_training.json")
+      service_response = service.create_categories_model(
+        language: "en",
+        training_data: training_data,
+        training_data_content_type: "application/json"
+      )
+      assert((200..299).cover?(service_response.status))
+
+      service_response = service.list_categories_models
+      model_id = service_response.result["models"][0]["model_id"]
+      assert((200..299).cover?(service_response.status))
+      # puts JSON.pretty_generate(service_response.result)
+      # puts JSON.pretty_generate(model_id)
+
+      service_response = service.get_categories_model(model_id: model_id)
+      assert((200..299).cover?(service_response.status))
+
+      service_response = service.update_categories_model(
+        model_id: model_id,
+        language: "en",
+        training_data: training_data,
+        training_data_content_type: "application/json"
+      )
+      assert((200..299).cover?(service_response.status))
+
+      service_response = service.delete_categories_model(
+        model_id: model_id
+      )
+      assert((200..299).cover?(service_response.status))
+    end
+
+    def test_classifications_models
+      # skip "test_classifications_models"
+      service.add_default_headers(
+        headers: {
+          "X-Watson-Learning-Opt-Out" => "1",
+          "X-Watson-Test" => "1"
+        }
+      )
+      training_data = File.open(Dir.getwd + "/resources/nlu_classifications_training.json")
+      service_response = service.create_classifications_model(
+        language: "en",
+        training_data: training_data,
+        training_data_content_type: "application/json"
+      )
+      assert((200..299).cover?(service_response.status))
+
+      service_response = service.list_classifications_models
+      model_id = service_response.result["models"][0]["model_id"]
+      assert((200..299).cover?(service_response.status))
+      # puts JSON.pretty_generate(service_response.result)
+      # puts JSON.pretty_generate(model_id)
+
+      service_response = service.get_classifications_model(model_id: model_id)
+      assert((200..299).cover?(service_response.status))
+
+      service_response = service.update_classifications_model(
+        model_id: model_id,
+        language: "en",
+        training_data: training_data,
+        training_data_content_type: "application/json"
+      )
+      assert((200..299).cover?(service_response.status))
+
+      service_response = service.delete_classifications_model(
+        model_id: model_id
+      )
+      assert((200..299).cover?(service_response.status))
+    end
   end
 else
   class NaturalLanguageUnderstandingV1Test < Minitest::Test

data/test/integration/test_text_to_speech_v1.rb

@@ -48,13 +48,13 @@ if !ENV["TEXT_TO_SPEECH_APIKEY"].nil? && !ENV["TEXT_TO_SPEECH_URL"].nil?
     end
 
     def test_customizations
-      service_response = @service.list_voice_models
+      service_response = @service.list_custom_models
       refute(service_response.nil?)
     end
 
     def test_custom_words
       skip "Skip to allow for concurrent travis jobs"
-      customization_id = @service.create_voice_model(
+      customization_id = @service.create_custom_model(
         name: "test_integration_customization",
         description: "customization for tests"
       ).result["customization_id"]
@@ -79,10 +79,67 @@ if !ENV["TEXT_TO_SPEECH_APIKEY"].nil? && !ENV["TEXT_TO_SPEECH_URL"].nil?
         word: "MACLs"
       ).result
       assert(word["translation"] == "mackles")
-      @service.delete_voice_model(
+      @service.delete_custom_model(
         customization_id: customization_id
       )
     end
+
+    def test_custom_prompts
+      customization_id = @service.create_custom_model(
+        name: "test_integration_customization",
+        description: "RUBY customization for tests"
+      ).result["customization_id"]
+
+      prompt_metadata = { prompt_text: "Thank you and goodbye" }
+      prompt_json = JSON[prompt_metadata]
+      audio_file = File.open(Dir.getwd + "/resources/speech.wav")
+      prompt = @service.add_custom_prompt(
+        customization_id: customization_id,
+        prompt_id: "rubyprompt_id",
+        metadata: prompt_json,
+        file: audio_file
+      ).result["prompt"]
+      assert(prompt == "Thank you and goodbye")
+
+      prompts = @service.list_custom_prompts(customization_id: customization_id).result["prompts"]
+      refute(prompts.nil?)
+
+      prompt = @service.get_custom_prompt(
+        customization_id: customization_id,
+        prompt_id: "rubyprompt_id"
+      ).result["prompt"]
+      assert(prompt == "Thank you and goodbye")
+
+      @service.delete_custom_prompt(
+        customization_id: customization_id,
+        prompt_id: "rubyprompt_id"
+      )
+
+      @service.delete_custom_model(
+        customization_id: customization_id
+      )
+    end
+
+    def test_speaker_models
+      audio_file = File.open(Dir.getwd + "/resources/speech.wav")
+      @service.create_speaker_model(
+        speaker_name: "RubyMike",
+        audio: audio_file
+      ).result["speaker_model"]
+
+      speakers = @service.list_speaker_models.result["speakers"]
+      speaker_id = speakers[0]["speaker_id"]
+      # puts JSON.pretty_generate(speakers)
+
+      @service.get_speaker_model(
+        speaker_id: speaker_id
+      ).result["models_speaker"]
+
+      # speaker_id = d3d03b69-4035-4420-928d-7ac2e0249829
+      @service.delete_speaker_model(
+        speaker_id: speaker_id
+      )
+    end
   end
 else
   class TextToSpeechV1Test < Minitest::Test

data/test/unit/test_assistant_v1.rb

@@ -8,7 +8,7 @@ SimpleCov.command_name "test:unit"
 
 WebMock.disable_net_connect!(allow_localhost: true)
 
-# Unit tests for the Watson Assistant V1 Service
+# Unit tests for the Watson Assistant V1 Services
 class AssistantV1Test < Minitest::Test
   include Minitest::Hooks
   attr_accessor :service
@@ -1401,4 +1401,55 @@ class AssistantV1Test < Minitest::Test
     )
     assert_equal({ "list_mentions_response" => "yes" }, service_response.result)
   end
+
+  def test_bulk_classify
+    workspace_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://api.us-south.assistant.watson.cloud.ibm.com/v1/workspaces/f8fdbc65-e0bd-4e43-b9f8-2975a366d4ec/bulk_classify?version=2018-02-16")
+      .with(
+        body: "{\"input\":{\"text\":\"Turn on the lights\"}}",
+        headers: {
+          "Accept" => "application/json",
+          "Content-Type" => "application/json",
+          "Host" => "api.us-south.assistant.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: message_response.to_json, headers: headers)
+    service_response = service.bulk_classify(
+      workspace_id: workspace_id,
+      input: { "text" => "Turn on the lights" }
+    )
+    assert_equal(message_response, service_response.result)
+
+    stub_request(:post, "https://api.us-south.assistant.watson.cloud.ibm.com/v1/workspaces/f8fdbc65-e0bd-4e43-b9f8-2975a366d4ec/bulk_classify?version=2018-02-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Content-Type" => "application/json",
+          "Host" => "api.us-south.assistant.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: message_response.to_json, headers: headers)
+    service_response = service.bulk_classify(
+      workspace_id: workspace_id
+    )
+    assert_equal(message_response, service_response.result)
+  end
 end

data/test/unit/test_assistant_v2.rb

@@ -222,4 +222,55 @@ class AssistantV2Test < Minitest::Test
     )
     assert_nil(service_response)
   end
+
+  def test_bulk_classify
+    skill_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://api.us-south.assistant.watson.cloud.ibm.com/v2/skills/f8fdbc65-e0bd-4e43-b9f8-2975a366d4ec/workspace/bulk_classify?version=2018-02-16")
+      .with(
+        body: "{\"input\":{\"text\":\"Turn on the lights\"}}",
+        headers: {
+          "Accept" => "application/json",
+          "Content-Type" => "application/json",
+          "Host" => "api.us-south.assistant.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: message_response.to_json, headers: headers)
+    service_response = service.bulk_classify(
+      skill_id: skill_id,
+      input: { "text" => "Turn on the lights" }
+    )
+    assert_equal(message_response, service_response.result)
+
+    stub_request(:post, "https://api.us-south.assistant.watson.cloud.ibm.com/v2/skills/f8fdbc65-e0bd-4e43-b9f8-2975a366d4ec/workspace/bulk_classify?version=2018-02-16")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Content-Type" => "application/json",
+          "Host" => "api.us-south.assistant.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: message_response.to_json, headers: headers)
+    service_response = service.bulk_classify(
+      skill_id: skill_id
+    )
+    assert_equal(message_response, service_response.result)
+  end
 end

data/test/unit/test_discovery_v2.rb

@@ -295,7 +295,7 @@ class DiscoveryV2Test < Minitest::Test
   end
 
   def test_analyze_document
-    skip "not available yet"
+    # skip "not available yet"
 
     stub_request(:post, "https://api.us-south.discovery.watson.cloud.ibm.com/discovery/api/v2/projects/project/collections/collid/analyze?version=2018-03-05")
       .with(
@@ -467,4 +467,33 @@ class DiscoveryV2Test < Minitest::Test
     )
     assert_nil(service_response)
   end
+
+  def test_delete_training_query
+    stub_request(:delete, "https://api.us-south.discovery.watson.cloud.ibm.com/discovery/api/v2/projects/project/training_data/queries/queryid?version=2018-03-05")
+      .with(
+        headers: {
+          "Host" => "api.us-south.discovery.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { "body" => "hello" }.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.delete_training_query(
+      project_id: "project",
+      query_id: "queryid"
+    )
+    assert_nil(service_response)
+  end
+
+  def test_query_collection_notices
+    stub_request(:get, "https://api.us-south.discovery.watson.cloud.ibm.com/discovery/api/v2/projects/project/collections/collection/notices?version=2018-03-05")
+      .with(
+        headers: {
+          "Accept" => "application/json",
+          "Host" => "api.us-south.discovery.watson.cloud.ibm.com"
+        }
+      ).to_return(status: 200, body: { "body" => "hello" }.to_json, headers: { "Content-Type" => "application/json" })
+    service_response = service.query_collection_notices(
+      project_id: "project",
+      collection_id: "collection"
+    )
+    assert_equal({ "body" => "hello" }, service_response.result)
+  end
 end