cnvrg 1.6.22 → 1.6.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edee87a5b2d2c1693d36ddcfeb992b4e87a88521988e6335844ab522401cee46
-  data.tar.gz: bd0286b12dc83235c57bcf64726d2af6860608e0a061c885888bf044129d1ab0
+  metadata.gz: e02d88ff10cc1d512fcc462c36a2414c369db01d9f153e3fcd7e0c16323a7ed3
+  data.tar.gz: 4d229c75a62ddeaef049878712f6efd5a9ed9d2282ce178c5668a16ca151b341
 SHA512:
-  metadata.gz: e1421a63d3a34350f181deaead9c9b5f1cebe91f75f675a81d2a0cb49de0990d690efc08ba9e8ef74315b44041889ed093e19fbf4a9a271ec0f1394b39c45748
-  data.tar.gz: 67872a7abe1dbac6d001c28c4a556c0b8c09b153dade45eb6a6e54ed318a804235e089504c5e2e409cef27dde5235ea1ab35d7a239bc7aefad976ce60969e111
+  metadata.gz: cb33e353617be53f4b0644189709830413e02c758d70043a51c6674493578d12411bec4cc50590ca2956f731f08043842783f984bca588618714a7c122e1cbe9
+  data.tar.gz: 19ea024dda8473f01bae568c7ed5f8cea6ec55475e044f6eb25d96cd58fb852dcc33fe6ba0b1c0b55290f46bd2cf5977710e6d9f5df8940b920e836a74f46c09

data/lib/cnvrg/cli.rb

@@ -1184,7 +1184,7 @@ module Cnvrg
     end
 
     desc '', '', :hide => true
-    def data_put(dataset_url, files: [], dir: '', chunk_size: 1000)
+    def data_put(dataset_url, files: [], dir: '', commit: '', chunk_size: 1000)
       begin
         verify_logged_in(false)
         log_start(__method__, args, options)
@@ -1203,11 +1203,21 @@ module Cnvrg
         end
         log_message("Uploading #{@files.size} files", Thor::Shell::Color::GREEN)
         number_of_chunks = (@files.size.to_f / chunk_size).ceil
-        response = @datafiles.start_commit(false, true, chunks: number_of_chunks)
-        unless response #means we failed in the start commit.
-          raise SignalException.new(1, "Cant put files into server, check the dataset slug")
+        if commit.blank?
+          response = @datafiles.start_commit(false, true, chunks: number_of_chunks)
+          unless response #means we failed in the start commit.
+            raise SignalException.new(1, "Cant put files into dataset, check the dataset id")
+          end
+          @commit =  response['result']['commit_sha1']
+        elsif commit.eql? "latest"
+          response = @datafiles.last_valid_commit()
+          unless response #means we failed in the start commit.
+            raise SignalException.new(1, "Cant put files into commit:#{commit}, check the dataset id and commitc")
+          end
+          @commit = response['result']['sha1']
+        else
+          @commit = commit
         end
-        @commit = response['result']['commit_sha1']
         #dir shouldnt have starting or ending slash.
         dir = dir[0..-2] if dir.end_with? '/'
         dir = dir[1..-1] if dir.start_with? '/'
@@ -1217,9 +1227,11 @@ module Cnvrg
           #will throw a signal exception if something goes wrong.
           @datafiles.upload_multiple_files(@commit, temp_tree, force: true, prefix: dir, total: @files.size)
         end
-        res = @datafiles.put_commit(@commit)
-        unless res.is_success?
-          raise SignalException.new(1, res.msg)
+        if commit.blank?
+          res = @datafiles.put_commit(@commit)
+          unless res.is_success?
+            raise SignalException.new(1, res.msg)
+          end
         end
         log_message("Upload finished Successfully", Thor::Shell::Color::GREEN)
       rescue SignalException => e

data/lib/cnvrg/data.rb

@@ -185,10 +185,12 @@ module Cnvrg
 
     desc 'data put DATASET_URL FILES_PREFIX', 'Upload selected files from local dataset directory to remote server'
     method_option :dir, :type => :string, :aliases => ["-d", "--dir"], :default => ''
+    method_option :commit, :type => :string, :aliases => ["-c", "--commit"], :default => ''
     def put(dataset_url, *files)
       cli = Cnvrg::CLI.new()
       dir = options[:dir]
-      cli.data_put(dataset_url, files: files, dir: dir)
+      commit = options[:commit]
+      cli.data_put(dataset_url, files: files, dir: dir, commit: commit)
     end
 
     desc 'data clone_query --query=QUERY_SLUG DATASET_URL', 'Clone dataset with specific query'

data/lib/cnvrg/datafiles.rb

@@ -898,6 +898,17 @@ module Cnvrg
         return false
       end
     end
+    def last_valid_commit()
+      begin
+        #if we are pushing with force or to branch we dont need to send current/next commit cause we want to
+        # create a new commit.
+        response = Cnvrg::API.request("#{base_resource}/last_valid_commit", 'GET')
+        Cnvrg::CLI.is_response_success(response, true)
+        return response
+      rescue => e
+        return false
+      end
+    end
 
     def end_commit(commit_sha1,force, success: true, uploaded_files: 0 )
       begin

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '1.6.22'
+  VERSION = '1.6.23'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.6.22
+  version: 1.6.23
 platform: ruby
 authors:
 - Yochay Ettun
@@ -477,7 +477,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A CLI tool for interacting with cnvrg.io.