ibm-ml 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 6f259dbcfbeb8baa701a1d76c5ebfe44bc005eb8
-  data.tar.gz: abfd76da8bb4577c35933975bb86069d6eca9b40
+SHA256:
+  metadata.gz: 28e28748b9764e40344b434a24248af233a64c0e8cc8a72b3584f5956af9538a
+  data.tar.gz: e3e0f009477cc585f0adf0a1429c286973f80da9a20e61bb4d933956a64d5492
 SHA512:
-  metadata.gz: 2e423c9d9d03bf7d64d5a1faab6bb9a0f1e0098bbd1cbb622d4e697c95d06cc45f86221e3090908000a7f5ad8fcee4067d0143c868a5d28cf7ef2f68327aa897
-  data.tar.gz: 0941b84896e0b85692265c177201a4c427116f4e10ecf2f1cdb409fe108f9ed7d1596846cbed1a4c76921a4fd3e1808add1e388077060ec94c9f8cae6fc66c74
+  metadata.gz: 5a7e67d7af443cfa10feca24d2ff5c4b36f8efd104e25c3e353786d8b11d6453fdd6b41f56ae6bbd0ae99609d3d8d063a15e3b40538856d7d014e521c7f69db4
+  data.tar.gz: 0044f91526e70317f14dc09910110765793483b36dbbac28b9b1c477557d489a4d559b93a6ec740745cd5011ae6eb69ef934df7076819736b38aed88bf0c9a66

data/.gitignore

@@ -13,3 +13,6 @@
 
 # rspec failure tracking
 .rspec_status
+
+# Ruby version files
+.ruby-version

data/.rubocop.yml

@@ -3,4 +3,6 @@ Metrics/LineLength:
 Metrics/MethodLength:
   Max: 15
 Metrics/AbcSize:
-  Max: 25
+  Max: 25
+Style/FrozenStringLiteralComment:
+  Enabled: false

data/.travis.yml

@@ -1,8 +1,8 @@
 sudo: false
 language: ruby
 rvm:
-- 2.4.0
-- 2.0.0
+- 2.4.3
+- 2.3.6
 cache: bundler
 script:
 - bundle exec rake
@@ -13,4 +13,4 @@ deploy:
   api_key:
     secure: KrW9QsWC2deO9ubwZxQSRcbL8Azj4xkE0KpY30B564/o3qJOFZN98cevVJ7EujyxA+HVXWsdvEsr+PHk17fCSbSlbnmcRS0C7BSy7RCNWgHhDd2hiUG32QXszpr5ZFvXkzlZ9N5gNRzlIpOVckQS2swYCt20GNTn6XQ69a9j7wMER68bDT4gWCkq+xssioS5PaE1hFqOvPDXRltigIz3cZz8+8UDnPzprTyyJ235KNktEFs4OUWGrDwfbgoJs3K744+PvYyTxw+xenlZ6huZqEYmYAws/okIPKenQ/qiTBOx4RRRkVOXWzZ4kUexJiAdIoxKunZ1bPjTtip3AKa1nu3FdgJqq3DZxxX5wftKyeeZYyOoZs+e24Vi79JGXSRcHpMDi578nd5Fqu1UU6weTjS11DHhxX2rPNYRBcvCwXxKCnrw3IY8bzhQ2cF3K1PTV6g6RCXqEY/IKqex6RUw+dcPxqFNaH5VIgyDxs3TUUkEUmsGfHZmyz1MXNjnrLJRQki+H25LpHhOP/lcwJZuLjwNca5uBp01M0R89gsumLVvI5fxpteWjFMUTMZ397sC6Ve0/PmggYxuwLre1nT1N8MMVX79oHXwxeOHltw9lcR4wOc7oIPX8BzgtLvnCvsha9AHXP8F0n0u2F8UrJr25sBQ0CXLpTeTG+zG2t63L5s=
   on:
-    rvm: 2.4.0
+    rvm: 2.4.3

data/README.md

@@ -1,6 +1,6 @@
 # IBM::ML
 [![Gem Version](https://badge.fury.io/rb/ibm-ml.svg)](https://badge.fury.io/rb/ibm-ml)
-[![Build Status](https://travis-ci.org/IBM-ATAT/ibm-ml-ruby.svg?branch=master)](https://travis-ci.org/IBM-ATAT/ibm-ml-ruby)
+[![Build Status](https://travis-ci.org/IBM-DSE/ibm-ml-ruby.svg?branch=master)](https://travis-ci.org/IBM-DSE/ibm-ml-ruby)
 
 A Ruby gem to invoke the IBM Machine Learning service REST API.
 
@@ -11,7 +11,7 @@ Currently supports:
 ## Installation
 
 ### With Gem
-After [installing Ruby](https://www.ruby-lang.org/en/documentation/installation/) >= 2.0:
+After [installing Ruby](https://www.ruby-lang.org/en/documentation/installation/) >= 2.3:
 
 ```bash
 $ gem install ibm-ml
@@ -52,12 +52,13 @@ record = {
 
 ### Cloud 
 ```ruby
-CLOUD_USERNAME  =  # WML service username
-CLOUD_PASSWORD  =  # WML service password
-DEPLOYMENT_ID   =  # deployment ID
+CLOUD_USERNAME    =  # WML service username
+CLOUD_PASSWORD    =  # WML service password
+CLOUD_INSTANCE_ID =  # WML instance ID
+DEPLOYMENT_ID     =  # deployment ID
 
 # Create the service object
-ml_service = IBM::ML::Cloud.new(CLOUD_USERNAME, CLOUD_PASSWORD)
+ml_service = IBM::ML::Cloud.new(CLOUD_USERNAME, CLOUD_PASSWORD, CLOUD_INSTANCE_ID)
 
 # Fetch an authentication token
 pp ml_service.fetch_token
@@ -114,5 +115,5 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at [https://github.com/IBM-ATAT/ibm-ml-ruby](https://github.com/IBM-ATAT/ibm-ml-ruby).
+Bug reports and pull requests are welcome on GitHub at [https://github.com/IBM-DSE/ibm-ml-ruby](https://github.com/IBM-DSE/ibm-ml-ruby).
 

data/ibm-ml.gemspec

@@ -1,5 +1,5 @@
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'ibm/ml/version'
 
@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.description   = 'Simplifies development of applications using an IBM Machine Learning service '\
                        'by providing methods for getting deployments and calling them. '\
                        'Operates with both IBM Watson Machine Learning as well as Machine Learning on DSX Local.'
-  spec.homepage      = 'https://github.com/IBM-ATAT/ibm-ml-ruby'
+  spec.homepage      = 'https://github.com/IBM-DSE/ibm-ml-ruby'
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
@@ -25,5 +25,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
-  spec.add_development_dependency 'rubocop', '~> 0.49'
+  spec.add_development_dependency 'rubocop', '~> 0.54'
 end

data/lib/ibm/ml.rb

@@ -9,7 +9,8 @@ module IBM
     require_relative 'ml/local'
     require_relative 'ml/zos'
 
-    def initialize(username, password)
+    def initialize(host, username, password)
+      @host         = host
       @username     = username
       @password     = password
       uri           = URI("https://#{@host}")
@@ -18,19 +19,25 @@ module IBM
     end
 
     def fetch_token
-      uri          = URI.parse ldap_url
-      http         = Net::HTTP.new uri.host, uri.port
-      http.use_ssl = uri.scheme == 'https'
+      url      = URI(ldap_url)
+      request  = ldap_request(url)
+      response = @http.request request
 
-      response = http.request ldap_request(http, uri)
+      if response.is_a? Net::HTTPClientError
+        begin
+          body = JSON.parse(response.read_body)
+          raise(AuthError, body['errors'][0]['message']) if body.key?('errors')
+        rescue JSON::ParserError
+          raise response.class.to_s
+        end
+      end
 
-      raise response.class.to_s if response.is_a? Net::HTTPClientError
       process_ldap_response(response)
     end
 
     def query_ml_score(score, field, values_key)
       fields = score['fields'].map(&:upcase)
-      index = fields.index(field.upcase)
+      index  = fields.index(field.upcase)
       score[values_key].map { |record| record[index] }[0]
     end
 
@@ -52,14 +59,14 @@ module IBM
     end
 
     def post_request(url, body)
-      request = Net::HTTP::Post.new(url, post_header)
+      request      = Net::HTTP::Post.new(url, post_header)
       request.body = body
-      response = @http.request(request)
+      response     = @http.request(request)
       JSON.parse(response.read_body)
     end
 
     def post_header
-      header = auth_header
+      header                 = auth_header
       header['content-type'] = 'application/json'
       header
     end

data/lib/ibm/ml/cloud.rb

@@ -4,18 +4,18 @@ module IBM
     class Cloud
       include ML
 
-      def initialize(username, password)
-        @host = 'ibm-watson-ml.mybluemix.net'
-        super
+      def initialize(username, password, instance_id)
+        super('ibm-watson-ml.mybluemix.net', username, password)
+        @instance_id = instance_id
         @http.use_ssl = true
       end
 
       def models
-        get_request "https://#{@host}/v2/published_models", 'resources'
+        get_request "#{instance_url}/published_models", 'resources'
       end
 
       def deployments
-        get_request "https://#{@host}/v2/deployments", 'resources'
+        get_request "#{instance_url}/deployments", 'resources'
       end
 
       def deployment(deployment_id)
@@ -27,7 +27,7 @@ module IBM
       end
 
       def model(model_id)
-        get_request "https://#{@host}/v2/published_models/#{model_id}", 'entity'
+        get_request "#{instance_url}/published_models/#{model_id}", 'entity'
       end
 
       def model_by_name(name)
@@ -40,12 +40,17 @@ module IBM
       end
 
       def score(deployment_id, record)
-        deployment = deployment(deployment_id)['entity']
-        model_fields = model(deployment['published_model']['guid'])['entity']['input_data_schema']['fields']
+        deployment  = deployment(deployment_id)['entity']
+        field_names = model_of_deployment(deployment)['entity']['input_data_schema']['fields'].map do |f|
+          f['name']
+        end
+
+        cleaned_rec   = record.map { |k, v| [k.downcase, v] }.to_h
+        record_values = field_names.map { |name| cleaned_rec[name.downcase] }
 
-        response = post_request deployment['scoring_href'], {
-          fields: model_fields.map { |field| field['name'] },
-          values: [record.values]
+        response = post_request deployment['scoring_url'], {
+          fields: field_names,
+          values: [record_values]
         }.to_json
 
         raise(response['message'] + ' : ' + response['description']) if response.key?('message')
@@ -59,12 +64,15 @@ module IBM
       private
 
       def ldap_url
-        "https://#{@host}/v2/identity/token"
+        "https://#{@host}/v3/identity/token"
+      end
+
+      def instance_url
+        "https://#{@host}/v3/wml_instances/#{@instance_id}"
       end
 
-      def ldap_request(http, url)
-        http.use_ssl = true
-        request      = Net::HTTP::Get.new url
+      def ldap_request(url)
+        request = Net::HTTP::Get.new(url)
         request.basic_auth @username, @password
         request
       end
@@ -77,6 +85,7 @@ module IBM
         response['resources'].each do |resource|
           return resource if resource['metadata']['guid'] == guid
         end
+        raise(QueryError, "Could not find resource with id \"#{guid}\"")
       end
 
       def find_by_name(response, name)
@@ -85,8 +94,14 @@ module IBM
         end
         raise(QueryError, "Could not find resource with name \"#{name}\"")
       end
+
+      def model_of_deployment(deployment)
+        model(deployment['published_model']['guid'])
+      end
     end
 
+    class AuthError < StandardError
+    end
     class QueryError < StandardError
     end
   end

data/lib/ibm/ml/local.rb

@@ -1,4 +1,3 @@
-
 module IBM
   module ML
     # Class for calling Local Machine Learning scoring service
@@ -6,13 +5,12 @@ module IBM
       include ML
 
       def initialize(host, username, password)
-        @host = host
-        super(username, password)
+        super
         @http.use_ssl     = true
         @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
 
-      def score(deployment_id, hash)
+      def score(deployment_id, record)
         url = URI("https://#{@host}/v2/scoring/online/#{deployment_id}")
 
         # noinspection RubyStringKeysInHashInspection
@@ -22,7 +20,7 @@ module IBM
         }
 
         request      = Net::HTTP::Post.new(url, header)
-        request.body = { fields: hash.keys, records: [hash.values] }.to_json
+        request.body = { fields: record.keys, records: [record.values] }.to_json
 
         response = @http.request(request)
 
@@ -44,8 +42,7 @@ module IBM
         "https://#{@host}/v2/identity/token"
       end
 
-      def ldap_request(http, uri)
-        http.verify_mode    = OpenSSL::SSL::VERIFY_NONE
+      def ldap_request(uri)
         request             = Net::HTTP::Get.new uri
         request['Username'] = @username
         request['Password'] = @password

data/lib/ibm/ml/version.rb

@@ -1,5 +1,5 @@
 module IBM
   module ML
-    VERSION = '0.2.2'.freeze
+    VERSION = '0.3.0'.freeze
   end
 end

data/lib/ibm/ml/zos.rb

@@ -18,7 +18,7 @@ module IBM
         "http://#{@host}:#{@ldap_port}/v2/identity/ldap"
       end
 
-      def ldap_request(_, url)
+      def ldap_request(url)
         request = Net::HTTP::Post.new(url)
         request.set_content_type 'application/json'
         request.body = { username: @username, password: @password }.to_json

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ibm-ml
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - David Thomason
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-10 00:00:00.000000000 Z
+date: 2018-03-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.54'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.49'
+        version: '0.54'
 description: Simplifies development of applications using an IBM Machine Learning
   service by providing methods for getting deployments and calling them. Operates
   with both IBM Watson Machine Learning as well as Machine Learning on DSX Local.
@@ -90,7 +90,7 @@ files:
 - lib/ibm/ml/local.rb
 - lib/ibm/ml/version.rb
 - lib/ibm/ml/zos.rb
-homepage: https://github.com/IBM-ATAT/ibm-ml-ruby
+homepage: https://github.com/IBM-DSE/ibm-ml-ruby
 licenses:
 - Apache-2.0
 metadata: {}
@@ -110,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Client library for calling IBM Machine Learning API