monadic-chat 0.3.7 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2256497e5cedc7850024f7ed9a8b8ec7d9b6cef546d2d20fea7feac024689012
-  data.tar.gz: 288b0fa1ceb0367d8c0758b98d1397f307a4926add65ab532867b131968f89d1
+  metadata.gz: 73e7b781492fab243c740ffe311a90291b2c5197e90b41b0a2972e7339aeba0d
+  data.tar.gz: b2abac3f0925214f36d7eb64d19796bfb923b910e32d29031751822855fc629d
 SHA512:
-  metadata.gz: cfae3022ccca777f643a122d73e14044963392044bbf26f4833010296fb73d12f86d960d349e480089aa3c734d91ef1ee2415be592a2aa3fa11360e5c90ade23
-  data.tar.gz: 58347893d5ae84aa9374acef3e52421e0f6abf06e9fde78ed9ebbbd8ef57dfb5d6da705b3348a56fc90d4903dbc33c50e3e5330c2c275e5da083bf61705cb982
+  metadata.gz: 107f07c41b2a40905ee32319f455b1da03a65d7270831f5810be75dd9800dbe905ed61aba0aac00b9018f54d5d978e90f2b01a6e9d6b1bfeff00c35286a7d6e5
+  data.tar.gz: 48098f9dac1512feea8fc8d23bfaa15ac33e669e3989465751e7676e2924630f34fe11db6806d8723cf70ecd8e4132342335d34df6469bd7c21f6d07e6204067

data/CHANGELOG.md

@@ -39,3 +39,10 @@
 
 - Default model changed to `gpt-3.5-turbo-0613`
 - Stability improvement
+
+## [0.4.0] - 2023-11-10
+
+- Default model changed to `gpt-3.5-turbo`
+- Support for OpenAI's latest models
+- Missing character issue addressed
+- API access timeout/retry mechanism improved

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    monadic-chat (0.3.7)
+    monadic-chat (0.4.0)
       blingfire
       http
       kramdown

data/README.md

@@ -27,6 +27,7 @@
 
 **Change Log**
 
+- [November 10, 2023] Stability improvement; default model changed to `gpt-3.5-turbo`
 - [October 07, 2023] Stability improvement; default model changed to `gpt-3.5-turbo-0613`
 - [June 11, 2023] The repository renamed to `monadic-chat-cli`
 - [April 05, 2023] `Wikipedia` app added (experimental)
@@ -303,13 +304,13 @@ Monadic Chat has two modes. The `normal` mode utilizes OpenAI's chat API to achi
 
 ### Normal Mode
 
-The current default language model for `normal` mode is `gpt-3.5-turbo-613`.
+The current default language model for `normal` mode is `gpt-3.5-turbo`.
 
 In the default configuration, the dialogue messages are reduced after ten turns by deleting the oldest ones (but not the messages that the `system` role has given as instructions).
 
 ### Research Mode
 
-The current default language model for `research` mode is `gpt-3.5-turbo-0613`.
+The current default language model for `research` mode is `gpt-3.5-turbo`.
 
 In `research` mode, the conversation between the user and the large-scale language model is accomplished with a mechanism that tracks the conversation history in a monadic structure. In the default configuration, the dialogue messages are reduced after ten turns by deleting the oldest ones (but not the messages that the `system` role has given as instructions).
 

data/lib/monadic_chat/open_ai.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 
 require "http"
 require "oj"
@@ -9,27 +9,43 @@ require "tty-progressbar"
 
 Oj.mimic_JSON
 
+OPEN_TIMEOUT = 10
+RETRY_MAX_COUNT = 10
+RETRY_WAIT_TIME_SEC = 1
+
 module OpenAI
   def self.default_model(research_mode: false)
     if research_mode
-      "gpt-3.5-turbo-0613"
+      "gpt-3.5-turbo"
     else
-      "gpt-3.5-turbo-0613"
+      "gpt-3.5-turbo"
     end
   end
 
   def self.model_to_method(model)
-    {
-      "gpt-3.5-turbo-instruct" => "completions",
+    res = {
+      "gpt-3.5-turbo-1106" => "chat/completions",
+      "gpt-3.5-turbo" => "chat/completions",
+      "gpt-3.5-turbo-16k" => "chat/completions",
+      "gpt-4-1106-preview" => "chat/completions",
       "gpt-4" => "chat/completions",
       "gpt-4-0613" => "chat/completions",
       "gpt-4-32K" => "chat/completions",
       "gpt-4-32k-0613" => "chat/completions",
-      "gpt-3.5-turbo" => "chat/completions",
       "gpt-3.5-turbo-0613" => "chat/completions",
-      "gpt-3.5-turbo-16k" => "chat/completions",
       "gpt-3.5-turbo-16k-0613" => "chat/completions"
     }[model]
+    if res.nil?
+      puts ""
+      puts "============================================================="
+      puts "Model #{model} not found."
+      puts "Maybe you are trying to use a model not available any more."
+      puts "Check your monadic_chat.conf and try again."
+      puts "============================================================="
+      puts ""
+      exit 1
+    end
+    res
   end
 
   def self.query(access_token, mode, method, timeout_sec = 60, query = {}, &block)
@@ -41,49 +57,59 @@ module OpenAI
     headers["Accept"] = "text/event-stream" if query["stream"]
     http = HTTP.headers(headers)
 
+    timeout_settings = {
+      connect: OPEN_TIMEOUT,
+      write: timeout_sec,
+      read: timeout_sec
+    }
+
     case mode
     when "post"
-      res = http.timeout(timeout_sec).post(target_uri, json: query)
+      res = http.timeout(timeout_settings).post(target_uri, json: query)
     when "get"
-      res = http.timeout(timeout_sec).get(target_uri)
+      res = http.timeout(timeout_settings).get(target_uri)
     end
 
     if query["stream"]
       json = nil
+      buffer = ""
+      break_flag = false
       res.body.each do |chunk|
-        chunk.scan(/data: (\{.*\})/i).flatten.each do |data|
-          content = data.strip
-          break if content == "[DONE]"
-
-          begin
-            stream = JSON.parse(content)
-          rescue JSON::ParserError
-            next
-          end
-
-          fragment = case method
-                     when "completions"
-                       stream["choices"][0]["text"]
-                     when "chat/completions"
-                       stream["choices"][0]["delta"]["content"] || ""
-                     end
-          block&.call fragment
-          if !json
-            json = stream
-          else
-            case method
-            when "completions"
-              json["choices"][0]["text"] << fragment
-            when "chat/completions"
-              json["choices"][0]["text"] ||= +""
-              json["choices"][0]["text"] << fragment
+        break if break_flag
+
+        buffer << chunk
+        break_flag = true if /\Rdata: [DONE]\R/ =~ buffer
+        scanner = StringScanner.new(buffer)
+        pattern = /data: (\{.*?\})(?=\n|\z)/m
+        until scanner.eos?
+          matched = scanner.scan_until(pattern)
+          if matched
+            json_data = matched.match(pattern)[1]
+
+            begin
+              res = JSON.parse(json_data)
+              choice = res.dig("choices", 0) || {}
+              fragment = choice.dig("delta", "content").to_s
+
+              block&.call fragment
+              if !json
+                json = res
+              else
+                json["choices"][0]["text"] ||= +""
+                json["choices"][0]["text"] << fragment
+              end
+
+              break if choice["finish_reason"] == "length" || choice["finish_reason"] == "stop"
+            rescue JSON::ParserError
+              res = { "type" => "error", "content" => "Error: JSON Parsing" }
+              pp res
+              block&.call res
+              res
             end
+          else
+            buffer = scanner.rest
+            break
           end
-        rescue JSON::ParserError
-          res = { "type" => "error", "content" => "Error: JSON Parsing" }
-          pp res
-          block&.call res
-          res
         end
       end
       json
@@ -97,6 +123,17 @@ module OpenAI
         res
       end
     end
+  rescue HTTP::Error, HTTP::TimeoutError
+    if num_retrial < MAX_RETRIES
+      num_retrial += 1
+      sleep RETRY_DELAY
+      retry
+    else
+      res = { "type" => "error", "content" => "Error: Timeout" }
+      pp res
+      block&.call res
+      res
+    end
   end
 
   def self.models(access_token)

data/lib/monadic_chat/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MonadicChat
-  VERSION = "0.3.7"
+  VERSION = "0.4.0"
 end

data/lib/monadic_chat.rb

@@ -27,8 +27,8 @@ Oj.mimic_JSON
 
 module MonadicChat
   SETTINGS = {
-    "normal_model" => "gpt-3.5-turbo-0613",
-    "research_model" => "gpt-3.5-turbo-0613",
+    "normal_model" => "gpt-3.5-turbo",
+    "research_model" => "gpt-3.5-turbo",
     "max_tokens_wiki" => 1000,
     "num_retrials" => 2,
     "min_query_size" => 5,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monadic-chat
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.4.0
 platform: ruby
 authors:
 - yohasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-07 00:00:00.000000000 Z
+date: 2023-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler