easy_ml 0.2.0.pre.rc94 → 0.2.0.pre.rc96

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 054ef06f827068239a9fd2c28ecaafe2a606c6eeb52271319777580a23cc131a
-  data.tar.gz: 3b93ecb131ca07fdc06a2495cf72159bb7c72871c75e294f8c544165d1b1d2dc
+  metadata.gz: 86ad2fdcb22b78a52793bcb4872563a52d7bac3b923d2fbccf990aa057e2955c
+  data.tar.gz: dd8f47b3f99edb720ad3255dfb0e8774a689dd5b780730a9dd01a0605f314e26
 SHA512:
-  metadata.gz: 8257f161fa333b4b7c76e1d3aa3c5c87399378d0316c7b25ac0576d9c37e77367bc4fdd5942696f3dbbd7a4607eaecd98c202be651916b966e4186a69f3e7cc4
-  data.tar.gz: 12f4a33cb003cc8a0cd504f3d328819ed3007d95aa0f3c8719a17ba3ae291b96ce1c2dc9384d043e7c8e8abf84dd2c6da98e824b058fb04213832b67c331e1b4
+  metadata.gz: ca4fe8d77662e99558351d4b2fffe259097248ad5c3272c8e42d8e20643745e4e3ccfa717c4028918fc1b658ffb7cf79661d9fb359c772ec2c10c30e87959ed1
+  data.tar.gz: c9cb19869c2f804b0223679c493e4ed1c30d317c0b1e06c051a267c123e37cc40a16d48ea574459d0f54c3280d208f35c85fa5c4e89014c402a211401075e4cb

data/app/frontend/pages/SettingsPage.tsx

@@ -1,7 +1,7 @@
 import React, { useState } from 'react';
 import { usePage } from '@inertiajs/react'
 import { useInertiaForm } from 'use-inertia-form';
-import { Settings2, Save, AlertCircle, Key, Globe2, Database } from 'lucide-react';
+import { Settings2, Save, AlertCircle, Key, Globe2, Database, GitBranch } from 'lucide-react';
 import { PluginSettings } from '../components/settings/PluginSettings';
 
 interface Settings {
@@ -9,6 +9,8 @@ interface Settings {
     timezone: string;
     s3_bucket: string;
     s3_region: string;
+    git_sha: string;
+    version: string;
   }
 }
 
@@ -156,6 +158,31 @@ export default function SettingsPage({ settings: initialSettings }: { settings:
             </div>
           </div>
 
+          {/* Deployment Information */}
+          <div className="space-y-4">
+            <div className="flex items-center gap-2 mb-4">
+              <GitBranch className="w-5 h-5 text-gray-500" />
+              <h3 className="text-lg font-medium text-gray-900">Deployment Information</h3>
+            </div>
+
+            <div className="bg-gray-50 rounded-lg p-4">
+              <div className="space-y-1">
+                <div className="flex items-center gap-2">
+                  <span className="text-sm font-medium text-gray-700">Git SHA</span>
+                  <span className="text-sm font-mono bg-gray-100 px-2 py-1 rounded text-gray-600">
+                    {initialSettings?.settings?.git_sha || 'Not available'}
+                  </span>
+                </div>
+                <div className="flex items-center gap-2">
+                  <span className="text-sm font-medium text-gray-700">EasyML Version</span>
+                  <span className="text-sm font-mono bg-gray-100 px-2 py-1 rounded text-gray-600">
+                    {initialSettings?.settings?.version || 'Not available'}
+                  </span>
+                </div>
+              </div>
+            </div>
+          </div>
+
           <div className="pt-6 border-t flex items-center justify-between">
             {saved && (
               <div className="flex items-center gap-2 text-green-600">

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::Configuration.timezone)
+          orig_version = version
+          prev_version = tz.parse(version.gsub(/_/, "")) if version
+          timestamp = Time.current.in_time_zone(EasyML::Configuration.timezone)
+          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::Configuration.timezone)
+          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
@@ -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/app/serializers/easy_ml/settings_serializer.rb

@@ -5,5 +5,23 @@ module EasyML
     include JSONAPI::Serializer
 
     attributes *EasyML::Settings.configuration_attributes
+
+    attribute :version do |object|
+      EasyML::VERSION
+    end
+
+    attribute :git_sha do |object|
+      # Get git SHA of the main app
+      if Rails.root.join('.git').exist?
+        sha = `cd #{Rails.root} && git rev-parse HEAD`.strip
+        sha.presence || "Git SHA unavailable"
+      elsif ENV["GIT_REVISION"]
+        ENV["GIT_REVISION"]
+      else
+        "Not a git repository"
+      end
+    rescue
+      "Error determining git SHA"
+    end
   end
 end

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-rc94"
+  VERSION = "0.2.0-rc96"
 
   module Version
   end

data/public/easy_ml/assets/.vite/manifest.json

@@ -1,6 +1,6 @@
 {
   "entrypoints/Application.tsx": {
-    "file": "assets/entrypoints/Application.tsx-KENNRQpC.js",
+    "file": "assets/entrypoints/Application.tsx-BXwsBCuQ.js",
     "name": "entrypoints/Application.tsx",
     "src": "entrypoints/Application.tsx",
     "isEntry": true,