sage-rails 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cb2c81d99ac3d6dcaa9640c0b5c9b3d15612d60d089aad3c7ee889b9b6ca9d09
-  data.tar.gz: 4315483545ae23e66765121fa02a14d6259e98016a934d7e4953e67abfc1bb80
+  metadata.gz: f84a14a8dc13d5bca60926490250937bc5b52ae4f77c6962e328cbb28a5635a1
+  data.tar.gz: 59d079bb38465f75b165ed44d63b3cfd9d1f8d52a56fdb5c78feba7cdf987237
 SHA512:
-  metadata.gz: 2d4f2a8b7e31ab1a692a26c0a72f29e8c56e526d578170533999c307bb7769ab9142ccc9fab544700bda31e4ed38ea635f3b7e3d321db3d31cad24361a9f6e80
-  data.tar.gz: 6b0c40cd4407780316c5b955ce45d8738b7f378a5013adbec3e97e938762be95c1d4f75079c91a88c3a7441ab3ad701933b76f8985723c5a29fa6f99895816ff
+  metadata.gz: 71fe7deb5b559a26703f21a3f81f998a4e32a521c91c37e2f69b01957cd39266e098ad679330cfec776408f95b2001dfa79c67f6df5fd9221a55d8e4e826d163
+  data.tar.gz: 4a30c3d554af61200f3424c30c00ab51263229470c8977799289f30fee9dac43605b867f7e7719af9b82c7c995288a13f493f289ccd393ad09198c01b70fcaa1

data/CONTRIBUTING.md

@@ -0,0 +1,42 @@
+# Contributing
+
+First, thanks for wanting to contribute. You’re awesome! :heart:
+
+## Help
+
+We’re not able to provide support through GitHub Issues. If you’re looking for help with your code, try posting on [Stack Overflow](https://stackoverflow.com/).
+
+All features should be documented. If you don’t see a feature in the docs, assume it doesn’t exist.
+
+## Bugs
+
+Think you’ve discovered a bug?
+
+1. Search existing issues to see if it’s been reported.
+2. Try the `master` branch to make sure it hasn’t been fixed.
+
+```rb
+gem "sage-rails", github: "mrjonesbot/sage"
+```
+
+If the above steps don’t help, create an issue. Include:
+
+- Detailed steps to reproduce
+- Complete backtraces for exceptions
+
+## New Features
+
+If you’d like to discuss a new feature, create an issue and start the title with `[Idea]`.
+
+## Pull Requests
+
+Fork the project and create a pull request. A few tips:
+
+- Keep changes to a minimum. If you have multiple features or fixes, submit multiple pull requests.
+- Follow the existing style. The code should read like it’s written by a single person.
+
+Feel free to open an issue to get feedback on your idea before spending too much time on it.
+
+---
+
+This contributing guide is released under [CCO](https://creativecommons.org/publicdomain/zero/1.0/) (public domain). Use it for your own project without attribution.

data/README.md

@@ -2,16 +2,29 @@
 
 ![Sage Query Interface](screenshots/sage-query-interface.png)
 
+> **Note:** This project is pre-v1 and is subject to frequent changes.
+
 **Natural language reporting to help your team build accurate reports, faster.**
 
 Sage is a Rails engine built on top of the excellent [Blazer](https://github.com/ankane/blazer) gem, adding an LLM interface to make data exploration accessible via natural language.
 
+## Requirements
+
+Sage relies on `turbo-rails` and `stimulus-rails` to render the dashboard. These gems should already be included in most modern Rails applications. If not, add them to your Gemfile:
+
+```ruby
+gem "turbo-rails"
+gem "stimulus-rails"
+```
+
+Refer to the [stimulus-rails installation page](https://github.com/hotwired/stimulus-rails) to get started.
+
 ## Installation
 
 Add Sage to your application's Gemfile:
 
 ```ruby
-gem "sage-rails"
+gem "sage-rails", require: 'sage'
 ```
 
 Run bundle install:
@@ -88,26 +101,17 @@ For detailed information on Blazer-specific features, refer to the [Blazer docum
 
 ## Database Context
 
-Sage introspects your database schema to provide context for more accurate SQL generation. This feature works out of the box with Blazer's data sources.
+Sage introspects your database schema to provide context for more accurate SQL generation. 
 
 ### Multiple Data Sources
 
-If you have multiple Blazer data sources configured, Sage will use the appropriate schema for each:
+If you have multiple databases, Sage will use the appropriate schema for each:
 
-```ruby
-# config/blazer.yml
-data_sources:
-  main:
-    url: <%= ENV["DATABASE_URL"] %>
-  analytics:
-    url: <%= ENV["ANALYTICS_DATABASE_URL"] %>
-```
-
-When querying from different data sources in Blazer, Sage automatically switches schema context.
+When querying different data sources in Blazer, Sage will switch schema context.
 
 ## Model Scope Context
 
-Sage leverages your Rails model scopes as documentation for query patterns, dramatically improving the accuracy of generated SQL queries, especially for complex multi-table reports.
+Sage introspects your Rails model scopes to understand common query patterns, dramatically improving the accuracy of generated SQL queries.
 
 ### Example
 
@@ -144,9 +148,8 @@ Sage understands:
 ### Benefits
 
 1. **Business Logic Awareness**: Scopes encode your business rules (what makes a customer "active" or "high-value")
-2. **Correct JOIN Patterns**: Scopes show the proper way to join tables in your application
-3. **Aggregation Patterns**: Complex scopes with GROUP BY and HAVING clauses guide report generation
-4. **Consistency**: Generated queries follow the same patterns as your application code
+2. **Aggregation Patterns**: Complex scopes with GROUP BY and HAVING clauses guide report generation
+3. **Consistency**: Generated queries follow the same patterns as your application code
 
 Scopes now serve dual purposes:
 1. Reusable query logic in your Rails application
@@ -186,11 +189,6 @@ $ rails test
 - Ensure model files are in standard Rails locations (`app/models/`)
 - Check that Blazer is properly configured and can execute queries
 
-### Performance
-- Use lighter models (Claude Haiku, GPT-3.5) for faster response times
-- Consider caching frequently used queries
-- Scope context is cached per request to minimize processing
-
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub. This project is intended to be a safe, welcoming space for collaboration.

data/app/assets/javascripts/sage/application.js

@@ -4,7 +4,7 @@ import "@hotwired/turbo-rails"
 import { Application } from "@hotwired/stimulus"
 
 // Import and register Sage controllers
-import { SearchController, ClipboardController, SelectController, DashboardController, ReverseInfiniteScrollController } from "sage"
+import { SearchController, ClipboardController, SelectController, DashboardController, ReverseInfiniteScrollController, VariablesController } from "sage"
 
 const application = Application.start()
 application.debug = true
@@ -16,3 +16,29 @@ application.register("sage--clipboard", ClipboardController)
 application.register("sage--select", SelectController)
 application.register("sage--dashboard", DashboardController)
 application.register("sage--reverse-infinite-scroll", ReverseInfiniteScrollController)
+application.register("sage--variables", VariablesController)
+
+// Override Blazer's submitIfCompleted function globally
+window.submitIfCompleted = function($form) {
+  // Try to find our Sage variables controller first
+  const controller = document.querySelector('[data-controller*="sage--variables"]')
+  if (controller && window.Stimulus) {
+    const controllerInstance = window.Stimulus.getControllerForElementAndIdentifier(controller, 'sage--variables')
+    if (controllerInstance) {
+      controllerInstance.submitIfCompleted($form[0] || $form)
+      return
+    }
+  }
+  
+  // Fallback to improved version of original logic
+  var completed = true
+  $form.find("input[name], select").each(function () {
+    const value = $(this).val()
+    if (!value || value.toString().trim() === "") {
+      completed = false
+    }
+  })
+  if (completed) {
+    $form.submit()
+  }
+}

data/app/controllers/sage/checks_controller.rb

@@ -5,13 +5,13 @@ module Sage
     def index
       @q = Blazer::Check.ransack(params[:q])
       @checks = @q.result.joins(:query).includes(:query)
-      
+
       # Apply basic ordering first
       @checks = @checks.order("blazer_queries.name, blazer_checks.id")
-      
+
       # Apply pagination with Pagy
       @pagy, @checks = pagy(@checks)
-      
+
       # Apply state-based sorting on the paginated results
       state_order = [ nil, "disabled", "error", "timed out", "failing", "passing" ]
       @checks = @checks.sort_by { |q| state_order.index(q.state) || 99 }

data/app/controllers/sage/dashboards_controller.rb

@@ -1,21 +1,21 @@
 module Sage
   class DashboardsController < BaseController
-    before_action :set_dashboard, only: [:show, :edit, :update, :destroy, :refresh]
+    before_action :set_dashboard, only: [ :show, :edit, :update, :destroy, :refresh ]
 
     def index
       @q = Blazer::Dashboard.ransack(params[:q])
       @dashboards = @q.result
-      
+
       # Only include creator if Blazer.user_class is configured
       @dashboards = @dashboards.includes(:creator) if Blazer.user_class
-      
+
       @dashboards = @dashboards.order(:name)
-      
+
       # Apply additional filters if needed
       if blazer_user && params[:filter] == "mine"
         @dashboards = @dashboards.where(creator_id: blazer_user.id).reorder(updated_at: :desc)
       end
-      
+
       # Apply pagination with Pagy
       @pagy, @dashboards = pagy(@dashboards)
     end
@@ -40,7 +40,7 @@ module Sage
     def show
       @queries = @dashboard.dashboard_queries.order(:position).preload(:query).map(&:query)
       @query_errors = {}
-      
+
       @queries.each do |query|
         # Check if the query has a valid data source
         if query.data_source.blank? || !Blazer.data_sources.key?(query.data_source)
@@ -53,12 +53,12 @@ module Sage
 
       @smart_vars = {}
       @sql_errors = []
-      @data_sources = @queries.map { |q| 
+      @data_sources = @queries.map { |q|
         # Use the query's data source if specified, otherwise use the default
         source = q.data_source.presence || Blazer.data_sources.keys.first
         Blazer.data_sources[source]
       }.compact.uniq
-      
+
       @bind_vars.each do |var|
         @data_sources.each do |data_source|
           smart_var, error = parse_smart_variables(var, data_source)
@@ -127,4 +127,3 @@ module Sage
     end
   end
 end
-

data/app/controllers/sage/queries_controller.rb

@@ -150,7 +150,7 @@ module Sage
 
       # fallback for now for users with open tabs
       # TODO remove fallback in future version
-      @var_params = request.request_parameters["variables"] || request.request_parameters
+      @var_params = params[:variables] || request.request_parameters["variables"] || request.request_parameters
       @success = process_vars(@statement, @var_params)
       @only_chart = params[:only_chart]
       @run_id = blazer_params[:run_id]

data/app/helpers/sage/application_helper.rb

@@ -11,7 +11,7 @@ module Sage
       messages.group_by { |message| message.created_at.to_date }
              .sort_by { |date, _| date }
     end
-    
+
     def format_message_date(date)
       case date
       when Date.current

data/app/helpers/sage/queries_helper.rb

@@ -4,7 +4,7 @@ module Sage
       messages.group_by { |message| message.created_at.to_date }
              .sort_by { |date, _| date }
     end
-    
+
     def format_message_date(date)
       case date
       when Date.current
@@ -20,4 +20,4 @@ module Sage
       end
     end
   end
-end
+end

data/app/javascript/sage/controllers/variables_controller.js

@@ -0,0 +1,122 @@
+import { Controller } from "@hotwired/stimulus"
+
+export default class extends Controller {
+  static targets = ["form", "variable"]
+  
+  connect() {
+    // Override the global submitIfCompleted function from Blazer
+    window.submitIfCompleted = this.submitIfCompleted.bind(this)
+    
+    // Set up event listeners for variable changes
+    this.setupVariableListeners()
+  }
+  
+  setupVariableListeners() {
+    // Listen for changes on all variable inputs
+    this.variableTargets.forEach(input => {
+      input.addEventListener("change", (event) => {
+        this.handleVariableChange(event)
+      })
+      
+      // Also listen for daterangepicker events if present
+      if (input.dataset.daterangepicker) {
+        const picker = $(input).data('daterangepicker')
+        if (picker) {
+          $(input).on('apply.daterangepicker', (ev, picker) => {
+            this.handleDateRangeChange(input, picker)
+          })
+        }
+      }
+    })
+  }
+  
+  handleVariableChange(event) {
+    const input = event.target
+    console.log(`Variable ${input.name} changed to:`, input.value)
+    
+    // Check if all required variables are filled and submit if so
+    setTimeout(() => {
+      this.submitIfCompleted(this.formTarget)
+    }, 100) // Small delay to ensure all values are updated
+  }
+  
+  handleDateRangeChange(input, picker) {
+    console.log(`Date range updated for ${input.name}:`, input.value)
+    
+    // Force update any related hidden fields
+    this.updateRelatedDateFields(input, picker)
+    
+    // Submit the form after date range is updated
+    setTimeout(() => {
+      this.submitIfCompleted(this.formTarget)
+    }, 200) // Longer delay for date picker updates
+  }
+  
+  updateRelatedDateFields(input, picker) {
+    // If this is a start_time/end_time combo, make sure both are updated
+    if (input.name === "start_time" || input.name === "end_time") {
+      const startTimeInput = this.formTarget.querySelector('input[name="start_time"]')
+      const endTimeInput = this.formTarget.querySelector('input[name="end_time"]')
+      
+      if (startTimeInput && endTimeInput && picker) {
+        // Update both fields based on the picker values
+        if (picker.startDate) {
+          startTimeInput.value = picker.startDate.utc().format()
+        }
+        if (picker.endDate) {
+          endTimeInput.value = picker.endDate.endOf("day").utc().format()
+        }
+      }
+    }
+  }
+  
+  submitIfCompleted(form) {
+    if (!form) return
+    
+    let completed = true
+    const requiredInputs = form.querySelectorAll('input[name], select[name]')
+    
+    // Check each required input
+    requiredInputs.forEach(input => {
+      const value = input.value
+      
+      // More robust empty check
+      if (this.isEmpty(value)) {
+        completed = false
+        console.log(`Variable ${input.name} is empty:`, value)
+      } else {
+        console.log(`Variable ${input.name} has value:`, value)
+      }
+    })
+    
+    console.log(`Form completion check: ${completed ? 'Complete' : 'Incomplete'}`)
+    
+    if (completed) {
+      console.log('Submitting form with all variables filled')
+      form.submit()
+    }
+  }
+  
+  isEmpty(value) {
+    // More comprehensive empty check
+    return value === null || 
+           value === undefined || 
+           value === "" || 
+           (typeof value === "string" && value.trim() === "")
+  }
+  
+  // Manual trigger for testing
+  triggerSubmit() {
+    this.submitIfCompleted(this.formTarget)
+  }
+  
+  // Debug method to check current variable states
+  debugVariables() {
+    console.log("=== Current Variable States ===")
+    const inputs = this.formTarget.querySelectorAll('input[name], select[name]')
+    inputs.forEach(input => {
+      console.log(`${input.name}: "${input.value}" (${typeof input.value})`)
+    })
+    console.log("===============================")
+  }
+}

data/app/javascript/sage.js

@@ -4,9 +4,10 @@ import ClipboardController from "sage/controllers/clipboard_controller"
 import SelectController from "sage/controllers/select_controller"
 import DashboardController from "sage/controllers/dashboard_controller"
 import ReverseInfiniteScrollController from "sage/controllers/reverse_infinite_scroll_controller"
+import VariablesController from "sage/controllers/variables_controller"
 
 // Export all Sage controllers for manual registration
-export { SearchController, ClipboardController, SelectController, DashboardController, ReverseInfiniteScrollController }
+export { SearchController, ClipboardController, SelectController, DashboardController, ReverseInfiniteScrollController, VariablesController }
 
 // Register all Sage controllers with the provided Stimulus application
 export function registerControllers(application) {
@@ -15,5 +16,6 @@ export function registerControllers(application) {
   application.register("sage--select", SelectController)
   application.register("sage--dashboard", DashboardController)
   application.register("sage--reverse-infinite-scroll", ReverseInfiniteScrollController)
+  application.register("sage--variables", VariablesController)
 }
 

data/app/views/sage/_variables.html.erb

@@ -0,0 +1,168 @@
+<% if @bind_vars.any? %>
+  <% var_params = request.query_parameters %>
+  <%= javascript_tag nonce: true do %>
+    <%= blazer_js_var "timeZone", Blazer.time_zone.tzinfo.name %>
+    var now = moment.tz(timeZone)
+    var format = "YYYY-MM-DD"
+
+    function toDate(time) {
+      return moment.tz(time.format(format), timeZone)
+    }
+  <% end %>
+  <div data-controller="sage--variables" data-sage--variables-form-target="form">
+    <form id="bind" method="get" action="<%= action %>" class="form-inline" style="margin-bottom: 15px;">
+      <% date_vars = ["start_time", "end_time"] %>
+      <% if (date_vars - @bind_vars).empty? %>
+        <% @bind_vars = @bind_vars - date_vars %>
+      <% else %>
+        <% date_vars = nil %>
+      <% end %>
+
+      <% @bind_vars.each_with_index do |var, i| %>
+        <div style="margin-bottom: 10px;">
+          <div style="margin-bottom: 3px;">
+            <small class="text-muted"><code>{{<%= var %>}}</code></small>
+          </div>
+        </div>
+        <% if (data = @smart_vars[var]) %>
+          <%= select_tag var, options_for_select([[nil, nil]] + data, selected: var_params[var]), style: "margin-right: 20px; width: 200px; display: none;", data: { "sage--variables-target": "variable" } %>
+          <%= javascript_tag nonce: true do %>
+            $("#<%= var %>").selectize({
+              create: true
+            });
+          <% end %>
+        <% elsif var.end_with?("_at") || var == "start_time" || var == "end_time" %>
+          <%= hidden_field_tag var, var_params[var], data: { "sage--variables-target": "variable" } %>
+
+          <div class="selectize-control single" style="width: 200px;">
+            <div id="<%= var %>-select" class="selectize-input" style="display: inline-block;">
+              <span>Select a date</span>
+            </div>
+          </div>
+
+          <%= javascript_tag nonce: true do %>
+            (function() {
+              var input = $("#<%= var %>")
+              var datePicker = $("#<%= var %>-select")
+              datePicker.daterangepicker({
+                singleDatePicker: true,
+                locale: {format: format},
+                autoUpdateInput: false,
+                autoApply: true,
+                startDate: input.val().length > 0 ? moment.tz(input.val(), timeZone) : now
+              })
+              // hack to start with empty date
+              datePicker.on("apply.daterangepicker", function(ev, picker) {
+                datePicker.find("span").html(toDate(picker.startDate).format("MMMM D, YYYY"))
+                input.val(toDate(picker.startDate).utc().format())
+                
+                // Trigger our custom variable controller instead of submitIfCompleted
+                var controller = document.querySelector('[data-controller*="sage--variables"]')
+                if (controller && window.Stimulus) {
+                  var controllerInstance = window.Stimulus.getControllerForElementAndIdentifier(controller, 'sage--variables')
+                  if (controllerInstance) {
+                    controllerInstance.handleDateRangeChange(input[0], picker)
+                  }
+                }
+              })
+              if (input.val().length > 0) {
+                var picker = datePicker.data("daterangepicker")
+                datePicker.find("span").html(toDate(picker.startDate).format("MMMM D, YYYY"))
+              }
+            })()
+          <% end %>
+        <% else %>
+          <%= text_field_tag var, var_params[var], style: "width: 120px; margin-right: 20px;", autofocus: i == 0 && !var.end_with?("_at") && !var_params[var], class: "form-control", data: { "sage--variables-target": "variable" } %>
+        <% end %>
+      <% end %>
+
+      <% if date_vars %>
+        <% date_vars.each do |var| %>
+          <%= hidden_field_tag var, var_params[var], data: { "sage--variables-target": "variable" } %>
+        <% end %>
+
+        <div style="margin-bottom: 5px; text-align: left;">
+          <small class="text-muted"><code>{{<%= date_vars.join('}}, {{') %>}}</code></small>
+        </div>
+        <div class="selectize-control single" style="width: 300px;">
+          <div id="reportrange" class="selectize-input" style="display: inline-block;">
+            <span>Select a time range</span>
+          </div>
+        </div>
+
+        <%= javascript_tag nonce: true do %>
+          function dateStr(daysAgo) {
+            return now.clone().subtract(daysAgo || 0, "days").format(format)
+          }
+
+          function setTimeInputs(start, end) {
+            $("#start_time").val(toDate(start).utc().format())
+            $("#end_time").val(toDate(end).endOf("day").utc().format())
+          }
+
+          $("#reportrange").daterangepicker(
+            {
+              ranges: {
+               "Today": [dateStr(), dateStr()],
+               "Last 7 Days": [dateStr(6), dateStr()],
+               "Last 30 Days": [dateStr(29), dateStr()]
+              },
+              locale: {
+                format: format
+              },
+              startDate: dateStr(29),
+              endDate: dateStr(),
+              opens: "right",
+              alwaysShowCalendars: true
+            },
+            function(start, end) {
+              setTimeInputs(start, end)
+              
+              // Trigger our custom variable controller instead of submitIfCompleted
+              var controller = document.querySelector('[data-controller*="sage--variables"]')
+              if (controller && window.Stimulus) {
+                var controllerInstance = window.Stimulus.getControllerForElementAndIdentifier(controller, 'sage--variables')
+                if (controllerInstance) {
+                  controllerInstance.triggerSubmit()
+                }
+              }
+            }
+          ).on("apply.daterangepicker", function(ev, picker) {
+            setTimeInputs(picker.startDate, picker.endDate)
+            $("#reportrange span").html(toDate(picker.startDate).format("MMMM D, YYYY") + " - " + toDate(picker.endDate).format("MMMM D, YYYY"))
+            
+            // Trigger our custom variable controller
+            var controller = document.querySelector('[data-controller*="sage--variables"]')
+            if (controller && window.Stimulus) {
+              var controllerInstance = window.Stimulus.getControllerForElementAndIdentifier(controller, 'sage--variables')
+              if (controllerInstance) {
+                controllerInstance.handleDateRangeChange(document.getElementById('start_time'), picker)
+              }
+            }
+          })
+
+          if ($("#start_time").val().length > 0) {
+            var picker = $("#reportrange").data("daterangepicker")
+            picker.setStartDate(moment.tz($("#start_time").val(), timeZone))
+            picker.setEndDate(moment.tz($("#end_time").val(), timeZone))
+            $("#reportrange").trigger("apply.daterangepicker", picker)
+          } else {
+            var picker = $("#reportrange").data("daterangepicker")
+            $("#reportrange").trigger("apply.daterangepicker", picker)
+            
+            // Initial trigger for our custom controller
+            var controller = document.querySelector('[data-controller*="sage--variables"]')
+            if (controller && window.Stimulus) {
+              var controllerInstance = window.Stimulus.getControllerForElementAndIdentifier(controller, 'sage--variables')
+              if (controllerInstance) {
+                controllerInstance.triggerSubmit()
+              }
+            }
+          }
+        <% end %>
+      <% end %>
+
+      <button type='submit' class='btn btn-primary'>Run</button>
+    </form>
+  </div>
+<% end %>

data/app/views/sage/dashboards/show.html.erb

@@ -22,7 +22,7 @@
 <% end %>
 
 <% if @bind_vars.any? %>
-  <%= render partial: "blazer/variables", locals: {action: dashboard_path(@dashboard)} %>
+  <%= render partial: "sage/variables", locals: {action: dashboard_path(@dashboard)} %>
 <% else %>
   <div style="padding-bottom: 15px;"></div>
 <% end %>

data/app/views/sage/queries/show.html.erb

@@ -28,12 +28,12 @@
   <p style="white-space: pre-line;"><%= @query.description %></p>
 <% end %>
 
-<%= render partial: "blazer/variables", locals: { action: query_path(@query) } %>
+<%= render partial: "sage/variables", locals: { action: query_path(@query) } %>
 
 <pre id="code"><code><%= @statement.display_statement %></code></pre>
 
 <% if @success %>
-  <%= turbo_frame_tag dom_id(@query, 'results'), src: run_query_path(@query.id, from_show: true) do  %>
+  <%= turbo_frame_tag dom_id(@query, 'results'), src: run_query_path(@query.id, from_show: true, variables: variable_params(@query)) do  %>
     loading...
   <% end %>
 <% end %>

data/config/initializers/ransack.rb

@@ -1,17 +1,17 @@
-require 'ransack'
+require "ransack"
 
 # Configure Ransack for Blazer models
 Rails.application.config.after_initialize do
   # Ensure Blazer is loaded first
-  require 'blazer' if defined?(Blazer)
-  
+  require "blazer" if defined?(Blazer)
+
   # Extend Blazer::Query with Ransack capabilities
   if defined?(Blazer::Query)
     # First, ensure Ransack is included in the model
     unless Blazer::Query.respond_to?(:ransack)
       Blazer::Query.send(:extend, Ransack::Adapters::ActiveRecord::Base)
     end
-    
+
     Blazer::Query.class_eval do
       # Define which attributes can be searched
       def self.ransackable_attributes(auth_object = nil)
@@ -21,7 +21,7 @@ Rails.application.config.after_initialize do
       # Define which associations can be searched
       def self.ransackable_associations(auth_object = nil)
         associations = %w[checks audits dashboard_queries dashboards]
-        associations << 'creator' if Blazer.user_class
+        associations << "creator" if Blazer.user_class
         associations
       end
 
@@ -37,14 +37,14 @@ Rails.application.config.after_initialize do
       end
     end
   end
-  
+
   # Extend Blazer::Dashboard with Ransack capabilities
   if defined?(Blazer::Dashboard)
     # First, ensure Ransack is included in the model
     unless Blazer::Dashboard.respond_to?(:ransack)
       Blazer::Dashboard.send(:extend, Ransack::Adapters::ActiveRecord::Base)
     end
-    
+
     Blazer::Dashboard.class_eval do
       # Define which attributes can be searched
       def self.ransackable_attributes(auth_object = nil)
@@ -54,7 +54,7 @@ Rails.application.config.after_initialize do
       # Define which associations can be searched
       def self.ransackable_associations(auth_object = nil)
         associations = %w[dashboard_queries queries]
-        associations << 'creator' if Blazer.user_class
+        associations << "creator" if Blazer.user_class
         associations
       end
     end
@@ -68,7 +68,7 @@ Rails.application.config.to_prepare do
     unless Blazer::Query.respond_to?(:ransack)
       Blazer::Query.send(:extend, Ransack::Adapters::ActiveRecord::Base)
     end
-    
+
     unless Blazer::Query.respond_to?(:ransackable_attributes)
       Blazer::Query.class_eval do
         def self.ransackable_attributes(auth_object = nil)
@@ -85,13 +85,13 @@ Rails.application.config.to_prepare do
       end
     end
   end
-  
+
   if defined?(Blazer::Dashboard)
     # Ensure Ransack is included
     unless Blazer::Dashboard.respond_to?(:ransack)
       Blazer::Dashboard.send(:extend, Ransack::Adapters::ActiveRecord::Base)
     end
-    
+
     unless Blazer::Dashboard.respond_to?(:ransackable_attributes)
       Blazer::Dashboard.class_eval do
         def self.ransackable_attributes(auth_object = nil)
@@ -100,19 +100,19 @@ Rails.application.config.to_prepare do
 
         def self.ransackable_associations(auth_object = nil)
           associations = %w[dashboard_queries queries]
-          associations << 'creator' if Blazer.user_class
+          associations << "creator" if Blazer.user_class
           associations
         end
       end
     end
   end
-  
+
   if defined?(Blazer::Check)
     # Ensure Ransack is included
     unless Blazer::Check.respond_to?(:ransack)
       Blazer::Check.send(:extend, Ransack::Adapters::ActiveRecord::Base)
     end
-    
+
     unless Blazer::Check.respond_to?(:ransackable_attributes)
       Blazer::Check.class_eval do
         def self.ransackable_attributes(auth_object = nil)
@@ -121,20 +121,20 @@ Rails.application.config.to_prepare do
 
         def self.ransackable_associations(auth_object = nil)
           associations = %w[query]
-          associations << 'creator' if Blazer.user_class
+          associations << "creator" if Blazer.user_class
           associations
         end
       end
     end
   end
-  
+
   # Extend Blazer::Check with Ransack capabilities
   if defined?(Blazer::Check)
     # First, ensure Ransack is included in the model
     unless Blazer::Check.respond_to?(:ransack)
       Blazer::Check.send(:extend, Ransack::Adapters::ActiveRecord::Base)
     end
-    
+
     Blazer::Check.class_eval do
       # Define which attributes can be searched
       def self.ransackable_attributes(auth_object = nil)
@@ -144,9 +144,9 @@ Rails.application.config.to_prepare do
       # Define which associations can be searched
       def self.ransackable_associations(auth_object = nil)
         associations = %w[query]
-        associations << 'creator' if Blazer.user_class
+        associations << "creator" if Blazer.user_class
         associations
       end
     end
   end
-end
+end

data/config/routes.rb

@@ -5,7 +5,7 @@ Sage::Engine.routes.draw do
     post :refresh, on: :member
     get :run, on: :member
 
-    resources :messages, only: [:index, :create], controller: 'queries/messages'
+    resources :messages, only: [ :index, :create ], controller: "queries/messages"
 
     collection do
       post :run

data/lib/generators/sage/install/templates/sage.rb

@@ -1,22 +1,8 @@
 Sage.configure do |config|
   # Configure the AI provider (options: :anthropic, :openai)
   config.provider = :anthropic
+  # config.provider = :openai
 
-  # API Key Configuration
-  # Priority order:
-  # 1. Rails credentials: rails credentials:edit
-  #    anthropic:
-  #      api_key: your_key_here
-  #    openai:
-  #      api_key: your_key_here
-  # 2. .env file: ANTHROPIC_API_KEY=your_key_here or OPENAI_API_KEY=your_key_here
-  # 3. Direct configuration (not recommended for production):
-  # config.anthropic_api_key = "your_key_here"
-  # config.open_ai_key = "your_key_here"
-
-  # Model selection (optional)
-  # For Anthropic (defaults to claude-3-opus-20240229):
-  # config.anthropic_model = "claude-3-sonnet-20240229"
-  # For OpenAI (defaults to gpt-4):
-  # config.open_ai_model = "gpt-3.5-turbo"
+  config.anthropic_api_key = ENV["ANTHROPIC_API_KEY"]
+  # config.openai_api_key = ENV["OPENAI_API_KEY"]
 end

data/lib/sage/model_scopes_context.rb

@@ -43,20 +43,20 @@ module Sage
 
     def collect_models_with_scopes
       models_with_scopes = []
-      
+
       # Find all model files in the app/models directory
       model_files = Dir.glob(Rails.root.join("app/models/**/*.rb"))
-      
+
       model_files.each do |file_path|
         # Skip concern files and other non-model files
         next if file_path.include?("/concerns/")
-        
+
         # Read the file content
         file_content = File.read(file_path)
-        
+
         # Extract model name from file path
         model_name = File.basename(file_path, ".rb").camelize
-        
+
         # Find all scope definitions using regex
         # Match various scope patterns:
         # scope :active, -> { where(active: true) }
@@ -70,7 +70,7 @@ module Sage
           # Pattern 3: Simple one-liner scopes
           /scope\s+:(\w+)\s*,\s*(.+?)$/
         ]
-        
+
         scope_matches = []
         scope_patterns.each do |pattern|
           matches = file_content.scan(pattern)
@@ -79,11 +79,11 @@ module Sage
             scope_body = match[1] || ""
             # Avoid duplicate entries
             unless scope_matches.any? { |s| s[0] == scope_name }
-              scope_matches << [scope_name, scope_body]
+              scope_matches << [ scope_name, scope_body ]
             end
           end
         end
-        
+
         if scope_matches.any?
           # Try to get the actual model class and table name
           begin
@@ -93,17 +93,17 @@ module Sage
             table_name = model_name.tableize
             model_class = nil
           end
-          
+
           model_info = {
             name: model_name,
             table: table_name,
             scopes: []
           }
-          
+
           scope_matches.each do |match|
             scope_name = match[0]
             scope_body = match[1]
-            
+
             if scope_body
               # Try to extract SQL-like patterns from the scope body
               # Look for where conditions, joins, etc.
@@ -114,20 +114,20 @@ module Sage
               model_info[:scopes] << "  • `#{scope_name}` → (check model file for implementation)"
             end
           end
-          
+
           models_with_scopes << model_info if model_info[:scopes].any?
         end
       end
 
       models_with_scopes
     end
-    
+
     def extract_sql_from_scope_body(scope_body)
       # Clean up the scope body
       cleaned = scope_body.strip
-      
+
       sql_parts = []
-      
+
       # Extract WHERE conditions
       if cleaned =~ /where\s*\(["']([^"']+)["'](?:,\s*(.+?))?\)/
         # String SQL with potential parameters
@@ -146,14 +146,14 @@ module Sage
         not_conditions = not_conditions.gsub(/(\w+):\s*/, '\1 != ')
         sql_parts << "WHERE NOT (#{not_conditions})"
       end
-      
+
       # Extract JOINs
       if cleaned =~ /joins?\s*\(:?(\w+)\)/
         sql_parts << "JOIN #{$1}"
       elsif cleaned =~ /includes?\s*\(:?(\w+)\)/
         sql_parts << "LEFT JOIN #{$1}"
       end
-      
+
       # Extract ORDER
       if cleaned =~ /order\s*\(["']([^"']+)["']\)/
         sql_parts << "ORDER BY #{$1}"
@@ -162,12 +162,12 @@ module Sage
         order_clause = order_clause.gsub(/(\w+):\s*:?(asc|desc)/i, '\1 \2')
         sql_parts << "ORDER BY #{order_clause}"
       end
-      
+
       # Extract LIMIT
       if cleaned =~ /limit\s*\((\d+)\)/
         sql_parts << "LIMIT #{$1}"
       end
-      
+
       # If we found SQL parts, join them
       if sql_parts.any?
         sql_parts.join(" ")

data/lib/sage/version.rb

@@ -1,3 +1,3 @@
 module Sage
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sage-rails
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Nathan Jones
@@ -140,6 +140,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CONTRIBUTING.md
 - README.md
 - app/assets/images/chevron-down-zinc-500.svg
 - app/assets/images/chevron-right.svg
@@ -165,6 +166,7 @@ files:
 - app/javascript/sage/controllers/reverse_infinite_scroll_controller.js
 - app/javascript/sage/controllers/search_controller.js
 - app/javascript/sage/controllers/select_controller.js
+- app/javascript/sage/controllers/variables_controller.js
 - app/jobs/sage/application_job.rb
 - app/jobs/sage/process_report_job.rb
 - app/mailers/sage/application_mailer.rb
@@ -173,6 +175,7 @@ files:
 - app/schemas/sage/report_response_schema.rb
 - app/views/layouts/application.html.erb
 - app/views/layouts/sage/application.html.erb
+- app/views/sage/_variables.html.erb
 - app/views/sage/checks/_form.html.erb
 - app/views/sage/checks/_search.html.erb
 - app/views/sage/checks/edit.html.erb