chatgpt-rb 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ccefcb04218cda4636349cd9576030b42c7106d0d00fd9aadbbd2bc508678c0a
-  data.tar.gz: 10044ebaa750c3a1dae7a9b484abb7ad5d4ef9e6a9a9797a51286f57f077e2d5
+  metadata.gz: 4833d50d716b3f34e13dc2936f3b837ff0346ecfe35d42c2755f1c0d48989883
+  data.tar.gz: c2220ac57c216ea81125552274e65567b4076b127acdc1d62a54daaa427a665f
 SHA512:
-  metadata.gz: 41d2d11e8eeedfc065483d19c19c495d480954c99a98ac3256ec0a76a079562ab9f8524f654aa2fc238c4f867e02a8d1f5520f34ee9b510d5f97075f17e27c4e
-  data.tar.gz: 9dff14b6052aae029620e5d7e1f75ada65cf91418dcaada97c5231f799f183f90c851ea706bd4b76b681e4202e05b6bf302bef1aee84f92a98d2546756d5a930
+  metadata.gz: dc3972ef878ce27bb6576bbc7fcc9e39cbdb364abfa35b762fd7bb2e77b4d025389300630953c8ea8e1d88b7d57af7979116a4af1b63639ddaf3ecd7ad16adee
+  data.tar.gz: 8bb0f8541137f062bdbf716cb1de37114186caaa4d0bcd279ac4cda0d892698b454862af25f923dc854a870defef2425a3c891c5df5fcfd4a222e82e006d39be

data/bin/chatgpt-rb

@@ -6,11 +6,6 @@ require "reline"
 require "optparse"
 require_relative "./../lib/chatgpt_rb"
 
-begin
-  stty_save = `stty -g`.chomp
-rescue
-end
-
 options = {
   key: ENV["OPEN_AI_KEY"],
   model: "gpt-3.5-turbo",
@@ -47,6 +42,8 @@ OptionParser.new do |opts|
 end.parse!
 
 begin
+  stty_save = `stty -g`.chomp
+
   puts "Type any message to talk with ChatGPT. Type '\\help' for a list of commands."
 
   functions = options[:functions_files].flat_map do |function_file|
@@ -69,27 +66,53 @@ begin
 
   conversation = ChatgptRb::Conversation.new(api_key: options.fetch(:key), model: options.fetch(:model), base_uri: options.fetch(:base_uri), messages:, functions:, prompt: options[:prompt])
 
+  commands = [
+    {
+      names: ["s", "save"],
+      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)
+      }
+    },
+    {
+      names: ["q", "quit", "exit"],
+      description: "Exit the program",
+      implementation: ->() {
+        exit
+      }
+    },
+    {
+      names: ["d", "dump"],
+      description: "Print out all messages in this converastion.",
+      implementation: ->() {
+        puts "dump> ".colorize(:blue) + conversation.messages.to_json
+      }
+    },
+    {
+      names: ["f", "functions"],
+      description: "List all available functions.",
+      implementation: ->() {
+        puts "available functions:".colorize(:blue)
+        functions.each do |function|
+          puts "- `#{function.name}` #{function.description}".colorize(:blue)
+        end
+      }
+    },
+    {
+      names: ["h", "help"],
+      description: "List all commands and their description",
+      implementation: ->() {
+        puts commands.map { |command| "  - #{command[:names].map { |str| "`\\#{str}`".colorize(:yellow) }.join(", ")}: #{command[:description].colorize(:blue)}" }.join("\n")
+      }
+    }
+  ]
+
   while message = Reline.readline("me> ".colorize(:red), true) do
-    case message.chomp
-    when "\\help", "\\h"
-      puts <<~COMMANDS.colorize(:blue)
-        - `\\quit` Exit
-        - `\\save <filename>` Save this conversation to a JSON file that can be reloaded later with the `-f` argument
-        - `\\functions` Get a list of configured functions
-      COMMANDS
-    when "\\q", "\\quit", "\\exit"
-      exit
-    when "\\dump"
-      puts "dump> ".colorize(:blue) + conversation.messages.to_json
-    when "\\functions"
-      puts "available functions:".colorize(:blue)
-      functions.each do |function|
-        puts "- `#{function.name}` #{function.description}".colorize(:blue)
-      end
-    when /^\\save .+/
-      filename = /^\\save (.+)/.match(message)[1]
-      File.open(filename, "w") { |f| f.write(conversation.messages.to_json) }
-      puts "saved to #{filename} ".colorize(:blue)
+    input = message.chomp
+    if (command = commands.find { |command| command[:names].any? { |name| "\\#{name}" == input } })
+      command[:implementation].call
     else
       print("ai> ".colorize(:yellow))
       conversation.ask(message) { |fragment| print(fragment) }

data/lib/chatgpt_rb/conversation.rb

@@ -23,7 +23,15 @@ module ChatgptRb
       @api_key = api_key
       @model = model
       @functions = functions.each_with_object({}) do |function, hash|
-        func = function.is_a?(ChatgptRb::Function) ? function : ChatgptRb::Function.new(**function)
+        func = if function.is_a?(ChatgptRb::Function)
+                 function
+               else
+                 parameters = function.dig(:parameters, :properties)&.map do |name, definition|
+                   required = function.dig(:parameters, :required)&.include?(name)
+                   ChatgptRb::Parameter.new(name:, required:, **definition)
+                 end || []
+                 ChatgptRb::Function.new(parameters:, **function.except(:parameters))
+               end
         hash[func.name] = func
       end
       @temperature = temperature
@@ -139,6 +147,8 @@ module ChatgptRb
         end
       end
 
+      raise APIError.new, response.body unless response.success?
+
       error_buffer.each { |e| $stderr.puts("Error: #{e}") }
 
       @messages << if block_given? && streamed_content != ""
@@ -164,4 +174,7 @@ module ChatgptRb
       end
     end
   end
+
+  # Raised when the API responds with an error.
+  class APIError < StandardError; end
 end

data/lib/chatgpt_rb/version.rb

@@ -1,3 +1,3 @@
 module ChatgptRb
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatgpt-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Aaron Breckenridge
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-08 00:00:00.000000000 Z
+date: 2023-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty