predicsis_ml_sdk 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17f846220b672f48e9612199c0f4da13f79768a5
-  data.tar.gz: dd14f5bff6022e47bef01ad7dbba98d2ffb3543a
+  metadata.gz: e55b4f098812ce79e77599cd388e0502cd0d3772
+  data.tar.gz: 7ea659bbdb0850bdddf69c132c03fa5517b76233
 SHA512:
-  metadata.gz: e2136fff6abb55704bff9173e12190bada270ca390657d5b3e1f66263ea4a1472dade520ff9e314eef8f51642aebda15e66d7d540590273b31a4ec87576fc030
-  data.tar.gz: 9a352eb14f112160a19af5e5f460fb589a5a4d0b6ecaeb9a360653a60f21b9a038bd29a002f1658b2d8a1cee3095ca4a07210e95a8b8316d121c9cf10ce17a75
+  metadata.gz: 35ebefab33c0d30b75a274fdc719a71b432089cc31e839e6397ff15754c7828823ed8717fbd80c5c5cb0d1aff7bcdbc87a63cc6e58f49b183e5f2fc5b593542c
+  data.tar.gz: 7bfb8c00039e235d5cac7a92132a7b723284a8d4e9e03961b2f3c9bf36dc3ab9483f1948f74b165bb81b3faa5d40b2016913c7226a655b2978183ad536983267

data/lib/predicsis_ml_sdk/errors.rb

@@ -11,10 +11,11 @@ module PredicsisMlSdk
   class JobError < Error
     attr_reader :job_id, :action
 
-    def initialize(message = nil, error = nil, job_id = nil, action = nil)
-      super(message, error)
+    def initialize(errors = nil, job_id = nil, action = nil)
       @job_id = job_id
       @action = action
+      @errors = errors
+      super(errors.map { |e| e['message'] }.join('. '), errors)
     end
   end
 

data/lib/predicsis_ml_sdk/job.rb

@@ -36,6 +36,11 @@ module PredicsisMlSdk
       self
     end
 
+    def next_job
+      return nil unless next_job_id
+      @next_job ||= Job.get(next_job_id, token)
+    end
+
     def succeeded?
       status.eql? 'completed'
     end
@@ -47,5 +52,15 @@ module PredicsisMlSdk
     def pending?
       %w(pending processing).include? status
     end
+
+    def terminated?
+      if failed?
+        fail JobError.new(errors, id, action)
+      elsif succeeded?
+        next_job ? next_job.terminated? : true
+      else
+        false
+      end
+    end
   end
 end

data/lib/predicsis_ml_sdk/job_stuff.rb

@@ -15,22 +15,13 @@ module PredicsisMlSdk
 
     def terminated?
       return true if @job_ids.empty?
-      if job.failed?
-        fail JobError.new(job.error['message'], job.error, job.id, job.action)
-      else
-        return job.succeeded?
-      end
+      job.terminated?
     end
 
     def wait_for_result
       return if @job_ids.empty?
-      sleep(1) while job.pending?
-      if job.succeeded?
-        get
-      else
-        fail JobError.new(job.error['message'], job.error, job.id, job.action)
-      end
-      self
+      sleep(1) until job.terminated?
+      get
     end
   end
 end

data/lib/predicsis_ml_sdk/requests.rb

@@ -61,7 +61,7 @@ module PredicsisMlSdk
         response = HTTParty.put(endpoint, body_stream: File.open(filename),
                                           headers: { 'Content-Length' => File.size(filename).to_s })
         if [200, 201, 204].include? response.code
-          params['key'] || params['object']
+          params
         else
           fail RequestError.new(response['message'], JSON.parse(response.body))
         end
@@ -104,9 +104,9 @@ module PredicsisMlSdk
       end
 
       MODELS.each do |model|
-        define_method("post_#{model}") do |token, params = {}|
+        define_method("post_#{model}") do |token, params = {}, other_params = {}|
           PredicsisMlSdk.logger.debug "POST #{model.pluralize}"
-          params = { :"#{model}" => params }
+          params = { :"#{model}" => params }.merge(other_params)
           response = post("#{api_host}/#{model.pluralize}", params.to_json, headers(token))
           PredicsisMlSdk.logger.info("#{model}_id: #{response[model]['id']}")
           response[model]

data/lib/predicsis_ml_sdk/source.rb

@@ -1,10 +1,12 @@
 module PredicsisMlSdk
   class Source
     include Util
-    attr_accessor :id
+    include JobStuff
 
-    def self.create(params = {}, token = bearer_token)
-      data = Requests.post_source(token, params)
+    attr_accessor :id, :token
+
+    def self.create(source_params = {}, data_store_params = {}, token = bearer_token)
+      data = Requests.post_source(token, source_params, data_store: data_store_params)
       new(data['id'], token).tap do |source|
         source.define_attributes(data)
       end

data/lib/predicsis_ml_sdk/version.rb

@@ -1,3 +1,3 @@
 module PredicsisMlSdk
-  VERSION = '0.3.1'
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicsis_ml_sdk
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Armand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2016-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json