ruby_llm 1.8.1 → 1.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8662c9b8b38e5941ea7e66882d59e8583989135285bc4b7eaaf5b83c8c2326e
-  data.tar.gz: 33c168dc4d68d4cffb18bb0761adc42da51288a43aee78633d30f669bffaa47f
+  metadata.gz: 336eefa156c3f1b789ed32054beeb65b803dfa93c346274b4e812dc431bd6faf
+  data.tar.gz: 11f2c00c1eac1f24ad8beab2c4994fda980ac260e6481b261f3b0a515cc419a2
 SHA512:
-  metadata.gz: 6f94e7adcf5b6f50aca97718c615d8dfa681a483da841ca8214f3970ca918a2a8e384f07a494dad9db83da269068a502ab8caf14a441a2ecb86909617e06fdf9
-  data.tar.gz: 8342ae03bb413eb4b65b55c73629b1729b319e96e6976172fcaaa8ed19231280b5773eb8acccf4f563d63c801a78a03b20be5552189f86a4a7e435fb426c354f
+  metadata.gz: e4499bb85b6709d8fb2ff5e61d064f2352e265e03fa84b6f9aa1cba122c441f4239edc8e4ad5f9621fa4965411327d77a880b7496c145bcc2a3664ff4244545d
+  data.tar.gz: 440b540b7c514e72d1f4d916e04fe489cde96feb64f0699e1f7502b698f37d682b2e77b743efac212b259712553eb61703aae67e0a666fb0d05f02177382db38

data/README.md

@@ -10,7 +10,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=10)](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)
+[![Ruby Style Guide](https://img.shields.io/badge/code_style-rubocop-brightgreen.svg)](https://github.com/rubocop/rubocop)
 [![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)
 
@@ -71,7 +71,7 @@ RubyLLM.embed "Ruby is elegant and expressive"
 
 ```ruby
 # Moderate content for safety
-RubyLLM.moderate("Check if this text is safe").flagged? # => false
+RubyLLM.moderate "Check if this text is safe"
 ```
 
 ```ruby
@@ -139,10 +139,10 @@ end
 ## Rails
 
 ```bash
-# Install database models
+# Install Rails Integration
 rails generate ruby_llm:install
 
-# Add chat UI (optional)
+# Add Chat UI (optional)
 rails generate ruby_llm:chat_ui
 ```
 

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

@@ -1,11 +1,14 @@
 # frozen_string_literal: true
 
 require 'rails/generators'
+require_relative '../generator_helpers'
 
 module RubyLLM
   module Generators
     # Generates a simple chat UI scaffold for RubyLLM
     class ChatUIGenerator < Rails::Generators::Base
+      include RubyLLM::Generators::GeneratorHelpers
+
       source_root File.expand_path('templates', __dir__)
 
       namespace 'ruby_llm:chat_ui'
@@ -15,102 +18,148 @@ module RubyLLM
       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
+      def check_model_exists
+        model_path = "app/models/#{message_model_name.underscore}.rb"
+        return if File.exist?(model_path)
 
-        @model_names
-      end
+        # Build the argument string for the install/upgrade commands
+        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(' ')}" : ''
 
-      %i[chat message model].each do |type|
-        define_method("#{type}_model_name") do
-          @model_names ||= parse_model_mappings
-          @model_names[type]
-        end
+        raise Thor::Error, <<~ERROR
+          Model file not found: #{model_path}
 
-        define_method("#{type}_table_name") do
-          table_name_for(send("#{type}_model_name"))
-        end
+          Please run the install generator first:
+            rails generate ruby_llm:install#{arg_string}
+
+          Or if upgrading from <= 1.6.x, run the upgrade generator:
+            rails generate ruby_llm:upgrade_to_v1_7#{arg_string}
+        ERROR
       end
 
       def create_views
+        # For namespaced models, use the proper Rails convention path
+        chat_view_path = chat_model_name.underscore.pluralize
+        message_view_path = message_model_name.underscore.pluralize
+        model_view_path = model_model_name.underscore.pluralize
+
         # Chat views
-        template 'views/chats/index.html.erb', "app/views/#{chat_table_name}/index.html.erb"
-        template 'views/chats/new.html.erb', "app/views/#{chat_table_name}/new.html.erb"
-        template 'views/chats/show.html.erb', "app/views/#{chat_table_name}/show.html.erb"
+        template 'views/chats/index.html.erb', "app/views/#{chat_view_path}/index.html.erb"
+        template 'views/chats/new.html.erb', "app/views/#{chat_view_path}/new.html.erb"
+        template 'views/chats/show.html.erb', "app/views/#{chat_view_path}/show.html.erb"
         template 'views/chats/_chat.html.erb',
-                 "app/views/#{chat_table_name}/_#{chat_model_name.underscore}.html.erb"
-        template 'views/chats/_form.html.erb', "app/views/#{chat_table_name}/_form.html.erb"
+                 "app/views/#{chat_view_path}/_#{chat_model_name.demodulize.underscore}.html.erb"
+        template 'views/chats/_form.html.erb', "app/views/#{chat_view_path}/_form.html.erb"
 
         # Message views
         template 'views/messages/_message.html.erb',
-                 "app/views/#{message_table_name}/_#{message_model_name.underscore}.html.erb"
-        template 'views/messages/_content.html.erb', "app/views/#{message_table_name}/_content.html.erb"
-        template 'views/messages/_form.html.erb', "app/views/#{message_table_name}/_form.html.erb"
-        template 'views/messages/create.turbo_stream.erb',
-                 "app/views/#{message_table_name}/create.turbo_stream.erb"
+                 "app/views/#{message_view_path}/_#{message_model_name.demodulize.underscore}.html.erb"
+        template 'views/messages/_tool_calls.html.erb',
+                 "app/views/#{message_view_path}/_tool_calls.html.erb"
+        template 'views/messages/_content.html.erb', "app/views/#{message_view_path}/_content.html.erb"
+        template 'views/messages/_form.html.erb', "app/views/#{message_view_path}/_form.html.erb"
+        template 'views/messages/create.turbo_stream.erb', "app/views/#{message_view_path}/create.turbo_stream.erb"
 
         # Model views
-        template 'views/models/index.html.erb', "app/views/#{model_table_name}/index.html.erb"
-        template 'views/models/show.html.erb', "app/views/#{model_table_name}/show.html.erb"
+        template 'views/models/index.html.erb', "app/views/#{model_view_path}/index.html.erb"
+        template 'views/models/show.html.erb', "app/views/#{model_view_path}/show.html.erb"
         template 'views/models/_model.html.erb',
-                 "app/views/#{model_table_name}/_#{model_model_name.underscore}.html.erb"
+                 "app/views/#{model_view_path}/_#{model_model_name.demodulize.underscore}.html.erb"
       end
 
       def create_controllers
-        template 'controllers/chats_controller.rb', "app/controllers/#{chat_table_name}_controller.rb"
-        template 'controllers/messages_controller.rb', "app/controllers/#{message_table_name}_controller.rb"
-        template 'controllers/models_controller.rb', "app/controllers/#{model_table_name}_controller.rb"
+        # For namespaced models, use the proper Rails convention path
+        chat_controller_path = chat_model_name.underscore.pluralize
+        message_controller_path = message_model_name.underscore.pluralize
+        model_controller_path = model_model_name.underscore.pluralize
+
+        template 'controllers/chats_controller.rb', "app/controllers/#{chat_controller_path}_controller.rb"
+        template 'controllers/messages_controller.rb', "app/controllers/#{message_controller_path}_controller.rb"
+        template 'controllers/models_controller.rb', "app/controllers/#{model_controller_path}_controller.rb"
       end
 
       def create_jobs
-        template 'jobs/chat_response_job.rb', "app/jobs/#{chat_model_name.underscore}_response_job.rb"
+        template 'jobs/chat_response_job.rb', "app/jobs/#{variable_name_for(chat_model_name)}_response_job.rb"
       end
 
       def add_routes
-        model_routes = <<~ROUTES.strip
-          resources :#{model_table_name}, only: [:index, :show] do
-            collection do
-              post :refresh
+        # For namespaced models, use Rails convention with namespace blocks
+        if chat_model_name.include?('::')
+          namespace = chat_model_name.deconstantize.underscore
+          chat_resource = chat_model_name.demodulize.underscore.pluralize
+          message_resource = message_model_name.demodulize.underscore.pluralize
+          model_resource = model_model_name.demodulize.underscore.pluralize
+
+          routes_content = <<~ROUTES.strip
+            namespace :#{namespace} do
+              resources :#{model_resource}, only: [:index, :show] do
+                collection do
+                  post :refresh
+                end
+              end
+              resources :#{chat_resource} do
+                resources :#{message_resource}, only: [:create]
+              end
             end
-          end
-        ROUTES
-        route model_routes
-        chat_routes = <<~ROUTES.strip
-          resources :#{chat_table_name} do
-            resources :#{message_table_name}, only: [:create]
-          end
-        ROUTES
-        route chat_routes
+          ROUTES
+          route routes_content
+        else
+          model_routes = <<~ROUTES.strip
+            resources :#{model_table_name}, only: [:index, :show] do
+              collection do
+                post :refresh
+              end
+            end
+          ROUTES
+          route model_routes
+          chat_routes = <<~ROUTES.strip
+            resources :#{chat_table_name} do
+              resources :#{message_table_name}, only: [:create]
+            end
+          ROUTES
+          route chat_routes
+        end
       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}\" }"
+        msg_var = variable_name_for(message_model_name)
+        chat_var = variable_name_for(chat_model_name)
+        msg_path = message_model_name.underscore
+
+        # For namespaced models, we need the association name which might be different
+        # e.g., for LLM::Message, the chat association might be :llm_chat
+        chat_association = chat_table_name.singularize
+
+        # Use Rails convention paths for partials
+        partial_path = message_model_name.underscore.pluralize
+
+        # For broadcasts, we need to explicitly set the partial path
+        # Turbo will pass the record with the demodulized name (e.g. 'message' for Llm::Message)
+        broadcasting_code = if message_model_name.include?('::')
+                              partial_name = "#{partial_path}/#{message_model_name.demodulize.underscore}"
+                              <<~RUBY.strip
+                                broadcasts_to ->(#{msg_var}) { "#{chat_var}_\#{#{msg_var}.#{chat_association}_id}" },
+                                  partial: "#{partial_name}"
+                              RUBY
+                            else
+                              "broadcasts_to ->(#{msg_var}) { \"#{chat_var}_\#{#{msg_var}.#{chat_association}_id}\" }"
+                            end
 
         broadcast_append_chunk_method = <<-RUBY
 
   def broadcast_append_chunk(content)
-    broadcast_append_to "#{chat_var}_\#{#{chat_var}_id}",
+    broadcast_append_to "#{chat_var}_\#{#{chat_association}_id}",
       target: "#{msg_var}_\#{id}_content",
-      partial: "#{message_table_name}/content",
+      partial: "#{partial_path}/content",
       locals: { content: content }
   end
         RUBY
 
-        inject_into_file "app/models/#{msg_var}.rb", before: "end\n" do
+        inject_into_file "app/models/#{msg_path}.rb", before: "end\n" do
           "  #{broadcasting_code}\n#{broadcast_append_chunk_method}"
         end
       rescue Errno::ENOENT
@@ -122,18 +171,17 @@ module RubyLLM
       def display_post_install_message
         return unless behavior == :invoke
 
+        # Show the correct URL based on whether models are namespaced
+        url_path = if chat_model_name.include?('::')
+                     chat_model_name.underscore.pluralize
+                   else
+                     chat_table_name
+                   end
+
         say "\n  ✅ Chat UI installed!", :green
-        say "\n  Start your server and visit http://localhost:3000/#{chat_table_name}", :cyan
+        say "\n  Start your server and visit http://localhost:3000/#{url_path}", :cyan
         say "\n"
       end
-
-      private
-
-      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
 end

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

@@ -1,39 +1,39 @@
-class <%= chat_model_name.pluralize %>Controller < ApplicationController
-  before_action :set_<%= chat_model_name.underscore %>, only: [:show]
+class <%= chat_controller_class_name %> < ApplicationController
+  before_action :set_<%= chat_variable_name %>, only: [:show]
 
   def index
-    @<%= chat_model_name.tableize %> = <%= chat_model_name %>.order(created_at: :desc)
+    @<%= chat_table_name %> = <%= chat_model_name %>.order(created_at: :desc)
   end
 
   def new
-    @<%= chat_model_name.underscore %> = <%= chat_model_name %>.new
+    @<%= chat_variable_name %> = <%= 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)
+    @<%= chat_variable_name %> = <%= chat_model_name %>.create!(model: model)
+    <%= chat_job_class_name %>.perform_later(@<%= chat_variable_name %>.id, prompt)
 
-    redirect_to @<%= chat_model_name.underscore %>, notice: '<%= chat_model_name.humanize %> was successfully created.'
+    redirect_to @<%= chat_variable_name %>, notice: '<%= chat_model_name.humanize %> was successfully created.'
   end
 
   def show
-    @<%= message_model_name.underscore %> = @<%= chat_model_name.underscore %>.<%= message_model_name.tableize %>.build
+    @<%= message_variable_name %> = @<%= chat_variable_name %>.<%= message_table_name %>.build
   end
 
   private
 
-  def set_<%= chat_model_name.underscore %>
-    @<%= chat_model_name.underscore %> = <%= chat_model_name %>.find(params[:id])
+  def set_<%= chat_variable_name %>
+    @<%= chat_variable_name %> = <%= chat_model_name %>.find(params[:id])
   end
 
   def model
-    params[:<%= chat_model_name.underscore %>][:model].presence
+    params[:<%= chat_variable_name %>][:model].presence
   end
 
   def prompt
-    params[:<%= chat_model_name.underscore %>][:prompt]
+    params[:<%= chat_variable_name %>][:prompt]
   end
 end

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

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

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

@@ -1,14 +1,14 @@
-class <%= model_model_name.pluralize %>Controller < ApplicationController
+class <%= model_controller_class_name %> < ApplicationController
   def index
-    @<%= model_model_name.tableize %> = <%= model_model_name %>.all.group_by(&:provider)
+    @<%= model_table_name %> = <%= model_model_name %>.all
   end
 
   def show
-    @<%= model_model_name.underscore %> = <%= model_model_name %>.find(params[:id])
+    @<%= model_variable_name %> = <%= 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"
+    redirect_to <%= model_table_name %>_path, notice: "<%= model_model_name.pluralize %> refreshed successfully"
   end
 end

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

@@ -1,11 +1,11 @@
-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)
+class <%= chat_job_class_name %> < ApplicationJob
+  def perform(<%= chat_variable_name %>_id, content)
+    <%= chat_variable_name %> = <%= chat_model_name %>.find(<%= chat_variable_name %>_id)
 
-    <%= chat_model_name.underscore %>.ask(content) do |chunk|
+    <%= chat_variable_name %>.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 %>.broadcast_append_chunk(chunk.content)
+        <%= message_variable_name %> = <%= chat_variable_name %>.<%= message_table_name %>.last
+        <%= message_variable_name %>.broadcast_append_chunk(chunk.content)
       end
     end
   end

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

@@ -1,16 +1,16 @@
-<div id="<%%= dom_id <%= chat_model_name.underscore %> %>">
+<div id="<%%= dom_id <%= chat_model_name.demodulize.underscore %> %>">
   <div>
     <strong>Model:</strong>
-    <%%= <%= chat_model_name.underscore %>.model_association.name %>
+    <%%= <%= chat_model_name.demodulize.underscore %>.<%= model_table_name.singularize %>&.name || 'Default' %>
   </div>
 
   <div>
     <strong>Messages:</strong>
-    <%%= <%= chat_model_name.underscore %>.messages_association.count %>
+    <%%= <%= chat_model_name.demodulize.underscore %>.<%= message_table_name %>.count %>
   </div>
 
   <div>
     <strong>Created:</strong>
-    <%%= <%= chat_model_name.underscore %>.created_at.strftime("%B %d, %Y at %I:%M %p") %>
+    <%%= <%= chat_model_name.demodulize.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

@@ -1,10 +1,10 @@
-<%%= form_with(model: <%= chat_model_name.underscore %>, url: <%= chat_model_name.tableize %>_path) do |form| %>
-  <%% if <%= chat_model_name.underscore %>.errors.any? %>
+<%%= form_with(model: <%= chat_variable_name %>, url: <%= chat_table_name %>_path) do |form| %>
+  <%% if <%= chat_variable_name %>.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>
+      <h2><%%= pluralize(<%= chat_variable_name %>.errors.count, "error") %> prohibited this <%= chat_table_name.singularize.humanize.downcase %> from being saved:</h2>
 
       <ul>
-        <%% <%= chat_model_name.underscore %>.errors.each do |error| %>
+        <%% <%= chat_variable_name %>.errors.each do |error| %>
           <li><%%= error.full_message %></li>
         <%% end %>
       </ul>
@@ -24,6 +24,6 @@
   </div>
 
   <div>
-    <%%= form.submit "Start new <%= chat_model_name.underscore.humanize.downcase %>" %>
+    <%%= form.submit "Start new <%= chat_table_name.singularize.humanize.downcase %>" %>
   </div>
 <%% end %>

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

@@ -4,13 +4,13 @@
 
 <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 %> %>
+<div id="<%= chat_table_name %>">
+  <%% @<%= chat_table_name %>.each do |<%= chat_variable_name %>| %>
+    <%%= render <%= chat_variable_name %> %>
     <p>
-      <%%= link_to "Show this <%= chat_model_name.underscore.humanize.downcase %>", <%= chat_model_name.underscore %> %>
+      <%%= link_to "Show this <%= chat_table_name.singularize.humanize.downcase %>", <%= chat_variable_name %> %>
     </p>
   <%% end %>
 </div>
 
-<%%= link_to "New <%= chat_model_name.underscore.humanize.downcase %>", new_<%= chat_model_name.underscore %>_path %>
+<%%= link_to "New <%= chat_table_name.singularize.humanize.downcase %>", new_<%= chat_variable_name %>_path %>

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

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

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

@@ -1,23 +1,23 @@
 <p style="color: green"><%%= notice %></p>
 
-<%%= turbo_stream_from "<%= chat_model_name.underscore %>_#{@<%= chat_model_name.underscore %>.id}" %>
+<%%= turbo_stream_from "<%= chat_variable_name %>_#{@<%= chat_variable_name %>.id}" %>
 
 <%% content_for :title, "<%= chat_model_name %>" %>
 
-<h1><%= chat_model_name %> <%%= @<%= chat_model_name.underscore %>.id %></h1>
+<h1><%= chat_model_name %> <%%= @<%= chat_variable_name %>.id %></h1>
 
-<p>Using <strong><%%= @<%= chat_model_name.underscore %>.model_association.name %></strong></p>
+<p>Using <strong><%%= @<%= chat_variable_name %>.<%= model_table_name.singularize %>.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 %> %>
+<div id="<%= message_table_name %>">
+  <%% @<%= chat_variable_name %>.<%= message_table_name %>.where.not(id: nil).each do |<%= message_variable_name %>| %>
+    <%%= render <%= message_variable_name %> %>
   <%% 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 %> %>
+  <%%= render "<%= message_model_name.underscore.pluralize %>/form", <%= chat_variable_name %>: @<%= chat_variable_name %>, <%= message_variable_name %>: @<%= message_variable_name %> %>
 </div>
 
 <div style="margin-top: 20px;">
-  <%%= link_to "Back to <%= chat_model_name.tableize.humanize.downcase %>", <%= chat_model_name.tableize %>_path %>
+  <%%= link_to "Back to <%= chat_table_name.humanize.downcase %>", <%= chat_table_name %>_path %>
 </div>

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

@@ -1,10 +1,10 @@
-<%%= 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? %>
+<%%= form_with(model: <%= message_variable_name %>, url: <%= chat_model_name.include?('::') ? "#{chat_model_name.split('::').first.underscore}_#{chat_model_name.demodulize.underscore}_#{message_model_name.demodulize.underscore.pluralize}_path(@#{chat_variable_name})" : "[@#{chat_variable_name}, #{message_variable_name}]" %>, id: "new_<%= message_variable_name %>") do |form| %>
+  <%% if <%= message_variable_name %>.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>
+      <h2><%%= pluralize(<%= message_variable_name %>.errors.count, "error") %> prohibited this <%= message_table_name.singularize.humanize.downcase %> from being saved:</h2>
 
       <ul>
-        <%% <%= message_model_name.underscore %>.errors.each do |error| %>
+        <%% <%= message_variable_name %>.errors.each do |error| %>
           <li><%%= error.full_message %></li>
         <%% end %>
       </ul>
@@ -16,6 +16,6 @@
   </div>
 
   <div>
-    <%%= form.submit "Send <%= message_model_name.underscore.humanize.downcase %>" %>
+    <%%= form.submit "Send <%= message_table_name.singularize.humanize.downcase %>" %>
   </div>
 <%% end %>

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

@@ -1,10 +1,13 @@
-<%%= 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 id="<%= message_variable_name %>_<%%= <%= message_model_name.demodulize.underscore %>.id %>" class="<%= message_variable_name %>"
+     style="margin-bottom: 20px; padding: 10px; border-left: 3px solid <%%= <%= message_model_name.demodulize.underscore %>.role == 'user' ? '#007bff' : '#28a745' %>">
   <div style="font-weight: bold; margin-bottom: 5px;">
-    <%%= <%= message_model_name.underscore %>.role&.capitalize %>
+    <%%= <%= message_model_name.demodulize.underscore %>.role&.capitalize %>
   </div>
-  <div id="<%%= dom_id(<%= message_model_name.underscore %>) %>_content" style="white-space: pre-wrap;"><%%= <%= message_model_name.underscore %>.content %></div>
+  <div id="<%= message_variable_name %>_<%%= <%= message_model_name.demodulize.underscore %>.id %>_content" style="white-space: pre-wrap;"><%%= <%= message_model_name.demodulize.underscore %>.content %></div>
+  <%% if <%= message_model_name.demodulize.underscore %>.tool_call? %>
+    <%%= render "<%= message_model_name.underscore.pluralize %>/tool_calls", <%= message_model_name.demodulize.underscore %>: <%= message_model_name.demodulize.underscore %> %>
+  <%% end %>
   <div style="font-size: 0.85em; color: #666; margin-top: 5px;">
-    <%%= <%= message_model_name.underscore %>.created_at&.strftime("%I:%M %p") %>
+    <%%= <%= message_model_name.demodulize.underscore %>.created_at&.strftime("%I:%M %p") %>
   </div>
-<%% end %>
+</div>

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

@@ -0,0 +1,7 @@
+<div style="display: flex; flex-direction: column; gap: 3px; align-items: flex-start; font-family: monospace;">
+  <%% <%= message_model_name.demodulize.underscore %>.<%= tool_call_variable_name.pluralize %>.each do |tool_call| %>
+    <div style="background: #eee; padding: 5px; border-radius: 4px;">
+      <%%= tool_call.name %>(<%%= tool_call.arguments.map { |k, v| "#{k}: #{v.inspect}" }.join(", ") %>)
+    </div>
+  <%% end %>
+</div>

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

@@ -1,9 +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 %> %>
+<%%= turbo_stream.append "<%= message_table_name %>" do %>
+  <%% @<%= chat_variable_name %>.<%= message_table_name %>.last(2).each do |<%= message_variable_name %>| %>
+    <%%= render <%= message_variable_name %> %>
   <%% 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 %>
+<%%= turbo_stream.replace "new_<%= message_variable_name %>" do %>
+  <%%= render "<%= message_model_name.underscore.pluralize %>/form", <%= chat_variable_name %>: @<%= chat_variable_name %>, <%= message_variable_name %>: @<%= chat_variable_name %>.<%= message_table_name %>.build %>
 <%% end %>