chatgpt-rb 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56bfd3ab0a5f56e05e8da9b5f59f7358383ebb1c78214d1afec32c6dd63fa140
-  data.tar.gz: 3361ca43ea603a5634e95793cfff46215751a855e2836a92ba6161c4eb07d3fc
+  metadata.gz: 50e30e865ade9a6e20cad5680617972114a224bda8bf25d9969b9b57e6236763
+  data.tar.gz: e7d1714512f1696b9401018b11292a46ed220c650639521def9b4fa0290303a0
 SHA512:
-  metadata.gz: '09ab2d88f40d4b00eed86b3fbab7ab8fcc9b454f98c6f1ab0ac3b7461f97324f9151563540c9700d6e24d2ba47491ada4e611394453bd9b093ed2c026254f4cb'
-  data.tar.gz: ff8ba450b24f98564a455c5994e8e19a3ad8cc0e85e4e3f14530a65a669e2a964ae8484815c14098fa6160c48e61b24a69f8cb46de4da4b5874d8a191881bb60
+  metadata.gz: a42400a64dee74e93b7b27c8d04fc1f8c750bd0b90abc1ba37c33bdd58cbc9a494906c544b2bb0e02585807fffffbaae9ff3488d328b9bdb3051cc4fbfb59c0b
+  data.tar.gz: 4f187489399450e128b1f5f1634004be8de0a5f4b71516bff12ec234e3cf5cf3498102d6e44081e0e2bd00dc8ad14c1f75ca68770425eac0a7b1e32d284ee6e4

data/bin/watcher

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require "listen"
+
+directory_to_watch = Dir.pwd
+
+listener = Listen.to(directory_to_watch) do |modified, added, removed|
+  system("rspec")
+end
+
+listener.start
+puts "Watching #{directory_to_watch} for changes..."
+
+# Stop the listener when the process is terminated
+Signal.trap("INT") { listener.stop }
+Signal.trap("TERM") { listener.stop }
+sleep

data/lib/chatgpt_rb/conversation.rb

@@ -1,12 +1,19 @@
 require "httparty"
+require_relative "./function"
+require_relative "./dsl/conversation"
 
 module ChatgptRb
   class Conversation
-    attr_reader :api_key, :model, :functions, :temperature, :max_tokens, :top_p, :frequency_penalty, :presence_penalty, :messages
+    include HTTParty
+
+    base_uri "https://api.openai.com"
+
+    attr_accessor :api_key, :model, :functions, :temperature, :max_tokens, :top_p, :frequency_penalty, :presence_penalty, :prompt
+    attr_reader :messages
 
     # @param api_key [String]
     # @param model [String]
-    # @param functions [Array<Hash>]
+    # @param functions [Array<Hash>, Array<ChatgptRb::Function>]
     # @param temperature [Float]
     # @param max_tokens [Integer]
     # @param top_p [Float]
@@ -14,25 +21,43 @@ 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."
-    def initialize(api_key:, 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)
+    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, &configuration)
       @api_key = api_key
       @model = model
-      @functions = functions
+      @functions = functions.each_with_object({}) do |function, hash|
+        func = function.is_a?(ChatgptRb::Function) ? function : ChatgptRb::Function.new(**function)
+        hash[func.name] = func
+      end
       @temperature = temperature
       @max_tokens = max_tokens
       @top_p = top_p
       @frequency_penalty = frequency_penalty
       @presence_penalty = presence_penalty
       @messages = messages
+      @prompt = prompt
+      ChatgptRb::DSL::Conversation.configure(self, &configuration) if block_given?
       @messages << { role: "system", content: prompt } if prompt
     end
 
     # @param content [String]
+    # @yieldparam [String] the response, but streamed
+    # @return [String] the response
     def ask(content, &block)
       @messages << { role: "user", content: }
       get_next_response(&block)
     end
 
+    # @param content [String]
+    # @param function [ChatgptRb::Function] temporarily enhance the next response with the provided function
+    # @yieldparam [String] the response, but streamed
+    # @return [String] the response
+    def ask_with_function(content, function, &block)
+      function_was = functions[function.name]
+      functions[function.name] = function
+      get_next_response(content, &block)
+      functions[function.name] = function_was
+    end
+
     private
 
     def <<(message)
@@ -46,23 +71,29 @@ module ChatgptRb
       streamed_function = ""
       error_buffer = []
 
-      response = HTTParty.post(
-        "https://api.openai.com/v1/chat/completions",
+      body = {
+        model:,
+        messages: @messages,
+        temperature:,
+        max_tokens:,
+        top_p:,
+        frequency_penalty:,
+        presence_penalty:,
+        stream: block_given?,
+      }.tap do |hash|
+        hash[:functions] = functions.values.map(&:as_json) unless functions.empty?
+      end
+
+      response = self.class.post(
+        "/v1/chat/completions",
         steam_body: block_given?,
         headers: {
-          "Content-Type": "application/json",
-          "Authorization": "Bearer #{api_key}",
+          "Content-Type" => "application/json",
+          "Authorization" => "Bearer #{api_key}",
+          "Accept" => "application/json",
+          "User-Agent" => "Ruby/chatgpt-rb",
         },
-        body: {
-          model:,
-          messages: @messages,
-          temperature:,
-          max_tokens:,
-          top_p:,
-          frequency_penalty:,
-          presence_penalty:,
-          stream: block_given?,
-        }.tap { |hash| hash[:functions] = functions.map { |hash| hash.except(:implementation) } unless functions.empty? }.to_json,
+        body: body.to_json,
       ) do |fragment|
         if block_given?
           fragment.each_line do |line|
@@ -113,13 +144,12 @@ module ChatgptRb
         function_args = @messages.last["function_call"]
         function_name = function_args.fetch("name")
         arguments = JSON.parse(function_args.fetch("arguments"))
-
-        function = functions.find { |function| function[:name] == function_name }
-        content = function.fetch(:implementation).call(**arguments.transform_keys(&:to_sym))
+        function = functions[function_name]
+        content = function.implementation.call(**arguments.transform_keys(&:to_sym))
 
         @messages << { role: "function", name: function_name, content: content.to_json }
 
-        get_next_response(functions:, api_key:, model:, temperature:, max_tokens:, top_p:, frequency_penalty:, presence_penalty:, &block)
+        get_next_response(&block)
       end
     end
   end

data/lib/chatgpt_rb/dsl/base.rb

@@ -0,0 +1,29 @@
+module ChatgptRb
+  module DSL
+    class Base
+      # @param object [Chatgpt::Conversation, ChatgptRb::Function, ChatgptRb::Parameter]
+      # @param configuration [Block]
+      # @return [Chatgpt::Conversation, ChatgptRb::Function, ChatgptRb::Parameter]
+      def self.configure(object, &configuration)
+        new(object).instance_eval(&configuration)
+        object
+      end
+
+      attr_reader :object
+
+      # @param object [Chatgpt::Conversation, ChatgptRb::Function, ChatgptRb::Parameter]
+      def initialize(object)
+        @object = object
+      end
+
+      # @param [Array<Symbol>] shorthand for allowing the DSL to set iVars
+      def self.supported_fields(fields)
+        fields.each do |method_name|
+          define_method method_name do |value|
+            object.public_send("#{method_name}=", value)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/chatgpt_rb/dsl/conversation.rb

@@ -0,0 +1,17 @@
+require_relative "./base"
+require_relative "./function"
+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]
+
+      # @param name [String] the name of the function
+      # @param configuration [Block]
+      def function(name, &configuration)
+        object.functions[name] = ChatgptRb::DSL::Function.configure(ChatgptRb::Function.new(name:), &configuration)
+      end
+    end
+  end
+end

data/lib/chatgpt_rb/dsl/function.rb

@@ -0,0 +1,14 @@
+require_relative "../parameter"
+require_relative "./parameter"
+
+module ChatgptRb
+  module DSL
+    class Function < Base
+      supported_fields %i[description implementation parameters]
+
+      def parameter(name, &configuration)
+        object.parameters << ChatgptRb::DSL::Parameter.configure(ChatgptRb::Parameter.new(name:), &configuration)
+      end
+    end
+  end
+end

data/lib/chatgpt_rb/dsl/parameter.rb

@@ -0,0 +1,9 @@
+require_relative "./base"
+
+module ChatgptRb
+  module DSL
+    class Parameter < Base
+      supported_fields %i[description type enum required]
+    end
+  end
+end

data/lib/chatgpt_rb/function.rb

@@ -0,0 +1,31 @@
+module ChatgptRb
+  class Function
+    attr_accessor :name, :description, :parameters, :implementation
+
+    # @param name [String]
+    # @param description [String, nil]
+    # @param parameters [Array<ChatgptRb::Parameter>]
+    # @param implementation [Lambda, nil]
+    def initialize(name:, description: nil, parameters: [], implementation: nil)
+      @name = name
+      @description = description
+      @parameters = parameters
+      @implementation = implementation
+    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
+    end
+  end
+end

data/lib/chatgpt_rb/parameter.rb

@@ -0,0 +1,31 @@
+module ChatgptRb
+  class Parameter
+    attr_accessor :name, :enum, :type, :description, :required
+
+    # @param name [String]
+    # @param enum
+    # @param type
+    # @param description
+    # @param required [true, false] whether or not this parameter is required
+    def initialize(name:, enum: nil, type: nil, description: nil, required: false)
+      @name = name
+      @enum = enum
+      @type = type
+      @description = description
+      @required = required
+    end
+
+    def required?
+      !!required
+    end
+
+    # @return Hash
+    def as_json
+      {
+        enum:,
+        type:,
+        description:,
+      }.compact
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chatgpt-rb
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Aaron Breckenridge
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-07 00:00:00.000000000 Z
+date: 2023-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -66,6 +66,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  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: listen
+  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: webmock
+  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'
 description: Provides libraries for interacting with the ChatGPT API and a CLI program
   `chatgpt-rb` for live conversations.
 email:
@@ -76,8 +118,15 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/chatgpt-rb
+- bin/watcher
 - lib/chatgpt_rb.rb
 - lib/chatgpt_rb/conversation.rb
+- lib/chatgpt_rb/dsl/base.rb
+- lib/chatgpt_rb/dsl/conversation.rb
+- lib/chatgpt_rb/dsl/function.rb
+- lib/chatgpt_rb/dsl/parameter.rb
+- lib/chatgpt_rb/function.rb
+- lib/chatgpt_rb/parameter.rb
 homepage: https://github.com/breckenedge/chatgpt-rb
 licenses:
 - MIT