kithe 2.9.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 981fc65d0f244c001b3fe4e769ad3ba8cbba9b94c5a41ababeab9bd1ee8c547e
-  data.tar.gz: 9afd39007cc0e3e707b6b23454e116104cf313b2875ad86835c7bd8702e5e1e0
+  metadata.gz: 2442db92e7c22e24d345483d17020d6025c42e4b24b9fe2dbdf0d9ad8625309e
+  data.tar.gz: 8d15649504ce721fd2c8b5ee1dc8a7f64b9486e64e3f4f3b5a983ce8d295e5ed
 SHA512:
-  metadata.gz: 545afe321bfb8261b6b9c8f50414ff32df6128644d0d7b96c7096699fdcde8aa092578f6e229513c4444d33bbcc5300c1f83432d7e3ce130415ee53e3f3ff29a
-  data.tar.gz: 89dda8bb1a56bd11a9817ad74c1c8bf0cb1098079ea8cac5cdeeeac1856760566cf9d66f7060deeb5638a91e00799d0bcef36dd9e71b50b6a56bcbb840db6c06
+  metadata.gz: 788253f8998adb2a6cd1799b4b124d7e301737477a002c6541f7de5b33f8c6744b818d8aee40de67e3eea316ca6be3411f28a6a2c1951a2ca921416e810cfc45
+  data.tar.gz: dac26e54710bef716c27833bf822763fc54f784a009835ee43d71fe7e39e63f315cce90dbd6b9a34af54e7ec5ab604b9bf9d749a5450bb94fdc4ebbcdcc4cbf6

data/app/jobs/kithe/create_derivatives_job.rb

@@ -1,7 +1,23 @@
 module Kithe
+  # Create derivatives in a bg job.
+  #
+  # Used as part of kithe standard ingest flow, to create all derivatives in bg job for new
+  # ingest
+  #
+  # Can also be used explicitly, with args, to create only certain derivs, optionally lazily
+  #
+  # @example
+  #
+  #   CreateDerivativesJob.new(asset).perform_later
+  #
+  #   CreateDerivativesJob.new(asset, lazy: true).perform_later
+  #
+  #   CreateDerivativesJob.new(asset, only: :some_deriv, lazy: true).perform_later
+  #
+  #   CreateDerivativesJob.new(asset, except: :other_deriv, lazy: true).perform_later
   class CreateDerivativesJob < Job
-    def perform(asset)
-        asset.create_derivatives
+    def perform(asset, lazy: false, only: nil, except: nil)
+        asset.create_derivatives(lazy: lazy, only: only, except: except)
     end
     # This error typically occurs when several large assets, whose derivatives
     # take a long time to generate, are deleted immediately after ingest.

data/app/models/kithe/asset.rb

@@ -114,8 +114,8 @@ class Kithe::Asset < Kithe::Model
   end
 
   # just a convenience for kithe remove_persisted_derivatives
-  def remove_derivatives(*keys)
-    file_attacher.remove_persisted_derivatives(*keys)
+  def remove_derivatives(*keys, **options)
+    file_attacher.remove_persisted_derivatives(*keys, **options)
   end
 
   # Runs the shrine promotion step, that we normally have in backgrounding, manually

data/lib/kithe/version.rb

@@ -1,3 +1,3 @@
 module Kithe
-  VERSION = '2.9.0'
+  VERSION = '2.10.0'
 end

data/lib/tasks/kithe_tasks.rake

@@ -12,6 +12,7 @@ namespace :kithe do
       opts.on("--lazy", "Lazy create") { options[:lazy] = true }
       opts.on("--asset-id=FRIENDLIER_IDS", "comma-seperated list of asset (friendlier) ids") { |ids| options[:asset_ids] = ids.split(",") }
       opts.on("--work-id=FRIENDLIER_IDS", "comma-seperated list of work (friendlier) ids") { |ids| options[:work_ids] = ids.split(",") }
+      opts.on("--bg[=QUEUE_NAME]", "queue up ActiveJob per asset to create, with optional queue name") { |queue| options[:bg] = queue || true}
     end.tap do |parser|
       parser.parse!(parser.order(ARGV) {})
     end
@@ -27,10 +28,25 @@ namespace :kithe do
     scope.find_each do |asset|
       begin
         progress_bar.title = asset.friendlier_id
-        asset.create_derivatives(
-          only: options[:derivative_keys],
-          lazy: !!options[:lazy]
-        )
+
+        if options[:bg]
+          job_scope = Kithe::CreateDerivativesJob
+
+          if options[:bg].kind_of?(String)
+            job_scope = job_scope.set(queue: options[:bg])
+          end
+
+          job_scope.perform_later(
+            asset,
+            only: options[:derivative_keys],
+            lazy: !!options[:lazy]
+          )
+        else
+          asset.create_derivatives(
+            only: options[:derivative_keys],
+            lazy: !!options[:lazy]
+          )
+        end
       rescue Shrine::FileNotFound => e
         progress_bar.log("original missing for #{asset.friendlier_id}")
         # it's cool, skip it

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kithe
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Jonathan Rochkind
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-27 00:00:00.000000000 Z
+date: 2023-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails