cnvrg 0.0.1420 → 0.0.1421

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f94403f39c98e7d4c89c32d9c066f6cc82bf9833
-  data.tar.gz: 2aa4bbda3018ee9d4615f343db4bbc4e420bfdd0
+  metadata.gz: 1c6baee53317d2534fda3e2bbe815b9f8ebfe782
+  data.tar.gz: a91b53562b3e431399d3bf20ed6cb0a1f4bda1ad
 SHA512:
-  metadata.gz: deab7e2a08f9e01744970c10641039cda7f56bd080d9cd6d0da49b1e2cd1c95e983c4b519a652f3ccf4d6aaf01c4cd074dba96140bce9a3adf06a2fb5bca7c3e
-  data.tar.gz: c8632b9c983025873f92ec07b64498c2625467c9a2e9593420cc9edf4d0c0f09278332d7a5dde58440b34c9e7e669f070804747fd6b4801787540af869b1b8be
+  metadata.gz: cbaf58967b1170824772cdbc8472394ca430d6e6272256c868005b70a492a40196ee8af7dc4fd37b03ebfc6f757ba29ba54854c33c1e73f185a0a005a9a8ef94
+  data.tar.gz: 3817f79efeca681e9eca2d17b9a38c87807f1d1b71c28550327417ac8307d399f647d839177d5dd9791d582383ea99220107f0ae31815d374ef1e174b490d4d6

data/lib/cnvrg/cli.rb

@@ -66,7 +66,7 @@ class Thor
       real_options = []
 
       real_args = [].replace(array_options)
-      if local_options.is_a? (Array) and !local_options.empty?
+      if local_options.is_a? (Array) and !local_options.empty? and args.empty?
         array_options.each_with_index do |p, i|
           opt = p
           if p.include? "="
@@ -91,6 +91,12 @@ class Thor
 
         args = real_args
       else
+        if !args.empty? and local_options.is_a? Array and !local_options.empty?
+          args = args + local_options
+        else
+            args = args.flatten()
+        end
+
       end
 
 
@@ -115,9 +121,12 @@ class Thor
 
     def is_option (options, p)
       options.each do |o|
-        if (!o.aliases.nil? and (o.aliases[0].split(",").include? p or o.aliases.include? p)) or o.switch_name.eql? p
-          return o
+        if !o.aliases.nil?
+          if (o.aliases.is_a? Array and o.aliases.include? p) or (!o.aliases.is_a? Array and o.aliases[0].split(",").include? p) or o.switch_name.eql? p
+            return o
+          end
         end
+
       end
       return false
     end
@@ -1321,6 +1330,21 @@ module Cnvrg
 
     end
 
+    # desc 'data commits', 'List all commits for a specific dataset'
+    #
+    # def list_commits()
+    #   verify_logged_in(true)
+    #   log_start(__method__, args, options)
+    #
+    #   dataset_dir = is_cnvrg_dir(Dir.pwd)
+    #   @dataset = Dataset.new(dataset_dir)
+    #   result = @dataset.list_commits()
+    #   list = result["result"]["list"]
+    #
+    #   print_table(list)
+    #
+    # end
+
 
     desc 'unlink', 'Unlink a project from current directory'
 
@@ -2080,9 +2104,9 @@ module Cnvrg
       end
       if local
         invoke :exec, cmd, :sync_before => sync_before, :sync_after => sync_after, :title => title,
-                 :log => log, :email_notification => email_notification, :upload_output => upload_output,
-                 :commit => commit, :image => image, :data => data, :data_commit => data_commit, :ignore => ignore
-          return
+               :log => log, :email_notification => email_notification, :upload_output => upload_output,
+               :commit => commit, :image => image, :data => data, :data_commit => data_commit, :ignore => ignore
+        return
       else
         real_options.delete(["local", false])
         instances = {"small" => options["small"], "medium" => options["medium"], "large" => options["large"],
@@ -2091,10 +2115,9 @@ module Cnvrg
         if !instance_type.nil? and !instance_type.empty?
           real_options << ["machine_type", instance_type]
         end
-        # exec_options = real_options.map { |x| "--#{x[0]}=#{x[1]}" }.flatten.join(" ")
-        # cmd_to_exec = "#{exec_options} #{cmd.join(" ")}"
-        # return exec_remote(cmd_to_exec)
-        invoke :exec_remote, cmd, :sync_before => sync_before, :sync_after => sync_after, :title => title, :machine_type => instance_type,
+        exec_options = real_options.map { |x| "--#{x[0]}=#{x[1]}" }.flatten.join(" ")
+        cmd_to_exec = "#{exec_options} #{cmd.join(" ")}"
+        invoke :exec_remote, [cmd] , :sync_before => sync_before, :sync_after => sync_after, :title => title, :machine_type => instance_type,
                :schedule => schedule, :log => log, :email_notification => email_notification, :upload_output => upload_output, :commit => commit,
                :image => image, :grid => grid, :data => data, :data_commit => data_commit, :ignore => ignore
         return
@@ -2196,8 +2219,6 @@ module Cnvrg
         start_commit = @project.last_local_commit
         cmd = cmd.join("\s")
 
-
-
         @exp = Experiment.new(@project.owner, @project.slug)
 
         platform = RUBY_PLATFORM
@@ -2556,7 +2577,6 @@ module Cnvrg
     method_option :data_commit, :type => :string, :aliases => ["--data_commit"], :default => ""
     method_option :ignore, :type => :string, :aliases => ["-i"], :desc => "ignore following files", :default => ""
 
-
     def exec_remote(*cmd)
       verify_logged_in(true)
       log_start(__method__, args, options)
@@ -2729,14 +2749,10 @@ module Cnvrg
         workers = options["workers"] || nil
         begin
           num_workers = workers.to_i
-
-          puts workers
         rescue
           say "Number of workers should be a number between 1 to 10", Thor::Shell::Color::RED
           exit(1)
         end
-
-        exit(0)
         file_as_input = options["file_as_input"] || false
 
 
@@ -2757,7 +2773,7 @@ module Cnvrg
 
         invoke :sync, [false], []
 
-        res = project.deploy(file_to_run, function, nil, commit_to_run, instance_type, image_slug, schedule, local_timestamp,num_workers,file_as_input)
+        res = project.deploy(file_to_run, function, nil, commit_to_run, instance_type, image_slug, schedule, local_timestamp, num_workers, file_as_input)
 
         if Cnvrg::CLI.is_response_success(res)
 
@@ -2820,7 +2836,7 @@ module Cnvrg
     method_option :gpu, :type => :boolean, :aliases => ["--gpu"], :default => false
     method_option :gpuxl, :type => :boolean, :aliases => ["--gpuxl"], :default => false
     method_option :gpuxxl, :type => :boolean, :aliases => ["--gpuxxl"], :default => false
-    method_option :image, :type => :string, :aliases => ["-i","--image"], :default => ""
+    method_option :image, :type => :string, :aliases => ["-i", "--image"], :default => ""
     method_option :data, :type => :string, :aliases => ["-d", "--data"], :default => ""
     method_option :data_commit, :type => :string, :aliases => ["--data_commit"], :default => ""
 
@@ -2843,7 +2859,7 @@ module Cnvrg
         instance_type = get_instance_type(instances)
 
         invoke :remote_notebook, [], :notebook_dir => notebook_dir, :kernel => kernel, :machine_type => instance_type, :image => image,
-               :data=> data, :data_commit => data_commit
+               :data => data, :data_commit => data_commit
         return
 
       end
@@ -2860,7 +2876,6 @@ module Cnvrg
     method_option :data_commit, :type => :string, :aliases => ["--data_commit"], :default => ""
 
 
-
     def remote_notebook()
       verify_logged_in(true)
       log_start(__method__, args, options)
@@ -2898,7 +2913,7 @@ module Cnvrg
         invoke :sync, [false], []
 
 
-        res = @image.remote_notebook(notebook_dir, instance_type, kernel,data,data_commit)
+        res = @image.remote_notebook(notebook_dir, instance_type, kernel, data, data_commit)
         if Cnvrg::CLI.is_response_success(res)
           if res["result"]["machine"] == -1
             say "There are no available machines", Thor::Shell::Color::BLUE
@@ -3129,7 +3144,7 @@ module Cnvrg
               stdout.each do |line|
                 puts line
 
-                  end
+              end
 
             rescue Errno::EIO => e
               # break
@@ -3161,43 +3176,43 @@ module Cnvrg
 
           end
 
-        if options["verbose"]
-          say "Syncing project before running", Thor::Shell::Color::BLUE
-          say 'Checking for new updates from remote version', Thor::Shell::Color::BLUE
-        end
-        @project = Project.new(project_dir)
-
-        start_commit = @project.last_local_commit
-
-        if (note_slug=image.note_slug)
-          say "There is a running notebook session in: https://cnvrg.io/#{@project.owner}/projects/#{@project.slug}/notebook_sessions/show/#{note_slug}", Thor::Shell::Color::BLUE
-          new = yes? "Create a new session?", Thor::Shell::Color::YELLOW
-          if !new
-            exit(0)
+          if options["verbose"]
+            say "Syncing project before running", Thor::Shell::Color::BLUE
+            say 'Checking for new updates from remote version', Thor::Shell::Color::BLUE
           end
+          @project = Project.new(project_dir)
 
-        end
-        invoke :sync, [false], :verbose => options["verbose"]
-        say "Done Syncing", Thor::Shell::Color::BLUE if options["verbose"]
-        #replace url
-        base_url = get_base_url()
+          start_commit = @project.last_local_commit
 
-        local_url = "/#{@project.owner}/projects/#{@project.slug}/notebook_sessions/view/local"
-        command = ["/bin/bash", "-lc", "sed -i 's#c.NotebookApp.base_url = .*#c.NotebookApp.base_url = \"#{local_url}\"#' /home/ds/.jupyter/jupyter_notebook_config.py"]
-        container.exec(command, tty: true)
-        container.stop()
-        container.start()
-        sleep(7)
-        @note = Experiment.new(@project.owner, @project.slug)
-        port = image.container_port()
+          if (note_slug=image.note_slug)
+            say "There is a running notebook session in: https://cnvrg.io/#{@project.owner}/projects/#{@project.slug}/notebook_sessions/show/#{note_slug}", Thor::Shell::Color::BLUE
+            new = yes? "Create a new session?", Thor::Shell::Color::YELLOW
+            if !new
+              exit(0)
+            end
 
-        command = ["/bin/bash", "-lc", "jupyter notebook list"]
-        list = container.exec(command, tty: true)[0]
-        if list.empty? or list.nil?
-          say "Couldn't start notebook server", Thor::Shell::Color::RED
-          log_end(1, "can't start notebook server")
-          exit(1)
-        end
+          end
+          invoke :sync, [false], :verbose => options["verbose"]
+          say "Done Syncing", Thor::Shell::Color::BLUE if options["verbose"]
+          #replace url
+          base_url = get_base_url()
+
+          local_url = "/#{@project.owner}/projects/#{@project.slug}/notebook_sessions/view/local"
+          command = ["/bin/bash", "-lc", "sed -i 's#c.NotebookApp.base_url = .*#c.NotebookApp.base_url = \"#{local_url}\"#' /home/ds/.jupyter/jupyter_notebook_config.py"]
+          container.exec(command, tty: true)
+          container.stop()
+          container.start()
+          sleep(7)
+          @note = Experiment.new(@project.owner, @project.slug)
+          port = image.container_port()
+
+          command = ["/bin/bash", "-lc", "jupyter notebook list"]
+          list = container.exec(command, tty: true)[0]
+          if list.empty? or list.nil?
+            say "Couldn't start notebook server", Thor::Shell::Color::RED
+            log_end(1, "can't start notebook server")
+            exit(1)
+          end
 
           result = ""
           list.each do |r|
@@ -3207,24 +3222,24 @@ module Cnvrg
           end
           token = result.to_s.split("::")[0].to_s.match(/(token=)(.+)\s/)[2]
 
-        # machine_activity = @note.get_machine_activity(project_dir)
+          # machine_activity = @note.get_machine_activity(project_dir)
 
 
-        slug = @note.start_notebook_session(kernel, start_commit, token, port, false, notebook_dir)
-        image.set_note_url(slug)
-        note_url = "http://localhost:#{port}/#{@project.owner}/projects/#{@project.slug}/notebook_sessions/view/local/?token=#{token}"
+          slug = @note.start_notebook_session(kernel, start_commit, token, port, false, notebook_dir)
+          image.set_note_url(slug)
+          note_url = "http://localhost:#{port}/#{@project.owner}/projects/#{@project.slug}/notebook_sessions/view/local/?token=#{token}"
 
 
-        if !note_url.empty?
-          check = Helpers.checkmark()
+          if !note_url.empty?
+            check = Helpers.checkmark()
 
-          say "#{check} Notebook server started successfully", Thor::Shell::Color::GREEN
-          Launchy.open(note_url)
-        else
-          say "Couldn't start notebook server", Thor::Shell::Color::RED
-          log_end(1, "can't start notebook server")
-          exit(1)
-        end
+            say "#{check} Notebook server started successfully", Thor::Shell::Color::GREEN
+            Launchy.open(note_url)
+          else
+            say "Couldn't start notebook server", Thor::Shell::Color::RED
+            log_end(1, "can't start notebook server")
+            exit(1)
+          end
         end
 
 
@@ -3236,7 +3251,7 @@ module Cnvrg
         end
       rescue SignalException
         if !notebooks_pid.nil?
-          ::Process.kill(0,notebooks_pid)
+          ::Process.kill(0, notebooks_pid)
           say "#{check} Notebook has stopped successfully", Thor::Shell::Color::GREEN
 
 
@@ -3821,14 +3836,14 @@ module Cnvrg
 
       login_content = options["login"]
 
-        container = Docker::Container.get(container)
-        command = ["/bin/bash", "-lc", "sudo echo -e \"#{login_content}\" >/home/ds/.netrc"]
-        container.exec(command, tty: true)
-        command = ["/bin/bash", "-lc", "sudo chown -R ds:ds /home/ds/.netrc"]
-        container.exec(command, tty: true)
-        command = ["/bin/bash", "-lc", "sudo chmod 0600 /home/ds/.netrc"]
-        container.exec(command, tty: true)
-        say "OK"
+      container = Docker::Container.get(container)
+      command = ["/bin/bash", "-lc", "sudo echo -e \"#{login_content}\" >/home/ds/.netrc"]
+      container.exec(command, tty: true)
+      command = ["/bin/bash", "-lc", "sudo chown -R ds:ds /home/ds/.netrc"]
+      container.exec(command, tty: true)
+      command = ["/bin/bash", "-lc", "sudo chmod 0600 /home/ds/.netrc"]
+      container.exec(command, tty: true)
+      say "OK"
 
     end
 

data/lib/cnvrg/version.rb

@@ -1,4 +1,4 @@
 module Cnvrg
-    VERSION = '0.0.1420'
+    VERSION = '0.0.1421'
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 0.0.1420
+  version: 0.0.1421
 platform: ruby
 authors:
 - Yochay Ettun
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler