easy_ml 0.2.0.pre.rc63 → 0.2.0.pre.rc65

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 30ec865849f66547055d1835ccc18753308d9a6cd3c8a5862a01a20151b2e772
-  data.tar.gz: df9c0eee094ea607370bd84f97f2f269919e08e07fac1a4e0a17f96bc0286093
+  metadata.gz: d6993d639004ee88981816cf11422f458d2fa5caa121e760d075c7a73ae70195
+  data.tar.gz: 0e60804c7d59f8c3402be88b6b6ae5e24a7c9542875cbc29f606bbd500227b1f
 SHA512:
-  metadata.gz: 6241d23ced8da76c9ca7e6789bfeccc75824b9e217fa01850f6ab6475ee77716b222d4c0661e965d69de8b95d9719d15ed67a2f1835c359ca3d186d193058b2c
-  data.tar.gz: a92fdc6934bf28d0f6a18f5356d8ac76f5ee0195f96fbed9110dc1862c976922ec7e1141b65e7050d80c1b63e5a90e7a5903147f9001167e7e12e7c553e9339c
+  metadata.gz: b11150da87d6dafb5d0a71f0c9b8391012a388ba51eb17544dca044d8616b2d9898fa65ef37e7c8cb22f627669e648b23edc37f6582f5aa40d4619228c57ed02
+  data.tar.gz: 7fd29a43e9a2a15b3388e2c592fe5772d15e394103d7c0651fbe0404abd7bd8637e8ff32f3c38cac4220ce815ab49f369c5767d00dab0cd5ed060a924d3fa8bb

data/app/jobs/easy_ml/batch_job.rb

@@ -40,14 +40,23 @@ module EasyML
           Resque.redis.rpush("batch:#{parent_id}:remaining", batch.to_json)
         end
 
-        enqueue_batch(batch)
+        handle_batch(parent_id, batch)
+      end
+
+      def handle_batch(parent_id, batch)
+        if batch.size > 1
+          enqueue_batch(batch)
+        else
+          run_one_batch(parent_id, batch.first)
+          after_batch_hook(parent_id, batch)
+        end
       end
 
       def enqueue_next_batch(caller, parent_id)
         next_batch = Resque.redis.lpop("batch:#{parent_id}:remaining")
         payload = Resque.decode(next_batch)
 
-        caller.enqueue_batch(payload)
+        caller.handle_batch(parent_id, payload)
       end
 
       def next_batch?(parent_id)

data/app/jobs/easy_ml/compute_feature_job.rb

@@ -4,20 +4,18 @@ module EasyML
 
     @queue = :easy_ml
 
-    def self.perform(batch_id, options = {})
+    def self.perform(batch_id, batch_args = {})
       begin
-        options.symbolize_keys!
-        feature_id = options.dig(:feature_id)
-        feature = EasyML::Feature.find(feature_id)
-        dataset = feature.dataset
-
-        # Check if any feature has failed before proceeding
-        if dataset.features.any? { |f| f.workflow_status == "failed" }
-          return
-        end
-
-        feature.update(workflow_status: :analyzing) if feature.workflow_status == :ready
-        feature.fit_batch(options.merge!(batch_id: batch_id))
+        # This is very, very, very, very, very important
+        # if you don't dup the batch_args, resque-batched-job will
+        # fail in some non-obvious ways, because it will try to
+        # decode to match the original batch args EXACTLY.
+        #
+        # This will waste your time so please just don't remove this .dup!!!
+        #
+        # https://github.com/drfeelngood/resque-batched-job/blob/master/lib/resque/plugins/batched_job.rb#L86
+        batch_args = batch_args.dup
+        run_one_batch(batch_id, batch_args)
       rescue => e
         EasyML::Feature.transaction do
           return if dataset.reload.workflow_status == :failed
@@ -29,6 +27,10 @@ module EasyML
       end
     end
 
+    def self.run_one_batch(batch_id, batch_args)
+      EasyML::Feature.fit_one_batch(batch_id, batch_args)
+    end
+
     def self.build_error_with_context(dataset, error, batch_id, feature)
       error = EasyML::Event.handle_error(dataset, error)
       batch = feature.build_batch(batch_id: batch_id)

data/app/jobs/easy_ml/refresh_dataset_job.rb

@@ -16,14 +16,14 @@ module EasyML
         if dataset.features.needs_fit.any?
           dataset.fit_features(async: true)
         else
-          dataset.actually_refresh
+          dataset.after_fit_features
         end
       rescue StandardError => e
         if Rails.env.test?
           raise e
         end
         dataset.update(workflow_status: :failed)
-        handle_error(dataset, e)
+        EasyML::Event.handle_error(dataset, e)
       end
     end
   end

data/app/models/easy_ml/column/imputers/imputer.rb

@@ -8,7 +8,6 @@ module EasyML
           @column = column
           @dataset = column.dataset
           @preprocessing_step = preprocessing_step.with_indifferent_access
-          validate_preprocessing_step!
         end
 
         def inspect
@@ -72,31 +71,6 @@ module EasyML
 
           EasyML::Column::Imputers::OrdinalEncoder.new(column, preprocessing_step).decode_labels(df)
         end
