cnvrg 1.10.20 → 1.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 443373b68531083498c571cacf504da4dc02d005ef5c749a0077b7a4efce49ac
-  data.tar.gz: 6b944be355bd91eccc138792fbcf117dc4fdb8b505b75a7b888dcd74f47aa1ed
+  metadata.gz: b48bf1399bcafb013474322d63fb0d06ad9c484866f4d59dce963eddcd2fb67a
+  data.tar.gz: bc4ed0f3b02a869babc60beec4b090542492d5b53db50810ca7cbe5eaa7901f7
 SHA512:
-  metadata.gz: b7ff78d2eceb2a420f46d2ed96ac06ab2c96cc031d8949581069f2b4a4c9d45f210120024c2c25fe93b4542c9f0de0d3dcf893745911f129b8986cda716d3505
-  data.tar.gz: 56d85bf1fb4d16c1ec3ce46dfd5e38363c71a5242daaddb6e7f8cfa335526961abf4c6cf2345426fd8689d97e7d9a4e03b75c34e16ca32d440aca42459ed07e3
+  metadata.gz: b685ded1e59dfdb12a766ccd05e682b9e053a3069adf377ddc09fdae7d94be0ede6bd3f2ef67dbefdc0c6dc4d8d9a0c4e0ca9754a5cc939aa93340f33cbc295b
+  data.tar.gz: 20a00dbc9a98c4f96785ea1bb684b9f217aa97ad39a583f1638c317a392ccb821f58de01c939bccde883c8aa02cf124b60757b0f4f1eaade669d87784aa394b5

data/lib/cnvrg/cli.rb

@@ -896,10 +896,12 @@ module Cnvrg
             return
           end
 
+
           if only_tree
-            success = Dataset.clone_tree(commit: commit, dataset_home: dataset_home)
-            return if success
+            Dataset.clone_tree(commit: commit, dataset_home: dataset_home)
+            return
           end
+
           commit = response["result"]["commit"]
           files_count = response["result"]["file_count"]
           files = @files.get_clone_chunk(commit: commit)
@@ -911,6 +913,7 @@ module Cnvrg
                                            :total => files_count,
                                            :autofinish => true)
 
+          Dataset.clone_tree(commit: commit, dataset_home: dataset_home, progressbar: progressbar)
 
           while files['keys'].length > 0
             Cnvrg::Logger.log_info("download multiple files, #{downloaded_files.size} files downloaded")
@@ -964,10 +967,9 @@ module Cnvrg
         Cnvrg::CLI.is_response_success(response,true)
         dataset_name = response["results"]["name"]
         dataset_slug = response["results"]["slug"]
-        dataset_home = Dir.pwd+"/"+dataset_slug
+        dataset_home = Dir.pwd + "/" + dataset_slug
         Dataset.stop_if_dataset_present(dataset_home, dataset_name) if soft
 
-        # dataset_home = Dir.pwd
         if Dataset.blank_clone(owner, dataset_name, dataset_slug)
           dataset = Dataset.new(dataset_home)
           log_message("Cloning #{dataset_name}", Thor::Shell::Color::BLUE)
@@ -986,12 +988,13 @@ module Cnvrg
           begin
             log_message("Downloading files", Thor::Shell::Color::BLUE)
             Parallel.map((response["results"]["query_files"]), parallel_options) do |f|
-              relative_path = f["fullpath"].gsub(/^#{dataset_home}/, "")
+              relative_path = f["fullpath"].gsub(/^#{dataset_home}/, "").gsub(/^#{slug}/, "")
               relative_path_dir = relative_path.split("/")
               file_name = relative_path_dir.pop()
               relative_path_dir = relative_path_dir.join("/")
               abs_path = dataset_home + "/" + relative_path_dir
               abs_path = dataset_home if flatten
+
               begin
                 FileUtils.mkdir_p(abs_path) unless File.exist? (abs_path + "/" + file_name)
               rescue
@@ -1781,8 +1784,7 @@ module Cnvrg
       print_table(list)
     end
 
-    desc 'commits', 'List all commits for a specific Project'
-
+    desc 'commits', 'List all commits for a specific Project', :hide => true
     def list_commits()
       verify_logged_in(true)
       log_start(__method__, args, options)
@@ -1796,7 +1798,7 @@ module Cnvrg
     end
 
 
-    desc 'unlink', 'Unlink a project from current directory'
+    desc 'unlink', 'Unlink a project from current directory', :hide => true
 
     def unlink
       verify_logged_in(false)
@@ -2893,7 +2895,7 @@ module Cnvrg
       end
     end
 
-    desc 'show', 'Show specific file from a specific commit'
+    desc 'show', 'Show specific file from a specific commit', :hide => true
     method_option :path, :type => :string, :aliases => ["-p"], :desc => "File path", :default => ""
     method_option :commit, :type => :string, :aliases => ["-c"], :desc => "Commit sha1", :default => nil
 
@@ -4806,8 +4808,7 @@ module Cnvrg
 
     end
 
-    desc 'list_machines', 'Lists all machines belong to your organization'
-
+    desc 'list_machines', 'Lists all machines belong to your organization', :hide => true
     def list_machines
       begin
         verify_logged_in(false)

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

@@ -471,23 +471,38 @@ module Cnvrg
       response.to_json
     end
 
-    def self.clone_tree(commit: 'latest', dataset_home: nil)
+    def self.clone_tree(commit: 'latest', dataset_home: nil, progressbar: nil)
       @dataset = Cnvrg::Dataset.new(dataset_home)
       @files = Cnvrg::Datafiles.new(@dataset.owner, @dataset.slug, dataset: @dataset)
       trees = @files.get_trees(commit: commit)
       return false if trees.nil?
-      pb = ProgressBar.create(:title => "Download Progress",
-                              :progress_mark => '=',
-                              :format => "%b>>%i| %p%% %t",
-                              :starting_at => 0,
-                              :total => trees.size,
-                              :autofinish => true)
+
+      if progressbar
+        pb = progressbar
+        pb.total += trees.size
+      else
+        pb = ProgressBar.create(
+          :title => "Download Progress",
+          :progress_mark => '=',
+          :format => "%b>>%i| %p%% %t",
+          :starting_at => 0,
+          :total => trees.size,
+          :autofinish => true
+        )
+      end
+
       trees.each do |tree|
         pb.progress += 1
         @files.download_dir(dataset_home, tree)
       end
-      pb.finish
-      @dataset.write_success
+
+      unless progressbar
+        # if progessbar sent it means that its not only tree so we dont want to finish the progress bar
+        # and we dont want to write success
+
+        pb.finish
+        @dataset.write_success
+      end
       true
     end
 
@@ -541,7 +556,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 +567,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/files.rb

@@ -115,7 +115,7 @@ module Cnvrg
         #upload files
         blob_id_chunk = Parallel.map(files.keys, in_threads: ParallelThreads) do |file|
           begin
-            Cnvrg::Helpers.try_until_success{self.upload_single_file(files[file].merge(parsed_chunk_of_files[file]))}
+            upload_single_file(files[file].merge(parsed_chunk_of_files[file]))
           rescue => e
             Cnvrg::CLI.log_message("Failed to upload #{file}: #{e.message}", 'red') unless suppress_exceptions
             Cnvrg::Logger.log_error(e)
@@ -188,7 +188,7 @@ module Cnvrg
     def upload_single_file(file)
       path = file['path']
       absolute_path = file[:absolute_path]
-      @client.upload(path, absolute_path)
+      @client.safe_upload(path, absolute_path)
     end
 
     def parse_file(file)

data/lib/cnvrg/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.10.20
+  version: 1.11.5
 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-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler