ruby_conversations 1.0.15 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ce57aae2af7a87f50877f69671efef0753458e9cce7b7add9947c327143b3861
-  data.tar.gz: 7d94fdd743f9a0c7180dcc1625ad73d10fcd0fe46c95b9d9d6c418258a3e57ff
+  metadata.gz: b5c99da86fb4fd6958f8bbd252656dcfcbf08e375731b1f0f45c62f14eb1e9a7
+  data.tar.gz: df34a7844a5a9a41b770c1ac2144542642d6082c22d17b9af7282994e89fe5c4
 SHA512:
-  metadata.gz: e1970d41c9944ee5ca5df9faa3407f36328a0551c9b16dc4330172da7a682fc22225aa62c4406018f5ea97b787dc1369162f2bc81a92ffd44780472df4c94272
-  data.tar.gz: 1b1ecae17f206f2c2799318bfc7b94e53d765abf9c407d1391ba926022d8297bacad0eea305cd09b38753b65be5fbf672463486048dfe9d4be2ab433de8a32b5
+  metadata.gz: 38f26a3074bb9579e7ef547208273346b85b9255b3c41a1ceb812c758467168494d4b29d602d1f2401c79961835eefb6fa25791b33fb99228c6b73d3da4a225d
+  data.tar.gz: 4b952f7d55e15e22727fb155e6a52e388d9b82900f9f0cbe08fe72bffa4ba898939b651ef070837b43296adb1dec72543a6e18cf2b2ae327def4bac665cce773

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

@@ -3,39 +3,51 @@
 module RubyConversations
   module Concerns
     # Handles the management of LLM credentials for AI conversations.
-    # This concern provides methods for configuring LLM credentials from either
+    # Provides methods for configuring LLM credentials from either
     # environment variables or an AWS credential provider.
     module LlmCredentials
       extend ActiveSupport::Concern
 
-      private
+      # Helper methods for retrieving AWS credentials from different sources
+      # These methods are meant to be used as class methods in the LlmCredentials module
+      module CredentialHelpers
+        private
 
-      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]
+        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
+
+        def provider_credentials
+          provider = AwsCredentialProvider.instance
+          provider.refresh_if_expired!
+          {
+            api_key: provider.access_key_id,
+            secret_key: provider.secret_access_key,
+            session_token: provider.session_token
+          }
         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)
-        }
+      class_methods do
+        include CredentialHelpers
+
+        def configure_llm_credentials
+          RubyLLM.configure do |config|
+            creds                 = provider_credentials
+            config.bedrock_region = ENV.fetch('AWS_REGION', 'us-west-2')
+            config.bedrock_api_key     = creds[:api_key]
+            config.bedrock_secret_key  = creds[:secret_key]
+            config.bedrock_session_token = creds[:session_token]
+          end
+        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

@@ -14,7 +14,7 @@ module RubyConversations
 
     # Define attributes needed for API interaction & local state
     attr_accessor :chat, :id, :conversationable_type, :conversationable_id, :conversationable,
-                  :messages, :tool, :tools, :created_at, :updated_at
+                  :messages, :tool, :tools, :created_at, :updated_at, :persist
 
     # Validations
     validates :messages, presence: { message: 'At least one message is required' }, on: :update
@@ -23,11 +23,9 @@ module RubyConversations
     # Initialization
     def initialize(attributes = nil)
       attributes ||= {}
-      # Ensure messages is always an array before super assigns other attributes
       @messages = []
-      # 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') || []
+      messages_attrs = extract_message_attributes(attributes)
+      @persist = extract_persist_flag(attributes)
 
       super # Initialize with remaining attributes using ActiveModel::Model
       initialize_messages(messages_attrs)
@@ -35,8 +33,26 @@ module RubyConversations
       build_chat
     end
 
+    def extract_message_attributes(attributes)
+      attributes.delete(:messages) ||
+        attributes.delete('messages') ||
+        attributes.delete(:messages_attributes) ||
+        attributes.delete('messages_attributes') ||
+        []
+    end
+
+    def extract_persist_flag(attributes)
+      attributes.delete(:persist) ||
+        attributes.delete('persist') ||
+        false
+    end
+
     def build_chat
-      @chat = RubyLLM.chat(model: llm, provider: provider).with_temperature(0.0)
+      @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
@@ -64,6 +80,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 = 15
+  MINOR = 1
+  PATCH = 1
 
   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.15
+  version: 1.1.1
 platform: ruby
 authors:
 - Paul Shippy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-18 00:00:00.000000000 Z
+date: 2025-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport