cnvrg 0.3.2 → 0.3.5

data/lib/cnvrg/experiment.rb

@@ -1,22 +1,28 @@
+require 'net/http'
 module Cnvrg
   class Experiment
     attr_reader :slug
+    attr_reader :sync_before_terminate
+    attr_reader :sync_delay_time
 
     def initialize(owner, project_slug)
       @project_slug = project_slug
       @owner = owner
       @base_resource = "users/#{owner}/projects/#{project_slug}/"
       @slug = nil
+      @sync_before_terminate = nil
+      @sync_delay_time = nil
     end
 
-    def start(input, platform, machine_name, start_commit, name, email_notification, machine_activity,script_path)
+    def start(input, platform, machine_name, start_commit, name, email_notification, machine_activity,script_path,sync_before_terminate, periodic_sync)
+
       res = Cnvrg::API.request(@base_resource + "experiment/start", 'POST',
-                               {input: input, platform: platform, machine_name: machine_name, start_commit: start_commit,
+                               {input: input, platform: platform, machine_name: machine_name, start_commit: start_commit,sync_before_terminate:sync_before_terminate, periodic_sync:periodic_sync,
                                 title: name, email_notification: email_notification, machine_activity: machine_activity,script_path:script_path})
       Cnvrg::CLI.is_response_success(res,false)
-
       @slug = res.to_h["result"].to_h["slug"]
-
+      @sync_before_terminate = res.to_h["result"].to_h["sync_before_terminate"]
+      @sync_delay_time = res.to_h["result"].to_h["sync_delay_time"]
       return res
 
     end
@@ -113,5 +119,30 @@ module Cnvrg
 
       end
     end
+
+    def restart_spot_instance
+      restart = false
+      begin
+      url = URI.parse('http://169.254.169.254/latest/meta-data/spot/termination-time')
+      req = Net::HTTP::Get.new(url.to_s)
+      res = Net::HTTP.start(url.host, url.port) {|http|
+        http.request(req)
+      }
+      unless res.body.include? "404"
+        restart = true
+      end
+      if res.body.include? "Empty reply from server"
+        restart = false
+      end
+      rescue
+      end
+
+      return restart
+
+    end
+
+    def send_restart_request()
+      response = Cnvrg::API.request(@base_resource + "experiment/check_spot_instance", 'POST', {exp_slug: @slug})
+    end
   end
 end

data/lib/cnvrg/project.rb

@@ -312,7 +312,7 @@ module Cnvrg
       File.open(@working_dir+"/.cnvrg/config.yml", "w+") { |f| f.write new_config.to_yaml }
     end
 
-      def generate_idx
+      def generate_idx(deploy:false)
         if File.exists? "#{self.local_path}/.cnvrg/idx.yml"
           old_idx = YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
         else
@@ -322,6 +322,11 @@ module Cnvrg
         tree_idx = Hash.new(0)
         list = Dir.glob("#{self.local_path}/**/*", File::FNM_DOTMATCH).reject { |x| (x =~ /\/\.{1,2}$/) or (x =~ /^#{self.local_path}\/\.cnvrg\/*/) or (x =~/^#{self.local_path}\/\.cnvrgignore.conflict*/) and not (x =~/^#{self.local_path}\/\.cnvrgignore/) }
         list_ignore = self.get_ignore_list()
+        if deploy
+          list_ignore << ["main.py","main.pyc", "__init__.py", "uwsgi.ini"]
+          list_ignore.flatten!
+        end
+
         Parallel.map(list, in_threads: IDXParallelThreads) do |e|
           label = e.gsub(self.local_path + "/", "")
           ignore_label = label.gsub("/","//")
@@ -357,8 +362,8 @@ module Cnvrg
         return response
       end
 
-      def compare_idx(new_branch, commit:last_local_commit,force:false)
-        local_idx = self.generate_idx
+      def compare_idx(new_branch, commit:last_local_commit,force:false, deploy: false)
+        local_idx = self.generate_idx(deploy: deploy)
         ignore_list = self.send_ignore_list()
         if force
           added = []

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.3.2'
+  VERSION = '0.3.5'
 end
 

metadata

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