datahen 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc47c55d814a573f9de29c4725aba0cad212dceae5dfa2d330dc980ad4f64253
-  data.tar.gz: 508fe6249ef13f07c835297758f31eb8459080b13c4256c9393d0c8c6ea2b171
+  metadata.gz: beadb0e5b371134e96d8e1888250de66411eb287a30cfc5f717e525c19343d6c
+  data.tar.gz: 298daaf6f56f1fcfb4e842b9e82d0e4f8896315d264b9481aa2ed4ec55bc8a9b
 SHA512:
-  metadata.gz: 23c817ae6f20698c95fdae1503bfe9fc6072f617389e979a1389eab746de07632fab432b2a3a5a824c56c9ad3b6a254a1508ecfd7bb691013843e7b93831daf5
-  data.tar.gz: c3a1df12099bc6bf159ac7689d7c7be36dc15416b6ecc3c347e7ef1ba1e8e844a58d9600f00803c7fd73837915b88674aa8e470e504acc6ac89d6fd0897df632
+  metadata.gz: 8cba2e599b72315d65cd20440c6a8804d7298bd577d5d24f9408bc71e35f47ee5abb8e7d580b7b42cc95c10608f852339a1d44ecfedaedd82acb565f5ffb05d2
+  data.tar.gz: 6a8c1c8f7d8deca7663699f7f20ea0e9cf7e7608b2d93150fb2fd4da438780fecff010332e43675800f94012739bfcda6a85dd27df1055958e6de0bbd4c158ab

data/lib/datahen/client/base.rb

@@ -13,6 +13,9 @@ module Datahen
         finisher: nil
       }
 
+      CHECK_NIL = lambda{|v|v.nil?}
+      CHECK_EMPTY_BODY = lambda{|v|v.body.nil? || v.body.empty?}
+
       def self.env_auth_token
         ENV['DATAHEN_TOKEN']
       end
@@ -56,14 +59,14 @@ module Datahen
         target.merge(source.select{|k,v|target.has_key?(k)})
       end
 
-      def retry times, delay = nil, err_msg = nil, stream = false
+      def retry(times, delay = nil, err_msg = nil, stream = false, check_nil = CHECK_NIL)
         limit = times.nil? ? nil : times.to_i
         delay = delay.nil? ? 5 : delay.to_i
         count = 0
         begin
           val = yield
           if stream
-            return if val.nil?
+            return if check_nil.call(val)
             if val['error'] != ""
               raise StandardError.new(val['error'])
             end

data/lib/datahen/client/job.rb

@@ -60,7 +60,7 @@ module Datahen
         params = @options.merge({body: body.to_json})
 
         limit = opts.has_key?(:retry_limit) ? opts.fetch(:retry_limit) : self.default_retry_limit[:seeder]
-        self.retry(limit, 5, "Error while updating the seeder.") do
+        self.retry(limit, 5, "Error while updating the seeder.", false, CHECK_EMPTY_BODY) do
           response = self.class.put("/jobs/#{job_id}/seeding_update", params)
           if response.code == 422 && response.body.to_s =~ /pq:\s*deadlock/i
             raise CustomRetryError.new(self.class.random_delay(5), response.body.to_s)
@@ -78,7 +78,7 @@ module Datahen
         params = @options.merge({body: body.to_json})
 
         limit = opts.has_key?(:retry_limit) ? opts.fetch(:retry_limit) : self.default_retry_limit[:finisher]
-        self.retry(limit, 5, "Error while updating the finisher.") do
+        self.retry(limit, 5, "Error while updating the finisher.", false, CHECK_EMPTY_BODY) do
           response = self.class.put("/jobs/#{job_id}/finisher_update", params)
           if response.code == 422 && response.body.to_s =~ /pq:\s*deadlock/
             raise CustomRetryError.new(self.class.random_delay(5), response.body.to_s)

data/lib/datahen/client/job_output.rb

@@ -7,7 +7,7 @@ module Datahen
 
       def all(job_id, collection = 'default', opts = {})
         limit = opts.has_key?(:retry_limit) ? opts.fetch(:retry_limit) : 0
-        self.retry(limit, 10, "Error while updating the seeder.", true) do
+        self.retry(limit, 10, "Error while updating the seeder.", true, CHECK_EMPTY_BODY) do
           self.class.get("/jobs/#{job_id}/output/collections/#{collection}/records", @options)
         end
       end

data/lib/datahen/client/job_page.rb

@@ -63,7 +63,7 @@ module Datahen
         params = @options.merge({body: body.to_json})
 
         limit = opts.has_key?(:retry_limit) ? opts.fetch(:retry_limit) : self.default_retry_limit[:parser]
-        self.retry(limit, 5, "Error while updating the parser.") do
+        self.retry(limit, 5, "Error while updating the parser.", false, CHECK_EMPTY_BODY) do
           response = self.class.put("/jobs/#{job_id}/pages/#{gid}/parsing_update", params)
           if response.code == 422 && response.body.to_s =~ /pq:\s*deadlock/i
             raise Error::CustomRetryError.new(self.class.random_delay(5), response.body.to_s)

data/lib/datahen/version.rb

@@ -1,3 +1,3 @@
 module Datahen
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: datahen
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Parama Danoesubroto
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-09 00:00:00.000000000 Z
+date: 2024-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor