cnvrg 2.0.6 → 2.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b238ce877c0fa8da80c63c6d3d165ce974c250ea9c3f3d21ff092098356aa5a5
-  data.tar.gz: 7c7b4aa637b3bcaf5f18a7eb973d6995f0f1e25147a16a2ccfb1ce3d6dea91e3
+  metadata.gz: 7c04990b9e466d74e4ba90092109234a5488f1845db38bac6e3c121d8e6a7508
+  data.tar.gz: 253358287a518824c5d22aeda7f4b9c2a9197e57d14177c8757806470258021a
 SHA512:
-  metadata.gz: fb1b724199e92fddfa2be4c04b9eb1a8a94e1df65759482fb6c3173f7c3c7632d236c22836749e5f1d6578115555b838285b58d1a95a42ce2df67d3a354da043
-  data.tar.gz: c840826e01dcd8061fdb1bf065f416d97ca3fe35575649171814741c32332b458c7bac57fa248e9afd45f337b60b18003077cc72d5927527490689572608ad6b
+  metadata.gz: df209c738e03b869cc5ccc50694a2ce705fe3c9ba2459a1ddbbeb64b9ab433fdf8bd880bbd4f1d24ce2420ebbf0180b53c87b564e89d3b41df86c55a3b6a5ede
+  data.tar.gz: 9bcd79dafb0d9b00626df5b873e8c787731afe2e297292bb184c2e2250062e4ccf5766539a9600d1c078568e2db8c13e9e88842dc6262c8a0c40cc75c80ab07a

data/Readme.md

@@ -39,4 +39,33 @@
 * 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)
+* 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
+## Version v2.0.16
+2021-12-16
+* 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,23 @@ 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()
+        use_token = true if url.include?("cloud.cnvrg.io")
+        if use_token
+          @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)
 
@@ -3147,7 +3160,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 +3217,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 +3242,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 +3338,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 +4713,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'
@@ -5007,7 +5029,7 @@ module Cnvrg
       end
     end
 
-    desc 'experiments', 'List project experiments'
+    desc 'experiments', 'List project experiments', :hide => true
     method_option :id, :type => :string, :aliases => ["--id"], :desc => "Get info for specific experiments", :default => ""
     method_option :tag, :type => :string, :aliases => ["-t"], :desc => "Get info for specific experiment tag", :default => ""
 
@@ -5876,6 +5898,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/project.rb

@@ -661,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

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '2.0.6'
+  VERSION = '2.0.16'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.16
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -488,7 +488,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
+rubygems_version: 3.2.32
 signing_key: 
 specification_version: 4
 summary: A CLI tool for interacting with cnvrg.io.