chatgpt2023 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fa6c7ff39ad8b06d1908bdeafe1e7e695f2b49fc4a7b5c0f1fc3436bae550ca
-  data.tar.gz: 507e44dc68538096b23ac3d3cd17e1e6ce3e6ceabdc78469f872731c18a9cd95
+  metadata.gz: d76a15a250b67bab6e676ed5c18131cde6310d9c5ace84921e8113c21b4c180f
+  data.tar.gz: bbdce3b4c8ba915e55f3b440da3fc368d90ad6a0555ae1ebf8e6065e44061bd3
 SHA512:
-  metadata.gz: 28e5169a1d13568bcdbe83c677d125e1a0aa275318f41aabbd8acdee6376f28f0dfda6a56de4604e273d8d3d6fe18883172c556636be5fb726a79223e70a638d
-  data.tar.gz: 4d1e69b95f4c16c181426926ffde1d9b4d46cc97f59b8478fee5964a0d2bc216ac6f7bd5f5aeb4076154ed2b6e82ebbe083499351e978969a16f7c3905faad2c
+  metadata.gz: fb2c05d8493193771ae4480dfa340af843c4c73ae497cc03aa9504c5c9fbb5c30456df7c5c37db26f68bba3419ca41447d4e8436b7aab9b060bcce2160fd6254
+  data.tar.gz: b2c4d4292b30a127935de35156cd48b50ae7c5890e2c5cbe0e6e5f37bf56641db73bb136ee6a2a3d88b8227aacc05f8041281347920d0da7a54d2b9f6a899171

data/lib/chatgpt2023.rb

@@ -39,15 +39,62 @@ end
 
 class ChatGpt2023
   
+  attr_accessor :assistant_recent
+  
   def initialize(apikey: nil, attempts: 1, debug: false)
     
     @apiurl = "https://api.openai.com/v1"
     
     raise 'You must supply an API key!' unless apikey
     @apikey, @attempts, @debug = apikey, attempts, debug
+    @assistant_recent = nil
     
   end
   
+  
+  # CURL example
+  # curl https://api.openai.com/v1/chat/completions \
+  # -H 'Content-Type: application/json' \
+  # -H 'Authorization: Bearer YOUR_API_KEY' \
+  # -d '{
+  # "model": "gpt-3.5-turbo",
+  # "messages": [{"role": "user", "content": "Hello!"}]
+  # }'
+  
+  # Ruby example
+
+  # require 'chatgpt2023'
+
+  # c = ChatGpt2023.new(apikey: YOUR_API_KEY)
+  # r = c.chat 'who is Burt Reynolds?'
+  # r2 = c.chat 'what age was he?'
+  # r3 = c.chat 'did he have family?'  
+  #
+  
+  def chat(s, temperature: 1, max_tokens: 3900)
+    r = chats(s, temperature: temperature, max_tokens: max_tokens)
+    return r if r.is_a?(Hash) 
+    return {text: r.first[:message][:content].strip}
+  end
+  
+  def chats(s=nil, messages: [], temperature: 1, max_tokens: 3900, n: 1)
+    
+    messages << @assistant_recent if @assistant_recent
+    messages << {'role' => 'user', 'content' => s } if s
+    r = go_chat(messages, temperature: temperature, 
+                       max_tokens: max_tokens, n: n)        
+    
+    puts 'chat/completions r: ' + r.inspect if @debug
+    
+    if r[:error] then r
+      r
+    else
+      @assistant_recent = r[:choices].first[:message]
+      r[:choices]
+    end
+    
+  end  
+  
   # Example
   # c = ChatGpt2023.new(apikey: 'yourapikey')
   # s = '
@@ -56,19 +103,20 @@ class ChatGpt2023
   # '
   # r = c.code_completions s, temperature: 0.2
   # puts r.first[:text]
-  
+  #
   def code_completions(s, temperature: 1, max_tokens: 32, n: 1)
     
     r = go_code(s, temperature: temperature, 
                        max_tokens: max_tokens, n: n)
     puts 'code r: ' + r.inspect if @debug
-    r[:choices]
+    r[:error] ? r : r[:choices]
     
   end
 
   def code_completion(s, temperature: 1, max_tokens: 32)
-    code_completions(s, temperature: temperature, max_tokens: max_tokens)\
-        .first[:text].strip
+    r = code_completions(s, temperature: temperature, max_tokens: max_tokens)
+    return r if r.is_a?(Hash) 
+    return {text: r.first[:text].strip}
   end  
   
   def completions(s, temperature: 1, max_tokens: 32, n: 1)
@@ -76,17 +124,18 @@ class ChatGpt2023
     r = go_completions(s, temperature: temperature, 
                        max_tokens: max_tokens, n: n)
     puts 'completions r: ' + r.inspect if @debug
-    r[:choices]
+    r[:error] ? r : r[:choices]
     
   end
   
   def completion(s, temperature: 1, max_tokens: 32)
-    completions(s, temperature: temperature, max_tokens: max_tokens)\
-        .first[:text].strip
+    r = completions(s, temperature: temperature, max_tokens: max_tokens)
+    return r if r.is_a?(Hash) 
+    return {text: r.first[:text].strip}
   end
   
   alias complete completion
-  alias ask completion
+  alias ask chat
   
   def edits(s, s2)
     r = go_edits(s, s2)
@@ -109,6 +158,20 @@ class ChatGpt2023
   
   private
   
+  def go_chat(messages=[], temperature: 0, max_tokens: 4096, n: 1)
+
+    h = {      
+      "model" => 'gpt-3.5-turbo',
+      "messages" => messages,
+      "temperature" => temperature,
+      "max_tokens" => max_tokens,
+      "n" => n
+    }    
+    
+    submit('chat/completions', h)    
+    
+  end  
+  
   def go_code(s, temperature: 0, max_tokens: 7, n: 1)
 
     h = {
@@ -209,7 +272,7 @@ class ChatGpt2023
     
     end while h.has_key?(:error) and attempts < @attempts
         
-    raise ChatGpt2023Error, h[:error][:message].inspect if h.has_key? :error
+    #raise ChatGpt2023Error, h[:error][:message].inspect if h.has_key? :error
     
     return h
   end
@@ -222,10 +285,10 @@ class CGRecorder <  ChatGpt2023
   
   def initialize(apikey: nil, indexfile: 'cgindex.xml', 
                  logfile: 'chatgpt.xml', attempts: 1, debug: false)
-    
+
     super(apikey: apikey, attempts: attempts, debug: debug)
     @dx = DynarexDaily.new filename: logfile, fields: %i(prompt result), 
-        autosave: true, order: 'descending', debug: false
+        autosave: true, order: 'descending', debug: debug
     @index = Dynarex.new(indexfile, schema: 'entries[title]/entry(prompt, ' \
       + 'tags)', order: 'descending', autosave: true)
     title = 'ChatGPT prompt log'
@@ -235,9 +298,8 @@ class CGRecorder <  ChatGpt2023
   
   def code_completion(s, tags=nil, temperature: 1, max_tokens: 2000)
     
-    r = code_completions(s, temperature: temperature, max_tokens: max_tokens)\
-        .first[:text].strip
-    log(s, r, tags)
+    r = super(s, temperature: temperature, max_tokens: max_tokens)    
+    log(s, r[:text].strip, tags) unless r[:error]
     
     return r
     
@@ -245,9 +307,9 @@ class CGRecorder <  ChatGpt2023
 
   def completion(s, tags=nil, temperature: 1, max_tokens: 1000)
     
-    r = completions(s, temperature: temperature, max_tokens: max_tokens)\
-        .first[:text].strip
-    log(s, r, tags)
+    r = super(s, temperature: temperature, max_tokens: max_tokens)
+    puts 'CGRecorder inside completion: ' + r.inspect if @debug
+    log(s, r[:text].strip, tags) unless r[:error]
     
     return r
     
@@ -269,7 +331,7 @@ end
 class ChatAway
   
   # statement below used for debugging
-  #attr_reader :dx, :prompts
+  attr_reader :dx, :prompts
   
   def initialize(questions, apikey: nil, filepath: '/tmp/chatgpt', debug: false)
     
@@ -278,42 +340,99 @@ class ChatAway
     FileUtils.mkdir_p filepath
     idxfile = File.join(filepath, 'index.xml')
     cgfile =  File.join(filepath, 'chatgpt.xml')
-    
-    @dx = questions.is_a?(Dynarex) ? questions : Dynarex.new(questions)
-    @chat = CGRecorder.new(apikey: apikey, indexfile: idxfile, logfile: cgfile, attempts: 5)
+
+    puts 'questions: ' + questions.inspect if @debug
+    @dx = case questions.class.to_s.to_sym
+    when :Dynarex
+      questions
+    when :String
+      questions.lines.length < 2 ? Dynarex.new(questions) : import(questions)
+    end
+    
+    @chat = CGRecorder.new(apikey: apikey, indexfile: idxfile, 
+                           logfile: cgfile, attempts: 5, debug: @debug)
     @prompts = @chat.index.all.map(&:prompt)
     
-  end
+    @mode = nil
+    
+  end 
   
-  def start()
+  def start()        
     
-    @dx.all.each do |rx|
+    @dx.all.map do |rx|
       
-        if @prompts.include?(rx.prompt) and rx.redo != 'true'
-          next 
-        end
-        
-        type = rx.type == 'code' ? :code_completion : :completion
+      puts 'rx: ' + rx.inspect if @debug
+      
+      #if (@prompts.include?(rx.prompt) and rx.redo != 'true') \
+      #    or @mode != :import
+      #  next 
+      #end
+      
+      type = rx.type == 'code' ? :code_completion : :completion
+      
+      prompt = rx.prompt
+      
+      puts 'prompt: ' + prompt
+
+      attempts = 0
+      reply = nil
+      
+      begin
         
-        prompt = rx.prompt
+        r = @chat.method(type).call prompt
         
-        puts 'prompt: ' + prompt
-
-        attempts = 0
+        puts 'r: ' + r.inspect if @debug
         
-        begin
-          r = @chat.method(type).call prompt
-        rescue
-          puts 'Something not working! ' + ($!).inspect
+        if r[:error] then
+          
+          puts r[:error][:text]
           sleep 2
           attempts += 1
-          retry if attempts < 4 
+          
+          redo if attempts < 4             
+          
+        else
+          reply = r[:text]
         end
         
+      rescue
+        
+        puts 'Something not working! ' + ($!).inspect
         sleep 2
+        attempts += 1
+        
+        retry if attempts < 4 
+        
+      ensure
+        
+        reply ||= ''
+        
+      end
+      
+      sleep 2
+      
+      reply
         
     end    
     
   end
   
+  private
+  
+  
+  def import(s)
+
+    @mode = :import
+    puts 'inside import' if @debug
+    
+    header = '<?dynarex schema="prompts/entry(prompt, type, redo)" delimiter=" # "?>
+--+ 
+'
+
+    s2 = header + s.strip.lines.map {|line| 'p: ' + line }.join("\n")
+
+    Dynarex.new(s2)
+    
+  end   
+  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chatgpt2023
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - James Robertson
@@ -36,7 +36,7 @@ cert_chain:
   6FQD1/GISew7VvxUJdptXeuVNIsdNKxvL3RpfLCuFsi1WXyJ4k3odRMTmS0kAfTy
   J4sZZW9RNfabTMQQY7DIs3tUAn6i+O0r9lo=
   -----END CERTIFICATE-----
-date: 2023-02-15 00:00:00.000000000 Z
+date: 2023-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down