monadic-chat 0.3.6 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e2cd88bc8efbeb6fcc338449160fd6d100c42b44fa8d178816023fac853926c
-  data.tar.gz: e8ebe92f6b1ba1a4d583ce1d58469bcac453b0633ca5303a0f98cab53bc679ee
+  metadata.gz: 73e7b781492fab243c740ffe311a90291b2c5197e90b41b0a2972e7339aeba0d
+  data.tar.gz: b2abac3f0925214f36d7eb64d19796bfb923b910e32d29031751822855fc629d
 SHA512:
-  metadata.gz: 401e24445a672a6fd451a80a225235d36cd520186918bc34dc9b7c86d9753e1ea0dddab5ecec319c7f1bca99c52024c95052264715715ab7bf54b3c36c9426ac
-  data.tar.gz: cb9e6c76f4086e72f58fbcec7e3c28b5106053c64659e3f7fe6997ceec44e6dfc7f8f07ef5dd5f092580822e84987389f75294f27704815cd48d70cbba87aefb
+  metadata.gz: 107f07c41b2a40905ee32319f455b1da03a65d7270831f5810be75dd9800dbe905ed61aba0aac00b9018f54d5d978e90f2b01a6e9d6b1bfeff00c35286a7d6e5
+  data.tar.gz: 48098f9dac1512feea8fc8d23bfaa15ac33e669e3989465751e7676e2924630f34fe11db6806d8723cf70ecd8e4132342335d34df6469bd7c21f6d07e6204067

data/CHANGELOG.md

@@ -32,5 +32,17 @@
 
 ## [0.3.5] - 2023-04-05
 
-- `Wikipedia` app added (experimental, requires GPT-4)
+- `Wikipedia` app added (experimental)
 - `monadic-chat new/del app_name` command added
+
+## [0.3.7] - 2023-10-08
+
+- 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.5)
+    monadic-chat (0.4.0)
       blingfire
       http
       kramdown
@@ -20,13 +20,13 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.4)
+    addressable (2.8.5)
       public_suffix (>= 2.0.2, < 6.0)
-    blingfire (0.1.8)
+    blingfire (0.2.0)
     diff-lcs (1.5.0)
     domain_name (0.5.20190701)
       unf (>= 0.0.5, < 1.0.0)
-    ffi (1.15.5)
+    ffi (1.16.3)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
@@ -45,26 +45,26 @@ GEM
     llhttp-ffi (0.4.0)
       ffi-compiler (~> 1.0)
       rake (~> 13.0)
-    oj (3.14.3)
+    oj (3.16.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
-    public_suffix (5.0.1)
+    public_suffix (5.0.3)
     rake (13.0.6)
-    rexml (3.2.5)
-    rouge (4.1.0)
+    rexml (3.2.6)
+    rouge (4.1.3)
     rspec (3.12.0)
       rspec-core (~> 3.12.0)
       rspec-expectations (~> 3.12.0)
       rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.1)
+    rspec-core (3.12.2)
       rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.2)
+    rspec-expectations (3.12.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+    rspec-mocks (3.12.6)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.12.0)
-    rspec-support (3.12.0)
+    rspec-support (3.12.1)
     strings (0.2.1)
       strings-ansi (~> 0.2)
       unicode-display_width (>= 1.5, < 3.0)
@@ -101,7 +101,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.8.2)
-    unicode-display_width (2.4.2)
+    unicode-display_width (2.5.0)
     unicode_utils (1.4.0)
     wisper (2.0.1)
 
@@ -116,4 +116,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   2.4.10
+   2.4.17

data/README.md

@@ -27,8 +27,10 @@
 
 **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, requires GPT-4)
+- [April 05, 2023] `Wikipedia` app added (experimental)
 - [April 05, 2023] `monadic-chat new/del app_name` command
 - [April 02, 2023] Architecture refined here and there
 - [March 26, 2023] Command line options to directly run individual apps 

data/apps/chat/chat.md

@@ -12,9 +12,9 @@ JSON:
 
 ```json
 {
+  "mode": "chat",
   "response": "Sure!",
   "summary": "",
-  "mode": "chat",
   "language": "English",
   "topics": [],
   "confidence": 1.00,
@@ -33,6 +33,7 @@ Make sure the following content requirements are all fulfilled: ###
 - update the value of the "ambiguity" property based on the clarity of the user input, ranging from 0.00 (not at all ambiguous, clearly stated) to 1.00 (fully ambiguous, nonsensical)
 - avoid giving a response that is the same or similar to one of the previous responses in MESSAGES
 - program code in the response must be embedded in a code block in the markdown text
+- the output JSON object must contain "mode", "response", "summary", "language", "topics", "confidence", and "ambiguity"
 ###
 
 Make sure the following formal requirements are all fulfilled: ###

data/apps/code/code.md

@@ -10,9 +10,9 @@ JSON:
 
 ```json
 {
+  "mode": "chat",
   "response": "Sure!",
   "summary": "",
-  "mode": "chat",
   "language": "English",
   "topics": []
 }
@@ -27,6 +27,7 @@ Make sure the following content requirements are all fulfilled: ###
 - summarize the user's messages so far and update the "summary" property with a text of fewer than 100 words
 - avoid giving a response that is the same or similar to one of the previous responses in "MESSAGES"
 - program code in the response must be embedded in a code block in the markdown text
+- the output JSON object must contain "mode", "response", "summary", "language", and "topics"
 ###
 
 Make sure the following formal requirements are all fulfilled: ###

data/apps/novel/novel.md

@@ -10,9 +10,9 @@ JSON:
 
 ```json
 {
+  "mode": "novel",
   "response": "What follows is a story that an AI assistant tells. It is guaranteed that this will be an incredibly realistic and interesting novel.",
-  "summary": "",
-  "mode": "novel"
+  "summary": ""
 }
 ```
 
@@ -22,6 +22,7 @@ Make sure the following content requirements are all fulfilled: ###
 - do not repeat in your response what is already told in "MESSAGES"
 - make your response as detailed as possible within the maximum limit of 200 words
 - summarize the user's messages so far and update the "summary" property with a text of fewer than 100 words
+- the output JSON object must contain "mode", "response", and "summary"
 ###
 
 Make sure the following formal requirements are all fulfilled: ###

data/apps/translate/translate.md

@@ -11,9 +11,9 @@ JSON:
 ```json
 {
   "mode": "translate",
+  "target_lang": "English",
   "response": "This is a sentence in Japanese.",
-  "dictioanry": {"日本語": "Japanese", "文": "sentence"},
-  "target_lang": "English"
+  "dictioanry": {"日本語": "Japanese", "文": "sentence"}
 }
 ```
 
@@ -22,6 +22,7 @@ Make sure the following requirements are all fulfilled: ###
 - translate the new prompt text to the language specified in the "target_lang" set it to "response" and set the translation to the "response" property
 - update the "dictionary" property with translation suggested by the user (using parentheses) for specific expressions
 - add user-suggested translations (translations in parentheses) to the "dictionary" property
+- the output JSON object must contain "mode", "target_lang", "response", and "dictionary"
 ###
 
 Make sure the following formal requirements are all fulfilled: ###

data/bin/monadic-chat

@@ -159,7 +159,7 @@ else
       next unless app == ARGV[0]
 
       openai_completion ||= MonadicChat.authenticate(message: false)
-      app_obj = eval(app.capitalize, binding, __FILE__, __LINE__).new(openai_completion, research_mode: false, params: { "model" => "gpt-4" })
+      app_obj = eval(app.capitalize, binding, __FILE__, __LINE__).new(openai_completion, research_mode: false, params: {})
       app_obj.bind(ARGV[1..].join(" "), num_retrials: 2)
       exit
     end

data/lib/monadic_chat/open_ai.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: true
+# frozen_string_literal: false
 
 require "http"
 require "oj"
@@ -9,6 +9,10 @@ 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
@@ -19,17 +23,29 @@ module OpenAI
   end
 
   def self.model_to_method(model)
-    {
-      "text-davinci-003" => "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,44 +57,82 @@ 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.split("\n\n").each do |data|
-          content = data.strip[6..]
-          break if content == "[DONE]"
-
-          stream = JSON.parse(content)
-          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
         end
       end
       json
     else
-      JSON.parse res.body
+      begin
+        JSON.parse res.body
+      rescue JSON::ParserError
+        res = { "type" => "error", "content" => "Error: JSON Parsing" }
+        pp res
+        block&.call res
+        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
 

data/lib/monadic_chat/version.rb

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

data/user_apps/wikipedia/wikipedia.rb

@@ -3,7 +3,7 @@
 require_relative "../../lib/monadic_app"
 
 class Wikipedia < MonadicApp
-  DESC = "Searches Wikipedia for you (experimental, requires GPT-4)"
+  DESC = "Searches Wikipedia for you (experimental)"
   COLOR = "white"
 
   attr_accessor :template, :config, :params, :completion

metadata

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