ibm_watson 0.13.0 → 0.14.0

data/lib/ibm_watson/language_translator_v3.rb

@@ -23,16 +23,15 @@
 require "concurrent"
 require "erb"
 require "json"
-require_relative "./detailed_response"
-require_relative "./common.rb"
 
-require_relative "./watson_service"
+require "ibm_cloud_sdk_core"
+require_relative "./common.rb"
 
 # Module for the Watson APIs
 module IBMWatson
   ##
   # The Language Translator V3 service.
-  class LanguageTranslatorV3 < WatsonService
+  class LanguageTranslatorV3 < IBMCloudSdkCore::BaseService
     include Concurrent::Async
     ##
     # @!method initialize(args)
@@ -102,13 +101,13 @@ module IBMWatson
     #   translation.
     # @param source [String] Translation source language code.
     # @param target [String] Translation target language code.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def translate(text:, model_id: nil, source: nil, target: nil)
       raise ArgumentError.new("text must be provided") if text.nil?
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "language_translator", service_version: "V3", operation_id: "translate")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "language_translator", service_version: "V3", operation_id: "translate")
 
       params = {
         "version" => @version
@@ -142,11 +141,11 @@ module IBMWatson
     # List identifiable languages.
     # Lists the languages that the service can identify. Returns the language code (for
     #   example, `en` for English or `es` for Spanish) and name of each language.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def list_identifiable_languages
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "language_translator", service_version: "V3", operation_id: "list_identifiable_languages")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "language_translator", service_version: "V3", operation_id: "list_identifiable_languages")
 
       params = {
         "version" => @version
@@ -169,13 +168,13 @@ module IBMWatson
     # Identify language.
     # Identifies the language of the input text.
     # @param text [String] Input text in UTF-8 format.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def identify(text:)
       raise ArgumentError.new("text must be provided") if text.nil?
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "language_translator", service_version: "V3", operation_id: "identify")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "language_translator", service_version: "V3", operation_id: "identify")
 
       params = {
         "version" => @version
@@ -210,11 +209,11 @@ module IBMWatson
     #   (default and non-default) for each language pair. To return only default models,
     #   set this to `true`. To return only non-default models, set this to `false`. There
     #   is exactly one default model per language pair, the IBM provided base model.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def list_models(source: nil, target: nil, default_models: nil)
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "language_translator", service_version: "V3", operation_id: "list_models")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "language_translator", service_version: "V3", operation_id: "list_models")
 
       params = {
         "version" => @version,
@@ -270,13 +269,13 @@ module IBMWatson
     #   train successfully.
     # @param forced_glossary_filename [String] The filename for forced_glossary.
     # @param parallel_corpus_filename [String] The filename for parallel_corpus.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def create_model(base_model_id:, name: nil, forced_glossary: nil, parallel_corpus: nil, forced_glossary_filename: nil, parallel_corpus_filename: nil)
       raise ArgumentError.new("base_model_id must be provided") if base_model_id.nil?
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "language_translator", service_version: "V3", operation_id: "create_model")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "language_translator", service_version: "V3", operation_id: "create_model")
 
       params = {
         "version" => @version,
@@ -320,13 +319,13 @@ module IBMWatson
     # Delete model.
     # Deletes a custom translation model.
     # @param model_id [String] Model ID of the model to delete.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def delete_model(model_id:)
       raise ArgumentError.new("model_id must be provided") if model_id.nil?
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "language_translator", service_version: "V3", operation_id: "delete_model")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "language_translator", service_version: "V3", operation_id: "delete_model")
 
       params = {
         "version" => @version
@@ -351,13 +350,13 @@ module IBMWatson
     #   models. Use this API call to poll the status of your customization request. A
     #   successfully completed training will have a status of `available`.
     # @param model_id [String] Model ID of the model to get.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def get_model(model_id:)
       raise ArgumentError.new("model_id must be provided") if model_id.nil?
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "language_translator", service_version: "V3", operation_id: "get_model")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "language_translator", service_version: "V3", operation_id: "get_model")
 
       params = {
         "version" => @version

data/lib/ibm_watson/natural_language_classifier_v1.rb

@@ -22,16 +22,15 @@
 require "concurrent"
 require "erb"
 require "json"
-require_relative "./detailed_response"
-require_relative "./common.rb"
 
-require_relative "./watson_service"
+require "ibm_cloud_sdk_core"
+require_relative "./common.rb"
 
 # Module for the Watson APIs
 module IBMWatson
   ##
   # The Natural Language Classifier V1 service.
-  class NaturalLanguageClassifierV1 < WatsonService
+  class NaturalLanguageClassifierV1 < IBMCloudSdkCore::BaseService
     include Concurrent::Async
     ##
     # @!method initialize(args)
@@ -86,7 +85,7 @@ module IBMWatson
     #   can use the classifier to classify text.
     # @param classifier_id [String] Classifier ID to use.
     # @param text [String] The submitted phrase. The maximum length is 2048 characters.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def classify(classifier_id:, text:)
       raise ArgumentError.new("classifier_id must be provided") if classifier_id.nil?
 
@@ -94,7 +93,7 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "natural_language_classifier", service_version: "V1", operation_id: "classify")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "natural_language_classifier", service_version: "V1", operation_id: "classify")
 
       data = {
         "text" => text
@@ -121,7 +120,7 @@ module IBMWatson
     #   Note that classifying Japanese texts is a beta feature.
     # @param classifier_id [String] Classifier ID to use.
     # @param collection [Array[ClassifyInput]] The submitted phrases.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def classify_collection(classifier_id:, collection:)
       raise ArgumentError.new("classifier_id must be provided") if classifier_id.nil?
 
@@ -129,7 +128,7 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "natural_language_classifier", service_version: "V1", operation_id: "classify_collection")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "natural_language_classifier", service_version: "V1", operation_id: "classify_collection")
 
       data = {
         "collection" => collection
@@ -167,7 +166,7 @@ module IBMWatson
     #   preparation](https://cloud.ibm.com/docs/services/natural-language-classifier/using-your-data.html).
     # @param metadata_filename [String] The filename for training_metadata.
     # @param training_data_filename [String] The filename for training_data.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def create_classifier(metadata:, training_data:, metadata_filename: nil, training_data_filename: nil)
       raise ArgumentError.new("metadata must be provided") if metadata.nil?
 
@@ -175,7 +174,7 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "natural_language_classifier", service_version: "V1", operation_id: "create_classifier")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "natural_language_classifier", service_version: "V1", operation_id: "create_classifier")
 
       form_data = {}
 
