easy_ml 0.2.0.pre.rc85 → 0.2.0.pre.rc89

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53104f4ab5d52062d772983a09a1d31aecd524a7780b7104538327a346faab5e
-  data.tar.gz: 023a0bf486a12c23e6a8724ae329e49849e8168ad647a4557d3d3ef2adec1a47
+  metadata.gz: a0eb5ce84bdd93da3ea53e97f1b1ceab81a529a9bb076596f4edf7e49349eadf
+  data.tar.gz: 5262f39ff5a1236729d28a8fa6715d1b12e6dd5b4319225a6df512493872bba0
 SHA512:
-  metadata.gz: fb9e184aea0eff595d296285e5a66a9ad4778a8e48b6a64f39b5628ff92cdd440d06953d6a5dbf63b6b0ca312db6edef717e57fcd2f12fcbea63caaaa586eb67
-  data.tar.gz: b379bca69fc1817ec29da1f56df6a0c6e121b443849b1d4f6032b14ec86805dd50f629a84989bd0c80bdba691c0d9f51cdf4d80dc69e5bba71502281a840d96c
+  metadata.gz: 8e8094ed3309b80e0ee70543667e7af982e0805ba6fe81a62ad2f46297eae4487440a4e6ffdca75f32ef045ef8b25440a8396032cf00f9fd6c191d63fc8c0386
+  data.tar.gz: 97d057eb4ffa2acdb319a52de427cc3f3e7c42db8de349d063b36cd91479c68eca10ec150689d11070f0d20f24b620c0ce7a77f3e335420dd8c73612d706d1a0

data/app/controllers/easy_ml/datasets_controller.rb

@@ -73,7 +73,23 @@ module EasyML
 
       # Iterate over columns to check and update preprocessing_steps
       dataset_params[:columns_attributes]&.each do |_, column_attrs|
-        column_attrs[:preprocessing_steps] = nil if column_attrs.dig(:preprocessing_steps, :training, :method) == "none"
+        if column_attrs.dig(:preprocessing_steps, :training, :method) == "none"
+          column_attrs[:preprocessing_steps] = nil
+        elsif column_attrs.dig(:preprocessing_steps, :training)
+          # Ensure encoding is properly set for categorical columns
+          training_config = column_attrs.dig(:preprocessing_steps, :training)
+          if training_config[:params]
+            # Remove old encoding params as they're now part of the encoding field
+            training_config[:params].delete(:one_hot)
+            training_config[:params].delete(:ordinal_encoding)
+          end
+
+          # Ensure embedding params are present when encoding is embedding
+          if training_config[:encoding] == "embedding" && training_config[:params]
+            training_config[:params][:llm] ||= "openai"
+            training_config[:params][:model] ||= "text-embedding-3-small"
+          end
+        end
       end
 
       # Handle feature ID assignment for existing features
@@ -165,7 +181,7 @@ module EasyML
     private
 
     def preprocessing_params
-      [:method, { params: [:constant, :categorical_min, :one_hot, :ordinal_encoding, { clip: %i[min max] }] }]
+      [:method, :encoding, { params: [:constant, :categorical_min, :llm, :model, :preset, :dimensions, { clip: %i[min max] }] }]
     end
 
     def dataset_params

data/app/controllers/easy_ml/predictions_controller.rb

@@ -22,8 +22,16 @@ module EasyML
         return render json: { error: "Missing required fields: #{fields}" }, status: :not_found
       end
 
-      prediction = EasyML::Predict.predict(slug, input)
+      type = (params[:type] || :predict).to_sym
+      allowed_types = [:predict, :predict_proba]
+      unless allowed_types.include?(type)
+        return render json: { error: "Invalid type: #{type}" }, status: :not_found
+      end
+
+      prediction = EasyML::Predict.send(type, slug, input)
 
+      render json: { prediction: EasyML::PredictionSerializer.new(prediction).serializable_hash.dig(:data, :attributes) }, status: :ok
+    rescue ActiveRecord::RecordNotFound
       render json: { prediction: EasyML::PredictionSerializer.new(prediction).serializable_hash.dig(:data, :attributes) }, status: :ok
     rescue ActiveRecord::RecordNotFound
       render json: { error: "Model not found" }, status: :not_found