ruby_conversations 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c9ac759157e0a174601a8eb345c21dc4cb6916408d757a54b2e7ffb44173b01
-  data.tar.gz: 6357e028b36fc6a1ad772f52ede341d638e393d6b03f9530b5951dfeaa8677da
+  metadata.gz: d32de256fcc9a8676794a2da52b5e7f1d6340dee5db4614232b8ffb42dde3bae
+  data.tar.gz: d557589614b047b2e33cf5c8ec1e81fdaf8cafc6b605e37084aaad6bbb6cd58f
 SHA512:
-  metadata.gz: 2a4f6e671026766297cf3cd4ad9ed0c66c7f4beac979480349447c3b257a69ce88aa8b38ebbf7e5ea1961e29341e749bfea8a4626f743908d64f1ecbd93efd07
-  data.tar.gz: 6abdb98f3d9df53efb8c12e894c6648417b964733f4a3ac0a0a9d28609a2faf146f7ac30f1aacb2ce71b32bdb85afecce8c46dbed67821fffa76ea2236f4a58a
+  metadata.gz: 6412f0ff57642fce95b680e7024c69fa1ec1e20a7718ed93f0370d73d2d5a4d435179b0effd569c7be9720298f4b4d6bda1f6d15873e87b313ff366e6c302da4
+  data.tar.gz: 83f0c09530212693fc8e5ada3506a9469c1c07a770d34fc3931cd6a9401f1eca54c48a3f86ccdb66fc4c1765555dd38ae3c62ec9bfc405af8a9aac5a31fd8d81

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

@@ -6,17 +6,9 @@ module RubyConversations
     extend ActiveSupport::Concern
 
     def execute(system_message: nil)
-      message = messages.last
-      raise ArgumentError, 'Conversation must have at least one message to execute' unless message
-
-      chat = setup_llm_chat(system_message: system_message)
-      response = chat.ask(message.request)
-      update_last_message_response(message, response)
-      json_response = save_conversation
-      {
-        response: response,
-        conversation: json_response
-      }
+      validate_conversation_state
+      response = generate_chat_response(system_message)
+      store_and_update_conversation(response)
     end
 
     def llm
@@ -30,6 +22,26 @@ module RubyConversations
 
     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)

data/app/models/ruby_conversations/conversation.rb

@@ -6,7 +6,7 @@ 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'
-require_relative '../concerns/ruby_conversations/storable'
+
 module RubyConversations
   # Represents a conversation thread, managing messages and interactions with the LLM.
   class Conversation
@@ -16,7 +16,6 @@ module RubyConversations
     include LlmCredentials
     include MessageValidation
     include MessageProcessing
-    include Storable
 
     # Define attributes needed for API interaction & local state
     attr_accessor :id, :conversationable_type, :conversationable_id, :conversationable,

data/lib/ruby_conversations/client.rb

@@ -2,26 +2,67 @@
 
 require 'faraday'
 require 'jwt'
+require 'logger'
 
 module RubyConversations
   # HTTP client for interacting with the conversations API
   class Client
+    attr_reader :client
+
     PROMPT_ATTRIBUTES = %w[
       id name message role temperature valid_placeholders created_at updated_at latest_version_id
     ].freeze
 
+    # Initialize a new API client
+    # @param url [String] The base URL for the API
+    # @param jwt_secret [String, #call] The JWT secret or a callable that returns a JWT token
     def initialize(url:, jwt_secret:)
       @url = url
       @jwt_secret = jwt_secret
       @jwt_token = nil
       @jwt_expiration = nil
+      @logger = Logger.new($stdout)
+      @client = build_client
     end
 
+    # Store a conversation or add a message to an existing conversation
+    # @param conversation [Conversation] The conversation to store
+    # @param message [Message] The message to store
+    # @return [Hash] The API response data
+    def store_conversation_or_message(conversation, message)
+      if conversation.id.present?
+        store_message(conversation, message)
+      else
+        store_conversation(conversation)
+      end
+    end
+
+    # Store a new conversation
+    # @param conversation [Conversation] The conversation to store
+    # @return [Hash] The API response data
+    # @raise [Error] If the API response is missing a conversation ID
     def store_conversation(conversation)
       response = client.post('api/ai_conversations', conversation.conversation_attributes_for_storage)
+      data = handle_response(response)
+      raise RubyConversations::Error, 'API response missing conversation ID' unless data['id'].present?
+
+      conversation.id = data['id']
+      data
+    end
+
+    # Store a message in an existing conversation
+    # @param conversation [Conversation] The conversation to add the message to
+    # @param message [Message] The message to store
+    # @return [Hash] The API response data
+    def store_message(conversation, message)
+      response = client.post("api/ai_conversations/#{conversation.id}/ai_messages",
+                             { ai_message: message.attributes_for_api })
       handle_response(response)
     end
 
+    # Fetch a prompt by name
+    # @param name [String] The name of the prompt to fetch
+    # @return [Hash] The prompt attributes
     def fetch_prompt(name)
       response = client.get("api/prompts/#{name}")
       data = handle_response(response)
@@ -36,10 +77,6 @@ module RubyConversations
       end
     end
 
-    def client
-      @client ||= build_client
-    end
-
     def build_client
       Faraday.new(url: @url) do |faraday|
         faraday.request :json
@@ -55,7 +92,7 @@ module RubyConversations
     end
 
     def token_expired?
-      @jwt_token.nil? || @jwt_expiration.nil? || Time.now.to_i >= @jwt_expiration
+      [@jwt_token, @jwt_expiration].any?(&:nil?) || Time.now.to_i >= @jwt_expiration
     end
 
     def refresh_jwt
@@ -79,12 +116,10 @@ module RubyConversations
     end
 
     def handle_response(response)
-      case response.status
-      when 200, 201
-        response.body
-      else
-        raise Error, "API request failed: #{response.body}"
-      end
+      return response.body if response.success?
+
+      @logger.error("API request failed: #{response.body.inspect}")
+      raise RubyConversations::Error, "API request failed: #{response.body}"
     end
   end
 end

data/lib/ruby_conversations/version.rb

@@ -3,7 +3,7 @@
 module RubyConversations
   MAJOR = 1
   MINOR = 0
-  PATCH = 9
+  PATCH = 10
 
   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.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Paul Shippy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-10 00:00:00.000000000 Z
+date: 2025-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-factory_bot
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rails
   requirement: !ruby/object:Gem::Requirement
@@ -249,7 +263,6 @@ files:
 - 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/concerns/ruby_conversations/storable.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/storable.rb

@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-module RubyConversations
-  # Module for handling storage functionality in Ruby Conversations
-  # Provides methods for storing and retrieving conversation data
-  module Storable
-    extend ActiveSupport::Concern
-
-    def save_conversation
-      RubyConversations.client.store_conversation(self)
-    end
-  end
-end