chatgpt2023 0.4.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b89dececa8f5b5da00c97e7e745168c9a0526481f61138a03d5d2b7ff7b4576
-  data.tar.gz: b8d72dc15a1a051493786a53d22ed3a0bf135234bddf5d7d72c1db77a264ed6c
+  metadata.gz: 79e85a14caa0d9f7554af7d2df3faf4356d906ffd32eddbeab97a0ce62588aa6
+  data.tar.gz: 7ed03e8ba40941b21431469711325c9eb20efd5c9374ecfb24e0cdd9d497888b
 SHA512:
-  metadata.gz: 31f3e1e57bbd60a724dff54a8317bd8501d939f797d5dd1bc673b9814f581f313d475d2e43900757057e64e5ab2d6e8106cdf055719c16ae935895f9283a2d81
-  data.tar.gz: 96e1288e2a79d823d18aaeeb6716f7239c26bc956d1a807530cf64a78ead4a162055103256ab7f6352ef56218198b4de01f9e7e6cf2bc83ce3236729d7861862
+  metadata.gz: '0297c587bab1025db945d899437ca0b19a820c2c172a01ea2129de95b09fd773f02bed19e098d8a3c34881c06b4ddfc301a3e38670bce6c35236300494281099'
+  data.tar.gz: f80fc62462f62eeee57b2ed50ff81a76de628fa27bd2733c82ac57b108da6ed5a2b14f6afce5a600353c97d3a3fc8ce574117341fec1b70f38bb29b1fa972f14

data/lib/chatgpt2023.rb

@@ -39,12 +39,12 @@ end
 
 class ChatGpt2023
   
-  def initialize(apikey: nil, debug: false)
+  def initialize(apikey: nil, attempts: 1, debug: false)
     
     @apiurl = "https://api.openai.com/v1"
     
     raise 'You must supply an API key!' unless apikey
-    @apikey, @debug = apikey, debug
+    @apikey, @attempts, @debug = apikey, attempts, debug
     
   end
   
@@ -62,13 +62,14 @@ class ChatGpt2023
     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,13 +77,14 @@ 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
@@ -207,9 +209,9 @@ class ChatGpt2023
         sleep 5
       end
     
-    end while h.has_key?(:error) and attempts <= 5
+    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
@@ -221,9 +223,9 @@ class CGRecorder <  ChatGpt2023
   attr_reader :index
   
   def initialize(apikey: nil, indexfile: 'cgindex.xml', 
-                 logfile: 'chatgpt.xml', debug: false)
-    
-    super(apikey: apikey, debug: debug)
+                 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
     @index = Dynarex.new(indexfile, schema: 'entries[title]/entry(prompt, ' \
@@ -235,9 +237,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)
     
     return r
     
@@ -245,9 +246,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)
     
     return r
     
@@ -269,7 +270,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 +279,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)
+
+    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.0
+  version: 0.4.2
 platform: ruby
 authors:
 - James Robertson
@@ -36,7 +36,7 @@ cert_chain:
   6FQD1/GISew7VvxUJdptXeuVNIsdNKxvL3RpfLCuFsi1WXyJ4k3odRMTmS0kAfTy
   J4sZZW9RNfabTMQQY7DIs3tUAn6i+O0r9lo=
   -----END CERTIFICATE-----
-date: 2023-02-14 00:00:00.000000000 Z
+date: 2023-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: down