ruby_conversations 1.0.10 → 1.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d32de256fcc9a8676794a2da52b5e7f1d6340dee5db4614232b8ffb42dde3bae
-  data.tar.gz: d557589614b047b2e33cf5c8ec1e81fdaf8cafc6b605e37084aaad6bbb6cd58f
+  metadata.gz: 2b0a2a0d68b09e3f39f63329126c07e9f36ca92acddceb4ae63079fbed34c535
+  data.tar.gz: d5448b0535c11dd19ec1fa6d594f963eb2b276fc8cea8b89ec0255932094297a
 SHA512:
-  metadata.gz: 6412f0ff57642fce95b680e7024c69fa1ec1e20a7718ed93f0370d73d2d5a4d435179b0effd569c7be9720298f4b4d6bda1f6d15873e87b313ff366e6c302da4
-  data.tar.gz: 83f0c09530212693fc8e5ada3506a9469c1c07a770d34fc3931cd6a9401f1eca54c48a3f86ccdb66fc4c1765555dd38ae3c62ec9bfc405af8a9aac5a31fd8d81
+  metadata.gz: a2612396e683b5c24f2f6e44532579cfa098ac6914b5d6e3fd260bccca3800788eb1e17f9244bcfb510b913f07ee1196190d4546ecbdce7ce1d8da598b1c4c94
+  data.tar.gz: a8af5b75a7601668d7ffd6d7fae99d2a462f867b8c6f1f02c876c44c9e94554a28abb953176aed4b6c105c2ad3ac247ca1be52f74b576098fc1b736c09a2ae83

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

@@ -0,0 +1,63 @@
+# frozen_string_literal: true
+
+module RubyConversations
+  module Concerns
+    # Handles chat-related functionality for Conversation
+    module ConversationChat
+      extend ActiveSupport::Concern
+
+      def execute(system_message: nil)
+        validate_conversation_state
+        response = generate_chat_response(system_message)
+        store_and_update_conversation(response)
+      end
+
+      def llm
+        case model_identifier
+        when 'claude-3-7-sonnet'
+          'us.anthropic.claude-3-7-sonnet-20250219-v1:0'
+        else
+          model_identifier
+        end
+      end
+
+      private
+
+      def validate_conversation_state
+        message = messages.last
+        raise ArgumentError, 'Conversation must have at least one message to execute' unless message
+      end
+
+      def generate_chat_response(system_message)
+        chat = setup_llm_chat(system_message: system_message)
+        chat.ask(messages.last.request)
+      end
+
+      def store_and_update_conversation(response)
+        update_last_message_response(messages.last, response)
+        RubyConversations.client.store_conversation_or_message(self, messages.last)
+
+        {
+          response: response,
+          conversation: self
+        }
+      end
+
+      def setup_llm_chat(system_message: nil)
+        configure_llm_credentials
+        build_chat(system_message)
+      end
+
+      def update_last_message_response(message, response)
+        message.response = response.to_h.to_json
+      end
+
+      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
+    end
+  end
+end

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

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module RubyConversations
+  module Concerns
+    # Handles message-related functionality for Conversation
+    module ConversationMessages
+      extend ActiveSupport::Concern
+
+      def initialize_messages(message_attributes)
+        (message_attributes || []).each do |msg_data|
+          processed_prompts = process_message_prompts(msg_data)
+
+          message_instance = RubyConversations::Message.new(msg_data.except('id', 'conversation_id', 'created_at',
+                                                                            'updated_at'))
+          message_instance.message_prompts = processed_prompts
+          @messages << message_instance # Add to the messages array
+        end
+      end
+
+      def ask_multiple(prompt_inputs, description: nil)
+        MessageBuilder.new(self).build_from_multiple_prompts(prompt_inputs, description: description)
+        self
+      end
+
+      def ask(name, description: nil, inputs: {})
+        MessageBuilder.new(self).build_from_single_prompt(name, description: description, inputs: inputs)
+        self
+      end
+    end
+  end
+end

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

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module RubyConversations
+  module Concerns
+    # 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_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 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
+end

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

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+
+module RubyConversations
+  module Concerns
+    # Handles API-related attribute functionality for Message
+    module MessageApiAttributes
+      extend ActiveSupport::Concern
+
+      def message_attributes_for_api
+        {
+          request: request,
+          response: response,
+          model_identifier: model_identifier,
+          change_description: change_description,
+          llm: llm
+        }.compact
+      end
+
+      def message_base_attributes
+        {
+          'request' => request,
+          'response' => response,
+          'model_identifier' => model_identifier,
+          'change_description' => change_description
+        }
+      end
+
+      def remote_attributes
+        base_attributes.compact
+      end
+
+      private
+
+      def base_attributes
+        RubyConversations::Concerns::MessageAttributes::ATTRIBUTE_NAMES.each_with_object({}) do |attr_name, attrs|
+          attrs[attr_name] = public_send(attr_name)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module RubyConversations
+  module Concerns
+    # Handles attribute-related functionality for Message
+    module MessageAttributes
+      extend ActiveSupport::Concern
+
+      ATTRIBUTE_NAMES = %w[
+        id ai_conversation_id request response model_identifier
+        tool change_description llm created_at updated_at
+      ].freeze
+
+      included do
+        # Define core message attributes
+        attr_accessor :request, :response, :model_identifier, :change_description
+
+        # Define relationship attributes
+        attr_accessor :ai_conversation, :message_prompts, :prompts
+
+        # Common validations
+        validates :llm, presence: true
+        validates :request, presence: true
+
+        # Override initialize to ensure arrays are initialized
+        def initialize(attributes = {})
+          @message_prompts = []
+          @prompts = []
+          super
+        end
+      end
+
+      def remote_attributes
+        base_attributes.compact
+      end
+
+      private
+
+      def base_attributes
+        ATTRIBUTE_NAMES.each_with_object({}) do |attr_name, attrs|
+          attrs[attr_name] = public_send(attr_name)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+# frozen_string_literal: true
+
+module RubyConversations
+  module Concerns
+    # Handles message processing functionality for Conversation
+    module MessageProcessing
+      extend ActiveSupport::Concern
+
+      def process_message_prompts(message_data)
+        prompts_data = extract_prompts_data(message_data)
+        return [] unless prompts_data
+
+        prompts_data.map do |prompt_data|
+          process_single_prompt(prompt_data)
+        end
+      end
+
+      private
+
+      def extract_prompts_data(message_data)
+        message_data['message_prompts'] ||
+          message_data[:message_prompts] ||
+          message_data['ai_message_prompts_attributes'] ||
+          message_data[:ai_message_prompts_attributes]
+      end
+
+      def process_single_prompt(prompt_data)
+        inputs_data = extract_inputs_data(prompt_data)
+        prompt_instance = RubyConversations::MessagePrompt.new(
+          prompt_data.except('id', 'message_id', 'created_at', 'updated_at')
+        )
+
+        process_prompt_inputs(prompt_instance, inputs_data)
+        prompt_instance
+      end
+
+      def extract_inputs_data(prompt_data)
+        prompt_data['message_inputs'] ||
+          prompt_data[:message_inputs] ||
+          prompt_data['ai_message_inputs_attributes'] ||
+          prompt_data[:ai_message_inputs_attributes] || []
+      end
+
+      def process_prompt_inputs(prompt_instance, inputs_data)
+        inputs_data.each do |input_data|
+          input_instance = RubyConversations::MessageInput.new(
+            input_data.except('id', 'message_prompt_id', 'created_at', 'updated_at')
+          )
+          prompt_instance.message_inputs << input_instance
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module RubyConversations
+  module Concerns
+    # Handles validation-related functionality for Message
+    module MessageValidation
+      extend ActiveSupport::Concern
+
+      private
+
+      def validate_messages
+        messages.each do |message|
+          next if message.valid?
+
+          message.errors.full_messages.each do |msg|
+            errors.add(:messages, "invalid: #{msg}")
+          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
+end

data/app/models/ruby_conversations/conversation.rb

@@ -1,21 +1,16 @@
 # frozen_string_literal: true
 
 require 'active_model'
-require_relative '../concerns/ruby_conversations/conversation_chat'
-require_relative '../concerns/ruby_conversations/conversation_messages'
-require_relative '../concerns/ruby_conversations/llm_credentials'
-require_relative '../concerns/ruby_conversations/message_validation'
-require_relative '../concerns/ruby_conversations/message_processing'
 
 module RubyConversations
   # Represents a conversation thread, managing messages and interactions with the LLM.
   class Conversation
     include ActiveModel::Model
-    include ConversationChat
-    include ConversationMessages
-    include LlmCredentials
-    include MessageValidation
-    include MessageProcessing
+    include RubyConversations::Concerns::ConversationChat
+    include RubyConversations::Concerns::ConversationMessages
+    include RubyConversations::Concerns::LlmCredentials
+    include RubyConversations::Concerns::MessageValidation
+    include RubyConversations::Concerns::MessageProcessing
 
     # Define attributes needed for API interaction & local state
     attr_accessor :id, :conversationable_type, :conversationable_id, :conversationable,

data/app/models/ruby_conversations/message.rb

@@ -1,16 +1,13 @@
 # frozen_string_literal: true
 
 require 'active_model'
-require_relative 'message_prompt'
-require_relative '../concerns/ruby_conversations/message_attributes'
-require_relative '../concerns/ruby_conversations/message_api_attributes'
 
 module RubyConversations
   # Represents a message in a conversation, either from the user or AI
   class Message
     include ActiveModel::Model
-    include MessageAttributes
-    include MessageApiAttributes
+    include Concerns::MessageAttributes
+    include Concerns::MessageApiAttributes
 
     # Define attributes
     attr_accessor :id, :conversation_id, :llm,

data/lib/ruby_conversations/version.rb

@@ -3,7 +3,7 @@
 module RubyConversations
   MAJOR = 1
   MINOR = 0
-  PATCH = 10
+  PATCH = 12
 
   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.0.10
+  version: 1.0.12
 platform: ruby
 authors:
 - Paul Shippy
@@ -256,13 +256,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- app/models/concerns/ruby_conversations/conversation_chat.rb
-- app/models/concerns/ruby_conversations/conversation_messages.rb
-- app/models/concerns/ruby_conversations/llm_credentials.rb
-- app/models/concerns/ruby_conversations/message_api_attributes.rb
-- app/models/concerns/ruby_conversations/message_attributes.rb
-- app/models/concerns/ruby_conversations/message_processing.rb
-- app/models/concerns/ruby_conversations/message_validation.rb
+- app/models/ruby_conversations/concerns/conversation_chat.rb
+- app/models/ruby_conversations/concerns/conversation_messages.rb
+- app/models/ruby_conversations/concerns/llm_credentials.rb
+- app/models/ruby_conversations/concerns/message_api_attributes.rb
+- app/models/ruby_conversations/concerns/message_attributes.rb
+- app/models/ruby_conversations/concerns/message_processing.rb
+- app/models/ruby_conversations/concerns/message_validation.rb
 - app/models/ruby_conversations/conversation.rb
 - app/models/ruby_conversations/message.rb
 - app/models/ruby_conversations/message_builder.rb

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

@@ -1,61 +0,0 @@
-# frozen_string_literal: true
-
-module RubyConversations
-  # Handles chat-related functionality for Conversation
-  module ConversationChat
-    extend ActiveSupport::Concern
-
-    def execute(system_message: nil)
-      validate_conversation_state
-      response = generate_chat_response(system_message)
-      store_and_update_conversation(response)
-    end
-
-    def llm
-      case model_identifier
-      when 'claude-3-7-sonnet'
-        'us.anthropic.claude-3-7-sonnet-20250219-v1:0'
-      else
-        model_identifier
-      end
-    end
-
-    private
-
-    def validate_conversation_state
-      message = messages.last
-      raise ArgumentError, 'Conversation must have at least one message to execute' unless message
-    end
-
-    def generate_chat_response(system_message)
-      chat = setup_llm_chat(system_message: system_message)
-      chat.ask(messages.last.request)
-    end
-
-    def store_and_update_conversation(response)
-      update_last_message_response(messages.last, response)
-      RubyConversations.client.store_conversation_or_message(self, messages.last)
-
-      {
-        response: response,
-        conversation: self
-      }
-    end
-
-    def setup_llm_chat(system_message: nil)
-      configure_llm_credentials
-      build_chat(system_message)
-    end
-
-    def update_last_message_response(message, response)
-      message.response = response.to_h.to_json
-    end
-
-    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
-  end
-end

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

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module RubyConversations
-  # Handles message-related functionality for Conversation
-  module ConversationMessages
-    extend ActiveSupport::Concern
-
-    def ask_multiple(prompt_inputs, description: nil)
-      MessageBuilder.new(self).build_from_multiple_prompts(prompt_inputs, description: description)
-      self
-    end
-
-    def ask(name, description: nil, inputs: {})
-      MessageBuilder.new(self).build_from_single_prompt(name, description: description, inputs: inputs)
-      self
-    end
-  end
-end

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

@@ -1,40 +0,0 @@
-# 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_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 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/concerns/ruby_conversations/message_api_attributes.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module RubyConversations
-  # Handles API-related attribute functionality for Message
-  module MessageApiAttributes
-    extend ActiveSupport::Concern
-
-    def message_attributes_for_api
-      {
-        request: request,
-        response: response,
-        model_identifier: model_identifier,
-        change_description: change_description,
-        llm: llm
-      }.compact
-    end
-
-    def message_base_attributes
-      {
-        'request' => request,
-        'response' => response,
-        'model_identifier' => model_identifier,
-        'change_description' => change_description
-      }
-    end
-
-    def remote_attributes
-      base_attributes.compact
-    end
-
-    private
-
-    def base_attributes
-      MessageAttributes::ATTRIBUTE_NAMES.each_with_object({}) do |attr_name, attrs|
-        attrs[attr_name] = public_send(attr_name)
-      end
-    end
-  end
-end

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

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module RubyConversations
-  # Handles attribute-related functionality for Message
-  module MessageAttributes
-    extend ActiveSupport::Concern
-
-    ATTRIBUTE_NAMES = %w[
-      id ai_conversation_id request response model_identifier
-      tool change_description llm created_at updated_at
-    ].freeze
-
-    included do
-      # Define core message attributes
-      attr_accessor :request, :response, :model_identifier, :change_description
-
-      # Define relationship attributes
-      attr_accessor :ai_conversation, :message_prompts, :prompts
-
-      # Common validations
-      validates :llm, presence: true
-      validates :request, presence: true
-
-      # Override initialize to ensure arrays are initialized
-      def initialize(attributes = {})
-        @message_prompts = []
-        @prompts = []
-        super
-      end
-    end
-
-    def remote_attributes
-      base_attributes.compact
-    end
-
-    private
-
-    def base_attributes
-      ATTRIBUTE_NAMES.each_with_object({}) do |attr_name, attrs|
-        attrs[attr_name] = public_send(attr_name)
-      end
-    end
-  end
-end

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

@@ -1,48 +0,0 @@
-# frozen_string_literal: true
-
-module RubyConversations
-  # Handles message processing and initialization logic
-  module MessageProcessing
-    extend ActiveSupport::Concern
-
-    private
-
-    def process_message_prompts(msg_data)
-      prompts_data = extract_prompts_data(msg_data)
-      prompts_data.map { |prompt_data| build_message_prompt(prompt_data) }
-    end
-
-    def extract_prompts_data(msg_data)
-      prompts_data = msg_data.delete(:prompts) ||
-                     msg_data.delete(:message_prompts) ||
-                     msg_data.delete('message_prompts') ||
-                     msg_data.delete(:ai_message_prompts_attributes) ||
-                     msg_data.delete('ai_message_prompts_attributes')
-      prompts_data || []
-    end
-
-    def build_message_prompt(prompt_data)
-      inputs_data = extract_inputs_data(prompt_data)
-      processed_inputs = inputs_data.map { |input_data| build_message_input(input_data) }
-
-      prompt_instance = RubyConversations::MessagePrompt.new(
-        prompt_data.except('id', 'message_id', 'created_at', 'updated_at')
-      )
-      prompt_instance.message_inputs = processed_inputs
-      prompt_instance
-    end
-
-    def extract_inputs_data(prompt_data)
-      inputs_data = prompt_data.delete(:inputs) ||
-                    prompt_data.delete(:message_inputs) ||
-                    prompt_data.delete('message_inputs')
-      inputs_data || []
-    end
-
-    def build_message_input(input_data)
-      RubyConversations::MessageInput.new(
-        input_data.except('id', 'message_prompt_id', 'created_at', 'updated_at')
-      )
-    end
-  end
-end

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

@@ -1,48 +0,0 @@
-# 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
-      messages.each do |message|
-        validate_message_level(message)
-        message.ai_message_prompts.each do |prompt|
-          validate_prompt_level(prompt)
-          prompt.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