cnvrg 1.10.20 → 1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 443373b68531083498c571cacf504da4dc02d005ef5c749a0077b7a4efce49ac
-  data.tar.gz: 6b944be355bd91eccc138792fbcf117dc4fdb8b505b75a7b888dcd74f47aa1ed
+  metadata.gz: 04a9acd0283e8ef3c4aacfa23c90d2954e3e0a2ad4f2a70eed66ea0b87144956
+  data.tar.gz: 8221939940f215d62f6c5a66705cbdd20f6218c87007d2f71d9a4fdba0af5285
 SHA512:
-  metadata.gz: b7ff78d2eceb2a420f46d2ed96ac06ab2c96cc031d8949581069f2b4a4c9d45f210120024c2c25fe93b4542c9f0de0d3dcf893745911f129b8986cda716d3505
-  data.tar.gz: 56d85bf1fb4d16c1ec3ce46dfd5e38363c71a5242daaddb6e7f8cfa335526961abf4c6cf2345426fd8689d97e7d9a4e03b75c34e16ca32d440aca42459ed07e3
+  metadata.gz: 286544fb7129aef8fa679aa3daacdfa983cc10154709ceadbaf58406676780225559702b41195182156a379e0f4c6bc192d067eb39a7476a605bd9381f504597
+  data.tar.gz: '09e9a6a66e91b29afd2940b02d424785556cce005d1b966e7f3e82c6eb448014d6c8657570c4305274fae7b1d34f824520f6e12a90688f069dfaa8facad5d1b8'

data/lib/cnvrg/datafiles.rb

@@ -52,7 +52,7 @@ module Cnvrg
         end
         raise SignalException.new(1, "Cant find file #{file}") unless File.exists? "#{Dir.pwd}/#{file}"
       end
-      paths.map{|p| p.gsub(/^\.\//, '')}
+      paths
     end
 
     def get_files_and_folders(paths)
@@ -429,9 +429,10 @@ module Cnvrg
 
         file_chunks = files.each_slice(chunk_size).to_a
         # Fetch the required files from the server:
-        Parallel.map((file_chunks), in_threads: 10) do |files_chunk|
+        Parallel.map((file_chunks), in_threads: threads) do |chunk|
+          files_chunk = chunk.map{|p| p.gsub(/^\.\//, '')}
           Cnvrg::Logger.info("Generating chunk idx")
-          tree = @dataset.generate_chunked_idx(files_chunk, prefix: prefix, threads: threads)
+          tree = @dataset.generate_chunked_idx(files_chunk, prefix: prefix, threads: threads, cli: cli)
           Cnvrg::Logger.info("Getting files info from server")
           results = request_upload_files(commit_sha1, tree, override, new_branch, partial_commit)
           next unless results
@@ -1199,7 +1200,9 @@ module Cnvrg
     end
 
     def end_commit(commit_sha1, force, success: true, uploaded_files: 0, commit_type: nil)
+      counter = 0
       begin
+        counter += 1
         response = Cnvrg::API.request(
             "#{base_resource}/commit/end",
             'POST',
@@ -1211,9 +1214,11 @@ module Cnvrg
                 commit_type: commit_type
             }
         )
-        Cnvrg::CLI.is_response_success(response, true)
+        is_success = Cnvrg::CLI.is_response_success(response, false)
+        raise Exception.new("Invalid response #{response}") unless is_success
         return response
       rescue => e
+        retry if counter <= 20
         return false
       end
     end

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: 15, prefix: '')
+    def generate_chunked_idx(list_files = [], threads: 15, prefix: '', cli: nil)
       tree = {}
       Parallel.map(list_files, in_threads: threads) do |file|
 
@@ -552,7 +552,11 @@ module Cnvrg
         label = safe_path.gsub(self.local_path + "/", "")
         label = "#{prefix}/#{label}" if prefix.present?
         if not Cnvrg::Files.valid_file_name?(label)
-          raise StandardError.new("#{label} is not a valid file name.")
+          if cli
+            cli.log_message("#{label} is not a valid file name, skipping it", Thor::Shell::Color::RED)
+          else
+            puts "#{label} is not a valid file name, , skipping it"
+          end
         end
         if File.directory? file
           tree[label + "/"] = nil

data/lib/cnvrg/downloader/client.rb

@@ -14,8 +14,15 @@ module Cnvrg
       end
 
       def extract_key_iv(sts_path)
-        sts = open(sts_path, {ssl_verify_mode: 0}).read rescue nil
-        raise StandardError.new("Cant open sts") if sts.blank?
+        count = 20
+        begin
+          count += 1
+          sts = open(sts_path, {ssl_verify_mode: 0}).read rescue nil
+        rescue => e
+          Cnvrg::Logger.log_error(e)
+          retry if count <= 20
+          raise StandardError.new("Cant access storage: #{e.message}")
+        end
         sts.split("\n")
       end
 

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '1.10.20'
+  VERSION = '1.11'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.10.20
+  version: '1.11'
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-09-23 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.