ruby_llm 1.14.1 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e29291ded69046aa32b77f524a148e14ce1b1bfbcaddea1da99b5cee66f7b13
-  data.tar.gz: '08a7aaa292f898f0e25f69658f19289799eb5e520feabf8a736bb3737d05fb9d'
+  metadata.gz: 3cfdd21451b6e3daac0463dfdb7655892967e5a4da6b00846f353809a9abe18a
+  data.tar.gz: e1505ddd57326601298bb8975c20049a195eb87babd62b08ac0e6340c9e653f6
 SHA512:
-  metadata.gz: e9d4a4c8f284fc94669217c0979da4f6e6eccc95e0e47a8429b64c35c447ade3d994f278431c1593bc1fef804545e2bc0f5529775bc209b72dd728eeb4d99016
-  data.tar.gz: c6ed2232f289a940ad3b9ee29279005528bf74a5921b911fda19e8e2cc6ecb939405e46db76a7e1e83f580da69ed368fa197355b05efada524a537419ac37381
+  metadata.gz: 7222e575d4f1e5cf620fdc37f4c255c7ededeee945d7b77fac4129c2947d6f78f7d5641b45ed39470180e5bf2dfd48b36e0a6c16579e4e4835564c48b6907920
+  data.tar.gz: ce3fb0f0e8b3665fafe56717cf8fcb10733008821633b024013d0f6e5d0bc90ef47f25b0109aa0e80ee3df4002e2f9b6a20cd98595031aa57235588cb4677052

data/README.md

@@ -86,9 +86,7 @@ RubyLLM.moderate "Check if this text is safe"
 ```ruby
 # Let AI use your code
 class Weather < RubyLLM::Tool
-  description "Get current weather"
-  param :latitude
-  param :longitude
+  desc "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"

data/lib/generators/ruby_llm/generator_helpers.rb

@@ -87,6 +87,7 @@ module RubyLLM
 
         add_association_params(params, :message, message_table_name, message_model_name,
                                owner_table: tool_call_table_name, owner_model_name: tool_call_model_name)
+        add_result_foreign_key_param(params)
 
         "acts_as_tool_call#{" #{params.join(', ')}" if params.any?}"
       end
@@ -178,6 +179,13 @@ module RubyLLM
         "#{owner_model_name.demodulize.underscore}_id"
       end
 
+      def add_result_foreign_key_param(params)
+        foreign_key = "#{tool_call_table_name.singularize}_id"
+        default_foreign_key = "#{tool_call_model_name.demodulize.underscore}_id"
+
+        params << "result_foreign_key: :#{foreign_key}" if foreign_key != default_foreign_key
+      end
+
       # Convert namespaced model names to proper table names
       # e.g., "Assistant::Chat" -> "assistant_chats" (not "assistant/chats")
       def table_name_for(model_name)

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

@@ -1,5 +1,5 @@
 class <%= class_name %>Tool < RubyLLM::Tool
-  description "TODO: describe what this tool does"
+  desc "TODO: describe what this tool does"
 
   def execute
     # TODO: return something to the LLM.

data/lib/ruby_llm/active_record/acts_as.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'active_support/concern'
+require 'active_support/inflector'
+
 module RubyLLM
   module ActiveRecord
     # Adds chat and message persistence capabilities to ActiveRecord models.

data/lib/ruby_llm/active_record/acts_as_legacy.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'active_support/concern'
+require 'active_support/inflector'
+
 module RubyLLM
   module ActiveRecord
     # Adds chat and message persistence capabilities to ActiveRecord models.
@@ -160,27 +163,33 @@ module RubyLLM
         self
       end
 
-      def on_new_message(&block)
-        to_llm
+      def on_new_message(&)
+        to_llm.on_new_message(&)
+        self
+      end
 
-        existing_callback = @chat.instance_variable_get(:@on)[:new_message]
+      def on_end_message(&)
+        to_llm.on_end_message(&)
+        self
+      end
 
-        @chat.on_new_message do
-          existing_callback&.call
-          block&.call
-        end
+      def before_message(...)
+        to_llm.before_message(...)
         self
       end
 
-      def on_end_message(&block)
-        to_llm
+      def after_message(...)
+        to_llm.after_message(...)
+        self
+      end
 
-        existing_callback = @chat.instance_variable_get(:@on)[:end_message]
+      def before_tool_call(...)
+        to_llm.before_tool_call(...)
+        self
+      end
 
-        @chat.on_end_message do |msg|
-          existing_callback&.call(msg)
-          block&.call(msg)
-        end
+      def after_tool_result(...)
+        to_llm.after_tool_result(...)
         self
       end
 
@@ -319,8 +328,8 @@ module RubyLLM
       def setup_persistence_callbacks
         return @chat if @chat.instance_variable_get(:@_persistence_callbacks_setup)
 
-        @chat.on_new_message { persist_new_message }
-        @chat.on_end_message { |msg| persist_message_completion(msg) }
+        @chat.before_message { persist_new_message }
+        @chat.after_message { |msg| persist_message_completion(msg) }
 
         @chat.instance_variable_set(:@_persistence_callbacks_setup, true)
         @chat
@@ -383,8 +392,8 @@ module RubyLLM
           case attachment
           when ActionDispatch::Http::UploadedFile, ActiveStorage::Blob
             attachment
-          when ActiveStorage::Attached::One, ActiveStorage::Attached::Many
-            attachment.blobs
+          when ActiveStorage::Attachment, ActiveStorage::Attached::One, ActiveStorage::Attached::Many
+            active_storage_blobs(attachment)
           when Hash
             attachment.values.map { |v| prepare_for_active_storage(v) }
           else
@@ -398,16 +407,28 @@ module RubyLLM
 
         attachment = source.is_a?(RubyLLM::Attachment) ? source : RubyLLM::Attachment.new(source)
 
-        {
-          io: StringIO.new(attachment.content),
-          filename: attachment.filename,
-          content_type: attachment.mime_type
-        }
+        if attachment.active_storage?
+          active_storage_blobs(attachment.source)
+        else
+          {
+            io: StringIO.new(attachment.content),
+            filename: attachment.filename,
+            content_type: attachment.mime_type
+          }
+        end
       rescue StandardError => e
         RubyLLM.logger.warn "Failed to process attachment #{source}: #{e.message}"
         nil
       end
 
+      def active_storage_blobs(attachment)
+        case attachment
+        when ActiveStorage::Blob then attachment
+        when ActiveStorage::Attachment, ActiveStorage::Attached::One then attachment.blob
+        when ActiveStorage::Attached::Many then attachment.blobs
+        end
+      end
+
       def build_content(message, attachments)
         return message if content_like?(message)
 
@@ -473,9 +494,15 @@ module RubyLLM
       end
 
       def extract_content
-        return content unless respond_to?(:attachments) && attachments.attached?
+        text_content = if content.respond_to?(:to_plain_text)
+                         content.to_plain_text
+                       else
+                         content
+                       end
+
+        return text_content unless respond_to?(:attachments) && attachments.attached?
 
-        RubyLLM::Content.new(content).tap do |content_obj|
+        RubyLLM::Content.new(text_content).tap do |content_obj|
           @_tempfiles = []
 
           attachments.each do |attachment|

data/lib/ruby_llm/active_record/chat_methods.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/concern'
+
 module RubyLLM
   module ActiveRecord
     # Methods mixed into chat models.
@@ -154,27 +156,33 @@ module RubyLLM
         self
       end
 
-      def on_new_message(&block)
-        to_llm
+      def on_new_message(&)
+        to_llm.on_new_message(&)
+        self
+      end
 
-        existing_callback = @chat.instance_variable_get(:@on)[:new_message]
+      def on_end_message(&)
+        to_llm.on_end_message(&)
+        self
+      end
 
-        @chat.on_new_message do
-          existing_callback&.call
-          block&.call
-        end
+      def before_message(...)
+        to_llm.before_message(...)
         self
       end
 
-      def on_end_message(&block)
-        to_llm
+      def after_message(...)
+        to_llm.after_message(...)
+        self
+      end
 
-        existing_callback = @chat.instance_variable_get(:@on)[:end_message]
+      def before_tool_call(...)
+        to_llm.before_tool_call(...)
+        self
+      end
 
-        @chat.on_end_message do |msg|
-          existing_callback&.call(msg)
-          block&.call(msg)
-        end
+      def after_tool_result(...)
+        to_llm.after_tool_result(...)
         self
       end
 
@@ -208,6 +216,10 @@ module RubyLLM
         message_record
       end
 
+      def cost
+        RubyLLM::Cost.aggregate(messages_association.map(&:cost))
+      end
+
       def create_user_message(content, with: nil)
         add_message(role: :user, content: build_content(content, with))
       end
@@ -258,8 +270,8 @@ module RubyLLM
       def setup_persistence_callbacks
         return @chat if @chat.instance_variable_get(:@_persistence_callbacks_setup)
 
-        @chat.on_new_message { persist_new_message }
-        @chat.on_end_message { |msg| persist_message_completion(msg) }
+        @chat.before_message { persist_new_message }
+        @chat.after_message { |msg| persist_message_completion(msg) }
 
         @chat.instance_variable_set(:@_persistence_callbacks_setup, true)
         @chat
@@ -402,8 +414,8 @@ module RubyLLM
           case attachment
           when ActionDispatch::Http::UploadedFile, ActiveStorage::Blob
             attachment
-          when ActiveStorage::Attached::One, ActiveStorage::Attached::Many
-            attachment.blobs
+          when ActiveStorage::Attachment, ActiveStorage::Attached::One, ActiveStorage::Attached::Many
+            active_storage_blobs(attachment)
           when Hash
             attachment.values.map { |v| prepare_for_active_storage(v) }
           else
@@ -418,10 +430,7 @@ module RubyLLM
         attachment = source.is_a?(RubyLLM::Attachment) ? source : RubyLLM::Attachment.new(source)
 
         if attachment.active_storage?
-          case attachment.source
-          when ActiveStorage::Blob then attachment.source
-          when ActiveStorage::Attached::One, ActiveStorage::Attached::Many then attachment.source.blobs
-          end
+          active_storage_blobs(attachment.source)
         else
           {
             io: StringIO.new(attachment.content),
@@ -434,6 +443,14 @@ module RubyLLM
         nil
       end
 
+      def active_storage_blobs(attachment)
+        case attachment
+        when ActiveStorage::Blob then attachment
+        when ActiveStorage::Attachment, ActiveStorage::Attached::One then attachment.blob
+        when ActiveStorage::Attached::Many then attachment.blobs
+        end
+      end
+
       def build_content(message, attachments)
         return message if content_like?(message)
 

data/lib/ruby_llm/active_record/message_methods.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'active_support/concern'
+require 'ruby_llm/active_record/payload_helpers'
+
 module RubyLLM
   module ActiveRecord
     # Methods mixed into message models.
@@ -40,6 +43,18 @@ module RubyLLM
         )
       end
 
+      def cost
+        RubyLLM::Cost.new(tokens:, model: model_association)
+      end
+
+      def cache_read_tokens
+        cached_value
+      end
+
+      def cache_write_tokens
+        cache_creation_value
+      end
+
       def to_partial_path
         partial_prefix = self.class.name.underscore.pluralize
         role_partial = if to_llm.tool_call?
@@ -99,7 +114,8 @@ module RubyLLM
       def extract_content
         return RubyLLM::Content::Raw.new(content_raw) if has_attribute?(:content_raw) && content_raw.present?
 
-        content_value = self[:content]
+        content_value = content
+        content_value = content_value.to_plain_text if content_value.respond_to?(:to_plain_text)
 
         return content_value unless respond_to?(:attachments) && attachments.attached?
 

data/lib/ruby_llm/active_record/model_methods.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'active_support/concern'
+require 'active_support/core_ext/module/delegation'
+
 module RubyLLM
   module ActiveRecord
     # Methods mixed into model registry models.
@@ -10,15 +13,7 @@ module RubyLLM
         def refresh!
           RubyLLM.models.refresh!
 
-          transaction do
-            RubyLLM.models.all.each do |model_info|
-              model = find_or_initialize_by(
-                model_id: model_info.id,
-                provider: model_info.provider
-              )
-              model.update!(from_llm_attributes(model_info))
-            end
-          end
+          save_to_database
         end
 
         def save_to_database
@@ -76,8 +71,11 @@ module RubyLLM
 
       delegate :supports?, :supports_vision?, :supports_functions?, :type,
                :input_price_per_million, :output_price_per_million,
+               :cache_read_input_price_per_million, :cache_write_input_price_per_million,
+               :cached_input_price_per_million, :cache_creation_input_price_per_million,
                :function_calling?, :structured_output?, :batch?,
                :reasoning?, :citations?, :streaming?, :provider_class, :label,
+               :cost_for,
                to: :to_llm
     end
   end

data/lib/ruby_llm/active_record/payload_helpers.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'active_support/core_ext/object/blank'
+require 'json'
+
 module RubyLLM
   module ActiveRecord
     # Shared helpers for parsing serialized payloads on ActiveRecord-backed models.

data/lib/ruby_llm/active_record/tool_call_methods.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'active_support/concern'
+require 'ruby_llm/active_record/payload_helpers'
+
 module RubyLLM
   module ActiveRecord
     # Methods mixed into tool call models.

data/lib/ruby_llm/agent.rb

@@ -359,7 +359,8 @@ module RubyLLM
 
     def_delegators :chat, :model, :messages, :tools, :params, :headers, :schema, :ask, :say, :with_tool, :with_tools,
                    :with_model, :with_temperature, :with_thinking, :with_context, :with_params, :with_headers,
-                   :with_schema, :on_new_message, :on_end_message, :on_tool_call, :on_tool_result, :each, :complete,
-                   :add_message, :reset_messages!
+                   :with_schema, :on_new_message, :on_end_message, :on_tool_call, :on_tool_result, :before_message,
+                   :after_message, :before_tool_call, :after_tool_result, :each, :complete, :add_message,
+                   :reset_messages!, :cost
   end
 end

data/lib/ruby_llm/aliases.json

@@ -9,7 +9,6 @@
   },
   "claude-3-5-sonnet": {
     "anthropic": "claude-3-5-sonnet-20241022",
-    "openrouter": "anthropic/claude-3.5-sonnet",
     "bedrock": "anthropic.claude-3-5-sonnet-20241022-v2:0"
   },
   "claude-3-7-sonnet": {
@@ -17,9 +16,6 @@
     "openrouter": "anthropic/claude-3.7-sonnet",
     "bedrock": "anthropic.claude-3-7-sonnet-20250219-v1:0"
   },
-  "claude-3-7-sonnet-latest": {
-    "anthropic": "claude-3-7-sonnet-latest"
-  },
   "claude-3-haiku": {
     "anthropic": "claude-3-haiku-20240307",
     "openrouter": "anthropic/claude-3-haiku",
@@ -64,6 +60,12 @@
     "bedrock": "anthropic.claude-opus-4-6-v1",
     "azure": "claude-opus-4-6"
   },
+  "claude-opus-4-7": {
+    "anthropic": "claude-opus-4-7",
+    "openrouter": "anthropic/claude-opus-4.7",
+    "bedrock": "anthropic.claude-opus-4-7",
+    "azure": "claude-opus-4-7"
+  },
   "claude-sonnet-4": {
     "anthropic": "claude-sonnet-4-20250514",
     "openrouter": "anthropic/claude-sonnet-4",
@@ -88,6 +90,14 @@
     "deepseek": "deepseek-chat",
     "openrouter": "deepseek/deepseek-chat"
   },
+  "deepseek-v4-flash": {
+    "deepseek": "deepseek-v4-flash",
+    "openrouter": "deepseek/deepseek-v4-flash"
+  },
+  "deepseek-v4-pro": {
+    "deepseek": "deepseek-v4-pro",
+    "openrouter": "deepseek/deepseek-v4-pro"
+  },
   "gemini-1.5-flash": {
     "gemini": "gemini-1.5-flash",
     "vertexai": "gemini-1.5-flash"
@@ -207,6 +217,10 @@
     "gemini": "gemini-embedding-001",
     "vertexai": "gemini-embedding-001"
   },
+  "gemini-embedding-2": {
+    "gemini": "gemini-embedding-2",
+    "vertexai": "gemini-embedding-2"
+  },
   "gemini-flash": {
     "gemini": "gemini-flash-latest",
     "vertexai": "gemini-flash-latest"
@@ -231,6 +245,14 @@
     "gemini": "gemma-3n-e4b-it",
     "openrouter": "google/gemma-3n-e4b-it"
   },
+  "gemma-4-26b-a4b-it": {
+    "gemini": "gemma-4-26b-a4b-it",
+    "openrouter": "google/gemma-4-26b-a4b-it"
+  },
+  "gemma-4-31b-it": {
+    "gemini": "gemma-4-31b-it",
+    "openrouter": "google/gemma-4-31b-it"
+  },
   "gpt-3.5-turbo": {
     "openai": "gpt-3.5-turbo",
     "openrouter": "openai/gpt-3.5-turbo"
@@ -378,6 +400,14 @@
     "openai": "gpt-5.4-pro",
     "openrouter": "openai/gpt-5.4-pro"
   },
+  "gpt-5.5": {
+    "openai": "gpt-5.5",
+    "openrouter": "openai/gpt-5.5"
+  },
+  "gpt-5.5-pro": {
+    "openai": "gpt-5.5-pro",
+    "openrouter": "openai/gpt-5.5-pro"
+  },
   "gpt-audio": {
     "openai": "gpt-audio",
     "openrouter": "openai/gpt-audio"

data/lib/ruby_llm/attachment.rb

@@ -32,6 +32,7 @@ module RubyLLM
       return false unless defined?(ActiveStorage)
 
       @source.is_a?(ActiveStorage::Blob) ||
+        @source.is_a?(ActiveStorage::Attachment) ||
         @source.is_a?(ActiveStorage::Attached::One) ||
         @source.is_a?(ActiveStorage::Attached::Many)
     end
@@ -148,16 +149,7 @@ module RubyLLM
     def load_content_from_active_storage
       return unless defined?(ActiveStorage)
 
-      @content = case @source
-                 when ActiveStorage::Blob
-                   @source.download
-                 when ActiveStorage::Attached::One
-                   @source.blob&.download
-                 when ActiveStorage::Attached::Many
-                   # For multiple attachments, just take the first one
-                   # This maintains the single-attachment interface
-                   @source.blobs.first&.download
-                 end
+      @content = active_storage_blob&.download
     end
 
     def source_type_cast
@@ -192,31 +184,23 @@ module RubyLLM
       end
     end
 
-    def extract_filename_from_active_storage # rubocop:disable Metrics/PerceivedComplexity
+    def extract_filename_from_active_storage
       return 'attachment' unless defined?(ActiveStorage)
 
-      case @source
-      when ActiveStorage::Blob
-        @source.filename.to_s
-      when ActiveStorage::Attached::One
-        @source.blob&.filename&.to_s || 'attachment'
-      when ActiveStorage::Attached::Many
-        @source.blobs.first&.filename&.to_s || 'attachment'
-      else
-        'attachment'
-      end
+      active_storage_blob&.filename&.to_s || 'attachment'
     end
 
     def active_storage_content_type
       return unless defined?(ActiveStorage)
 
+      active_storage_blob&.content_type
+    end
+
+    def active_storage_blob
       case @source
-      when ActiveStorage::Blob
-        @source.content_type
-      when ActiveStorage::Attached::One
-        @source.blob&.content_type
-      when ActiveStorage::Attached::Many
-        @source.blobs.first&.content_type
+      when ActiveStorage::Blob then @source
+      when ActiveStorage::Attachment, ActiveStorage::Attached::One then @source.blob
+      when ActiveStorage::Attached::Many then @source.blobs.first
       end
     end
   end