ruby_llm 0.1.0.pre17 → 0.1.0.pre19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 899bee99690875afeb0d8bb83b654cf05ccaa4db7006971eb122e7188e91f6b7
-  data.tar.gz: a050cc712573b90bc2d2d1012f40c1866be940e001b6d2aaff6089834bf89584
+  metadata.gz: 230db2439975e0515e1f128a286222c06de3de1b7eff0b77631bc9e4fa2df338
+  data.tar.gz: 25846959e0c3d2c411d82825077b4ff112bef0aea7910e87f5b3336fd58f8dca
 SHA512:
-  metadata.gz: f18a0c1094c407d7690151825f1c0cc557e2621fda75569c052ab9d396a46b7201e8aa3ba643a42da3d1b52e2a8a95216d315f66632cd6cc4de1fee0a372cfb1
-  data.tar.gz: 312856c0e943e93933e33e492d1e599732b6714a527cf83ac3d5b271d50ecd004064ae7aec5b5671e5dca2c83dba3e458794f0a87c0c12f19c27357a89b9ad61
+  metadata.gz: b082f5426e1c0d4ef426df99c5cca9463943b525e113b11aa9d60b799ebe6b0ae77fcc347a06d922b98316b402f8eb9a6a716ddd5e45c26ef86458eb4405d17c
+  data.tar.gz: c8a8a42ef3e0e8eb676fae0a28a26103c0dd1ff66be9753bb13d448f3114fb05d862fe78eee5f7599b6e2edd28a8d78c4e1fcd64ca87e163cecf1725f73351ff

data/README.md

@@ -82,7 +82,7 @@ Need vector embeddings for your text? RubyLLM makes it simple:
 
 ```ruby
 # Get embeddings with the default model
-vector = RubyLLM.embed(text: "Hello, world!")
+vector = RubyLLM.embed "Hello, world!"
 
 # Use a specific model
 vector = RubyLLM.embed(
@@ -191,18 +191,32 @@ end
 class CreateMessages < ActiveRecord::Migration[8.0]
   def change
     create_table :messages do |t|
-      t.references :chat
+      t.references :chat, null: false
       t.string :role
       t.text :content
-      t.json :tool_calls, default: {}
-      t.string :tool_call_id
+      t.string :model_id
       t.integer :input_tokens
       t.integer :output_tokens
-      t.string :model_id
+      t.references :tool_call
       t.timestamps
     end
   end
 end
+
+# db/migrate/YYYYMMDDHHMMSS_create_tool_calls.rb
+class CreateToolCalls < ActiveRecord::Migration[8.0]
+  def change
+    create_table :tool_calls do |t|
+      t.references :message, null: false
+      t.string :tool_call_id, null: false
+      t.string :name, null: false
+      t.jsonb :arguments, default: {}
+      t.timestamps
+    end
+
+    add_index :tool_calls, :tool_call_id
+  end
+end
 ```
 
 Then in your models:
@@ -218,6 +232,10 @@ end
 class Message < ApplicationRecord
   acts_as_message
 end
+
+class ToolCall < ApplicationRecord
+  acts_as_tool_call
+end
 ```
 
 That's it! Now you can use chats straight from your models:

data/lib/ruby_llm/active_record/acts_as.rb

@@ -8,13 +8,16 @@ module RubyLLM
     module ActsAs
       extend ActiveSupport::Concern
 
-      class_methods do
-        def acts_as_chat(message_class: 'Message') # rubocop:disable Metrics/MethodLength
+      class_methods do # rubocop:disable Metrics/BlockLength
+        def acts_as_chat(message_class: 'Message', tool_call_class: 'ToolCall') # rubocop:disable Metrics/MethodLength
           include ChatMethods
 
+          @message_class = message_class.to_s
+          @tool_call_class = tool_call_class.to_s
+
           has_many :messages,
                    -> { order(created_at: :asc) },
-                   class_name: message_class.to_s,
+                   class_name: @message_class,
                    dependent: :destroy
 
           delegate :complete,
@@ -28,13 +31,35 @@ module RubyLLM
                    to: :to_llm
         end
 
-        def acts_as_message(chat_class: 'Chat')
+        def acts_as_message(chat_class: 'Chat', tool_call_class: 'ToolCall') # rubocop:disable Metrics/MethodLength
           include MessageMethods
 
-          belongs_to :chat, class_name: chat_class.to_s
+          @chat_class = chat_class.to_s
+          @tool_call_class = tool_call_class.to_s
+
+          belongs_to :chat, class_name: @chat_class
+          has_many :tool_calls, class_name: @tool_call_class, dependent: :destroy
+
+          belongs_to :parent_tool_call,
+                     class_name: @tool_call_class,
+                     foreign_key: 'tool_call_id',
+                     optional: true,
+                     inverse_of: :result
 
           delegate :tool_call?, :tool_result?, :tool_results, to: :to_llm
         end
+
+        def acts_as_tool_call(message_class: 'Message')
+          @message_class = message_class.to_s
+
+          belongs_to :message, class_name: @message_class
+
+          has_one :result,
+                  class_name: @message_class,
+                  foreign_key: 'tool_call_id',
+                  inverse_of: :parent_tool_call,
+                  dependent: :nullify
+        end
       end
     end
 
@@ -43,6 +68,10 @@ module RubyLLM
     module ChatMethods
       extend ActiveSupport::Concern
 
+      class_methods do
+        attr_reader :tool_call_class
+      end
+
       def to_llm
         chat = RubyLLM.chat(model: model_id)
 
@@ -73,18 +102,32 @@ module RubyLLM
         )
       end
 
-      def persist_message_completion(message)
+      def persist_message_completion(message) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
         return unless message
 
-        messages.last.update!(
-          role: message.role,
-          content: message.content,
-          model_id: message.model_id,
-          tool_calls: message.tool_calls,
-          tool_call_id: message.tool_call_id,
-          input_tokens: message.input_tokens,
-          output_tokens: message.output_tokens
-        )
+        if message.tool_call_id
+          tool_call_id = self.class.tool_call_class.constantize.find_by(tool_call_id: message.tool_call_id).id
+        end
+
+        transaction do
+          messages.last.update!(
+            role: message.role,
+            content: message.content,
+            model_id: message.model_id,
+            tool_call_id: tool_call_id,
+            input_tokens: message.input_tokens,
+            output_tokens: message.output_tokens
+          )
+          persist_tool_calls(message.tool_calls) if message.tool_calls.present?
+        end
+      end
+
+      def persist_tool_calls(tool_calls)
+        tool_calls.each_value do |tool_call|
+          attributes = tool_call.to_h
+          attributes[:tool_call_id] = attributes.delete(:id)
+          messages.last.tool_calls.create!(**attributes)
+        end
       end
     end
 
@@ -97,13 +140,30 @@ module RubyLLM
         RubyLLM::Message.new(
           role: role.to_sym,
           content: content,
-          tool_calls: tool_calls,
-          tool_call_id: tool_call_id,
+          tool_calls: extract_tool_calls,
+          tool_call_id: extract_tool_call_id,
           input_tokens: input_tokens,
           output_tokens: output_tokens,
           model_id: model_id
         )
       end
+
+      def extract_tool_calls
+        tool_calls.to_h do |tool_call|
+          [
+            tool_call.tool_call_id,
+            RubyLLM::ToolCall.new(
+              id: tool_call.tool_call_id,
+              name: tool_call.name,
+              arguments: tool_call.arguments
+            )
+          ]
+        end
+      end
+
+      def extract_tool_call_id
+        parent_tool_call&.tool_call_id
+      end
     end
   end
 end

data/lib/ruby_llm/chat.rb

@@ -97,8 +97,10 @@ module RubyLLM
 
     def handle_tool_calls(response, &block)
       response.tool_calls.each_value do |tool_call|
+        @on[:new_message]&.call
         result = execute_tool tool_call
-        add_tool_result tool_call.id, result if result
+        message = add_tool_result tool_call.id, result
+        @on[:end_message]&.call(message)
       end
 
       complete(&block)

data/lib/ruby_llm/tool_call.rb

@@ -19,5 +19,13 @@ module RubyLLM
       @name = name
       @arguments = arguments
     end
+
+    def to_h
+      {
+        id: @id,
+        name: @name,
+        arguments: @arguments
+      }
+    end
   end
 end

data/lib/ruby_llm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RubyLLM
-  VERSION = '0.1.0.pre17'
+  VERSION = '0.1.0.pre19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_llm
 version: !ruby/object:Gem::Version
-  version: 0.1.0.pre17
+  version: 0.1.0.pre19
 platform: ruby
 authors:
 - Carmine Paolino