-
-        private
-
-        def validate_preprocessing_step!
-          validate_params!
-          validate_method!
-        end
-
-        def validate_params!
-          return unless preprocessing_step[:params]
-
-          preprocessing_step[:params].keys.each do |param|
-            unless Imputers.supported_params.include?(param.to_sym)
-              raise ArgumentError, "Unsupported preprocessing parameter '#{param}'. Supported parameters are: #{Imputers.supported_params.join(", ")}"
-            end
-          end
-        end
-
-        def validate_method!
-          return unless preprocessing_step[:method]
-
-          unless Imputers.supported_methods.include?(preprocessing_step[:method].to_sym)
-            raise ArgumentError, "Unsupported preprocessing method '#{preprocessing_step[:method]}'. Supported methods are: #{Imputers.supported_methods.join(", ")}"
-          end
-        end
       end
     end
   end

data/app/models/easy_ml/column/selector.rb

@@ -45,7 +45,7 @@ module EasyML
       end
 
       def data(**kwargs)
-        if column.is_computed?
+        if column.is_computed? && !column.in_raw_dataset?
           Selector.new(column, :processed).send(:select, :data, **kwargs)
         else
           select(:data, **kwargs)

data/app/models/easy_ml/column.rb

@@ -206,9 +206,10 @@ module EasyML
 
     def raw_dtype
       return @raw_dtype if @raw_dtype
+      set_feature_lineage
 
       if in_raw_dataset?
-        @raw_dtype = raw&.data&.to_series&.dtype
+        @raw_dtype = raw&.data&.to_series.try(:dtype)
       elsif already_computed?
         @raw_dtype = processed&.data&.to_series&.dtype
       end

data/app/models/easy_ml/dataset.rb

@@ -202,7 +202,6 @@ module EasyML
         prepare!
         fit_features!(async: async)
       end
-      after_fit_features unless async
     end
 
     def refresh(async: false)
@@ -212,7 +211,6 @@ module EasyML
         prepare
         fit_features(async: async)
       end
-      after_fit_features unless async
     end
 
     def fit_features!(async: false, features: self.features)
@@ -227,11 +225,11 @@ module EasyML
     end
 
     def after_fit_features
+      puts "AFTER FIT FEATURES!"
       unlock!
       reload
       return if failed?
 
-      features.update_all(needs_fit: false, fit_at: Time.current)
       actually_refresh
     end
 

data/app/models/easy_ml/feature.rb

@@ -232,13 +232,41 @@ module EasyML
       if async && job_count > 1
         EasyML::ComputeFeatureJob.enqueue_ordered_batches(jobs)
       else
-        jobs.flatten.each do |job|
-          EasyML::ComputeFeatureJob.perform(nil, job)
+        jobs.each do |feature_batch|
+          feature_batch.each do |batch_args|
+            EasyML::ComputeFeatureJob.perform(nil, batch_args)
+          end
+          feature = EasyML::Feature.find(feature_batch.first.dig(:feature_id))
+          feature.after_fit
         end
-        features.each(&:after_fit) unless features.any?(&:failed?)
+        dataset.after_fit_features
       end
     end
 
+    def self.fit_one_batch(batch_id, batch_args = {})
+      batch_args.symbolize_keys!
+      feature_id = batch_args.dig(:feature_id)
+      feature = EasyML::Feature.find(feature_id)
+      dataset = feature.dataset
+
+      # Check if any feature has failed before proceeding
+      if dataset.features.any? { |f| f.workflow_status == "failed" }
+        return
+      end
+      feature.update(workflow_status: :analyzing) if feature.workflow_status == :ready
+      begin
+        feature.fit_batch(batch_args.merge!(batch_id: batch_id))
+      rescue => e
+        EasyML::Feature.fit_feature_failed(dataset, e)
+        raise e
+      end
+    end
+
+    def self.fit_feature_failed(dataset, e)
+      dataset.update(workflow_status: :failed)
+      EasyML::Event.handle_error(dataset, e)
+    end
+
     # Fit a single batch, used for testing the user's feature implementation
     def fit_batch(batch_args = {})
       batch_args.symbolize_keys!
@@ -301,7 +329,11 @@ module EasyML
       end
       return if df.blank?
 
-      batch_df = adapter.fit(df, self, batch_args)
+      begin
+        batch_df = adapter.fit(df, self, batch_args)
+      rescue => e
+        raise "Feature #{feature_class}#fit failed: #{e.message}"
+      end
       if batch_df.present?
         store(batch_df)
       else
@@ -315,7 +347,11 @@ module EasyML
       return df if !adapter.respond_to?(:transform) && feature_store.empty?
 
       df_len_was = df.shape[0]
-      result = adapter.transform(df, self)
+      begin
+        result = adapter.transform(df, self)
+      rescue => e
+        raise "Feature #{feature_class}#transform failed: #{e.message}"
+      end
       raise "Feature '#{name}' must return a Polars::DataFrame, got #{result.class}" unless result.is_a?(Polars::DataFrame)
       df_len_now = result.shape[0]
       raise "Feature #{feature_class}#transform: output size must match input size! Input size: #{df_len_now}, output size: #{df_len_was}." if df_len_now != df_len_was
@@ -412,7 +448,7 @@ module EasyML
 
     def after_fit
       updates = {
-        applied_at: Time.current,
+        fit_at: Time.current,
         needs_fit: false,
         workflow_status: :ready,
       }.compact

data/lib/easy_ml/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module EasyML
-  VERSION = "0.2.0-rc63"
+  VERSION = "0.2.0-rc65"
 
   module Version
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: easy_ml
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre.rc63
+  version: 0.2.0.pre.rc65
 platform: ruby
 authors:
 - Brett Shollenberger
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-02-06 00:00:00.000000000 Z
+date: 2025-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord