cnvrg 1.6.0.7 → 1.6.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74e632845d8a6f6ca39492119e8efa15f90aaa76f66737336da95ef24b89b873
-  data.tar.gz: 79a573e7bb4dcb63dadb89dba6c5bba7c16473e8fcc688ad27c64ff1c0b58dcc
+  metadata.gz: 319b1e08fd56c2a26834b3a2e2fc94565e2abad1d0244c72e4e45c11a8cc7d3d
+  data.tar.gz: 60edde88d619c8aae0afded8314c2688545712445718e99576a7ec20222d795e
 SHA512:
-  metadata.gz: 6308aba4c811a524e84ffa9d1a9519af3fe74561ac1adb20b9ad4db8d78ab91b834549f37a29c258f5775bf59d46328fd956ced36c9877ccf2c678d4641643bd
-  data.tar.gz: a4e5526fa519c995833b52d8ba5147a1cda9373f634dff60aa6435422a6486c7b599f0a27427a68d20166c5dc81f2aa54badc686186baec26483a3fff41f08bc
+  metadata.gz: 9dc2c22f8c1f4c696c0580f2ab2c3122d57061a95591bff13403a2e93412f6268b50a23119ba5ccbaa0830bd8f87474490be50ccf6d128c378b39d4a1cffaca3
+  data.tar.gz: 4628fee3352fb89fb639ed3aef3e76ce2cadff9c916d153a940416d25ac81f8e700b2891cca6682c95e9526342c089ef631f2c16d9df9ca84cc4faccaac70e28

data/lib/cnvrg/cli.rb

@@ -2888,7 +2888,8 @@ module Cnvrg
     method_option :email_notification, :type => :boolean, :aliases => ["-en", "--email_notification"], :default => false
     method_option :upload_output, :type => :string, :aliases => ["-uo", "--upload_output"], :default => ""
     method_option :commit, :type => :string, :aliases => ["-c", "--commit"], :default => ""
-    method_option :schedule, :type => :string, :aliases => ["-s", "--schedule"], :default => ""
+    method_option :schedule, :type => :string, :aliases => ["--schedule"], :default => ""
+    method_option :recurring, :type => :string, :aliases => ["--recurring"], :default => ""
     method_option :image, :type => :string, :aliases => ["--image"], :default => nil
     method_option :grid, :type => :string, :aliases => ["-g", "--grid"], :default => ""
     method_option :data, :type => :string, :aliases => ["-d", "--data"], :default => ""
@@ -2922,6 +2923,7 @@ module Cnvrg
       upload_output = options["upload_output"]
       local = options["local"]
       schedule = options["schedule"]
+      recurring = options["recurring"]
       image = options["image"] || nil
       grid = options["grid"]
       data = options["data"]
@@ -2982,7 +2984,7 @@ module Cnvrg
                      options["machine"] => !options["machine"].blank? }
         instance_type = get_instance_type(instances)
         invoke :exec_remote, [cmd], :sync_before => sync_before, :sync_after => sync_after, :title => title, :machine_type => instance_type,
-               :schedule => schedule, :log => log, :email_notification => email_notification, :upload_output => upload_output, :commit => commit,
+               :schedule => schedule, :recurring => recurring, :log => log, :email_notification => email_notification, :upload_output => upload_output, :commit => commit,
                :image => image, :grid => grid, :data => data, :data_commit => data_commit, :ignore => ignore, :force => force, :sync_before_terminate => sync_before_terminate,
                 :max_time => max_time,
                :periodic_sync => periodic_sync, :dataset_only_tree=> dataset_only_tree,
@@ -3271,7 +3273,8 @@ module Cnvrg
     method_option :email_notification, :type => :boolean, :aliases => ["-en", "--email_notification"], :default => false
     method_option :upload_output, :type => :string, :aliases => ["-uo", "--upload_output"], :default => ""
     method_option :machine_type, :type => :string, :default => ""
-    method_option :schedule, :type => :string, :aliases => ["-s", "--schedule"], :default => ""
+    method_option :schedule, :type => :string, :aliases => ["--schedule"], :default => ""
+    method_option :recurring, :type => :string, :aliases => ["--recurring"], :default => ""
     method_option :commit, :type => :string, :aliases => ["-c, --commit"], :default => nil
     method_option :image, :type => :string, :aliases => ["-i", "--image"], :default => ""
     method_option :grid, :type => :string, :aliases => ["-g", "--grid"], :default => ""
@@ -3329,24 +3332,7 @@ module Cnvrg
         restart_if_stuck = options["restart_if_stuck"]
         instance_type = options["machine_type"] || nil
         schedule = options["schedule"] || ""
-        if schedule.start_with? 'in'
-          time = schedule.split(" ")
-
-          local = Time.now.localtime
-          if time[2].downcase().start_with? "min"
-            new = local + (time[1].to_i * 60)
-          elsif time[2].downcase().start_with? "hours"
-            new = local + (time[1].to_i * 3600)
-          elsif time[2].downcase().start_with? "days"
-            new = local + (time[1].to_i * 3600 * 24)
-          else
-            log_message("Could not undersatnd when to schedule experiment", Thor::Shell::Color::RED)
-            exit(1)
-          end
-          new_time = new.to_s
-          new_time = new_time[0, new_time.size - 6] #remove timezone
-          schedule = "at #{new_time}"
-        end
+        recurring = options["recurring"] || ""
         upload_output = options["upload_output"]
         time_to_upload = calc_output_time(upload_output)
         if time_to_upload == 0 or time_to_upload == -1
@@ -3364,7 +3350,7 @@ module Cnvrg
         git_branch = options["git_branch"]
         options_hash = Hash[options]
         local_folders_options = options["local_folders"]
-        options_hash.except!("schedule", "machine_type", "image", "upload_output", "grid", "data", "data_commit", "title",
+        options_hash.except!("schedule", "recurring", "machine_type", "image", "upload_output", "grid", "data", "data_commit", "title",
                              "local", "small", "medium", "large", "gpu", "gpuxl", "gpuxxl","max_time","dataset_only_tree",
                              "data_query", "git_commit","git_branch", "restart_if_stuck","local_folders","output_dir", "commit", "datasets", "requirements", "prerun" )
         exec_options = options_hash.map {|x| "--#{x[0]}=#{x[1]}"}.flatten.join(" ")
@@ -3437,7 +3423,7 @@ module Cnvrg
 
         res = exp.exec_remote(command, commit_to_run, instance_type, image, schedule, local_timestamp, grid, path_to_cmd, data, data_commit,
                               periodic_sync, sync_before_terminate, max_time, ds_sync_options,output_dir,
-                              data_query, git_commit, git_branch, restart_if_stuck,local_folders_options, title, datasets, prerun: prerun, requirements: requirements)
+                              data_query, git_commit, git_branch, restart_if_stuck,local_folders_options, title, datasets, prerun: prerun, requirements: requirements, recurring: recurring)
         if Cnvrg::CLI.is_response_success(res)
           check = Helpers.checkmark()
           str = "#{check} Experiment's is on: #{Cnvrg::Helpers.remote_url}/#{project.owner}/projects/#{project.slug}/experiments/#{res["result"]["exp_url"]}"
@@ -5355,7 +5341,7 @@ module Cnvrg
       @image.update_image_activity(project.last_local_commit, nil)
     end
 
-    desc 'check_pod_restart', description: 'Check pod restart', hide: true
+    desc 'check_pod_restart', 'Check pod restart', :hide => true
     def check_pod_restart
       Cnvrg::CLI.new.log_start(__method__, args, options)
       @project = Project.new(owner: ENV['CNVRG_OWNER'], slug: ENV['CNVRG_PROJECT'])
@@ -5486,6 +5472,10 @@ module Cnvrg
       end
 
       def self.log_message(message, type = Thor::Shell::Color::BLUE, to_print: true)
+        if $LOG.blank?
+          ### handle case when $LOG is not initialized
+          CLI.new.log_handler
+        end
         case type
         when Thor::Shell::Color::BLUE, 'blue', 'progress'
           color = Thor::Shell::Color::BLUE
@@ -5503,18 +5493,11 @@ module Cnvrg
           color = nil
           $LOG.info message: message, type: "unknown"
         end
-        say "#{color}#{message}" if to_print
+        say "#{color}#{message}#{Thor::Shell::Color::CLEAR}" if to_print
       end
 
       def log_message(message, type=Thor::Shell::Color::GREEN, to_print = true)
-        if to_print
-          say message, type
-        end
-        begin
-          Cnvrg::Logger.log_info(message)
-        rescue => e
-          Cnvrg::Logger.log_error(e)
-        end
+        CLI.log_message(message, type, to_print: to_print)
       end
 
       def log_error(e)

data/lib/cnvrg/data.rb

@@ -29,13 +29,27 @@ module Cnvrg
       cli.init_data(public, bucket: bucket)
     end
 
-    desc "data link", "Set current directory as dataset directory"
-    def link(dataset_slug=nil)
+    desc "data link DATASET_SLUG", "Set current directory as dataset directory"
+    def link(dataset=nil)
       begin
-        raise Exception.new("Please enter dataset name") if dataset_slug.blank?
         cli = Cnvrg::CLI.new()
         cli.verify_logged_in(false)
         cli.log_start(__method__, args, options)
+        
+        if dataset.include? "/"
+          ## this case is to support DATASET_URL expected example: domain.com/organization_name/datasets/dataset_name
+          url_parts = dataset.split("/")
+          dataset_index = Cnvrg::Helpers.look_for_in_path(dataset, "datasets")
+          dataset_slug = url_parts[dataset_index + 1]
+          owner = url_parts[dataset_index - 1]
+          raise Exception.new("Can't find all dataset information please check the URL") if dataset_slug.blank? or owner.blank?
+        else
+          ## this case is to support DATASET_SLUG expected example: dataset_name
+          # in this case it will take the organization from the config file
+          dataset_slug = dataset
+          raise Exception.new("Please enter dataset name or dataset full url") if dataset_slug.blank?
+          owner = CLI.get_owner
+        end
 
         config_validation = Dataset.validate_config
         if config_validation[:validation] == Data::ConfigValidation::SUCCESS
@@ -47,7 +61,6 @@ module Cnvrg
         end
 
         cli.log_message("Linking dataset: #{dataset_slug} to the current directory", Thor::Shell::Color::BLUE)
-        owner = CLI.get_owner
         success = Dataset.link_dataset(owner: owner, slug: dataset_slug)
         if success
           cli.log_message("Dataset: #{dataset_slug} linked successfully to the current directory")

data/lib/cnvrg/dataset.rb

@@ -320,6 +320,12 @@ module Cnvrg
         return unless success
         result = response["result"]
 
+        sha1 = result["init_commit_sha1"]
+        
+        # We need to write init IDX that contain init commit sha1 so the user will be able to doing actions on the dataset
+        # so it only relevant for new server
+        raise Exception.new("This feature is not available for your cnvrg version. Please contact support for more information") if sha1.blank? ## means this is old version of server
+
         config = {dataset_name: result["title"],
                   dataset_slug: result["slug"],
                   owner: owner}
@@ -332,10 +338,7 @@ module Cnvrg
         FileUtils.touch list_files
         File.open(".cnvrg/config.yml", "w+") {|f| f.write config.to_yaml}
 
-        # Write init IDX that contain init commit sha1 so the user will be able to doing actions on the dataset
-        # Relevant only for new server
         dataset = Dataset.new(Dir.pwd)
-        sha1 = result["init_commit_sha1"]
         dataset.write_idx({}, sha1)
         true
       rescue => e

data/lib/cnvrg/experiment.rb

@@ -88,13 +88,13 @@ module Cnvrg
 
     end
 
-    def exec_remote(command, commit_to_run, instance_type, image_slug,scheduling_query,local_timestamp, grid,path_to_cmd,data, data_commit,periodic_sync,
+    def exec_remote(command, commit_to_run, instance_type, image_slug,schedule,local_timestamp, grid,path_to_cmd,data, data_commit,periodic_sync,
                     sync_before_terminate, max_time, ds_sync_options=0,output_dir=nil,data_query=nil,
-                    git_commit=nil, git_branch=nil, restart_if_stuck=nil, local_folders=nil,title=nil, datasets=nil, prerun: true, requirements: true)
+                    git_commit=nil, git_branch=nil, restart_if_stuck=nil, local_folders=nil,title=nil, datasets=nil, prerun: true, requirements: true, recurring: nil)
       response = Cnvrg::API.request("users/#{@owner}/projects/#{@project_slug}/experiment/remote", 'POST', {command: command, image_slug: image_slug,
                                                                                                             commit_sha1: commit_to_run,
                                                                                                             instance_type: instance_type,
-                                                                                                            scheduling_query:scheduling_query,
+                                                                                                            schedule:schedule,
                                                                                                             local_timestamp:local_timestamp,
                                                                                                             datasets: datasets,
                                                                                                             grid: grid,
@@ -104,7 +104,7 @@ module Cnvrg
                                                                                                             dataset_sync_options:ds_sync_options,output_dir:output_dir,
                                                                                                             dataset_query:data_query,git_commit:git_commit,git_branch:git_branch,
                                                                                                             restart_if_stuck:restart_if_stuck, local_folders: local_folders, title:title,
-                                                                                                            prerun: prerun, requirements: requirements})
+                                                                                                            prerun: prerun, requirements: requirements, recurring: recurring})
 
       return response
     end

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '1.6.0.7'
+  VERSION = '1.6.0.8'
 end
 

metadata

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