inst_data_shipper 0.2.4 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2f09c00768c10bfc79fb35c689131740739a8889c81ee02186f4bd9e70b446b
-  data.tar.gz: 9550a780011a5fa988fff785429a637175a16634911186e7bb7625e80ac09141
+  metadata.gz: 9374e4353fc38c211cd8d7565b271f9a1543c8e6165d1716cffa93f0704d974b
+  data.tar.gz: de10a934800be0a8560fd241341da120e7b453cff3d7806664e7e8260c0ef33d
 SHA512:
-  metadata.gz: f5f4fd607175698b654476ed4ef50d600be06b380071469e9fda824433d3d7014bacbecc53cb25238a5ade8d1ce5b302192bc7aa8f48c922e0ae029b56d4fcac
-  data.tar.gz: 6d069aa519374716b5690ba2428f6f4ec2000ae36b716921e36aab9160d126dc53a4db1f8d7614d97d82849d62138d7464ffd4f719c39ee226f7becad7b50514
+  metadata.gz: 4b0599be4475101ea1ad5e5c5db90134628cdbf1e60e3b440a1f9f4fa90023da5da31c39d868f3fb431a9037f4a25159f0e283e253888da9432153db1b838edf
+  data.tar.gz: a8be277a20e03c4363f3a527dd0aa382252e330d73bdcb02f58a9c032f69b5cf19279c316d5fd5712e0570f71da9306b38d103af431a04b6aa38d7915155819d

data/lib/inst_data_shipper/data_sources/canvas_reports.rb

@@ -28,7 +28,7 @@ module InstDataShipper
       end
 
       def import_canvas_report_by_terms(*args, **kwargs)
-        _in_canvas_report_pool(:_import_canvas_report_by_terms, *args, **kwargs)
+        delayed(:_import_canvas_report_by_terms, *args, **kwargs)
       end
 
       def import_existing_report(report, **kwargs)
@@ -87,7 +87,7 @@ module InstDataShipper
           },
           on_failure: {
             job: Jobs::AsyncCaller,
-            args: [origin_class, :_handle_failed_canvas_report, report_name, kwargs],
+            args: [origin_class, :_handle_failed_canvas_report, report_name, { **kwargs, params: }],
             kwargs: { retry_count: retry_count },
           },
           status_key: :status,
@@ -96,8 +96,7 @@ module InstDataShipper
       end
 
       def _in_canvas_report_pool(mthd, *args, **kwargs)
-        pool = CanvasSync::JobBatches::Pool.from_pid(batch_context[:report_processor_pool])
-        Jobs::AsyncCaller.call_from_pool(pool, self.class, mthd, *args, **kwargs)
+        call_in_pool(batch_context[:report_processor_pool], mthd, *args, **kwargs)
       end
 
       def _process_canvas_report(report:, schema_name: nil)
@@ -171,6 +170,8 @@ module InstDataShipper
       end
 
       def _handle_failed_canvas_report(report_name, kwargs, retry_count:, report:)
+        return if report.dig("parameters", "extra_text")&.include?("Failed, the report failed to generate a file")
+
         if retry_count.positive?
           tbid = batch_context[:report_bid] || batch_context[:root_bid]
           Sidekiq::Batch.new(tbid).jobs do

data/lib/inst_data_shipper/dumper.rb

@@ -308,6 +308,11 @@ module InstDataShipper
       Jobs::AsyncCaller.perform_later(self.class.to_s, mthd.to_s, *args, **kwargs)
     end
 
+    def call_in_pool(pool, mthd, *args, **kwargs)
+      pool = CanvasSync::JobBatches::Pool.from_pid(pool) if pool.is_a?(String)
+      Jobs::AsyncCaller.call_from_pool(pool, self.class, mthd, *args, **kwargs)
+    end
+
     delegate :working_dir, to: :executor
 
     def batch

data/lib/inst_data_shipper/version.rb

@@ -1,3 +1,3 @@
 module InstDataShipper
-  VERSION = "0.2.4".freeze
+  VERSION = "0.2.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inst_data_shipper
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.6
 platform: ruby
 authors:
 - Instructure CustomDev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-10-02 00:00:00.000000000 Z
+date: 2024-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails