cnvrg 0.0.15 → 0.0.140

data/lib/cnvrg/helpers.rb

@@ -72,7 +72,7 @@ module Cnvrg
 
     def cnvrgignore_content
       %{
-# cnvrg ignore: Ignore the following directories and files
+               # cnvrg ignore: Ignore the following directories and files
 # for example:
 # some_dir/
 # some_file.txt
@@ -81,47 +81,6 @@ module Cnvrg
             }.strip
     end
 
-    def hyper_content
-      %{# Hyperparameter Optimization is the process of choosing a set of parameters for a learning algorithm, usually with the goal of optimizing a measure of the algorithm's performance on an independent data set.
-
-# Below is the list of parameters that will be used in the optimization process. Each parameter has a param_name that should match the argument that is feeded to the experiment s.t kernel => --kernel='rbf'
-
-parameters:
-  # Integer parameter is a range of possible values between a minimum (inclusive)
-  # and maximum (not inclusive) values. Values are floored (0.7 => 0)
-    - param_name: "learning_rate"
-      type: "integer" 
-      min: 0 # inclusive
-      max: 10 # not inclusive
-      scale: "linear"
-      steps: 4 # The number of linear steps to produce.
-
-
-    # Float parameter is a range of possible values between a minimum (inclusive)
-    # and maximum (not inclusive) values.
-    #
-    - param_name: "learning_rate"
-      type: "float" # precision is 9 after period
-      min: 0.00001
-      max: 0.1
-      scale: "log2" # Could be log10 as well
-      steps: 2
-
-    # Discrete parameter is an array of numerical values.
-    #
-    - param_name: "c"
-      type: "discrete"
-      values: [0, 0.1 ,0.001]
-
-    # Categorical parameter is an array of string values
-    #
-    - param_name: "kernel"
-      type: "categorical"
-      values: ["linear", "poly", "rbf"] 
-    
-}
-    end
-
     def readme_content
       %{
             # README

data/lib/cnvrg/job.rb

@@ -31,6 +31,7 @@ class LogJob
                 upload_file(file_path)
             return resp
         rescue =>e
+            puts e
             return false
 
         end

data/lib/cnvrg/project.rb

@@ -1,7 +1,7 @@
 require 'fileutils'
 module Cnvrg
   class Project
-    attr_reader :slug, :owner, :title, :local_path, :working_dir
+    attr_reader :slug, :owner, :title, :local_path
 
     RemoteURL ||= "https://cnvrg.io"
 
@@ -12,7 +12,6 @@ module Cnvrg
         @title = config[:project_name]
         @slug = config[:project_slug]
         @owner = config[:owner]
-        @working_dir = project_home
       rescue => e
       end
 
@@ -24,21 +23,18 @@ module Cnvrg
       return idx[:commit]
     end
 
-
     def url
       url = Cnvrg::Helpers.remote_url
       "#{url}/#{self.owner}/projects/#{self.slug}"
     end
 
     def update_ignore_list(new_ignore)
-      if new_ignore.nil? or new_ignore.empty?
+      if new_ignore.empty?
         return true
       end
-      list = new_ignore.split(",")
       begin
         File.open(self.local_path+"/.cnvrgignore", "a+") do |f|
-          f.puts("\n")
-          list.each do |i|
+          new_ignore.each do |i|
             f.puts("#{i}\n")
           end
         end
@@ -52,18 +48,13 @@ module Cnvrg
       ignore_list = []
       File.open(self.local_path+"/.cnvrgignore", "r").each_line do |line|
         line = line.strip
-        if line.start_with? "#" or ignore_list.include? line or line.empty?
+        if line.start_with? "#"
           next
         end
-        if line.end_with? "/" or File.directory?(line)
-          if line.end_with? "/"
-            ignore_list << line.chop
-          else
-            ignore_list << line
-          end
-            all_sub = Dir.glob("#{line}/**/*", File::FNM_DOTMATCH).flatten
-
-          ignore_list << all_sub.flatten
+        if line.end_with? "/"
+          ignore_list << line.chop
+          sub_dirs = Dir.glob("#{line}/**/*").each { |x| x.gsub!("//", "/") }
+          ignore_list << sub_dirs.flatten
         else
           ignore_list << line
         end
@@ -80,6 +71,7 @@ module Cnvrg
       else
 
         list_dirs = [project_name,
+                     project_name + "/data",
                      project_name + "/models",
                      project_name + "/notebooks",
                      project_name + "/src",
@@ -97,7 +89,6 @@ module Cnvrg
       ]
       cnvrgreadme = Helpers.readme_content
       cnvrgignore = Helpers.cnvrgignore_content
-      cnvrghyper  = Helpers.hyper_content
 
       begin
 
@@ -117,8 +108,6 @@ module Cnvrg
         File.open(project_name + "/.cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
         File.open(project_name + "/.cnvrgignore", "w+") { |f| f.write cnvrgignore }
         File.open(project_name + "/README.md", "w+") { |f| f.write cnvrgreadme }
-        File.open(project_name + "/src/hyper.yaml", "w+") { |f| f.write cnvrghyper }
-        
       rescue
         return false
       end
@@ -147,13 +136,14 @@ module Cnvrg
           FileUtils.mkdir_p list_dirs
           FileUtils.touch list_files
           File.open(".cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
-          File.open(".cnvrgignore", "w+") { |f| f.write cnvrgignore } unless File.exist? ".cnvrgignore"
+          File.open(".cnvrgignore", "w+") { |f| f.write cnvrgignore }
           if !File.exist? "README" and !File.exist? "README.md"
             FileUtils.touch [ "README.md" ]
             File.open("README.md", "w+") { |f| f.write cnvrgreadme }
           end
 
         rescue => e
+          puts e
           return false
         end
         return true
@@ -215,26 +205,6 @@ module Cnvrg
         end
         return true
       end
-    def update_is_new_branch(new_branch)
-      config = YAML.load_file(@working_dir+"/.cnvrg/config.yml")
-      config[:new_branch] = new_branch
-      File.open(@working_dir+"/.cnvrg/config.yml", "w+") { |f| f.write config.to_yaml }
-    end
-    def get_new_branch
-      begin
-      config = YAML.load_file(@working_dir+"/.cnvrg/config.yml")
-      return config[:new_branch]
-      rescue =>e
-        return false
-
-      end
-    end
-
-    def remove_new_branch
-      config = YAML.load_file(@working_dir+"/.cnvrg/config.yml")
-      new_config = config.except(:new_branch)
-      File.open(@working_dir+"/.cnvrg/config.yml", "w+") { |f| f.write new_config.to_yaml }
-    end
 
       def generate_idx
         if File.exists? "#{self.local_path}/.cnvrg/idx.yml"
@@ -249,18 +219,15 @@ module Cnvrg
         list_ignore = self.get_ignore_list()
         list.each do |e|
           label = e.gsub(self.local_path + "/", "")
-
           if File.directory? e
             if list_ignore.include? label
               next
             end
-
             tree_idx[label+"/"] = nil
           else
             if list_ignore.include? label
               next
             end
-
             sha1 = Digest::SHA1.file(e).hexdigest
             if old_idx.nil? or old_idx.to_h[:tree].nil?
               tree_idx[label] = {sha1: sha1, commit_time: nil}
@@ -291,7 +258,7 @@ module Cnvrg
 
         local_idx = self.generate_idx
         response = Cnvrg::API.request("users/#{self.owner}/projects/#{self.slug}/status", 'POST', {idx: local_idx, new_branch: new_branch, current_commit: commit})
-        CLI.is_response_success(response,false)
+        CLI.is_response_success(response)
         return response
       end
 
@@ -300,8 +267,7 @@ module Cnvrg
           commit = last_local_commit
         end
         response = Cnvrg::API.request("users/#{self.owner}/projects/#{self.slug}/commit/compare", 'POST', {current_commit: commit})
-        CLI.is_response_success(response,false)
-        update_is_new_branch(response["result"]["new_branch"])
+        CLI.is_response_success(response)
         return response["result"]["new_branch"]
       end
 
@@ -316,22 +282,16 @@ module Cnvrg
         return true
       end
 
-      def deploy(file_to_run, function, input_params, commit_to_run, instance_type, image_slug, scheduling_query, local_timestamp,workers, file_input)
+      def deploy(file_to_run, function, input_params, commit_to_run, instance_type, image_slug, scheduling_query, local_timestamp)
         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,
                                                                                            instance_type: instance_type,
                                                                                            scheduling_query: scheduling_query,
-                                                                                           local_timestamp: local_timestamp,
-                                                                                            workers:workers,file_input:file_input})
+                                                                                           local_timestamp: local_timestamp})
         return response
       end
-    def list_commits
-      response = Cnvrg::API.request("users/#{self.owner}/projects/#{self.slug}/commits/list", 'GET')
-      CLI.is_response_success(response)
-      return response
 
-    end
       def update_idx_with_commit!(commit)
         idx_hash = YAML.load_file("#{self.local_path}/.cnvrg/idx.yml")
         idx_hash[:commit] = commit

data/lib/cnvrg/version.rb

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

data/lib/cnvrg.rb

@@ -3,5 +3,6 @@ require 'cnvrg/version'
 require 'cnvrg/cli'
 require 'thor'
 
+
 module Cnvrg
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.140
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-16 00:00:00.000000000 Z
+date: 2017-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -249,74 +249,46 @@ dependencies:
   name: logstash-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.22.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.33'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.33'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -330,7 +302,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: net-ssh
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -358,16 +330,12 @@ files:
 - lib/cnvrg/api.rb
 - lib/cnvrg/auth.rb
 - lib/cnvrg/cli.rb
-- lib/cnvrg/data.rb
-- lib/cnvrg/datafiles.rb
-- lib/cnvrg/dataset.rb
 - lib/cnvrg/experiment.rb
 - lib/cnvrg/files.rb
 - lib/cnvrg/helpers.rb
 - lib/cnvrg/job.rb
 - lib/cnvrg/project.rb
 - lib/cnvrg/runner.rb
-- lib/cnvrg/ssh.rb
 - lib/cnvrg/version.rb
 homepage: https://cnvrg.io
 licenses: []
@@ -388,8 +356,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A CLI tool for interacting with cnvrg.io.
 test_files: []
+has_rdoc: 

data/lib/cnvrg/data.rb

@@ -1,72 +0,0 @@
-require 'cnvrg/cli'
-require 'thor'
-class SubCommandBase < Thor
- def self.banner(command, namespace = nil, subcommand = false)
-  "#{basename}  #{command.usage}"
- end
-
- def self.subcommand_prefix
-  self.name.gsub(%r{.*::}, '').gsub(%r{^[A-Z]}) { |match| match[0].downcase }.gsub(%r{[A-Z]}) { |match| "-#{match[0].downcase}" }
- end
-end
-
-module Cnvrg
-
-  class Data < SubCommandBase
-    class_option :no_compression, :type => :boolean, :aliases => ["-nc", "--no_compression"], :default => false
-    desc "data init", "init data folder"
-    method_option :public, :type => :boolean, :aliases => ["-p", "--public"], :default => false
-    def init
-      cli = Cnvrg::CLI.new()
-      public = options["public"]
-      cli.init_data(public)
-    end
-    desc "data upload", "upload data folder"
-    method_option :ignore, :type => :array, :aliases => ["-i", "--i"], :desc => "ignore following files"
-    method_option :verbose, :type => :boolean, :aliases => ["-v"], :default => false
-    method_option :sync, :type => :boolean, :aliases => ["-s"], :default => false
-    method_option :no_compression, :type => :boolean, :aliases => ["-nc", "--no_compression"], :default => false
-
-    def upload
-      cli = Cnvrg::CLI.new()
-      ignore = options["ignore"]
-      verbose = options["verbose"]
-      sync = options["sync"]
-      no_compression = options["no_compression"]
-      cli.upload_data_tar(ignore, verbose,sync,no_compression)
-    end
-    desc 'data download', 'pull data'
-    method_option :verbose, :type => :boolean, :aliases => ["-v"], :default => false
-    method_option :sync, :type => :boolean, :aliases => ["-s"], :default => false
-
-    def download()
-      cli = Cnvrg::CLI.new()
-      verbose = options["verbose"]
-      sync = options["sync"]
-
-      cli.download_data(verbose,sync,Dir.pwd)
-
-    end
-    desc 'data clone', 'clone datset'
-    def clone(dataset_url)
-      cli = Cnvrg::CLI.new()
-      cli.clone_data(dataset_url)
-
-    end
-    desc 'data list', 'list of datasets'
-    def list()
-      cli = Cnvrg::CLI.new()
-
-      cli.list_dataset()
-
-    end
-    desc 'data commits', 'pull data'
-
-    def commits()
-      cli = Cnvrg::CLI.new()
-      cli.list_dataset_commits()
-
-    end
-
-  end
-end