ruby_conversations 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d6209ce940d83da8e50a14df8ef7b7aa9134676742022cc7fcbe47eaaba94bc
-  data.tar.gz: 010bf794202f4030e657c4fed0d88e39a8dceac460e9e32ca331cb2d340a020a
+  metadata.gz: ce57aae2af7a87f50877f69671efef0753458e9cce7b7add9947c327143b3861
+  data.tar.gz: 7d94fdd743f9a0c7180dcc1625ad73d10fcd0fe46c95b9d9d6c418258a3e57ff
 SHA512:
-  metadata.gz: 3686165abf53df27c35c84b0e1444e6be18336fcb939aebb36245fa906f72a31eb18468d2d6782d39eafac19ba2f60e4f07ee48a492880a883ec16cf331c376b
-  data.tar.gz: dac103d0a4ef37ca87e874dd1a36924800aa8c0a96e0ba5798434e7e246a97daad7d79d475d9758798938e0b426d39f0b6bfc146989286a8783ba745708d4480
+  metadata.gz: e1970d41c9944ee5ca5df9faa3407f36328a0551c9b16dc4330172da7a682fc22225aa62c4406018f5ea97b787dc1369162f2bc81a92ffd44780472df4c94272
+  data.tar.gz: 1b1ecae17f206f2c2799318bfc7b94e53d765abf9c407d1391ba926022d8297bacad0eea305cd09b38753b65be5fbf672463486048dfe9d4be2ab433de8a32b5

data/app/models/ruby_conversations/concerns/conversation_chat.rb

@@ -10,14 +10,30 @@ module RubyConversations
         validate_conversation_state
         chat_messages = generate_chat_response(system_message)
 
-        if tool.present?
-          tool_calls = chat_messages.filter { |message| message.tool_calls.present? }
-          raise "No tool call found for tool '#{tool}'. Please check the prompt." if tool_calls.empty?
-        end
+        validate_tool_calls(chat_messages)
 
         store_and_update_conversation(chat_messages)
       end
 
+      def validate_tool_calls(chat_messages)
+        return unless tools_configured?
+        return if tool_calls?(chat_messages)
+
+        raise "No tool call found for tool(s): '#{tool_names}'. Please check the prompt."
+      end
+
+      def tools_configured?
+        tool.present? || tools&.present?
+      end
+
+      def tool_names
+        tool&.name || tools&.map(&:name)
+      end
+
+      def tool_calls?(chat_messages)
+        chat_messages.any? { |message| message.tool_calls.present? }
+      end
+
       def llm
         case model_identifier
         when 'claude-3-7-sonnet'
@@ -35,7 +51,7 @@ module RubyConversations
       end
 
       def generate_chat_response(system_message)
-        chat = setup_llm_chat(system_message: system_message)
+        setup_llm_chat(system_message: system_message)
         chat.ask(messages.last.request)
         chat.messages
       end
@@ -52,18 +68,17 @@ module RubyConversations
 
       def setup_llm_chat(system_message: nil)
         configure_llm_credentials
-        build_chat(system_message)
+        configure_tools
+        chat.add_message(role: :system, content: system_message) if system_message.present?
       end
 
       def update_last_message_response(message, chat_messages)
         message.response = chat_messages.map(&:to_h).to_json
       end
 
-      def build_chat(system_message)
-        chat = RubyLLM.chat(model: llm, provider: provider).with_temperature(0.0)
+      def configure_tools
         chat.with_tool(tool) if tool.present?
-        chat.add_message(role: :system, content: system_message) if system_message.present?
-        chat
+        tools&.each { |tool| chat.with_tool(tool) }
       end
     end
   end

data/app/models/ruby_conversations/conversation.rb

@@ -13,8 +13,8 @@ module RubyConversations
     include RubyConversations::Concerns::MessageProcessing
 
     # Define attributes needed for API interaction & local state
-    attr_accessor :id, :conversationable_type, :conversationable_id, :conversationable,
-                  :messages, :tool, :created_at, :updated_at
+    attr_accessor :chat, :id, :conversationable_type, :conversationable_id, :conversationable,
+                  :messages, :tool, :tools, :created_at, :updated_at
 
     # Validations
     validates :messages, presence: { message: 'At least one message is required' }, on: :update
@@ -31,6 +31,12 @@ module RubyConversations
 
       super # Initialize with remaining attributes using ActiveModel::Model
       initialize_messages(messages_attrs)
+
+      build_chat
+    end
+
+    def build_chat
+      @chat = RubyLLM.chat(model: llm, provider: provider).with_temperature(0.0)
     end
 
     def model_identifier

data/lib/ruby_conversations/version.rb

@@ -3,7 +3,7 @@
 module RubyConversations
   MAJOR = 1
   MINOR = 0
-  PATCH = 14
+  PATCH = 15
 
   VERSION = "#{RubyConversations::MAJOR}.#{RubyConversations::MINOR}.#{RubyConversations::PATCH}".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby_conversations
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Paul Shippy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-17 00:00:00.000000000 Z
+date: 2025-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport