predicsis_ml_sdk 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd94d67a5621a6d3e526bfdaccef5d56f60b9b68
-  data.tar.gz: aee739207c7f1ce163199d12c72dabd39e289770
+  metadata.gz: c542b25c2db14e099b718f4e3395f56d78f9807c
+  data.tar.gz: a93043ef772dd0ca9890220cb596fb5dc1f7fbcc
 SHA512:
-  metadata.gz: d628d0b7739109264f55e7b9241148b3d396f41d7ba75bdf082b6a09783304baf2e1623edb8a3aefceb659aaeace8416e73da8f2199bbc99abfcf76111e6b857
-  data.tar.gz: 9d3eee51c38056711da6e9e8684ae8e8d7eb5501b1b672af36d2bb555aba205e8593088ee7eef80ac6b34e36cd562ddb470409516edadb47ff6d3b2659d8dada
+  metadata.gz: 3b3ef9330d2d65d47d812d1cf31b336b294576c1880fda060008c4d593f9fb001c2b600fa012b584ac6053ed3211297774d2a8958fd373b96da070ca370c2719
+  data.tar.gz: ade4dd944fa10280c2d5753f08a1f1d246ddc7f562585c0135ac75c43fad1101d0c451505873ef917403eefc0ae192c18efb435757c098906616051f0bd55bf5

data/lib/initializer.rb

@@ -1,8 +1,8 @@
 module Initializer
   def self.autoload_paths
-    load "#{self.pwd}/predicsis_ml_sdk/predicsis_error.rb"
-    load "#{self.pwd}/predicsis_ml_sdk/job_stuff.rb"
-    Dir[File.join(self.pwd, 'predicsis_ml_sdk', '*.rb')].each { |file| load file }
+    require "#{self.pwd}/predicsis_ml_sdk/predicsis_error.rb"
+    require "#{self.pwd}/predicsis_ml_sdk/job_stuff.rb"
+    Dir[File.join(self.pwd, 'predicsis_ml_sdk', '**', '*.rb')].each { |file| require file }
   end
 
   private

data/lib/predicsis_ml_sdk/credentials.rb

@@ -9,11 +9,15 @@ module PredicsisMlSdk
     end
 
     def get(type = 's3')
-      data = Requests.get_credentials(@token)
+      data = Requests.get_credentials(type, @token)
       define_attributes(data)
       self
     rescue => e
       raise e
     end
+
+    def to_h
+      instance_variables.each_with_object({}) { |var, hash| hash[var.to_s.delete("@")] = instance_variable_get(var) unless var.to_s == '@token' }
+    end
   end
 end

data/lib/predicsis_ml_sdk/data_file.rb

@@ -1,7 +1,35 @@
 module PredicsisMlSdk
   class DataFile
+    attr_accessor :id
+
     def self.upload(params = {})
+      params.delete('expires_at')
       Requests.upload(params)
     end
+
+    def self.get(id, token = nil)
+      DataFile.new(id, token).get
+    end
+
+    def self.signed_url(id, token = nil)
+      DataFile.new(id, token).signed_url
+    end
+
+    def initialize(id = nil, token = nil)
+      @token = token
+      @id = id
+    end
+
+    def get
+      data = Requests.get_data_file(@token, @id)
+      define_attributes(data)
+      self
+    end
+
+    def signed_url
+      data = Requests.get_signed_url(@token, @id)
+      define_attributes(data)
+      self
+    end
   end
 end

data/lib/predicsis_ml_sdk/requests.rb

@@ -6,7 +6,7 @@ module PredicsisMlSdk
   class Requests
     HTTParty::Basement.default_options.update(verify: false)
 
-    MODELS = %w(source dataset dictionary preparation_rules_set modalities_set report model)
+    MODELS = %w(source dataset dictionary preparation_rules_set modalities_set report model data_file)
 
     class << self
       %w(get post patch delete).each do |method|
@@ -49,22 +49,19 @@ module PredicsisMlSdk
         delete("#{api_host}/settings/tokens/#{id}", nil, headers(token))
       end
 
-      def get_credentials(token)
+      def get_credentials(type, token)
         PredicsisMlSdk.logger.debug 'GET credentials'
-        get("#{api_host}/sources/credentials/s3", nil, headers(token))['credentials']
+        get("#{api_host}/sources/credentials/#{type}", nil, headers(token))['credentials']
       end
 
       def upload(params = {})
-        filename = params.delete(:file)
-        endpoint = params.delete(:url)
-        aws_access_key_id = params.delete(:aws_access_key_id)
-        params.merge!(AwsAccessKeyId: aws_access_key_id, :'Content-Type' => 'multipart/form-data',
-                      acl: 'private', success_action_status: '201', file: File.new(filename))
+        filename = params.delete('file')
+        endpoint = params.delete('signed_url')
         PredicsisMlSdk.logger.debug "UPLOAD #{filename}"
-        response = HTTMultiParty.post("#{endpoint}", query: params)
+        response = HTTParty.put(endpoint, body_stream: File.open(filename),
+                                          headers: { 'Content-Length' => File.size(filename).to_s })
         if [200, 201, 204].include? response.code
-          return response['PostResponse']['Key'] ||
-            Nokogiri::XML.parse(response).xpath('PostResponse/Key').map { |key| key.content }.first
+          params['key'] || params['object']
         else
           fail PredicsisError::RequestError.new(response['message'], JSON.parse(response.body))
         end
@@ -96,6 +93,11 @@ module PredicsisMlSdk
           params, headers(token))['variable']
       end
 
+      def get_signed_url(token, id)
+        PredicsisMlSdk.logger.debug "GET data_files/#{id}/signed_url"
+        get("#{api_host}/data_files/#{id}/signed_url", nil, headers(token))['data_file']
+      end
+
       MODELS.each do |model|
         define_method("post_#{model}") do |token, params = {}|
           PredicsisMlSdk.logger.debug "POST #{model.pluralize}"

data/lib/predicsis_ml_sdk/version.rb

@@ -1,3 +1,3 @@
 module PredicsisMlSdk
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: predicsis_ml_sdk
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Armand
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-21 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json