ruby_conversations 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29d0a2bc2bf832a2bd4a452e1213d024604d73c3be3406851d2ac77dce20278d
-  data.tar.gz: 973a5a996c8146aa0651dfeb42cb95d27c9a4623c53b1b4f662cefb48f90bc88
+  metadata.gz: 6928d1d487d9e5a716b8e9bcdf4f0e4363ae2bb2d2cc1ee4939df4e4aee7764a
+  data.tar.gz: ab759bb89535426def0743f50e7e0711adc9012f3c61bd7a2daf7e722d7644e1
 SHA512:
-  metadata.gz: bf8a698597f4a53c26a0850ee8afc0552d9280b5ea46ba05b890e5bebaa587e40d666e93349ec1667e1ac438c881b9a1afa79b7482cc970fedc49d7e89d49be5
-  data.tar.gz: c9b77726ec303b37ad0af8f8e16ad3979802f8d995c254dcd2713a4a60563e0cbd7865b4bb433ade118ff2a597c8cc896940004b0abc874b802c63f666d037ba
+  metadata.gz: d875c52d737a2dcf105d5be833c1168282a2c92f3df6f9c781cbe7975778b1916d8b067e0a95a4a5cfc733e656c49390d2453d02889253ea8622985826b800a6
+  data.tar.gz: 4ec9eea20a8a9c61535bd4fdfa487c040fa07a779e43adda68baaac59a6a00a44967cf54bdc1c440ae5543e113c8fed988cdf969e9a2e0408afe966a2dba75ac

data/app/models/ruby_conversations/message_builder.rb

@@ -19,18 +19,14 @@ module RubyConversations
     end
 
     def build_from_multiple_prompts(prompt_inputs, description: nil)
-      message = @conversation.ai_messages.build(
-        request: '',
-        change_description: description,
-        llm: @conversation.model_identifier,
-        tool: @conversation.tool
-      )
+      message = initialize_ai_message(description)
 
       prompt_inputs.each do |prompt_name, inputs|
         process_single_prompt_input(message, prompt_name, inputs)
       end
 
-      message # Return the built message
+      message.request = message.request.strip
+      message
     end
 
     def process_single_prompt_input(message, prompt_name, inputs)
@@ -38,7 +34,7 @@ module RubyConversations
       validate_inputs!(prompt, inputs)
 
       interpolated_message = prompt.interpolate(inputs)
-      message.request += interpolated_message
+      message.request += "#{interpolated_message}\n\n"
 
       message_prompt = message.ai_message_prompts.build(
         prompt_version_id: prompt.latest_version_id,
@@ -49,6 +45,15 @@ module RubyConversations
 
     private
 
+    def initialize_ai_message(description)
+      @conversation.ai_messages.build(
+        request: '',
+        change_description: description,
+        llm: @conversation.model_identifier,
+        tool: @conversation.tool
+      )
+    end
+
     def validate_inputs!(prompt, inputs)
       return unless prompt.valid_placeholders.present?
 
@@ -63,7 +68,6 @@ module RubyConversations
 
     def build_prompt_association(message, prompt, inputs)
       message_prompt = message.ai_message_prompts.build(
-        prompt: prompt,
         prompt_version_id: prompt.latest_version_id,
         draft: prompt.message
       )

data/app/models/ruby_conversations/prompt.rb

@@ -16,11 +16,9 @@ module RubyConversations
     belongs_to :organization, optional: true
 
     # Validations
-    validates :message, presence: true
     validates :name, presence: true, uniqueness: true
     validates :temperature, numericality: { greater_than_or_equal_to: 0.0 }, allow_nil: true
     validates :role, presence: true, inclusion: { in: VALID_ROLES }
-    validate :validate_placeholders_format
 
     # Scopes
     scope :active, -> { where(active: true) }
@@ -50,55 +48,14 @@ module RubyConversations
     end
 
     def interpolate(inputs = {})
-      return message if placeholders.empty?
-
-      validate_required_variables!(inputs)
-
       interpolated = message.dup
       format(interpolated, **inputs)
     end
 
-    def placeholders
-      return [] if message.nil?
-
-      matches = message.scan(/%<([^>]+)>/)
-      matches&.flatten&.uniq || []
-    end
-
-    def active?
-      active
-    end
-
-    def deactivate!
-      update!(active: false)
-    end
-
-    def activate!
-      update!(active: true)
-    end
-
     private
 
     def versioned_attributes
       %i[content role]
     end
-
-    def validate_placeholders_format
-      invalid_placeholders = placeholders.grep_v(/\A[a-z_][a-z0-9_]*\z/i)
-
-      return unless invalid_placeholders.any?
-
-      errors.add(:message, "contains invalid placeholders: #{invalid_placeholders.join(', ')}")
-    end
-
-    def validate_required_variables!(variables)
-      missing = placeholders - variables.keys.map(&:to_s)
-      raise ArgumentError, "Missing required variables: #{missing.join(', ')}" if missing.any?
-
-      extra = variables.keys.map(&:to_s) - placeholders
-      return unless extra.any?
-
-      raise ArgumentError, "Unknown variables provided: #{extra.join(', ')}"
-    end
   end
 end

data/lib/ruby_conversations/version.rb

@@ -3,7 +3,7 @@
 module RubyConversations
   MAJOR = 1
   MINOR = 0
-  PATCH = 0 # this is automatically incremented by the build process
+  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.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Paul Shippy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday