cnvrg 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f4256d8fe0490792ce6c903208f55fb334c090fb
-  data.tar.gz: 90297a245a2df22569c0f1b11135d09d35f7d1e8
+  metadata.gz: c1eb2a526f32419697a93b9927b01ec1327588db
+  data.tar.gz: cbc3517d2341d6a1905190a6a6f99bfa1e1df20c
 SHA512:
-  metadata.gz: 0abffec7afcb1f5ed6cbbf764cea7826e2aa267e3f5e7f80ba18b5c3338604f4bdb36ad10e8009438b2d2ae437406feed79d4273a7b8f9cfb76f7b2fac43befc
-  data.tar.gz: 8ba624643cbb0772f9fb08880ddb285012a936feb31fae3ef3ca9b0059fcc95da94801e68838a273c82f357e98c42682db96fb94488b295f0a40663ff629c249
+  metadata.gz: 9287cf89d3440a871737dd037c2bc5b3dc6ebc2457ea31cfbd1156d022891460977d44a5993f06620d396ec9604ce5786ba63e957672773dac32a259a2792b45
+  data.tar.gz: 66a9c63f4adccb2720d9cbee9b7f17ac79cedda0e9389bd9300b830c02292ad03259eec1c42e427ea095df1bffe1fa5496d1239d96fe37ce5b207041def87b82

data/lib/cnvrg/cli.rb

@@ -1938,10 +1938,13 @@ module Cnvrg
     def upload_data_new(new_branch,  verbose,sync,force, tags, chunk_size)
       commit = invoke :start_commit_data,[], :new_branch=> new_branch, :direct=>false, :force =>force, :chunk_size => chunk_size
       upload_res = invoke :upload_data_files,[commit],:new_branch=>new_branch, :verbose =>verbose, :force =>force, :sync =>sync, :chunk_size => chunk_size
-      if !upload_res
+      if upload_res < 0
         return
       end
-      invoke :end_commit_data,[commit, success: upload_res] , :new_branch=>new_branch,  :force =>force
+      # if !upload_res
+      #   return
+      # end
+      invoke :end_commit_data,[commit, success: true, uploaded_files: upload_res] , :new_branch=>new_branch,  :force =>force
       if tags
         log_message('Uploading Tags', Thor::Shell::Color::BLUE)
         dataset_dir = is_cnvrg_dir(Dir.pwd)
@@ -2028,7 +2031,7 @@ module Cnvrg
     method_option :new_branch, :type => :boolean, :aliases => ["-nb"], :desc => "create new branch of commits"
     method_option :force, :type => :boolean, :aliases => ["-f","--force"], :default => false
 
-    def end_commit_data(commit, success: true)
+    def end_commit_data(commit, success: true, uploaded_files: 0)
       begin
         verify_logged_in(true)
         log_start(__method__, args, options)
@@ -2036,13 +2039,19 @@ module Cnvrg
         @dataset = Dataset.new(dataset_dir)
         @files = Cnvrg::Datafiles.new(@dataset.owner, @dataset.slug)
         force = options["force"] || false
-
-        resp = @files.end_commit(commit, force, success: success)
+        resp = @files.end_commit(commit, force, success: success, uploaded_files: uploaded_files)
         if (resp and resp["result"])
           check = Helpers.checkmark
-          @dataset.set_next_commit(commit)
-          @dataset.remove_next_commit
-          log_message("#{check} Data files were updated successfully", Thor::Shell::Color::GREEN)
+          if resp["result"]["new_commit"].blank?
+            @dataset.revert_next_commit
+            log_message("#{check} Dataset is up to date", Thor::Shell::Color::GREEN)
+          else
+            log_message("#{check} Data files were updated successfully", Thor::Shell::Color::GREEN)
+            @dataset.set_next_commit(resp["result"]["commit_sha1"]) # no need fo rboth methods FIX
+            @dataset.remove_next_commit()
+
+          end
+
         end
       rescue => e
         puts e
@@ -2133,10 +2142,11 @@ module Cnvrg
           if upload_resp.is_a? Cnvrg::Result
             log_message(upload_resp.msg, upload_resp.msg_color)
 
-            return false
+            return -1
 
           else
             files_uploaded += upload_resp
+            next if upload_resp == 0
           end
 
           temp_tree.each do |k,v|
@@ -2144,7 +2154,7 @@ module Cnvrg
           end
           @dataset.write_idx(new_tree, new_commit)
         end
-        return files_uploaded > 0
+        return files_uploaded
       rescue Exception => e
         puts e
         return false

data/lib/cnvrg/datafiles.rb

@@ -29,6 +29,9 @@ module Cnvrg
       upload_resp = Cnvrg::API.request(@base_resource + "upload_files", 'POST_JSON', {commit_sha1: commit_sha1, tree: tree, force: force, is_branch: new_branch})
       return Cnvrg::Result.new(false, "Failed to upload files") unless Cnvrg::CLI.is_response_success(upload_resp, false)
       results = upload_resp['result'].with_indifferent_access
+        if results['files'].blank?
+          return 0
+        end
       props = Cnvrg::Helpers.get_s3_props(results)
       client = props[:client]
       bucket = props[:bucket]
@@ -756,9 +759,9 @@ module Cnvrg
 
     end
 
-    def end_commit(commit_sha1,force, success: true)
+    def end_commit(commit_sha1,force, success: true, uploaded_files: 0 )
       begin
-        response = Cnvrg::API.request("#{base_resource}/commit/end", 'POST', {commit_sha1: commit_sha1,force:force, success: success})
+        response = Cnvrg::API.request("#{base_resource}/commit/end", 'POST', {commit_sha1: commit_sha1,force:force, success: success, uploaded_files: uploaded_files})
         Cnvrg::CLI.is_response_success(response, true)
         return response
       rescue => e

data/lib/cnvrg/dataset.rb

@@ -501,8 +501,16 @@ module Cnvrg
       idx[:commit] = idx_hash[:next_commit]
       idx[:tree] = idx_hash[:tree]
       File.open("#{self.local_path}/.cnvrg/idx.yml", 'w') { |f| f.write idx.to_yaml }
-
-
+    end
+    def revert_next_commit()
+      if  !File.exist? "#{self.local_path}/.cnvrg/idx.yml"
+        return nil
+      end
+      idx_hash = YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
+      idx = Hash.new()
+      idx[:commit] = idx_hash[:commit]
+      idx[:tree] = idx_hash[:tree]
+      File.open("#{self.local_path}/.cnvrg/idx.yml", 'w') { |f| f.write idx.to_yaml }
     end
     def get_current_commit()
       if  !File.exist? "#{self.local_path}/.cnvrg/idx.yml"

data/lib/cnvrg/experiment.rb

@@ -139,14 +139,6 @@ module Cnvrg
     def restart_spot_instance
 
       restart = false
-      #TODO: remove this later
-      fall_number = rand(1..20)
-      if [5,15].include? fall_number
-        return true
-      else
-        return false
-      end
-
       begin
       url = URI.parse('http://169.254.169.254/latest/meta-data/spot/termination-time')
       req = Net::HTTP::Get.new(url.to_s)

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-04 00:00:00.000000000 Z
+date: 2018-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler