eco-helpers 3.0.37 → 3.1.2

data/lib/eco/api/session/batch/base_policy.rb

@@ -19,7 +19,9 @@ module Eco
         # @attr_reader max [Integer] `max` **allowed**  number of occurrences of the property
         # @attr_reader min [Integer] `min` **required** number of occurrences of the property
         class BasePolicy
-          extend Eco::API::Common::ClassHierarchy
+          extend Eco::Language::Klass::HelpersBuilt
+          extend Eco::Language::Models::Hierarchy
+
           # adds evaluate method to enable block calls as DSL
           include Eco::Language::Methods::DslAble
 
@@ -31,9 +33,12 @@ module Eco
               key             = key.to_sym.freeze
               class_name      = to_constant(key)
 
-              new_class(class_name, inherits: Eco::API::Session::Batch::BasePolicy) do |klass|
+              new_class(
+                class_name,
+                inherits: Eco::API::Session::Batch::BasePolicy
+              ) do |klass|
                 klass.model = model[key]
-                klass.policy_attrs *klass.model_attrs
+                klass.policy_attrs(*klass.model_attrs)
               end
             end
 
@@ -47,7 +52,7 @@ module Eco
                 var    = "@#{method}".freeze
 
                 define_method(method) do |&block|
-                  unless policy = self[attr]
+                  unless (policy = self[attr])
                     klass  = self.class.policy_class(attr)
                     policy = self[attr] = klass.new(attr, _parent: self)
                   end
@@ -65,10 +70,9 @@ module Eco
 
           include Enumerable
 
-          attr_reader   :attr
-          attr_accessor :max, :min
+          attr_writer :max, :min, :count
 
-          def initialize(attr = nil, _parent: self)
+          def initialize(attr = nil, _parent: self) # rubocop:disable Lint/UnderscorePrefixedVariableName
             @_parent  = _parent
             @attr     = attr.to_sym
             @policies = {}
@@ -76,16 +80,19 @@ module Eco
 
           def max(value = :unused)
             return @max if value == :unused
+
             self.max = value
           end
 
           def min(value = :unused)
             return @min if value == :unused
+
             self.min = value
           end
 
           def attr(as_namespace: false)
             return @attr if !as_namespace || root?
+
             "#{@_parent.attr(as_namespace: true)}:#{@attr}"
           end
 
@@ -110,7 +117,7 @@ module Eco
 
           # @return [Boolean] `true` if there are no active subpolicies, `false` otherwise
           def empty?
-            count == 0
+            count.zero?
           end
 
           # @return [Boolean] `true` if there are active subpolicies, `false` otherwise
@@ -120,6 +127,7 @@ module Eco
 
           def each(&block)
             return to_enum(:each) unless block
+
             items.each(&block)
           end
 
@@ -141,9 +149,12 @@ module Eco
           end
 
           # @param attr [Symbol, String] name of the policy
-          # @param value [Expected object of Eco::API::Session::Batch::BasePolicy] a subpolicy to assign to a name `attr`
+          # @param value [Expected object of Eco::API::Session::Batch::BasePolicy] a subpolicy
+          #   to assign to a name `attr`
           def []=(attr, value)
-            raise "Expected object of Eco::API::Session::Batch::BasePolicy. Given #{value.class}" unless value.is_a?(Eco::API::Session::Batch::BasePolicy)
+            msg = "Expected object of Eco::API::Session::Batch::BasePolicy. Given #{value.class}"
+            raise ArgumentError, msg unless value.is_a?(Eco::API::Session::Batch::BasePolicy)
+
             @policies[attr.to_sym] = value
           end
 
@@ -151,9 +162,10 @@ module Eco
           # @param recurse [Boolean] to determine if we only check the current policy or also all active subpolicies
           # @return [Boolean] `true` if `model` is compliant with the current policy
           def compliant?(model, recurse: true)
-            unless hash = model_to_hash(model)
-              raise "Expected 'model' to be a Hash (or hashable) object. Given: #{model}"
+            unless (hash = model_to_hash(model))
+              raise ArgumentError, "Expected 'model' to be a Hash (or hashable) object. Given: #{model}"
             end
