cnvrg 1.6.0.9 → 1.6.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a578311b787d26b7a510ce7c6ff9b845d55300b82a5c75e70a787e334693779
-  data.tar.gz: 7bea7b961282523b23dfbe01014d658147dfa354240246ff4722e165d5603895
+  metadata.gz: 345b4c6497b1f7621f04a5d5ec4fb7d51d1939da11cb59e70ba5fda466dd8755
+  data.tar.gz: e8321196067449dac95a2e12d2adf74853ebde8f4eda0f0783337a6b5854ea88
 SHA512:
-  metadata.gz: f8d23528d8fe271b4f4dde1c585b2a0991e8aaf4445a4b33436355caaed5dff153dd72afa1574123de627a894d38ba78157caa79ba77ba4e52f13ba92e0c6c45
-  data.tar.gz: 1cfa9cddbd3af489be308bf496f0e4b1079a9a007eafe97cf5255b31187fbb15ab9978797b2a8fbec3b8f4b08c8a74ec042a7088f6e3b799cf0a41e80792c5f3
+  metadata.gz: 7b89ffd39a4a95a583de590188708036ca82cf364c058b7de40b9b95f622daa289f44481a5afa880753f26446495ee5a731a3136441ab2626ecdef33a206e457
+  data.tar.gz: baf172073f91d7d29495d4cb3fcbadef8b396ea7e8b066c11fcd692e01daeb2be9dbb60e9db8fa619b7294ce00be2a9ad1e4fd156ba2f067eacbcf78aa32e1b2

data/lib/cnvrg/cli.rb

@@ -2854,14 +2854,15 @@ module Cnvrg
     method_option :job_type, :type => :string, :aliases => ["-jt", "--job_type"], :default => nil
     method_option :files, :type => :string, :aliases => ["--files"], :default => nil
     method_option :output_dir, :type => :string, :aliases => ["--output_dir"], :default => nil
-    def sync(direct = true)
+    def  sync(direct = true)
       verify_logged_in(true) if direct
       @project = Project.new(get_project_home)
       log_start(__method__, args, options)
       log_message('Checking for new updates from remote version', Thor::Shell::Color::BLUE, options["verbose"])
       log_message('Syncing project', Thor::Shell::Color::BLUE, !options["verbose"])
-      job_slug = options['job_slug']
-      job_type = options['job_type']
+      job_slug = options['job_slug'] || ENV['CNVRG_JOB_ID']
+      job_type = options['job_type'] || ENV['CNVRG_JOB_TYPE']
+      is_git = ENV['CNVRG_GIT_PROJECT'] == "true" || @project.is_git
       in_exp = options["in_exp"] || (job_slug.present? and job_type.present?)
       in_exp = false if job_type.present? and job_type == "NotebookSession"
       run_download = true
@@ -2913,6 +2914,8 @@ module Cnvrg
     method_option :local_folders, :type => :string, :aliases => ["--local_folders"], :default => nil
     method_option :prerun, :type => :boolean, :aliases => ["-p", "--prerun"], :default => true
     method_option :requirements, :type => :boolean, :aliases => ["-r", "--requirements"], :default => true
+    method_option :notify_on_error, :type => :boolean, :aliases => ["-noe", "--notify_on_error"], :default => nil
+    method_option :notify_on_success, :type => :boolean, :aliases => ["-nos", "--notify_on_success"], :default => nil
 
     def run(*cmd)
       verify_logged_in(true)
@@ -2944,6 +2947,8 @@ module Cnvrg
       local_folders = options["local_folders"]
       prerun = options["prerun"]
       requirements = options["requirements"]
+      email_notification_error = options["notify_on_error"]
+      email_notification_success = options["notify_on_success"]
 
       if !data.present? and data_query.present?
         log_message("Please provide data with data_query", Thor::Shell::Color::RED)
@@ -2993,7 +2998,8 @@ module Cnvrg
                 :max_time => max_time,
                :periodic_sync => periodic_sync, :dataset_only_tree=> dataset_only_tree,
                :output_dir=>output_dir, :data_query=>data_query, :git_commit =>git_commit, :git_branch=> git_branch,
-               :restart_if_stuck =>restart_if_stuck, :local_folders => local_folders, :datasets => datasets, :prerun => prerun, :requirements => requirements
+               :restart_if_stuck =>restart_if_stuck, :local_folders => local_folders, :datasets => datasets, :prerun => prerun, :requirements => requirements,
+               :email_notification_error => email_notification_error, :email_notification_success => email_notification_success
         return
       end
 
@@ -3299,6 +3305,8 @@ module Cnvrg
     method_option :datasets, :type => :string, :aliases => ["--datasets"], :default => nil
     method_option :prerun, :type => :boolean, :aliases => ["-p", "--prerun"], :default => true
     method_option :requirements, :type => :boolean, :aliases => ["-r", "--requirements"], :default => true
+    method_option :email_notification_error, :type => :boolean, :aliases => ["--email_notification_error"], :default => true
+    method_option :email_notification_success, :type => :boolean, :aliases => ["--email_notification_success"], :default => true
 
     def exec_remote(*cmd)
 
@@ -3318,6 +3326,8 @@ module Cnvrg
         force = options["force"]
         prerun = options["prerun"]
         requirements = options["requirements"]
+        email_notification_error = options["email_notification_error"]
+        email_notification_success = options["email_notification_success"]
         max_time = options["max_time"]
         if !max_time.nil? and !max_time.empty?
           max_time = max_time.to_i
@@ -3356,7 +3366,8 @@ module Cnvrg
         local_folders_options = options["local_folders"]
         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" )
+                             "data_query", "git_commit","git_branch", "restart_if_stuck","local_folders","output_dir", "commit", "datasets", "requirements", "prerun",
+                             "email_notification_error", "email_notification_success")
         exec_options = options_hash.map {|x| "--#{x[0]}=#{x[1]}"}.flatten.join(" ")
         command = "#{exec_options} #{remote}  #{upload_output_option} #{cmd.flatten.join(" ")}"
         commit_to_run = options["commit"] || nil
@@ -3427,7 +3438,8 @@ 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, recurring: recurring)
+                              data_query, git_commit, git_branch, restart_if_stuck,local_folders_options, title, datasets, prerun: prerun, requirements: requirements, recurring: recurring,
+                              email_notification_error: email_notification_error, email_notification_success: email_notification_success)
         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"]}"

data/lib/cnvrg/experiment.rb

@@ -107,7 +107,8 @@ module Cnvrg
 
     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, recurring: nil)
+                    git_commit=nil, git_branch=nil, restart_if_stuck=nil, local_folders=nil,title=nil, datasets=nil, prerun: true, requirements: true, recurring: nil,
+                    email_notification_error: false, email_notification_success: false)
       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,
@@ -121,7 +122,9 @@ 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, recurring: recurring})
+                                                                                                            prerun: prerun, requirements: requirements, recurring: recurring,
+                                                                                                            email_notification_error: email_notification_error,
+                                                                                                            email_notification_success: email_notification_success})
 
       return response
     end

data/lib/cnvrg/project.rb

@@ -1,4 +1,7 @@
 require 'fileutils'
+require 'pathname'
+
+
 module Cnvrg
   class Project
     attr_reader :slug, :owner, :title, :local_path, :working_dir, :is_git, :is_branch, :machines
@@ -426,8 +429,10 @@ module Cnvrg
       end
       list_ignore_new = list_ignore.map{|x| x.gsub("//","/")} rescue []
       # list.each do |e|
+      project_root  = Pathname.new(self.local_path)
       Parallel.map(list, in_threads: IDXParallelThreads) do |e|
-        label = e.gsub(self.local_path + "/", "")
+        relative_path = Pathname.new(File.expand_path(e))
+        label = relative_path.relative_path_from(project_root)
         if not Cnvrg::Files.valid_file_name?(label)
           raise StandardError.new("#{label} is not a valid file name")
         end

data/lib/cnvrg/version.rb

@@ -1,4 +1,3 @@
 module Cnvrg
-  VERSION = '1.6.0.9'
+  VERSION = '1.6.0.13'
 end
-

metadata

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