ruby_conversations 1.0.14 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d6209ce940d83da8e50a14df8ef7b7aa9134676742022cc7fcbe47eaaba94bc
-  data.tar.gz: 010bf794202f4030e657c4fed0d88e39a8dceac460e9e32ca331cb2d340a020a
+  metadata.gz: dd956939c0daaea90e866266a6ab8a5bba2b3ec9bb295c81a6f2e902b163d968
+  data.tar.gz: a03a9a78205f79a6d4850cb7cd58ca0fc7413b0754e62563b541b8adc1b32917
 SHA512:
-  metadata.gz: 3686165abf53df27c35c84b0e1444e6be18336fcb939aebb36245fa906f72a31eb18468d2d6782d39eafac19ba2f60e4f07ee48a492880a883ec16cf331c376b
-  data.tar.gz: dac103d0a4ef37ca87e874dd1a36924800aa8c0a96e0ba5798434e7e246a97daad7d79d475d9758798938e0b426d39f0b6bfc146989286a8783ba745708d4480
+  metadata.gz: abab8e151b670375b5486c7915eb921f1c24943b6f20d65f56229428d7254afe8ef18d98fe957df82de16e6219d9b4196489044fcee6e04887b201c8b2528833
+  data.tar.gz: 3f4e262b42234bb4ed48a18d11a165edc932f75999c64f13afe8aa2b93ccd04b2e4370c3ad4b90470882e299947133831ff712a71d6418a3f36773127b21d7f2

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/concerns/llm_credentials.rb

@@ -8,34 +8,40 @@ module RubyConversations
     module LlmCredentials
       extend ActiveSupport::Concern
 
-      private
+      class_methods do
+        def configure_llm_credentials
+          RubyLLM.configure do |config|
+            credentials = provider_credentials
+            config.bedrock_region = ENV.fetch('AWS_REGION', 'us-west-2')
+            config.bedrock_api_key = credentials[:api_key]
+            config.bedrock_secret_key = credentials[:secret_key]
+            config.bedrock_session_token = credentials[:session_token]
+          end
+        end
 
-      def configure_llm_credentials
-        RubyLLM.configure do |config|
-          credentials = provider_credentials
-          config.bedrock_region = ENV.fetch('AWS_REGION', 'us-west-2')
-          config.bedrock_api_key = credentials[:api_key]
-          config.bedrock_secret_key = credentials[:secret_key]
-          config.bedrock_session_token = credentials[:session_token]
+        private
+
+        def env_credentials
+          {
+            api_key: ENV.fetch('AWS_ACCESS_KEY_ID', nil),
+            secret_key: ENV.fetch('AWS_SECRET_ACCESS_KEY', nil),
+            session_token: ENV.fetch('AWS_SESSION_TOKEN', nil)
+          }
         end
-      end
 
-      def env_credentials
-        {
-          api_key: ENV.fetch('AWS_ACCESS_KEY_ID', nil),
-          secret_key: ENV.fetch('AWS_SECRET_ACCESS_KEY', nil),
-          session_token: ENV.fetch('AWS_SESSION_TOKEN', nil)
-        }
+        def provider_credentials
+          credential_provider = AwsCredentialProvider.instance
+          credential_provider.refresh_if_expired!
+          {
+            api_key: credential_provider.access_key_id,
+            secret_key: credential_provider.secret_access_key,
+            session_token: credential_provider.session_token
+          }
+        end
       end
 
-      def provider_credentials
-        credential_provider = AwsCredentialProvider.instance
-        credential_provider.refresh_if_expired!
-        {
-          api_key: credential_provider.access_key_id,
-          secret_key: credential_provider.secret_access_key,
-          session_token: credential_provider.session_token
-        }
+      def configure_llm_credentials
+        self.class.configure_llm_credentials
       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, :persist
 
     # Validations
     validates :messages, presence: { message: 'At least one message is required' }, on: :update
@@ -28,9 +28,21 @@ module RubyConversations
       # Extract nested attributes before super tries to assign them
       messages_attrs = attributes.delete(:messages) || attributes.delete('messages') ||
                        attributes.delete(:messages_attributes) || attributes.delete('messages_attributes') || []
+      # Extract persist flag, default to false
+      @persist = attributes.delete(:persist) || attributes.delete('persist') || false
 
       super # Initialize with remaining attributes using ActiveModel::Model
       initialize_messages(messages_attrs)
+
+      build_chat
+    end
+
+    def build_chat
+      @chat = if @persist && RubyConversations.configuration.persistence_model
+                resolve_persistence_model.create!(model_id: llm, provider: provider)
+              else
+                RubyLLM.chat(model: llm, provider: provider).with_temperature(0.0)
+              end
     end
 
     def model_identifier
@@ -58,6 +70,19 @@ module RubyConversations
 
     private
 
+    def resolve_persistence_model
+      model_config = RubyConversations.configuration.persistence_model
+      unless model_config.is_a?(String)
+        raise ConfigurationError, "Invalid persistence_model configured: Must be a String, got #{model_config.class}"
+      end
+
+      model_config.safe_constantize || raise(ConfigurationError,
+                                             "Invalid persistence_model configured: '#{model_config}' could not be resolved.")
+    rescue NameError => e
+      # Catch potential NameError from constantize if the class name is invalid
+      raise ConfigurationError, "Invalid persistence_model configured: #{e.message}"
+    end
+
     def base_attributes
       {
         id: id

data/lib/ruby_conversations/configuration.rb

@@ -3,7 +3,7 @@
 module RubyConversations
   # Configuration options for RubyConversations
   class Configuration
-    attr_accessor :api_url, :jwt_secret, :default_llm_model, :default_llm_provider
+    attr_accessor :api_url, :jwt_secret, :default_llm_model, :default_llm_provider, :persistence_model
 
     def initialize
       @default_llm_model = 'claude-3-7-sonnet'

data/lib/ruby_conversations/version.rb

@@ -2,8 +2,8 @@
 
 module RubyConversations
   MAJOR = 1
-  MINOR = 0
-  PATCH = 14
+  MINOR = 1
+  PATCH = 0
 
   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.1.0
 platform: ruby
 authors:
 - Paul Shippy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-17 00:00:00.000000000 Z
+date: 2025-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport