monadic-chat 0.2.2 → 0.3.1

data/apps/code/code.rb

@@ -8,36 +8,31 @@ class Code < MonadicApp
 
   attr_accessor :template, :config, :params, :completion
 
-  def initialize(openai_completion, research_mode: false, stream: true)
+  def initialize(openai_completion, research_mode: false, stream: true, params: {})
     @num_retained_turns = 10
     params = {
       "temperature" => 0.0,
       "top_p" => 1.0,
       "presence_penalty" => 0.0,
       "frequency_penalty" => 0.0,
-      "model" => OpenAI.model_name(research_mode: research_mode),
+      "model" => openai_completion.model_name(research_mode: research_mode),
       "max_tokens" => 2000,
       "stream" => stream,
       "stop" => nil
-    }
-    method = OpenAI.model_to_method(params["model"])
-    case method
-    when RESEARCH_MODE
-      tjson = TEMPLATES["normal/code"]
-      tmarkdown = TEMPLATES["research/code"]
-    when NORMAL_MODE
-      tjson = TEMPLATES["normal/code"]
-      tmarkdown = nil
-    end
-    super(params: params,
-          tjson: tjson,
-          tmarkdown: tmarkdown,
+    }.merge(params)
+    mode = research_mode ? :research : :normal
+    template_json = TEMPLATES["normal/code"]
+    template_md = TEMPLATES["research/code"]
+    super(mode: mode,
+          params: params,
+          template_json: template_json,
+          template_md: template_md,
           placeholders: {},
           prop_accumulator: "messages",
           prop_newdata: "response",
           update_proc: proc do
-            case method
-            when RESEARCH_MODE
+            case mode
+            when :research
               ############################################################
               # Research mode reduder defined here                       #
               # @messages: messages to this point                        #
@@ -51,7 +46,7 @@ class Code < MonadicApp
 
               @metadata["turns"] = @metadata["turns"].to_i - 1 if conditions.all?
 
-            when NORMAL_MODE
+            when :normal
               ############################################################
               # Normal mode recuder defined here                         #
               # @messages: messages to this point                        #

data/apps/linguistic/linguistic.json

@@ -1,6 +1,6 @@
 {"messages": [
   {"role": "system",
-   "content": "You are an English syntactic/semantic/pragmatic analyzer. Analyze the new prompt from the user below and execute a syntactic parsing. Give your response in a variation of the penn treebank format, but use brackets [ ] instead of parentheses ( ). Also, give your response in a markdown code span. The sentence must always be parsed if the user's input sentence is enclosed in double quotes. Let the user know if parsing the sentence is difficult or the input must be enclosed in double quotes."
+   "content": "You are an English syntactic/semantic/pragmatic analyzer. Analyze the new prompt from the user and execute a syntactic parsing. Give your response in a variation of the penn treebank format, but use brackets [ ] instead of parentheses ( ). Also, give your response in a markdown code span. Let the user know if parsing the given sentence is impossible."
   },
   {"role": "user",
    "content": "\"We saw a beautiful sunset.\""

data/apps/linguistic/linguistic.md

@@ -14,7 +14,7 @@ JSON:
 ```json
 {
   "prompt": "\"We didn't have a camera.\"",
-  "response": "`[S [NP We] [VP [V didn't] [VP [V have] [NP [Det a] [N camera] ] ] ] ] ]`\n\n###\n\n",
+  "response": "`[S [NP We] [VP [V didn't] [VP [V have] [NP [Det a] [N camera] ] ] ] ] ]`",
   "mode": "linguistic",
   "turns": 3,
   "sentence_type": ["declarative"],
@@ -41,6 +41,4 @@ Make sure the following formal requirements are all fulfilled:
 - escape double quotes and other special characters in the text values in the resulting JSON object
 - check the validity of the generated JSON object and correct any possible parsing problems before returning it 
 
-Add "\n\n###\n\n" at the end of the "response" value.
-
-Wrap the JSON object with "<JSON>\n" and "\n</JSON>".
+Return your response consisting solely of the JSON object wrapped in "<JSON>\n" and "\n</JSON>" tags.

data/apps/linguistic/linguistic.rb

@@ -8,36 +8,31 @@ class Linguistic < MonadicApp
 
   attr_accessor :template, :config, :params, :completion
 
-  def initialize(openai_completion, research_mode: false, stream: true)
+  def initialize(openai_completion, research_mode: false, stream: true, params: {})
     @num_retained_turns = 10
     params = {
       "temperature" => 0.0,
       "top_p" => 1.0,
       "presence_penalty" => 0.0,
       "frequency_penalty" => 0.0,
-      "model" => OpenAI.model_name(research_mode: research_mode),
+      "model" => openai_completion.model_name(research_mode: research_mode),
       "max_tokens" => 2000,
       "stream" => stream,
       "stop" => nil
-    }
-    method = OpenAI.model_to_method(params["model"])
-    case method
-    when RESEARCH_MODE
-      tjson = TEMPLATES["normal/linguistic"]
-      tmarkdown = TEMPLATES["research/linguistic"]
-    when NORMAL_MODE
-      tjson = TEMPLATES["normal/linguistic"]
-      tmarkdown = nil
-    end
-    super(params: params,
-          tjson: tjson,
-          tmarkdown: tmarkdown,
+    }.merge(params)
+    mode = research_mode ? :research : :normal
+    template_json = TEMPLATES["normal/linguistic"]
+    template_md = TEMPLATES["research/linguistic"]
+    super(mode: mode,
+          params: params,
+          template_json: template_json,
+          template_md: template_md,
           placeholders: {},
           prop_accumulator: "messages",
           prop_newdata: "response",
           update_proc: proc do
-            case method
-            when RESEARCH_MODE
+            case mode
+            when :research
               ############################################################
               # Research mode reduder defined here                       #
               # @messages: messages to this point                        #
@@ -51,7 +46,7 @@ class Linguistic < MonadicApp
 
               @metadata["turns"] = @metadata["turns"].to_i - 1 if conditions.all?
 
-            when NORMAL_MODE
+            when :normal
               ############################################################
               # Normal mode recuder defined here                         #
               # @messages: messages to this point                        #

data/apps/novel/novel.md

@@ -12,7 +12,7 @@ JSON:
 ```json
 {
   "prompt": "The preface to the novel is presented",
-  "response": "What follows is a story that an AI assistant tells. It is guaranteed that this will be an incredibly realistic and interesting novel.\n\n###\n\n",
+  "response": "What follows is a story that an AI assistant tells. It is guaranteed that this will be an incredibly realistic and interesting novel.",
   "mode": "novel",
   "turns": 1,
   "tokens": 147
@@ -35,6 +35,4 @@ Make sure the following formal requirements are all fulfilled:
 - increment the value of "turns" by 1
 - check the validity of the generated JSON object and correct any possible parsing problems before returning it 
 
-Add "\n\n###\n\n" at the end of the "response" value.
-
-Wrap the JSON object with "<JSON>\n" and "\n</JSON>".
+Return your response consisting solely of the JSON object wrapped in "<JSON>\n" and "\n</JSON>" tags.

data/apps/novel/novel.rb

@@ -8,36 +8,31 @@ class Novel < MonadicApp
 
   attr_accessor :template, :config, :params, :completion
 
-  def initialize(openai_completion, research_mode: false, stream: true)
+  def initialize(openai_completion, research_mode: false, stream: true, params: {})
     @num_retained_turns = 10
     params = {
       "temperature" => 0.3,
       "top_p" => 1.0,
       "presence_penalty" => 0.1,
       "frequency_penalty" => 0.1,
-      "model" => OpenAI.model_name(research_mode: research_mode),
+      "model" => openai_completion.model_name(research_mode: research_mode),
       "max_tokens" => 2000,
       "stream" => stream,
       "stop" => nil
-    }
-    method = OpenAI.model_to_method(params["model"])
-    case method
-    when RESEARCH_MODE
-      tjson = TEMPLATES["normal/novel"]
-      tmarkdown = TEMPLATES["research/novel"]
-    when NORMAL_MODE
-      tjson = TEMPLATES["normal/novel"]
-      tmarkdown = nil
-    end
-    super(params: params,
-          tjson: tjson,
-          tmarkdown: tmarkdown,
+    }.merge(params)
+    mode = research_mode ? :research : :normal
+    template_json = TEMPLATES["normal/novel"]
+    template_md = TEMPLATES["research/novel"]
+    super(mode: research_mode ? :research : :normal,
+          params: params,
+          template_json: template_json,
+          template_md: template_md,
           placeholders: {},
           prop_accumulator: "messages",
           prop_newdata: "response",
           update_proc: proc do
-            case method
-            when RESEARCH_MODE
+            case mode
+            when :research
               ############################################################
               # Research mode reduder defined here                       #
               # @messages: messages to this point                        #
@@ -51,7 +46,7 @@ class Novel < MonadicApp
 
               @metadata["turns"] = @metadata["turns"].to_i - 1 if conditions.all?
 
-            when NORMAL_MODE
+            when :normal
               ############################################################
               # Normal mode recuder defined here                         #
               # @messages: messages to this point                        #

data/apps/translate/translate.md

@@ -14,7 +14,7 @@ JSON:
   "mode": "translate",
   "turns": 0,
   "prompt": "これは日本語(Japanese)の文(sentence)です。",
-  "response": "This is a sentence in Japanese.\n\n###\n\n",
+  "response": "This is a sentence in Japanese.",
   "target_lang": "English",
   "tokens": 194
 }
@@ -35,6 +35,4 @@ Make sure the following formal requirements are all fulfilled:
 - increment the value of "turns" by 1
 - check the validity of the generated JSON object and correct any possible parsing problems before returning it 
 
-Add "\n\n###\n\n" at the end of the "response" value.
-
-Wrap the JSON object with "<JSON>\n" and "\n</JSON>".
+Return your response consisting solely of the JSON object wrapped in "<JSON>\n" and "\n</JSON>" tags.

data/apps/translate/translate.rb

@@ -8,40 +8,35 @@ class Translate < MonadicApp
 
   attr_accessor :template, :config, :params, :completion
 
-  def initialize(openai_completion, replacements: nil, research_mode: false, stream: true)
+  def initialize(openai_completion, replacements: nil, research_mode: false, stream: true, params: {})
     @num_retained_turns = 10
     params = {
       "temperature" => 0.2,
       "top_p" => 1.0,
       "presence_penalty" => 0.0,
       "frequency_penalty" => 0.0,
-      "model" => OpenAI.model_name(research_mode: research_mode),
+      "model" => openai_completion.model_name(research_mode: research_mode),
       "max_tokens" => 2000,
       "stream" => stream,
       "stop" => nil
-    }
+    }.merge(params)
     replacements ||= {
       "mode" => :interactive,
       "{{TARGET_LANG}}" => "Enter target language"
     }
-    method = OpenAI.model_to_method(params["model"])
-    case method
-    when RESEARCH_MODE
-      tjson = TEMPLATES["normal/translate"]
-      tmarkdown = TEMPLATES["research/translate"]
-    when NORMAL_MODE
-      tjson = TEMPLATES["normal/translate"]
-      tmarkdown = nil
-    end
-    super(params: params,
-          tjson: tjson,
-          tmarkdown: tmarkdown,
+    mode = research_mode ? :research : :normal
+    template_json = TEMPLATES["normal/translate"]
+    template_md = TEMPLATES["research/translate"]
+    super(mode: research_mode ? :research : :normal,
+          params: params,
+          template_json: template_json,
+          template_md: template_md,
           placeholders: replacements,
           prop_accumulator: "messages",
           prop_newdata: "response",
           update_proc: proc do
-            case method
-            when RESEARCH_MODE
+            case mode
+            when :research
               ############################################################
               # Research mode reduder defined here                       #
               # @messages: messages to this point                        #
@@ -55,7 +50,7 @@ class Translate < MonadicApp
 
               @metadata["turns"] = @metadata["turns"].to_i - 1 if conditions.all?
 
-            when NORMAL_MODE
+            when :normal
               ############################################################
               # Normal mode recuder defined here                         #
               # @messages: messages to this point                        #

data/lib/monadic_app.rb

@@ -8,15 +8,12 @@ require_relative "./monadic_chat/menu"
 require_relative "./monadic_chat/parameters"
 require_relative "./monadic_chat/internals"
 
-Thread.abort_on_exception = false
-
 class MonadicApp
   include MonadicChat
   attr_reader :template, :messages
 
-  def initialize(params:, tjson:, tmarkdown:, placeholders:, prop_accumulator:, prop_newdata:, update_proc:)
-    @threads = Thread::Queue.new
-    @responses = Thread::Queue.new
+  def initialize(mode:, params:, template_json:, template_md:, placeholders:, prop_accumulator:, prop_newdata:, update_proc:)
+    @mode = mode.to_sym
     @placeholders = placeholders
     @prop_accumulator = prop_accumulator
     @prop_newdata = prop_newdata
@@ -26,21 +23,14 @@ class MonadicApp
     @params = @params_initial.dup
     @html = false
 
-    @method = OpenAI.model_to_method @params["model"]
+    @method = OpenAI.model_to_method(@params["model"])
 
     @metadata = {}
-
-    @messages_initial = JSON.parse(File.read(tjson))["messages"]
+    @messages_initial = JSON.parse(File.read(template_json))["messages"]
     @messages = @messages_initial.dup
 
-    case @method
-    when RESEARCH_MODE
-      @template_initial = File.read(tmarkdown)
-      @template = @template_initial.dup
-    when NORMAL_MODE
-      @template_initial = ""
-      @template = ""
-    end
+    @template_initial = File.read(template_md)
+    @template = @template_initial.dup
   end
 
   ##################################################
@@ -75,12 +65,7 @@ class MonadicApp
       else
         if input && confirm_query(input)
           begin
-            case @method
-            when RESEARCH_MODE
-              bind_research_mode(input, num_retry: NUM_RETRY)
-            when NORMAL_MODE
-              bind_normal_mode(input, num_retry: NUM_RETRY)
-            end
+            bind(input, num_retry: NUM_RETRY)
           rescue StandardError => e
             input = ask_retrial(input, e.message)
             next

data/lib/monadic_chat/formatting.rb

@@ -17,7 +17,7 @@ class MonadicApp
     end
 
     @messages.each do |m|
-      accumulator << "#{m["role"].capitalize}: #{m["content"]}".sub("\n\n###\n\n", "")
+      accumulator << "#{m["role"].capitalize}: #{m["content"]}"
     end
 
     h1 = "# Monadic :: Chat / #{self.class.name}"
@@ -32,8 +32,6 @@ class MonadicApp
   def show_data
     print PROMPT_SYSTEM.prefix
 
-    wait
-
     res = format_data
     print "\n#{TTY::Markdown.parse(res, indent: 0)}"
   end
@@ -50,7 +48,6 @@ class MonadicApp
   end
 
   def show_html
-    wait
     set_html
     print PROMPT_SYSTEM.prefix
     print "HTML is ready\n"

data/lib/monadic_chat/interaction.rb

@@ -6,25 +6,25 @@ class MonadicApp
   ##################################################
 
   def user_input(text = "")
-    if count_lines_below < 1
-      ask_clear
-      user_input
-    else
-      res = PROMPT_USER.readline(text)
-      print TTY::Cursor.clear_line_after
-      res == "" ? nil : res
-    end
+    # if count_lines_below < 1
+    #   ask_clear
+    #   user_input
+    # else
+    res = PROMPT_USER.readline(text)
+    print TTY::Cursor.clear_line_after
+    res == "" ? nil : res
+    # end
   end
 
   def show_greet
-    current_mode = case @method
-                   when RESEARCH_MODE
+    current_mode = case @mode
+                   when :research
                      PASTEL.red("Research")
-                   when NORMAL_MODE
+                   when :normal
                      PASTEL.green("Normal")
                    end
     greet_md = <<~GREET
-      - You are currently in **#{current_mode}** mode
+      - You are currently in **#{current_mode}** mode (#{@params["model"]})
       - Type **help** or **menu** to see available commands
     GREET
     print PROMPT_SYSTEM.prefix