ruboty-openai_chat 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 353bed59e624fc927b316d6336c367e23475d0bf534ed126db6b07fcefc497ce
-  data.tar.gz: 0d50dd6f60af89192adb12f64b156914a1ce2663ff8b9c9d7238ba18eae1a596
+  metadata.gz: 56d165955c63d1811168c341cc949fa01edef6afefdbee4fca59968f4d45bcc0
+  data.tar.gz: 035fe05f51a35bb5c94bcb2347bf4e3f783455d741d1922ae04e70928c0bd71d
 SHA512:
-  metadata.gz: 7598b2b3644f09cf7b78358c4a9a8fb78a6aa6e3944a83c0f19037f80cd9ab60a8d416bb34675c94cbd70680bc8e07b8ecc1f9744775211b9a7b156498727cd0
-  data.tar.gz: eabeb98f4d348d33868554a3abe3c473aac32895d7d3e33a236831fa72a7f1b9df0ae78a868b695759e7199bec3f78f6c24287bf8f71b31b7f4831b03f12b8a0
+  metadata.gz: 8fd13b2d9393cc7971eb13555c98a1ff3c704e01d48cfbace79958f3b5adc3c18a8ecb1f1e3c928e2844a8f6ba22ec5d8dd69df98bafd5c5f39e9b32849b04b2
+  data.tar.gz: 272e9f664c55bf3d46542a06f1360018743a4a01228c92ab32cd27bb1af0157133a839e76912033ff494b500cd87ea262501941636754b5abff0b4ecf285b8a1

data/lib/ruboty/openai_chat/actions/base.rb

@@ -31,8 +31,9 @@ module Ruboty
           @memory ||= Memory.new(robot)
         end
 
-        def pretext
-          [ENV["OPENAI_CHAT_PRETEXT"], memory.namespace(NAMESPACE)[PROFILE_KEY]].compact.map { |text| text.strip.gsub(/\R/, " ") }.join(" ")
+        # @return [Array<String>]
+        def pretexts
+          [ENV["OPENAI_CHAT_PRETEXT"], memory.namespace(NAMESPACE)[PROFILE_KEY]].compact
         end
       end
     end

data/lib/ruboty/openai_chat/actions/chat.rb

@@ -11,70 +11,71 @@ module Ruboty
 
         def call
           human_comment = message[:body]
-          response = complete(human_comment)
-          p response if ENV["OPENAI_CHAT_DEBUG"]
+          response = request_chat(human_comment)
+          p response if Ruboty::OpenAIChat.debug_mode?
           raise response.body if response.code >= 400
 
-          ai_comment = response.dig("choices", 0, "text").gsub(/\A\s+/, "") || ""
+          ai_comment = response.dig("choices", 0, "message", "content").gsub(/\A\s+/, "") || ""
 
-          remember_dialog(Dialog.new(human_comment: human_comment, ai_comment: ai_comment, expire_at: expire_at))
+          remember_messages(
+            Message.new(role: :user, content: human_comment, expire_at: expire_at),
+            Message.new(role: :assistant, content: ai_comment, expire_at: expire_at)
+          )
           message.reply(ai_comment)
         rescue StandardError => e
           forget
           message.reply(e.message, code: true)
-          raise e if ENV["OPENAI_CHAT_DEBUG"]
+          raise e if Ruboty::OpenAIChat.debug_mode?
 
           true
         end
 
         private
 
-        def complete(human_comment)
+        def request_chat(human_comment)
           # https://beta.openai.com/examples/default-chat
