cnvrg 1.11.28 → 1.11.29

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e617f50977eafa031b94bed3ba18753ecb4529924f74182525a5c6a53410fc5f
-  data.tar.gz: 40b755a41a73611dbc8f48802352ca73cac613c2e6d3fa70bf823e9e24f7c3f5
+  metadata.gz: 0b2588acc9e199189983cf67643124e60c8c9c7a5223bbbd85d65994cb3a812c
+  data.tar.gz: a35822e68bc4a095e7a029d4572bf9a748f2b0f6f0b2f3baa86c04315be3f176
 SHA512:
-  metadata.gz: 51abb620c15a66be237a4392ec7fad73e1a5f865f3932934b938028ee0b54558772b8dcc292c77379bbbe273c1771f2b3e85d250d492cafa0b0bc681cb7a52dc
-  data.tar.gz: 06fe73c3d4246c41b43923736c2ece0680a4f04522a317acdc576b6191d5ca74057f55bc6c5120456ac8ef0c5cfe7f328317655799b0d3d3c910db1cde871ad7
+  metadata.gz: c0c64aecb69a20b939c990ed99b26e2387d26046c44a734b46f7f813b271c7552801ea3909478a424db42e80e9df662cc2af428283cd65cbe7eb08d939648aa2
+  data.tar.gz: a86c3d71aa228f7a387fd484b286e2dacf92483644cd48687eb0d68bfcb2d0c9e68ac2b87b3ff537efbef064f8c915423fb82438ef823f95aa748b71659a5772

data/Readme.md

@@ -0,0 +1,17 @@
+
+## Version v1.11.15
+2021-03-30
+* DEV-208 - Task: Make sure the index name is constant over days
+* DEV-7555 - Bug: CLI: Error message is not correct when run a flow after removing the permission from Template.
+* DEV-7800 - New Feature: FR - add stdout to CLI logs (for logging in kibana etc.)
+* DEV-7928 - Bug: CLI - cnvrg clone doesnt show log message when files not found
+* DEV-7956 - Bug: CLI crashes from progressbar
+* DEV-8006 - Bug: Cli- cnvrg data put ,slash in the end url path will cause unique index error
+* DEV-8007 - Bug: Cli- Cnvrg data clone failed sometimes to load sts, there for clone crashed
+* DEV-8159 - New Feature: Oauth Proxy
+* DEV-8179 - New Feature: Add auto cache and link files in cache clone
+* DEV-8208 - Bug: Cli - cnvrg data put fails
+* DEV-8284 - Improvement: Use server instead of docker for agent communication
+* DEV-8434 - Bug: Rerun of experiment in git project doesn't show artifacts
+* DEV-8539 - Bug: SDK - in windows: e.sync doesnt perform sync
+* DEV-8621 - Improvement: Add more metrics 

data/cnvrg.gemspec

@@ -14,8 +14,8 @@ Gem::Specification.new do |spec|
 
     #spec.files         = `git ls-files`.split($/)
     spec.files = %w[cnvrg.gemspec] + Dir['*.md', 'bin/*', 'lib/**/*.rb']
-    spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-    spec.executables   = ['cnvrg']
+    spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+    spec.executables = ['cnvrg']
     spec.require_paths = ['lib']
 
     spec.add_development_dependency 'bundler'
@@ -23,14 +23,14 @@ Gem::Specification.new do |spec|
     spec.add_development_dependency 'rspec', '~> 3.0'
     spec.add_development_dependency 'vcr', '~> 3.0'
     spec.add_development_dependency 'aruba'
-    spec.add_development_dependency 'pry'	
-    
-    spec.add_runtime_dependency 'mimemagic', '~> 0.3.1','>=0.3.2'
+    spec.add_development_dependency 'pry'
+
+    spec.add_runtime_dependency 'mimemagic', '~> 0.3.1', '>=0.3.7'
     spec.add_runtime_dependency 'faraday', '~> 0.15.2'
     spec.add_runtime_dependency 'netrc', '~> 0.11.0'
     spec.add_runtime_dependency 'open4', '~> 1.3', '>= 1.3.4'
     spec.add_runtime_dependency 'highline', '~> 1.7', '>= 1.7.8'
-    spec.add_runtime_dependency 'thor', '~> 0.19.0','>=0.19.1'
+    spec.add_runtime_dependency 'thor', '~> 0.19.0', '>=0.19.1'
     spec.add_runtime_dependency 'aws-sdk-s3', '~> 1'
     spec.add_runtime_dependency 'signet', '~> 0.11.0'
     spec.add_runtime_dependency 'google-cloud-env', '~> 1.2.1'

data/lib/cnvrg/cli.rb

@@ -3199,6 +3199,7 @@ module Cnvrg
     method_option :output_dir, :type => :string, :aliases => ["-o", "--output_dir"], :default => nil
     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
 
     def exec(*cmd)
       log = []
@@ -3222,6 +3223,7 @@ module Cnvrg
       output_dir = options['output_dir'] || "output"
       project_home = get_project_home
       data_query = options["data_query"]
+      docker_stats = options["docker_stats"]
       @project = Project.new(project_home)
       if @project.is_git
         sync_before = false
@@ -3294,20 +3296,22 @@ module Cnvrg
             stdout, stderr = '', ''
             begin
               process_running = true
-              stats_thread = Thread.new do
-                while process_running do
-                  sleep 30
-                  begin
-                    stats = remote ? usage_metrics_in_docker(docker_id) : Helpers.ubuntu? ? {memory: memory_usage, cpu: cpu_usage} : {}
-                    if is_on_gpu
-                      gu = gpu_util(take_from_docker: options["gpu_util_from_docker"], docker_id: docker_id)
-                      stats['gpu_util'] = gu[0]
-                      stats['gpu'] = gu[1]
+              if docker_stats
+                stats_thread = Thread.new do
+                  while process_running do
+                    sleep 30
+                    begin
+                      stats = remote ? usage_metrics_in_docker(docker_id) : Helpers.ubuntu? ? { memory: memory_usage, cpu: cpu_usage } : {}
+                      if is_on_gpu
+                        gu = gpu_util(take_from_docker: options["gpu_util_from_docker"], docker_id: docker_id)
+                        stats['gpu_util'] = gu[0]
+                        stats['gpu'] = gu[1]
+                      end
+                      @exp.send_machine_stats [stats] unless stats.empty?
+                    rescue => e
+                      log_error(e)
+                      log_message("Failed to upload ongoing stats, continuing with experiment", Thor::Shell::Color::YELLOW)
                     end
-                    @exp.send_machine_stats [stats] unless stats.empty?
-                  rescue => e
-                    log_error(e)
-                    log_message("Failed to upload ongoing stats, continuing with experiment", Thor::Shell::Color::YELLOW)
                   end
                 end
               end
@@ -3405,7 +3409,7 @@ module Cnvrg
               end
 
                 # log_thread.join
-              stats_thread.join
+              stats_thread.join if docker_stats
 
                 res = @exp.end(log, exit_status, end_commit, cpu_average, memory_average, end_time: end_time)
 
@@ -3425,7 +3429,7 @@ module Cnvrg
               log_message("Couldn't run #{cmd}, check your input parameters", Thor::Shell::Color::RED)
               if @exp
                 # log_thread.join
-                Thread.kill(stats_thread)
+                Thread.kill(stats_thread) if docker_stats
                 exit_status = $?.exitstatus
                 if exit_status.blank?
                   exit_status = "-1"
@@ -3449,7 +3453,7 @@ module Cnvrg
         end_commit = @project.last_local_commit
         process_running = false
         # log_thread.join
-        stats_thread.join
+        stats_thread.join if docker_stats
 
         res = @exp.end(log, exit_status, end_commit, cpu_average, memory_average)
         if container
@@ -4640,6 +4644,81 @@ module Cnvrg
       end
     end
 
+    desc 'Collect and send job utilization', '', :hide => true
+    method_option :prometheus_url, :type => :string, :aliases => ["--prometheus_url"], :desc => "prometheus url to collect metrics from"
+    method_option :node_name, :type => :string, :aliases => ["--node_name"], :desc => "machie activity node name"
+    method_option :machine, :type => :boolean, :aliases => ["--machine"], :desc => "get machine_query or cluster_query"
+    method_option :gpu, :type => :boolean, :aliases => ["--gpu"], :desc => "collect gpu metrics", :default => false
+    method_option :gaudi, :type => :boolean, :aliases => ["--gaudi"], :desc => "collect gaudi metrics", :default => false
+    method_option :wait, :type => :numeric, :aliases => ["--wait"], :desc => "to to wait between querying", :default => 30
+
+    def collect_metrics
+      @exp = Experiment.new(ENV['CNVRG_OWNER'], ENV['CNVRG_PROJECT'], job_id: ENV['CNVRG_JOB_ID'])
+      prometheus_url = options[:prometheus_url].ends_with?("/") ? options[:prometheus_url] : "#{options[:prometheus_url]}/"
+
+      translate_result = Cnvrg::API_V2.request(
+        "#{ENV['CNVRG_OWNER']}/resources/translate_metrics",
+        'GET',
+        { gpu: options[:gpu] }
+      )
+
+      is_machine = options[:machine]
+      while true do
+        begin
+          stats = {}
+          translate_result.each do |query_name, metric|
+            if is_machine
+              metric_query = metric['machine_query'].presence || metric['query']
+              query_content = metric_query.gsub('#JOB_SLUG#', ENV['CNVRG_JOB_ID']).gsub('#NODE_NAME#', options[:node_name])
+            else
+              metric_query = metric['cluster_query'].presence || metric['query']
+              pod_name = `hostname`.strip
+              query_content = metric_query.gsub('#JOB_SLUG#', pod_name).gsub('#NODE_NAME#', options[:node_name])
+            end
+            if metric_query.blank? || query_content.blank?
+              next
+            end
+            uri = URI("#{prometheus_url}api/v1/query?query=#{query_content}")
+            resp = Net::HTTP.get(uri)
+            begin
+              result = JSON.parse(resp)
+            rescue JSON::ParserError => e
+              log_error(e)
+              next
+            end
+            data_result = result&.dig('data', 'result')
+            next unless data_result
+
+            if data_result.size > 1
+              stats[query_name] = {}
+              data_result.each_with_index do |res, i|
+                timestamp, value = res["value"]
+                uuid = res["metric"]["UUID"].presence || i
+                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
+                stats[query_name][uuid] = stat_value
+              end
+            else
+              timestamp, value = data_result&.first&.dig('value')
+              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'
+                stats['block_io'] = {} if stats['block_io'].blank?
+                io_type = query_name.split('_')[1]
+                stats['block_io'].merge!({ io_type => stat_value })
+              else
+                stats[query_name] = stat_value
+              end
+            end
+          end
+          @exp.send_machine_stats [stats] unless stats.empty?
+        rescue => e
+          log_error(e)
+          log_message("Failed to upload ongoing stats, continuing with experiment", Thor::Shell::Color::YELLOW)
+        end
+        sleep options[:wait]
+      end
+    end
 
     desc '', '', :hide => true
 

data/lib/cnvrg/experiment.rb

@@ -133,23 +133,30 @@ module Cnvrg
       return response
     end
     def remote_notebook(instance_type, commit, data, data_commit, notebook_type,ds_sync_options=0,data_query=nil, image = nil, datasets = nil)
-      response = Cnvrg::API.request("users/#{@owner}/projects/#{@project_slug}/notebook/remote", 'POST', {instance_type: instance_type,dataset_slug:data,
-                                                                                                          dataset_commit: data_commit,image_slug:image,
-                                                                                                          datasets: datasets,
-                                                                                                          commit:commit,notebook_type:notebook_type,dataset_sync_options:ds_sync_options,
-                                                                                                          dataset_query:data_query})
+      response = Cnvrg::API.request("users/#{@owner}/projects/#{@project_slug}/notebook/remote", 'POST', { instance_type: instance_type, dataset_slug:data,
+                                                                                                           dataset_commit: data_commit, image_slug:image,
+                                                                                                           datasets: datasets,
+                                                                                                           commit:commit, notebook_type:notebook_type, dataset_sync_options:ds_sync_options,
+                                                                                                           dataset_query: data_query })
       return response
     end
 
     def upload_temp_log(temp_log)
-      response = Cnvrg::API.request(@base_resource + "experiment/upload_temp_log", 'POST', {output: temp_log,
-                                                                                            exp_slug: @slug})
-      Cnvrg::CLI.is_response_success(response,false)
+      response = Cnvrg::API.request(@base_resource + "experiment/upload_temp_log", 'POST', { output: temp_log,
+                                                                                             exp_slug: @slug })
+      Cnvrg::CLI.is_response_success(response, false)
     end
 
     def send_machine_stats(stats)
-      response = Cnvrg::API.request(@base_resource + "experiment/upload_stats", "POST", {exp_slug: @slug, stats: stats.map{|s| s.merge!({time: Time.now})}})
-      Cnvrg::CLI.is_response_success(response,false)
+      response = Cnvrg::API.request(
+        @base_resource + "experiment/upload_stats",
+        "POST",
+        {
+          exp_slug: @slug,
+          stats: stats.map { |s| s.merge!({ time: Time.now }) }
+        }
+      )
+      Cnvrg::CLI.is_response_success(response, false)
     end
 
     def end(output, exit_status, end_commit, cpu_average, memory_average, end_time: nil)
@@ -158,7 +165,7 @@ module Cnvrg
       success = false
       end_time ||= Time.now
       while tries < 10 and success.blank?
-        sleep (tries*rand) ** 2 ### exponential backoff
+        sleep (tries * rand) ** 2 ### exponential backoff
                                 ## this call is super important so we cant let it crash.
 
         tries += 1

data/lib/cnvrg/helpers/executer.rb

@@ -201,7 +201,7 @@ class Cnvrg::Helpers::Executer
     pod_name = `hostname`.strip rescue nil
     node_name = nil
     if pod_name.present?
-      pod_describe = `kubectl -n cnvrg get pod #{pod_name} -o json` rescue nil
+      pod_describe = `kubectl get pod #{pod_name} -o json` rescue nil
       pod_describe = JSON.parse(pod_describe) rescue {}
       node_name = pod_describe["spec"]["nodeName"] rescue nil
     end
@@ -217,7 +217,7 @@ class Cnvrg::Helpers::Executer
 
   def get_pod_events(pod_name)
     return if pod_name.blank?
-    `kubectl get event --namespace cnvrg --field-selector involvedObject.name=#{pod_name} -o json`
+    `kubectl get event --field-selector involvedObject.name=#{pod_name} -o json`
   end
 
   def get_node_events(node_name)

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '1.11.28'
+  VERSION = '1.11.29'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 1.11.28
+  version: 1.11.29
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,7 +105,7 @@ dependencies:
         version: 0.3.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -115,7 +115,7 @@ dependencies:
         version: 0.3.1
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.3.7
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -394,6 +394,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- Readme.md
 - bin/cnvrg
 - cnvrg.gemspec
 - lib/cnvrg.rb