refactor: pass array query params as comma separated strings

Author: mamoonraja

lib/ibm_watson/discovery_v1.rb

@@ -260,10 +260,11 @@ def list_fields(environment_id:, collection_ids:)
       }
       sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "list_fields")
       headers.merge!(sdk_headers)
+      collection_ids *= "," unless collection_ids.nil?
 
       params = {
         "version" => @version,
-        "collection_ids" => collection_ids.to_a
+        "collection_ids" => collection_ids
       }
 
       method_url = "/v1/environments/%s/fields" % [ERB::Util.url_encode(environment_id)]
@@ -1485,6 +1486,11 @@ def query_notices(environment_id:, collection_id:, filter: nil, query: nil, natu
       }
       sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "query_notices")
       headers.merge!(sdk_headers)
+      _return *= "," unless _return.nil?
+      sort *= "," unless sort.nil?
+      passages_fields *= "," unless passages_fields.nil?
+      similar_document_ids *= "," unless similar_document_ids.nil?
+      similar_fields *= "," unless similar_fields.nil?
 
       params = {
         "version" => @version,
@@ -1494,17 +1500,17 @@ def query_notices(environment_id:, collection_id:, filter: nil, query: nil, natu
         "passages" => passages,
         "aggregation" => aggregation,
         "count" => count,
-        "return" => _return.to_a,
+        "return" => _return,
         "offset" => offset,
-        "sort" => sort.to_a,
+        "sort" => sort,
         "highlight" => highlight,
-        "passages.fields" => passages_fields.to_a,
+        "passages.fields" => passages_fields,
         "passages.count" => passages_count,
         "passages.characters" => passages_characters,
         "deduplicate.field" => deduplicate_field,
         "similar" => similar,
-        "similar.document_ids" => similar_document_ids.to_a,
-        "similar.fields" => similar_fields.to_a
+        "similar.document_ids" => similar_document_ids,
+        "similar.fields" => similar_fields
       }
 
       method_url = "/v1/environments/%s/collections/%s/notices" % [ERB::Util.url_encode(environment_id), ERB::Util.url_encode(collection_id)]
@@ -1686,23 +1692,28 @@ def federated_query_notices(environment_id:, collection_ids:, filter: nil, query
       }
       sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "federated_query_notices")
       headers.merge!(sdk_headers)
+      collection_ids *= "," unless collection_ids.nil?
+      _return *= "," unless _return.nil?
+      sort *= "," unless sort.nil?
+      similar_document_ids *= "," unless similar_document_ids.nil?
+      similar_fields *= "," unless similar_fields.nil?
 
       params = {
         "version" => @version,
-        "collection_ids" => collection_ids.to_a,
+        "collection_ids" => collection_ids,
         "filter" => filter,
         "query" => query,
         "natural_language_query" => natural_language_query,
         "aggregation" => aggregation,
         "count" => count,
-        "return" => _return.to_a,
+        "return" => _return,
         "offset" => offset,
-        "sort" => sort.to_a,
+        "sort" => sort,
         "highlight" => highlight,
         "deduplicate.field" => deduplicate_field,
         "similar" => similar,
-        "similar.document_ids" => similar_document_ids.to_a,
-        "similar.fields" => similar_fields.to_a
+        "similar.document_ids" => similar_document_ids,
+        "similar.fields" => similar_fields
       }
 
       method_url = "/v1/environments/%s/notices" % [ERB::Util.url_encode(environment_id)]
@@ -2265,14 +2276,15 @@ def query_log(filter: nil, query: nil, count: nil, offset: nil, sort: nil)
       }
       sdk_headers = Common.new.get_sdk_headers("discovery", "V1", "query_log")
       headers.merge!(sdk_headers)
+      sort *= "," unless sort.nil?
 
       params = {
         "version" => @version,
         "filter" => filter,
         "query" => query,
         "count" => count,
         "offset" => offset,
-        "sort" => sort.to_a
+        "sort" => sort
       }
 
       method_url = "/v1/logs"

lib/ibm_watson/speech_to_text_v1.rb

@@ -365,9 +365,9 @@ def recognize(audio:, content_type: nil, model: nil, language_customization_id:
       headers = {
         "Content-Type" => content_type
       }
-      keywords *= "," unless keywords.nil?
       sdk_headers = Common.new.get_sdk_headers("speech_to_text", "V1", "recognize")
       headers.merge!(sdk_headers)
+      keywords *= "," unless keywords.nil?
 
       params = {
         "model" => model,
@@ -942,6 +942,7 @@ def create_job(audio:, content_type: nil, model: nil, callback_url: nil, events:
       }
       sdk_headers = Common.new.get_sdk_headers("speech_to_text", "V1", "create_job")
       headers.merge!(sdk_headers)
+      keywords *= "," unless keywords.nil?
 
       params = {
         "model" => model,
@@ -954,7 +955,7 @@ def create_job(audio:, content_type: nil, model: nil, callback_url: nil, events:
         "base_model_version" => base_model_version,
         "customization_weight" => customization_weight,
         "inactivity_timeout" => inactivity_timeout,
-        "keywords" => keywords.to_a,
+        "keywords" => keywords,
         "keywords_threshold" => keywords_threshold,
         "max_alternatives" => max_alternatives,
         "word_alternatives_threshold" => word_alternatives_threshold,

lib/ibm_watson/tone_analyzer_v3.rb

@@ -134,11 +134,12 @@ def tone(tone_input:, content_type: nil, sentences: nil, tones: nil, content_lan
       }
       sdk_headers = Common.new.get_sdk_headers("tone_analyzer", "V3", "tone")
       headers.merge!(sdk_headers)
+      tones *= "," unless tones.nil?
 
       params = {
         "version" => @version,
         "sentences" => sentences,
-        "tones" => tones.to_a
+        "tones" => tones
       }
 
       if content_type.start_with?("application/json") && tone_input.instance_of?(Hash)

test/integration/test_discovery_v1.rb

@@ -104,7 +104,7 @@ def test_collections_fields_query_and_expansions
 
       fields = @service.list_fields(
         environment_id: @environment_id,
-        collection_ids: [new_collection_id]
+        collection_ids: [new_collection_id, @collection_id]
       )
       refute(fields.nil?)
 

test/integration/test_speech_to_text_v1.rb

@@ -80,7 +80,7 @@ def test_recognize_with_keywords
           content_type: "audio/l16; rate=44100",
           timestamps: true,
           word_alternatives_threshold: 0.9,
-          keywords: %w"[colorado tornado]",
+          keywords: %w[colorado tornado],
           keywords_threshold: 0.5
         )
         refute_nil(output.result["results"][0]["alternatives"][0]["transcript"])

test/integration/test_tone_analyzer_v3.rb

@@ -26,19 +26,19 @@ def before_all
     end
 
     def test_tone
-      tone_text = File.read(Dir.getwd + "/resources/personality.txt")
+      tone_text = File.read(Dir.getwd + "/resources/tone-example.json")
       service_response = service.tone(
         tone_input: tone_text,
-        content_type: "text/plain"
+        content_type: "application/json"
       )
       assert((200..299).cover?(service_response.status))
     end
 
     def test_tone_with_args
-      tone_text = File.read(Dir.getwd + "/resources/personality.txt")
+      tone_text = File.read(Dir.getwd + "/resources/tone-example.json")
       service_response = service.tone(
         tone_input: tone_text,
-        content_type: "text/plain",
+        content_type: "application/json",
         sentences: false
       )
       assert((200..299).cover?(service_response.status))