cnvrg 1.9.9 → 1.9.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10a6bb8d2946d743e8dd1f609369d503c9bf44a9ba748e1e2dfb33df57444aa0
-  data.tar.gz: 382e9b28d7edb8856bcd12d5accabf31eb0f264055b4f652da94508a97458b3c
+  metadata.gz: fd47735837c5b994e5a7b614ac38dacabb094872e4edcefe92374a726874f6e4
+  data.tar.gz: 63029e65065352cf285d1321e73e2f51bab63518460a6ffcd69920c80a4ea833
 SHA512:
-  metadata.gz: db580ef688cf3c3a1e3c95f62c3c520fa606a13ebc678fee420c312e89b7c2c62e39783d25a7962d1f1ba5fa439c968626164443c0828d4fae5604eb881794fd
-  data.tar.gz: 296974a98310ef9ba922124385723a33380cd6fd412d80d18cb3cb0a73b070a1a119d61ce26b8a4fe560e6f7a8b591fb222e3ba6ccc09c046d891a02436358bd
+  metadata.gz: 8c202546702f4c041f1d2bad1443240f35168b0a5c489503f1d9852e612f49ffd60a6b68c8066a02e39ba8e131451166121afeb68a063a5f040d1d9938a805ab
+  data.tar.gz: 6e5296dda882e2d9dcf9d06ec72b6c0ffe69a089aa82f846846dd7daa46f9ff698e25da3ce7fb0eb96d3c9488803d022d06065bcc7791adfa8f8bc75a1ce1cf5

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, 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,13 @@ 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,
             is_branch: new_branch,
             partial_commit: partial_commit
         })
@@ -330,7 +329,7 @@ module Cnvrg
 
     end
 
-    def upload_multiple_files_optimized(files, commit_sha1, threads: ParallelThreads, 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)
 
@@ -406,8 +405,8 @@ module Cnvrg
         # Fetch the required files from the server:
         Parallel.map((file_chunks), in_threads: 10) do |files_chunk|
 
-          tree = @dataset.generate_chunked_idx(files_chunk, prefix: prefix)
-          results = request_upload_files(commit_sha1, tree, force, new_branch, partial_commit)
+          tree = @dataset.generate_chunked_idx(files_chunk, prefix: prefix, threads: threads)
+          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 +1148,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)
@@ -1319,10 +1304,10 @@ module Cnvrg
               # blob
             local_path = "#{local_path}.conflict" if conflict
             storage_path = f["path"]
-            if File.exists? local_path
-              Cnvrg::Logger.log_info("Trying to download #{local_path} but its already exists, skipping..")
-              next
-            end
+            # if File.exists? local_path
+            #   Cnvrg::Logger.log_info("Trying to download #{local_path} but its already exists, skipping..")
+            #   next
+            # end
             resp = @downloader.download(storage_path, local_path)
             Cnvrg::Logger.log_info("Download #{local_path} success resp: #{resp}")
           rescue => e

data/lib/cnvrg/dataset.rb

@@ -541,7 +541,7 @@ module Cnvrg
       "#{url}/#{self.owner}/datasets/#{self.slug}"
     end
 
-    def generate_chunked_idx(list_files = [], threads: IDXParallelThreads, prefix: '')
+    def generate_chunked_idx(list_files = [], threads: 15, prefix: '')
       tree = {}
       Parallel.map(list_files, in_threads: threads) do |file|
         #check if prefix exists do prefix/path otherwise path

data/lib/cnvrg/helpers/executer.rb

@@ -89,7 +89,7 @@ class Cnvrg::Helpers::Executer
   end
 
   def current_homedir
-    `env | grep HOME`.strip.split("=").try(:last)
+    `env | grep -w HOME`.strip.split("=").try(:last)
   end
 
   def spark_path
@@ -97,7 +97,7 @@ class Cnvrg::Helpers::Executer
   end
 
   def slave_homedir()
-    run_in_slave("env | grep HOME").split("=").try(:last)
+    run_in_slave("env | grep -w HOME").split("=").try(:last)
   end
 
   def slave_env

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '1.9.9'
+  VERSION = '1.9.9.6'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.9.9
+  version: 1.9.9.6
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-09 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.