ruby_conversations 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd956939c0daaea90e866266a6ab8a5bba2b3ec9bb295c81a6f2e902b163d968
-  data.tar.gz: a03a9a78205f79a6d4850cb7cd58ca0fc7413b0754e62563b541b8adc1b32917
+  metadata.gz: ebe08b35dd3c009e6bd81c5fb6bbb8e9d109d51b76d4469a8af13deeadaebfc5
+  data.tar.gz: db51099d58654198bcbb1d0c873896f729170937798b0f8cee7928cc44dc5e3c
 SHA512:
-  metadata.gz: abab8e151b670375b5486c7915eb921f1c24943b6f20d65f56229428d7254afe8ef18d98fe957df82de16e6219d9b4196489044fcee6e04887b201c8b2528833
-  data.tar.gz: 3f4e262b42234bb4ed48a18d11a165edc932f75999c64f13afe8aa2b93ccd04b2e4370c3ad4b90470882e299947133831ff712a71d6418a3f36773127b21d7f2
+  metadata.gz: 78866ece10dffbce9e4daaa3b6fff1dd8b019663b5c0f665f4043b984b8de17a4c004ae23e62a490eae3626540be14f0811a3b9fef7b00c18f7593789dced64a
+  data.tar.gz: 84cd8cfe96fad9343323ecd5080586647ab2bb762290954b2aa8887c875f628d96c12d6b61a4473489ea584c2b2cb5749b35cb5632f129e71e5b903a5c890666

data/README.md

@@ -7,9 +7,7 @@ A Rails engine for managing AI conversations and storing them in prompt studio.
 - **Built-in Prompt Management**: Version-controlled prompts with placeholder validation
 - **Conversation History**: Track and manage conversation threads
 - **Input/Output Storage**: Structured storage for message inputs and responses
-- **Real-time Updates**: Built-in broadcasting support for real-time applications
 - **JWT Authentication**: Secure remote mode with JWT authentication
-- **Easy Integration**: Simple setup with Rails generators
 
 ## Installation
 
@@ -36,7 +34,7 @@ gem install ruby_conversations
 Configure the engine in `config/initializers/ai_conversation_engine.rb`:
 
 ```ruby
-AiConversationEngine.configure do |config|
+RubyConversations.configure do |config|
   # API settings
   config.api_url = ENV['AI_CONVERSATION_API_URL']
   config.jwt_secret = ENV['AI_CONVERSATION_JWT_SECRET']
@@ -51,34 +49,13 @@ end
 
 ```ruby
 # Create a new conversation
-conversation = AiConversation.create!
+conversation = RubyConversations::Conversation.new
 
 # Ask a question using a predefined prompt
-conversation.ask("explain_code", inputs: { code: "def hello; end" })
-```
-
-### With Associated Objects
-
-```ruby
-# Create a conversation linked to another object
-class Project < ApplicationRecord
-  has_many :conversations, as: :conversationable,
-           class_name: 'AiConversationEngine::AiConversation'
-end
-
-project = Project.find(1)
-conversation = project.conversations.create!
-conversation.ask("analyze_project", inputs: { name: project.name })
-```
-
-
-### Real-time Updates
-
-```ruby
-# In your view
-<%= turbo_stream_from "chat_#{@conversation.id}" %>
+conversation.with_prompt("explain_code", inputs: { code: "def hello; end" })
+result = conversation.call_llm
 
-# Updates are automatically broadcast when messages are added
+puts result[:content]
 ```
 
 ## Development

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

@@ -6,15 +6,17 @@ module RubyConversations
     module ConversationChat
       extend ActiveSupport::Concern
 
-      def execute(system_message: nil)
+      def call_llm(system_message: nil, &block)
         validate_conversation_state
-        chat_messages = generate_chat_response(system_message)
+        chat_messages = generate_chat_response(system_message, &block)
 
         validate_tool_calls(chat_messages)
 
         store_and_update_conversation(chat_messages)
       end
 
+      alias execute call_llm
+
       def validate_tool_calls(chat_messages)
         return unless tools_configured?
         return if tool_calls?(chat_messages)
@@ -50,9 +52,9 @@ module RubyConversations
         raise ArgumentError, 'Conversation must have at least one message to execute' unless message
       end
 
-      def generate_chat_response(system_message)
+      def generate_chat_response(system_message, &)
         setup_llm_chat(system_message: system_message)
-        chat.ask(messages.last.request)
+        chat.ask(messages.last.request, &)
         chat.messages
       end
 
@@ -62,7 +64,8 @@ module RubyConversations
 
         {
           response: chat_messages,
-          conversation: self
+          conversation: self,
+          content: chat_messages.last.content
         }
       end
 

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

@@ -17,15 +17,20 @@ module RubyConversations
         end
       end
 
-      def ask_multiple(prompt_inputs, description: nil)
+      def with_prompts(prompt_inputs, description: nil)
         MessageBuilder.new(self).build_from_multiple_prompts(prompt_inputs, description: description)
         self
       end
 
-      def ask(name, description: nil, inputs: {})
+      def with_prompt(name, description: nil, inputs: {})
         MessageBuilder.new(self).build_from_single_prompt(name, description: description, inputs: inputs)
         self
       end
+
+      def with_user_message(message, description: nil)
+        MessageBuilder.new(self).build_from_user_message(message, description: description)
+        self
+      end
     end
   end
 end

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

@@ -13,36 +13,22 @@ module RubyConversations
     include RubyConversations::Concerns::MessageProcessing
 
     # Define attributes needed for API interaction & local state
-    attr_accessor :chat, :id, :conversationable_type, :conversationable_id, :conversationable,
-                  :messages, :tool, :tools, :created_at, :updated_at, :persist
+    attr_accessor :id, :conversationable_type, :conversationable_id, :conversationable,
+                  :messages, :tool, :tools, :created_at, :updated_at
 
     # Validations
     validates :messages, presence: { message: 'At least one message is required' }, on: :update
     validate :validate_messages
 
     # Initialization
-    def initialize(attributes = nil)
-      attributes ||= {}
-      # Ensure messages is always an array before super assigns other attributes
+    def initialize(attributes = {})
+      @chat = attributes.delete(:chat)
       @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
-
-      super # Initialize with remaining attributes using ActiveModel::Model
-      initialize_messages(messages_attrs)
-
-      build_chat
+      super
     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
+    def chat
+      @chat ||= RubyLLM.chat(model: llm, provider: provider).with_temperature(0.0)
     end
 
     def model_identifier
@@ -53,36 +39,12 @@ module RubyConversations
       @provider ||= RubyConversations.configuration.default_llm_provider
     end
 
-    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 conversation_attributes_for_storage
       { ai_conversation: base_attributes.merge(relationship_attributes).merge(messages_attributes).compact }
     end
 
     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/app/models/ruby_conversations/message_builder.rb

@@ -15,7 +15,13 @@ module RubyConversations
       message = build_message(interpolated_message, description)
       build_prompt_association(message, prompt, inputs)
 
-      message # Return the built message
+      message
+    end
+
+    def build_from_user_message(raw_message, description: nil)
+      message = build_message(raw_message, description)
+      build_message_prompt(message, Prompt.new(name: 'user_message', role: 'user', message: raw_message))
+      message
     end
 
     def build_from_multiple_prompts(prompt_inputs, description: nil)

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, :persistence_model
+    attr_accessor :api_url, :jwt_secret, :default_llm_model, :default_llm_provider
 
     def initialize
       @default_llm_model = 'claude-3-7-sonnet'

data/lib/ruby_conversations/version.rb

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