cnvrg 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be48abaee7b44f00673ed8e4fe95fdc32044cdbf
-  data.tar.gz: fdc1bb3df689ea6524f268f910915559ba62ddfb
+  metadata.gz: 07964bc246a5f5139d9e726200e40d318a54eaec
+  data.tar.gz: f313dce679b50991e1440f668b8db27b1433bca8
 SHA512:
-  metadata.gz: 70a35b1ac372e78feffd115d7426338dced272bd351b7e76277f3dc2ead315d2632b9f28a07c4f7fd27f93c9668678addb4d91b106cb3c26b5e75d94832c752b
-  data.tar.gz: 96a10e4bd81552ea5b1ce22468fd102f9ec21a29e64152b83106a743e2e6278de0d68cb504fc78dcfb64098f30b60d5ecb051a224685dcdb5f9eea876ce12cc2
+  metadata.gz: 56a184f578f4817a3f7471b3263d948575d7b685139748614793e1dad14f20419645279616c0bcffb43eaee31e7ce4d20ca7090ee080ade8167cfed668d80dca
+  data.tar.gz: d6dfd7f259df3aaaf55ccd4e93662e9d5b4f9ad184f138b14c605d09a3faed498d6d1f0dd3765ced81d966303bc5f696ba0bd262c8110809e3295d8a175e85f1

data/lib/cnvrg/api.rb

@@ -3,7 +3,6 @@ require 'faraday'
 require 'json'
 require 'fileutils'
 require 'cnvrg/helpers'
-require 'faraday_middleware-request-retry'
 require 'logger'
 
 module Cnvrg

data/lib/cnvrg/cli.rb

@@ -2395,7 +2395,11 @@ module Cnvrg
         end
         git_output_dir = options["output_dir"]
         if !git_output_dir.blank?
+          if git_output_dir.ends_with? "/"
+            git_output_dir = git_output_dir[0..-2]
+          end
           spec_files_to_upload = Dir.glob("#{git_output_dir}/**/*", File::FNM_DOTMATCH).flatten
+          spec_files_to_upload = spec_files_to_upload.select{|x| !x.ends_with? "/."}
           force = true
         end
 
@@ -3370,7 +3374,7 @@ module Cnvrg
     method_option :data_query, :type => :string, :aliases => ["-q", "--query"], :default => nil
     method_option :git_commit, :type => :string, :aliases => [ "--git_commit"], :default => nil
     method_option :git_branch, :type => :string, :aliases => [ "--git_branch"], :default => nil
-
+    method_option :restart_if_stuck, :type => :boolean, :aliases => ["--restart"], :default => nil
 
     def run(*cmd)
       verify_logged_in(true)
@@ -3407,7 +3411,7 @@ module Cnvrg
       end
       git_commit = options["git_commit"]
       git_branch = options["git_branch"]
-
+      restart_if_stuck = options["restart_if_stuck"]
 
       options_hash = Hash[options]
 
@@ -3438,7 +3442,7 @@ module Cnvrg
                :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,
-               :output_dir=>output_dir, :data_query=>data_query, :git_commit =>git_commit, :git_branch=> git_branch
+               :output_dir=>output_dir, :data_query=>data_query, :git_commit =>git_commit, :git_branch=> git_branch, :restart_if_stuck =>restart_if_stuck
         return
       end
 
@@ -3783,7 +3787,7 @@ module Cnvrg
     method_option :data_query, :type => :string, :aliases => ["-q", "--query"], :default => nil
     method_option :git_commit, :type => :string, :aliases => [ "--git_commit"], :default => nil
     method_option :git_branch, :type => :string, :aliases => [ "--git_branch"], :default => nil
-
+    method_option :restart_if_stuck, :type => :boolean, :aliases => ["--restart"], :default => nil
     def exec_remote(*cmd)
       verify_logged_in(true)
       log_start(__method__, args, options)
@@ -3812,6 +3816,7 @@ module Cnvrg
         if dataset_only_tree
           ds_sync_options = 1
         end
+        restart_if_stuck = options["restart_if_stuck"]
         instance_type = options["machine_type"] || nil
         schedule = options["schedule"] || ""
         if schedule.start_with? 'in'
@@ -3850,7 +3855,7 @@ module Cnvrg
         options_hash = Hash[options]
         options_hash.except!("schedule", "machine_type", "image", "upload_output", "grid", "data", "data_commit",
                              "local", "small", "medium", "large", "gpu", "gpuxl", "gpuxxl","max_time","dataset_only_tree",
-                             "data_query", "git_commit","git_branch" )
+                             "data_query", "git_commit","git_branch", "restart_if_stuck" )
         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
@@ -3918,7 +3923,7 @@ module Cnvrg
           commit_to_run = forced_commit
         end
         res = exp.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,output_dir,data_query, git_commit, git_branch)
+                              periodic_sync, sync_before_terminate, max_time, ds_sync_options,output_dir,data_query, git_commit, git_branch, restart_if_stuck)
         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

@@ -89,7 +89,7 @@ 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,
-                    sync_before_terminate, max_time, ds_sync_options=0,output_dir=nil,data_query=nil, git_commit=nil, git_branch=nil)
+                    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)
       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,
@@ -100,7 +100,7 @@ module Cnvrg
                                                                                                             dataset_commit: data_commit,max_time:max_time,
                                                                                                             periodic_sync:periodic_sync, sync_before_terminate:sync_before_terminate,
                                                                                                             dataset_sync_options:ds_sync_options,output_dir:output_dir,
-                                                                                                            dataset_query:data_query,git_commit:git_commit,git_branch:git_branch })
+                                                                                                            dataset_query:data_query,git_commit:git_commit,git_branch:git_branch,restart_if_stuck:restart_if_stuck })
       return response
     end
     def remote_notebook(instance_type, commit, data, data_commit, notebook_type,ds_sync_options=0,data_query=nil)

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.5.5'
+  VERSION = '0.5.6'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-28 00:00:00.000000000 Z
+date: 2018-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler