attr-gather 1.1.3 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07ef681505341f374e4374d1baf4b5a8630a34b5dc87dc4fcaec159b2a7efeb2
-  data.tar.gz: 680bc4891c2a140b6af5e780d97dba80e7ceb5aa750f8a0fe88dffcf7327c9f5
+  metadata.gz: ee9b30fd44bd8931964b53b904815224fa6a5a592ac1f22d19605a982a326d42
+  data.tar.gz: 7954a71a61dc89266358909ce189312b3b3164e4092d62ae4fae973712efca9d
 SHA512:
-  metadata.gz: 4a634990d091aff5b530c06341e2cb2fdbad34cbec9f4b4dee073245822f45633fab79cbb8c4b76ee95dcda62d56a5b1ec856ac4b7500d04f9478a548664e070
-  data.tar.gz: 6c1dddb4c8478d28ced0677c2b1b4b86343404f645721dde7af77ed9cdc44e880f1ece2fd3a271b26ed85b2325b7b8d4c5ce6cffaa5e1e9b4c2b589c0430dfb7
+  metadata.gz: 040b490aba781f8f851b617a365d2aea061f9d2afb189bcdf4e0e086effebc2135109a648b0f116d4be7000cbe4d3e10e369fadcb38d9e2910114c36957cce68
+  data.tar.gz: 59a93d0d6e16f9b2433822c4faf7ef4cda25f3e9e37da8a5fae816e313e1d6e0b86906a1d652b3c64125eae888607c9117ade38fc17ff11b84c361add21f4c62

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    attr-gather (1.1.3)
+    attr-gather (1.2.0)
       dry-container (~> 0.7)
 
 GEM

data/lib/attr/gather/aggregators/base.rb

@@ -19,22 +19,20 @@ module Attr
           @filter = opts.delete(:filter) || NOOP_FILTER
         end
 
+        def with(**opts)
+          self.class.new(filter: @filter, **opts)
+        end
+
         def call(_original_input, _results_array)
           raise NotImplementedError
         end
 
         private
 
-        def wrap_result(result)
-          Concurrent::Promise.fulfill(result)
-        end
-
         def unwrap_result(res)
-          unvalidated = res.result.value!
-
-          return unvalidated if filter.nil?
+          return res if filter.nil?
 
-          filter.call(unvalidated).value
+          filter.call(res).value
         end
       end
     end

data/lib/attr/gather/aggregators/deep_merge.rb

@@ -12,12 +12,10 @@ module Attr
         # Initialize a new DeepMerge aggregator
         #
         # @param reverse [Boolean] deep merge results in reverse order
-        # @param merge_input [Boolean] include input in aggregation result
         #
         # @api private
-        def initialize(reverse: false, merge_input: true, **)
+        def initialize(reverse: false, **)
           @reverse = reverse
-          @merge_input = merge_input
           super
         end
 
@@ -25,27 +23,21 @@ module Attr
           execution_results = execution_results.reverse_each if reverse?
           initial = unwrap_initial_input(input)
 
-          result = execution_results.reduce(initial) do |memo, res|
+          execution_results.reduce(initial) do |memo, res|
             deep_merge(memo, unwrap_result(res))
           end
-
-          wrap_result(result)
         end
 
         private
 
         def unwrap_initial_input(input)
-          merge_input? ? filter.call(input.dup).value : {}
+          input
         end
 
         def reverse?
           @reverse
         end
 
-        def merge_input?
-          @merge_input
-        end
-
         def deep_merge(hash, other)
           Hash[hash].merge(other) do |_, orig, new|
             if orig.respond_to?(:to_hash) && new.respond_to?(:to_hash)

data/lib/attr/gather/aggregators/shallow_merge.rb

@@ -12,39 +12,26 @@ module Attr
         # Initialize a new DeepMerge aggregator
         #
         # @param reverse [Boolean] merge results in reverse order
-        # @param merge_input [Boolean] include input in aggregation result
         #
         # @api private
-        def initialize(reverse: false, merge_input: true, **)
+        def initialize(reverse: false, **)
           @reverse = reverse
-          @merge_input = merge_input
           super
         end
 
         def call(input, execution_results)
           execution_results = execution_results.reverse_each if reverse?
-          initial = unwrap_initial_input(input)
 
-          result = execution_results.reduce(initial) do |memo, res|
+          execution_results.reduce(input) do |memo, res|
             memo.merge(unwrap_result(res))
           end
-
-          wrap_result(result)
         end
 
         private
 
-        def unwrap_initial_input(input)
-          merge_input? ? filter.call(input.dup).value : {}
-        end
-
         def reverse?
           @reverse
         end
-
-        def merge_input?
-          @merge_input
-        end
       end
     end
   end

data/lib/attr/gather/version.rb

@@ -2,6 +2,6 @@
 
 module Attr
   module Gather
-    VERSION = '1.1.3'
+    VERSION = '1.2.0'
   end
 end

data/lib/attr/gather/workflow/callable.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'attr/gather/workflow/task_executor'
-require 'attr/gather/workflow/async_task_executor'
-
 module Attr
   module Gather
     module Workflow
@@ -21,42 +18,39 @@ module Attr
         #
         # @param input [Hash]
         #
-        # @return [Concurrent::Promise]
+        # @return [Concurrent::Promise<Hash>]
         #
         # @note For more information, check out {https://dry-rb.org/gems/dry-monads/1.0/result}
         #
         # @api public
         def call(input)
-          final_results = []
+          task_promises = {}
 
-          each_task_batch.reduce(input.dup) do |aggregated_input, batch|
-            executor_results = execute_batch(aggregated_input, batch)
-            final_results << executor_results
-            aggregator.call(aggregated_input, executor_results).value!
+          final_results = self.class.tasks.to_a.map do |task|
+            task_promises[task] = execute_task(input, task, task_promises)
           end
 
-          aggregator.call(input.dup, final_results.flatten(1))
+          Concurrent::Promise.zip(*final_results).then do |results|
+            aggregator.call(input, results)
+          end
         end
 
         private
 
-        # Enumator for task batches
-        #
-        # @return [Enumerator]
-        #
-        # @api private
-        def each_task_batch
-          self.class.tasks.each_batch
-        end
-
         # Executes a batch of tasks
         #
         # @return [Array<TaskExecutionResult>]
         #
         # @api private
-        def execute_batch(aggregated_input, batch)
-          executor = AsyncTaskExecutor.new(batch, container: container)
-          executor.call(aggregated_input)
+        def execute_task(initial_input, task, task_promises)
+          task_proc = container.resolve(task.name)
+          dep_promises = task.depends_on.map { |t| task_promises[t] }
+          input_promise = Concurrent::Promise.zip(*dep_promises)
+
+          input_promise.then do |results|
+            dep_input = aggregator.call(initial_input, results)
+            task_proc.call(dep_input)
+          end
         end
 
         # @api private

data/lib/attr/gather/workflow/dsl.rb

@@ -36,9 +36,9 @@ module Attr
         #
         # @api public
         def task(task_name, opts = EMPTY_HASH)
-          task = Task.new(name: task_name, **opts)
-          yield task
-          tasks << task
+          conf = OpenStruct.new
+          yield conf
+          tasks << Hash[name: task_name, **opts, **conf.to_h]
           self
         end
 

data/lib/attr/gather/workflow/task.rb

@@ -1,19 +1,32 @@
 # frozen_string_literal: true
 
+require 'dry-equalizer'
+
 module Attr
   module Gather
     module Workflow
       # @api private
       class Task
-        attr_accessor :depends_on, :name
+        send :include, Dry::Equalizer(:name, :depends_on)
+
+        attr_accessor :name, :depends_on
 
+        # Initialize a new DeepMerge aggregator
+        #
+        # @param name [String] name of the task
+        # @param depends_on [Array<Task>] tasks needed before running this task
+        #
+        # @api private
         def initialize(name:, depends_on: [])
           @name = name
           @depends_on = depends_on
         end
 
+        # Check if this task depends on a given task
+        #
+        # @param other_task [Task] task to check
         def depends_on?(other_task)
-          depends_on.include?(other_task.name)
+          depends_on.include?(other_task)
         end
 
         def fullfilled_given_remaining_tasks?(task_list)

data/lib/attr/gather/workflow/task_graph.rb

@@ -20,7 +20,9 @@ module Attr
           tasks.each { |t| self << t }
         end
 
-        def <<(task)
+        def <<(hash)
+          name, depends_on = hash.values_at :name, :depends_on
+          task = build_task(name, depends_on)
           validate_for_insert!(task)
 
           registered_tasks.each do |t|
@@ -68,6 +70,16 @@ module Attr
 
         private
 
+        def build_task(name, depends_on)
+          deps = depends_on.map do |dep_name|
+            registered_tasks.find do |task|
+              task.name == dep_name
+            end
+          end
+
+          Task.new(name: name, depends_on: deps)
+        end
+
         def tsort_each_child(node, &blk)
           to_h[node].each(&blk)
         end
@@ -99,7 +111,7 @@ module Attr
         end
 
         def depended_on_tasks_exist?(task)
-          task.depends_on.all? { |t| registered_tasks.map(&:name).include?(t) }
+          task.depends_on.all? { |t| registered_tasks.include?(t) }
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: attr-gather
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - Ian Ker-Seymer
@@ -115,14 +115,11 @@ files:
 - lib/attr/gather/filters/result.rb
 - lib/attr/gather/version.rb
 - lib/attr/gather/workflow.rb
-- lib/attr/gather/workflow/async_task_executor.rb
 - lib/attr/gather/workflow/callable.rb
 - lib/attr/gather/workflow/dot_serializer.rb
 - lib/attr/gather/workflow/dsl.rb
 - lib/attr/gather/workflow/graphable.rb
 - lib/attr/gather/workflow/task.rb
-- lib/attr/gather/workflow/task_execution_result.rb
-- lib/attr/gather/workflow/task_executor.rb
 - lib/attr/gather/workflow/task_graph.rb
 homepage: https://github.com/ianks/attr-gather
 licenses:

data/lib/attr/gather/workflow/async_task_executor.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-require 'attr/gather/workflow/task_executor'
-
-module Attr
-  module Gather
-    module Workflow
-      # @api private
-      class AsyncTaskExecutor < TaskExecutor
-        def initialize(batch, container:)
-          super(batch, container: container)
-          @executor = :io
-        end
-      end
-    end
-  end
-end

data/lib/attr/gather/workflow/task_execution_result.rb

@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-module Attr
-  module Gather
-    module Workflow
-      # A wrapper containing information and results of a task execution
-      #
-      # @!attribute [r] started_at
-      #   @return [Time] time which the execution occured
-      #
-      # @!attribute [r] task
-      #   @return [Attr::Gather::Workflow::Task] task that was run
-      #
-      # @!attribute [r] result
-      #   @return [Concurrent::Promise] the result promise of the the task
-      #
-      # @api public
-      class TaskExecutionResult
-        include Concerns::Identifiable
-
-        attr_reader :task, :result, :started_at, :uuid
-
-        def initialize(task, result, started_at: Time.now, uuid: SecureRandom.uuid) # rubocop:disable Metrics/LineLength
-          @task = task
-          @result = result
-          @started_at = started_at
-          @uuid = uuid
-        end
-
-        # @!attribute [r] state
-        #   @return [:unscheduled, :pending, :processing, :rejected, :fulfilled]
-        def state
-          result.state
-        end
-
-        # Extracts the result, this is an unsafe operation that blocks the
-        # operation, and returns either the value or an exception.
-        #
-        # @note For more information, check out {https://ruby-concurrency.github.io/concurrent-ruby/1.1.5/Concurrent/Concern/Obligation.html#value!-instance_method}
-        def value!
-          result.value!
-        end
-
-        # Chain a new block result to be executed after resolution
-        #
-        # @return [TaskExecutionResult] the new task execution result
-        # @yield The block operation to be performed asynchronously.
-        def then(*args, &block)
-          new_result = result.then(*args, &block)
-          self.class.new(task, new_result, started_at: @started_at, uuid: @uuid)
-        end
-
-        # Catch an async exception when a failure occurs
-        #
-        # @return [TaskExecutionResult] the new task execution result
-        # @yield The block operation to be performed asynchronously.
-        def catch(*args, &block)
-          new_result = result.catch(*args, &block)
-          self.class.new(task, new_result, started_at: @started_at, uuid: @uuid)
-        end
-
-        # Executes a block after the result is fulfilled
-        # Represents the TaskExecutionResult as a hash
-        #
-        # @return [Hash]
-        def as_json
-          value = result.value
-
-          { started_at: started_at,
-            task: task.as_json,
-            state: state,
-            value: value }
-        end
-      end
-    end
-  end
-end

data/lib/attr/gather/workflow/task_executor.rb

@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-require 'concurrent'
-require 'attr/gather/workflow/task_execution_result'
-
-module Attr
-  module Gather
-    module Workflow
-      # @api private
-      class TaskExecutor
-        attr_reader :batch, :container, :executor
-
-        def initialize(batch, container:)
-          @batch = batch
-          @container = container
-          @executor = :immediate
-        end
-
-        def call(input)
-          batch.map do |task|
-            task_proc = container.resolve(task.name)
-            result = Concurrent::Promise.execute(executor: executor) do
-              task_proc.call(input)
-            end
-            TaskExecutionResult.new(task, result)
-          end
-        end
-      end
-    end
-  end
-end