cnvrg 2.0.11 → 2.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86857e06a0d107172c161467e8ff8cb04a120d8b230c97843e91ce13c826ccce
-  data.tar.gz: 272fe88e1e390f2887c36c49915cc89f10a6cf9947bb98ab6fd503476ac03820
+  metadata.gz: 8498090d7edb55682fcc70778016643eba8e37e8a4b588e149ee318b1beecfd8
+  data.tar.gz: 3413d316dbf02cd6e4e8b3adc8f3d3760da0e1e7b39c60c322a8293b63ebb921
 SHA512:
-  metadata.gz: c28ab54953e47843897273f8038f5e0bfc92e101e161d1edae4477250e1334b5730b5020713572ad2482c5b0c305c5c0b2c5725b8796a44c06750eccf2924e9f
-  data.tar.gz: 69be0cd1fc89180ce7b878aaa8e0767b5be9a00cb0c9813c504e62677c1c839831aa6cf4fbf27aeb66aa50b756f7b28f46eb721182e588bcc4b7c65544e6a41b
+  metadata.gz: db819d57216a924cdbe8eacff8b1c5fdf6d95c082da67b7b54d21e5958ab7ca1fd3c9c636c461b86d5f04bb3c31c85b3ab2ed92679267d98c9d0b913df986c54
+  data.tar.gz: 14575293bf59438342f840ab230327be08b088ced95aafd51429dd046370b27337f99b520ff4c224355bf8477e7d0d5490a87476937c68cb2b42a8d88b1d983b

data/Readme.md

@@ -53,4 +53,22 @@
 2021-09-12
 * DEV-10502 - Bug: Periodic sync stuck
 ## Version v2.0.11
-2021-10-21
+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
+## Version v2.0.17
+2021-12-19
+* DEV-10581 - Bug: CLI - getting 404 response in "cnvrg set_default_owner"

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.rb

@@ -363,7 +363,7 @@ module Cnvrg
         config = YAML.load_file(path)
 
         username = config.to_h[:username]
-        res = Cnvrg::API.request("/users/#{username}/get_possible_owners", 'GET')
+        res = Cnvrg::API.request("/api/v1/users/#{username}/get_possible_owners", 'GET')
         if Cnvrg::CLI.is_response_success(res)
           owner = username
           result = res["result"]
@@ -372,7 +372,6 @@ module Cnvrg
           choose_owner = result["username"]
           if owners.empty?
           else
-            owners << choose_owner
             chosen = false
             while !chosen
               owners_id = owners.each_with_index.map {|x, i| "#{i + 1}. #{x}"}
@@ -496,8 +495,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 +516,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)
 
@@ -3327,7 +3339,7 @@ module Cnvrg
               end
 
               if local
-                exec_local(cmd)
+                exec_local(cmd, print_log, start_commit, real, start_time)
                 exit_status = $?.exitstatus
 
               else
@@ -4700,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'
@@ -5884,7 +5897,8 @@ module Cnvrg
         end
       end
 
-      def exec_local(cmd)
+      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|

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '2.0.11'
+  VERSION = '2.0.17'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 2.0.11
+  version: 2.0.17
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-21 00:00:00.000000000 Z
+date: 2022-01-06 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.0.3
 signing_key: 
 specification_version: 4
 summary: A CLI tool for interacting with cnvrg.io.