cnvrg 2.0.1 → 2.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ab82882b2bb6c9093751cd560eaa4ccb7540fad9b9a34a81245721538dd37a5b
-  data.tar.gz: e35299be744d985a37794288a269ba2bb55cf64d3fcd702c6c6147bd4f5d740d
+  metadata.gz: 4092be1be35506977a7f1b4778b5bb1dfa234a02fc572812e773069f38e3d518
+  data.tar.gz: f8e954f4bbcbb4b735966c1391c3570c6ab7bf32036c825b7fd6a25460a7d5ef
 SHA512:
-  metadata.gz: 52b51bb4942583e9ac3eceab24891d252ef7e31d7f1a2a87d5c8f4586f914f33f2d9cc7addc09ab5aa3652a9ba939ef5a37bdb9fc82d18e4e0e0a61126265d17
-  data.tar.gz: df735e631778b5d36d296c33903719a2ba7832ce2a9e218eea033ad246f8c4ce044a7b7d5562f68d901a1ee32d62a88559f886da2a0341d8bf7c51b50c25660c
+  metadata.gz: 8e80a6d6d66eb5101eaa82c339c9c3862d4e39fbaaff7ba6e6d2278d0be5ef1cfc1b7b029e50dd567bf79af389911e2d27ad0d056e33110d1c56b4d613008b33
+  data.tar.gz: ab28db04b2d89b4170c1df63c7fec38c0027538f0e5620672a8ca358fd3234e4d177cdadaf46f5ebb8fe0c5c90f20cfd97179d1456201432b14b094b1555b666

data/Readme.md

@@ -23,4 +23,46 @@
 2021-05-05
 * DEV-8868 - Bug: SDK - e.sync() in git project only creates empty "output" folder in commit
 ## Version v2.0.1
-2021-06-13
+2021-06-13
+## Version v2.0.2
+2021-06-16
+* DEV-9694 - Bug: Download artifacts fails on authorization error 
+## Version v2.0.3
+2021-06-29
+* DEV-9919 - Bug: clone artifacts fails on "Not Authorize, Are you logged in?"
+## Version v2.0.4
+2021-07-08
+* DEV-9935 - Bug: CLI - cnvrg sync creates new commit but no blob versions
+## Version v2.0.5
+2021-07-11
+* DEV-10171 - Bug: experiment randomly fails with error- "Couldn't clone artifacts"
+* DEV-10189 - Bug: CLI Sync -file/folder with broken symlink will cause sync to fail
+## Version v2.0.6
+2021-07-18
+* DEV-10209 - Bug: some experiments in grid failed on cnvrg-cli commands (docker container id was missing)
+## Version v2.0.7
+2021-07-27
+* DEV-10186 - Bug: CLI/run an experiment with --local tag giver server error
+## Version v2.0.8
+2021-09-06
+* DEV-10697 - Bug: Tensorboard not starting in workspace and experiment.
+## Version v2.0.9
+2021-09-12
+* DEV-10502 - Bug: Periodic sync stuck
+## Version v2.0.10
+2021-09-12
+* DEV-10502 - Bug: Periodic sync stuck
+## Version v2.0.11
+2021-10-21
+## Version v2.0.12
+2021-10-25
+* DEV-11544 - Sub-bug: local experiment is failing to run 
+## Version v2.0.13
+2021-10-27
+* DEV-11054 - Task: Create organization and user by default
+## Version v2.0.14
+2021-11-11
+* DEV-11834 - Sub-task: add device name to hpu metrics
+## Version v2.0.15
+2021-12-12
+* DEV-12316 - Improvement: cli login should identify saas users automatically

data/lib/cnvrg/api.rb

@@ -57,6 +57,7 @@ module Cnvrg
                     conn = Faraday.new "#{endpoint_uri}"
                 end
             conn.headers['Auth-Token'] = @pass
+            conn.headers['Authorization'] = "CAPI #{@pass}"
             conn.headers['User-Agent'] = "#{Cnvrg::API::USER_AGENT}"
             conn.options.timeout = 420
                 conn.options.open_timeout=180
@@ -169,6 +170,7 @@ module Cnvrg
             when 'POST_FILE'
                 conn = Faraday.new do |fr|
                     fr.headers['Auth-Token'] = @pass
+                    fr.headers['Authorization'] = "CAPI #{@pass}"
                     fr.headers['User-Agent'] = "#{Cnvrg::API::USER_AGENT}"
                     fr.headers["Content-Type"] = "multipart/form-data"
                     if !Helpers.is_verify_ssl

data/lib/cnvrg/api_v2.rb

@@ -22,6 +22,7 @@ module Cnvrg
 
       conn = Faraday.new endpoint_uri, :ssl => {:verify => !!Helpers.is_verify_ssl}
       conn.headers['Auth-Token'] = pass
+      conn.headers['Authorization'] = "CAPI #{pass}"
       conn.headers['User-Agent'] = Cnvrg::API::USER_AGENT
       conn.headers['Content-Type'] = "application/json"
       conn.options.timeout = 420

data/lib/cnvrg/auth.rb

@@ -44,7 +44,7 @@ module Cnvrg
             end
         end
 
-        def sign_in(email, password)
+        def sign_in(email, password, token: nil)
             url = Cnvrg::API.endpoint_uri()
             url = URI.parse(url+ "/users/sign_in")
             http = Net::HTTP.new(url.host, url.port)
@@ -61,6 +61,9 @@ module Cnvrg
 
             req.add_field("EMAIL", email)
             req.add_field("PASSWORD", password)
+            if token.present?
+                req.add_field("Authorization", "CAPI #{token}")
+            end
 
             response = http.request(req)
 

data/lib/cnvrg/cli/library_cli.rb

@@ -1,7 +1,7 @@
 module Cnvrg
   class LibraryCli < SubCommandBase
-
-    desc "library import", ''
+    map push: :import
+    desc "library push", 'Push a new library to AI Library'
     def import
       unless File.exists? "library.yml"
         Cnvrg::CLI.log_message("Can't find library.yml", 'red')

data/lib/cnvrg/cli.rb

@@ -496,8 +496,10 @@ module Cnvrg
 
 
     desc 'login', 'Authenticate with cnvrg.io platform'
+    method_option :sso, :type => :boolean, :aliases => ["-s", "--sso"], :default => false
 
     def login
+      use_token = options["sso"]
       begin
         log_handler()
         log_start(__method__, args, options)
@@ -515,12 +517,22 @@ module Cnvrg
           exit(0)
         end
         @email = ask("Enter your email:")
-        password = cmd.ask("Enter your password (hidden):") {|q| q.echo = "*"}
-        result = @auth.sign_in(@email, password)
+        url = Cnvrg::API.endpoint_uri()
+        if use_token or url.include?("cloud.cnvrg.io")
+          @token = cmd.ask("Enter your token (hidden):") {|q| q.echo = "*"}
+          netrc[Cnvrg::Helpers.netrc_domain] = @email, @token
+          netrc.save
+          password = ""
+        else
+          password = cmd.ask("Enter your password (hidden):") {|q| q.echo = "*"}
+        end
+        result = @auth.sign_in(@email, password, token: @token)
 
         if !result["token"].nil?
-          netrc[Cnvrg::Helpers.netrc_domain] = @email, result["token"]
-          netrc.save
+          unless use_token
+            netrc[Cnvrg::Helpers.netrc_domain] = @email, result["token"]
+            netrc.save
+          end
 
           log_message("Authenticated successfully as #{@email}", Thor::Shell::Color::GREEN)
 
@@ -3006,12 +3018,12 @@ module Cnvrg
     method_option :job_slug, :type => :string, :aliases => ["-j", "--job"], :default => nil
     method_option :job_type, :type => :string, :aliases => ["-jt", "--job_type"], :default => nil
     method_option :files, :type => :string, :aliases => ["--files"], :default => nil
-    method_option :output_dir, :type => :string, :aliases => ["--output_dir"], :default => nil
+    method_option :output_dir, :type => :string, :aliases => ["--output_dir"], :default => 'output'
     method_option :git_diff, :type => :boolean, :aliases => ["--git_diff"], :default => false
     method_option :suppress_exceptions, :type => :boolean, :aliases => ["--suppress-exceptions"], :default => true
     method_option :debug_mode, :type => :boolean, :aliases => ["--debug-mode"], :default => false
     method_option :chunk_size, :type => :numeric, :aliases => ["--chunk"], :default => 1000
-    method_option :local, :type => :boolean, :aliases => ["--local"], :default => false
+    method_option :local, :type => :boolean, :aliases => ["--local"], :default => true
 
     def sync(direct = true)
       verify_logged_in(true) if direct
@@ -3147,7 +3159,7 @@ module Cnvrg
           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, :force => force, :output_dir=>output_dir, :data_query=>data_query
+                 :ignore => ignore, :force => force, :output_dir=>output_dir, :data_query=>data_query, :local => local
           return
         end
       else
@@ -3204,6 +3216,7 @@ module Cnvrg
     method_option :data_query, :type => :string, :aliases => ["-q", "--query"], :default => nil
     method_option :use_bash, :type => :boolean, :aliases => ["-b", "--use_bash"], :default => false
     method_option :docker_stats, :type => :boolean, :aliases => ["--docker_stats"], :default => true
+    method_option :local, :type => :boolean, :aliases => ["-l", "--local"], :default => false
 
     def exec(*cmd)
       log = []
@@ -3228,6 +3241,7 @@ module Cnvrg
       project_home = get_project_home
       data_query = options["data_query"]
       docker_stats = options["docker_stats"]
+      local = options[:local] || false
       @project = Project.new(project_home)
       if @project.is_git
         sync_before = false
@@ -3323,43 +3337,49 @@ module Cnvrg
               if @exp.get_cmd.present?
                 cmd = @exp.get_cmd
               end
-              command_slug = (0...18).map { (65 + rand(26)).chr }.join
-              result_file = "/conf/result-#{command_slug}"
-              data = {cmd: cmd, async: true, format: true, file_name: result_file, use_script: true, use_bash: options["use_bash"]}
-
-              conn = Cnvrg::Helpers::Executer.get_main_conn
-              response = conn.post('command', data.to_json)
-              if response.to_hash[:status].to_i != 200
-                exit_status = 129
-                raise StandardError.new("Cant send command to slave")
-              end
-              t = FileWatch::Tail.new
-              filename = result_file
-              lines = []
-              t.tail(filename)
-              t.subscribe do |path, line|
-                begin
-                  cur_log = JSON.parse(line)
-                  if cur_log["type"] == "endMessage"
-                    exit_status = cur_log["real"].to_i
-                    break
-                  else
-                    puts(cur_log.to_json)
-                    STDOUT.flush
-                    cur_log["time"] = Time.parse(cur_log["timestamp"])
-                    cur_log["message"] = cur_log["message"].to_s + "\r\n"
-                    log << cur_log
-                  end
-                  if log.size >= 10
-                    @exp.upload_temp_log(log)
-                    log = []
-                  elsif (start_time + 15.seconds) <= Time.now
-                    @exp.upload_temp_log(log) unless log.empty?
-                    log = []
-                    start_time = Time.now
+
+              if local
+                exec_local(cmd, print_log, start_commit, real, start_time)
+                exit_status = $?.exitstatus
+
+              else
+                command_slug = (0...18).map { (65 + rand(26)).chr }.join
+                result_file = "/conf/result-#{command_slug}"
+                data = {cmd: cmd, async: true, format: true, file_name: result_file, use_script: true, use_bash: options["use_bash"]}
+                conn = Cnvrg::Helpers::Executer.get_main_conn
+                response = conn.post('command', data.to_json)
+                if response.to_hash[:status].to_i != 200
+                  exit_status = 129
+                  raise StandardError.new("Cant send command to slave")
+                end
+                t = FileWatch::Tail.new
+                filename = result_file
+                lines = []
+                t.tail(filename)
+                t.subscribe do |path, line|
+                  begin
+                    cur_log = JSON.parse(line)
+                    if cur_log["type"] == "endMessage"
+                      exit_status = cur_log["real"].to_i
+                      break
+                    else
+                      puts(cur_log.to_json)
+                      STDOUT.flush
+                      cur_log["time"] = Time.parse(cur_log["timestamp"])
+                      cur_log["message"] = cur_log["message"].to_s + "\r\n"
+                      log << cur_log
+                    end
+                    if log.size >= 10
+                      @exp.upload_temp_log(log)
+                      log = []
+                    elsif (start_time + 15.seconds) <= Time.now
+                      @exp.upload_temp_log(log) unless log.empty?
+                      log = []
+                      start_time = Time.now
+                    end
+                  rescue => e
+                    log_error(e)
                   end
-                rescue => e
-                  log_error(e)
                 end
               end
               end_time = Time.now
@@ -4692,6 +4712,7 @@ module Cnvrg
               data_result.each_with_index do |res, i|
                 timestamp, value = res["value"]
                 uuid = res["metric"]["UUID"].presence || i
+                uuid = res["metric"]["device"] if query_name == "gaudi"
                 stat_value = value.present? ? ("%.2f" % value) : 0 # converting 34.685929244444445 to 34.69
                 stat_value = stat_value.to_i == stat_value.to_f ? stat_value.to_i : stat_value.to_f # converting 34.00 to 34
                 if query_name.include? 'block'
@@ -5876,6 +5897,57 @@ module Cnvrg
         end
       end
 
+      def exec_local(cmd , print_log, start_commit, real, start_time)
+        log = []
+        PTY.spawn(@exp.as_env, cmd) do |stdout, stdin, pid, stderr|
+          begin
+            stdout.each do |line|
+              cur_time = Time.now
+              real_time = Time.now - real
+              cur_log = {time: cur_time,
+                         message: line,
+                         type: "stdout",
+                         real: real_time
+              }
+              if print_log
+                puts({log: line, timestamp: Time.now, exp_logs: true}.to_json)
+              end
+              log << cur_log
+              if log.size >= 10
+                @exp.upload_temp_log(log) unless log.empty?
+                log = []
+              elsif (start_time + 15.seconds) <= Time.now
+                @exp.upload_temp_log(log) unless log.empty?
+                log = []
+                start_time = Time.now
+              end
+            end
+            if stderr
+              stderr.each do |err|
+                log << {time: Time.now, message: err, type: "stderr"}
+              end
+            end
+          rescue Errno::EIO => e
+            log_error(e)
+            if !log.empty?
+              temp_log = log
+              @exp.upload_temp_log(temp_log) unless temp_log.empty?
+              log -= temp_log
+            end
+          rescue Errno::ENOENT => e
+            exp_success = false
+            log_message("command \"#{cmd}\" couldn't be executed, verify command is valid", Thor::Shell::Color::RED)
+            log_error(e)
+          rescue => e
+            res = @exp.end(log, 1, start_commit, 0, 0)
+            log_message("Error occurred,aborting", Thor::Shell::Color::RED)
+            log_error(e)
+            exit(0)
+          end
+          ::Process.wait pid
+        end
+      end
+
     end
   end
 

data/lib/cnvrg/files.rb

@@ -730,7 +730,11 @@ module Cnvrg
       end
       res = Cnvrg::API.request(@base_resource + "download_files", 'POST', {files: files, commit: commit})
       unless Cnvrg::CLI.is_response_success(res, false)
-        raise SignalException.new("Cant download files from the server.")
+        begin
+          puts(res)
+        rescue
+        end
+        raise StandardError.new("Cant download files from the server.")
       end
       self.download_multiple_files_s3(res['result'], @project_home, postfix: postfix, progress: progress, threads: threads)
     end

data/lib/cnvrg/helpers/executer.rb

@@ -3,7 +3,7 @@ require 'cnvrg/helpers/agent'
 class Cnvrg::Helpers::Executer
   attr_reader :machine_activity, :agent_id, :main_id
   MAIN_CONTAINER_PORT = ENV['MAIN_CONTAINER_PORT'].try(:to_i) || 4000
-
+  HAS_DOCKER = ENV['HAS_DOCKER'] == "true"
 
   ### this class represent a machine_activity. it will poll the commands, communicate with the
   # server (poll commands) and let the server know the status of this executer.
@@ -84,7 +84,7 @@ class Cnvrg::Helpers::Executer
     agent_id = nil
     main_id = nil
     timeout = 2
-    timeout = nil if !@is_new_main
+    timeout = nil if (!@is_new_main || HAS_DOCKER)
     Timeout.timeout(timeout) do
       while agent_id.blank? or main_id.blank?
         grep_by = @job_id

data/lib/cnvrg/project.rb

@@ -328,15 +328,21 @@ module Cnvrg
     end
 
     def get_storage_client
-      response = Cnvrg::API.request("users/#{@owner}/projects/#{@slug}/client", 'GET')
-      if Cnvrg::CLI.is_response_success(response, false)
-
+      client_params = nil
+      i = 0
+      begin
+        response = Cnvrg::API.request("users/#{@owner}/projects/#{@slug}/client", 'GET')
+        unless Cnvrg::CLI.is_response_success(response, false)
+          raise StandardError.new("Can't find project credentials")
+        end
         client_params = response['client']
-      else
-
+      rescue StandardError
+        i += 1
+        sleep(5 * i)
+        retry if i < 10
         client_params = get_storage_client_fallback
       end
-
+      raise StandardError.new("Can't find project credentials") unless client_params
       Cnvrg::Downloader::Client.factory(client_params)
     end
 
@@ -381,10 +387,12 @@ module Cnvrg
     def generate_output_dir(output_dir, local: false)
       Cnvrg::Logger.log_info("Generating output dir for #{output_dir}")
       upload_list = []
+      list = []
       list = Dir.glob("/cnvrg/#{output_dir}/**/*", File::FNM_DOTMATCH)
       if local
         list += Dir.glob("#{output_dir}/**/*", File::FNM_DOTMATCH)
       end
+      list.uniq!
       Parallel.map(list, in_threads: IDXParallelThreads) do |e|
         next if e.end_with? "/."
         if File.directory? e
@@ -449,6 +457,10 @@ module Cnvrg
         if list_ignore_new.include? label
           next
         end
+        if File.symlink?(e)
+          Cnvrg::Logger.log_info("Skipping symlink #{e}")
+          next
+        end
         if File.directory? e
           dir_name = (label.ends_with? "/") ? label : (label + "/")
           tree_idx[dir_name] = nil
@@ -649,7 +661,11 @@ module Cnvrg
 
     def fetch_webapp_slugs(webapp_slug, slugs: nil)
       response = Cnvrg::API_V2.request("#{self.owner}/projects/#{self.slug}/webapps/#{webapp_slug}" , 'GET')
-      return response["experiments"]
+
+      if response.key?("experiments")
+        return response["experiments"]
+      end
+      return response["data"]["attributes"]["experiments"]
     rescue
       slugs
     end
@@ -701,8 +717,11 @@ module Cnvrg
       res = JSON.parse(resp['result']) rescue nil
       return if res.blank?
       config = self.get_config
-      config[:is_git] = res['git']
       config[:project_name] = res['title']
+      config[:project_slug] = @slug
+      config[:owner] = @owner
+      config[:git] = res['git'] || false
+      config[:is_git] = res['git'] || false
       self.set_config(config)
     end
 

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '2.0.1'
+  VERSION = '2.0.15'
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.15
 platform: ruby
 authors:
 - Yochay Ettun
 - Leah Kolben
 - Omer Shacham
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2021-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -473,7 +473,7 @@ files:
 homepage: https://cnvrg.io
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -488,8 +488,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key:
+rubygems_version: 3.2.32
+signing_key: 
 specification_version: 4
 summary: A CLI tool for interacting with cnvrg.io.
 test_files: []