cnvrg 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed41aace0f169165c4fe37fe93f2c842911d1dea
-  data.tar.gz: e4052bcf65b9af805d269a4f8fea935c9784f682
+  metadata.gz: 0513fe7eb80b8633e3012478fe86baad4f11585f
+  data.tar.gz: 7a31042c326555ffc8d59c14abc2c09c0635a138
 SHA512:
-  metadata.gz: c6ead169cf675632f34a76a1e36e45245c3e4cbfe20e988234677036f97b3556c86b4775b18cc134ee2cefe8287950f4f148ac3c2d8515ba74de66c4593b4a91
-  data.tar.gz: 6169ad2276f32fa5d86dcfbbc6a24fcaecb60b1c68f322af5e4ff5585de986c809abe2c4dc66465218a91491fb53c34b0e27cbadda0d20b7c96fd9c8289acfc1
+  metadata.gz: c811b17a9f6f77ef8c99363adbd0868686349f93bcae165845b3a8c9acb280d2a6cc11d1f15e31280b6aa1fc22bcbe7cb94af4316234a1aafa54b04ba3b46f62
+  data.tar.gz: f59236f39b298e2ab1be29202c58e9bdc36aec4a6f9b8f413251c87d7ad90cf300a620dcc6395a9e728c7c479770dad5a546c74a7f67b99461a4efad4e863b6c

data/lib/cnvrg/api.rb

@@ -17,14 +17,14 @@ module Cnvrg
                 if File.exist? home_dir+"/.cnvrg/config.yml"
                     config = YAML.load_file(home_dir+"/.cnvrg/config.yml")
                 else
-                    return "https://cnvrg.io/api"
+                    return "https://app.cnvrg.io/api"
                 end
 
             rescue
-                return "https://cnvrg.io/api"
+                return "https://app.cnvrg.io/api"
             end
             if !config or config.empty? or config.to_h[:api].nil?
-                return "https://cnvrg.io/api"
+                return "https://app.cnvrg.io/api"
             else
               return config.to_h[:api]
             end

data/lib/cnvrg/cli.rb

@@ -2276,7 +2276,7 @@ module Cnvrg
             if git_output_dir.ends_with? "/"
               git_output_dir = git_output_dir[0..-2]
             end
-            list = @project.generate_output_dir(git_output_dir)
+            list = @project.generate_output_dir_tmp(git_output_dir)
             spec_files_to_upload = list
             if spec_files_to_upload.blank?
               log_message("#{check} Project is up to date", Thor::Shell::Color::GREEN, (((options["sync"] or sync) and !direct) ? false : true))
@@ -2961,7 +2961,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
+    method_option :restart_if_stuck, :type => :boolean, :aliases => ["--restart","--restart_if_stuck"], :default => nil
     method_option :local_folders, :type => :string, :aliases => ["--local_folders"], :default => nil
 
     def run(*cmd)
@@ -3003,6 +3003,7 @@ module Cnvrg
       git_branch = options["git_branch"]
       restart_if_stuck = options["restart_if_stuck"]
 
+
       options_hash = Hash[options]
 
       if local
@@ -3376,6 +3377,7 @@ module Cnvrg
     method_option :local_folders, :type => :string, :aliases => ["--local_folders"], :default => nil
 
     def exec_remote(*cmd)
+
       verify_logged_in(true)
       log_start(__method__, args, options)
       working_dir = is_cnvrg_dir
@@ -3442,7 +3444,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",
+        options_hash.except!("schedule", "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" )
         exec_options = options_hash.map {|x| "--#{x[0]}=#{x[1]}"}.flatten.join(" ")
@@ -3578,8 +3580,11 @@ module Cnvrg
           project = Project.new(working_dir)
           commit_to_run = options["commit"] || nil
 
-        workers = options["workers"] || nil
+        workers = options["workers"]
         begin
+          if workers.blank?
+            workers = 2
+          end
           num_workers = workers.to_i
         rescue
           log_message("Number of workers should be a number between 1 to 10", Thor::Shell::Color::RED)
@@ -3588,18 +3593,10 @@ module Cnvrg
         file_as_input = options["file_as_input"] || false
 
 
-        image = is_project_with_docker(working_dir)
-        if !image or !image.is_docker
-          image = Images.new(working_dir, "cnvrg")
-          image_slug = image.image_slug
-        else
-          image_slug = image.image_slug
-        end
-
 
         invoke :sync, [false], []
 
-          res = project.deploy(file_to_run, function, nil, commit_to_run, instance_type, image_slug, schedule, local_timestamp, num_workers, file_as_input, title)
+          res = project.deploy(file_to_run, function, nil, commit_to_run, instance_type, "cnvrg", schedule, local_timestamp, num_workers, file_as_input, title)
 
         if Cnvrg::CLI.is_response_success(res)
 

data/lib/cnvrg/files.rb

@@ -57,7 +57,6 @@ module Cnvrg
       unless Cnvrg::CLI.is_response_success(resp, false)
         raise Exception.new("Cant upload files to the server.")
       end
-
       # resolve bucket
       res = resp['result']
       files = res['files']
@@ -66,6 +65,7 @@ module Cnvrg
       bucket = props[:bucket]
       upload_options = props[:upload_options]
       s3_bucket = Aws::S3::Resource.new(client: client).bucket(bucket)
+
       #upload files
       files.keys.map do |file|
       # Parallel.map(files.keys, self.get_upload_options) do |file|
@@ -420,7 +420,6 @@ module Cnvrg
       begin
         return true if upload_resp['result']['already_exists'].present?
           sts_path = upload_resp["result"]["path_sts"]
-
           retries = 0
           success= false
           while !success and retries < 20
@@ -471,7 +470,6 @@ module Cnvrg
                 :endpoint=> endpoint,:force_path_style=> true,:ssl_verify_peer=>false,
                 :http_open_timeout => 60, :retry_limit => 20)
           end
-
             s3 = Aws::S3::Resource.new(client: client)
             resp = s3.bucket(bucket).
                 object(upload_resp["result"]["path"]+"/"+File.basename(file_path)).

data/lib/cnvrg/project.rb

@@ -341,6 +341,26 @@ module Cnvrg
       end
 
 
+      return upload_list
+
+    end
+    def generate_output_dir_tmp(output_dir)
+      upload_list = []
+      list = Dir.glob("#{output_dir}/**/*", File::FNM_DOTMATCH)
+      Parallel.map(list, in_threads: IDXParallelThreads) do |e|
+        next if e.end_with? "/."
+        if File.directory? e
+
+          next
+        else
+          upload_list << e
+        end
+      end
+      # if Dir.exists? output_dir
+      #   upload_list << output_dir + "/"
+      # end
+
+
       return upload_list
 
     end
@@ -518,6 +538,7 @@ module Cnvrg
       end
 
       def deploy(file_to_run, function, input_params, commit_to_run, instance_type, image_slug, scheduling_query, local_timestamp,workers, file_input, title)
+
         response = Cnvrg::API.request("users/#{@owner}/projects/#{@slug}/deploy", 'POST', {file_to_run: file_to_run, function: function,
                                                                                            image_slug: image_slug, input_params: input_params,
                                                                                            commit_sha1: commit_to_run,

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.8.0'
+  VERSION = '0.8.2'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.2
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler