cnvrg 1.5.8.5 → 1.5.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f627c061c341ca9b30f94357954a18029d430493514ff8bfb8385f3bf898b0e6
-  data.tar.gz: 00df93c8098d44d109148eaf952937a783dfc89eb514e8fb51badb787f430d71
+  metadata.gz: 594fa00701be650fa08c0cc8e682efbe4da2eda138745903f1fc04cbe653f0ad
+  data.tar.gz: 23d0df95d4e59f0aa720db633f3bcc50b2b60776f1f19e52794d5d5be99d52bb
 SHA512:
-  metadata.gz: d72a8e73785067d6acd64fb290dfc4390b4fbda019af34203306e33a5907f71c8bd362dcb407789f4a34e398b151ed7e4faada64f14876650eee69f14ee8cb2b
-  data.tar.gz: 12ea638eb269b3bc7edbc853bb553cb014f6e49c0a9fcddcc4baa04f95d60be7fca15fa015d0425ca9b8ed982c6c06efeac44f66038ab33d10a8389b8ba09664
+  metadata.gz: cb7f6b9cd03596158bb0aad59dc38dda2edacc6907e466d07048609f627ba7a9301a06890e5d504409821b15d07de34f96703e0a1d80a0159e3313e4e9db6891
+  data.tar.gz: a31197ca8ac472412981ff0f432b11c36ef5d63467df58f08fd19bf50065234e0c46e682a17cc0e84e5c6f9a0794f17d2299f46886b087257d64a52e4c91ad1c

data/lib/cnvrg/cli.rb

@@ -920,12 +920,11 @@ module Cnvrg
           if downloaded_files == files_count
             Dataset.verify_cnvrgignore_exist(dataset_name, false)
             @executer.set_dataset_status(dataset: @dataset.slug, status: "cloned") if @executer
-            if !read
-              @dataset.write_idx(nil, commit) #nil means, generate idx
-            end
-
             log_message("#{check} Clone finished successfully", Thor::Shell::Color::GREEN)
             @dataset.write_success
+            ### if read, dont generate idx (but create idx.yml) if not read, generate idx.
+            # TODO fix it for later... (check it in different cases)
+            @dataset.write_idx(read ? {} : nil, commit) #nil means, generate idx
           end
         else
           log_message("Error: Couldn't create directory: #{dataset_name}", Thor::Shell::Color::RED)
@@ -1957,7 +1956,6 @@ module Cnvrg
       verify_logged_in(true)
       log_start(__method__, args, options)
       log_message('Syncing dataset', Thor::Shell::Color::BLUE, !options["verbose"])
-
       if !force and !init
         # w(verbose=false, new_branch=false,sync=false, commit=nil,all_files=true)
         invoke :download_data_new,[verbose, new_branch, true, commit, all_files], :new_branch=>new_branch, :direct=>false, :force =>force
@@ -3109,43 +3107,6 @@ module Cnvrg
             start_loop = Time.now
             stdout, stderr = '', ''
             begin
-
-              if remote
-                if @exp.sync_before_terminate
-                  spot_status_thread = Thread.new do
-                    begin
-                      loop do
-                        log_message('Checking Spot Instance Status', Thor::Shell::Color::YELLOW)
-                        restart = @exp.restart_spot_instance()
-
-                        if restart
-                          log_message('Spot instance is going to be terminated', Thor::Shell::Color::YELLOW)
-                          # sync
-                          if @project.is_git
-                            output_dir = @exp.output_dir
-
-                            if output_dir.blank?
-                              output_dir = "output"
-                            end
-                            upload(false, false, true, ignore, true, true,output_dir,"Experiment",@exp.slug  )
-                          else
-                            upload(false, false, true, ignore, true, true,nil,"Experiment",@exp.slug  )
-                          end
-                            res = @exp.send_restart_request(@project.get_idx.try(:fetch, :commit))
-                          while !Cnvrg::CLI.is_response_success(res, false) do
-                            sleep(5)
-                            res = @exp.send_restart_request(@project.get_idx.try(:fetch, :commit))
-                          end
-                          exit(0)
-                        end
-                        sleep(10)
-                      end
-                    rescue => e
-                      log_error(e)
-                    end
-                  end
-                end
-              end
               process_running = true
               stats_thread = Thread.new do
                 while process_running do
@@ -3230,6 +3191,7 @@ module Cnvrg
               end
 
                 if sync_after
+                  @project.job_log(["Syncing Experiment"])
                 # Sync after run
                   if @project.is_git
                     output_dir = output_dir || @exp.output_dir
@@ -3244,7 +3206,10 @@ module Cnvrg
                   end
 
                 end
-                end_commit = @project.last_local_commit
+              end_commit = @project.last_local_commit
+              if end_commit.present?
+                @project.job_log(["Experiment end commit: #{end_commit}"])
+              end
 
                 # log_thread.join
                 stats_thread.join

data/lib/cnvrg/project.rb

@@ -404,7 +404,7 @@ module Cnvrg
 
     end
 
-    def generate_idx(deploy: false)
+    def generate_idx(deploy: false, files: [])
       if File.exists? "#{self.local_path}/.cnvrg/idx.yml"
         old_idx = YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
       else
@@ -412,14 +412,19 @@ module Cnvrg
       end
 
       tree_idx = Hash.new(0)
-      list = Dir.glob("#{self.local_path}/**/*", File::FNM_DOTMATCH).reject {|x| (x =~ /\/\.{1,2}$/) or (x =~ /^#{self.local_path}\/\.cnvrg\/*/) or (x =~ /^#{self.local_path}\/\.git\/*/) or (x =~ /^#{self.local_path}\/\.cnvrgignore.conflict*/) and not (x =~ /^#{self.local_path}\/\.cnvrgignore/)}
+
+      ### if file specified, just take them, dont calculate everything from scratch
       list_ignore = self.get_ignore_list()
+      if files.blank?
+        list = Dir.glob("#{self.local_path}/**/*", File::FNM_DOTMATCH).reject {|x| (x =~ /\/\.{1,2}$/) or (x =~ /^#{self.local_path}\/\.cnvrg\/*/) or (x =~ /^#{self.local_path}\/\.git\/*/) or (x =~ /^#{self.local_path}\/\.cnvrgignore.conflict*/) and not (x =~ /^#{self.local_path}\/\.cnvrgignore/)}
+      else
+        list = files
+      end
       if deploy
-        list_ignore << ["main.py", "main.pyc", "__init__.py", "uwsgi.ini"]
+        list_ignore += ["main.py", "main.pyc", "__init__.py", "uwsgi.ini"]
         list_ignore.flatten!
       end
       list_ignore_new = list_ignore.map{|x| x.gsub("//","/")} rescue []
-
       # list.each do |e|
       Parallel.map(list, in_threads: IDXParallelThreads) do |e|
         label = e.gsub(self.local_path + "/", "")
@@ -484,18 +489,15 @@ module Cnvrg
         local_idx = self.get_idx
       else
         #upload
-        local_idx = self.generate_idx(deploy: deploy)
+        local_idx = self.generate_idx(deploy: deploy, files: specific_files)
       end
       commit = local_idx[:commit]
       tree = local_idx[:tree]
       ignore_list = self.send_ignore_list()
       if force or specific_files.present?
         added = []
-        if specific_files.present?
-          added = specific_files
-        elsif tree.present?
-          added << local_idx[:tree].keys
-          added.flatten!
+        if tree.present?
+          added += local_idx[:tree].keys
         end
         response = {"result" => {"commit" => nil, "tree" => {"added" => added,
                                                              "updated_on_server" => [],

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '1.5.8.5'
+  VERSION = '1.5.8.6'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.5.8.5
+  version: 1.5.8.6
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2019-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -446,8 +446,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A CLI tool for interacting with cnvrg.io.