Merge pull request #27 from watson-developer-cloud/inherit-base-class

Inherit base class for Watson services

Author: mamoonraja

README.md

@@ -100,7 +100,7 @@ discovery = IBMWatson::DiscoveryV1.new(
 ```ruby
 # after instantiation, letting the SDK manage the IAM token
 discovery = IBMWatson::DiscoveryV1.new(version: "2017-10-16")
-discovery._iam_apikey(iam_apikey: "<iam_apikey>")
+discovery.iam_apikey(iam_apikey: "<iam_apikey>")
 ```
 
 #### Supplying the access token
@@ -115,7 +115,7 @@ discovery = IBMWatson::DiscoveryV1.new(
 ```ruby
 # after instantiation, assuming control of managing IAM token
 discovery = IBMWatson::DiscoveryV1.new(version: "2017-10-16")
-discovery._iam_access_token(iam_access_token: "<access_token>")
+discovery.iam_access_token(iam_access_token: "<access_token>")
 ```
 
 ### Username and password

examples/assistant_v1.rb

@@ -4,7 +4,7 @@
 require("json")
 
 # If using IAM
-assistant = AssistantV1(
+assistant = IBMWatson::AssistantV1.new(
   iam_apikey: "IAM API KEY",
   version: "2018-02-16"
 )

examples/tone_analyzer_v3.rb

@@ -4,7 +4,7 @@
 require("json")
 
 # If using IAM
-tone_analyzer = ToneAnalyzerV3(
+tone_analyzer = IBMWatson::ToneAnalyzerV3.new(
   iam_apikey: "IAM API KEY",
   version: "2017-09-21"
 )

lib/ibm_watson/assistant_v1.rb

@@ -45,6 +45,7 @@ def request(method:, url:, headers: nil, params: nil, data: nil)
       )
     end
     return JSON.parse(response.body.to_s) if (200..299).cover?(response.code)
+
     require_relative("./watson_api_exception.rb")
     raise WatsonApiException.new(response: response)
   end
@@ -54,17 +55,18 @@ def request(method:, url:, headers: nil, params: nil, data: nil)
   #   2. If this class is managing tokens and does not yet have one, make a request for one
   #   3. If this class is managing tokens and the token has expired refresh it. In case the refresh token is expired, get a new one
   # If this class is managing tokens and has a valid token stored, send it
-  def _token
+  def token
     return @user_access_token unless @user_access_token.nil? || (@user_access_token.respond_to?(:empty?) && @user_access_token.empty?)
+
     if @token_info.all? { |_k, v| v.nil? }
-      token_info = _request_token
-      _save_token_info(
+      token_info = request_token
+      save_token_info(
         token_info: token_info
       )
       return @token_info["access_token"]
-    elsif _is_token_expired?
-      token_info = _is_refresh_token_expired? ? _request_token : _refresh_token
-      _save_token_info(
+    elsif token_expired?
+      token_info = refresh_token_expired? ? request_token : refresh_token
+      save_token_info(
         token_info: token_info
       )
       return @token_info["access_token"]
@@ -73,8 +75,10 @@ def _token
     end
   end
 
+  private
+
   # Request an IAM token using an API key
-  def _request_token
+  def request_token
     headers = {
       "Content-Type" => CONTENT_TYPE,
       "Authorization" => DEFAULT_AUTHORIZATION,
@@ -95,7 +99,7 @@ def _request_token
   end
 
   # Refresh an IAM token using a refresh token
-  def _refresh_token
+  def refresh_token
     headers = {
       "Content-Type" => CONTENT_TYPE,
       "Authorization" => DEFAULT_AUTHORIZATION,
@@ -114,23 +118,13 @@ def _refresh_token
     response
   end
 
-  # Set a self-managed IAM access token.
-  # The access token should be valid and not yet expired.
-  def _access_token(iam_access_token:)
-    @user_access_token = iam_access_token
-  end
-
-  # Set the IAM api key
-  def _iam_apikey(iam_apikey:)
-    @iam_apikey = iam_apikey
-  end
-
   # Check if currently stored token is expired.
   # Using a buffer to prevent the edge case of the
   # token expiring before the request could be made.
   # The buffer will be a fraction of the total TTL. Using 80%.
-  def _is_token_expired?
+  def token_expired?
     return true if @token_info["expiration"].nil? || @token_info["expires_in"].nil?
+
     fraction_of_ttl = 0.8
     time_to_live = @token_info["expires_in"].nil? ? 0 : @token_info["expires_in"]
     expire_time = @token_info["expiration"].nil? ? 0 : @token_info["expiration"]
@@ -142,16 +136,17 @@ def _is_token_expired?
   # Used as a fail-safe to prevent the condition of a refresh token expiring,
   # which could happen after around 30 days. This function will return true
   # if it has been at least 7 days and 1 hour since the last token was set
-  def _is_refresh_token_expired?
+  def refresh_token_expired?
     return true if @token_info["expiration"].nil?
+
     seven_days = 7 * 24 * 3600
     current_time = Time.now.to_i
     new_token_time = @token_info["expiration"] + seven_days
     new_token_time < current_time
   end
 
   # Save the response from the IAM service request to the object's state
-  def _save_token_info(token_info:)
+  def save_token_info(token_info:)
     @token_info = token_info
   end
 end

lib/ibm_watson/discovery_v1.rb

@@ -31,7 +31,7 @@
 module IBMWatson
   ##
   # The Language Translator V3 service.
-  class LanguageTranslatorV3
+  class LanguageTranslatorV3 < WatsonService
     include Concurrent::Async
     ##
     # @!method initialize(args)
@@ -72,7 +72,6 @@ class LanguageTranslatorV3
     #   'https://iam.ng.bluemix.net/identity/token'.
     def initialize(args = {})
       @__async_initialized__ = false
-      super()
       defaults = {}
       defaults[:version] = nil
       defaults[:url] = "https://gateway.watsonplatform.net/language-translator/api"
@@ -82,84 +81,11 @@ def initialize(args = {})
       defaults[:iam_access_token] = nil
       defaults[:iam_url] = nil
       args = defaults.merge(args)
-      @watson_service = WatsonService.new(
-        vcap_services_name: "language_translator",
-        url: args[:url],
-        username: args[:username],
-        password: args[:password],
-        iam_apikey: args[:iam_apikey],
-        iam_access_token: args[:iam_access_token],
-        iam_url: args[:iam_url],
-        use_vcap_services: true
-      )
+      args[:vcap_services_name] = "language_translator"
+      super
       @version = args[:version]
     end
 
-    # :nocov:
-    def add_default_headers(headers: {})
-      @watson_service.add_default_headers(headers: headers)
-    end
-
-    def _iam_access_token(iam_access_token:)
-      @watson_service._iam_access_token(iam_access_token: iam_access_token)
-    end
-
-    def _iam_apikey(iam_apikey:)
-      @watson_service._iam_apikey(iam_apikey: iam_apikey)
-    end
-
-    # @return [DetailedResponse]
-    def request(args)
-      @watson_service.request(args)
-    end
-
-    # @note Chainable
-    # @param headers [Hash] Custom headers to be sent with the request
-    # @return [self]
-    def headers(headers)
-      @watson_service.headers(headers)
-      self
-    end
-
-    def password=(password)
-      @watson_service.password = password
-    end
-
-    def password
-      @watson_service.password
-    end
-
-    def username=(username)
-      @watson_service.username = username
-    end
-
-    def username
-      @watson_service.username
-    end
-
-    def url=(url)
-      @watson_service.url = url
-    end
-
-    def url
-      @watson_service.url
-    end
-
-    # @!method configure_http_client(proxy: {}, timeout: {})
-    # Sets the http client config, currently works with timeout and proxies
-    # @param proxy [Hash] The hash of proxy configurations
-    # @option proxy address [String] The address of the proxy
-    # @option proxy port [Integer] The port of the proxy
-    # @option proxy username [String] The username of the proxy, if authentication is needed
-    # @option proxy password [String] The password of the proxy, if authentication is needed
-    # @option proxy headers [Hash] The headers to be used with the proxy
-    # @param timeout [Hash] The hash for configuring timeouts. `per_operation` has priority over `global`
-    # @option timeout per_operation [Hash] Timeouts per operation. Requires `read`, `write`, `connect`
-    # @option timeout global [Integer] Upper bound on total request time
-    def configure_http_client(proxy: {}, timeout: {})
-      @watson_service.configure_http_client(proxy: proxy, timeout: timeout)
-    end
-    # :nocov:
     #########################
     # Translation
     #########################
@@ -182,6 +108,7 @@ def configure_http_client(proxy: {}, timeout: {})
     # @return [DetailedResponse] A `DetailedResponse` object representing the response.
     def translate(text:, model_id: nil, source: nil, target: nil)
       raise ArgumentError("text must be provided") if text.nil?
+
       headers = {
       }
       params = {
@@ -239,6 +166,7 @@ def list_identifiable_languages
     # @return [DetailedResponse] A `DetailedResponse` object representing the response.
     def identify(text:)
       raise ArgumentError("text must be provided") if text.nil?
+
       headers = {
       }
       params = {
@@ -330,6 +258,7 @@ def list_models(source: nil, target: nil, default_models: nil)
     # @return [DetailedResponse] A `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("base_model_id must be provided") if base_model_id.nil?
+
       headers = {
       }
       params = {
@@ -382,6 +311,7 @@ def create_model(base_model_id:, name: nil, forced_glossary: nil, parallel_corpu
     # @return [DetailedResponse] A `DetailedResponse` object representing the response.
     def delete_model(model_id:)
       raise ArgumentError("model_id must be provided") if model_id.nil?
+
       headers = {
       }
       params = {
@@ -408,6 +338,7 @@ def delete_model(model_id:)
     # @return [DetailedResponse] A `DetailedResponse` object representing the response.
     def get_model(model_id:)
       raise ArgumentError("model_id must be provided") if model_id.nil?
+
       headers = {
       }
       params = {