+
             value   = model_attr(hash)
             good    = !model_attr?(hash) || (min?(value) && max?(value))
             #pp "batch_policy: '#{attr}' - #{value}: 'min' #{min?(value)}; 'max' #{max?(value)}"
@@ -162,10 +174,10 @@ module Eco
           end
 
           def validate!(model)
-            unless compliant?(model)
-              msg = self.uncompliance(model)
-              raise "Uncompliance Exception\n#{msg}"
-            end
+            return if compliant?(model)
+
+            msg = uncompliance(model)
+            raise "Uncompliance Exception\n#{msg}"
           end
 
           # @param model [Hash] plain hash (or hashable object) with the stats to check policy compliance against
@@ -182,25 +194,27 @@ module Eco
           # @param recurse [Boolean] to determine if we only check the current policy or also all active subpolicies
           # @return [String] message with what failed to meet compliance
           def uncompliance(model, recurse: true)
-            unless hash = model_to_hash(model)
-              raise "Expected 'model' to be a Hash (or hashable) object. Given: #{model}"
+            unless (hash = model_to_hash(model))
+              raise ArgumentError, "Expected 'model' to be a Hash (or hashable) object. Given: #{model}"
             end
-            msg = ""
+
+            msg = ''
             unless compliant?(hash, recurse: false)
               value = model_attr(hash)
-              msg += "'#{attr(as_namespace: true)}' fails to meet: "
-              msg += " [ min(#{min}) >=  #{value}] " unless min?(value)
-              msg += " [ max(#{max}) <=  #{value}] " unless max?(value)
-              msg += "\n"
+              msg << "'#{attr(as_namespace: true)}' fails to meet: "
+              msg << " [ min(#{min}) >=  #{value}] " unless min?(value)
+              msg << " [ max(#{max}) <=  #{value}] " unless max?(value)
+              msg << "\n"
             end
 
             if recurse
               map do |active|
                 active.uncompliance(hash, recurse: true)
               end.compact.tap do |msgs|
-                msg += "\n" + msgs.join("\n") unless msgs.empty?
+                msg << "\n#{msgs.join("\n")}" unless msgs.empty?
               end
             end
+
             msg
           end
 
@@ -217,18 +231,19 @@ module Eco
           end
 
           def model_attr?(hash)
-            hash.key?(self.attr) || hash.key?(self.attr.to_s)
+            hash.key?(self.attr) || hash.key?(self.attr.to_s) # rubocop:disable Style/RedundantSelf
           end
 
           def model_attr(hash)
-            return hash[self.attr] if hash.key?(self.attr)
-            hash[self.attr.to_s]   if model_attr?(hash)
+            return hash[self.attr] if hash.key?(self.attr) # rubocop:disable Style/RedundantSelf
+            hash[self.attr.to_s]   if model_attr?(hash) # rubocop:disable Style/RedundantSelf
           end
 
           private
 
           def model_to_hash(model)
             return model if model.is_a?(Hash)
+
             model.to_h if model.respond_to?(:to_h)
           end
         end

data/lib/eco/api/session/batch/launcher/mode_size.rb

@@ -8,6 +8,7 @@ module Eco
 
             DEFAULT_BATCH_SIZE = 50
             DEFAULT_JOB_SIZE   = 100
+            MIN_JOB_SIZE       = 15
 
             def batch_size(opts = options)
               return job_mode_size if job_mode?(opts)
@@ -18,7 +19,11 @@ module Eco
             private
 
             # Swaps to batch endpoint on specific errors
-            def batch_mode_on(*error_types, options: self.options, allow_job_mode: true)
+            def batch_mode_on(
+              *error_types,
+              options:        self.options,
+              allow_job_mode: true
+            )
               msg = 'Expecting block. Non given'
               raise ArgumentError, msg unless block_given?
 

data/lib/eco/api/session/batch/launcher.rb

@@ -58,7 +58,7 @@ module Eco
             )
           end
 
-          def launch_batch( # rubocop:disable Metrics/AbcSize
+          def launch_batch( # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
             data,
             method:,
             status:     nil,
@@ -67,10 +67,19 @@ module Eco
             people_api: api&.people,
             silent:     false
           )
-            tap_status(status: status, enviro: enviro, queue: data, method: method) do |overall_status|
+            tap_status(
+              status: status,
+              enviro: enviro,
+              queue:  data,
+              method: method
+            ) do |overall_status|
               pending_for_server_error = data.to_a[0..]
 
-              batch_mode_on(*RETRY_ON, options: options, allow_job_mode: job_mode) do |as_job_mode, per_page|
+              batch_mode_on(
+                *RETRY_ON,
+                options:        options,
+                allow_job_mode: job_mode
+              ) do |as_job_mode, per_page|
                 iteration  = 0
                 done       = 0
                 iterations = (data.length.to_f / per_page).ceil
@@ -85,6 +94,9 @@ module Eco
                   msg << (' ' * 20)
                   log(:info) { msg } unless silent
 
+                  # Use batch endpoint, rather than job when min not reached
+                  as_job_mode &&= slice.length >= MIN_JOB_SIZE
+
                   start_slice = Time.now
 
                   offer_retry_on(*RETRY_ON, retries_left: TIMEOUT_RETRIES) do
@@ -136,6 +148,7 @@ module Eco
             server_error = !res_status || res_status.server_error?
             other_error  = !server_error && (!res_status.code || res_status.code < 100)
             no_body      = !server_error && !other_error && !response.body
+
             server_error || other_error || no_body
           end
         end

data/lib/eco/api/session/config/api.rb

@@ -96,7 +96,7 @@ module Eco
           # @param logger [Logger] the logger that will be used with this api instance.
           # @return [Ecoportal::API::Internal, Ecoportal::API::V2, Ecoportal::API::V1]
           def api(version: nil, logger: nil)
-            version       = version ? version : self.version
+            version     ||= self.version
             switch_logger = (logger != @logger)
             @logger       = logger if logger
 
@@ -135,9 +135,10 @@ module Eco
             self.class.description(self)
           end
 
-          # @todo: deletage to `apis.one_off?`
           def one_off?
-            name.is_a?(Symbol)
+            return false unless @root.respond_to?(:one_off)
+
+            @root.one_off?
           end
 
           def key

data/lib/eco/api/session/config/apis/one_off.rb

@@ -83,7 +83,7 @@ module Eco
 
               true
             rescue StandardError => err
-              puts err.to_s
+              puts err
               false
             end
           end

data/lib/eco/api/session/config/files.rb

@@ -3,25 +3,26 @@ module Eco
     class Session
       class Config
         class Files < BaseConfig
-
           def initialize(config:)
-            super(config: config)
+            super
+
             @validations = {}
           end
 
           def working_directory=(path)
-            self["dir"] = path
+            self['dir'] = path
           end
 
           def working_directory
-            if config.apis.active_api&.one_off?
-              one_off_dir = File.join("one_off", config.apis.active_name.to_s)
-              unless full_path = Eco::Data::Files::Directory.new(one_off_dir).create
-                raise "Could not create the folder '#{full_path}'"
-              end
-              self["dir"] = one_off_dir
-            end
-            self["dir"]
+            return self['dir'] unless config.apis.active_api&.one_off?
+
+            one_off_dir = File.join('one_off', config.apis.active_name.to_s)
+            dir         = Eco::Data::Files::Directory.new(one_off_dir)
+
+            msg = "Could not create the folder '#{dir.full_path}'"
+            raise msg unless dir.create
+
+            self['dir'] = one_off_dir
           end
 
           attr_key :timestamp_pattern
@@ -32,7 +33,7 @@ module Eco
           end
 
           def validate(format, input)
-            @validations[format].call(input) if  @validations.key?(format)
+            @validations[format].call(input) if @validations.key?(format)
           end
         end
       end