cnvrg 0.8.8 → 0.8.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa06cc99ce48fbc702512cef391170adb96c7551
-  data.tar.gz: a796655bb7816ae274b0e2318b1b07c3f13f4b70
+  metadata.gz: a68bff6bfb11b5c5ec5a1a79a457a6c77885c0b2
+  data.tar.gz: a9caf9fa18a3097369b895a3bf073620a09a8901
 SHA512:
-  metadata.gz: 69373b1b73682ff11400cec9cb23d0a7491b56e7ca8fc32f7a63da95819f4a10efac4fcbf80744ea45bb1797f1e2b54ce56fdeee7046472f6daf68e3ac36272a
-  data.tar.gz: d9ca87a00116dbbc7d63651addd0e9f296b8e5b21e613bd33253575d632d0e5990644790182fec19198756eba872198a5e8d327ee0da58aab339e9bf3238a395
+  metadata.gz: 2f7754c7c39d0ed23b99c74ed3d371a16fcd45d6c65a60a45fe7672e516293546ee723784fb99ab794b04f13cf64c8856380f8d44b3d7cefd373851b6985bf5a
+  data.tar.gz: eeccb807877a72ad1522d82fe63c060fc801ebe16ac79c8130409e3827f9a1057b8ad0f78bc23931003b599d63ad5852c84f506b6180a82f41774640b010d78a

data/lib/cnvrg/Images.rb

@@ -7,50 +7,81 @@ require 'mimemagic'
 
 module Cnvrg
   class Images
-    attr_reader :image_name, :image_tag, :is_docker, :project_slug, :commit_id, :owner, :port, :image_slug
+    # attr_reader :image_name, :image_tag, :is_docker, :project_slug, :commit_id, :owner, :port, :image_slug
 
 
-    def initialize(working_dir, image_name="")
+    def initialize()
       begin
-        config = YAML.load_file(working_dir+"/.cnvrg/config.yml")
-        idx = YAML.load_file(working_dir + "/.cnvrg/idx.yml")
-
-        @working_dir = working_dir
-        @commit_id =idx[:commit]
-        @project_title = config[:project_name]
-        @project_slug = config[:project_slug]
-        @owner = config[:owner]
-        @is_docker = config[:docker]
-        if image_name.empty?
-          @image_name = config[:image_base]
-          @image_tag = config[:image_tag]
-          @image_slug = find_image()
+        home_dir = File.expand_path('~')
+        config = YAML.load_file(home_dir+"/.cnvrg/config.yml")
+        @owner = config.to_h[:owner]
+        @username =  config.to_h[:username]
+      rescue => e
+        @owner = ""
+        @username =  ""
+        Cnvrg::Logger.log_info("cnvrg is not configured")
 
-        else
+      end
 
-          @image_name = image_name
-          if !@image_name.nil? and !@image_name.empty?
-            if image_name.include? ":"
-            @image_name = image_name[0, image_name.index(":")]
-            @image_tag = image_name[image_name.index(":")+1, image_name.size]
-            else
-              @image_name = image_name
-              @image_tag = "lastest"
-            end
+    end
 
-          end
-          @image_slug = find_image(false)
-          update_image_activity(@commit_id, nil)
-          config = {project_name: config[:project_name],
-                    project_slug: config[:project_slug],
-                    owner: config[:owner],
-                    docker: true, image_base: @image_name, image_tag: @image_tag, image_slug: image_slug}
-          File.open(working_dir+"/.cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
+    def upload_docker_image(image_path, image_name,workdir, user, description, is_gpu )
+      if image_name.present? and image_name.include? ":"
+        image_split = image_name.split(":")
+        image_name = image_split[0]
+        image_tag = image_split[1]
+        if image_tag.blank?
+          image_tag = "latest"
+        end
+        if image_name.blank?
+          Cnvrg::Logger.log_info("image_name: #{image_name} is not valid")
+          return false
         end
+      end
+      if !File.exist? image_path
+        Cnvrg::Logger.log_info("image_path: #{image_path} was not found")
+        return
+      end
+      is_dockerfile = (!image_path.end_with? ".tar") ? true : false
+      file_name = File.basename image_path
+      file_size = File.size(image_path).to_f
+      mime_type = MimeMagic.by_path(image_path)
+      content_type = mime_type.present? ? mime_type.type : "application/x-tar"
+
+      image_res = Cnvrg::API.request("users/#{@owner}/images/upload" , 'POST', {image_name: image_name, image_tag: image_tag,
+                                                                                workdir: workdir, user: user, description:description, is_gpu:is_gpu,
+                                                                                file_name: file_name,
+                                                                                file_size: file_size, file_content_type: content_type, is_dockerfile: is_dockerfile
+                                                                                 })
+      Cnvrg::CLI.is_response_success(image_res, true
+      )
+
+      path = image_res["result"]["path"]
+      image_id = image_res["result"]["image_id"]
+
+
+      props = Cnvrg::Helpers.get_s3_props(image_res["result"])
+      if props.is_a? Cnvrg::Result
+        return false
+      end
 
-      rescue => e
+      client = props[:client]
+      upload_options = props[:upload_options]
+      bucket = Aws::S3::Resource.new(client: client).bucket(props[:bucket])
+
+      resp = bucket.object(path).
+          upload_file(image_path, upload_options)
+      unless resp
+        raise Exception.new("Cant upload #{image_path}")
       end
+      return save_docker_image(image_id)
+
+
+    end
 
+    def save_docker_image(image_id)
+      image_res = Cnvrg::API.request("users/#{@owner}/images/#{image_id}/save" , 'POST', {})
+      return Cnvrg::CLI.is_response_success(image_res, true)
     end
 
     def is_container_exist()

data/lib/cnvrg/cli.rb

@@ -4483,9 +4483,9 @@ module Cnvrg
     end
 
 
-    desc 'upload_image', 'commit notebook changes to create a new notebook image'
+    desc 'upload_image', 'commit notebook changes to create a new notebook image', :hide =>true
 
-    def upload_image(image_id, is_public, is_base, *message)
+    def upload_image_old(image_id, is_public, is_base, *message)
       verify_logged_in(true)
       log_start(__method__, args, options)
       image = Docker::Image.get(image_id)
@@ -4848,6 +4848,38 @@ module Cnvrg
       end
 
 
+    end
+
+    desc 'upload_docker_image', 'Upload new docker image to cnvrg'
+    method_option :workdir, :type => :string, :aliases => ["-w","--workdir"], :desc => "workdir of docker image", :default => "/root"
+    method_option :description, :type => :string, :aliases => ["-d", "--description"], :desc => "description for docker image", :default => ""
+    method_option :user, :type => :string, :aliases => ["-u","--user"], :default => "root"
+    method_option :gpu, :type => :boolean, :aliases => ["-g","--gpu"], :default => false
+    def upload_image(image_name,image_path)
+      begin
+        verify_logged_in(true)
+        log_start(__method__, args, options)
+
+        @image = Cnvrg::Images.new()
+        say "Uploading new docker image file", Thor::Shell::Color::BLUE
+        workdir = options[:workdir]
+        description = options[:description]
+        user = options[:user]
+        is_gpu = options[:gpu]
+        res = @image.upload_docker_image(image_path, image_name, workdir, user, description, is_gpu)
+        if res
+          log_message("Successfully uploaded image: #{image_name}", Thor::Shell::Color::GREEN, true)
+
+
+        else
+          log_message("Couldn't upload image: #{image_name}", Thor::Shell::Color::RED, true)
+
+        end
+      rescue => e
+        log_error(e)
+      end
+
+
     end
 
 
@@ -5403,7 +5435,7 @@ module Cnvrg
               log_message('Server Error', Thor::Shell::Color::RED)
             else
               $LOG.error message: error, type: "error"
-              log_message("error", Thor::Shell::Color::RED)
+              log_message(error, Thor::Shell::Color::RED)
             end
 
             if should_exit

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-  VERSION = '0.8.8'
+  VERSION = '0.8.9'
 end
 

metadata

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