ruby_llm 1.8.1 → 1.8.2

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

@@ -1,16 +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>
+<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>
+  <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.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 <%= 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 %>
     <%% 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>
+  <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>

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

@@ -5,10 +5,10 @@
 <h1><%= model_model_name.pluralize %></h1>
 
 <p>
-  <%%= button_to "Refresh <%= model_model_name.pluralize %>", refresh_<%= model_model_name.tableize %>_path, method: :post %>
+  <%%= button_to "Refresh <%= model_model_name.pluralize %>", refresh_<%= model_table_name %>_path, method: :post %>
 </p>
 
-<div id="<%= model_model_name.tableize %>">
+<div id="<%= model_table_name %>">
   <table>
     <thead>
       <tr>
@@ -20,11 +20,9 @@
       </tr>
     </thead>
     <tbody>
-      <%% @<%= model_model_name.tableize %>.values.flatten.each do |<%= model_model_name.underscore %>| %>
-        <%%= render <%= model_model_name.underscore %> %>
-      <%% end %>
+      <%%= render @<%= model_variable_name.pluralize %> %>
     </tbody>
   </table>
 </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 %>

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

@@ -1,18 +1,18 @@
-<%% content_for :title, @model.name %>
+<%% content_for :title, @<%= model_variable_name %>.name %>
 
-<h1><%%= @model.name %></h1>
+<h1><%%= @<%= model_variable_name %>.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>
+<p><strong>ID:</strong> <%%= @<%= model_variable_name %>.model_id %></p>
+<p><strong>Provider:</strong> <%%= @<%= 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>
 
-<%% if @model.capabilities.any? %>
-  <p><strong>Capabilities:</strong> <%%= @model.capabilities.join(", ") %></p>
+<%% if @<%= model_variable_name %>.capabilities.any? %>
+  <p><strong>Capabilities:</strong> <%%= @<%= model_variable_name %>.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 %>
+  <%%= 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>

data/lib/generators/ruby_llm/generator_helpers.rb

@@ -1,129 +1,173 @@
 # frozen_string_literal: true
 
 module RubyLLM
-  # Shared helpers for RubyLLM generators
-  module GeneratorHelpers
-    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
+  module Generators
+    # Shared helpers for RubyLLM generators
+    module GeneratorHelpers
+      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
 
-      @model_names
-    end
+      %i[chat message tool_call model].each do |type|
+        define_method("#{type}_model_name") do
+          @model_names ||= parse_model_mappings
+          @model_names[type]
+        end
 
-    %i[chat message tool_call model].each do |type|
-      define_method("#{type}_model_name") do
-        @model_names ||= parse_model_mappings
-        @model_names[type]
-      end
+        define_method("#{type}_table_name") do
+          table_name_for(send("#{type}_model_name"))
+        end
+
+        define_method("#{type}_variable_name") do
+          variable_name_for(send("#{type}_model_name"))
+        end
+
+        define_method("#{type}_controller_class_name") do
+          controller_class_name_for(send("#{type}_model_name"))
+        end
+
+        define_method("#{type}_job_class_name") do
+          "#{variable_name_for(send("#{type}_model_name")).camelize}ResponseJob"
+        end
 
-      define_method("#{type}_table_name") do
-        table_name_for(send("#{type}_model_name"))
+        define_method("#{type}_partial") do
+          partial_path_for(send("#{type}_model_name"))
+        end
       end
-    end
 
-    def acts_as_chat_declaration
-      params = []
+      def acts_as_chat_declaration
+        params = []
 
-      add_association_params(params, :messages, message_table_name, message_model_name, plural: true)
-      add_association_params(params, :model, model_table_name, model_model_name)
+        add_association_params(params, :messages, message_table_name, message_model_name, plural: true)
+        add_association_params(params, :model, model_table_name, model_model_name)
 
-      "acts_as_chat#{" #{params.join(', ')}" if params.any?}"
-    end
+        "acts_as_chat#{" #{params.join(', ')}" if params.any?}"
+      end
 
-    def acts_as_message_declaration
-      params = []
+      def acts_as_message_declaration
+        params = []
 
-      add_association_params(params, :chat, chat_table_name, chat_model_name)
-      add_association_params(params, :tool_calls, tool_call_table_name, tool_call_model_name, plural: true)
-      add_association_params(params, :model, model_table_name, model_model_name)
+        add_association_params(params, :chat, chat_table_name, chat_model_name)
+        add_association_params(params, :tool_calls, tool_call_table_name, tool_call_model_name, plural: true)
+        add_association_params(params, :model, model_table_name, model_model_name)
 
-      "acts_as_message#{" #{params.join(', ')}" if params.any?}"
-    end
+        "acts_as_message#{" #{params.join(', ')}" if params.any?}"
+      end
 
-    def acts_as_model_declaration
-      params = []
+      def acts_as_model_declaration
+        params = []
 
-      add_association_params(params, :chats, chat_table_name, chat_model_name, plural: true)
+        add_association_params(params, :chats, chat_table_name, chat_model_name, plural: true)
 
-      "acts_as_model#{" #{params.join(', ')}" if params.any?}"
-    end
+        "acts_as_model#{" #{params.join(', ')}" if params.any?}"
+      end
 
-    def acts_as_tool_call_declaration
-      params = []
+      def acts_as_tool_call_declaration
+        params = []
 
-      add_association_params(params, :message, message_table_name, message_model_name)
+        add_association_params(params, :message, message_table_name, message_model_name)
 
-      "acts_as_tool_call#{" #{params.join(', ')}" if params.any?}"
-    end
+        "acts_as_tool_call#{" #{params.join(', ')}" if params.any?}"
+      end
 
-    def create_namespace_modules
-      namespaces = []
+      def create_namespace_modules
+        namespaces = []
 
-      [chat_model_name, message_model_name, tool_call_model_name, model_model_name].each do |model_name|
-        if model_name.include?('::')
-          namespace = model_name.split('::').first
-          namespaces << namespace unless namespaces.include?(namespace)
+        [chat_model_name, message_model_name, tool_call_model_name, model_model_name].each do |model_name|
+          if model_name.include?('::')
+            namespace = model_name.split('::').first
+            namespaces << namespace unless namespaces.include?(namespace)
+          end
         end
-      end
 
-      namespaces.each do |namespace|
-        module_path = "app/models/#{namespace.underscore}.rb"
-        next if File.exist?(Rails.root.join(module_path))
+        namespaces.each do |namespace|
+          module_path = "app/models/#{namespace.underscore}.rb"
+          next if File.exist?(Rails.root.join(module_path))
 
-        create_file module_path do
-          <<~RUBY
-            module #{namespace}
-              def self.table_name_prefix
-                "#{namespace.underscore}_"
+          create_file module_path do
+            <<~RUBY
+              module #{namespace}
+                def self.table_name_prefix
+                  "#{namespace.underscore}_"
+                end
               end
-            end
-          RUBY
+            RUBY
+          end
         end
       end
-    end
 
-    def migration_version
-      "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
-    end
+      def migration_version
+        "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+      end
 
-    def postgresql?
-      ::ActiveRecord::Base.connection.adapter_name.downcase.include?('postgresql')
-    rescue StandardError
-      false
-    end
+      def postgresql?
+        ::ActiveRecord::Base.connection.adapter_name.downcase.include?('postgresql')
+      rescue StandardError
+        false
+      end
 
-    def table_exists?(table_name)
-      ::ActiveRecord::Base.connection.table_exists?(table_name)
-    rescue StandardError
-      false
-    end
+      def table_exists?(table_name)
+        ::ActiveRecord::Base.connection.table_exists?(table_name)
+      rescue StandardError
+        false
+      end
 
-    private
+      private
 
-    def add_association_params(params, default_assoc, table_name, model_name, plural: false)
-      assoc = plural ? table_name.to_sym : table_name.singularize.to_sym
+      def add_association_params(params, default_assoc, table_name, model_name, plural: false)
+        assoc = plural ? table_name.to_sym : table_name.singularize.to_sym
 
-      return if assoc == default_assoc
+        return if assoc == default_assoc
 
-      params << "#{default_assoc}: :#{assoc}"
-      params << "#{default_assoc.to_s.singularize}_class: '#{model_name}'" if model_name != assoc.to_s.classify
-    end
+        params << "#{default_assoc}: :#{assoc}"
+        params << "#{default_assoc.to_s.singularize}_class: '#{model_name}'" if model_name != assoc.to_s.classify
+      end
 
-    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('/', '_')
+      def table_name_for(model_name)
+        model_name.underscore.pluralize.tr('/', '_')
+      end
+
+      # Convert model name to instance variable name
+      # e.g., "LLM::Chat" -> "llm_chat" (not "llm/chat")
+      def variable_name_for(model_name)
+        model_name.underscore.tr('/', '_')
+      end
+
+      # Convert model name to controller class name
+      # For namespaced models, use Rails convention: "Llm::Chat" -> "Llm::ChatsController"
+      # For regular models: "Chat" -> "ChatsController"
+      def controller_class_name_for(model_name)
+        if model_name.include?('::')
+          parts = model_name.split('::')
+          namespace = parts[0..-2].join('::')
+          resource = parts.last.pluralize
+          "#{namespace}::#{resource}Controller"
+        else
+          "#{model_name.pluralize}Controller"
+        end
+      end
+
+      # Convert model name to partial path
+      # e.g., "LLM::Message" -> "llm/message" (not "llm_message")
+      def partial_path_for(model_name)
+        "#{model_name.underscore.pluralize}/#{model_name.demodulize.underscore}"
+      end
     end
   end
 end

data/lib/generators/ruby_llm/install/install_generator.rb

@@ -5,106 +5,102 @@ require 'rails/generators/active_record'
 require_relative '../generator_helpers'
 
 module RubyLLM
-  # Generator for RubyLLM Rails models and migrations
-  class InstallGenerator < Rails::Generators::Base
-    include Rails::Generators::Migration
-    include RubyLLM::GeneratorHelpers
+  module Generators
+    # Generator for RubyLLM Rails models and migrations
+    class InstallGenerator < Rails::Generators::Base
+      include Rails::Generators::Migration
+      include RubyLLM::Generators::GeneratorHelpers
 
-    namespace 'ruby_llm:install'
+      namespace 'ruby_llm:install'
 
-    source_root File.expand_path('templates', __dir__)
+      source_root File.expand_path('templates', __dir__)
 
-    argument :model_mappings, type: :array, default: [], banner: 'chat:ChatName message:MessageName ...'
+      argument :model_mappings, type: :array, default: [], banner: 'chat:ChatName message:MessageName ...'
 
-    class_option :skip_active_storage, type: :boolean, default: false,
-                                       desc: 'Skip ActiveStorage installation and attachment setup'
+      class_option :skip_active_storage, type: :boolean, default: false,
+                                         desc: 'Skip ActiveStorage installation and attachment setup'
 
-    desc 'Creates models and migrations for RubyLLM Rails integration\n' \
-         'Usage: rails g ruby_llm:install [chat:ChatName] [message:MessageName] ...'
+      desc 'Creates models and migrations for RubyLLM Rails integration\n' \
+           'Usage: rails g ruby_llm:install [chat:ChatName] [message:MessageName] ...'
 
-    def self.next_migration_number(dirname)
-      ::ActiveRecord::Generators::Base.next_migration_number(dirname)
-    end
+      def self.next_migration_number(dirname)
+        ::ActiveRecord::Generators::Base.next_migration_number(dirname)
+      end
 
-    def create_migration_files
-      # Create migrations with timestamps to ensure proper order
-      # First create chats table
-      migration_template 'create_chats_migration.rb.tt',
-                         "db/migrate/create_#{chat_table_name}.rb"
-
-      # Then create messages table
-      sleep 1 # Ensure different timestamp
-      migration_template 'create_messages_migration.rb.tt',
-                         "db/migrate/create_#{message_table_name}.rb"
-
-      # Then create tool_calls table
-      sleep 1 # Ensure different timestamp
-      migration_template 'create_tool_calls_migration.rb.tt',
-                         "db/migrate/create_#{tool_call_table_name}.rb"
-
-      # Create models table
-      sleep 1 # Ensure different timestamp
-      migration_template 'create_models_migration.rb.tt',
-                         "db/migrate/create_#{model_table_name}.rb"
-
-      # Add references to chats, tool_calls and messages.
-      sleep 1 # Ensure different timestamp
-      migration_template 'add_references_to_chats_tool_calls_and_messages_migration.rb.tt',
-                         'db/migrate/add_references_to_' \
-                         "#{chat_table_name}_#{tool_call_table_name}_and_#{message_table_name}.rb"
-    end
+      def create_migration_files
+        migration_template 'create_chats_migration.rb.tt',
+                           "db/migrate/create_#{chat_table_name}.rb"
 
-    def create_model_files
-      create_namespace_modules
+        sleep 1 # Ensure different timestamp
+        migration_template 'create_messages_migration.rb.tt',
+                           "db/migrate/create_#{message_table_name}.rb"
 
-      template 'chat_model.rb.tt', "app/models/#{chat_model_name.underscore}.rb"
-      template 'message_model.rb.tt', "app/models/#{message_model_name.underscore}.rb"
-      template 'tool_call_model.rb.tt', "app/models/#{tool_call_model_name.underscore}.rb"
+        sleep 1 # Ensure different timestamp
+        migration_template 'create_tool_calls_migration.rb.tt',
+                           "db/migrate/create_#{tool_call_table_name}.rb"
 
-      template 'model_model.rb.tt', "app/models/#{model_model_name.underscore}.rb"
-    end
+        sleep 1 # Ensure different timestamp
+        migration_template 'create_models_migration.rb.tt',
+                           "db/migrate/create_#{model_table_name}.rb"
 
-    def create_initializer
-      template 'initializer.rb.tt', 'config/initializers/ruby_llm.rb'
-    end
+        sleep 1 # Ensure different timestamp
+        migration_template 'add_references_to_chats_tool_calls_and_messages_migration.rb.tt',
+                           'db/migrate/add_references_to_' \
+                           "#{chat_table_name}_#{tool_call_table_name}_and_#{message_table_name}.rb"
+      end
 
-    def install_active_storage
-      return if options[:skip_active_storage]
+      def create_model_files
+        create_namespace_modules
 
-      say '  Installing ActiveStorage for file attachments...', :cyan
-      rails_command 'active_storage:install'
-    end
+        template 'chat_model.rb.tt', "app/models/#{chat_model_name.underscore}.rb"
+        template 'message_model.rb.tt', "app/models/#{message_model_name.underscore}.rb"
+        template 'tool_call_model.rb.tt', "app/models/#{tool_call_model_name.underscore}.rb"
+
+        template 'model_model.rb.tt', "app/models/#{model_model_name.underscore}.rb"
+      end
 
-    def show_install_info
-      say "\n  ✅ RubyLLM installed!", :green
+      def create_initializer
+        template 'initializer.rb.tt', 'config/initializers/ruby_llm.rb'
+      end
 
-      say '  ✅ ActiveStorage configured for file attachments support', :green unless options[:skip_active_storage]
+      def install_active_storage
+        return if options[:skip_active_storage]
 
-      say "\n  Next steps:", :yellow
-      say '     1. Run: rails db:migrate'
-      say '     2. Set your API keys in config/initializers/ruby_llm.rb'
+        say '  Installing ActiveStorage for file attachments...', :cyan
+        rails_command 'active_storage:install'
+      end
 
-      say "     3. Start chatting: #{chat_model_name}.create!(model: 'gpt-4.1-nano').ask('Hello!')"
+      def show_install_info
+        say "\n  ✅ RubyLLM installed!", :green
 
-      say "\n  🚀 Model registry is database-backed!", :cyan
-      say '     Models automatically load from the database'
-      say '     Pass model names as strings - RubyLLM handles the rest!'
-      say "     Specify provider when needed: Chat.create!(model: 'gemini-2.5-flash', provider: 'vertexai')"
+        say '  ✅ ActiveStorage configured for file attachments support', :green unless options[:skip_active_storage]
 
-      if options[:skip_active_storage]
-        say "\n  📎 Note: ActiveStorage was skipped", :yellow
-        say '     File attachments won\'t work without ActiveStorage.'
-        say '     To enable later:'
-        say '       1. Run: rails active_storage:install && rails db:migrate'
-        say "       2. Add to your #{message_model_name} model: has_many_attached :attachments"
-      end
+        say "\n  Next steps:", :yellow
+        say '     1. Run: rails db:migrate'
+        say '     2. Set your API keys in config/initializers/ruby_llm.rb'
 
-      say "\n  📚 Documentation: https://rubyllm.com", :cyan
+        say "     3. Start chatting: #{chat_model_name}.create!(model: 'gpt-4.1-nano').ask('Hello!')"
 
-      say "\n  ❤️  Love RubyLLM?", :magenta
-      say '     • ⭐ Star on GitHub: https://github.com/crmne/ruby_llm'
-      say '     • 🐦 Follow for updates: https://x.com/paolino'
-      say "\n"
+        say "\n  🚀 Model registry is database-backed!", :cyan
+        say '     Models automatically load from the database'
+        say '     Pass model names as strings - RubyLLM handles the rest!'
+        say "     Specify provider when needed: Chat.create!(model: 'gemini-2.5-flash', provider: 'vertexai')"
+
+        if options[:skip_active_storage]
+          say "\n  📎 Note: ActiveStorage was skipped", :yellow
+          say '     File attachments won\'t work without ActiveStorage.'
+          say '     To enable later:'
+          say '       1. Run: rails active_storage:install && rails db:migrate'
+          say "       2. Add to your #{message_model_name} model: has_many_attached :attachments"
+        end
+
+        say "\n  📚 Documentation: https://rubyllm.com", :cyan
+
+        say "\n  ❤️  Love RubyLLM?", :magenta
+        say '     • ⭐ Star on GitHub: https://github.com/crmne/ruby_llm'
+        say '     • 🐦 Follow for updates: https://x.com/paolino'
+        say "\n"
+      end
     end
   end
 end

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

@@ -1,5 +1,5 @@
 RubyLLM.configure do |config|
-  config.openai_api_key = Rails.application.credentials.dig(:openai_api_key)
+  config.openai_api_key = ENV['OPENAI_API_KEY'] || Rails.application.credentials.dig(:openai_api_key)
   # config.default_model = "gpt-4.1-nano"
 
   # Use the new association-based acts_as API (recommended)