chatgpt-rb 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c3a20f294a53407477460d0bcf1efc53524a4986cf1129c365f597a93766adc
-  data.tar.gz: 75999a3494afb6b8726a1510c6e16ec29e8dc55015212175befef7f5fac3a766
+  metadata.gz: 1219489ab15f01f9161fc6c6ab35e5212c6851079559b7ae65303d7913e309af
+  data.tar.gz: 3c6951ea51ef8b71a25dc3c61ee5c6368f4c0f38bfc99e5f6d70782b43bf45e6
 SHA512:
-  metadata.gz: 5a4aaa0890191fdd4c4b5221c49a3ce094e4d69f0ffd699207fa8987515fb4e12dd6ffcb349cd2015205e99ee65660b57c72f7c8c05e6a471703d557f50dbcaa
-  data.tar.gz: 409b9eb640141bdd46ebbaf8b131c43b8f72d6e1e3b4da75c0f729ff9cf5bba1cb2b87a2536ddcf4fc906f6008f360a8694a5029ba57f43d55263f08783e10c6
+  metadata.gz: 29b1ce40f4cf7c5e88f710fed4eb7c47468fd92f5f053e2321bfa207de58c370ad67aaeac41f79b3264b50596cac48eb00d350fb81600756ff7562704b46374c
+  data.tar.gz: fef058d0addadd83568529d5b96544a4ead59dfac7878d200cdf506ac65f3c89f0e6ca32d70f0fe9d2a4eaff264131ffe30d7af18b17a293f3f2f10cf7e90f31

data/bin/chatgpt-rb

@@ -14,6 +14,8 @@ options = {
   temperature: 0.7,
 }
 
+SAVE_COMMAND_PATTERN = /sa?v?e? (.+)/.freeze
+
 OptionParser.new do |opts|
   opts.banner = "Usage: chatgpt-rb [options]"
 
@@ -74,32 +76,36 @@ begin
 
   commands = [
     {
-      names: ["s", "save"],
+      names: ["s", "save", SAVE_COMMAND_PATTERN],
       description: "Save this conversation to a JSON file that can be reloaded later with the `-f` argument",
-      implementation: ->() {
-        filename = /^\\save (.+)/.match(message)[1]
-        File.open(filename, "w") { |f| f.write(conversation.messages.to_json) }
-        puts "saved to #{filename} ".colorize(:blue)
+      implementation: ->(message) {
+        filename = if message =~ SAVE_COMMAND_PATTERN
+          SAVE_COMMAND_PATTERN.match(message)[1]
+        else
+          "conversation_#{Time.now.iso8601}.json"
+        end
+        File.open(filename, "w") { |f| f.write(conversation.to_json) }
+        puts "saved to #{filename}".colorize(:blue)
       }
     },
     {
       names: ["q", "quit", "exit"],
       description: "Exit the program",
-      implementation: ->() {
+      implementation: ->(_) {
         exit
       }
     },
     {
       names: ["d", "dump"],
       description: "Print out all messages in this converastion.",
-      implementation: ->() {
+      implementation: ->(_) {
         puts "dump> ".colorize(:blue) + conversation.messages.to_json
       }
     },
     {
       names: ["f", "functions"],
       description: "List all available functions.",
-      implementation: ->() {
+      implementation: ->(_) {
         puts "available functions:".colorize(:blue)
         functions.each do |function|
           puts "- `#{function.name}` #{function.description}".colorize(:blue)
@@ -109,7 +115,7 @@ begin
     {
       names: ["h", "help"],
       description: "List all commands and their description",
-      implementation: ->() {
+      implementation: ->(_) {
         puts commands.map { |command| "  - #{command[:names].map { |str| "`\\#{str}`".colorize(:yellow) }.join(", ")}: #{command[:description].colorize(:blue)}" }.join("\n")
       }
     }
@@ -117,8 +123,8 @@ begin
 
   while message = Reline.readline("me> ".colorize(:red), true) do
     input = message.chomp
-    if (command = commands.find { |command| command[:names].any? { |name| "\\#{name}" == input } })
-      command[:implementation].call
+    if (command = commands.find { |command| command[:names].any? { |name| name.is_a?(Regexp) ? input =~ name : "\\#{name}" == input } })
+      command[:implementation].call(message)
     else
       print("ai> ".colorize(:yellow))
       conversation.ask(message) { |fragment| print(fragment) }

data/lib/chatgpt_rb/conversation.rb

@@ -1,3 +1,4 @@
+require "json"
 require "httparty"
 require "json-schema"
 require_relative "./function"
@@ -5,7 +6,7 @@ require_relative "./dsl/conversation"
 
 module ChatgptRb
   class Conversation
-    attr_accessor :api_key, :model, :functions, :temperature, :max_tokens, :top_p, :frequency_penalty, :presence_penalty, :prompt, :base_uri
+    attr_accessor :api_key, :model, :functions, :temperature, :max_tokens, :top_p, :frequency_penalty, :presence_penalty, :prompt, :base_uri, :seed, :json
     attr_reader :messages
 
     # @param api_key [String]
@@ -18,8 +19,10 @@ module ChatgptRb
     # @param presence_penalty [Float]
     # @param messages [Array<Hash>]
     # @param prompt [String, nil] instructions that the model can use to inform its responses, for example: "Act like a sullen teenager."
+    # @param json [true, false] whether or not ChatGPT should respond using only JSON objects
+    # @param seed [Integer, nil] deterministic best effort
     # @param base_uri [String]
-    def initialize(api_key: nil, model: "gpt-3.5-turbo", functions: [], temperature: 0.7, max_tokens: 1024, top_p: 1.0, frequency_penalty: 0.0, presence_penalty: 0.0, messages: [], prompt: nil, base_uri: "https://api.openai.com/v1", &configuration)
+    def initialize(api_key: nil, model: "gpt-3.5-turbo", functions: [], temperature: 0.7, max_tokens: 1024, top_p: 1.0, frequency_penalty: 0.0, presence_penalty: 0.0, messages: [], prompt: nil, base_uri: "https://api.openai.com/v1", json: false, seed: nil, &configuration)
       @api_key = api_key
       @model = model
       @functions = functions.each_with_object({}) do |function, hash|
@@ -42,10 +45,16 @@ module ChatgptRb
       @messages = messages.map { |message| message.transform_keys(&:to_sym) }
       @prompt = prompt
       @base_uri = base_uri
+      @json = json
+      @seed = seed
       ChatgptRb::DSL::Conversation.configure(self, &configuration) if block_given?
       @messages.unshift(role: "system", content: prompt) if prompt
     end
 
+    def to_json
+      messages.to_json
+    end
+
     # @param content [String]
     # @yieldparam [String] the response, but streamed
     # @return [String] the response
@@ -67,17 +76,10 @@ module ChatgptRb
 
     private
 
-    def <<(message)
-      @messages << message
-    end
-
     # Ensure that each function's argument declarations conform to the JSON Schema
     # See https://github.com/voxpupuli/json-schema/
     def validate_functions!
-      metaschema = JSON::Validator.validator_for_name("draft4").metaschema
-      functions.values.each do |function|
-        raise ArgumentError, "Invalid function declaration for #{function.name}: #{function.as_json}" unless JSON::Validator.validate(metaschema, function.as_json)
-      end
+      functions.values.each(&:validate!)
     end
 
     def get_next_response(&block)
@@ -87,6 +89,7 @@ module ChatgptRb
       streamed_arguments = ""
       streamed_role = ""
       streamed_function = ""
+      streamed_tool_calls = ""
       error_buffer = []
 
       body = {
@@ -99,7 +102,9 @@ module ChatgptRb
         presence_penalty:,
         stream: block_given?,
       }.tap do |hash|
-        hash[:functions] = functions.values.map(&:as_json) unless functions.empty?
+        hash[:tools] = functions.values.map(&:as_json) unless functions.empty?
+        hash[:response_format] = { type: :json_object } if json
+        hash[:seed] = seed unless seed.nil?
       end
 
       response = HTTParty.post(
@@ -140,6 +145,8 @@ module ChatgptRb
               streamed_content << content
             elsif arguments = json.dig("choices", 0, "delta", "function_call", "arguments")
               streamed_arguments << arguments
+            elsif tool_calls = json.dig("choices", 0, "delta", "tool_calls")
+              streamed_tool_calls << tool_calls
             end
           rescue => e
             error_buffer << "Error: #{e}"
@@ -155,12 +162,30 @@ module ChatgptRb
                      { content: streamed_content, role: streamed_role }
                    elsif block_given? && streamed_arguments != ""
                      { role: "assistant", content: nil, function_call: { "name" => streamed_function, "arguments" => streamed_arguments } }
+                   elsif block_given? && streamed_tool_calls != ""
+                     { role: "assistant", content: nil, tool_calls: streamed_tool_calls }
                    else
                      response.dig("choices", 0, "message").transform_keys(&:to_sym)
                    end
 
       if @messages.last[:content]
-        @messages.last[:content]
+        json ? JSON.parse(@messages.last[:content]) : @messages.last[:content]
+      elsif @messages.last[:tool_calls]
+        @messages.last[:tool_calls].each do |tool_call|
+          next unless tool_call.fetch("type") == "function"
+          function_name = tool_call.dig("function", "name")
+          function_args = JSON.parse(tool_call.dig("function", "arguments"))
+          function = functions.fetch(function_name)
+          content = function.implementation.call(**function_args.transform_keys(&:to_sym))
+          @messages << {
+            role: "tool",
+            tool_call_id: tool_call.fetch("id"),
+            name: function_name,
+            content: content.to_json,
+          }
+        end
+
+        get_next_response(&block)
       elsif @messages.last[:function_call]
         function_args = @messages.last[:function_call]
         function_name = function_args.fetch("name")

data/lib/chatgpt_rb/dsl/conversation.rb

@@ -5,7 +5,7 @@ require_relative "../function"
 module ChatgptRb
   module DSL
     class Conversation < Base
-      supported_fields %i[api_key model functions temperature max_tokens top_p frequency_penalty presence_penalty prompt]
+      supported_fields %i[api_key model functions temperature max_tokens top_p frequency_penalty presence_penalty prompt json seed]
 
       # @param name [String] the name of the function
       # @param configuration [Block]

data/lib/chatgpt_rb/function.rb

@@ -13,19 +13,29 @@ module ChatgptRb
       @implementation = implementation
     end
 
+    def validate!
+      metaschema = JSON::Validator.validator_for_name("draft4").metaschema
+      return if JSON::Validator.validate(metaschema, as_json[:function])
+
+      raise ArgumentError, "Invalid function declaration for #{name}: #{as_json[:function]}"
+    end
+
     # @return [Hash]
     def as_json
       {
-        name:,
-        description:,
-        parameters: {
-          type: "object",
-          properties: parameters.each_with_object({}) do |parameter, hash|
-            hash[parameter.name] = parameter.as_json
-          end,
-          required: parameters.select(&:required?).map(&:name),
-        },
-      }.compact
+        type: "function",
+        function: {
+          name:,
+          description:,
+          parameters: {
+            type: "object",
+            properties: parameters.each_with_object({}) do |parameter, hash|
+              hash[parameter.name] = parameter.as_json
+            end,
+            required: parameters.select(&:required?).map(&:name),
+          },
+        }.compact
+      }
     end
   end
 end

data/lib/chatgpt_rb/version.rb

@@ -1,3 +1,3 @@
 module ChatgptRb
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatgpt-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Aaron Breckenridge
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-05 00:00:00.000000000 Z
+date: 2023-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -123,7 +123,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Provides libraries for interacting with the ChatGPT API and a CLI program
-  `chatgpt-rb` for live conversations. Supports writing functions in Ruby.
+  `chatgpt-rb` for live conversations. Supports writing tools (functions) in Ruby
+  and streaming responses.
 email:
 - aaron@breckridge.dev
 executables:
@@ -146,7 +147,7 @@ homepage: https://github.com/breckenedge/chatgpt-rb
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -161,8 +162,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.4.21
+signing_key: 
 specification_version: 4
 summary: A gem for interacting with the ChatGPT API
 test_files: []