@@ -207,11 +206,11 @@ module IBMWatson
     # @!method list_classifiers
     # List classifiers.
     # Returns an empty array if no classifiers are available.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def list_classifiers
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "natural_language_classifier", service_version: "V1", operation_id: "list_classifiers")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "natural_language_classifier", service_version: "V1", operation_id: "list_classifiers")
 
       method_url = "/v1/classifiers"
 
@@ -229,13 +228,13 @@ module IBMWatson
     # Get information about a classifier.
     # Returns status and other information about a classifier.
     # @param classifier_id [String] Classifier ID to query.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def get_classifier(classifier_id:)
       raise ArgumentError.new("classifier_id must be provided") if classifier_id.nil?
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "natural_language_classifier", service_version: "V1", operation_id: "get_classifier")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "natural_language_classifier", service_version: "V1", operation_id: "get_classifier")
 
       method_url = "/v1/classifiers/%s" % [ERB::Util.url_encode(classifier_id)]
 
@@ -258,7 +257,7 @@ module IBMWatson
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "natural_language_classifier", service_version: "V1", operation_id: "delete_classifier")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "natural_language_classifier", service_version: "V1", operation_id: "delete_classifier")
 
       method_url = "/v1/classifiers/%s" % [ERB::Util.url_encode(classifier_id)]
 

data/lib/ibm_watson/natural_language_understanding_v1.rb

@@ -27,16 +27,15 @@
 require "concurrent"
 require "erb"
 require "json"
-require_relative "./detailed_response"
-require_relative "./common.rb"
 
-require_relative "./watson_service"
+require "ibm_cloud_sdk_core"
+require_relative "./common.rb"
 
 # Module for the Watson APIs
 module IBMWatson
   ##
   # The Natural Language Understanding V1 service.
-  class NaturalLanguageUnderstandingV1 < WatsonService
+  class NaturalLanguageUnderstandingV1 < IBMCloudSdkCore::BaseService
     include Concurrent::Async
     ##
     # @!method initialize(args)
@@ -133,13 +132,13 @@ module IBMWatson
     #   support](https://www.bluemix.net/docs/services/natural-language-understanding/language-support.html)
     #   for more information.
     # @param limit_text_characters [Fixnum] Sets the maximum number of characters that are processed by the service.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def analyze(features:, text: nil, html: nil, url: nil, clean: nil, xpath: nil, fallback_to_raw: nil, return_analyzed_text: nil, language: nil, limit_text_characters: nil)
       raise ArgumentError.new("features must be provided") if features.nil?
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "natural-language-understanding", service_version: "V1", operation_id: "analyze")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "natural-language-understanding", service_version: "V1", operation_id: "analyze")
 
       params = {
         "version" => @version
@@ -180,11 +179,11 @@ module IBMWatson
     # Lists Watson Knowledge Studio [custom
     #   models](https://cloud.ibm.com/docs/services/natural-language-understanding/customizing.html)
     #   that are deployed to your Natural Language Understanding service.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def list_models
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "natural-language-understanding", service_version: "V1", operation_id: "list_models")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "natural-language-understanding", service_version: "V1", operation_id: "list_models")
 
       params = {
         "version" => @version
@@ -207,13 +206,13 @@ module IBMWatson
     # Delete model.
     # Deletes a custom model.
     # @param model_id [String] Model ID of the model to delete.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def delete_model(model_id:)
       raise ArgumentError.new("model_id must be provided") if model_id.nil?
 
       headers = {
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "natural-language-understanding", service_version: "V1", operation_id: "delete_model")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "natural-language-understanding", service_version: "V1", operation_id: "delete_model")
 
       params = {
         "version" => @version

data/lib/ibm_watson/personality_insights_v3.rb

@@ -38,16 +38,15 @@
 require "concurrent"
 require "erb"
 require "json"
-require_relative "./detailed_response"
-require_relative "./common.rb"
 
-require_relative "./watson_service"
+require "ibm_cloud_sdk_core"
+require_relative "./common.rb"
 
 # Module for the Watson APIs
 module IBMWatson
   ##
   # The Personality Insights V3 service.
-  class PersonalityInsightsV3 < WatsonService
+  class PersonalityInsightsV3 < IBMCloudSdkCore::BaseService
     include Concurrent::Async
     ##
     # @!method initialize(args)
@@ -187,7 +186,7 @@ module IBMWatson
     #   (`text/csv`).
     # @param consumption_preferences [Boolean] Indicates whether consumption preferences are returned with the results. By
     #   default, no consumption preferences are returned.
-    # @return [DetailedResponse] A `DetailedResponse` object representing the response.
+    # @return [IBMCloudSdkCore::DetailedResponse] A `IBMCloudSdkCore::DetailedResponse` object representing the response.
     def profile(content:, accept:, content_type: nil, content_language: nil, accept_language: nil, raw_scores: nil, csv_headers: nil, consumption_preferences: nil)
       raise ArgumentError.new("content must be provided") if content.nil?
 
@@ -199,7 +198,7 @@ module IBMWatson
         "Content-Language" => content_language,
         "Accept-Language" => accept_language
       }
-      headers = Common.new.get_default_headers(headers: headers, service_name: "personality_insights", service_version: "V3", operation_id: "profile")
+      headers = Common.new.get_sdk_headers(headers: headers, service_name: "personality_insights", service_version: "V3", operation_id: "profile")
 
       params = {
         "version" => @version,