monadic-chat 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73e7b781492fab243c740ffe311a90291b2c5197e90b41b0a2972e7339aeba0d
-  data.tar.gz: b2abac3f0925214f36d7eb64d19796bfb923b910e32d29031751822855fc629d
+  metadata.gz: 9d44ae83c28ccafde3e3b2ea1d486730c2dbf5ff3cc7193dc4c25c97f6a46fbb
+  data.tar.gz: f69a30f93b4777b70d078b007c3342e212d3deb4bf2cf92d782fb6af6b825f07
 SHA512:
-  metadata.gz: 107f07c41b2a40905ee32319f455b1da03a65d7270831f5810be75dd9800dbe905ed61aba0aac00b9018f54d5d978e90f2b01a6e9d6b1bfeff00c35286a7d6e5
-  data.tar.gz: 48098f9dac1512feea8fc8d23bfaa15ac33e669e3989465751e7676e2924630f34fe11db6806d8723cf70ecd8e4132342335d34df6469bd7c21f6d07e6204067
+  metadata.gz: 31a241cff282c2e98eed745e4e32612dc018793832c38dddd79614479fd8b816a1c94be7ff16dc16b73858eb883d2da42b81109ed3d94e253a7e473526533386
+  data.tar.gz: eddd1596523564ac1f066b93c762d13b44515990ba1e479b74f6b51cf94e8fc840d45d45763757264a0c1dde21beac1b68c3652a2baf8a08ab6f306e64a818e9

data/CHANGELOG.md

@@ -46,3 +46,8 @@
 - Support for OpenAI's latest models
 - Missing character issue addressed
 - API access timeout/retry mechanism improved
+
+## [0.4.1] - 2024-01-27
+
+- New models of January 2024 supported
+- Default model changed to `gpt-4`

data/lib/monadic_chat/internals.rb

@@ -152,29 +152,31 @@ class MonadicApp
     research_mode = @mode == :research
 
     escaping = +""
-    last_chunk = +""
+    finished = false
 
     res = @completion.run(params,
                           research_mode: research_mode,
                           timeout_sec: SETTINGS["timeout_sec"],
                           num_retrials: num_retrials) do |chunk|
-      if escaping
-        chunk = escaping + chunk
-        escaping = ""
-      end
+      if chunk.instance_of?(Hash) && chunk["content"] == "DONE"
+        finished = true
+      elsif chunk.instance_of?(String) && !finished
+        if escaping
+          chunk = escaping + chunk
+          escaping = ""
+        end
 
-      if /(?:\\\z)/ =~ chunk
-        escaping += chunk
-        next
-      else
-        chunk = chunk.gsub('\\n') { "\n" }
-      end
+        if /(?:\\\z)/ =~ chunk
+          escaping += chunk
+          next
+        else
+          chunk = chunk.gsub('\\n') { "\n" }
+        end
 
-      print last_chunk
-      last_chunk = chunk
+        print chunk
+      end
     end
 
-    print last_chunk
     print "\n"
 
     message = case role

data/lib/monadic_chat/open_ai.rb

@@ -16,9 +16,9 @@ RETRY_WAIT_TIME_SEC = 1
 module OpenAI
   def self.default_model(research_mode: false)
     if research_mode
-      "gpt-3.5-turbo"
+      "gpt-4-turbo-preview"
     else
-      "gpt-3.5-turbo"
+      "gpt-4"
     end
   end
 
@@ -27,13 +27,12 @@ module OpenAI
       "gpt-3.5-turbo-1106" => "chat/completions",
       "gpt-3.5-turbo" => "chat/completions",
       "gpt-3.5-turbo-16k" => "chat/completions",
+      "gpt-4-0125-preview" => "chat/completions",
+      "gpt-4-turbo-preview" => "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-0613" => "chat/completions",
-      "gpt-3.5-turbo-16k-0613" => "chat/completions"
+      "gpt-4-32K" => "chat/completions"
     }[model]
     if res.nil?
       puts ""
@@ -73,12 +72,16 @@ module OpenAI
     if query["stream"]
       json = nil
       buffer = ""
-      break_flag = false
+      # break_flag = false
+
       res.body.each do |chunk|
-        break if break_flag
+        break if /\Rdata: [DONE]\R/ =~ chunk
+
+        # break if break_flag
 
         buffer << chunk
-        break_flag = true if /\Rdata: [DONE]\R/ =~ buffer
+        # break_flag = true if /\Rdata: [DONE]\R/ =~ buffer
+
         scanner = StringScanner.new(buffer)
         pattern = /data: (\{.*?\})(?=\n|\z)/m
         until scanner.eos?
@@ -92,6 +95,7 @@ module OpenAI
               fragment = choice.dig("delta", "content").to_s
 
               block&.call fragment
+
               if !json
                 json = res
               else
@@ -99,7 +103,11 @@ module OpenAI
                 json["choices"][0]["text"] << fragment
               end
 
-              break if choice["finish_reason"] == "length" || choice["finish_reason"] == "stop"
+              if choice["finish_reason"] == "length" || choice["finish_reason"] == "stop"
+                finish = { "type" => "message", "content" => "DONE" }
+                block&.call finish
+                break
+              end
             rescue JSON::ParserError
               res = { "type" => "error", "content" => "Error: JSON Parsing" }
               pp res
@@ -156,6 +164,7 @@ module OpenAI
       method = OpenAI.model_to_method(params["model"])
 
       response = OpenAI.query(@access_token, "post", method, timeout_sec, params, &block)
+
       if response["error"]
         raise response["error"]["message"]
       elsif response["choices"][0]["finish_reason"] == "length"

data/lib/monadic_chat/version.rb

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

data/lib/monadic_chat.rb

@@ -27,8 +27,8 @@ Oj.mimic_JSON
 
 module MonadicChat
   SETTINGS = {
-    "normal_model" => "gpt-3.5-turbo",
-    "research_model" => "gpt-3.5-turbo",
+    "normal_model" => "gpt-4",
+    "research_model" => "gpt-4-turbo-preview",
     "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.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - yohasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-10 00:00:00.000000000 Z
+date: 2024-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler