easy_ml 0.2.0.pre.rc95 → 0.2.0.pre.rc97

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c7bb2e3e683bfa64b859db712827e9c3f0253dfdbb0ca0ed1454a21c9eaced2
-  data.tar.gz: 7ed6cfa37a0723b2d2eeb7da2a98e5fa38608ac60e82536022949bcf6a4cf121
+  metadata.gz: a7de56b964119aa83ec62b64cf28fddc4f83ae3947d99a656643fe7355662ac5
+  data.tar.gz: fbdf0cdf54e96c128c37a5998cd2cf20135229e25320e1cce5b003defa448a52
 SHA512:
-  metadata.gz: 0125002301a9455366d06397b75b991ab39b32d35f26c5a6130e133be6148dc8229240d3a7202914376bf407481b301faac35c72bf3c979923b2544230c0a3b3
-  data.tar.gz: f4233cfb23f8638507af07ba8806837dd89c4e7ba4c9b67f4c21ed0b78ceaa5e44d10a2a263dc573a649d9cdd0cb60f59212a065973df8dee942322b71b80f31
+  metadata.gz: 202db609a33bdd29437450364bb945e4a51cfe18f6e6b075f343ec504489a88f254b90c5e14e87d0098c917d372a6adc1ad51800627acc08de57fbc4269fb375
+  data.tar.gz: fcb1ab6d584f6b55d68ffc5a4118807443d61e26dd85cd3968bcd57cec4aa1d1183c2703956f06f38bf549ec7ef705aecb094014149685a761d7b1e4766720ee

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

@@ -4,14 +4,23 @@ module EasyML
       extend ActiveSupport::Concern
 
       included do
+        STRING_FORMAT = "%Y_%m_%d_%H_%M_%S".freeze
+
         def bump_version(force: false)
           return version if version.present? && !force
 
-          prev_version = version
-          timestamp = Time.now.utc.strftime("%Y%m%d%H%M%S")
-          timestamp = (prev_version.to_i + 1).to_s if timestamp.to_i <= prev_version.to_i
+          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::Support::UTC)
+          timestamp = (prev_version + 1.second) if prev_version && compare_versions(timestamp, prev_version)
+
+          self.version = timestamp.strftime(STRING_FORMAT)
+        end
 
-          self.version = timestamp
+        def compare_versions(version1, version2)
+          tz = ActiveSupport::TimeZone.new(EasyML::Support::UTC)
+          tz.parse(version1.strftime(STRING_FORMAT).gsub(/_/, "")) <= tz.parse(version2.strftime(STRING_FORMAT).gsub(/_/, ""))
         end
       end
     end

data/app/models/easy_ml/dataset.rb

@@ -114,6 +114,10 @@ module EasyML
       write_attribute(:root_dir, value)
     end
 
+    def dir
+      root_dir
+    end
+    
     def set_root_dir
       bump_version
       write_attribute(:root_dir, default_root_dir)
@@ -211,12 +215,13 @@ module EasyML
     end
 
     def bump_versions(version)
+      original_version = self.version
       self.version = version
 
-      @raw = raw.cp(version)
-      @processed = processed.cp(version)
+      @raw = raw.cp(dir.gsub(original_version, version))
+      @processed = processed.cp(dir.gsub(original_version, version))
       save.tap do
-        features.each(&:bump_version)
+        features.each { |feature| feature.bump_version(original_version, version) }
         EasyML::Feature.import(features.to_a, on_duplicate_key_update: [:version])
       end
     end
@@ -750,7 +755,7 @@ module EasyML
         split_type.new(**args)
       when EasyML::Data::Splits::FileSplit.to_s
         split_type.new(**args.merge(
-                         dir: Pathname.new(root_dir).append("files/splits/#{type}").to_s,
+                         dir: Pathname.new(root_dir).join("files/splits/#{type}").to_s,
                        ))
       end
     end

data/app/models/easy_ml/feature.rb

@@ -433,9 +433,9 @@ module EasyML
       end
     end
 
-    def bump_version
-      feature_store.bump_version(version)
-      write_attribute(:version, version + 1)
+    def bump_version(original_version, version)
+      feature_store.bump_version(original_version, version)
+      write_attribute(:version, self.version + 1)
       self
     end
 

data/app/models/easy_ml/model.rb

@@ -203,6 +203,7 @@ module EasyML
 
     def unlock!
       Support::Lockable.unlock!(lock_key)
+      EasyML::Deploy.new(model: self).unlock!
     end
 
     def lock_model
@@ -266,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
@@ -558,6 +559,7 @@ module EasyML
       dataset.upload_remote_files
       model_snapshot = snapshot
 
+      Thread.current[:deploying] = true
       # Prepare the model to be retrained (reset values so they don't conflict with our snapshotted version)
       bump_version(force: true)
       dataset.bump_versions(version)

data/lib/easy_ml/feature_store.rb

@@ -1,9 +1,10 @@
 module EasyML
   class FeatureStore < EasyML::Data::DatasetManager
-    attr_reader :feature
+    attr_reader :feature, :dataset
 
     def initialize(feature)
       @feature = feature
+      @dataset = feature&.dataset
 
       datasource_config = feature&.dataset&.datasource&.configuration
       if datasource_config
@@ -27,11 +28,11 @@ module EasyML
       files.any?
     end
 
-    def bump_version(version)
+    def bump_version(original_version, version)
       compact
       cp(
-        feature_dir_for_version(version),
-        feature_dir_for_version(version + 1),
+        feature_dir.gsub(version, original_version),
+        feature_dir,
       )
     end
 
@@ -41,21 +42,14 @@ module EasyML
       @batch_size ||= feature.batch_size || 10_000
     end
 
-    def feature_dir_for_version(version)
+    def feature_dir
       File.join(
-        Rails.root,
-        "easy_ml/datasets",
-        feature&.dataset&.name&.parameterize&.gsub("-", "_"),
+        dataset.dir,
         "features",
-        feature&.name&.parameterize&.gsub("-", "_"),
-        version.to_s
+        feature&.name&.parameterize&.gsub("-", "_")
       )
     end
 
-    def feature_dir
-      feature_dir_for_version(feature.version)
-    end
-
     def s3_prefix
       File.join("datasets", feature_dir.split("datasets").last)
     end

data/lib/easy_ml/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: easy_ml
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre.rc95
+  version: 0.2.0.pre.rc97
 platform: ruby
 authors:
 - Brett Shollenberger