ruby_llm_swarm 1.9.1

data/lib/generators/ruby_llm/upgrade_to_v1_7/upgrade_to_v1_7_generator.rb

@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+require 'rails/generators/active_record'
+require_relative '../generator_helpers'
+
+module RubyLLM
+  module Generators
+    # Generator to upgrade existing RubyLLM apps to v1.7 with new Rails-like API
+    class UpgradeToV17Generator < Rails::Generators::Base
+      include Rails::Generators::Migration
+      include RubyLLM::Generators::GeneratorHelpers
+
+      namespace 'ruby_llm:upgrade_to_v1_7'
+      source_root File.expand_path('templates', __dir__)
+
+      # Override source_paths to include install templates
+      def self.source_paths
+        [
+          File.expand_path('templates', __dir__),
+          File.expand_path('../install/templates', __dir__)
+        ]
+      end
+
+      argument :model_mappings, type: :array, default: [], banner: 'chat:ChatName message:MessageName ...'
+
+      desc 'Upgrades existing RubyLLM apps to v1.7 with new Rails-like API\n' \
+           'Usage: rails g ruby_llm:upgrade_to_v1_7 [chat:ChatName] [message:MessageName] ...'
+
+      def self.next_migration_number(dirname)
+        ::ActiveRecord::Generators::Base.next_migration_number(dirname)
+      end
+
+      def create_migration_file
+        @model_table_already_existed = table_exists?(table_name_for(model_model_name))
+
+        # First check if models table exists, if not create it
+        unless @model_table_already_existed
+          migration_template 'create_models_migration.rb.tt',
+                             "db/migrate/create_#{table_name_for(model_model_name)}.rb",
+                             migration_version: migration_version,
+                             model_model_name: model_model_name
+
+          sleep 1 # Ensure different timestamp
+        end
+
+        migration_template 'migration.rb.tt',
+                           'db/migrate/migrate_to_ruby_llm_model_references.rb',
+                           migration_version: migration_version,
+                           chat_model_name: chat_model_name,
+                           message_model_name: message_model_name,
+                           tool_call_model_name: tool_call_model_name,
+                           model_model_name: model_model_name,
+                           model_table_already_existed: @model_table_already_existed
+      end
+
+      def create_model_file
+        create_namespace_modules
+
+        template 'model_model.rb.tt', "app/models/#{model_model_name.underscore}.rb"
+      end
+
+      def update_existing_models
+        update_model_acts_as(chat_model_name, 'acts_as_chat', acts_as_chat_declaration)
+        update_model_acts_as(message_model_name, 'acts_as_message', acts_as_message_declaration)
+        update_model_acts_as(tool_call_model_name, 'acts_as_tool_call', acts_as_tool_call_declaration)
+      end
+
+      def update_initializer
+        initializer_path = 'config/initializers/ruby_llm.rb'
+
+        unless File.exist?(initializer_path)
+          say_status :warning, 'No initializer found. Creating one...', :yellow
+          template 'initializer.rb.tt', initializer_path
+          return
+        end
+
+        initializer_content = File.read(initializer_path)
+
+        return if initializer_content.include?('config.use_new_acts_as')
+
+        inject_into_file initializer_path, before: /^end/ do
+          lines = ["\n  # Enable the new Rails-like API", '  config.use_new_acts_as = true']
+          lines << "  config.model_registry_class = \"#{model_model_name}\"" if model_model_name != 'Model'
+          lines << "\n"
+          lines.join("\n")
+        end
+      end
+
+      def show_next_steps
+        say_status :success, 'Upgrade prepared!', :green
+        say <<~INSTRUCTIONS
+
+          Next steps:
+          1. Review the generated migrations
+          2. Run: rails db:migrate
+          3. Update your code to use the new API: #{chat_model_name}.create! now has the same signature as RubyLLM.chat
+
+          ⚠️  If you get "undefined method 'acts_as_model'" during migration:
+            Add this to config/application.rb BEFORE your Application class:
+
+            RubyLLM.configure do |config|
+              config.use_new_acts_as = true
+            end
+
+          📚 See the full migration guide: https://rubyllm.com/upgrading-to-1-7/
+
+        INSTRUCTIONS
+      end
+
+      private
+
+      def update_model_acts_as(model_name, old_acts_as, new_acts_as)
+        model_path = "app/models/#{model_name.underscore}.rb"
+        return unless File.exist?(Rails.root.join(model_path))
+
+        content = File.read(Rails.root.join(model_path))
+        return unless content.match?(/^\s*#{old_acts_as}/)
+
+        gsub_file model_path, /^\s*#{old_acts_as}.*$/, "  #{new_acts_as}"
+      end
+    end
+  end
+end

data/lib/generators/ruby_llm/upgrade_to_v1_9/templates/add_v1_9_message_columns.rb.tt

@@ -0,0 +1,15 @@
+class AddRubyLlmV19Columns < ActiveRecord::Migration<%= migration_version %>
+  def change
+    unless column_exists?(:<%= message_table_name %>, :cached_tokens)
+      add_column :<%= message_table_name %>, :cached_tokens, :integer
+    end
+
+    unless column_exists?(:<%= message_table_name %>, :cache_creation_tokens)
+      add_column :<%= message_table_name %>, :cache_creation_tokens, :integer
+    end
+
+    unless column_exists?(:<%= message_table_name %>, :content_raw)
+      add_column :<%= message_table_name %>, :content_raw, :json
+    end
+  end
+end

data/lib/generators/ruby_llm/upgrade_to_v1_9/upgrade_to_v1_9_generator.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+require 'rails/generators/active_record'
+require_relative '../generator_helpers'
+
+module RubyLLM
+  module Generators
+    # Generator to add v1.9 columns (cached tokens + raw content support) to existing apps.
+    class UpgradeToV19Generator < Rails::Generators::Base
+      include Rails::Generators::Migration
+      include RubyLLM::Generators::GeneratorHelpers
+
+      namespace 'ruby_llm:upgrade_to_v1_9'
+      source_root File.expand_path('templates', __dir__)
+
+      argument :model_mappings, type: :array, default: [], banner: 'message:MessageName'
+
+      desc 'Adds cached token columns and raw content storage fields introduced in v1.9.0'
+
+      def self.next_migration_number(dirname)
+        ::ActiveRecord::Generators::Base.next_migration_number(dirname)
+      end
+
+      def create_migration_file
+        parse_model_mappings
+
+        migration_template 'add_v1_9_message_columns.rb.tt',
+                           'db/migrate/add_ruby_llm_v1_9_columns.rb',
+                           migration_version: migration_version,
+                           message_table_name: message_table_name
+      end
+
+      def show_next_steps
+        say_status :success, 'Upgrade prepared!', :green
+        say <<~INSTRUCTIONS
+
+          Next steps:
+          1. Review the generated migration
+          2. Run: rails db:migrate
+          3. Restart your application server
+
+          📚 See the v1.9.0 release notes for details on cached token tracking and raw content support.
+
+        INSTRUCTIONS
+      end
+    end
+  end
+end

data/lib/ruby_llm/active_record/acts_as.rb

@@ -0,0 +1,174 @@
+# frozen_string_literal: true
+
+module RubyLLM
+  module ActiveRecord
+    # Adds chat and message persistence capabilities to ActiveRecord models.
+    module ActsAs
+      extend ActiveSupport::Concern
+
+      # When ActsAs is included, ensure models are loaded from database
+      def self.included(base)
+        super
+        # Monkey-patch Models to use database when ActsAs is active
+        RubyLLM::Models.class_eval do
+          def self.load_models
+            read_from_database
+          rescue StandardError => e
+            RubyLLM.logger.debug "Failed to load models from database: #{e.message}, falling back to JSON"
+            read_from_json
+          end
+
+          def self.read_from_database
+            model_class = RubyLLM.config.model_registry_class
+            model_class = model_class.constantize if model_class.is_a?(String)
+            model_class.all.map(&:to_llm)
+          end
+
+          def load_from_database!
+            @models = self.class.read_from_database
+          end
+        end
+      end
+
+      class_methods do # rubocop:disable Metrics/BlockLength
+        def acts_as_chat(messages: :messages, message_class: nil, messages_foreign_key: nil, # rubocop:disable Metrics/ParameterLists
+                         model: :model, model_class: nil, model_foreign_key: nil)
+          include RubyLLM::ActiveRecord::ChatMethods
+
+          class_attribute :messages_association_name, :model_association_name, :message_class, :model_class
+
+          self.messages_association_name = messages
+          self.model_association_name = model
+          self.message_class = (message_class || messages.to_s.classify).to_s
+          self.model_class = (model_class || model.to_s.classify).to_s
+
+          has_many messages,
+                   -> { order(created_at: :asc) },
+                   class_name: self.message_class,
+                   foreign_key: messages_foreign_key,
+                   dependent: :destroy
+
+          belongs_to model,
+                     class_name: self.model_class,
+                     foreign_key: model_foreign_key,
+                     optional: true
+
+          delegate :add_message, to: :to_llm
+
+          define_method :messages_association do
+            send(messages_association_name)
+          end
+
+          define_method :model_association do
+            send(model_association_name)
+          end
+
+          define_method :'model_association=' do |value|
+            send("#{model_association_name}=", value)
+          end
+        end
+
+        def acts_as_model(chats: :chats, chat_class: nil, chats_foreign_key: nil)
+          include RubyLLM::ActiveRecord::ModelMethods
+
+          class_attribute :chats_association_name, :chat_class
+
+          self.chats_association_name = chats
+          self.chat_class = (chat_class || chats.to_s.classify).to_s
+
+          validates :model_id, presence: true, uniqueness: { scope: :provider }
+          validates :provider, presence: true
+          validates :name, presence: true
+
+          has_many chats, class_name: self.chat_class, foreign_key: chats_foreign_key
+
+          define_method :chats_association do
+            send(chats_association_name)
+          end
+        end
+
+        def acts_as_message(chat: :chat, chat_class: nil, chat_foreign_key: nil, touch_chat: false, # rubocop:disable Metrics/ParameterLists
+                            tool_calls: :tool_calls, tool_call_class: nil, tool_calls_foreign_key: nil,
+                            model: :model, model_class: nil, model_foreign_key: nil)
+          include RubyLLM::ActiveRecord::MessageMethods
+
+          class_attribute :chat_association_name, :tool_calls_association_name, :model_association_name,
+                          :chat_class, :tool_call_class, :model_class
+
+          self.chat_association_name = chat
+          self.tool_calls_association_name = tool_calls
+          self.model_association_name = model
+          self.chat_class = (chat_class || chat.to_s.classify).to_s
+          self.tool_call_class = (tool_call_class || tool_calls.to_s.classify).to_s
+          self.model_class = (model_class || model.to_s.classify).to_s
+
+          belongs_to chat,
+                     class_name: self.chat_class,
+                     foreign_key: chat_foreign_key,
+                     touch: touch_chat
+
+          has_many tool_calls,
+                   class_name: self.tool_call_class,
+                   foreign_key: tool_calls_foreign_key,
+                   dependent: :destroy
+
+          belongs_to :parent_tool_call,
+                     class_name: self.tool_call_class,
+                     foreign_key: ActiveSupport::Inflector.foreign_key(tool_calls.to_s.singularize),
+                     optional: true
+
+          has_many :tool_results,
+                   through: tool_calls,
+                   source: :result,
+                   class_name: name
+
+          belongs_to model,
+                     class_name: self.model_class,
+                     foreign_key: model_foreign_key,
+                     optional: true
+
+          delegate :tool_call?, :tool_result?, to: :to_llm
+
+          define_method :chat_association do
+            send(chat_association_name)
+          end
+
+          define_method :tool_calls_association do
+            send(tool_calls_association_name)
+          end
+
+          define_method :model_association do
+            send(model_association_name)
+          end
+        end
+
+        def acts_as_tool_call(message: :message, message_class: nil, message_foreign_key: nil, # rubocop:disable Metrics/ParameterLists
+                              result: :result, result_class: nil, result_foreign_key: nil)
+          class_attribute :message_association_name, :result_association_name, :message_class, :result_class
+
+          self.message_association_name = message
+          self.result_association_name = result
+          self.message_class = (message_class || message.to_s.classify).to_s
+          self.result_class = (result_class || self.message_class).to_s
+
+          belongs_to message,
+                     class_name: self.message_class,
+                     foreign_key: message_foreign_key
+
+          has_one result,
+                  class_name: self.result_class,
+                  foreign_key: result_foreign_key,
+                  dependent: :nullify
+
+          define_method :message_association do
+            send(message_association_name)
+          end
+
+          define_method :result_association do
+            send(result_association_name)
+          end
+        end
+      end
+    end
+  end
+end