ruby_conversations 1.1.14 → 1.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ed5064af3bc26131afeeb31aea307f3aff91e77148169b4074b8bafbf442918
-  data.tar.gz: abceedf6a1c5da4274f88dce6dee04661c8432f05523a8b9a4c0ef902e423d39
+  metadata.gz: 3c699cebb71c6b474fc4d69f0303a09df442a3005b40a211aa2948da20bc4979
+  data.tar.gz: 59532ffda0093a97a4e3fbee0efb1544901efc6dcc6c31fbe13649768dd7644f
 SHA512:
-  metadata.gz: 524b6044a78eecf9ff6799c87b977f950826a5afe9bc418f7b4803fd5c68029f44ae1d4543d8168005f916615608ea6894992ffcc8f2054deb126a79b61d82ca
-  data.tar.gz: 998ac5c443345285f8d3e75ef50a017c74bd6985cb11df16dbc8baf519e60ea73262bb1f3007532dad0566eec88bded62f5606dc7610513721194498aa408815
+  metadata.gz: 17f693b90549a70c3f8639934c264c00bdde4000b674405e99f8ecd2c4e5696b13a1df18800180bc8ce6b0d2652e154ab81fee6f80bda46d4c824214dbeaa56f
+  data.tar.gz: 6c4caab21a4028c519a5a7d381e264494a752235b22424d144afc2c101bd61b295ed0ae004b7f38c2d2d3d39cf6ddc0b1e8a6edf3a3dad6a78fd80861d5f6162

data/{app/models → lib}/ruby_conversations/concerns/conversation_chat.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'active_support/concern'
+require 'active_support/core_ext/object/blank'
+
 module RubyConversations
   module Concerns
     # Handles chat-related functionality for Conversation

data/{app/models → lib}/ruby_conversations/concerns/conversation_messages.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'active_support/concern'
+require 'active_support/core_ext/object/blank'
+
 module RubyConversations
   module Concerns
     # Handles message-related functionality for Conversation

data/{app/models → lib}/ruby_conversations/concerns/conversation_templates.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+require 'active_support/concern'
+require 'active_support/core_ext/object/blank'
+
 module RubyConversations
   module Concerns
     # Handles template-related functionality for Conversation

data/{app/models → lib}/ruby_conversations/concerns/llm_credentials.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/concern'
+
 module RubyConversations
   module Concerns
     # Handles the management of LLM credentials for AI conversations.

data/{app/models → lib}/ruby_conversations/concerns/message_api_attributes.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/concern'
+
 module RubyConversations
   module Concerns
     # Handles API-related attribute functionality for Message

data/{app/models → lib}/ruby_conversations/concerns/message_attributes.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/concern'
+
 module RubyConversations
   module Concerns
     # Handles attribute-related functionality for Message

data/{app/models → lib}/ruby_conversations/concerns/message_processing.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'active_support/concern'
+
 module RubyConversations
   module Concerns
     # Handles message processing functionality for Conversation

data/{app/models/ruby_conversations/conversation.rb → lib/ruby_conversations/conversation_manager.rb}

@@ -1,33 +1,24 @@
 # frozen_string_literal: true
 
-require 'active_model'
+require 'active_support/core_ext/string/inflections'
 
 module RubyConversations
-  # Represents a conversation thread, managing messages and interactions with the LLM.
-  class Conversation
-    include ActiveModel::Model
+  # Manages a conversation, including message storage, relationships, and LLM integration.
+  class ConversationManager
     include RubyConversations::Concerns::ConversationChat
     include RubyConversations::Concerns::ConversationMessages
     include RubyConversations::Concerns::ConversationTemplates
     include RubyConversations::Concerns::LlmCredentials
-    include RubyConversations::Concerns::MessageValidation
+
     include RubyConversations::Concerns::MessageProcessing
 
     attr_accessor :id, :conversationable_type, :conversationable_id, :conversationable,
                   :messages, :tool, :tools, :created_at, :updated_at
 
-    validates :messages, presence: { message: 'At least one message is required' }, on: :update
-    validate :validate_messages
-
     def initialize(attributes = {})
-      @chat = attributes.delete(:chat)
-      @model_identifier = attributes.delete(:model_identifier)
-      @provider = attributes.delete(:provider)
-      @tools_optional = attributes.delete(:tools_optional)
-      @messages = []
-
+      setup_attributes(attributes)
       configure_llm_credentials
-      super
+      configure_prompt_caching
     end
 
     def chat
@@ -73,14 +64,20 @@ module RubyConversations
       }
     end
 
-    def validate_messages
-      messages.each do |message|
-        next if message.valid?
+    def setup_attributes(attributes)
+      @chat = attributes.delete(:chat)
+      @model_identifier = attributes.delete(:model_identifier)
+      @provider = attributes.delete(:provider)
+      @tools_optional = attributes.delete(:tools_optional)
+      @messages = []
 
-        message.errors.full_messages.each do |msg|
-          errors.add(:messages, "invalid: #{msg}")
-        end
+      attributes.each do |key, value|
+        public_send("#{key}=", value) if respond_to?("#{key}=")
       end
     end
+
+    def configure_prompt_caching
+      chat.cache_prompts(system: true, tools: true, user: true)
+    end
   end
 end

data/{app/models → lib}/ruby_conversations/message.rb

@@ -99,7 +99,4 @@ module RubyConversations
       nested
     end
   end
-
-  # Alias for compatibility with Zeitwerk
-  AIMessage = Message
 end

data/{app/models → lib}/ruby_conversations/message_input.rb

@@ -1,19 +1,21 @@
 # frozen_string_literal: true
 
-require 'active_model'
+require 'active_support/core_ext/object/blank'
 
 module RubyConversations
   # Represents an input value for a message prompt
   class MessageInput
-    include ActiveModel::Model
-
     # Define attributes
     attr_accessor :id, :message_prompt_id, :placeholder_name, :value,
                   :created_at, :updated_at
 
-    # Validations
-    validates :placeholder_name, presence: true
-    validate :value_not_nil
+    attr_reader :message_prompt
+
+    def initialize(attributes = {})
+      attributes.each do |key, value|
+        public_send("#{key}=", value) if respond_to?("#{key}=")
+      end
+    end
 
     # Association-like methods
     def message_prompt=(prompt)
@@ -21,8 +23,6 @@ module RubyConversations
       @message_prompt_id = prompt&.id
     end
 
-    attr_reader :message_prompt
-
     # Scopes
     def self.ordered
       all.sort_by(&:placeholder_name)
@@ -48,10 +48,6 @@ module RubyConversations
 
     private
 
-    def value_not_nil
-      errors.add(:value, "can't be blank") if value.nil?
-    end
-
     def base_attributes
       {
         'id' => id,

data/{app/models → lib}/ruby_conversations/prompt.rb

@@ -1,12 +1,10 @@
 # frozen_string_literal: true
 
-require 'active_model'
+require 'active_support/core_ext/object/blank'
 
 module RubyConversations
   # Represents a prompt template used to generate AI messages.
   class Prompt
-    include ActiveModel::Model
-
     # Define attributes
     attr_accessor :id, :name, :role, :message, :valid_placeholders, :temperature, :metadata, :created_at, :updated_at,
                   :latest_version_id, :llm
@@ -14,6 +12,12 @@ module RubyConversations
     # Constants
     ROLES = %w[system user assistant].freeze
 
+    def initialize(attributes = {})
+      attributes.each do |key, value|
+        public_send("#{key}=", value) if respond_to?("#{key}=")
+      end
+    end
+
     # Class methods
     def self.roles
       ROLES
@@ -31,19 +35,14 @@ module RubyConversations
       find_by_name!(name)
     end
 
-    # Validations
-    validates :name, presence: true
-    validates :role, presence: true, inclusion: { in: ROLES }
-    validates :message, presence: true
-
-    # Initialization
-    def initialize(attributes = {})
-      super
-    end
-
     # Basic attributes method
     def attributes
-      instance_values
+      {
+        'id' => id, 'name' => name, 'role' => role, 'message' => message,
+        'valid_placeholders' => valid_placeholders, 'temperature' => temperature,
+        'metadata' => metadata, 'created_at' => created_at, 'updated_at' => updated_at,
+        'latest_version_id' => latest_version_id, 'llm' => llm
+      }
     end
 
     # Method for API serialization

data/lib/ruby_conversations/version.rb

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

data/lib/ruby_conversations.rb

@@ -1,11 +1,26 @@
 # frozen_string_literal: true
 
 require 'zeitwerk'
+require 'active_support/core_ext/object/blank'
 require 'ruby_conversations/version'
 require 'ruby_conversations/configuration'
 require 'ruby_conversations/errors'
 require 'ruby_conversations/client'
 require 'ruby_conversations/aws_credential_provider'
+require 'ruby_conversations/concerns/conversation_chat'
+require 'ruby_conversations/concerns/conversation_messages'
+require 'ruby_conversations/concerns/conversation_templates'
+require 'ruby_conversations/concerns/llm_credentials'
+
+require 'ruby_conversations/concerns/message_processing'
+require 'ruby_conversations/concerns/message_attributes'
+require 'ruby_conversations/concerns/message_api_attributes'
+require 'ruby_conversations/message_input'
+require 'ruby_conversations/message_prompt'
+require 'ruby_conversations/message'
+require 'ruby_conversations/prompt'
+require 'ruby_conversations/message_builder'
+require 'ruby_conversations/conversation_manager'
 require 'ruby_llm'
 
 # Main module for RubyConversations
@@ -44,5 +59,4 @@ end
 
 # Set up Zeitwerk autoloading
 loader = Zeitwerk::Loader.new
-loader.push_dir("#{__dir__}/../app/models")
 loader.setup

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby_conversations
 version: !ruby/object:Gem::Version
-  version: 1.1.14
+  version: 1.1.15
 platform: ruby
 authors:
 - Paul Shippy
@@ -256,26 +256,25 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- app/models/ruby_conversations/concerns/conversation_chat.rb
-- app/models/ruby_conversations/concerns/conversation_messages.rb
-- app/models/ruby_conversations/concerns/conversation_templates.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
-- app/models/ruby_conversations/message_input.rb
-- app/models/ruby_conversations/message_prompt.rb
-- app/models/ruby_conversations/prompt.rb
 - lib/ruby_conversations.rb
 - lib/ruby_conversations/aws_credential_provider.rb
 - lib/ruby_conversations/client.rb
+- lib/ruby_conversations/concerns/conversation_chat.rb
+- lib/ruby_conversations/concerns/conversation_messages.rb
+- lib/ruby_conversations/concerns/conversation_templates.rb
+- lib/ruby_conversations/concerns/llm_credentials.rb
+- lib/ruby_conversations/concerns/message_api_attributes.rb
+- lib/ruby_conversations/concerns/message_attributes.rb
+- lib/ruby_conversations/concerns/message_processing.rb
 - lib/ruby_conversations/configuration.rb
+- lib/ruby_conversations/conversation_manager.rb
 - lib/ruby_conversations/engine.rb
 - lib/ruby_conversations/errors.rb
+- lib/ruby_conversations/message.rb
+- lib/ruby_conversations/message_builder.rb
+- lib/ruby_conversations/message_input.rb
+- lib/ruby_conversations/message_prompt.rb
+- lib/ruby_conversations/prompt.rb
 - lib/ruby_conversations/version.rb
 homepage: https://github.com/StrongMind/ruby-conversations
 licenses:

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

@@ -1,46 +0,0 @@
-# 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