ruby_conversations 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd956939c0daaea90e866266a6ab8a5bba2b3ec9bb295c81a6f2e902b163d968
-  data.tar.gz: a03a9a78205f79a6d4850cb7cd58ca0fc7413b0754e62563b541b8adc1b32917
+  metadata.gz: b5c99da86fb4fd6958f8bbd252656dcfcbf08e375731b1f0f45c62f14eb1e9a7
+  data.tar.gz: df34a7844a5a9a41b770c1ac2144542642d6082c22d17b9af7282994e89fe5c4
 SHA512:
-  metadata.gz: abab8e151b670375b5486c7915eb921f1c24943b6f20d65f56229428d7254afe8ef18d98fe957df82de16e6219d9b4196489044fcee6e04887b201c8b2528833
-  data.tar.gz: 3f4e262b42234bb4ed48a18d11a165edc932f75999c64f13afe8aa2b93ccd04b2e4370c3ad4b90470882e299947133831ff712a71d6418a3f36773127b21d7f2
+  metadata.gz: 38f26a3074bb9579e7ef547208273346b85b9255b3c41a1ceb812c758467168494d4b29d602d1f2401c79961835eefb6fa25791b33fb99228c6b73d3da4a225d
+  data.tar.gz: 4b952f7d55e15e22727fb155e6a52e388d9b82900f9f0cbe08fe72bffa4ba898939b651ef070837b43296adb1dec72543a6e18cf2b2ae327def4bac665cce773

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

@@ -3,22 +3,14 @@
 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
 
-      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
-
+      # 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 env_credentials
@@ -30,16 +22,30 @@ module RubyConversations
         end
 
         def provider_credentials
-          credential_provider = AwsCredentialProvider.instance
-          credential_provider.refresh_if_expired!
+          provider = AwsCredentialProvider.instance
+          provider.refresh_if_expired!
           {
-            api_key: credential_provider.access_key_id,
-            secret_key: credential_provider.secret_access_key,
-            session_token: credential_provider.session_token
+            api_key: provider.access_key_id,
+            secret_key: provider.secret_access_key,
+            session_token: provider.session_token
           }
         end
       end
 
+      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 configure_llm_credentials
         self.class.configure_llm_credentials
       end

data/app/models/ruby_conversations/conversation.rb

@@ -23,13 +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') || []
-      # Extract persist flag, default to false
-      @persist = attributes.delete(:persist) || attributes.delete('persist') || false
+      messages_attrs = extract_message_attributes(attributes)
+      @persist = extract_persist_flag(attributes)
 
       super # Initialize with remaining attributes using ActiveModel::Model
       initialize_messages(messages_attrs)
@@ -37,6 +33,20 @@ 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 = if @persist && RubyConversations.configuration.persistence_model
                 resolve_persistence_model.create!(model_id: llm, provider: provider)
@@ -76,8 +86,8 @@ module RubyConversations
         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.")
+      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}"

data/lib/ruby_conversations/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_conversations
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Paul Shippy