cnvrg 0.0.140 → 0.0.141

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dd32719858cd65bd5cc1a284f04ebcc727e2a83
-  data.tar.gz: ab592b0e08289acf21377a50aa53ce3feb8a83f3
+  metadata.gz: 926f82dfe1bfcf71e51c1218b90c197dcd9ee717
+  data.tar.gz: 87668443ad37a85c376c92c38599a23b2475e036
 SHA512:
-  metadata.gz: 45bbf580911bc4c8dc14a88023e39019801a6d079093991d5a5960957f7a57d7241d340f3c8b74e949e35283e1423bf219599c7389b26eead581c79ea036c91d
-  data.tar.gz: 98369829234aeba876bcbebe69dec5993a7a4b4be6d04d5c7b479f42ab9dd050fb5a022e62f5c6dc2f2d8e22d8af50a183a935e411d8d3c581ad56b83a9b33d6
+  metadata.gz: c7996005a060813f1b2405a60b020bcc6ea56cc97ea8f165e903958a588a2de4178f7588ac64bbc4a5a2dbde43deeccd49fe959b065905e85171cef8a2d0cd51
+  data.tar.gz: c9ce755b4f9e3ed0a2d400c3d7bbe3a14f318a1b8fed87b9fd31d8facda64cca78e28d75de923d7d23cb97b465afb620b95463570a98354aa0f03887ee137d25

data/lib/cnvrg/Images.rb

@@ -1,7 +1,6 @@
 require 'fileutils'
 require 'cnvrg/files'
 require 'docker'
-require 'pry'
 
 module Cnvrg
   class Images

data/lib/cnvrg/cli.rb

@@ -29,7 +29,6 @@ require 'fileutils'
 require 'zip'
 require 'active_support/all'
 require 'thor'
-require 'pry'
 
 # DEV VERSION
 #
@@ -246,15 +245,30 @@ module Cnvrg
             owners << choose_owner
             chosen = false
             while !chosen
-              choose_owner = ask("Choose default owner:\n"+owners.join("\n")+"\n")
+              owners_id = owners.each_with_index.map{|x,i| "#{i+1}. #{x}"}
+              choose_owner = ask("Choose default owner:\n"+owners_id.join("\n")+"\n")
+
+              if choose_owner =~ /[[:digit:]]/
+                ow_index = choose_owner.to_i-1
+                if ow_index<0 or ow_index >= owners.size
+                  say "No such owner, please choose again", Thor::Shell::Color::BLUE
+                  chosen = false
+                  next
+                end
+                choose_owner = owners[choose_owner.to_i-1]
+                chosen = true
 
-              owners_lower = owners.map { |o| o.downcase }
-              ow_index = owners_lower.index(choose_owner.downcase)
-              if ow_index.nil?
-                say "Could not find owner named #{choose_owner}", Thor::Shell::Color::RED
               else
-                chosen = true
+
+                owners_lower = owners.map { |o| o.downcase }
+                ow_index = owners_lower.index(choose_owner.downcase)
+                if ow_index.nil?
+                  say "Could not find owner named #{choose_owner}", Thor::Shell::Color::RED
+                else
+                  chosen = true
+                end
               end
+
             end
 
 
@@ -274,6 +288,11 @@ module Cnvrg
 
           exit(1)
         end
+      rescue
+
+        say "Error Occurred, aborting", Thor::Shell::Color::RED
+        logout()
+        exit(1)
       rescue SignalException
 
         say "\nAborting"
@@ -393,8 +412,8 @@ module Cnvrg
         say "created project successfully", Thor::Shell::Color::GREEN
         say "Linked directory to\t#{@project.url}", Thor::Shell::Color::GREEN
       rescue => e
-        puts e
-        log_end(-1)
+        log_end(-1,e.message)
+        say "Error occurred, aborting", Thor::Shell::Color::RED
         if Dir.exist? working_dir
 
           @project.revert(working_dir)
@@ -821,7 +840,7 @@ module Cnvrg
           say "User aborted, Rolling Back all changes.", Thor::Shell::Color::RED
           exit(0)
         rescue => e
-          log_end(1, e.message)
+          log_end(-1, e.message)
           @files.rollback_commit(commit_sha1)
           say "Exception while trying to upload, Rolling back", Thor::Shell::Color::RED
           exit(0)
@@ -835,7 +854,7 @@ module Cnvrg
 
               @project.update_idx_with_commit!(commit_sha1)
             rescue => e
-              log_end(1, e.message)
+              log_end(-1, e.message)
               @files.rollback_commit(commit_sha1)
               say "Couldn't commit updates, Rolling Back all changes.", Thor::Shell::Color::RED
               exit(1)
@@ -1026,6 +1045,7 @@ module Cnvrg
         if !response["result"]["tree"].nil?
           idx = {commit: response["result"]["commit"], tree: response["result"]["tree"]}
           File.open(project_home + "/.cnvrg/idx.yml", "w+") { |f| f.write idx.to_yaml }
+          current_tree = Dir.entries(".").reject { |file| file.start_with? '.' or file.eql? "__init__.py" or file.eql? "uwsgi.ini" }
 
           response["result"]["tree"].each do |f|
             relative_path = f[0].gsub(/^#{@project.local_path}/, "")
@@ -1077,21 +1097,21 @@ module Cnvrg
 
 
     desc 'run cmd', 'Runs an experiment'
-    method_option :local, :type => :boolean, :aliases => ["--l"], :default => false
-    method_option :small, :type => :boolean, :aliases => ["--sm"], :default => false
-    method_option :medium, :type => :boolean, :aliases => ["--med"], :default => false
-    method_option :large, :type => :boolean, :aliases => ["--lg"], :default => false
+    method_option :local, :type => :boolean, :aliases => ["-l"], :default => false
+    method_option :small, :type => :boolean, :aliases => ["-sm", "--small"], :default => false
+    method_option :medium, :type => :boolean, :aliases => ["-md","--medium"], :default => false
+    method_option :large, :type => :boolean, :aliases => ["-lg","--large"], :default => false
     method_option :gpu, :type => :boolean, :aliases => ["--gpu"], :default => false
-    method_option :gpuxl, :type => :boolean, :aliases => ["--gxl"], :default => false
-    method_option :sync_before, :type => :boolean, :aliases => ["--sb"], :default => true
-    method_option :sync_after, :type => :boolean, :aliases => ["--sa"], :default => true
-    method_option :title, :type => :string, :aliases => ["--t"], :default => ""
+    method_option :gpuxl, :type => :boolean, :aliases => ["--gpuxl"], :default => false
+    method_option :sync_before, :type => :boolean, :aliases => ["-sb"], :default => true
+    method_option :sync_after, :type => :boolean, :aliases => ["-sa"], :default => true
+    method_option :title, :type => :string, :aliases => ["-t"], :default => ""
     method_option :log, :type => :boolean, :aliases => ["--log"], :default => false
-    method_option :email_notification, :type => :boolean, :aliases => ["--en"], :default => false
-    method_option :upload_output, :type => :string, :aliases => ["--uo"], :default => ""
-    method_option :commit, :type => :string, :aliases => ["--c"], :default => ""
-    method_option :schedule, :type => :string, :aliases => ["--s"], :default => ""
-    method_option :image, :type => :string, :aliases => ["--i"], :default => ""
+    method_option :email_notification, :type => :boolean, :aliases => ["-en"], :default => false
+    method_option :upload_output, :type => :string, :aliases => ["-uo"], :default => ""
+    method_option :commit, :type => :string, :aliases => ["-c"], :default => ""
+    method_option :schedule, :type => :string, :aliases => ["-s"], :default => ""
+    method_option :image, :type => :string, :aliases => ["-i"], :default => ""
 
     def run(*cmd)
       sync_before = options["sync_before"]
@@ -1119,14 +1139,14 @@ module Cnvrg
 
 
     desc '', ''
-    method_option :sync_before, :type => :boolean, :aliases => ["-sb", "--sb"], :default => true
-    method_option :sync_after, :type => :boolean, :aliases => ["-sa", "--sa"], :default => true
-    method_option :title, :type => :string, :aliases => ["-t", "--t"], :default => ""
-    method_option :log, :type => :boolean, :aliases => ["-l", "--l"], :default => false
-    method_option :email_notification, :type => :boolean, :aliases => ["-en", "--en"], :default => false
-    method_option :upload_output, :type => :string, :aliases => ["--uo", "-uo"], :default => ""
-    method_option :commit, :type => :string, :aliases => ["--c", "-c"], :default => ""
-    method_option :image, :type => :string, :aliases => ["--i"], :default => ""
+    method_option :sync_before, :type => :boolean, :aliases => ["-sb"], :default => true
+    method_option :sync_after, :type => :boolean, :aliases => ["-sa"], :default => true
+    method_option :title, :type => :string, :aliases => ["-t"], :default => ""
+    method_option :log, :type => :boolean, :aliases => ["-l", "--log"], :default => false
+    method_option :email_notification, :type => :boolean, :aliases => ["-en"], :default => false
+    method_option :upload_output, :type => :string, :aliases => [ "-uo"], :default => ""
+    method_option :commit, :type => :string, :aliases => ["-c"], :default => ""
+    method_option :image, :type => :string, :aliases => ["-i"], :default => ""
     method_option :indocker, :type => :boolean,  :default => false
 
     def exec(*cmd)
@@ -1258,7 +1278,6 @@ module Cnvrg
                   end
 
                 rescue Errno::EIO => e
-                  puts e
                     # break
                 rescue Errno::ENOENT
                   log_end(1, "command #{cmd} isn't valid")
@@ -1271,8 +1290,9 @@ module Cnvrg
                   exp_success = false
                   say "The process exited!", Thor::Shell::Color::RED
                 rescue => e
-                  puts e
-                  log_end(1, e.message)
+                  log_end(-1, e.message)
+                  say "Error occurred,aborting", Thor::Shell::Color::RED
+                  exit(0)
                 end
                 ::Process.wait pid
                 cpu_average = cpu_total.inject(0) { |sum, el| sum + el }.to_f / cpu_total.size
@@ -1310,7 +1330,7 @@ module Cnvrg
                     invoke :sync, [], :new_branch => true
 
                   else
-                    invoke :sync, [], :new_branch => true
+                    invoke :sync, [], :new_branch => false
                   end
                 end
                 end_commit = @project.last_local_commit
@@ -1321,8 +1341,7 @@ module Cnvrg
                 log_end(0)
               end
             rescue => e
-              puts e
-              log_end(1, e.message)
+              log_end(-1, e.message)
               if container
                 container.stop()
               end
@@ -1458,7 +1477,9 @@ module Cnvrg
                   exp_success = false
                   say "The process exited!", Thor::Shell::Color::RED
                 rescue => e
-                  log_end(1, e.message)
+                  log_end(-1, e.message)
+                  say "Error occurred, aborting", Thor::Shell::Color::RED
+                  exit(0)
                 end
                 ::Process.wait pid
                 cpu_average = cpu_total.inject(0) { |sum, el| sum + el }.to_f / cpu_total.size
@@ -1508,7 +1529,7 @@ module Cnvrg
                 log_end(0)
               end
             rescue => e
-              log_end(1, e.message)
+              log_end(-1, e.message)
               say "Couldn't run #{cmd}, check your input parameters", Thor::Shell::Color::RED
               exit(1)
             end
@@ -1533,16 +1554,16 @@ module Cnvrg
     end
 
     desc '', ''
-    method_option :sync_before, :type => :boolean, :aliases => ["-sb", "--sb"], :default => true
-    method_option :sync_after, :type => :boolean, :aliases => ["-sa", "--sa"], :default => true
-    method_option :title, :type => :string, :aliases => ["-t", "--t"], :default => ""
-    method_option :log, :type => :boolean, :aliases => ["-l", "--l"], :default => false
-    method_option :email_notification, :type => :boolean, :aliases => ["-en", "--en"], :default => false
-    method_option :upload_output, :type => :string, :aliases => ["--uo", "-uo"], :default => ""
-    method_option :machine_type, :type => :string, :aliases => ["--i", "-i"], :default => ""
-    method_option :schedule, :type => :string, :aliases => ["--s", "-s"], :default => ""
-    method_option :commit, :type => :string, :aliases => ["--c", "-c"], :default => nil
-    method_option :image, :type => :string, :aliases => ["--i"], :default => ""
+    method_option :sync_before, :type => :boolean, :aliases => ["-sb"], :default => true
+    method_option :sync_after, :type => :boolean, :aliases => ["-sa"], :default => true
+    method_option :title, :type => :string, :aliases => ["-t"], :default => ""
+    method_option :log, :type => :boolean, :aliases => ["-l", "--log"], :default => false
+    method_option :email_notification, :type => :boolean, :aliases => ["-en"], :default => false
+    method_option :upload_output, :type => :string, :aliases => ["-uo"], :default => ""
+    method_option :machine_type, :type => :string, :default => ""
+    method_option :schedule, :type => :string, :aliases => [ "-s"], :default => ""
+    method_option :commit, :type => :string, :aliases => [ "-c"], :default => nil
+    method_option :image, :type => :string, :aliases => ["-i"], :default => ""
 
     def exec_remote(*cmd)
       verify_logged_in(true)
@@ -1570,10 +1591,17 @@ module Cnvrg
           new_time = new_time[0, new_time.size-6] #remove timezone
           schedule = "at #{new_time}"
         end
+        upload_output = options["upload_output"]
+        time_to_upload = calc_output_time(upload_output)
+        if time_to_upload==0 or time_to_upload==-1
+          upload_output_option = "--upload_output=1m"
+        else
+          upload_output_option = "--upload_output=#{upload_output}"
+        end
         options_hash = Hash[options]
-        options_hash.except!("schedule", "machine_type", "image")
+        options_hash.except!("schedule", "machine_type", "image", "upload_output")
         exec_options = options_hash.map { |x| "--#{x[0]}=#{x[1]}" }.flatten.join(" ")
-        command = "#{exec_options} --uo=1m #{cmd.flatten.join(" ")}"
+        command = "#{exec_options} #{upload_output_option} #{cmd.flatten.join(" ")}"
         commit_to_run = options["commit"] || nil
         if !schedule.nil? and !schedule.empty?
 
@@ -1589,14 +1617,15 @@ module Cnvrg
         image = is_project_with_docker(working_dir)
         if !image or !image.is_docker
           # say "Couldn't find image related to project", Thor::Shell::Color::RED
-          default_image_name = "cnvrg"
+
+          image_slug = "cnvrg"
           if instance_type.eql? "gpu" or instance_type.eql? "gpuxl"
-            default_image_name = "cnvrg-gpu"
+            image_slug = "cnvrg_gpu"
           end
           # default = yes? "use #{default_image_name} default image?", Thor::Shell::Color::YELLOW
           # if default
-            image = Images.new(working_dir, default_image_name)
-            image_slug = image.image_slug
+          #   image = Images.new(working_dir, default_image_name)
+          #   image_slug = image.image_slug
           # else
           #   exit(0)
           # end
@@ -1763,27 +1792,30 @@ module Cnvrg
 
     method_option :kernel, :type => :string, :aliases => ["--k", "-k"], :default => ""
     method_option :notebook_dir, :type => :string, :aliases => ["-n", "--n"], :default => "", :desc => "relative path to notebook dir from current directory"
-    method_option :local, :type => :boolean, :aliases => ["--l"], :default => false
-    method_option :small, :type => :boolean, :aliases => ["--sm"], :default => false
-    method_option :medium, :type => :boolean, :aliases => ["--med"], :default => false
-    method_option :large, :type => :boolean, :aliases => ["--lg"], :default => false
+    method_option :local, :type => :boolean, :aliases => ["-l"], :default => false
+    method_option :small, :type => :boolean, :aliases => ["-sm","--small"], :default => false
+    method_option :medium, :type => :boolean, :aliases => ["-md","--medium"], :default => false
+    method_option :large, :type => :boolean, :aliases => ["-lg","--large"], :default => false
     method_option :gpu, :type => :boolean, :aliases => ["--gpu"], :default => false
-    method_option :gpuxl, :type => :boolean, :aliases => ["--gxl"], :default => false
+    method_option :gpuxl, :type => :boolean, :aliases => ["--gpuxl"], :default => false
+    method_option :image, :type => :string, :aliases => ["--i"], :default => ""
+
     desc 'starts a notebook session', 'starts a notebook session remotely or locally'
 
     def notebook()
       local = options["local"]
       notebook_dir = options["notebook_dir"]
       kernel = options["kernel"]
+      image = options["image"]
 
       if local
-        invoke :run_notebook, [], :notebook_dir => notebook_dir, :remote => false, :kernel => kernel
+        invoke :run_notebook, [], :notebook_dir => notebook_dir, :remote => false, :kernel => kernel,:image =>image
         return
       else
         instances = {"small" => options["small"], "medium" => options["medium"], "large" => options["large"], "gpu" => options["gpu"], "gpuxl" => options["gpuxl"]}
         instance_type = get_instance_type(instances)
 
-        invoke :remote_notebook, [], :notebook_dir => notebook_dir, :kernel => kernel, :machine_type => instance_type
+        invoke :remote_notebook, [], :notebook_dir => notebook_dir, :kernel => kernel, :machine_type => instance_type, :image =>image
         return
 
       end
@@ -1792,10 +1824,10 @@ module Cnvrg
     end
 
     desc 'remote_notebook', 'run notebook server on remote server'
-    method_option :notebook_dir, :type => :string, :aliases => ["-n", "--n"], :default => "", :desc => "relative path to notebook dir from current directory"
-    method_option :machine_type, :type => :string, :aliases => ["--i", "-i"], :default => ""
-    method_option :kernel, :type => :string, :aliases => ["--k", "-k"], :default => ""
-    method_option :image, :type => :string, :aliases => ["--i"], :default => ""
+    method_option :notebook_dir, :type => :string, :aliases => ["-n"], :default => "", :desc => "relative path to notebook dir from current directory"
+    method_option :machine_type, :type => :string,  :default => ""
+    method_option :kernel, :type => :string, :aliases => ["--kernel", "-k"], :default => ""
+    method_option :image, :type => :string, :aliases => ["-i"], :default => ""
 
 
     def remote_notebook()
@@ -1941,9 +1973,8 @@ module Cnvrg
 
         end
       rescue => e
-        puts e
-        log_end(-1)
-        say "Error occurd, Aborting"
+        log_end(-1, e.message)
+        say "Error occurred, aborting",Thor::Shell::Color::RED
         if container
           container.stop()
         end
@@ -2004,9 +2035,8 @@ module Cnvrg
           end
         end
       rescue => e
-        puts e
-        log_end(-1)
-        say "Error occurd, Aborting"
+        log_end(-1, e.message)
+        say "Error occurred, aborting"
         if container
           container.stop()
         end
@@ -2023,6 +2053,7 @@ module Cnvrg
     method_option :remote, :type => :boolean, :aliases => ["-r", "--r"], :default => false, :desc => "run on remote machine"
     method_option :kernel, :type => :string, :aliases => ["-k", "--k"], :default => "", :desc => "default kernel"
     method_option :verbose, :type => :boolean, :aliases => ["--v"], :default => false
+    method_option :image, :type => :string, :aliases => ["-i"], :default => ""
 
     def run_notebook
 
@@ -2045,6 +2076,11 @@ module Cnvrg
           notebook_dir = project_dir+ notebook_dir
         end
         say "Linking notebook directory to: #{File.basename notebook_dir}", Thor::Shell::Color::BLUE
+        choose_image = options["image"]
+
+        if !choose_image.nil? and !choose_image.empty?
+          invoke :set_image,[choose_image]
+        end
         image = is_project_with_docker(Dir.pwd)
         if image and image.is_docker and !remote
           container= image.get_container
@@ -2132,8 +2168,7 @@ module Cnvrg
           #   exit(1)
           # end
       rescue => e
-        log_end(-1)
-        puts e
+        log_end(-1,e.message)
         say "Error occurd, aborting", Thor::Shell::Color::RED
         if container
           container.stop()
@@ -2210,8 +2245,7 @@ module Cnvrg
           exit(0)
         end
       rescue => e
-        puts e
-        log_end(-1)
+        log_end(-1,e.message)
         say "Error occurd, aborting"
         if container
           container.stop()
@@ -2261,8 +2295,7 @@ module Cnvrg
 
         log_end(0)
       rescue => e
-        log_end(-1)
-        puts e
+        log_end(-1,e.message)
         say "Error occurd, aborting"
         if container
           container.stop()
@@ -2325,8 +2358,7 @@ module Cnvrg
 
         log_end(0)
       rescue => e
-        log_end(-1)
-        puts e
+        log_end(-1,e.message)
         say "Error occurd, aborting"
         if container
           container.stop()
@@ -2402,8 +2434,7 @@ module Cnvrg
 
         log_end(0)
       rescue => e
-        log_end(-1)
-        puts e
+        log_end(-1,e.message)
         say "Error occurd, aborting", Thor::Shell::Color::RED
         if container
           container.stop()
@@ -2452,8 +2483,9 @@ module Cnvrg
         log_end(0)
         return new_image.id
       rescue => e
-        puts e
-
+        log_end(-1,e.message)
+        say "\nError occurred,aborting"
+        exit(1)
       rescue SignalException
         log_end(-1)
         say "\nAborting"
@@ -2529,7 +2561,9 @@ module Cnvrg
           say "Image was updated successfully", Thor::Shell::Color::GREEN
         end
       rescue => e
-        puts e
+        log_end(-1,e.message)
+        say "error occurred, aborting"
+
       end
     end
 
@@ -2591,8 +2625,8 @@ module Cnvrg
           exit(1)
         end
       rescue => e
-        puts e
-
+        log_end(-1,e.message)
+        say "Couldn't upload image file for: #{image_name}", Thor::Shell::Color::RED
       rescue SignalException
         log_end(-1)
 
@@ -2646,7 +2680,7 @@ module Cnvrg
     method_option :cmd, :type => :string, :aliases => ["-c", "--c"], :default => "/usr/local/cnvrg/run_ipython.sh"
 
 
-    def config_remote(image_name, port=7654)
+    def config_remote(image_name, port=7654,tensport=6006)
       local_images = Docker::Image.all
 
       docker_image_local = local_images.map { |x| x.info["RepoTags"] }.flatten.select { |y| y.eql? "#{image_name}:latest" }.flatten
@@ -2673,6 +2707,9 @@ module Cnvrg
                     '8888/tcp' => [
                         {'HostPort' => "#{port}", 'HostIp' => 'localhost'}
                     ],
+                    '6006/tcp' => [
+                        {'HostPort' => "#{tensport}", 'HostIp' => 'localhost'}
+                    ],
                 },
             },
         }
@@ -2688,13 +2725,79 @@ module Cnvrg
         container.exec(command, tty: true)
         command = ["/bin/bash", "-lc", "sudo chmod 0600 /home/ds/.netrc"]
         container.exec(command, tty: true)
-        say "#{container.id}:#{port}"
+        say "#{container.id}:#{port}##{tensport}"
       rescue => e
         if e.message.include? "is not running"
-          return config_remote(image_name, port-1)
+          return config_remote(image_name, port-1,tensport-1)
         end
-        puts "error"
-        puts e
+
+        if container
+          container.kill()
+        end
+        return false
+      end
+    end
+    desc '', ''
+    method_option :login, :type => :string, :aliases => ["-l", "--l"], :default => ""
+    method_option :app_dir, :type => :string, :aliases => ["-d", "--d"], :default => "/home/ds/notebooks"
+    method_option :cmd, :type => :string, :aliases => ["-c", "--c"], :default => "/usr/local/cnvrg/run_ipython.sh"
+
+
+    def config_remote_gpu(image_name, port=7654,tensport=6006)
+      local_images = Docker::Image.all
+
+      docker_image_local = local_images.map { |x| x.info["RepoTags"] }.flatten.select { |y| y.eql? "#{image_name}:latest" }.flatten
+      if docker_image_local.empty?
+        say "no image"
+        exit(1)
+      end
+
+      begin
+        login_content = options["login"]
+        app_dir = options["app_dir"]
+        cmd= options["cmd"]
+
+        # image_settings = {
+        #     'Image' => "#{image_name}:latest",
+        #     'User' => 'ds',
+        #     'Cmd' => cmd,
+        #     'WorkingDir' => app_dir,
+        #     'ExposedPorts' => {
+        #         '8888/tcp' => {},
+        #     },
+        #     'HostConfig' => {
+        #         'PortBindings' => {
+        #             '8888/tcp' => [
+        #                 {'HostPort' => "#{port}", 'HostIp' => 'localhost'}
+        #             ],
+        #             '6006/tcp' => [
+        #                 {'HostPort' => "6006", 'HostIp' => 'localhost'}
+        #             ],
+        #         },
+        #     },
+        # }
+
+        container_id = `nvidia-docker run -itd -p #{port}:8888 -p #{tensport}:6006 -w #{app_dir} #{image_name}:latest #{cmd} `
+        container_id = container_id.gsub("\n","")
+        container = Docker::Container.get(container_id)
+        # container.start()
+        command = ["/bin/bash", "-lc", "sudo echo -e \"#{login_content}\" >/home/ds/.netrc"]
+        container.exec(command, tty: true)
+        command = ["/bin/bash", "-lc", "mkdir /home/ds/.cnvrg"]
+        container.exec(command, tty: true)
+        command = ["/bin/bash", "-lc", "mkdir /home/ds/.cnvrg/tmp"]
+        container.exec(command, tty: true)
+        command = ["/bin/bash", "-lc", "sudo chown -R ds /home/ds/.cnvrg /home/ds/.netrc"]
+        container.exec(command, tty: true)
+        command = ["/bin/bash", "-lc", "sudo chmod 0600 /home/ds/.netrc"]
+        container.exec(command, tty: true)
+        say "#{container.id}:#{port}##{tensport}"
+      rescue => e
+        if e.message.include? "is not running"
+          puts "running asgain with: #{port-1} #{tensport-1}"
+          return config_remote_gpu(image_name, port-1,tensport-1)
+        end
+
         if container
           container.kill()
         end
@@ -2750,7 +2853,6 @@ module Cnvrg
           return "port is taken"
         end
         puts "error"
-        puts e
         if container
           container.kill()
         end
@@ -2768,12 +2870,12 @@ module Cnvrg
 
       path = File.expand_path('~')+"/.cnvrg/tmp/#{image_name}.zip"
       @files = Cnvrg::Files.new("", "")
-      python_arr = Cnvrg::Images.get_installed_packages("python")
-      py = python_arr.join(",") unless python_arr.nil? or python_arr.empty?
-      system_arr = Cnvrg::Images.get_installed_packages("system")
-      sys = system_arr.join(",") unless system_arr.nil? or system_arr.empty?
+      # python_arr = Cnvrg::Images.get_installed_packages("python")
+      # py = python_arr.join(",") unless python_arr.nil? or python_arr.empty?
+      # system_arr = Cnvrg::Images.get_installed_packages("system")
+      # sys = system_arr.join(",") unless system_arr.nil? or system_arr.empty?
       # bash_history = Cnvrg::Images.get_bash_history
-      res = @files.upload_image(path, image_name, owner, true, true, sys, py, "", "Image made by cnvrg.io team", "")
+      res = @files.upload_image(path, image_name, owner, true, true, "", "", "", "Image made by cnvrg.io team", "")
 
     end
 
@@ -3290,7 +3392,6 @@ module Cnvrg
           end
           $LOG = LogStashLogger.new(type: :file, path: logfile, sync: true)
         rescue => e
-          # puts e
         end
       end
 

data/lib/cnvrg/files.rb

@@ -99,7 +99,7 @@ module Cnvrg
         content_type = "application/gzip"
       end
       begin
-      upload_resp = Cnvrg::API.request("users/#{owner}/images/" + "upload", 'POST_FILE', {relative_path: absolute_path,
+      upload_resp = Cnvrg::API.request("users/#{owner}/images/" + "upload_cnvrg", 'POST_FILE', {relative_path: absolute_path,
                                                                                           file_name: file_name,
                                                                                           image_name: image_name,
                                                                                           file_size: file_size,
@@ -108,7 +108,9 @@ module Cnvrg
                                                                                           project_slug: @project_slug,
                                                                                           commit_id:commit_id ,
                                                                                           dpkg: dpkg,
-                                                                                          libraries: libraries,
+                                                                                          py2: libraries,
+                                                                                          py3: libraries,
+
                                                                                           bash_history: bash,
                                                                                           commit_message:message,
                                                                                           is_base: is_base})

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-    VERSION = '0.0.140'
+    VERSION = '0.0.141'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.140
+  version: 0.0.141
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-19 00:00:00.000000000 Z
+date: 2017-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler