cnvrg 0.0.15 → 0.0.140

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ffd4052a08f7eb71ea98aa8f19de96bdff87fc44
-  data.tar.gz: 3b6590a222fac4dd9f76ff426741c6a8307d03d3
+  metadata.gz: 9dd32719858cd65bd5cc1a284f04ebcc727e2a83
+  data.tar.gz: ab592b0e08289acf21377a50aa53ce3feb8a83f3
 SHA512:
-  metadata.gz: 80a6c9f306f598d71b0b16e1cad9ada5d25183ec634197c49b4271784ffb39afc33e0d1c68b4729dcc27c426442355a29b0ff578bb3b60f23e108803d3ec5356
-  data.tar.gz: dd6e15721cb90947998f1e9e568e5f8a57bf0a6f8e16b30a9cb2d5e9d732b75a331bebe1e08ec202527bdb1b9a95972902611395a6f877da00024e79d4012912
+  metadata.gz: 45bbf580911bc4c8dc14a88023e39019801a6d079093991d5a5960957f7a57d7241d340f3c8b74e949e35283e1423bf219599c7389b26eead581c79ea036c91d
+  data.tar.gz: 98369829234aeba876bcbebe69dec5993a7a4b4be6d04d5c7b479f42ab9dd050fb5a022e62f5c6dc2f2d8e22d8af50a183a935e411d8d3c581ad56b83a9b33d6

data/cnvrg.gemspec

@@ -34,15 +34,11 @@ Gem::Specification.new do |spec|
     spec.add_runtime_dependency 'aws-sdk'
     spec.add_runtime_dependency 'sucker_punch', '~> 2.0'
     spec.add_runtime_dependency 'urlcrypt', '~> 0.1.1'
-    spec.add_runtime_dependency 'logstash-logger', '~> 0.22.1'
-    spec.add_runtime_dependency 'launchy', '~> 2.4'
-    spec.add_runtime_dependency 'docker-api', '~> 1.33'
-    spec.add_runtime_dependency 'rubyzip', '~> 1.2'
-    spec.add_runtime_dependency 'activesupport', '~> 5.0'
-    spec.add_runtime_dependency 'ruby-progressbar'
-    spec.add_runtime_dependency 'net-ssh'
-
-
+    spec.add_runtime_dependency 'logstash-logger'
+    spec.add_runtime_dependency 'launchy'
+    spec.add_runtime_dependency 'docker-api'
+    spec.add_runtime_dependency 'rubyzip'
+    spec.add_runtime_dependency 'activesupport'
 
     
 end

data/lib/cnvrg/Images.rb

@@ -1,8 +1,7 @@
 require 'fileutils'
 require 'cnvrg/files'
 require 'docker'
-require 'net/ssh'
-
+require 'pry'
 
 module Cnvrg
   class Images
@@ -48,6 +47,7 @@ module Cnvrg
         end
 
       rescue => e
+        puts e
       end
 
     end
@@ -95,73 +95,6 @@ module Cnvrg
 
 
     end
-    def self.create_new_custom_image(type,owner,image_name,is_public,is_base,image_extend,python3)
-      response = Cnvrg::API.request("users/#{owner}/images/custom", 'POST', {instance_type:type,image_name:image_name,is_public:is_public,
-                                                                             is_base:is_base,image_extend:image_extend,
-                                                                             python3:python3})
-      return response
-    end
-    def self.revoke_custom_new_image(owner,slug)
-      response = Cnvrg::API.request("users/#{owner}/images/#{slug}/revoke_image", 'GET')
-      return response
-    end
-    def self.commit_custom_image(owner,slug)
-      response = Cnvrg::API.request("users/#{owner}/images/#{slug}/commit_custom_image", 'GET')
-      return response
-    end
-    def self.ssh_to_machine(resp)
-
-      sts_path = resp["result"]["sts_path"]
-
-      uri = URI.parse(sts_path)
-
-      http_object = Net::HTTP.new(uri.host, uri.port)
-      http_object.use_ssl = true if uri.scheme == 'https'
-      request = Net::HTTP::Get.new(sts_path)
-
-      body = ""
-      http_object.start do |http|
-        response = http.request request
-        body = response.read_body
-      end
-
-      URLcrypt::key = [body].pack('H*')
-
-      ip = URLcrypt.decrypt(resp["result"]["machine_i"])
-
-      user = URLcrypt.decrypt(resp["result"]["machine_u"])
-      key = URLcrypt.decrypt(resp["result"]["machine_k"])
-      tempssh = Tempfile.new "sshkey"
-      tempssh.write open(key).read
-      tempssh.rewind
-      key_path = tempssh.path
-      count = 0
-      while count < 5
-
-      begin
-          ssh = Net::SSH.start(ip, user=user, :keys => key_path, :timeout => 10)
-          if !ssh.nil?
-            return ssh
-          else
-            count+=1
-            sleep(2)
-
-          end
-        rescue
-      count+=1
-      sleep(2)
-
-
-      end
-      end
-      if tempssh
-        tempssh.close
-        tempssh.unlink
-      end
-      return false
-    end
-
-
 
     def create_custom_image(new_image_name,working_dir,stored_commands)
 
@@ -241,10 +174,9 @@ module Cnvrg
     def create_container(port=7654, is_remote=false)
       begin
         image_settings = {
-            'Image' => "#{@image_name}:latest",
+            'Image' => "#{@image_name}:#{@image_tag}",
             'User' => 'ds',
-            'Cmd' => '/usr/local/cnvrg/run_ipython.sh',
-            'WorkingDir' => '/home/ds/notebooks',
+            'Cmd' => '/home/ds/run_ipython.sh',
             'ExposedPorts' => {
                 '8888/tcp' => {},
             },
@@ -257,6 +189,9 @@ module Cnvrg
                 },
             },
         }
+        # if !is_remote
+        #   image_settings['HostConfig'].merge!({ 'Binds' => ["#{@working_dir}:/home/ds/notebooks"]})
+        # end
         container = Docker::Container.create(image_settings)
         container.start()
         netrc = File.open(File.expand_path('~')+"/.netrc", "rb")
@@ -266,6 +201,10 @@ module Cnvrg
         p = container.exec(command, tty: true)
         command = ["/bin/bash", "-lc", "sudo chown -R ds /home/ds/.netrc"]
         p = 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)
         config = File.open(File.expand_path('~')+"/.cnvrg/config.yml", "rb")
         config_content = config.read
         container.store_file("/home/ds/.cnvrg/config.yml", config_content)
@@ -288,6 +227,7 @@ module Cnvrg
         if e.message.include? "is not running"
           return create_container(port-1)
         end
+        puts e
         return false
       rescue SignalException
 
@@ -307,18 +247,17 @@ module Cnvrg
         File.open(@working_dir+"/.cnvrg/pip_base.txt", "w+") { |f| f.write pip }
         File.open(@working_dir+"/.cnvrg/dpkg_base.txt", "w+") { |f| f.write dpkg }
       rescue => e
+        puts e
       end
 
 
     end
 
-    def remote_notebook(notebook_path, instance_type, kernel,data,data_commit)
+    def remote_notebook(notebook_path, instance_type, kernel)
       response = Cnvrg::API.request("users/#{@owner}/images/#{@image_slug}/remote_notebook", 'POST', {dir: notebook_path,
                                                                                                       project_slug: @project_slug,
                                                                                                       instance_type: instance_type,
-                                                                                                      kernel: kernel,
-                                                                                                      dataset_slug:data,
-                                                                                                      dataset_commit: data_commit})
+                                                                                                      kernel: kernel})
       return response
     end
 

data/lib/cnvrg/api.rb

@@ -57,10 +57,7 @@ module Cnvrg
                 else
                     response
                 end
-              when 'POST'
-                conn.options.timeout = 420
-                conn.options.open_timeout =420
-
+            when 'POST'
                 response = conn.post "#{endpoint_uri}/#{resource}", data
 
                 if parse_request == true
@@ -73,12 +70,12 @@ module Cnvrg
                     fr.headers['Auth-Token'] = @pass
                     fr.headers['User-Agent'] = "#{Cnvrg::API::USER_AGENT}"
                     fr.headers["Content-Type"] = "multipart/form-data"
-
+                    
                     fr.request :multipart
                     fr.request :url_encoded
                     fr.adapter :net_http
                 end
-
+                
 
                 # what if windows?
                 # data[:file] = Faraday::UploadIO.new(data[:absolute_path], content_type)
@@ -107,7 +104,7 @@ module Cnvrg
             else
             end
             rescue => e
-              puts e
+                puts e
                return nil
             end