Merge branch 'main' into community-main

Author: tpaulshippy

.github/workflows/cicd.yml

@@ -50,8 +50,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        lfs: true
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
@@ -100,8 +98,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v4
-      with:
-        lfs: true
 
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1

.github/workflows/docs.yml

@@ -18,8 +18,6 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          lfs: true
 
       - name: Setup Ruby for models guide generation (root Gemfile)
         uses: ruby/setup-ruby@v1

README.md

@@ -9,7 +9,7 @@
 
 Battle tested at [<picture><source media="(prefers-color-scheme: dark)" srcset="https://chatwithwork.com/logotype-dark.svg"><img src="https://chatwithwork.com/logotype.svg" alt="Chat with Work" height="30" align="absmiddle"></picture>](https://chatwithwork.com) — *Claude Code for your documents*
 
-[![Gem Version](https://badge.fury.io/rb/ruby_llm.svg?a=8)](https://badge.fury.io/rb/ruby_llm)
+[![Gem Version](https://badge.fury.io/rb/ruby_llm.svg?a=9)](https://badge.fury.io/rb/ruby_llm)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-standard-brightgreen.svg)](https://github.com/testdouble/standard)
 [![Gem Downloads](https://img.shields.io/gem/dt/ruby_llm)](https://rubygems.org/gems/ruby_llm)
 [![codecov](https://codecov.io/gh/crmne/ruby_llm/branch/main/graph/badge.svg?a=2)](https://codecov.io/gh/crmne/ruby_llm)

docs/_advanced/upgrading-to-1.7.md

@@ -34,7 +34,9 @@ rails db:migrate
 That's it! The generator:
 - Creates the models table if needed
 - Automatically adds `config.use_new_acts_as = true` to your initializer
+- Automatically updates your existing models' `acts_as` declarations to the new version
 - Migrates your existing data to use foreign keys
+- Loads the models in the db
 - Preserves all your data (old string columns renamed to `model_id_string`)
 
 ### Custom Model Names
@@ -187,6 +189,31 @@ The chat UI works with your existing Chat and Message models and includes:
 - Code syntax highlighting
 - Responsive design
 
+## Troubleshooting
+
+### "undefined local variable or method 'acts_as_model'" error during migration
+
+If you get this error when running `rails db:migrate`, add the configuration to `config/application.rb` **before** your Application class:
+
+```ruby
+# config/application.rb
+require_relative "boot"
+require "rails/all"
+
+# Configure RubyLLM before Rails::Application is inherited
+RubyLLM.configure do |config|
+  config.use_new_acts_as = true
+end
+
+module YourApp
+  class Application < Rails::Application
+    # ...
+  end
+end
+```
+
+This ensures RubyLLM is configured before ActiveRecord loads your models.
+
 ## New Applications
 
 Fresh installs get the model registry automatically:

gemfiles/rails_7.1.gemfile.lock

@@ -98,7 +98,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.3)
-    async (2.31.0)
+    async (2.32.0)
       console (~> 1.29)
       fiber-annotation
       io-event (~> 1.11)

gemfiles/rails_7.2.gemfile.lock

@@ -92,7 +92,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.3)
-    async (2.31.0)
+    async (2.32.0)
       console (~> 1.29)
       fiber-annotation
       io-event (~> 1.11)

gemfiles/rails_8.0.gemfile.lock

@@ -92,7 +92,7 @@ GEM
       rake
       thor (>= 0.14.0)
     ast (2.4.3)
-    async (2.31.0)
+    async (2.32.0)
       console (~> 1.29)
       fiber-annotation
       io-event (~> 1.11)

lib/generators/ruby_llm/generator_helpers.rb

@@ -0,0 +1,129 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  # Shared helpers for RubyLLM generators
+  module GeneratorHelpers
+    def parse_model_mappings
+      @model_names = {
+        chat: 'Chat',
+        message: 'Message',
+        tool_call: 'ToolCall',
+        model: 'Model'
+      }
+
+      model_mappings.each do |mapping|
+        if mapping.include?(':')
+          key, value = mapping.split(':', 2)
+          @model_names[key.to_sym] = value.classify
+        end
+      end
+
+      @model_names
+    end
+
+    %i[chat message tool_call model].each do |type|
+      define_method("#{type}_model_name") do
+        @model_names ||= parse_model_mappings
+        @model_names[type]
+      end
+
+      define_method("#{type}_table_name") do
+        table_name_for(send("#{type}_model_name"))
+      end
+    end
+
+    def acts_as_chat_declaration
+      params = []
+
+      add_association_params(params, :messages, message_table_name, message_model_name, plural: true)
+      add_association_params(params, :model, model_table_name, model_model_name)
+
+      "acts_as_chat#{" #{params.join(', ')}" if params.any?}"
+    end
+
+    def acts_as_message_declaration
+      params = []
+
+      add_association_params(params, :chat, chat_table_name, chat_model_name)
+      add_association_params(params, :tool_calls, tool_call_table_name, tool_call_model_name, plural: true)
+      add_association_params(params, :model, model_table_name, model_model_name)
+
+      "acts_as_message#{" #{params.join(', ')}" if params.any?}"
+    end
+
+    def acts_as_model_declaration
+      params = []
+
+      add_association_params(params, :chats, chat_table_name, chat_model_name, plural: true)
+
+      "acts_as_model#{" #{params.join(', ')}" if params.any?}"
+    end
+
+    def acts_as_tool_call_declaration
+      params = []
+
+      add_association_params(params, :message, message_table_name, message_model_name)
+
+      "acts_as_tool_call#{" #{params.join(', ')}" if params.any?}"
+    end
+
+    def create_namespace_modules
+      namespaces = []
+
+      [chat_model_name, message_model_name, tool_call_model_name, model_model_name].each do |model_name|
+        if model_name.include?('::')
+          namespace = model_name.split('::').first
+          namespaces << namespace unless namespaces.include?(namespace)
+        end
+      end
+
+      namespaces.each do |namespace|
+        module_path = "app/models/#{namespace.underscore}.rb"
+        next if File.exist?(Rails.root.join(module_path))
+
+        create_file module_path do
+          <<~RUBY
+            module #{namespace}
+              def self.table_name_prefix
+                "#{namespace.underscore}_"
+              end
+            end
+          RUBY
+        end
+      end
+    end
+
+    def migration_version
+      "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+    end
+
+    def postgresql?
+      ::ActiveRecord::Base.connection.adapter_name.downcase.include?('postgresql')
+    rescue StandardError
+      false
+    end
+
+    def table_exists?(table_name)
+      ::ActiveRecord::Base.connection.table_exists?(table_name)
+    rescue StandardError
+      false
+    end
+
+    private
+
+    def add_association_params(params, default_assoc, table_name, model_name, plural: false)
+      assoc = plural ? table_name.to_sym : table_name.singularize.to_sym
+
+      return if assoc == default_assoc
+
+      params << "#{default_assoc}: :#{assoc}"
+      params << "#{default_assoc.to_s.singularize}_class: '#{model_name}'" if model_name != assoc.to_s.classify
+    end
+
+    def table_name_for(model_name)
+      # Convert namespaced model names to proper table names
+      # e.g., "Assistant::Chat" -> "assistant_chats" (not "assistant/chats")
+      model_name.underscore.pluralize.tr('/', '_')
+    end
+  end
+end

lib/generators/ruby_llm/install/install_generator.rb

@@ -2,11 +2,13 @@
 
 require 'rails/generators'
 require 'rails/generators/active_record'
+require_relative '../generator_helpers'
 
 module RubyLLM
   # Generator for RubyLLM Rails models and migrations
   class InstallGenerator < Rails::Generators::Base
     include Rails::Generators::Migration
+    include RubyLLM::GeneratorHelpers
 
     namespace 'ruby_llm:install'
 
@@ -24,127 +26,6 @@ def self.next_migration_number(dirname)
       ::ActiveRecord::Generators::Base.next_migration_number(dirname)
     end
 
-    def migration_version
-      "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-    end
-
-    def postgresql?
-      ::ActiveRecord::Base.connection.adapter_name.downcase.include?('postgresql')
-    rescue StandardError
-      false
-    end
-
-    def parse_model_mappings
-      @model_names = {
-        chat: 'Chat',
-        message: 'Message',
-        tool_call: 'ToolCall',
-        model: 'Model'
-      }
-
-      model_mappings.each do |mapping|
-        if mapping.include?(':')
-          key, value = mapping.split(':', 2)
-          @model_names[key.to_sym] = value.classify
-        end
-      end
-
-      @model_names
-    end
-
-    %i[chat message tool_call model].each do |type|
-      define_method("#{type}_model_name") do
-        @model_names ||= parse_model_mappings
-        @model_names[type]
-      end
-
-      define_method("#{type}_table_name") do
-        table_name_for(send("#{type}_model_name"))
-      end
-    end
-
-    def acts_as_chat_declaration
-      acts_as_chat_params = []
-      messages_assoc = message_model_name.tableize.to_sym
-      model_assoc = model_model_name.underscore.to_sym
-
-      if messages_assoc != :messages
-        acts_as_chat_params << "messages: :#{messages_assoc}"
-        if message_model_name != messages_assoc.to_s.classify
-          acts_as_chat_params << "message_class: '#{message_model_name}'"
-        end
-      end
-
-      if model_assoc != :model
-        acts_as_chat_params << "model: :#{model_assoc}"
-        acts_as_chat_params << "model_class: '#{model_model_name}'" if model_model_name != model_assoc.to_s.classify
-      end
-
-      if acts_as_chat_params.any?
-        "acts_as_chat #{acts_as_chat_params.join(', ')}"
-      else
-        'acts_as_chat'
-      end
-    end
-
-    def acts_as_message_declaration
-      params = []
-
-      add_message_association_params(params, :chat, chat_model_name)
-      add_message_association_params(params, :tool_calls, tool_call_model_name, tableize: true)
-      add_message_association_params(params, :model, model_model_name)
-
-      params.any? ? "acts_as_message #{params.join(', ')}" : 'acts_as_message'
-    end
-
-    private
-
-    def add_message_association_params(params, default_assoc, model_name, tableize: false)
-      assoc = tableize ? model_name.tableize.to_sym : model_name.underscore.to_sym
-
-      return if assoc == default_assoc
-
-      params << "#{default_assoc}: :#{assoc}"
-      expected_class = assoc.to_s.classify
-      params << "#{default_assoc.to_s.singularize}_class: '#{model_name}'" if model_name != expected_class
-    end
-
-    public
-
-    def acts_as_tool_call_declaration
-      acts_as_tool_call_params = []
-      message_assoc = message_model_name.underscore.to_sym
-
-      if message_assoc != :message
-        acts_as_tool_call_params << "message: :#{message_assoc}"
-        if message_model_name != message_assoc.to_s.classify
-          acts_as_tool_call_params << "message_class: '#{message_model_name}'"
-        end
-      end
-
-      if acts_as_tool_call_params.any?
-        "acts_as_tool_call #{acts_as_tool_call_params.join(', ')}"
-      else
-        'acts_as_tool_call'
-      end
-    end
-
-    def acts_as_model_declaration
-      acts_as_model_params = []
-      chats_assoc = chat_model_name.tableize.to_sym
-
-      if chats_assoc != :chats
-        acts_as_model_params << "chats: :#{chats_assoc}"
-        acts_as_model_params << "chat_class: '#{chat_model_name}'" if chat_model_name != chats_assoc.to_s.classify
-      end
-
-      if acts_as_model_params.any?
-        "acts_as_model #{acts_as_model_params.join(', ')}"
-      else
-        'acts_as_model'
-      end
-    end
-
     def create_migration_files
       # Create migrations with timestamps to ensure proper order
       # First create chats table
@@ -168,6 +49,8 @@ def create_migration_files
     end
 
     def create_model_files
+      create_namespace_modules
+
       template 'chat_model.rb.tt', "app/models/#{chat_model_name.underscore}.rb"
       template 'message_model.rb.tt', "app/models/#{message_model_name.underscore}.rb"
       template 'tool_call_model.rb.tt', "app/models/#{tool_call_model_name.underscore}.rb"
@@ -186,12 +69,6 @@ def install_active_storage
       rails_command 'active_storage:install'
     end
 
-    def table_name_for(model_name)
-      # Convert namespaced model names to proper table names
-      # e.g., "Assistant::Chat" -> "assistant_chats" (not "assistant/chats")
-      model_name.underscore.pluralize.tr('/', '_')
-    end
-
     def show_install_info
       say "\n  ✅ RubyLLM installed!", :green