easy_ml 0.2.0.pre.rc21 → 0.2.0.pre.rc23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f0de4170b55d8d6e28cc09ac68421cbee2f0c441e6fb89e86207620fef642ee3
-  data.tar.gz: 86e5b583cc202827bc3d2d9ea89fd4dd13f1d95f729ad5ae8d43936a66fe1a2f
+  metadata.gz: 685c66332f22f73eae21f3a3f7b41e4b20bbf80a62d399c3e48bfbd3308b2eba
+  data.tar.gz: f3c41802ceb906d5f050097c72608aea21d1c6a8cc37a501ba3fdafb00be9dae
 SHA512:
-  metadata.gz: 1d066503c36f9daee59ad93a89b6f35ff6c211602181030036edc31b7ece52276fd252a7a85b549263a180f4ec85f86a04e498440f217b6431d8da0225d9de0e
-  data.tar.gz: c9c69540e6fbbedd688517226cffc757938933317952f9318189200a259dbc5b0963de6dfaa330741ea50387d290980176837f78ea80de04ea5e76b8d8f1c794
+  metadata.gz: 0f69d5c2e1dfcfa7f3ffebe7587122107905f3f14dcf78abb1f2ed751c08064c83cf53bf04f11abe4de41d724f1746ec0912051b7c31eb232a1b976f4d5051ce
+  data.tar.gz: 97ea5c0b4e6fe51843953bbcc56fef71f4ee436db8bad7c340158109193cb212f9a4689008dc195f626f1fa1047d2f3b29a24c3513be2af7ae17ab0b2222b777

data/app/controllers/easy_ml/application_controller.rb

@@ -44,7 +44,8 @@ module EasyML
     end
 
     def easy_ml_root
-      Rails.application.routes.routes.find { |r| r.app.app == EasyML::Engine }&.path&.spec&.to_s
+      path = Rails.application.routes.routes.find { |r| r.app.app == EasyML::Engine }&.path&.spec&.to_s
+      URI.join("#{request.scheme}://#{request.host_with_port}", path).to_s
     end
 
     inertia_share do

data/app/controllers/easy_ml/datasources_controller.rb

@@ -69,12 +69,15 @@ module EasyML
       datasource = Datasource.find(params[:id])
       datasource.update(is_syncing: true)
 
+      Rails.logger.info("X-Forwarded-Host: #{request.headers["X-Forwarded-Host"]}")
+      Rails.logger.info("X-Forwarded-Port: #{request.headers["X-Forwarded-Port"]}")
+
       # Start sync in background to avoid blocking
       datasource.refresh_async
 
-      redirect_to easy_ml_datasources_path(host: request.host), notice: "Datasource is syncing..."
+      redirect_to easy_ml_datasources_path, notice: "Datasource is syncing..."
     rescue ActiveRecord::RecordNotFound
-      redirect_to easy_ml_datasources_path(host: request.host), error: "Datasource not found..."
+      redirect_to easy_ml_datasources_path, error: "Datasource not found..."
     end
 
     private

data/app/models/easy_ml/dataset.rb

@@ -93,12 +93,22 @@ module EasyML
     end
 
     def set_root_dir
-      write_attribute(:root_dir, root_dir)
+      bump_version
+      write_attribute(:root_dir, default_root_dir)
+    end
+
+    def default_root_dir
+      File.join("datasets", underscored_name, version).to_s
     end
 
     def root_dir
-      bump_version
-      EasyML::Engine.root_dir.join("datasets").join(underscored_name).join(version).to_s
+      persisted = read_attribute(:root_dir)
+
+      if persisted.present? && !persisted.blank?
+        EasyML::Engine.root_dir.join(persisted).to_s
+      else
+        default_root_dir
+      end
     end
 
     def destructively_cleanup!

data/app/models/easy_ml/datasource.rb

@@ -89,9 +89,12 @@ module EasyML
 
     def root_dir
       persisted = read_attribute(:root_dir)
-      return persisted if persisted.present? && !persisted.to_s.blank?
 
-      default_root_dir
+      if persisted.present? && !persisted.blank?
+        EasyML::Engine.root_dir.join(persisted).to_s
+      else
+        default_root_dir
+      end
     end
 
     def refresh_async
@@ -156,7 +159,7 @@ module EasyML
 
     def default_root_dir
       folder = name.gsub(/\s{2,}/, " ").split(" ").join("_").downcase
-      EasyML::Engine.root_dir.join("datasources").join(folder)
+      File.join("datasources", folder)
     end
 
     def set_root_dir

data/app/models/easy_ml/model.rb

@@ -484,11 +484,21 @@ module EasyML
     end
 
     def set_root_dir
-      write_attribute(:root_dir, root_dir)
+      write_attribute(:root_dir, default_root_dir)
     end
 
     def root_dir
-      EasyML::Engine.root_dir.join("models").join(underscored_name).to_s
+      persisted = read_attribute(:root_dir)
+
+      if persisted.present? && !persisted.blank?
+        EasyML::Engine.root_dir.join(persisted).to_s
+      else
+        default_root_dir
+      end
+    end
+
+    def default_root_dir
+      File.join("models", underscored_name).to_s
     end
 
     def load_model(force: false)

data/lib/easy_ml/version.rb

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