cnvrg 1.10.8 → 1.10.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d9e8e76336bf9862fca95649740a7b5a5148565469ece725f4760041db28ffc4
-  data.tar.gz: f65852f97fb1294258c3c6b4b6941fb62248eeb1691d432e47bb4e2acb60a313
+  metadata.gz: d9c519291dee531a33698f1737d8019b9a9affff30c00c60ebb5904cf2ab4daa
+  data.tar.gz: 1dd54d29c1f0b7db384bfe62ae6f3678a118375515d6da451ef58094adfa334d
 SHA512:
-  metadata.gz: c5be8e6c872dd256560805d8146b3e2d7672a72844b932081dddc94c62e3fde4f9d7f66dd18d4f882c005c9e6e2183a91de689254b6dce07c265932058a4a1b0
-  data.tar.gz: 345eee06f18b24a30826665c7803b1275bdbc33d94779e5e37812cce7f95738bb819c5e2064871618145a27e72d133373e2493fb57f63b1c85ce8072c6057a54
+  metadata.gz: d4ce4dea833009867b132bdf6db3fa79bcc7396e828d2f7ad05433ca5c73bf06a999eb40d75d8895f8ae4108d7d6fb30fdc3149001edd63a25f785956abb2472
+  data.tar.gz: 1082b5f3dc5da602bb2089a97dec85774bed3a43c05c9247acf64c0bff7a6d50a641dee92f8a4b8999dd3732c5d3c75eec14c6e4b578c9b09d49f5bab7452e39

data/lib/cnvrg/cli.rb

@@ -1273,6 +1273,17 @@ module Cnvrg
           raise SignalException.new(1, "Cant put files into dataset, check the dataset id")
         end
         @commit =  response['result']['commit_sha1']
+
+        # Server expects certain regex format with * so fix those that dont comply
+        regex_list = regex_list.map do |regex|
+          if regex.end_with? "/"
+            # if user wants to delete entire folder add regex to delete contents as well
+            [regex, "#{regex}*"]
+          else
+            regex
+          end
+        end.flatten
+
         files_to_delete, folders_to_delete, job_id = @datafiles.delete_multiple_files(@commit, regex_list)
         log_message("Deleting #{files_to_delete} files and #{folders_to_delete} folders", Thor::Shell::Color::GREEN)
 
@@ -3598,25 +3609,33 @@ module Cnvrg
           exit_status = 0
           
           if options['wait']
+            end_pos = 0
             while true
               tries = 0
               begin
                 result = Cnvrg::API_V2.request(
-                    "#{project.owner}/projects/#{project.slug}/experiments/#{res["result"]["exp_url"]}/exit_status",
+                    "#{project.owner}/projects/#{project.slug}/experiments/#{res["result"]["exp_url"]}/info",
                     'GET',
-                    { grid: res["result"]["grid"]}
+                    { exit_status: true, grid: res["result"]["grid"], pos: end_pos }
                 )
 
-                exit_statuses = result.values
+                exit_statuses = result.values.pluck('exit_status')
                 if exit_statuses.include? nil
-                  system("clear") || system("cls")
-                  msg = "#{Time.current}: waiting for experiment to finish"
-                  msg = "#{Time.current}: waiting for all experiments to finish" if res["result"]["grid"]
-                  puts msg
+                  if res["result"]["grid"]
+                    system("clear") || system("cls")
+                    msg = "#{Time.current}: waiting for all experiments to finish"
+                    puts msg
+                  else
+                    end_pos = result[res['result']['exp_url']]['end_pos']
+                    logs = result[res['result']['exp_url']]['logs']
+                    logs.each do |log|
+                      puts log['message']
+                    end
+                  end
                   sleep 3
                 else
-                  result.each do |slug, exit_status|
-                    puts "Experiment #{slug} was exited with status #{exit_status}"
+                  result.each do |slug, value|
+                    puts "Experiment #{slug} was exited with status #{value['exit_status']}"
                   end
                   break
                 end

data/lib/cnvrg/data.rb

@@ -214,7 +214,7 @@ module Cnvrg
 
     desc 'data put DATASET_URL FILES_PREFIX', 'Upload selected files from local dataset directory to remote server'
     method_option :dir, :type => :string, :aliases => ["-d", "--dir"], :default => ''
-    method_option :commit, :type => :string, :aliases => ["-c", "--commit"], :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
@@ -226,7 +226,8 @@ module Cnvrg
       dir = options[:dir]
       force = options[:force]
       override = options[:override]
-      commit = options[:commit]
+      # commit = options[:commit]
+      commit = ''
       message = options[:message]
       threads = options[:threads]
       chunk_size = options[:chunk_size]

data/lib/cnvrg/dataset.rb

@@ -884,13 +884,8 @@ module Cnvrg
     end
 
     def self.stop_if_dataset_present(dataset_home, dataset_name, commit: nil)
-
       cli = Cnvrg::CLI.new()
       config = YAML.load_file(dataset_home + "/.cnvrg/config.yml")
-      if commit.present?
-        local_commit = YAML.load_file(dataset_home + "/.cnvrg/idx.yml")[:commit] rescue nil
-        return if commit != local_commit or local_commit.blank?
-      end
       if config[:dataset_name] == dataset_name
         cli.log_message("Dataset already present, clone aborted")
         exit(0)
@@ -898,6 +893,5 @@ module Cnvrg
     rescue => e
       nil
     end
-
   end
 end

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '1.10.8'
+  VERSION = '1.10.12'
 end

metadata

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