cnvrg 2.1.6 → 2.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 296eba8c8dab87e1a16b7980c1e80b013be95af52cfc184a12cf366f676a3a2b
-  data.tar.gz: '08ad62abd898bb6bb1a9099237f5ebd854f87359ecc571036ce351b259127d78'
+  metadata.gz: 414c34615497d519b8df3fc1adf597aa18bb8d05eb7466b312bbfd517f0e74aa
+  data.tar.gz: ddde064e3ef2f144948d1b6d1859f4daef95290dd13ae28b544569f6b16f5be0
 SHA512:
-  metadata.gz: f5174c705ed765c76538401ea14ea2c14e267d98836b3d8e8b66a72d31d4f7ee2eeb313fbd080cd15a513bb4149f907aef075be2d7f6bab4b96afefb4ba5f341
-  data.tar.gz: 355b440e9a009571e2f097599d14418fcdbe0a79cfaae8473637722745923f8b138b4fdbc0e3ee60107122835f98468811661b770ffee4008f8b141250361fce
+  metadata.gz: 8d72d7b22df91d154e0313f24511ae9f6f007c077bf0f49a9329f0546ec9983833920fd567e4abfe7ab876ae2da4aae888d77840d10d7945f956d0b8e77047c1
+  data.tar.gz: f72cfb009f744ede0fdaec505610e32fa50ee570415cd729678c2d791b79351a891569f5ef1911920ddca242bc0354c61e6aa505252793b3345cdfdaeebe0dbc

data/Readme.md

@@ -98,4 +98,14 @@
 * DEV-14633 - Bug: End sync did not complete, causing the experiment to get stuck in "terminating"
 ## Version v2.1.6
 2022-08-09
-* DEV-14682 - Bug: git-Walki: CLI/SDK experiments goes into debug mode for Github+SSH integrated projects
+* DEV-14682 - Bug: git-Walki: CLI/SDK experiments goes into debug mode for Github+SSH integrated projects
+## Version v2.1.7
+2022-08-24
+* DEV-15229 - Bug: CLI - warnings from faraday gem when running any CLI command
+## Version v2.1.8
+2022-09-04
+* DEV-15473 - Bug: CLI - Errors while cloning a project that has file containing spaces in their names 
+## Version v2.1.9
+2022-09-06
+* DEV-15423 - Bug: Workspace - Jupyter process gets killed
+* DEV-15451 - Bug: CLI - sync error "undefined method `encode' for nil:NilClass" on GCP storage

data/cnvrg.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
     spec.add_runtime_dependency 'ffi', '~> 1.9', '>= 1.9.10'
     spec.add_runtime_dependency 'mimemagic', '~> 0.3.1', '>=0.3.7'
     spec.add_runtime_dependency 'faraday', '~> 0.15.2'
+    spec.add_runtime_dependency 'warning', '~> 1.3.0'
     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'

data/lib/cnvrg/downloader/clients/azure_client.rb

@@ -15,15 +15,13 @@ module Cnvrg
 
         def download(storage_path, local_path, decrypt: true)
           prepare_download(local_path)
-
           storage_path = Cnvrg::Helpers.decrypt(@key, @iv, storage_path) if decrypt
 
           # We generate a temp uri in order to stream the file instead of using "get_blob" that overflows memory
           uri = client.send(:blob_uri, @container, storage_path)
 
-          generator = Azure::Storage::Common::Core::Auth::SharedAccessSignature.new(@account_name, @access_key)
 
-          expiring_url = generator.signed_uri(
+          expiring_url = self.signed_uri_custom(
             uri,
             false,
             service: 'b',
@@ -32,12 +30,32 @@ module Cnvrg
             start: (Time.now - (5 * 60)).utc.iso8601, # start 5 minutes ago
             expiry: (Time.now + 60 * 60 * 2).utc.iso8601 # expire in 2 hours
           )
-
           # Stream the file without loading it all into memory
           download = open(expiring_url)
           IO.copy_stream(download, local_path)
         end
 
+        def signed_uri_custom(uri, use_account_sas, options)
+          # url sent to generate_service_sas_token should be DECODED (file names with spaces should not be encoded with %20)
+          url = URI.decode(uri.path)
+          generator = Azure::Storage::Common::Core::Auth::SharedAccessSignature.new(@account_name, @access_key)
+
+          CGI::parse(uri.query || "").inject({}) { |memo, (k, v)| memo[k.to_sym] = v; memo }
+
+          if options[:service] == (nil) && uri.host != (nil)
+            host_splits = uri.host.split(".")
+            options[:service] = host_splits[1].chr if host_splits.length > 1 && host_splits[0] == @account_name
+          end
+
+          sas_params = if use_account_sas
+                         generator.generate_account_sas_token(options)
+                       else
+                         generator.generate_service_sas_token(url, options)
+                       end
+
+          URI.parse(uri.to_s + (uri.query.nil? ? "?" : "&") + sas_params)
+        end
+
         def upload(storage_path, local_path)
           begin
             client.create_block_blob(@container, storage_path, File.open(local_path, "rb"))

data/lib/cnvrg/downloader/clients/gcp_client.rb

@@ -6,7 +6,7 @@ module Cnvrg
       class GcpClient < Client
         def initialize(project_id: nil, credentials: nil, bucket_name: nil, sts: nil)
           @key, @iv = extract_key_iv(sts)
-          @project_id = Cnvrg::Helpers.decrypt(@key, @iv, project_id)
+          @project_id = Cnvrg::Helpers.decrypt(@key, @iv, project_id) if project_id.present?
           @credentials_path = Cnvrg::Helpers.decrypt(@key, @iv, credentials)
           @tempfile = nil
           @bucket_name = Cnvrg::Helpers.decrypt(@key, @iv, bucket_name)

data/lib/cnvrg/helpers/agent.rb

@@ -22,6 +22,7 @@ class Cnvrg::Helpers::Agent
     @slug = slug
     @files_exist = files_exist
     @container_name = container_name
+    @execute_command_completed = false
     @is_new_main = !ENV["MAIN_CONTAINER_PORT"].blank?
     @main_name = @is_new_main ? "main" : "slave"
     @run_in_main = @container_name.downcase == @main_name
@@ -79,6 +80,7 @@ class Cnvrg::Helpers::Agent
       command_status = Status::ABORTED
       @exit_status = 127
     end
+    @execute_command_completed = true
     finish_log = "Command: #{@command} with slug: #{@slug} finished"
     finish_log += " after #{@real_execution_retries} retries" if @real_execution_retries > 0
     log_internal(finish_log)
@@ -97,7 +99,7 @@ class Cnvrg::Helpers::Agent
 
   def periodic_thread
     Thread.new do
-        while @exit_status.blank?
+        while !@execute_command_completed
           Thread.exit if @log_interval.blank?
           sleep(@log_interval)
           send_logs

data/lib/cnvrg/version.rb

@@ -1,3 +1,3 @@
 module Cnvrg
-  VERSION = '2.1.6'
+  VERSION = '2.1.9'
 end

data/lib/cnvrg.rb

@@ -1,3 +1,7 @@
+require 'warning'
+Warning.ignore(/.*::CompositeIO is deprecated.*/)
+Warning.ignore(/.*::Parts is deprecated.*/)
+Warning.ignore(/.*::UploadIO is deprecated.*/)
 require 'rubygems'
 require 'cnvrg/version'
 require 'cnvrg/cli'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cnvrg
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.9
 platform: ruby
 authors:
 - Yochay Ettun
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -150,6 +150,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.15.2
+- !ruby/object:Gem::Dependency
+  name: warning
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement