ruby_llm 1.13.2 → 1.14.0

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

@@ -0,0 +1,10 @@
+<%% system ||= local_assigns[:message] %>
+<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">
+      System
+    </span>
+  </div>
+
+  <div class="whitespace-pre-wrap text-gray-700"><%%= system.content %></div>
+</div>

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

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

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

@@ -0,0 +1,4 @@
+<%% 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 %>

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

@@ -0,0 +1,14 @@
+<%% user ||= local_assigns[:message] %>
+<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">
+      User
+    </span>
+  </div>
+
+  <div id="<%= message_variable_name %>_<%%= user.id %>_content" class="whitespace-pre-wrap"><%%= user.content %></div>
+
+  <div>
+    <span class="text-sm text-gray-600"><%%= user.created_at&.strftime("%I:%M %p") %></span>
+  </div>
+</div>

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

@@ -0,0 +1,13 @@
+<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>
+    <span class="inline-block rounded px-2 py-0.5 text-xs font-medium bg-gray-200 text-gray-700">
+      Tool Call
+    </span>
+  </div>
+
+  <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>
+  </div>
+</div>

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

@@ -0,0 +1,21 @@
+<%% error_message = tool.tool_error_message %>
+<%% if error_message.present? %>
+  <%%= render "<%= message_model_name.underscore.pluralize %>/error",
+    <%= message_model_name.demodulize.underscore %>: tool,
+    title: "Tool Result Error",
+    error_message: error_message %>
+<%% else %>
+  <div id="<%= message_variable_name %>_<%%= tool.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
+      </span>
+    </div>
+
+    <pre class="whitespace-pre-wrap text-gray-700 text-sm overflow-x-auto"><%%= tool.content.presence || "(no output)" %></pre>
+
+    <div>
+      <span class="text-sm text-gray-600"><%%= tool.created_at&.strftime("%I:%M %p") %></span>
+    </div>
+  </div>
+<%% end %>

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

@@ -0,0 +1,17 @@
+<%% 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: "_") %>
+<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-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 %>
+    <%% 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" %>
+  </td>
+</tr>

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

@@ -0,0 +1,40 @@
+<%% content_for :title, "<%= model_model_name.pluralize %>" %>
+
+<div class="w-full">
+  <%% if notice.present? %>
+    <p class="py-2 px-3 bg-green-50 mb-5 text-green-500 font-medium rounded-md inline-block" id="notice"><%%= notice %></p>
+  <%% end %>
+
+  <div class="flex justify-between items-center">
+    <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" %>
+    </div>
+  </div>
+
+  <div id="<%= model_table_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">
+          <tr>
+            <th class="px-3 py-2 text-left text-sm font-semibold text-gray-900">Provider</th>
+            <th class="px-3 py-2 text-left text-sm font-semibold text-gray-900">Model</th>
+            <th class="px-3 py-2 text-left text-sm font-semibold text-gray-900">Context Window</th>
+            <th class="px-3 py-2 text-left text-sm font-semibold text-gray-900">$/1M tokens (In/Out)</th>
+            <th class="px-3 py-2 text-left text-sm font-semibold text-gray-900"></th>
+          </tr>
+        </thead>
+        <tbody class="divide-y divide-gray-200 bg-white">
+          <%% @<%= model_variable_name.pluralize %>.each do |model_info| %>
+            <%%= render "<%= model_model_name.underscore.pluralize %>/<%= model_model_name.demodulize.underscore %>",
+              <%= model_model_name.demodulize.underscore %>: model_info %>
+          <%% end %>
+        </tbody>
+      </table>
+    <%% else %>
+      <p class="text-center my-10">No chat models found.</p>
+    <%% end %>
+  </div>
+
+</div>

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

@@ -0,0 +1,27 @@
+<%% content_for :title, "Showing <%= model_table_name.singularize.humanize.downcase %>" %>
+
+<div class="md:w-2/3 w-full">
+  <%% if notice.present? %>
+    <p class="py-2 px-3 bg-green-50 mb-5 text-green-500 font-medium rounded-md inline-block" id="notice"><%%= notice %></p>
+  <%% end %>
+
+  <h1 class="font-bold text-4xl">Showing <%= model_table_name.singularize.humanize.downcase %></h1>
+
+  <div class="my-5 space-y-3">
+    <p><strong class="block font-medium mb-1">Provider:</strong> <%%= @<%= model_variable_name %>.provider_class&.name || @<%= model_variable_name %>.provider %></p>
+    <p><strong class="block font-medium mb-1">Model:</strong> <%%= @<%= model_variable_name %>.name %></p>
+    <p><strong class="block font-medium mb-1">ID:</strong> <%%= @<%= model_variable_name %>.model_id %></p>
+    <p><strong class="block font-medium mb-1">Context Window:</strong> <%%= number_with_delimiter(@<%= model_variable_name %>.context_window) if @<%= model_variable_name %>.context_window %></p>
+    <p><strong class="block font-medium mb-1">Max Output Tokens:</strong> <%%= number_with_delimiter(@<%= model_variable_name %>.max_output_tokens) if @<%= model_variable_name %>.max_output_tokens %></p>
+  </div>
+
+  <%% if @<%= model_variable_name %>.capabilities.any? %>
+    <div class="my-5">
+      <strong class="block font-medium mb-1">Capabilities:</strong>
+      <%%= @<%= model_variable_name %>.capabilities.join(", ") %>
+    </div>
+  <%% end %>
+
+  <%%= link_to "Start <%= chat_table_name.singularize.humanize.downcase %> with this model", new_<%= chat_variable_name %>_path(model: @<%= model_variable_name %>.model_id), class: "w-full sm:w-auto text-center rounded-md px-3.5 py-2.5 bg-gray-100 hover:bg-gray-50 inline-block font-medium" %>
+  <%%= link_to "All <%= model_table_name.humanize.downcase %>", <%= model_table_name %>_path, class: "w-full sm:w-auto text-center mt-2 sm:mt-0 sm:ml-2 rounded-md px-3.5 py-2.5 bg-gray-100 hover:bg-gray-50 inline-block font-medium" %>
+</div>

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

@@ -1,7 +1,7 @@
 <div id="<%%= dom_id <%= chat_model_name.demodulize.underscore %> %>">
   <div>
     <strong>Model:</strong>
-    <%%= <%= chat_model_name.demodulize.underscore %>.<%= model_table_name.singularize %>&.name || 'Default' %>
+    <%%= <%= chat_model_name.demodulize.underscore %>.<%= model_table_name.singularize %>&.label || default_model_display_name %>
   </div>
 
   <div>
@@ -13,4 +13,4 @@
     <strong>Created:</strong>
     <%%= <%= chat_model_name.demodulize.underscore %>.created_at.strftime("%B %d, %Y at %I:%M %p") %>
   </div>
-</div>
+</div>

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

@@ -14,7 +14,7 @@
   <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),
+        options_for_select(@chat_models.map { |model| [model.label, model.id] }.unshift([default_model_display_name, nil]), @selected_model),
         {},
         style: "width: 100%; max-width: 600px; padding: 5px;" %>
   </div>
@@ -26,4 +26,4 @@
   <div>
     <%%= form.submit "Start new <%= chat_table_name.singularize.humanize.downcase %>" %>
   </div>
-<%% end %>
+<%% end %>

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

@@ -1,16 +1,28 @@
-<p style="color: green"><%%= notice %></p>
+<%% if notice.present? %>
+  <p style="color: green"><%%= notice %></p>
+<%% end %>
 
 <%% content_for :title, "<%= chat_model_name.pluralize %>" %>
 
 <h1><%= chat_model_name.pluralize %></h1>
+<p>
+  <%%= link_to "<%= model_model_name.pluralize %>", <%= model_table_name %>_path %>
+</p>
 
 <div id="<%= chat_table_name %>">
-  <%% @<%= chat_table_name %>.each do |<%= chat_variable_name %>| %>
-    <%%= render <%= chat_variable_name %> %>
-    <p>
-      <%%= link_to "Show this <%= chat_table_name.singularize.humanize.downcase %>", <%= chat_variable_name %> %>
-    </p>
+  <%% if @<%= chat_table_name %>.any? %>
+    <%% @<%= chat_table_name %>.each do |<%= chat_variable_name %>| %>
+      <%%= render <%= chat_variable_name %> %>
+      <p>
+        <%%= link_to "Show this <%= chat_table_name.singularize.humanize.downcase %>", <%= chat_variable_name %> %>
+      </p>
+      <p>
+        <%%= link_to "Destroy this <%= chat_table_name.singularize.humanize.downcase %>", <%= chat_variable_name %>, data: { turbo_method: :delete, turbo_confirm: "Are you sure?" } %>
+      </p>
+    <%% end %>
+  <%% else %>
+    <p>No <%= chat_table_name.humanize.downcase %> found.</p>
   <%% end %>
 </div>
 
-<%%= link_to "New <%= chat_table_name.singularize.humanize.downcase %>", new_<%= chat_variable_name %>_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

@@ -8,4 +8,4 @@
 
 <div>
   <%%= link_to "Back to <%= chat_table_name.humanize.downcase %>", <%= chat_table_name %>_path %>
-</div>
+</div>

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

@@ -1,4 +1,6 @@
-<p style="color: green"><%%= notice %></p>
+<%% if notice.present? %>
+  <p style="color: green"><%%= notice %></p>
+<%% end %>
 
 <%%= turbo_stream_from "<%= chat_variable_name %>_#{@<%= chat_variable_name %>.id}" %>
 
@@ -6,7 +8,7 @@
 
 <h1><%= chat_model_name %> <%%= @<%= chat_variable_name %>.id %></h1>
 
-<p>Using <strong><%%= @<%= chat_variable_name %>.<%= model_table_name.singularize %>.name %></strong></p>
+<p>Using <strong><%%= @<%= chat_variable_name %>.<%= model_table_name.singularize %>&.label || default_model_display_name %></strong></p>
 
 <div id="<%= message_table_name %>">
   <%% @<%= chat_variable_name %>.<%= message_table_name %>.where.not(id: nil).each do |<%= message_variable_name %>| %>
@@ -20,4 +22,4 @@
 
 <div style="margin-top: 20px;">
   <%%= link_to "Back to <%= chat_table_name.humanize.downcase %>", <%= chat_table_name %>_path %>
-</div>
+</div>

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

@@ -0,0 +1,9 @@
+<%% assistant ||= local_assigns[:message] %>
+<div id="<%= message_variable_name %>_<%%= assistant.id %>" class="<%= message_variable_name %>"
+     style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #28a745;">
+  <div style="font-weight: bold; margin-bottom: 5px;">Assistant</div>
+  <div id="<%= message_variable_name %>_<%%= assistant.id %>_content" style="white-space: pre-wrap;"><%%= assistant.content %></div>
+  <div style="font-size: 0.85em; color: #666; margin-top: 5px;">
+    <%%= assistant.created_at&.strftime("%I:%M %p") %>
+  </div>
+</div>

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

@@ -1 +1 @@
-<%%= content %>
+<%%= content -%>

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

@@ -0,0 +1,8 @@
+<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 #dc2626; background: #fef2f2;">
+  <div style="font-weight: bold; margin-bottom: 5px; color: #b91c1c;"><%%= title.presence || "Error" %></div>
+  <pre style="white-space: pre-wrap; margin: 0; color: #7f1d1d;"><%%= error_message %></pre>
+  <div style="font-size: 0.85em; color: #7f1d1d; margin-top: 5px;">
+    <%%= <%= message_model_name.demodulize.underscore %>.created_at&.strftime("%I:%M %p") %>
+  </div>
+</div>

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

@@ -18,4 +18,4 @@
   <div>
     <%%= form.submit "Send <%= message_table_name.singularize.humanize.downcase %>" %>
   </div>
-<%% end %>
+<%% end %>

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

@@ -0,0 +1,6 @@
+<%% system ||= local_assigns[:message] %>
+<div id="<%= message_variable_name %>_<%%= system.id %>" class="<%= message_variable_name %>"
+     style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #6b7280; background: #f9fafb;">
+  <div style="font-weight: bold; margin-bottom: 5px; color: #374151;">System</div>
+  <div style="white-space: pre-wrap; color: #4b5563;"><%%= system.content %></div>
+</div>

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

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

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

@@ -1,7 +1,4 @@
-<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>
+<%% 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 %>

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

@@ -0,0 +1,9 @@
+<%% user ||= local_assigns[:message] %>
+<div id="<%= message_variable_name %>_<%%= user.id %>" class="<%= message_variable_name %>"
+     style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #007bff;">
+  <div style="font-weight: bold; margin-bottom: 5px;">User</div>
+  <div id="<%= message_variable_name %>_<%%= user.id %>_content" style="white-space: pre-wrap;"><%%= user.content %></div>
+  <div style="font-size: 0.85em; color: #666; margin-top: 5px;">
+    <%%= user.created_at&.strftime("%I:%M %p") %>
+  </div>
+</div>

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

@@ -1,9 +1,7 @@
-<%%= turbo_stream.append "<%= message_table_name %>" do %>
-  <%% @<%= chat_variable_name %>.<%= message_table_name %>.last(2).each do |<%= message_variable_name %>| %>
-    <%%= render <%= message_variable_name %> %>
+<%% if defined?(@<%= chat_variable_name %>) && @<%= chat_variable_name %>.present? %>
+  <%%= 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 %>
 <%% end %>
-
-<%%= 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 %>

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

@@ -0,0 +1,8 @@
+<div id="<%= message_variable_name %>_<%%= tool_calls.id %>" class="<%= message_variable_name %>"
+     style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #6b7280; background: #f9fafb;">
+  <div style="font-weight: bold; margin-bottom: 5px;">Tool Call</div>
+  <pre style="white-space: pre-wrap; margin: 0;"><%%= tool_call.name %>(<%%= tool_call.arguments.map { |k, v| "#{k}: #{v.inspect}" }.join(", ") %>)</pre>
+  <div style="font-size: 0.85em; color: #666; margin-top: 5px;">
+    <%%= tool_calls.created_at&.strftime("%I:%M %p") %>
+  </div>
+</div>

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

@@ -0,0 +1,16 @@
+<%% error_message = tool.tool_error_message %>
+<%% if error_message.present? %>
+  <%%= render "<%= message_model_name.underscore.pluralize %>/error",
+    <%= message_model_name.demodulize.underscore %>: tool,
+    title: "Tool Result Error",
+    error_message: error_message %>
+<%% else %>
+  <div id="<%= message_variable_name %>_<%%= tool.id %>" class="<%= message_variable_name %>"
+       style="margin-bottom: 20px; padding: 10px; border-left: 3px solid #6b7280; background: #f9fafb;">
+    <div style="font-weight: bold; margin-bottom: 5px;">Tool</div>
+    <pre style="white-space: pre-wrap; margin: 0;"><%%= tool.content.presence || "(no output)" %></pre>
+    <div style="font-size: 0.85em; color: #666; margin-top: 5px;">
+      <%%= tool.created_at&.strftime("%I:%M %p") %>
+    </div>
+  </div>
+<%% end %>

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

@@ -1,16 +1,15 @@
-<tr id="<%%= dom_id <%= model_model_name.demodulize.underscore %> %>">
-  <td><%%= <%= model_model_name.demodulize.underscore %>.provider %></td>
-  <td><%%= <%= model_model_name.demodulize.underscore %>.name %></td>
+<%% 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: "_") %>
+<tr id="model_<%%= row_id %>">
+  <td><%%= <%= model_model_name.demodulize.underscore %>.provider_class&.name || <%= model_model_name.demodulize.underscore %>.provider %></td>
+  <td><%%= <%= model_model_name.demodulize.underscore %>.respond_to?(:display_name) ? <%= model_model_name.demodulize.underscore %>.display_name : <%= model_model_name.demodulize.underscore %>.name %></td>
   <td><%%= number_with_delimiter(<%= model_model_name.demodulize.underscore %>.context_window) if <%= model_model_name.demodulize.underscore %>.context_window %></td>
   <td>
-    <%% if <%= model_model_name.demodulize.underscore %>.pricing && <%= model_model_name.demodulize.underscore %>.pricing['text_tokens'] && <%= model_model_name.demodulize.underscore %>.pricing['text_tokens']['standard'] %>
-      <%% input = <%= model_model_name.demodulize.underscore %>.pricing['text_tokens']['standard']['input_per_million'] %>
-      <%% output = <%= model_model_name.demodulize.underscore %>.pricing['text_tokens']['standard']['output_per_million'] %>
-      <%% if input && output %>
-        $<%%= "%.2f" % input %> / $<%%= "%.2f" % output %>
-      <%% end %>
+    <%% input = <%= model_model_name.demodulize.underscore %>.input_price_per_million %>
+    <%% output = <%= model_model_name.demodulize.underscore %>.output_price_per_million %>
+    <%% if input && output %>
+      $<%%= "%.2f" % input %> / $<%%= "%.2f" % output %>
     <%% end %>
   </td>
-  <td><%%= link_to "Show", <%= model_model_name.demodulize.underscore %> %></td>
-  <td><%%= link_to "Start <%= chat_table_name.singularize.humanize.downcase %>", new_<%= chat_variable_name %>_path(model: <%= model_model_name.demodulize.underscore %>.model_id) %></td>
-</tr>
+  <td><%%= link_to "Start <%= chat_table_name.singularize.humanize.downcase %>", new_<%= chat_variable_name %>_path(model: model_id) %></td>
+</tr>

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

@@ -1,28 +1,38 @@
-<p style="color: green"><%%= notice %></p>
+<%% if notice.present? %>
+  <p style="color: green"><%%= notice %></p>
+<%% end %>
 
 <%% content_for :title, "<%= model_model_name.pluralize %>" %>
 
 <h1><%= model_model_name.pluralize %></h1>
+<p>
+  <%%= link_to "<%= chat_model_name.pluralize %>", <%= chat_table_name %>_path %>
+</p>
 
 <p>
   <%%= button_to "Refresh <%= model_model_name.pluralize %>", refresh_<%= model_table_name %>_path, method: :post %>
 </p>
 
 <div id="<%= model_table_name %>">
-  <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>
-      <%%= render @<%= model_variable_name.pluralize %> %>
-    </tbody>
-  </table>
+  <%% if @<%= model_variable_name.pluralize %>.any? %>
+    <table>
+      <thead>
+        <tr>
+          <th>Provider</th>
+          <th>Model</th>
+          <th>Context Window</th>
+          <th>$/1M tokens (In/Out)</th>
+          <th></th>
+        </tr>
+      </thead>
+      <tbody>
+        <%% @<%= model_variable_name.pluralize %>.each do |model_info| %>
+          <%%= render "<%= model_model_name.underscore.pluralize %>/<%= model_model_name.demodulize.underscore %>",
+            <%= model_model_name.demodulize.underscore %>: model_info %>
+        <%% end %>
+      </tbody>
+    </table>
+  <%% else %>
+    <p>No chat models found.</p>
+  <%% end %>
 </div>
-
-<%%= link_to "Back to <%= chat_table_name.humanize.downcase %>", <%= chat_table_name %>_path %>

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

@@ -3,7 +3,7 @@
 <h1><%%= @<%= model_variable_name %>.name %></h1>
 
 <p><strong>ID:</strong> <%%= @<%= model_variable_name %>.model_id %></p>
-<p><strong>Provider:</strong> <%%= @<%= model_variable_name %>.provider %></p>
+<p><strong>Provider:</strong> <%%= @<%= model_variable_name %>.provider_class&.name || @<%= model_variable_name %>.provider %></p>
 <p><strong>Context Window:</strong> <%%= number_with_delimiter(@<%= model_variable_name %>.context_window) %> tokens</p>
 <p><strong>Max Output:</strong> <%%= number_with_delimiter(@<%= model_variable_name %>.max_output_tokens) %> tokens</p>
 
@@ -13,6 +13,5 @@
 
 <p>
   <%%= link_to "Start chat with this model", new_<%= chat_variable_name %>_path(model: @<%= model_variable_name %>.model_id) %> |
-  <%%= link_to "All models", <%= model_table_name %>_path %> |
-  <%%= link_to "Back to chats", <%= chat_table_name %>_path %>
-</p>
+  <%%= link_to "All models", <%= model_table_name %>_path %>
+</p>

data/lib/generators/ruby_llm/generator_helpers.rb

@@ -53,9 +53,9 @@ module RubyLLM
         params = []
 
         add_association_params(params, :messages, message_table_name, message_model_name,
-                               owner_table: chat_table_name, plural: true)
+                               owner_table: chat_table_name, owner_model_name: chat_model_name, plural: true)
         add_association_params(params, :model, model_table_name, model_model_name,
-                               owner_table: chat_table_name)
+                               owner_table: chat_table_name, owner_model_name: chat_model_name)
 
         "acts_as_chat#{" #{params.join(', ')}" if params.any?}"
       end
@@ -64,11 +64,11 @@ module RubyLLM
         params = []
 
         add_association_params(params, :chat, chat_table_name, chat_model_name,
-                               owner_table: message_table_name)
+                               owner_table: message_table_name, owner_model_name: message_model_name)
         add_association_params(params, :tool_calls, tool_call_table_name, tool_call_model_name,
-                               owner_table: message_table_name, plural: true)
+                               owner_table: message_table_name, owner_model_name: message_model_name, plural: true)
         add_association_params(params, :model, model_table_name, model_model_name,
-                               owner_table: message_table_name)
+                               owner_table: message_table_name, owner_model_name: message_model_name)
 
         "acts_as_message#{" #{params.join(', ')}" if params.any?}"
       end
@@ -77,7 +77,7 @@ module RubyLLM
         params = []
 
         add_association_params(params, :chats, chat_table_name, chat_model_name,
-                               owner_table: model_table_name, plural: true)
+                               owner_table: model_table_name, owner_model_name: model_model_name, plural: true)
 
         "acts_as_model#{" #{params.join(', ')}" if params.any?}"
       end
@@ -86,7 +86,7 @@ module RubyLLM
         params = []
 
         add_association_params(params, :message, message_table_name, message_model_name,
-                               owner_table: tool_call_table_name)
+                               owner_table: tool_call_table_name, owner_model_name: tool_call_model_name)
 
         "acts_as_tool_call#{" #{params.join(', ')}" if params.any?}"
       end
@@ -145,22 +145,38 @@ module RubyLLM
 
       private
 
-      def add_association_params(params, default_assoc, table_name, model_name, owner_table:, plural: false) # rubocop:disable Metrics/ParameterLists
+      # rubocop:disable Metrics/ParameterLists
+      def add_association_params(params, default_assoc, table_name, model_name,
+                                 owner_table:, owner_model_name:, plural: false)
         assoc = plural ? table_name.to_sym : table_name.singularize.to_sym
-
-        default_foreign_key = "#{default_assoc}_id"
-        # has_many/has_one: foreign key is on the associated table pointing back to owner
-        # belongs_to:       foreign key is on the owner table pointing to associated table
-        foreign_key = if plural || default_assoc.to_s.pluralize == default_assoc.to_s # has_many or has_one
-                        "#{owner_table.singularize}_id"
-                      else # belongs_to
-                        "#{table_name.singularize}_id"
-                      end
+        collection_association = collection_association?(default_assoc, plural)
+        foreign_key = inferred_foreign_key(table_name, owner_table, collection_association)
+        default_foreign_key = default_inferred_foreign_key(assoc, owner_model_name, collection_association)
 
         params << "#{default_assoc}: :#{assoc}" if assoc != default_assoc
         params << "#{default_assoc.to_s.singularize}_class: '#{model_name}'" if model_name != assoc.to_s.classify
         params << "#{default_assoc}_foreign_key: :#{foreign_key}" if foreign_key != default_foreign_key
       end
+      # rubocop:enable Metrics/ParameterLists
+
+      def collection_association?(default_assoc, plural)
+        plural || default_assoc.to_s.pluralize == default_assoc.to_s
+      end
+
+      def inferred_foreign_key(table_name, owner_table, collection_association)
+        return "#{table_name.singularize}_id" unless collection_association
+
+        "#{owner_table.singularize}_id"
+      end
+
+      # Rails default inference:
+      # belongs_to :assoc    -> assoc_id
+      # has_many/has_one     -> owner demodulized model name + _id
+      def default_inferred_foreign_key(association_name, owner_model_name, collection_association)
+        return "#{association_name}_id" unless collection_association
+
+        "#{owner_model_name.demodulize.underscore}_id"
+      end
 
       # Convert namespaced model names to proper table names
       # e.g., "Assistant::Chat" -> "assistant_chats" (not "assistant/chats")