cnvrg 1.9.9.3 → 1.9.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53ddc2741cb68ba2e0a7952883931cbfc6fc6d0c92ba2a98cd99c3d4bac350ef
-  data.tar.gz: 17a78f413fa1a65027826cf9d4a411176c938e9c260eae5d7813c19c9b6e5e56
+  metadata.gz: 9c3589f491e89ed7e76b625e215b48cd98af828e2de0c3015435d452717740c3
+  data.tar.gz: a32b3b3dac6a0932a5dffe4a900a4f026b01ae524c5f60bc716d44553565eaa4
 SHA512:
-  metadata.gz: c7bc53a1b26f86dc619a80c6bde93e93908916f665dd2e41742c1645cb855ac3b7f36ee1a32ed324204435ca18a6a6f6b4330cede901d1ae6a149affbb14f6a4
-  data.tar.gz: b17527598197acdd1bc0f00b0f461dc38bb621674ffd2ac144cedc68a4b64097fc898c4b9f4f6c562657e656d1cfdcaa79acdae53ec00d7016d85bee2252f519
+  metadata.gz: a9aa02bb0bcb739fe99f423d97bbec6536405588979f6faa5cda6054803419c5112b22a358f833e96981caa912e9e30d65db3cb4554b4d734dd27f59a65d8c45
+  data.tar.gz: 56bf19f2bdde12f8bb3a3f17efe185ecd5ca7edd7050e3fefd0bcb7fa237f800dbbbafb78974135e3e576396aa9d1685e44be19c3ca8491ad8ce90fa6c5fa545

data/lib/cnvrg/cli.rb

@@ -1191,7 +1191,7 @@ module Cnvrg
     end
 
     desc '', '', :hide => true
-    def data_put(dataset_url, files: [], dir: '', commit: '', chunk_size: 1000, force: false, threads: 15, message: nil)
+    def data_put(dataset_url, files: [], dir: '', commit: '', chunk_size: 1000, force: false, override: false, threads: 15, message: nil)
       begin
         verify_logged_in(false)
         log_start(__method__, args, options)
@@ -1207,7 +1207,7 @@ module Cnvrg
         log_message("Uploading #{@files.size} files", Thor::Shell::Color::GREEN)
         number_of_chunks = (@files.size.to_f / chunk_size).ceil
         if commit.blank?
-          response = @datafiles.start_commit(false, true, chunks: number_of_chunks, message: message )
+          response = @datafiles.start_commit(false, force, chunks: number_of_chunks, message: message )
           unless response #means we failed in the start commit.
             raise SignalException.new(1, "Cant put files into dataset, check the dataset id")
           end
@@ -1229,7 +1229,7 @@ module Cnvrg
         @datafiles.upload_multiple_files_optimized(
           @files,
           @commit,
-          force: force,
+          override: override,
           chunk_size: chunk_size,
           prefix: dir,
           threads: threads
@@ -1241,7 +1241,7 @@ module Cnvrg
           raise SignalException.new(1, res.msg)
         end
 
-        res = @datafiles.end_commit(@commit,false, success: true, commit_type: "put")
+        res = @datafiles.end_commit(@commit,force, success: true, commit_type: "put")
         msg = res['result']
         response = Cnvrg::Result.new(Cnvrg::CLI.is_response_success(res, true), msg)
         unless response.is_success?

data/lib/cnvrg/data.rb

@@ -213,13 +213,16 @@ module Cnvrg
     method_option :dir, :type => :string, :aliases => ["-d", "--dir"], :default => ''
     method_option :commit, :type => :string, :aliases => ["-c", "--commit"], :default => ''
     method_option :force, :type => :boolean, :aliases => ["-f","--force"], :default => false
+    method_option :override, :type => :boolean, :aliases => ["--override"], :default => false
     method_option :threads, :type => :numeric, :aliases => ["-t","--threads"], :default => 15
     method_option :chunk_size, :type => :numeric, :aliases => ["-cs","--chunk"], :default => 1000
     method_option :message, :type => :string, :aliases => ["--message"], :desc => "create commit with message", :default => nil
+
     def put(dataset_url, *files)
       cli = Cnvrg::CLI.new()
       dir = options[:dir]
-      force = options["force"]
+      force = options[:force]
+      override = options[:override]
       commit = options[:commit]
       message = options[:message]
       threads = options[:threads]
@@ -230,6 +233,7 @@ module Cnvrg
           dir: dir,
           commit: commit,
           force: force,
+          override: override,
           threads: threads,
           chunk_size: chunk_size,
           message: message

data/lib/cnvrg/datafiles.rb

@@ -168,7 +168,7 @@ module Cnvrg
         error = nil
         upload_resp = nil
         10.times do
-          upload_resp = Cnvrg::API.request(@base_resource + "upload_files", 'POST_JSON', {commit_sha1: commit_sha1, tree: tree, force: force, is_branch: new_branch, partial_commit: partial_commit})
+          upload_resp = Cnvrg::API.request(@base_resource + "upload_files", 'POST_JSON', {commit_sha1: commit_sha1, tree: tree, force: force, override: force, is_branch: new_branch, partial_commit: partial_commit})
           if Cnvrg::CLI.is_response_success(upload_resp, false)
             error = nil
             break
@@ -197,20 +197,19 @@ module Cnvrg
 
         files = results['files']
 
-        progressbar.progress += tree.keys.length - files.length if progressbar.present?
         progress_semaphore = Mutex.new
         upload_error_files = []
         @temp_upload_progressbar.progress += tree.keys.length - files.length if @temp_upload_progressbar.present?
         Parallel.map((files.keys), in_threads: threads) do |k|
           o = tree[k].merge(files[k])
-          success = upload_single_file(o)
+          success = upload_single_file(nil, o)
           if not success
             upload_error_files << {absolute_path: o[:absolute_path]}
             files.except!(k)
             tree.except!(k)
             Cnvrg::Logger.log_error_message("Error while upload single file #{o["path"]}")
           end
-          progress_semaphore.synchronize { progressbar.progress += 1 if progressbar.present? }
+          progress_semaphore.synchronize { @temp_upload_progressbar.progress += 1 if @temp_upload_progressbar.present? }
         end
 
         blob_ids = files.values.map {|f| f['bv_id']}
@@ -302,13 +301,14 @@ module Cnvrg
       end
     end
 
-    def request_upload_files(commit_sha1, tree, force, new_branch, partial_commit)
+    def request_upload_files(commit_sha1, tree, override, new_branch, partial_commit)
       retry_count = 0
       loop do
         upload_resp = Cnvrg::API.request(@base_resource + "upload_files", 'POST_JSON', {
             commit_sha1: commit_sha1,
             tree: tree,
-            force: force,
+            override: override,
+            force: override,
             is_branch: new_branch,
             partial_commit: partial_commit
         })
@@ -330,7 +330,7 @@ module Cnvrg
 
     end
 
-    def upload_multiple_files_optimized(files, commit_sha1, threads: 15, chunk_size: 1000, force: false, new_branch: false, prefix: '', partial_commit: nil)
+    def upload_multiple_files_optimized(files, commit_sha1, threads: 15, chunk_size: 1000, override: false, new_branch: false, prefix: '', partial_commit: nil)
       cli = CLI.new
       cli.log_message("Using #{threads} threads with chunk size of #{chunk_size}.", Thor::Shell::Color::GREEN)
 
@@ -407,7 +407,7 @@ module Cnvrg
         Parallel.map((file_chunks), in_threads: 10) do |files_chunk|
 
           tree = @dataset.generate_chunked_idx(files_chunk, prefix: prefix, threads: threads)
-          results = request_upload_files(commit_sha1, tree, force, new_branch, partial_commit)
+          results = request_upload_files(commit_sha1, tree, override, new_branch, partial_commit)
 
           # puts "Got #{results['files'].size} files to upload from #{files_chunk.size} files"
 
@@ -1149,43 +1149,29 @@ module Cnvrg
     end
 
     def start_commit(new_branch, force=false, chunks: 0, dataset: @dataset, message:nil)
-      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.
-        idx = (force || new_branch) ? {} : dataset.get_idx
-        commit = idx[:commit]
-        next_commit = idx[:next_commit]
-        response = Cnvrg::API.request(
-            "#{base_resource}/commit/start",
-            'POST',
-            {
-                dataset_slug: @dataset_slug,
-                new_branch: new_branch,
-                force:force,
-                username: @owner,
-                current_commit: commit,
-                next_commit: next_commit,
-                total_chunks: chunks,
-                message: message
-            }
-        )
+      #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.
+      idx = {}
+      commit = idx[:commit]
+      next_commit = idx[:next_commit]
+      response = Cnvrg::API.request(
+          "#{base_resource}/commit/start",
+          'POST',
+          {
+              dataset_slug: @dataset_slug,
+              new_branch: new_branch,
+              force:force,
+              username: @owner,
+              current_commit: commit,
+              next_commit: next_commit,
+              total_chunks: chunks,
+              message: message
+          }
+      )
       Cnvrg::CLI.is_response_success(response, true)
-      return response
-      rescue => e
-        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
+      response
+    rescue => e
+      false
     end
 
     def end_commit(commit_sha1, force, success: true, uploaded_files: 0, commit_type: nil)

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '1.9.9.3'
+  VERSION = '1.9.9.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.9.9.3
+  version: 1.9.9.9
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -453,7 +453,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A CLI tool for interacting with cnvrg.io.