ruby_llm 1.15.0 → 2.0.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3cfdd21451b6e3daac0463dfdb7655892967e5a4da6b00846f353809a9abe18a
-  data.tar.gz: e1505ddd57326601298bb8975c20049a195eb87babd62b08ac0e6340c9e653f6
+  metadata.gz: 3e6a6455ecb1c6bf276d863d9e1f181f1a1d3ea87092800a01522c1fb9be35fc
+  data.tar.gz: 39554eb45edfde45e43e0a9eb9afe2a5e07cf6601b9b8076e19065493e62e0fd
 SHA512:
-  metadata.gz: 7222e575d4f1e5cf620fdc37f4c255c7ededeee945d7b77fac4129c2947d6f78f7d5641b45ed39470180e5bf2dfd48b36e0a6c16579e4e4835564c48b6907920
-  data.tar.gz: ce3fb0f0e8b3665fafe56717cf8fcb10733008821633b024013d0f6e5d0bc90ef47f25b0109aa0e80ee3df4002e2f9b6a20cd98595031aa57235588cb4677052
+  metadata.gz: c92879f31f983745665f2a08db2e9b01a293d40ebd2a0e68ee899e1af4b77f7d4c6767c700bcbdecc85088a43a0fae58a11b617c4409e1b04b73d44a7f59b4da
+  data.tar.gz: 853e3cdde61afafbfdff5ff84cdc3c9878002f4da1b81e45e1b105b0caf759587647a03cb05d85d806a5e3c91c48ec426d24e356615914802860cb1cdec9c6cb

data/.rdoc_options

@@ -0,0 +1,25 @@
+---
+title: RubyLLM
+exclude:
+  - lib/ruby_llm/providers/
+  - lib/ruby_llm/protocols/
+  - lib/ruby_llm/protocol/
+  - lib/ruby_llm/transport/
+  - lib/ruby_llm/support/
+  - lib/ruby_llm/accounting/
+  - lib/ruby_llm/files/
+  - lib/ruby_llm/tools/
+  - lib/ruby_llm/models/
+  - lib/ruby_llm/chat/tool_concurrency\.rb$
+  - lib/ruby_llm/transcription/wav_audio\.rb$
+  - lib/tasks/
+  - lib/generators/
+  - \.json$
+footer_content:
+  Documentation:
+    Guides: https://rubyllm.com/next/
+    Upgrading: https://rubyllm.com/next/upgrading/
+  Resources:
+    GitHub: https://github.com/crmne/ruby_llm
+    Issues: https://github.com/crmne/ruby_llm/issues
+    Releases: https://github.com/crmne/ruby_llm/releases

data/README.md

@@ -5,9 +5,11 @@
   <img src="/docs/assets/images/logotype.svg" alt="RubyLLM" height="120" width="250">
 </picture>
 
-<strong>One *beautiful* Ruby API for GPT, Claude, Gemini, and more.</strong>
+<strong>Build AI features the Ruby way</strong>
 
-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) — *Your AI coworker*
+<p>The Ruby-native AI framework. Build with chats, tools, agents, images, audio, and video through one consistent API, in plain Ruby or Rails.</p>
+
+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) - *Fully private work AI*
 
 [![Gem Version](https://badge.fury.io/rb/ruby_llm.svg)](https://badge.fury.io/rb/ruby_llm)
 [![Ruby Style Guide](https://img.shields.io/badge/code_style-rubocop-brightgreen.svg)](https://github.com/rubocop/rubocop)
@@ -22,20 +24,22 @@ Battle tested at [<picture><source media="(prefers-color-scheme: dark)" srcset="
 
 ---
 
-Build chatbots, AI agents, RAG applications. Works with OpenAI, xAI, Anthropic, Google, AWS, local models, and any OpenAI-compatible API.
+Work with OpenAI, xAI, Anthropic, Google, AWS, local models, and more. Seventeen providers are built in, and you can connect an OpenAI-compatible endpoint directly.
 
-## From zero to AI chat app in under two minutes
+## Build a working Ruby AI chat in two minutes
 
 https://github.com/user-attachments/assets/65422091-9338-47da-a303-92b918bd1345
 
 ## Why RubyLLM?
 
-Every AI provider ships their own bloated client. Different APIs. Different response formats. Different conventions. It's exhausting.
+Use the same Ruby methods across providers. Add files to a conversation, give an agent tools, generate media, or build a search feature with embeddings and reranking. Read response text, generated files, and usage through Ruby objects.
 
-RubyLLM gives you one beautiful API for all of them. Same interface whether you're using GPT, Claude, or your local Ollama. Just three dependencies: Faraday, Zeitwerk, and Marcel. That's it.
+In Rails, the API works on your own Chat and Message records, with Active Storage attachments, Hotwire streaming, and background jobs. RubyLLM maintains the supporting model registry, tool calls, usage ledger, and batches. A handful of small dependencies keeps it easy to bring into an existing application.
 
 ## Show me the code
 
+These examples use **2.0.0.rc1**. Follow [Getting Started](https://rubyllm.com/next/getting-started/) to install it and configure the providers you want to try.
+
 ```ruby
 # Just ask questions
 chat = RubyLLM.chat
@@ -43,7 +47,8 @@ chat.ask "What's the best way to learn Ruby?"
 ```
 
 ```ruby
-# Analyze any file type
+# Ask about files with a model that supports their input types
+chat = RubyLLM.chat(model: "gemini-3.7-flash")
 chat.ask "What's in this image?", with: "ruby_conf.jpg"
 chat.ask "What's happening in this video?", with: "video.mp4"
 chat.ask "Describe this meeting", with: "meeting.wav"
@@ -65,28 +70,56 @@ end
 
 ```ruby
 # Generate images
-RubyLLM.paint "a sunset over mountains in watercolor style"
+image = RubyLLM.paint "a sunset over mountains in watercolor style"
+image.save "sunset.png"
+```
+
+```ruby
+# Generate videos
+video = RubyLLM.animate "a paper boat sailing down a rainy gutter"
+video.save "paper_boat.mp4"
 ```
 
 ```ruby
 # Create embeddings
-RubyLLM.embed "Ruby is elegant and expressive"
+embedding = RubyLLM.embed "Ruby is elegant and expressive"
+embedding.vectors
+```
+
+```ruby
+# Rank search results
+documents = ["Reset your password in Settings.", "Invoices arrive by email."]
+ranked = RubyLLM.rerank("How do I reset my password?", documents, model: "rerank-v3.5")
+ranked.results.first.document
 ```
 
 ```ruby
 # Transcribe audio to text
-RubyLLM.transcribe "meeting.wav"
+transcript = RubyLLM.transcribe "meeting.wav"
+puts transcript.text
+```
+
+```ruby
+# Turn text into speech
+speech = RubyLLM.speak "Hello, welcome to RubyLLM!"
+speech.save "welcome.mp3"
 ```
 
 ```ruby
-# Moderate content for safety
-RubyLLM.moderate "Check if this text is safe"
+# Extract document text as markdown
+document = RubyLLM.ocr "contract.pdf"
+puts document.markdown
+```
+
+```ruby
+# Check whether a moderation model flags content
+RubyLLM.moderate("Some user-generated content").flagged?
 ```
 
 ```ruby
 # Let AI use your code
 class Weather < RubyLLM::Tool
-  desc "Get current weather"
+  description "Get current weather"
 
   def execute(latitude:, longitude:)
     url = "https://api.open-meteo.com/v1/forecast?latitude=#{latitude}&longitude=#{longitude}&current=temperature_2m,wind_speed_10m"
@@ -94,13 +127,13 @@ class Weather < RubyLLM::Tool
   end
 end
 
-chat.with_tool(Weather).ask "What's the weather in Berlin?"
+chat.with_tools(Weather).ask "What's the weather in Berlin?"
 ```
 
 ```ruby
 # Define an agent with instructions + tools
 class WeatherAssistant < RubyLLM::Agent
-  model "gpt-5-nano"
+  model "gpt-5.6-luna"
   instructions "Be concise and always use tools for weather."
   tools Weather
 end
@@ -110,7 +143,7 @@ WeatherAssistant.new.ask "What's the weather in Berlin?"
 
 ```ruby
 # Get structured output
-class ProductSchema < RubyLLM::Schema
+class ProductSchema < Schematist::Schema
   string :name
   number :price
   array :features do
@@ -119,50 +152,71 @@ class ProductSchema < RubyLLM::Schema
 end
 
 response = chat.with_schema(ProductSchema).ask "Analyze this product", with: "product.txt"
+response.parsed
 ```
 
 ## Features
 
 * **Chat:** Conversational AI with `RubyLLM.chat`
 * **Vision:** Analyze images and videos
-* **Audio:** Transcribe and understand speech with `RubyLLM.transcribe`
-* **Documents:** Extract from PDFs, CSVs, JSON, any file type
+* **Audio:** Transcribe speech with `RubyLLM.transcribe` and generate it with `RubyLLM.speak`
+* **Documents:** Ask questions about PDFs, text files, and other supported formats
+* **OCR:** Turn documents into markdown with `RubyLLM.ocr`
 * **Image generation:** Create images with `RubyLLM.paint`
+* **Video generation:** Create videos with `RubyLLM.animate`
 * **Embeddings:** Generate embeddings with `RubyLLM.embed`
-* **Moderation:** Content safety with `RubyLLM.moderate`
+* **Reranking:** Order retrieval candidates by relevance with `RubyLLM.rerank`
+* **Moderation:** Content flags, categories, and scores with `RubyLLM.moderate`
 * **Tools:** Let AI call your Ruby methods
+* **Tool approval:** Park a run until a human approves with `requires_approval`
+* **The agentic loop:** Drive it yourself with `ask_later`, `step`, and `complete?`
+* **Server tools:** Web search, code execution, and MCP connectors with `with_server_tools`
 * **Agents:** Reusable assistants with `RubyLLM::Agent`
-* **Structured output:** JSON schemas that just work
+* **Prompt templates:** ERB prompts in `app/prompts`, rendered with `RubyLLM.render_prompt`
+* **Workflows:** Correlate multi-agent runs in your telemetry with `RubyLLM.workflow`
+* **Structured output:** Define a Ruby schema and read the result with `response.parsed`
 * **Streaming:** Real-time responses with blocks
-* **Rails:** ActiveRecord integration with `acts_as_chat`
+* **Rails:** Active Record persistence, Active Storage attachments, Hotwire streaming, and generators
+* **Files:** Upload once and reuse across chats with `RubyLLM.upload`
+* **Prompt caching:** Turn on the provider's cache with `with_caching` and `cache_until_here`
+* **Fallbacks and cancellation:** Retry on backup models with `with_fallbacks`, stop a run with `cancel`
+* **Cost tracking:** A per-attempt usage ledger behind `chat.tokens` and `chat.cost`
 * **Async:** Fiber-based concurrency
-* **Model registry:** 800+ models with capability detection and pricing
+* **Model registry:** Browse capabilities, limits, and pricing across providers
 * **Extended thinking:** Control, view, and persist model deliberation
-* **Providers:** OpenAI, xAI, Anthropic, Gemini, VertexAI, Bedrock, DeepSeek, Mistral, Ollama, OpenRouter, Perplexity, GPUStack, and any OpenAI-compatible API
+* **Citations:** Normalized source citations from documents, search, and grounding
+* **Batches:** Provider-side batch processing with provider-specific discounts via `RubyLLM.batch`
+* **Compaction:** Let providers condense long conversations with `with_compaction`
+* **Token counting:** Count a request before you send it with `count_tokens`
+* **Providers:** OpenAI, Azure, xAI, Anthropic, Gemini, VertexAI, Bedrock, Cohere, DeepSeek, Mistral, Ollama, Ollama Cloud, OpenRouter, Perplexity, GPUStack, ElevenLabs, Deepgram, and any OpenAI-compatible API
 
 ## Installation
 
-Add to your Gemfile:
-```ruby
-gem 'ruby_llm'
+Install the 2.0 release candidate:
+
+```bash
+bundle add ruby_llm --version 2.0.0.rc1
 ```
-Then `bundle install`.
 
-Configure your API keys:
+Configure a provider in your script, or in `config/initializers/ruby_llm.rb` in Rails:
+
 ```ruby
-# config/initializers/ruby_llm.rb
+require 'ruby_llm'
+
 RubyLLM.configure do |config|
-  config.openai_api_key = ENV['OPENAI_API_KEY']
+  config.openai_api_key = ENV.fetch('OPENAI_API_KEY')
 end
 ```
 
+Configure the other providers used by the examples as needed: Gemini for files, xAI for video, Mistral for OCR, and Cohere for reranking. [Getting Started](https://rubyllm.com/next/getting-started/) shows each setup beside its example. If your app uses 1.16, follow the [upgrade guide](https://rubyllm.com/next/upgrading/) before deploying 2.0.
+
 ## Rails
 
 ```bash
 # Install Rails Integration
 bin/rails generate ruby_llm:install
 bin/rails db:migrate
-bin/rails ruby_llm:load_models # v1.13+
+bin/rails ruby_llm:load_models
 
 # Add Chat UI (optional)
 bin/rails generate ruby_llm:chat_ui
@@ -173,7 +227,7 @@ class Chat < ApplicationRecord
   acts_as_chat
 end
 
-chat = Chat.create! model: "claude-sonnet-4"
+chat = Chat.create! model: "gpt-5.6-luna"
 chat.ask "What's in this file?", with: "report.pdf"
 ```
 
@@ -181,7 +235,7 @@ Visit `http://localhost:3000/chats` for a ready-to-use chat interface!
 
 ## Documentation
 
-[rubyllm.com](https://rubyllm.com)
+[Guides](https://rubyllm.com/next/getting-started/) · [API reference](https://rubyllm.com/next/api/) · [Models](https://rubyllm.com/available-models/) · [Upgrading](https://rubyllm.com/next/upgrading/)
 
 ## Contributing
 

data/exe/ruby_llm

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+$LOAD_PATH.unshift File.expand_path('../lib', __dir__)
+
+require 'generators/ruby_llm/provider/cli'
+
+exit RubyLLM::Generators::Provider::CLI.run(ARGV)

data/lib/generators/ruby_llm/agent/templates/agent.rb.tt

@@ -2,5 +2,4 @@ class <%= agent_class_name %> < RubyLLM::Agent
   # Change `Chat` to your app's chat model for Rails persistence.
   # Remove this line to skip persistence and use plain RubyLLM chats.
   chat_model Chat
-  instructions
 end

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

@@ -28,8 +28,6 @@ module RubyLLM
         args = []
         args << "chat:#{chat_model_name}" if chat_model_name != 'Chat'
         args << "message:#{message_model_name}" if message_model_name != 'Message'
-        args << "model:#{model_model_name}" if model_model_name != 'Model'
-        args << "tool_call:#{tool_call_model_name}" if tool_call_model_name != 'ToolCall'
         arg_string = args.any? ? " #{args.join(' ')}" : ''
 
         raise Thor::Error, <<~ERROR
@@ -37,9 +35,6 @@ module RubyLLM
 
           Please run the install generator first:
             bin/rails generate ruby_llm:install#{arg_string}
-
-          Or if upgrading from <= 1.6.x, run the upgrade generator:
-            bin/rails generate ruby_llm:upgrade_to_v1_7#{arg_string}
         ERROR
       end
 
@@ -114,6 +109,7 @@ module RubyLLM
         return if application_controller.include?('def available_chat_models')
 
         inject_into_file path, <<-RUBY, before: /^end\s*\z/
+
   private
 
   def available_chat_models
@@ -133,7 +129,7 @@ module RubyLLM
 
           routes_content = <<~ROUTES.strip
             namespace :#{namespace} do
-              resources :#{model_resource}, only: [ :index, :show ] do
+              resources :#{model_resource}, only: [ :index, :show ], constraints: { id: /[^\\/]+/ } do
                 collection do
                   post :refresh
                 end
@@ -146,7 +142,7 @@ module RubyLLM
           route routes_content
         else
           model_routes = <<~ROUTES.strip
-            resources :#{model_table_name}, only: [ :index, :show ] do
+            resources :#{model_resource_name}, only: [ :index, :show ], constraints: { id: /[^\\/]+/ } do
               collection do
                 post :refresh
               end
@@ -208,26 +204,6 @@ module RubyLLM
 
       private
 
-      def ui_variant
-        @ui_variant ||= case options[:ui]
-                        when 'tailwind'
-                          :tailwind
-                        when 'auto'
-                          tailwind_available? ? :tailwind : :scaffold
-                        else
-                          :scaffold
-                        end
-      end
-
-      def ui_template(template_path)
-        return template_path unless ui_variant == :tailwind
-
-        # Keep Tailwind templates as a separate set so we can mirror Rails/Tailwind
-        # scaffold conventions without complicating scaffold templates.
-        tailwind_template = "tailwind/#{template_path}"
-        File.exist?(File.join(self.class.source_root, "#{tailwind_template}.tt")) ? tailwind_template : template_path
-      end
-
       def message_helper_module_name
         if message_model_name.include?('::')
           "#{message_model_name.deconstantize}::#{message_model_name.demodulize.pluralize}Helper"
@@ -235,22 +211,6 @@ module RubyLLM
           "#{message_model_name.pluralize}Helper"
         end
       end
-
-      def tailwind_available?
-        Rails.root.join('app/assets/tailwind/application.css').exist? ||
-          Rails.root.join('config/tailwind.config.js').exist? ||
-          gem_in_bundle?('tailwindcss-rails') ||
-          gem_in_bundle?('cssbundling-rails')
-      end
-
-      def gem_in_bundle?(gem_name)
-        gemfile_path = Rails.root.join('Gemfile')
-        lockfile_path = Rails.root.join('Gemfile.lock')
-
-        [gemfile_path, lockfile_path].any? do |path|
-          path.exist? && path.read.include?(gem_name)
-        end
-      end
     end
   end
 end

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

@@ -7,22 +7,30 @@ class <%= chat_controller_class_name %> < ApplicationController
 
   def new
     @<%= chat_variable_name %> = <%= chat_model_name %>.new
-    @selected_model = params[:model]
+    @selected_model = params[:provider] ? [ params[:provider], params[:model] ].join(":") : params[:model]
     @chat_models = available_chat_models
   end
 
   def create
     prompt = params.dig(:<%= chat_variable_name %>, :prompt)
     if prompt.present?
-      @<%= chat_variable_name %> = <%= chat_model_name %>.create!(model: params.dig(:<%= chat_variable_name %>, :model).presence)
+      provider, model = params.dig(:<%= chat_variable_name %>, :model).to_s.split(":", 2)
+      @<%= chat_variable_name %> = <%= chat_model_name %>.create!(model: model.presence, provider: provider.presence)
       <%= chat_job_class_name %>.perform_later(@<%= chat_variable_name %>.id, prompt)
 
       redirect_to @<%= chat_variable_name %>, notice: "<%= chat_model_name.humanize %> was successfully created."
+    else
+      @<%= chat_variable_name %> = <%= chat_model_name %>.new
+      @<%= chat_variable_name %>.errors.add(:prompt, "can't be blank")
+      @selected_model = params.dig(:<%= chat_variable_name %>, :model)
+      @chat_models = available_chat_models
+
+      render :new, status: <%= unprocessable_content_status.inspect %>
     end
   end
 
   def show
-    @<%= message_variable_name %> = @<%= chat_variable_name %>.<%= message_table_name %>.build
+    @<%= message_variable_name %> = <%= message_model_name %>.new
   end
 
   def destroy

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

@@ -10,6 +10,14 @@ class <%= message_controller_class_name %> < ApplicationController
         format.turbo_stream
         format.html { redirect_to @<%= chat_variable_name %> }
       end
+    else
+      @<%= message_variable_name %> = @<%= chat_variable_name %>.<%= message_table_name %>.build
+      @<%= message_variable_name %>.errors.add(:content, "can't be blank")
+
+      respond_to do |format|
+        format.turbo_stream { render :create, status: <%= unprocessable_content_status.inspect %> }
+        format.html { render "<%= chat_model_name.underscore.pluralize %>/show", status: <%= unprocessable_content_status.inspect %> }
+      end
     end
   end
 

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

@@ -1,14 +1,14 @@
 class <%= model_controller_class_name %> < ApplicationController
   def index
-    @<%= model_table_name %> = available_chat_models
+    @<%= model_resource_name %> = available_chat_models
   end
 
   def show
-    @<%= model_variable_name %> = <%= model_model_name %>.find(params[:id])
+    @<%= model_variable_name %> = RubyLLM.models.find(params[:id], params[:provider])
   end
 
   def refresh
-    <%= model_model_name %>.refresh!
-    redirect_to <%= model_table_name %>_path, notice: "<%= model_model_name.pluralize %> refreshed successfully"
+    RubyLLM.models.refresh
+    redirect_to <%= model_resource_name %>_path, notice: "<%= model_model_name.pluralize %> refreshed successfully"
   end
 end

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

@@ -1,7 +1,7 @@
 <div id="<%%= dom_id <%= chat_model_name.demodulize.underscore %> %>" class="w-full sm:w-auto my-5 space-y-3">
   <div>
     <strong class="block font-medium mb-1">Model:</strong>
-    <%%= <%= chat_model_name.demodulize.underscore %>.<%= model_table_name.singularize %>&.label || default_model_display_name %>
+    <%%= <%= chat_model_name.demodulize.underscore %>.model&.label || default_model_display_name %>
   </div>
 
   <div>

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

@@ -14,7 +14,7 @@
   <div class="my-5">
     <%%= form.label :model, "Select AI model:" %>
     <%%= form.select :model,
-        options_for_select(@chat_models.map { |model| [model.label, model.id] }.unshift([default_model_display_name, nil]), @selected_model),
+        options_for_select(@chat_models.map { |model| [model.label, [model.provider, model.id].join(":")] }.unshift([default_model_display_name, nil]), @selected_model),
         {},
         class: ["block shadow-sm rounded-md border px-3 py-2 mt-2 w-full", {"border-gray-400 focus:outline-blue-600": <%= chat_variable_name %>.errors[:model].none?, "border-red-400 focus:outline-red-600": <%= chat_variable_name %>.errors[:model].any?}] %>
   </div>

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

@@ -8,7 +8,7 @@
   <div class="flex justify-between items-center">
     <h1 class="font-bold text-4xl"><%= chat_model_name.pluralize %></h1>
     <div class="flex items-center gap-2">
-      <%%= link_to "<%= model_model_name.pluralize %>", <%= model_table_name %>_path, class: "rounded-md px-3.5 py-2.5 bg-gray-100 hover:bg-gray-50 text-gray-900 block font-medium" %>
+      <%%= link_to "<%= model_model_name.pluralize %>", <%= model_resource_name %>_path, class: "rounded-md px-3.5 py-2.5 bg-gray-100 hover:bg-gray-50 text-gray-900 block font-medium" %>
       <%%= link_to "New <%= chat_table_name.singularize.humanize.downcase %>", new_<%= chat_variable_name %>_path, class: "rounded-md px-3.5 py-2.5 bg-blue-600 hover:bg-blue-500 text-white block font-medium" %>
     </div>
   </div>

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

@@ -12,11 +12,11 @@
 
   <div class="my-5">
     <strong class="block font-medium mb-1">Model:</strong>
-    <%%= @<%= chat_variable_name %>.<%= model_table_name.singularize %>&.label || default_model_display_name %>
+    <%%= @<%= chat_variable_name %>.model&.label || default_model_display_name %>
   </div>
 
   <div id="<%= message_table_name %>" class="min-w-full divide-y divide-gray-200 space-y-5 my-5">
-    <%% @<%= chat_variable_name %>.<%= message_table_name %>.where.not(id: nil).each do |<%= message_variable_name %>| %>
+    <%% @<%= chat_variable_name %>.<%= message_table_name %>.each do |<%= message_variable_name %>| %>
       <%%= render <%= message_variable_name %> %>
     <%% end %>
   </div>

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

@@ -1,4 +1,4 @@
-<%% assistant ||= local_assigns[:message] %>
+<%% assistant ||= local_assigns[:<%= message_model_name.demodulize.underscore %>] %>
 <div id="<%= message_variable_name %>_<%%= assistant.id %>" class="w-full sm:w-auto my-5 space-y-3 rounded-md px-3 py-2 bg-green-50">
   <div>
     <span class="inline-block rounded px-2 py-0.5 text-xs font-medium bg-green-100 text-green-700">

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

@@ -1,4 +1,4 @@
-<%% system ||= local_assigns[:message] %>
+<%% system ||= local_assigns[:<%= message_model_name.demodulize.underscore %>] %>
 <div id="<%= message_variable_name %>_<%%= system.id %>" class="w-full sm:w-auto my-5 space-y-3 rounded-md px-3 py-2 bg-gray-50 border border-gray-200">
   <div>
     <span class="inline-block rounded px-2 py-0.5 text-xs font-medium bg-gray-200 text-gray-700">

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

@@ -1,2 +1,2 @@
-<%% tool ||= local_assigns[:message] %>
+<%% tool ||= local_assigns[:<%= message_model_name.demodulize.underscore %>] %>
 <%%= render tool_result_partial(tool), tool: tool %>

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

@@ -1,4 +1,6 @@
-<%% tool_calls ||= local_assigns[:message] %>
-<%% tool_calls.<%= tool_call_variable_name.pluralize %>.each do |tool_call| %>
-  <%%= render tool_call_partial(tool_call), tool_calls: tool_calls, tool_call: tool_call %>
-<%% end %>
+<%% message = local_assigns[:<%= message_model_name.demodulize.underscore %>] || tool_calls %>
+<div id="<%= message_variable_name %>_<%%= message.id %>">
+  <%% message.<%= tool_call_variable_name.pluralize %>.each_value do |tool_call| %>
+    <%%= render tool_call_partial(tool_call), message: message, tool_call: tool_call %>
+  <%% end %>
+</div>

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

@@ -1,4 +1,4 @@
-<%% user ||= local_assigns[:message] %>
+<%% user ||= local_assigns[:<%= message_model_name.demodulize.underscore %>] %>
 <div id="<%= message_variable_name %>_<%%= user.id %>" class="w-full sm:w-auto my-5 space-y-3 rounded-md px-3 py-2 bg-blue-50">
   <div>
     <span class="inline-block rounded px-2 py-0.5 text-xs font-medium bg-blue-100 text-blue-700">

data/lib/generators/ruby_llm/chat_ui/templates/tailwind/views/messages/tool_calls/_default.html.erb.tt

@@ -1,4 +1,4 @@
-<div id="<%= message_variable_name %>_<%%= tool_calls.id %>" class="w-full sm:w-auto my-5 space-y-3 rounded-md px-3 py-2 bg-gray-50 border border-gray-200">
+<div id="<%= message_variable_name %>_tool_call_<%%= tool_call.id %>" class="w-full sm:w-auto my-5 space-y-3 rounded-md px-3 py-2 bg-gray-50 border border-gray-200">
   <div>
     <span class="inline-block rounded px-2 py-0.5 text-xs font-medium bg-gray-200 text-gray-700">
       Tool Call
@@ -8,6 +8,6 @@
   <pre class="whitespace-pre-wrap text-gray-700 text-sm overflow-x-auto"><%%= tool_call.name %>(<%%= tool_call.arguments.map { |k, v| "#{k}: #{v.inspect}" }.join(", ") %>)</pre>
 
   <div>
-    <span class="text-sm text-gray-600"><%%= tool_calls.created_at&.strftime("%I:%M %p") %></span>
+    <span class="text-sm text-gray-600"><%%= message.created_at&.strftime("%I:%M %p") %></span>
   </div>
 </div>

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

@@ -1,17 +1,16 @@
-<%% model_id = <%= model_model_name.demodulize.underscore %>.respond_to?(:model_id) ? <%= model_model_name.demodulize.underscore %>.model_id : <%= model_model_name.demodulize.underscore %>.id %>
-<%% row_id = [<%= model_model_name.demodulize.underscore %>.provider, model_id].join("_").parameterize(separator: "_") %>
+<%% row_id = [<%= model_model_name.demodulize.underscore %>.provider, <%= model_model_name.demodulize.underscore %>.id].join("_").parameterize(separator: "_") %>
 <tr id="model_<%%= row_id %>">
   <td class="px-3 py-2 text-sm text-gray-700"><%%= <%= model_model_name.demodulize.underscore %>.provider_class&.name || <%= model_model_name.demodulize.underscore %>.provider %></td>
-  <td class="px-3 py-2 text-sm text-gray-900"><%%= <%= model_model_name.demodulize.underscore %>.respond_to?(:display_name) ? <%= model_model_name.demodulize.underscore %>.display_name : <%= model_model_name.demodulize.underscore %>.name %></td>
+  <td class="px-3 py-2 text-sm text-gray-900"><%%= <%= model_model_name.demodulize.underscore %>.name %></td>
   <td class="px-3 py-2 text-sm text-gray-700"><%%= number_with_delimiter(<%= model_model_name.demodulize.underscore %>.context_window) if <%= model_model_name.demodulize.underscore %>.context_window %></td>
   <td class="px-3 py-2 text-sm text-gray-700">
-    <%% input = <%= model_model_name.demodulize.underscore %>.input_price_per_million %>
-    <%% output = <%= model_model_name.demodulize.underscore %>.output_price_per_million %>
+    <%% input = <%= model_model_name.demodulize.underscore %>.price(:input) %>
+    <%% output = <%= model_model_name.demodulize.underscore %>.price(:output) %>
     <%% if input && output %>
       $<%%= "%.2f" % input %> / $<%%= "%.2f" % output %>
     <%% end %>
   </td>
   <td class="px-3 py-2 text-sm">
-    <%%= link_to "Start <%= chat_table_name.singularize.humanize.downcase %>", new_<%= chat_variable_name %>_path(model: model_id), class: "text-blue-600 hover:text-blue-500" %>
+    <%%= link_to "Start <%= chat_table_name.singularize.humanize.downcase %>", new_<%= chat_variable_name %>_path(model: [<%= model_model_name.demodulize.underscore %>.provider, <%= model_model_name.demodulize.underscore %>.id].join(":")), class: "text-blue-600 hover:text-blue-500" %>
   </td>
 </tr>

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

@@ -9,11 +9,11 @@
     <h1 class="font-bold text-4xl"><%= model_model_name.pluralize %></h1>
     <div class="flex items-center gap-2">
       <%%= link_to "<%= chat_model_name.pluralize %>", <%= chat_table_name %>_path, class: "rounded-md px-3.5 py-2.5 bg-gray-100 hover:bg-gray-50 text-gray-900 block font-medium" %>
-      <%%= button_to "Refresh <%= model_model_name.pluralize %>", refresh_<%= model_table_name %>_path, method: :post, class: "rounded-md px-3.5 py-2.5 bg-blue-600 hover:bg-blue-500 text-white block font-medium cursor-pointer" %>
+      <%%= button_to "Refresh <%= model_model_name.pluralize %>", refresh_<%= model_resource_name %>_path, method: :post, class: "rounded-md px-3.5 py-2.5 bg-blue-600 hover:bg-blue-500 text-white block font-medium cursor-pointer" %>
     </div>
   </div>
 
-  <div id="<%= model_table_name %>" class="mt-5 overflow-x-auto">
+  <div id="<%= model_resource_name %>" class="mt-5 overflow-x-auto">
     <%% if @<%= model_variable_name.pluralize %>.any? %>
       <table class="min-w-full divide-y divide-gray-300 border border-gray-300">
         <thead class="bg-gray-50">