ruby_conversations 1.0.5 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b290c737d59d0eb2cefab58afdb2a1f87f9f52cbe4b3396a63fbcee88b3ab7fd
-  data.tar.gz: 951c13ba7e151aefaab4b5c8bff4dce2e1f783f43d4670ccc06a42f63b1d5245
+  metadata.gz: e51a404e8fe0e362f5429272e3c39fab96e281d8a7bf44e631e37e0ff6cdb689
+  data.tar.gz: 499bcaf7b5959b0a132fcbf79d06c69752fbfaf497cb0bbd5c22ce0fa3e5679b
 SHA512:
-  metadata.gz: f37b409fc142074098da0ac7cb94e7c7d14164bcbd654d6314e9c5f512f89d6d921deec70ef9cd6532a9bc594d5e29fbc2ec0b0328f15e0bbc510424fcf64dec
-  data.tar.gz: ab706df48294795c1064f2e36ccda7a151a6b2e1f0485b57acac140aad203fc13b7ac058004c3eb161286b579f277ba3f3e248f52774a68bbdffd9c8881258ee
+  metadata.gz: d520b36e1c90509515a80cff8a47c03232bdb80bcd3138423e6ca1337c6c245050919c5abab03cd94cfcfb1aa1ce224f6ee9405e810e722760418f9ab8c14efa
+  data.tar.gz: 57924e0b318cb11b8c6f5f12e4614da011e5003912912f415e02dcea5ebb8090e0cfc0c4bef0d5575933667a6188edab1115126d87f3cdb88e486e3af0377db3

data/app/models/ruby_conversations/ai_conversation.rb

@@ -1,8 +1,14 @@
 # frozen_string_literal: true
 
+require_relative 'concerns/message_validation'
+require_relative 'concerns/llm_credentials'
+
 module RubyConversations
   # An AI conversation is a conversation between an AI and a user.
   class AiConversation < ActiveRecord::Base
+    include RubyConversations::MessageValidation
+    include RubyConversations::LlmCredentials
+
     # Associations
     belongs_to :conversationable, polymorphic: true, optional: true, touch: true
     has_many :ai_messages, class_name: RubyConversations.configuration.message_class, dependent: :destroy
@@ -66,51 +72,20 @@ module RubyConversations
 
     private
 
-    def validate_messages
-      ai_messages.each do |message|
-        validate_message_level(message)
-        message.ai_message_prompts.each do |prompt|
-          validate_prompt_level(prompt)
-          prompt.ai_message_inputs.each do |input|
-            validate_input_level(input)
-          end
-        end
-      end
-    end
-
-    def validate_message_level(message)
-      return if message.valid?
-
-      message.errors.full_messages.each do |msg|
-        errors.add(:base, "Message error: #{msg}")
-      end
-    end
-
-    def validate_prompt_level(prompt)
-      return if prompt.valid?
-
-      prompt.errors.full_messages.each do |msg|
-        errors.add(:base, "Message prompt error: #{msg}")
-      end
+    def setup_llm_chat(system_message: nil)
+      configure_llm_credentials
+      build_chat(system_message)
     end
 
-    def validate_input_level(input)
-      return if input.valid?
-
-      input.errors.full_messages.each do |msg|
-        errors.add(:base, "Message prompt input error: #{msg}")
-      end
+    def update_last_message_response(message, response)
+      message.update!(response: response.to_h.to_json)
     end
 
-    def setup_llm_chat(system_message: nil)
-      chat = RubyLLM.chat(model: model_identifier, provider: provider).with_temperature(0.0)
+    def build_chat(system_message)
+      chat = RubyLLM.chat(model: llm, provider: provider).with_temperature(0.0)
       chat.with_tool(tool) if tool.present?
       chat.add_message(role: :system, content: system_message) if system_message.present?
       chat
     end
-
-    def update_last_message_response(message, response)
-      message.update!(response: response.to_h.to_json)
-    end
   end
 end

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

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module RubyConversations
+  # Handles the management of LLM credentials for AI conversations.
+  # This concern provides methods for configuring LLM credentials from either
+  # environment variables or an AWS credential provider.
+  module LlmCredentials
+    extend ActiveSupport::Concern
+
+    private
+
+    def configure_llm_credentials
+      RubyLLM.configure do |config|
+        credentials = ENV['AWS_ACCESS_KEY_ID'].present? ? env_credentials : provider_credentials
+        config.bedrock_api_key = credentials[:api_key]
+        config.bedrock_secret_key = credentials[:secret_key]
+        config.bedrock_session_token = credentials[: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)
+      }
+    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
+      }
+    end
+  end
+end

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

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module RubyConversations
+  # Provides validation methods for AI conversation messages, prompts, and inputs.
+  # This concern handles the validation of the message hierarchy in AI conversations,
+  # ensuring that all messages, their prompts, and inputs are valid.
+  module MessageValidation
+    extend ActiveSupport::Concern
+
+    private
+
+    def validate_messages
+      ai_messages.each do |message|
+        validate_message_level(message)
+        message.ai_message_prompts.each do |prompt|
+          validate_prompt_level(prompt)
+          prompt.ai_message_inputs.each do |input|
+            validate_input_level(input)
+          end
+        end
+      end
+    end
+
+    def validate_message_level(message)
+      return if message.valid?
+
+      message.errors.full_messages.each do |msg|
+        errors.add(:base, "Message error: #{msg}")
+      end
+    end
+
+    def validate_prompt_level(prompt)
+      return if prompt.valid?
+
+      prompt.errors.full_messages.each do |msg|
+        errors.add(:base, "Message prompt error: #{msg}")
+      end
+    end
+
+    def validate_input_level(input)
+      return if input.valid?
+
+      input.errors.full_messages.each do |msg|
+        errors.add(:base, "Message prompt input error: #{msg}")
+      end
+    end
+  end
+end

data/app/models/ruby_conversations/message_builder.rb

@@ -48,12 +48,10 @@ module RubyConversations
     def validate_inputs!(prompt, inputs)
       return unless prompt.valid_placeholders.present?
 
-      missing_inputs, extra_inputs = calculate_input_discrepancies(prompt, inputs)
+      missing_inputs = calculate_missing_inputs(prompt, inputs)
 
       errors = []
-      errors << "Missing required inputs: #{missing_inputs.join(', ')}" if missing_inputs.any?
-      errors << "Unknown inputs provided: #{extra_inputs.join(', ')}" if extra_inputs.any?
-
+      errors << "#{prompt.name}: Missing required inputs: #{missing_inputs.join(', ')}" if missing_inputs.any?
       raise ArgumentError, errors.join("\n") if errors.any?
     end
 
@@ -74,13 +72,11 @@ module RubyConversations
       end
     end
 
-    # Calculates missing and extra inputs compared to prompt placeholders
-    def calculate_input_discrepancies(prompt, inputs)
+    # Calculates missing inputs compared to prompt placeholders
+    def calculate_missing_inputs(prompt, inputs)
       required_placeholders = prompt.valid_placeholders.split(',').map(&:strip)
       provided_keys = inputs.keys.map(&:to_s)
-      missing_inputs = required_placeholders - provided_keys
-      extra_inputs = provided_keys - required_placeholders
-      [missing_inputs, extra_inputs]
+      required_placeholders - provided_keys
     end
 
     def build_ai_message(request, description)

data/lib/ruby_conversations/aws_credential_provider.rb

@@ -0,0 +1,93 @@
+# frozen_string_literal: true
+
+require 'aws-sdk-core'
+
+module RubyConversations
+  # Manages AWS credentials with automatic refresh capability
+  class AwsCredentialProvider
+    class << self
+      def instance
+        @instance ||= new
+      end
+    end
+
+    def initialize
+      refresh_credentials!
+    end
+
+    def access_key_id
+      refresh_if_expired!
+      @credentials&.access_key_id
+    end
+
+    def secret_access_key
+      refresh_if_expired!
+      @credentials&.secret_access_key
+    end
+
+    def session_token
+      refresh_if_expired!
+      @credentials&.session_token
+    end
+
+    attr_reader :expiration
+
+    def refresh_credentials!
+      fetch_and_set_credentials
+    end
+
+    def refresh_if_expired!
+      return unless expired?
+
+      refresh_credentials!
+    end
+
+    private
+
+    def fetch_and_set_credentials
+      if use_mock_credentials?
+        set_mock_credentials
+      else
+        fetch_and_set_real_credentials
+      end
+    end
+
+    def use_mock_credentials?
+      !Rails.env.production?
+    end
+
+    def set_mock_credentials
+      @credentials = Aws::Credentials.new(
+        'mock_access_key_id',
+        'mock_secret_access_key',
+        'mock_session_token'
+      )
+      @expiration = Time.now + 1.hour
+    end
+
+    def fetch_and_set_real_credentials
+      ecs_credentials = Aws::CredentialProviderChain.new.resolve
+      raise ConfigurationError, 'Could not resolve AWS credentials' if ecs_credentials.nil?
+
+      refresh_if_supported(ecs_credentials)
+      assign_credentials(ecs_credentials)
+    end
+
+    def refresh_if_supported(credentials)
+      credentials.refresh! if credentials.respond_to?(:refresh!)
+    end
+
+    def assign_credentials(ecs_credentials)
+      @credentials = ecs_credentials.credentials
+      @expiration = ecs_credentials.expiration if ecs_credentials.respond_to?(:expiration)
+    end
+
+    def expired?
+      return true if @credentials.nil?
+      return false if @expiration.nil?
+
+      # Refresh if we're within 5 minutes of expiration
+      @expiration < Time.now + 300
+    end
+  end
+end

data/lib/ruby_conversations/version.rb

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

data/lib/ruby_conversations.rb

@@ -7,6 +7,7 @@ require 'faraday'
 require 'jwt'
 require 'zeitwerk'
 require 'ruby_conversations/configuration'
+require 'ruby_conversations/aws_credential_provider'
 
 loader = Zeitwerk::Loader.for_gem
 loader.ignore("#{__dir__}/generators")
@@ -26,6 +27,7 @@ module RubyConversations
     def configure
       yield(configuration)
       configuration.validate!
+      configure_ruby_llm if configuration.default_llm_provider == 'bedrock'
     end
 
     def storage
@@ -56,6 +58,17 @@ module RubyConversations
         jwt_secret: configuration.jwt_secret
       )
     end
+
+    def configure_ruby_llm
+      credential_provider = AwsCredentialProvider.instance
+
+      RubyLLM.configure do |config|
+        config.bedrock_region = ENV.fetch('AWS_REGION', '')
+        config.bedrock_api_key = credential_provider.access_key_id
+        config.bedrock_secret_key = credential_provider.secret_access_key
+        config.bedrock_session_token = credential_provider.session_token
+      end
+    end
   end
 end
 

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: ruby_conversations
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.7
 platform: ruby
 authors:
 - Paul Shippy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-03 00:00:00.000000000 Z
+date: 2025-04-07 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
@@ -263,6 +277,8 @@ files:
 - app/models/ruby_conversations/ai_message.rb
 - app/models/ruby_conversations/ai_message_input.rb
 - app/models/ruby_conversations/ai_message_prompt.rb
+- app/models/ruby_conversations/concerns/llm_credentials.rb
+- app/models/ruby_conversations/concerns/message_validation.rb
 - app/models/ruby_conversations/message_builder.rb
 - app/models/ruby_conversations/prompt.rb
 - app/models/ruby_conversations/prompt_version.rb
@@ -277,6 +293,7 @@ files:
 - lib/generators/ruby_conversations/install/templates/migrations/create_prompt_versions.rb.erb
 - lib/generators/ruby_conversations/install/templates/migrations/create_prompts.rb.erb
 - lib/ruby_conversations.rb
+- lib/ruby_conversations/aws_credential_provider.rb
 - lib/ruby_conversations/configuration.rb
 - lib/ruby_conversations/engine.rb
 - lib/ruby_conversations/jwt_client.rb