-          client.completions(
+          client.chat(
             parameters: {
-              model: "text-davinci-003",
-              temperature: 0.9,
-              max_tokens: 512,
-              top_p: 1,
-              frequency_penalty: 0,
-              presence_penalty: 0.6,
-              stop: Dialog::STOP_SEQUENCES,
-              prompt: build_prompt(human_comment)
+              model: "gpt-3.5-turbo",
+              messages: build_messages(human_comment).map(&:to_api_hash),
+              temperature: 0.7
             }
           )
         end
 
-        def build_prompt(human_comment)
-          prefix = [prompt_prefix]
-          prefix += [pretext].compact
+        # @return [Array<Message>]
+        def build_messages(human_comment)
+          settings = <<~STRING.chomp
+            The following is a conversation with an AI assistant. The assistant is helpful, creative, clever, and very friendly. The AI assistant's name is #{robot.name}.
+          STRING
 
-          dialogs = [example_dialog, *dialogs_from_memory,
-                     Dialog.new(human_comment: human_comment, ai_comment: "")].map do |dialog|
-            dialog.to_prompt.chomp
-          end.join("\n")
+          system_messages = [Message.new(role: :system, content: settings)]
+          pretexts.each do |pretext|
+            system_messages << Message.new(role: :system, content: pretext.chomp)
+          end
 
-          <<~STRING.chomp
-            #{prefix.join(" ")}
+          pre_messages = [*example_dialog, *messages_from_memory]
 
-            #{dialogs}
-          STRING
+          [*system_messages, *pre_messages, Message.new(role: :user, content: human_comment)]
         end
 
         # @return [Array<Dialog>]
-        def dialogs_from_memory
-          raw_dialogs.reject! { |hash| Dialog.from_hash(hash).expired? }
-          raw_dialogs.map { |hash| Dialog.from_hash(hash) }
+        def messages_from_memory
+          current = Time.now
+          raw_messages.reject! { |hash| Message.from_hash(hash).expired?(current) }
+          raw_messages.map { |hash| Message.from_hash(hash) }
         end
 
-        # @param dialog [Dialog]
-        def remember_dialog(dialog)
-          raw_dialogs << dialog.to_h
+        # @param messages [Array<Message>]
+        def remember_messages(*messages)
+          messages.each do |message|
+            raw_messages << message.to_h
+          end
         end
 
         # @return [Array<Hash>]
-        def raw_dialogs
-          memory.namespace(NAMESPACE, message.from || "general")[:dialogs] ||= []
+        def raw_messages
+          memory.namespace(NAMESPACE, message.from || "general")[:messages] ||= []
         end
 
         def forget
@@ -83,26 +84,22 @@ module Ruboty
 
         # @return [Time]
         def expire_at
-          Time.now + ENV.fetch("OPENAI_CHAT_MEMORIZE_SECONDS") { 5 * 60 }.to_i
-        end
-
-        # @return [String]
-        def prompt_prefix
-          "The following is a conversation with an AI assistant. The assistant is helpful, creative, clever, and very friendly. The AI assistant's name is #{robot.name}."
+          Time.now + ENV.fetch("OPENAI_CHAT_MEMORIZE_SECONDS") { 15 * 60 }.to_i
         end
 
+        # @return [Array<Message>]
         def example_dialog
           case language
           when :ja
-            Dialog.new(
-              human_comment: "こんにちは。あなたは誰ですか？",
-              ai_comment: "私は OpenAI 製の AI アシスタントの #{robot.name} です。なにかお手伝いできることはありますか？"
-            )
+            [
+              Message.new(role: :user, content: "こんにちは。あなたは誰ですか？"),
+              Message.new(role: :assistant, content: "私は AI アシスタントの #{robot.name} です。なにかお手伝いできることはありますか？")
+            ]
           else
-            Dialog.new(
-              human_comment: "Hello, who are you?",
-              ai_comment: "I'm #{robot.name}, an AI assistant created by OpenAI. How can I help you today?"
-            )
+            [
+              Message.new(role: :user, content: "Hello, who are you?"),
+              Message.new(role: :assistant, content: "I'm #{robot.name}, an AI assistant. How can I help you today?")
+            ]
           end
         end
 

data/lib/ruboty/openai_chat/message.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module Ruboty
+  module OpenAIChat
+    class Message
+      ROLES = %i[system user assistant].freeze
+
+      # @return [:system, :user, :assistant]
+      attr_reader :role
+
+      # @return [String]
+      attr_reader :content
+
+      # @return [Time]
+      attr_reader :expire_at
+
+      def self.from_hash(hash)
+        new(**hash.transform_keys(&:to_sym))
+      end
+
+      # @param role [:system, :user, :assistant]
+      # @param content [String]
+      # @param expire_at [Time, Integer, nil]
+      def initialize(role:, content:, expire_at: nil)
+        @role = role.to_sym
+        raise ArgumentError, "role must be :system, :user, or :assistant" unless ROLES.include?(@role)
+
+        @content = content
+        @expire_at = expire_at&.yield_self { |t| Time.at(t) }
+      end
+
+      # @return [Hash]
+      def to_h
+        { role: role, content: content, expire_at: expire_at&.to_i }
+      end
+
+      def to_api_hash
+        { role: role, content: content }
+      end
+
+      # @return [Boolean]
+      def expired?(from = Time.now)
+        expire_at && (expire_at <= from)
+      end
+    end
+  end
+end

data/lib/ruboty/openai_chat/version.rb

@@ -2,6 +2,6 @@
 
 module Ruboty
   module OpenAIChat
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/ruboty/openai_chat.rb

@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
 require "ruboty"
-require "ruby/openai"
+require "openai"
 
 require_relative "openai_chat/version"
 require_relative "openai_chat/actions/base"
 require_relative "openai_chat/actions/chat"
 require_relative "openai_chat/actions/remember_profile"
 require_relative "openai_chat/actions/show_profile"
-require_relative "openai_chat/dialog"
 require_relative "openai_chat/memory"
+require_relative "openai_chat/message"
 
 require_relative "handlers/openai_chat"
 
@@ -17,5 +17,10 @@ module Ruboty
   module OpenAIChat
     class Error < StandardError; end
     # Your code goes here...
+
+    # @return [Boolean]
+    def self.debug_mode?
+      ENV["OPENAI_CHAT_DEBUG"]&.length&.positive?
+    end
   end
 end

data/ruboty-openai_chat.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   # Uncomment to register a new dependency of your gem
   # spec.add_dependency "example-gem", "~> 1.0"
   spec.add_dependency "ruboty"
-  spec.add_dependency "ruby-openai", "~> 2.0"
+  spec.add_dependency "ruby-openai", "~> 3.5"
 
   # For more information and examples about making a new gem, check out our
   # guide at: https://bundler.io/guides/creating_gem.html

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-openai_chat
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Tomoya Chiba
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-26 00:00:00.000000000 Z
+date: 2023-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruboty
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.5'
 description:
 email:
 - tomo.asleep@gmail.com
@@ -61,8 +61,8 @@ files:
 - lib/ruboty/openai_chat/actions/chat.rb
 - lib/ruboty/openai_chat/actions/remember_profile.rb
 - lib/ruboty/openai_chat/actions/show_profile.rb
-- lib/ruboty/openai_chat/dialog.rb
 - lib/ruboty/openai_chat/memory.rb
+- lib/ruboty/openai_chat/message.rb
 - lib/ruboty/openai_chat/version.rb
 - ruboty-openai_chat.gemspec
 homepage: https://github.com/tomoasleep/ruboty-openai_chat

data/lib/ruboty/openai_chat/dialog.rb

@@ -1,53 +0,0 @@
-# frozen_string_literal: true
-
-module Ruboty
-  module OpenAIChat
-    class Dialog
-      STOP_SEQUENCES = [">> Human: ", ">> AI: "].freeze
-      STOP_SEQUENCE_PATTERN = />> (Human|AI): /.freeze
-
-      # @return [String]
-      attr_reader :human_comment, :ai_comment
-
-      # @return [Time]
-      attr_reader :expire_at
-
-      def self.from_hash(hash)
-        new(**hash.transform_keys(&:to_sym))
-      end
-
-      # @param human_comment [String]
-      # @param ai_comment [String]
-      # @param expire_at [Time, Integer, nil]
-      def initialize(human_comment:, ai_comment:, expire_at: nil)
-        @human_comment = human_comment
-        @ai_comment = ai_comment
-        @expire_at = expire_at&.yield_self { |t| Time.at(t) }
-      end
-
-      # @return [String]
-      def to_prompt
-        <<~STRING
-          >> Human: #{escape(human_comment).chomp}
-          >> AI: #{escape(ai_comment).chomp}
-        STRING
-      end
-
-      # @return [Hash]
-      def to_h
-        { human_comment: human_comment, ai_comment: ai_comment, expire_at: expire_at&.to_i }
-      end
-
-      # @return [Boolean]
-      def expired?
-        expire_at && (expire_at <= Time.now)
-      end
-
-      private
-
-      def escape(text)
-        text.gsub(STOP_SEQUENCE_PATTERN, &:downcase)
-      end
-    end
-  end
-end