ruby_llm 1.6.4 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36ae61f8e11926aa9a761d4e8ab644eab587edb9091322596ab1ed7e32d65ee4
-  data.tar.gz: b5818edd28a449035ed62f58a79465b8705460be012194525930716d5457d458
+  metadata.gz: 5a7c8f498c7fee7618711944119c65a33f8a2236a87cbd55d51b5e5a5d25000f
+  data.tar.gz: 2bb4675e6bcad95099330783697c87c7d6eade98c159a6b00247c7e179f7bd9a
 SHA512:
-  metadata.gz: 35fbc3892899c17e12e239d3688542bdc032aee12d6f30d81fff8373f116eab53722cc4871654ebfe65cdd97806ec81f9903919e4a36076b2a18938d68942be0
-  data.tar.gz: cf38979b2cf7ea03fc7d4944130fc3023d4536635d28a41f41956ea6445fc21064554fd41e917e8a3694ee798bb7a90dd10f8761c4ba326e79afd38db589e473
+  metadata.gz: 06e41bd54bcf1c7c094750b67c494decf50e9db53a250d4732455742d688aa08c72669ba64f4cc771fa3a1ad5197f646ce58308be1f3fd7db84b21282180135b
+  data.tar.gz: '08c739bbdb44380720e817704d9f980b49b6a7bafd80d890a3207531afe746d9039e2e3e0d6adf82e496b8ce16d68fa0ee8359ccf63cecf08de778e07fe6b632'

data/README.md

@@ -9,14 +9,17 @@
 
 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=6)](https://badge.fury.io/rb/ruby_llm)
+[![Gem Version](https://badge.fury.io/rb/ruby_llm.svg?a=7)](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=1)](https://codecov.io/gh/crmne/ruby_llm)
+[![codecov](https://codecov.io/gh/crmne/ruby_llm/branch/main/graph/badge.svg?a=2)](https://codecov.io/gh/crmne/ruby_llm)
 
 <a href="https://trendshift.io/repositories/13640" target="_blank"><img src="https://trendshift.io/api/badge/repositories/13640" alt="crmne%2Fruby_llm | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
 </div>
 
+> [!NOTE]
+> Using RubyLLM in production? [Share your story](https://tally.so/r/3Na02p)! Takes 5 minutes.
+
 ---
 
 Build chatbots, AI agents, RAG applications. Works with OpenAI, Anthropic, Google, AWS, local models, and any OpenAI-compatible API.
@@ -108,7 +111,7 @@ response = chat.with_schema(ProductSchema).ask "Analyze this product", with: "pr
 * **Rails:** ActiveRecord integration with `acts_as_chat`
 * **Async:** Fiber-based concurrency
 * **Model registry:** 500+ models with capability detection and pricing
-* **Providers:** OpenAI, Anthropic, Gemini, Bedrock, DeepSeek, Mistral, Ollama, OpenRouter, Perplexity, GPUStack, and any OpenAI-compatible API
+* **Providers:** OpenAI, Anthropic, Gemini, VertexAI, Bedrock, DeepSeek, Mistral, Ollama, OpenRouter, Perplexity, GPUStack, and any OpenAI-compatible API
 
 ## Installation
 

data/lib/generators/ruby_llm/chat_ui/chat_ui_generator.rb

@@ -0,0 +1,115 @@
+# frozen_string_literal: true
+
+require 'rails/generators'
+
+module RubyLLM
+  module Generators
+    # Generates a simple chat UI scaffold for RubyLLM
+    class ChatUIGenerator < Rails::Generators::Base
+      source_root File.expand_path('templates', __dir__)
+
+      namespace 'ruby_llm:chat_ui'
+
+      argument :model_mappings, type: :array, default: [], banner: 'chat:ChatName message:MessageName ...'
+
+      desc 'Creates a chat UI scaffold with Turbo streaming\n' \
+           'Usage: rails g ruby_llm:chat_ui [chat:ChatName] [message:MessageName] ...'
+
+      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 model].each do |type|
+        define_method("#{type}_model_name") do
+          @model_names ||= parse_model_mappings
+          @model_names[type]
+        end
+      end
+
+      def create_views
+        # Chat views
+        template 'views/chats/index.html.erb', "app/views/#{chat_model_name.tableize}/index.html.erb"
+        template 'views/chats/new.html.erb', "app/views/#{chat_model_name.tableize}/new.html.erb"
+        template 'views/chats/show.html.erb', "app/views/#{chat_model_name.tableize}/show.html.erb"
+        template 'views/chats/_chat.html.erb',
+                 "app/views/#{chat_model_name.tableize}/_#{chat_model_name.underscore}.html.erb"
+        template 'views/chats/_form.html.erb', "app/views/#{chat_model_name.tableize}/_form.html.erb"
+
+        # Message views
+        template 'views/messages/_message.html.erb',
+                 "app/views/#{message_model_name.tableize}/_#{message_model_name.underscore}.html.erb"
+        template 'views/messages/_form.html.erb', "app/views/#{message_model_name.tableize}/_form.html.erb"
+        template 'views/messages/create.turbo_stream.erb',
+                 "app/views/#{message_model_name.tableize}/create.turbo_stream.erb"
+
+        # Model views
+        template 'views/models/index.html.erb', "app/views/#{model_model_name.tableize}/index.html.erb"
+        template 'views/models/show.html.erb', "app/views/#{model_model_name.tableize}/show.html.erb"
+        template 'views/models/_model.html.erb',
+                 "app/views/#{model_model_name.tableize}/_#{model_model_name.underscore}.html.erb"
+      end
+
+      def create_controllers
+        template 'controllers/chats_controller.rb', "app/controllers/#{chat_model_name.tableize}_controller.rb"
+        template 'controllers/messages_controller.rb', "app/controllers/#{message_model_name.tableize}_controller.rb"
+        template 'controllers/models_controller.rb', "app/controllers/#{model_model_name.tableize}_controller.rb"
+      end
+
+      def create_jobs
+        template 'jobs/chat_response_job.rb', "app/jobs/#{chat_model_name.underscore}_response_job.rb"
+      end
+
+      def add_routes
+        model_routes = <<~ROUTES.strip
+          resources :#{model_model_name.tableize}, only: [:index, :show] do
+            collection do
+              post :refresh
+            end
+          end
+        ROUTES
+        route model_routes
+        chat_routes = <<~ROUTES.strip
+          resources :#{chat_model_name.tableize} do
+            resources :#{message_model_name.tableize}, only: [:create]
+          end
+        ROUTES
+        route chat_routes
+      end
+
+      def add_broadcasting_to_message_model
+        msg_var = message_model_name.underscore
+        chat_var = chat_model_name.underscore
+        broadcasting_code = "broadcasts_to ->(#{msg_var}) { \"#{chat_var}_\#{#{msg_var}.#{chat_var}_id}\" }"
+
+        inject_into_class "app/models/#{msg_var}.rb", message_model_name do
+          "\n  #{broadcasting_code}\n"
+        end
+      rescue Errno::ENOENT
+        say "#{message_model_name} model not found. Add broadcasting code to your model.", :yellow
+        say "  #{broadcasting_code}", :yellow
+      end
+
+      def display_post_install_message
+        return unless behavior == :invoke
+
+        say "\n  ✅ Chat UI installed!", :green
+        say "\n  Start your server and visit http://localhost:3000/#{chat_model_name.tableize}", :cyan
+        say "\n"
+      end
+    end
+  end
+end

data/lib/generators/ruby_llm/chat_ui/templates/controllers/chats_controller.rb.tt

@@ -0,0 +1,39 @@
+class <%= chat_model_name.pluralize %>Controller < ApplicationController
+  before_action :set_<%= chat_model_name.underscore %>, only: [:show]
+
+  def index
+    @<%= chat_model_name.tableize %> = <%= chat_model_name %>.order(created_at: :desc)
+  end
+
+  def new
+    @<%= chat_model_name.underscore %> = <%= chat_model_name %>.new
+    @selected_model = params[:model]
+  end
+
+  def create
+    return unless prompt.present?
+
+    @<%= chat_model_name.underscore %> = <%= chat_model_name %>.create!(model: model)
+    <%= chat_model_name %>ResponseJob.perform_later(@<%= chat_model_name.underscore %>.id, prompt)
+
+    redirect_to @<%= chat_model_name.underscore %>, notice: '<%= chat_model_name.humanize %> was successfully created.'
+  end
+
+  def show
+    @<%= message_model_name.underscore %> = @<%= chat_model_name.underscore %>.<%= message_model_name.tableize %>.build
+  end
+
+  private
+
+  def set_<%= chat_model_name.underscore %>
+    @<%= chat_model_name.underscore %> = <%= chat_model_name %>.find(params[:id])
+  end
+
+  def model
+    params[:<%= chat_model_name.underscore %>][:model].presence
+  end
+
+  def prompt
+    params[:<%= chat_model_name.underscore %>][:prompt]
+  end
+end

data/lib/generators/ruby_llm/chat_ui/templates/controllers/messages_controller.rb.tt

@@ -0,0 +1,24 @@
+class <%= message_model_name.pluralize %>Controller < ApplicationController
+  before_action :set_<%= chat_model_name.underscore %>
+
+  def create
+    return unless content.present?
+
+    <%= chat_model_name %>ResponseJob.perform_later(@<%= chat_model_name.underscore %>.id, content)
+
+    respond_to do |format|
+      format.turbo_stream
+      format.html { redirect_to @<%= chat_model_name.underscore %> }
+    end
+  end
+
+  private
+
+  def set_<%= chat_model_name.underscore %>
+    @<%= chat_model_name.underscore %> = <%= chat_model_name %>.find(params[:<%= chat_model_name.underscore %>_id])
+  end
+
+  def content
+    params[:<%= message_model_name.underscore %>][:content]
+  end
+end

data/lib/generators/ruby_llm/chat_ui/templates/controllers/models_controller.rb.tt

@@ -0,0 +1,14 @@
+class <%= model_model_name.pluralize %>Controller < ApplicationController
+  def index
+    @<%= model_model_name.tableize %> = <%= model_model_name %>.all.group_by(&:provider)
+  end
+
+  def show
+    @<%= model_model_name.underscore %> = <%= model_model_name %>.find(params[:id])
+  end
+
+  def refresh
+    <%= model_model_name %>.refresh!
+    redirect_to <%= model_model_name.tableize %>_path, notice: "<%= model_model_name.pluralize %> refreshed successfully"
+  end
+end

data/lib/generators/ruby_llm/chat_ui/templates/jobs/chat_response_job.rb.tt

@@ -0,0 +1,12 @@
+class <%= chat_model_name %>ResponseJob < ApplicationJob
+  def perform(<%= chat_model_name.underscore %>_id, content)
+    <%= chat_model_name.underscore %> = <%= chat_model_name %>.find(<%= chat_model_name.underscore %>_id)
+
+    <%= chat_model_name.underscore %>.ask(content) do |chunk|
+      if chunk.content && !chunk.content.blank?
+        <%= message_model_name.underscore %> = <%= chat_model_name.underscore %>.<%= message_model_name.tableize %>.last
+        <%= message_model_name.underscore %>.update!(content: <%= message_model_name.underscore %>.content + chunk.content)
+      end
+    end
+  end
+end

data/lib/generators/ruby_llm/chat_ui/templates/views/chats/_chat.html.erb.tt

@@ -0,0 +1,16 @@
+<div id="<%%= dom_id <%= chat_model_name.underscore %> %>">
+  <div>
+    <strong>Model:</strong>
+    <%%= <%= chat_model_name.underscore %>.model_association.name %>
+  </div>
+
+  <div>
+    <strong>Messages:</strong>
+    <%%= <%= chat_model_name.underscore %>.messages_association.count %>
+  </div>
+
+  <div>
+    <strong>Created:</strong>
+    <%%= <%= chat_model_name.underscore %>.created_at.strftime("%B %d, %Y at %I:%M %p") %>
+  </div>
+</div>

data/lib/generators/ruby_llm/chat_ui/templates/views/chats/_form.html.erb.tt

@@ -0,0 +1,29 @@
+<%%= form_with(model: <%= chat_model_name.underscore %>, url: <%= chat_model_name.tableize %>_path) do |form| %>
+  <%% if <%= chat_model_name.underscore %>.errors.any? %>
+    <div style="color: red">
+      <h2><%%= pluralize(<%= chat_model_name.underscore %>.errors.count, "error") %> prohibited this <%= chat_model_name.underscore.humanize.downcase %> from being saved:</h2>
+
+      <ul>
+        <%% <%= chat_model_name.underscore %>.errors.each do |error| %>
+          <li><%%= error.full_message %></li>
+        <%% end %>
+      </ul>
+    </div>
+  <%% end %>
+
+  <div>
+    <%%= form.label :model, "Select AI model:", style: "display: block" %>
+    <%%= form.select :model,
+        options_for_select(<%= model_model_name %>.pluck(:name, :model_id).unshift(["Default (#{RubyLLM.config.default_model})", nil]), @selected_model),
+        {},
+        style: "width: 100%; max-width: 600px; padding: 5px;" %>
+  </div>
+
+  <div style="margin-top: 15px;">
+    <%%= form.text_field :prompt, style: "width: 100%; max-width: 600px;", placeholder: "What would you like to discuss?", autofocus: true %>
+  </div>
+
+  <div>
+    <%%= form.submit "Start new <%= chat_model_name.underscore.humanize.downcase %>" %>
+  </div>
+<%% end %>

data/lib/generators/ruby_llm/chat_ui/templates/views/chats/index.html.erb.tt

@@ -0,0 +1,16 @@
+<p style="color: green"><%%= notice %></p>
+
+<%% content_for :title, "<%= chat_model_name.pluralize %>" %>
+
+<h1><%= chat_model_name.pluralize %></h1>
+
+<div id="<%= chat_model_name.tableize %>">
+  <%% @<%= chat_model_name.tableize %>.each do |<%= chat_model_name.underscore %>| %>
+    <%%= render <%= chat_model_name.underscore %> %>
+    <p>
+      <%%= link_to "Show this <%= chat_model_name.underscore.humanize.downcase %>", <%= chat_model_name.underscore %> %>
+    </p>
+  <%% end %>
+</div>
+
+<%%= link_to "New <%= chat_model_name.underscore.humanize.downcase %>", new_<%= chat_model_name.underscore %>_path %>

data/lib/generators/ruby_llm/chat_ui/templates/views/chats/new.html.erb.tt

@@ -0,0 +1,11 @@
+<%% content_for :title, "New <%= chat_model_name.underscore.humanize.downcase %>" %>
+
+<h1>New <%= chat_model_name.underscore.humanize.downcase %></h1>
+
+<%%= render "form", <%= chat_model_name.underscore %>: @<%= chat_model_name.underscore %> %>
+
+<br>
+
+<div>
+  <%%= link_to "Back to <%= chat_model_name.tableize.humanize.downcase %>", <%= chat_model_name.tableize %>_path %>
+</div>

data/lib/generators/ruby_llm/chat_ui/templates/views/chats/show.html.erb.tt

@@ -0,0 +1,23 @@
+<p style="color: green"><%%= notice %></p>
+
+<%%= turbo_stream_from "<%= chat_model_name.underscore %>_#{@<%= chat_model_name.underscore %>.id}" %>
+
+<%% content_for :title, "<%= chat_model_name %>" %>
+
+<h1><%= chat_model_name %> <%%= @<%= chat_model_name.underscore %>.id %></h1>
+
+<p>Using <strong><%%= @<%= chat_model_name.underscore %>.model_association.name %></strong></p>
+
+<div id="<%= message_model_name.tableize %>">
+  <%% @<%= chat_model_name.underscore %>.messages_association.where.not(id: nil).each do |<%= message_model_name.underscore %>| %>
+    <%%= render "<%= message_model_name.tableize %>/<%= message_model_name.underscore %>", <%= message_model_name.underscore %>: <%= message_model_name.underscore %> %>
+  <%% end %>
+</div>
+
+<div style="margin-top: 30px;">
+  <%%= render "<%= message_model_name.tableize %>/form", <%= chat_model_name.underscore %>: @<%= chat_model_name.underscore %>, <%= message_model_name.underscore %>: @<%= message_model_name.underscore %> %>
+</div>
+
+<div style="margin-top: 20px;">
+  <%%= link_to "Back to <%= chat_model_name.tableize.humanize.downcase %>", <%= chat_model_name.tableize %>_path %>
+</div>

data/lib/generators/ruby_llm/chat_ui/templates/views/messages/_form.html.erb.tt

@@ -0,0 +1,21 @@
+<%%= form_with(model: [<%= chat_model_name.underscore %>, <%= message_model_name.underscore %>], id: "new_<%= message_model_name.underscore %>") do |form| %>
+  <%% if <%= message_model_name.underscore %>.errors.any? %>
+    <div style="color: red">
+      <h2><%%= pluralize(<%= message_model_name.underscore %>.errors.count, "error") %> prohibited this <%= message_model_name.underscore.humanize.downcase %> from being saved:</h2>
+
+      <ul>
+        <%% <%= message_model_name.underscore %>.errors.each do |error| %>
+          <li><%%= error.full_message %></li>
+        <%% end %>
+      </ul>
+    </div>
+  <%% end %>
+
+  <div>
+    <%%= form.text_field :content, style: "width: 100%; max-width: 600px;", placeholder: "Message...", autofocus: true %>
+  </div>
+
+  <div>
+    <%%= form.submit "Send <%= message_model_name.underscore.humanize.downcase %>" %>
+  </div>
+<%% end %>

data/lib/generators/ruby_llm/chat_ui/templates/views/messages/_message.html.erb.tt

@@ -0,0 +1,10 @@
+<%%= tag.div id: dom_id(<%= message_model_name.underscore %>), class: "<%= message_model_name.underscore %>",
+    style: "margin-bottom: 20px; padding: 10px; border-left: 3px solid #{<%= message_model_name.underscore %>.role == 'user' ? '#007bff' : '#28a745'};" do %>
+  <div style="font-weight: bold; margin-bottom: 5px;">
+    <%%= <%= message_model_name.underscore %>.role&.capitalize %>
+  </div>
+  <div style="white-space: pre-wrap;"><%%= <%= message_model_name.underscore %>.content %></div>
+  <div style="font-size: 0.85em; color: #666; margin-top: 5px;">
+    <%%= <%= message_model_name.underscore %>.created_at&.strftime("%I:%M %p") %>
+  </div>
+<%% end %>

data/lib/generators/ruby_llm/chat_ui/templates/views/messages/create.turbo_stream.erb.tt

@@ -0,0 +1,9 @@
+<%%= turbo_stream.append "<%= message_model_name.tableize %>" do %>
+  <%% @<%= chat_model_name.underscore %>.messages_association.last(2).each do |<%= message_model_name.underscore %>| %>
+    <%%= render "<%= message_model_name.tableize %>/<%= message_model_name.underscore %>", <%= message_model_name.underscore %>: <%= message_model_name.underscore %> %>
+  <%% end %>
+<%% end %>
+
+<%%= turbo_stream.replace "new_<%= message_model_name.underscore %>" do %>
+  <%%= render "<%= message_model_name.tableize %>/form", <%= chat_model_name.underscore %>: @<%= chat_model_name.underscore %>, <%= message_model_name.underscore %>: @<%= chat_model_name.underscore %>.messages_association.build %>
+<%% end %>

data/lib/generators/ruby_llm/chat_ui/templates/views/models/_model.html.erb.tt

@@ -0,0 +1,16 @@
+<tr id="<%%= dom_id <%= model_model_name.underscore %> %>">
+  <td><%%= <%= model_model_name.underscore %>.provider %></td>
+  <td><%%= <%= model_model_name.underscore %>.name %></td>
+  <td><%%= number_with_delimiter(<%= model_model_name.underscore %>.context_window) if <%= model_model_name.underscore %>.context_window %></td>
+  <td>
+    <%% if <%= model_model_name.underscore %>.pricing && <%= model_model_name.underscore %>.pricing['text_tokens'] && <%= model_model_name.underscore %>.pricing['text_tokens']['standard'] %>
+      <%% input = <%= model_model_name.underscore %>.pricing['text_tokens']['standard']['input_per_million'] %>
+      <%% output = <%= model_model_name.underscore %>.pricing['text_tokens']['standard']['output_per_million'] %>
+      <%% if input && output %>
+        $<%%= "%.2f" % input %> / $<%%= "%.2f" % output %>
+      <%% end %>
+    <%% end %>
+  </td>
+  <td><%%= link_to "Show", <%= model_model_name.underscore %> %></td>
+  <td><%%= link_to "Start <%= chat_model_name.underscore.humanize.downcase %>", new_<%= chat_model_name.underscore %>_path(model: <%= model_model_name.underscore %>.model_id) %></td>
+</tr>

data/lib/generators/ruby_llm/chat_ui/templates/views/models/index.html.erb.tt

@@ -0,0 +1,30 @@
+<p style="color: green"><%%= notice %></p>
+
+<%% content_for :title, "<%= model_model_name.pluralize %>" %>
+
+<h1><%= model_model_name.pluralize %></h1>
+
+<p>
+  <%%= button_to "Refresh <%= model_model_name.pluralize %>", refresh_<%= model_model_name.tableize %>_path, method: :post %>
+</p>
+
+<div id="<%= model_model_name.tableize %>">
+  <table>
+    <thead>
+      <tr>
+        <th>Provider</th>
+        <th>Model</th>
+        <th>Context Window</th>
+        <th>$/1M tokens (In/Out)</th>
+        <th colspan="2"></th>
+      </tr>
+    </thead>
+    <tbody>
+      <%% @<%= model_model_name.tableize %>.values.flatten.each do |<%= model_model_name.underscore %>| %>
+        <%%= render <%= model_model_name.underscore %> %>
+      <%% end %>
+    </tbody>
+  </table>
+</div>
+
+<%%= link_to "Back to <%= chat_model_name.tableize.humanize.downcase %>", <%= chat_model_name.tableize %>_path %>

data/lib/generators/ruby_llm/chat_ui/templates/views/models/show.html.erb.tt

@@ -0,0 +1,18 @@
+<%% content_for :title, @model.name %>
+
+<h1><%%= @model.name %></h1>
+
+<p><strong>ID:</strong> <%%= @model.model_id %></p>
+<p><strong>Provider:</strong> <%%= @model.provider %></p>
+<p><strong>Context Window:</strong> <%%= number_with_delimiter(@model.context_window) %> tokens</p>
+<p><strong>Max Output:</strong> <%%= number_with_delimiter(@model.max_output_tokens) %> tokens</p>
+
+<%% if @model.capabilities.any? %>
+  <p><strong>Capabilities:</strong> <%%= @model.capabilities.join(", ") %></p>
+<%% end %>
+
+<p>
+  <%%= link_to "Start chat with this model", new_chat_path(model: @model.model_id) %> |
+  <%%= link_to "All models", models_path %> |
+  <%%= link_to "Back to chats", chats_path %>
+</p>

data/lib/generators/ruby_llm/install/templates/chat_model.rb.tt

@@ -1,3 +1,3 @@
-class <%= options[:chat_model_name] %> < ApplicationRecord
+class <%= chat_model_name %> < ApplicationRecord
   <%= acts_as_chat_declaration %>
-end
+end

data/lib/generators/ruby_llm/install/templates/create_chats_migration.rb.tt

@@ -1,8 +1,8 @@
-class Create<%= options[:chat_model_name].pluralize %> < ActiveRecord::Migration<%= migration_version %>
+class Create<%= chat_model_name.pluralize %> < ActiveRecord::Migration<%= migration_version %>
   def change
-    create_table :<%= options[:chat_model_name].tableize %> do |t|
-      t.string :model_id
+    create_table :<%= chat_model_name.tableize %> do |t|
+      t.references :<%= model_model_name.tableize.singularize %>, foreign_key: true
       t.timestamps
     end
   end
-end
+end

data/lib/generators/ruby_llm/install/templates/create_messages_migration.rb.tt

@@ -1,15 +1,16 @@
-# Migration for creating messages table with references to chats and tool_calls
-class Create<%= options[:message_model_name].pluralize %> < ActiveRecord::Migration<%= migration_version %>
+class Create<%= message_model_name.pluralize %> < ActiveRecord::Migration<%= migration_version %>
   def change
-    create_table :<%= options[:message_model_name].tableize %> do |t|
-      t.references :<%= options[:chat_model_name].tableize.singularize %>, null: false, foreign_key: true
-      t.string :role
+    create_table :<%= message_model_name.tableize %> do |t|
+      t.references :<%= chat_model_name.tableize.singularize %>, null: false, foreign_key: true
+      t.string :role, null: false
       t.text :content
-      t.string :model_id
+      t.references :<%= model_model_name.tableize.singularize %>, foreign_key: true
       t.integer :input_tokens
       t.integer :output_tokens
-      t.references :<%= options[:tool_call_model_name].tableize.singularize %>
+      t.references :<%= tool_call_model_name.tableize.singularize %>, foreign_key: true
       t.timestamps
     end
+
+    add_index :<%= message_model_name.tableize %>, :role
   end
 end

data/lib/generators/ruby_llm/install/templates/create_models_migration.rb.tt

@@ -0,0 +1,43 @@
+class Create<%= model_model_name.pluralize %> < ActiveRecord::Migration<%= migration_version %>
+  def change
+    create_table :<%= model_model_name.tableize %> do |t|
+      t.string :model_id, null: false
+      t.string :name, null: false
+      t.string :provider, null: false
+      t.string :family
+      t.datetime :model_created_at
+      t.integer :context_window
+      t.integer :max_output_tokens
+      t.date :knowledge_cutoff
+<% if postgresql? %>
+      t.jsonb :modalities, default: {}
+      t.jsonb :capabilities, default: []
+      t.jsonb :pricing, default: {}
+      t.jsonb :metadata, default: {}
+<% else %>
+      t.json :modalities, default: {}
+      t.json :capabilities, default: []
+      t.json :pricing, default: {}
+      t.json :metadata, default: {}
+<% end %>
+      t.timestamps
+
+      t.index [:provider, :model_id], unique: true
+      t.index :provider
+      t.index :family
+<% if postgresql? %>
+      t.index :capabilities, using: :gin
+      t.index :modalities, using: :gin
+<% end %>
+    end
+
+    # Load models from JSON
+    say_with_time "Loading models from models.json" do
+      RubyLLM.models.load_from_json!
+      model_class = '<%= model_model_name %>'.constantize
+      model_class.save_to_database
+
+      "Loaded #{model_class.count} models"
+    end
+  end
+end

data/lib/generators/ruby_llm/install/templates/create_tool_calls_migration.rb.tt

@@ -1,14 +1,15 @@
 <%#- # Migration for creating tool_calls table with database-specific JSON handling -%>
-class Create<%= options[:tool_call_model_name].pluralize %> < ActiveRecord::Migration<%= migration_version %>
+class Create<%= tool_call_model_name.pluralize %> < ActiveRecord::Migration<%= migration_version %>
   def change
-    create_table :<%= options[:tool_call_model_name].tableize %> do |t|
-      t.references :<%= options[:message_model_name].tableize.singularize %>, null: false, foreign_key: true
+    create_table :<%= tool_call_model_name.tableize %> do |t|
+      t.references :<%= message_model_name.tableize.singularize %>, null: false, foreign_key: true
       t.string :tool_call_id, null: false
       t.string :name, null: false
       t.<%= postgresql? ? 'jsonb' : 'json' %> :arguments, default: {}
       t.timestamps
     end
 
-    add_index :<%= options[:tool_call_model_name].tableize %>, :tool_call_id
+    add_index :<%= tool_call_model_name.tableize %>, :tool_call_id, unique: true
+    add_index :<%= tool_call_model_name.tableize %>, :name
   end
-end
+end

data/lib/generators/ruby_llm/install/templates/initializer.rb.tt

@@ -1,6 +1,12 @@
 RubyLLM.configure do |config|
-  config.openai_api_key = ENV["OPENAI_API_KEY"]
-  config.anthropic_api_key = ENV["ANTHROPIC_API_KEY"]
-
+  config.openai_api_key = Rails.application.credentials.dig(:openai_api_key)
   # config.default_model = "gpt-4.1-nano"
-end
+
+  # Use the new association-based acts_as API (recommended)
+  config.use_new_acts_as = true
+<% if model_model_name != 'Model' -%>
+
+  # Custom model registry class name
+  config.model_registry_class = "<%= model_model_name %>"
+<% end -%>
+end

data/lib/generators/ruby_llm/install/templates/message_model.rb.tt

@@ -1,3 +1,4 @@
-class <%= options[:message_model_name] %> < ApplicationRecord
-  <%= acts_as_message_declaration %>
-end
+class <%= message_model_name %> < ApplicationRecord
+  <%= acts_as_message_declaration %><% unless options[:skip_active_storage] %>
+  has_many_attached :attachments<% end %>
+end

data/lib/generators/ruby_llm/install/templates/model_model.rb.tt

@@ -0,0 +1,3 @@
+class <%= model_model_name %> < ApplicationRecord
+  <%= acts_as_model_declaration %>
+end

data/lib/generators/ruby_llm/install/templates/tool_call_model.rb.tt

@@ -1,3 +1,3 @@
-class <%= options[:tool_call_model_name] %> < ApplicationRecord
+class <%= tool_call_model_name %> < ApplicationRecord
   <%= acts_as_tool_call_declaration %>
-end
+end