ruby_llm 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af7f86a7a466d3632083cb3a0b08f463ff140ccb81125ca2a0cdbe9e07c987aa
-  data.tar.gz: 38e08d2bed60f094117c1649c405026101a7205ee47d55833957231874e3b751
+  metadata.gz: 608fe5c960367e570a076fc956c9deed5232f289ede88971ad9f98c312a63c81
+  data.tar.gz: e402cce6a24c53ac98d0ae956e3f508664b08ceb35c02a3f228659e41735b7ed
 SHA512:
-  metadata.gz: 1391c4a44df215cee71c7458923e7bcc4e883a1e883cdcba42355bab3b7f76f6f8e82e33b9cc9b7b1c06e4d15c65fcff9822cee75477f2ac7cb53076abed9f4c
-  data.tar.gz: 04cbf69517185e7b6da978ae9625421553258baef325a93cbc73d243cd14cc178a556f8531946a073f77e150bd519e79eeccf1c1dbb5e53826587f28e56051eb
+  metadata.gz: a63d7a0f9d78ce884ee4da47ee758dadda1436ce831a5e3386652f297355b656ffe5f49ab20dc89e2773d87482d6d7b83e8b06fa1912aca5c5e7c56724558791
+  data.tar.gz: 4437db6a16721f689f1a0adc8a880a9a83fcf177a16856a50df012bffe088fb1de304218daeaa396ad1b88b8c68883eede8d1bee71c4b7da4f70a44d0b0428ee

data/lib/generators/ruby_llm/generator_helpers.rb

@@ -52,8 +52,10 @@ module RubyLLM
       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,
+                               owner_table: chat_table_name, plural: true)
+        add_association_params(params, :model, model_table_name, model_model_name,
+                               owner_table: chat_table_name)
 
         "acts_as_chat#{" #{params.join(', ')}" if params.any?}"
       end
@@ -61,9 +63,12 @@ module RubyLLM
       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,
+                               owner_table: message_table_name)
+        add_association_params(params, :tool_calls, tool_call_table_name, tool_call_model_name,
+                               owner_table: message_table_name, plural: true)
+        add_association_params(params, :model, model_table_name, model_model_name,
+                               owner_table: message_table_name)
 
         "acts_as_message#{" #{params.join(', ')}" if params.any?}"
       end
@@ -71,7 +76,8 @@ module RubyLLM
       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,
+                               owner_table: model_table_name, plural: true)
 
         "acts_as_model#{" #{params.join(', ')}" if params.any?}"
       end
@@ -79,7 +85,8 @@ module RubyLLM
       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,
+                               owner_table: tool_call_table_name)
 
         "acts_as_tool_call#{" #{params.join(', ')}" if params.any?}"
       end
@@ -120,6 +127,12 @@ module RubyLLM
         false
       end
 
+      def mysql?
+        ::ActiveRecord::Base.connection.adapter_name.downcase.include?('mysql')
+      rescue StandardError
+        false
+      end
+
       def table_exists?(table_name)
         ::ActiveRecord::Base.connection.table_exists?(table_name)
       rescue StandardError
@@ -128,13 +141,21 @@ module RubyLLM
 
       private
 
-      def add_association_params(params, default_assoc, table_name, model_name, plural: false)
+      def add_association_params(params, default_assoc, table_name, model_name, owner_table:, plural: false) # rubocop:disable Metrics/ParameterLists
         assoc = plural ? table_name.to_sym : table_name.singularize.to_sym
 
-        return if assoc == default_assoc
+        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
 
-        params << "#{default_assoc}: :#{assoc}"
+        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
 
       # Convert namespaced model names to proper table names

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

@@ -14,6 +14,11 @@ class Create<%= model_model_name.gsub('::', '').pluralize %> < ActiveRecord::Mig
       t.jsonb :capabilities, default: []
       t.jsonb :pricing, default: {}
       t.jsonb :metadata, default: {}
+<% elsif mysql? %>
+      t.json :modalities
+      t.json :capabilities
+      t.json :pricing
+      t.json :metadata
 <% else %>
       t.json :modalities, default: {}
       t.json :capabilities, default: []

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

@@ -4,7 +4,13 @@ class Create<%= tool_call_model_name.gsub('::', '').pluralize %> < ActiveRecord:
     create_table :<%= tool_call_table_name %> do |t|
       t.string :tool_call_id, null: false
       t.string :name, null: false
-      t.<%= postgresql? ? 'jsonb' : 'json' %> :arguments, default: {}
+<% if postgresql? %>
+      t.jsonb :arguments, default: {}
+<% elsif mysql? %>
+      t.json :arguments
+<% else %>
+      t.json :arguments, default: {}
+<% end %>
       t.timestamps
     end
 

data/lib/ruby_llm/active_record/acts_as.rb

@@ -31,8 +31,8 @@ module RubyLLM
       end
 
       class_methods do # rubocop:disable Metrics/BlockLength
-        def acts_as_chat(messages: :messages, message_class: nil,
-                         model: :model, model_class: nil)
+        def acts_as_chat(messages: :messages, message_class: nil, messages_foreign_key: nil, # rubocop:disable Metrics/ParameterLists
+                         model: :model, model_class: nil, model_foreign_key: nil)
           include RubyLLM::ActiveRecord::ChatMethods
 
           class_attribute :messages_association_name, :model_association_name, :message_class, :model_class
@@ -45,12 +45,12 @@ module RubyLLM
           has_many messages,
                    -> { order(created_at: :asc) },
                    class_name: self.message_class,
-                   foreign_key: ActiveSupport::Inflector.foreign_key(table_name.singularize),
+                   foreign_key: messages_foreign_key,
                    dependent: :destroy
 
           belongs_to model,
                      class_name: self.model_class,
-                     foreign_key: ActiveSupport::Inflector.foreign_key(model.to_s.singularize),
+                     foreign_key: model_foreign_key,
                      optional: true
 
           delegate :add_message, to: :to_llm
@@ -68,7 +68,7 @@ module RubyLLM
           end
         end
 
-        def acts_as_model(chats: :chats, chat_class: nil)
+        def acts_as_model(chats: :chats, chat_class: nil, chats_foreign_key: nil)
           include RubyLLM::ActiveRecord::ModelMethods
 
           class_attribute :chats_association_name, :chat_class
@@ -80,18 +80,16 @@ module RubyLLM
           validates :provider, presence: true
           validates :name, presence: true
 
-          has_many chats,
-                   class_name: self.chat_class,
-                   foreign_key: ActiveSupport::Inflector.foreign_key(table_name.singularize)
+          has_many chats, class_name: self.chat_class, foreign_key: chats_foreign_key
 
           define_method :chats_association do
             send(chats_association_name)
           end
         end
 
-        def acts_as_message(chat: :chat, chat_class: nil, touch_chat: false, # rubocop:disable Metrics/ParameterLists
-                            tool_calls: :tool_calls, tool_call_class: nil,
-                            model: :model, model_class: nil)
+        def acts_as_message(chat: :chat, chat_class: nil, chat_foreign_key: nil, touch_chat: false, # rubocop:disable Metrics/ParameterLists
+                            tool_calls: :tool_calls, tool_call_class: nil, tool_calls_foreign_key: nil,
+                            model: :model, model_class: nil, model_foreign_key: nil)
           include RubyLLM::ActiveRecord::MessageMethods
 
           class_attribute :chat_association_name, :tool_calls_association_name, :model_association_name,
@@ -106,12 +104,12 @@ module RubyLLM
 
           belongs_to chat,
                      class_name: self.chat_class,
-                     foreign_key: ActiveSupport::Inflector.foreign_key(chat.to_s.singularize),
+                     foreign_key: chat_foreign_key,
                      touch: touch_chat
 
           has_many tool_calls,
                    class_name: self.tool_call_class,
-                   foreign_key: ActiveSupport::Inflector.foreign_key(table_name.singularize),
+                   foreign_key: tool_calls_foreign_key,
                    dependent: :destroy
 
           belongs_to :parent_tool_call,
@@ -126,7 +124,7 @@ module RubyLLM
 
           belongs_to model,
                      class_name: self.model_class,
-                     foreign_key: ActiveSupport::Inflector.foreign_key(model.to_s.singularize),
+                     foreign_key: model_foreign_key,
                      optional: true
 
           delegate :tool_call?, :tool_result?, to: :to_llm
@@ -144,8 +142,8 @@ module RubyLLM
           end
         end
 
-        def acts_as_tool_call(message: :message, message_class: nil,
-                              result: :result, result_class: nil)
+        def acts_as_tool_call(message: :message, message_class: nil, message_foreign_key: nil, # rubocop:disable Metrics/ParameterLists
+                              result: :result, result_class: nil, result_foreign_key: nil)
           class_attribute :message_association_name, :result_association_name, :message_class, :result_class
 
           self.message_association_name = message
@@ -155,11 +153,11 @@ module RubyLLM
 
           belongs_to message,
                      class_name: self.message_class,
-                     foreign_key: ActiveSupport::Inflector.foreign_key(message.to_s.singularize)
+                     foreign_key: message_foreign_key
 
           has_one result,
                   class_name: self.result_class,
-                  foreign_key: ActiveSupport::Inflector.foreign_key(table_name.singularize),
+                  foreign_key: result_foreign_key,
                   dependent: :nullify
 
           define_method :message_association do

data/lib/ruby_llm/aliases.json

@@ -11,11 +11,6 @@
   "claude-3-5-haiku-latest": {
     "anthropic": "claude-3-5-haiku-latest"
   },
-  "claude-3-5-sonnet": {
-    "anthropic": "claude-3-5-sonnet-20241022",
-    "openrouter": "anthropic/claude-3.5-sonnet",
-    "bedrock": "anthropic.claude-3-5-sonnet-20240620-v1:0:200k"
-  },
   "claude-3-7-sonnet": {
     "anthropic": "claude-3-7-sonnet-20250219",
     "openrouter": "anthropic/claude-3.7-sonnet",
@@ -265,14 +260,6 @@
     "openai": "o1",
     "openrouter": "openai/o1"
   },
-  "o1-mini": {
-    "openai": "o1-mini",
-    "openrouter": "openai/o1-mini"
-  },
-  "o1-mini-2024-09-12": {
-    "openai": "o1-mini-2024-09-12",
-    "openrouter": "openai/o1-mini-2024-09-12"
-  },
   "o1-pro": {
     "openai": "o1-pro",
     "openrouter": "openai/o1-pro"

data/lib/ruby_llm/attachment.rb

@@ -7,17 +7,8 @@ module RubyLLM
 
     def initialize(source, filename: nil)
       @source = source
-      if url?
-        @source = URI source
-        @filename = filename || File.basename(@source.path).to_s
-      elsif path?
-        @source = Pathname.new source
-        @filename = filename || @source.basename.to_s
-      elsif active_storage?
-        @filename = filename || extract_filename_from_active_storage
-      else
-        @filename = filename
-      end
+      @source = source_type_cast
+      @filename = filename || source_filename
 
       determine_mime_type
     end
@@ -166,6 +157,38 @@ module RubyLLM
                  end
     end
 
+    def source_type_cast
+      if url?
+        URI(@source)
+      elsif path?
+        Pathname.new(@source)
+      else
+        @source
+      end
+    end
+
+    def source_filename
+      if url?
+        File.basename(@source.path).to_s
+      elsif path?
+        @source.basename.to_s
+      elsif io_like?
+        extract_filename_from_io
+      elsif active_storage?
+        extract_filename_from_active_storage
+      end
+    end
+
+    def extract_filename_from_io
+      if defined?(ActionDispatch::Http::UploadedFile) && @source.is_a?(ActionDispatch::Http::UploadedFile)
+        @source.original_filename.to_s
+      elsif @source.respond_to?(:path)
+        File.basename(@source.path).to_s
+      else
+        'attachment'
+      end
+    end
+
     def extract_filename_from_active_storage # rubocop:disable Metrics/PerceivedComplexity
       return 'attachment' unless defined?(ActiveStorage)