monadic-chat 0.2.0 → 0.2.2

data/lib/monadic_app.rb

@@ -34,10 +34,10 @@ class MonadicApp
     @messages = @messages_initial.dup
 
     case @method
-    when "completions"
+    when RESEARCH_MODE
       @template_initial = File.read(tmarkdown)
       @template = @template_initial.dup
-    when "chat/completions"
+    when NORMAL_MODE
       @template_initial = ""
       @template = ""
     end
@@ -76,9 +76,9 @@ class MonadicApp
         if input && confirm_query(input)
           begin
             case @method
-            when "completions"
+            when RESEARCH_MODE
               bind_research_mode(input, num_retry: NUM_RETRY)
-            when "chat/completions"
+            when NORMAL_MODE
               bind_normal_mode(input, num_retry: NUM_RETRY)
             end
           rescue StandardError => e

data/lib/monadic_chat/interaction.rb

@@ -18,9 +18,9 @@ class MonadicApp
 
   def show_greet
     current_mode = case @method
-                   when "completions"
+                   when RESEARCH_MODE
                      PASTEL.red("Research")
-                   when "chat/completions"
+                   when NORMAL_MODE
                      PASTEL.green("Normal")
                    end
     greet_md = <<~GREET

data/lib/monadic_chat/internals.rb

@@ -61,13 +61,13 @@ class MonadicApp
 
   def objectify
     case @method
-    when "completions"
+    when RESEARCH_MODE
       m = /\n\n```json\s*(\{.+\})\s*```\n\n/m.match(@template)
       json = m[1].gsub(/(?!\\\\\\)\\\\"/) { '\\\"' }
       res = JSON.parse(json)
       res["messages"] = @messages
       res
-    when "chat/completions"
+    when NORMAL_MODE
       @messages
     end
   end
@@ -77,7 +77,7 @@ class MonadicApp
 
     @update_proc.call
     case @method
-    when "completions"
+    when RESEARCH_MODE
       messages = +""
       system = +""
       @messages.each do |mes|
@@ -98,7 +98,7 @@ class MonadicApp
 
       params["prompt"] = template
       @messages << { "role" => "user", "content" => input }
-    when "chat/completions"
+    when NORMAL_MODE
       @messages << { "role" => "user", "content" => input }
       @update_proc.call
       params["messages"] = @messages
@@ -109,12 +109,12 @@ class MonadicApp
 
   def update_template(res)
     case @method
-    when "completions"
+    when RESEARCH_MODE
       @metadata = res
       @messages << { "role" => "assistant", "content" => res["response"] }
       json = res.to_json.strip
       @template.sub!(/\n\n```json.+```\n\n/m, "\n\n```json\n#{json}\n```\n\n")
-    when "chat/completions"
+    when NORMAL_MODE
       @messages << { "role" => "assistant", "content" => res }
     end
   end

data/lib/monadic_chat/menu.rb

@@ -128,12 +128,12 @@ class MonadicApp
     begin
       File.open(filepath, "w") do |f|
         case @method
-        when "completions"
+        when RESEARCH_MODE
           m = /\n\n```json\s*(\{.+\})\s*```\n\n/m.match(@template)
           data = JSON.parse(m[1])
           data["messages"] = @messages
           f.write JSON.pretty_generate(data)
-        when "chat/completions"
+        when NORMAL_MODE
           f.write JSON.pretty_generate({ "messages" => @messages })
         end
 
@@ -168,15 +168,14 @@ class MonadicApp
       json = File.read(filepath)
       data = JSON.parse(json)
       case @method
-      when "completions"
+      when RESEARCH_MODE
         self.class.name.downcase.split("::")[-1]
 
         raise unless data["mode"] == self.class.name.downcase.split("::")[-1]
 
         @messages = data.delete "messages"
         @template = @template.sub(/\n\n```json\s*\{.+\}\s*```\n\n/m, "\n\n```json\n#{JSON.pretty_generate(data).strip}\n```\n\n")
-      when "chat/completions"
-        pp data
+      when NORMAL_MODE
         raise unless data["messages"] && data["messages"][0]["role"]
 
         @messages = data["messages"]

data/lib/monadic_chat/open_ai.rb

@@ -18,6 +18,10 @@ module OpenAI
   def self.model_to_method(model)
     {
       "text-davinci-003" => "completions",
+      "gpt-4" => "chat/completions",
+      "gpt-4-0314" => "chat/completions",
+      "gpt-4-32K" => "chat/completions",
+      "gpt-4-32k-0314" => "chat/completions",
       "gpt-3.5-turbo" => "chat/completions",
       "gpt-3.5-turbo-0301" => "chat/completions"
     }[model]

data/lib/monadic_chat/parameters.rb

@@ -20,11 +20,10 @@ class MonadicApp
     case parameter
     when "model"
       value = change_model
+      @messages = @messages_initial.dup
       case @method
-      when "completions"
-        @template = @template_original.dup
-      when "chat/completions"
-        @template = JSON.parse @template_original
+      when RESEARCH_MODE
+        @template = @template_initial.dup
       end
     when "max_tokens"
       value = change_max_tokens

data/lib/monadic_chat/version.rb

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

data/lib/monadic_chat.rb

@@ -25,6 +25,8 @@ module MonadicChat
   MIN_LENGTH = 5
   TIMEOUT_SEC = 120
   TITLE_WIDTH = 72
+  NORMAL_MODE = "chat/completions"
+  RESEARCH_MODE = "completions"
 
   APPS_DIR = File.absolute_path(File.join(__dir__, "..", "apps"))
   APPS_DIR_LIST = Dir.entries(APPS_DIR)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monadic-chat
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - yohasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-13 00:00:00.000000000 Z
+date: 2023-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -275,6 +275,7 @@ files:
 - doc/img/code-example-time-html.png
 - doc/img/code-example-time.png
 - doc/img/example-translation.png
+- doc/img/extra-template-json.png
 - doc/img/how-research-mode-works.svg
 - doc/img/input-acess-token.png
 - doc/img/langacker-2001.svg
@@ -322,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.4.8
 signing_key:
 specification_version: 4
 summary: Highly configurable CLI client app for OpenAI chat/text-completion API