monadic-chat 0.3.2 → 0.3.4

data/apps/novel/novel.rb

@@ -15,8 +15,8 @@ class Novel < MonadicApp
       "top_p" => 1.0,
       "presence_penalty" => 0.1,
       "frequency_penalty" => 0.1,
-      "model" => openai_completion.model_name(research_mode: research_mode),
-      "max_tokens" => 2000,
+      "model" => research_mode ? SETTINGS["research_model"] : SETTINGS["normal_model"],
+      "max_tokens" => 1000,
       "stream" => stream,
       "stop" => nil
     }.merge(params)
@@ -38,14 +38,23 @@ class Novel < MonadicApp
               # @messages: messages to this point                        #
               # @metadata: currently available metdata sent from GPT     #
               ############################################################
-
               conditions = [
                 @messages.size > 1,
-                @metadata["tokens"].to_i > params["max_tokens"].to_i / 2
+                @messages.size > @num_retained_turns * 2 + 1
               ]
 
-              @metadata["turns"] = @metadata["turns"].to_i - 1 if conditions.all?
-
+              if conditions.all?
+                to_delete = []
+                new_num_messages = @messages.size
+                @messages.each_with_index do |ele, i|
+                  if ele["role"] != "system"
+                    to_delete << i
+                    new_num_messages -= 1
+                  end
+                  break if new_num_messages <= @num_retained_turns * 2 + 1
+                end
+                @messages.delete_if.with_index { |_, i| to_delete.include? i }
+              end
             when :normal
               ############################################################
               # Normal mode recuder defined here                         #
@@ -53,16 +62,21 @@ class Novel < MonadicApp
               ############################################################
 
               conditions = [
+                @messages.size > 1,
                 @messages.size > @num_retained_turns * 2 + 1
               ]
 
               if conditions.all?
+                to_delete = []
+                new_num_messages = @messages.size
                 @messages.each_with_index do |ele, i|
                   if ele["role"] != "system"
-                    @messages.delete_at i
-                    break
+                    to_delete << i
+                    new_num_messages -= 1
                   end
+                  break if new_num_messages <= @num_retained_turns * 2 + 1
                 end
+                @messages.delete_if.with_index { |_, i| to_delete.include? i }
               end
             end
           end

data/apps/translate/translate.md

@@ -12,27 +12,23 @@ JSON:
 ```json
 {
   "mode": "translate",
-  "turns": 0,
-  "prompt": "これは日本語(Japanese)の文(sentence)です。",
   "response": "This is a sentence in Japanese.",
-  "target_lang": "English",
-  "tokens": 194
+  "dictioanry": {"日本語": "Japanese", "文": "sentence"},
+  "target_lang": "English"
 }
 ```
 
 Make sure the following requirements are all fulfilled:
 
 - keep the value of the "mode" property at "translate"
-- set the text in the new prompt presented above to the "prompt" property
-- 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 value of "tokens" with the number of tokens of the resulting JSON object"
+- 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
 
 Make sure the following formal requirements are all fulfilled:
 
 - do not use invalid characters in the JSON object
 - escape double quotes and other special characters in the text values in the resulting JSON object
-- increment the value of "turns" by 1
 - check the validity of the generated JSON object and correct any possible parsing problems before returning it 
 
 Return your response consisting solely of the JSON object wrapped in "<JSON>\n" and "\n</JSON>" tags.

data/apps/translate/translate.rb

@@ -15,8 +15,8 @@ class Translate < MonadicApp
       "top_p" => 1.0,
       "presence_penalty" => 0.0,
       "frequency_penalty" => 0.0,
-      "model" => openai_completion.model_name(research_mode: research_mode),
-      "max_tokens" => 2000,
+      "model" => research_mode ? SETTINGS["research_model"] : SETTINGS["normal_model"],
+      "max_tokens" => 1000,
       "stream" => stream,
       "stop" => nil
     }.merge(params)
@@ -42,14 +42,23 @@ class Translate < MonadicApp
               # @messages: messages to this point                        #
               # @metadata: currently available metdata sent from GPT     #
               ############################################################
-
               conditions = [
                 @messages.size > 1,
-                @metadata["tokens"].to_i > params["max_tokens"].to_i / 2
+                @messages.size > @num_retained_turns * 2 + 1
               ]
 
-              @metadata["turns"] = @metadata["turns"].to_i - 1 if conditions.all?
-
+              if conditions.all?
+                to_delete = []
+                new_num_messages = @messages.size
+                @messages.each_with_index do |ele, i|
+                  if ele["role"] != "system"
+                    to_delete << i
+                    new_num_messages -= 1
+                  end
+                  break if new_num_messages <= @num_retained_turns * 2 + 1
+                end
+                @messages.delete_if.with_index { |_, i| to_delete.include? i }
+              end
             when :normal
               ############################################################
               # Normal mode recuder defined here                         #
@@ -57,16 +66,21 @@ class Translate < MonadicApp
               ############################################################
 
               conditions = [
+                @messages.size > 1,
                 @messages.size > @num_retained_turns * 2 + 1
               ]
 
               if conditions.all?
+                to_delete = []
+                new_num_messages = @messages.size
                 @messages.each_with_index do |ele, i|
                   if ele["role"] != "system"
-                    @messages.delete_at i
-                    break
+                    to_delete << i
+                    new_num_messages -= 1
                   end
+                  break if new_num_messages <= @num_retained_turns * 2 + 1
                 end
+                @messages.delete_if.with_index { |_, i| to_delete.include? i }
               end
             end
           end

data/bin/monadic-chat

@@ -54,11 +54,12 @@ module MonadicMenu
       clear_screen
       print "\n", banner.strip, "\n"
 
+      print TTY::Cursor.save
       openai_completion ||= MonadicChat.authenticate
       exit unless openai_completion
 
       max_app_name_width = APPS.reduce(8) { |accum, app| app.length > accum ? app.length : accum } + 2
-      parameter = PROMPT_SYSTEM.select(" Current mode: #{print_mode.call(mode)}\n\nSelect item:",
+      parameter = PROMPT_SYSTEM.select("Current mode: #{print_mode.call(mode)}\n\nSelect item:",
                                        per_page: 10,
                                        cycle: true,
                                        filter: true,
@@ -120,5 +121,34 @@ module MonadicMenu
   end
 end
 
-MonadicMenu.clear_screen
-MonadicMenu.run
+case ARGV.size
+when 0
+  MonadicMenu.clear_screen
+  MonadicMenu.run
+when 1
+  case ARGV[0]
+  when "readme", "-h"
+    MonadicChat.open_readme
+  when "version", "-v"
+    puts MonadicChat::VERSION
+  else
+    MonadicChat::APPS.each do |app|
+      next unless app == ARGV[0]
+
+      openai_completion ||= MonadicChat.authenticate(message: false)
+      eval(app.capitalize, binding, __FILE__, __LINE__).new(openai_completion, research_mode: false).run
+      exit
+    end
+    puts "Unknown command"
+  end
+else
+  MonadicChat::APPS.each do |app|
+    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.bind(ARGV[1..].join(" "), num_retry: 2)
+    exit
+  end
+  puts "Unknown command"
+end