easy_ml 0.2.0.pre.rc96 → 0.2.0.pre.rc98

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86ad2fdcb22b78a52793bcb4872563a52d7bac3b923d2fbccf990aa057e2955c
-  data.tar.gz: dd8f47b3f99edb720ad3255dfb0e8774a689dd5b780730a9dd01a0605f314e26
+  metadata.gz: 8c105c4f00c13b7654204ff04d2ffcec27657a4fd3386a7712fba6da90bd733a
+  data.tar.gz: 141dc35ad18183a64b73b9cebc57ecebdfc5e9855c9afa52a0270e904bfcc651
 SHA512:
-  metadata.gz: ca4fe8d77662e99558351d4b2fffe259097248ad5c3272c8e42d8e20643745e4e3ccfa717c4028918fc1b658ffb7cf79661d9fb359c772ec2c10c30e87959ed1
-  data.tar.gz: c9cb19869c2f804b0223679c493e4ed1c30d317c0b1e06c051a267c123e37cc40a16d48ea574459d0f54c3280d208f35c85fa5c4e89014c402a211401075e4cb
+  metadata.gz: 2412eed49dd5824d871037ee4806a7fdf970caf034d03a504ae1020fa3d71aa79a9fb544ed5208c65ca1f4bd7be05f5a60ffd57c17187d3986f64b1c2a0f0f4d
+  data.tar.gz: 5e2416e89e5855b1fddfee0072a0b750880fb4f7afbf47968d3e0e8f8e20e5eb95ced11ff05cd9df79473cbc6621006148b1965c2439477757aa78c1340e2415

data/app/models/easy_ml/concerns/versionable.rb

@@ -9,17 +9,17 @@ module EasyML
         def bump_version(force: false)
           return version if version.present? && !force
 
-          tz = ActiveSupport::TimeZone.new(EasyML::Configuration.timezone)
+          tz = ActiveSupport::TimeZone.new(EasyML::Support::UTC)
           orig_version = version
           prev_version = tz.parse(version.gsub(/_/, "")) if version
-          timestamp = Time.current.in_time_zone(EasyML::Configuration.timezone)
+          timestamp = Time.current.in_time_zone(EasyML::Support::UTC)
           timestamp = (prev_version + 1.second) if prev_version && compare_versions(timestamp, prev_version)
 
           self.version = timestamp.strftime(STRING_FORMAT)
         end
 
         def compare_versions(version1, version2)
-          tz = ActiveSupport::TimeZone.new(EasyML::Configuration.timezone)
+          tz = ActiveSupport::TimeZone.new(EasyML::Support::UTC)
           tz.parse(version1.strftime(STRING_FORMAT).gsub(/_/, "")) <= tz.parse(version2.strftime(STRING_FORMAT).gsub(/_/, ""))
         end
       end

data/app/models/easy_ml/dataset.rb

@@ -667,8 +667,6 @@ module EasyML
     end
 
     def upload_remote_files
-      return if !needs_refresh?
-
       processed.upload.tap do
         features.each(&:upload_remote_files)
         features.each(&:save)

data/app/models/easy_ml/deploy.rb

@@ -65,8 +65,14 @@ module EasyML
 
           EasyML::Deploy.transaction do
             update(model_history_id: self.model_version.id, snapshot_id: self.model_version.snapshot_id, status: :success)
-            model.retraining_runs.where(status: :deployed).update_all(status: :success)
-            retraining_run.update(model_history_id: self.model_version.id, snapshot_id: self.model_version.snapshot_id, deploy_id: id, status: :deployed,)
+            model.retraining_runs.where(status: :deployed).update_all(status: :success, is_deploying: false)
+            retraining_run.update(
+              model_history_id: self.model_version.id,
+              snapshot_id: self.model_version.snapshot_id,
+              deploy_id: id,
+              status: :deployed,
+              is_deploying: false
+            )
           end
 
           model_version.tap do

data/app/models/easy_ml/model.rb

@@ -267,7 +267,7 @@ module EasyML
 
     def formatted_version
       return nil unless version
-      UTC.parse(version).in_time_zone(EasyML::Configuration.timezone).strftime("%B %-d, %Y at %-l:%M %p")
+      EasyML::Support::UTC.parse(version.gsub(/_/, "")).in_time_zone(EasyML::Configuration.timezone).strftime("%B %-d, %Y at %-l:%M %p")
     end
 
     def last_run_at

data/app/models/easy_ml/model_file.rb

@@ -36,6 +36,10 @@ module EasyML
       )
     end
 
+    def s3_prefix
+      EasyML::Configuration.model_s3_path(model.name)
+    end
+
     def root_dir
       Pathname.new(model.root_dir)
     end

data/app/models/easy_ml/settings.rb

@@ -21,6 +21,16 @@ module EasyML
 
     validates :storage, inclusion: { in: %w[file s3] }, if: -> { storage.present? }
 
+    after_initialize :set_defaults, if: -> { new_record? }
+
+    def set_defaults
+      self.s3_prefix ||= "easy_ml"
+    end
+
+    def s3_prefix
+      read_attribute(:s3_prefix) || "easy_ml"
+    end
+
     TIMEZONES = [
       { value: "America/New_York", label: "Eastern Time" },
       { value: "America/Chicago", label: "Central Time" },

data/lib/easy_ml/configuration.rb

@@ -60,5 +60,17 @@ module EasyML
     def db_settings
       @db_settings ||= EasyML::Settings.first_or_create
     end
+
+    def self.s3_path_for(type, name)
+      File.join(instance.s3_prefix, type.to_s, name.to_s)
+    end
+
+    def self.model_s3_path(model_name)
+      s3_path_for("models", model_name.parameterize.gsub("-", "_"))
+    end
+
+    def self.dataset_s3_path(relative_path)
+      s3_path_for("datasets", relative_path)
+    end
   end
 end

data/lib/easy_ml/data/dataset_manager.rb

@@ -125,6 +125,10 @@ module EasyML
         synced_directory.download
       end
 
+      def remote_files
+        synced_directory.remote_files
+      end
+
       private
 
       def root

data/lib/easy_ml/data/splits/file_split.rb

@@ -46,7 +46,9 @@ module EasyML
         end
 
         def s3_prefix
-          File.join("datasets", dir.split("datasets").last)
+          EasyML::Configuration.dataset_s3_path(
+            dir.split("datasets").last
+          )
         end
 
         def synced_directory

data/lib/easy_ml/feature_store.rb

@@ -36,6 +36,19 @@ module EasyML
       )
     end
 
+    # Expose S3 information for testing and verification
+    def s3_prefix
+      EasyML::Configuration.dataset_s3_path(
+        File.join(feature_dir.split("datasets").last, "compacted")
+      )
+    end
+
+    def s3_key(filename = nil)
+      filename ||= File.basename(files.first) if files.any?
+      return nil unless filename
+      File.join(s3_prefix, filename)
+    end
+
     private
 
     def batch_size
@@ -49,9 +62,5 @@ module EasyML
         feature&.name&.parameterize&.gsub("-", "_")
       )
     end
-
-    def s3_prefix
-      File.join("datasets", feature_dir.split("datasets").last)
-    end
   end
 end

data/lib/easy_ml/support/synced_file.rb

@@ -52,6 +52,10 @@ module EasyML
         full_path
       end
 
+      def s3_key
+        s3_prefix.present? ? File.join(s3_prefix, filename) : filename
+      end
+
       def path
         File.join(root_dir, s3_prefix)
       end

data/lib/easy_ml/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module EasyML
-  VERSION = "0.2.0-rc96"
+  VERSION = "0.2.0-rc98"
 
   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.rc96
+  version: 0.2.0.pre.rc98
 platform: ruby
 authors:
 - Brett Shollenberger
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-06 00:00:00.000000000 Z
+date: 2025-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord