monadic-chat 0.1.2 → 0.2.0

data/lib/monadic_chat/internals.rb

@@ -32,12 +32,8 @@ class MonadicApp
       false
     else
       replacements.each do |key, value|
-        case @method
-        when "completions"
-          @template.gsub!(key, value)
-        when "chat/completions"
-          @template["messages"][0]["content"].gsub!(key, value)
-        end
+        @messages[0]["content"].gsub!(key, value)
+        messages[0]["content"]
       end
       true
     end
@@ -68,34 +64,58 @@ class MonadicApp
     when "completions"
       m = /\n\n```json\s*(\{.+\})\s*```\n\n/m.match(@template)
       json = m[1].gsub(/(?!\\\\\\)\\\\"/) { '\\\"' }
-      JSON.parse(json)
+      res = JSON.parse(json)
+      res["messages"] = @messages
+      res
     when "chat/completions"
-      @template
+      @messages
     end
   end
 
   def prepare_params(input)
     params = @params.dup
+
+    @update_proc.call
     case @method
     when "completions"
-      template = @template.dup.sub("{{PROMPT}}", input).sub("{{MAX_TOKENS}}", (@params["max_tokens"] / 2).to_s)
+      messages = +""
+      system = +""
+      @messages.each do |mes|
+        role = mes["role"]
+        content = mes["content"]
+        case role
+        when "system"
+          system << "#{content}\n"
+        when "assistant", "gpt"
+          system << "- #{mes["role"].strip}: #{content.sub("\n\n###\n\n", "")}\n\n###\n\n"
+        else
+          messages << "- #{mes["role"].strip}: #{mes["content"]}"
+        end
+      end
+      template = @template.dup.sub("{{SYSTEM}}", system)
+                          .sub("{{PROMPT}}", input)
+                          .sub("{{MESSAGES}}", messages.strip)
+
       params["prompt"] = template
+      @messages << { "role" => "user", "content" => input }
     when "chat/completions"
-      @template["messages"] << { "role" => "user", "content" => input }
-      params["messages"] = @template["messages"]
+      @messages << { "role" => "user", "content" => input }
+      @update_proc.call
+      params["messages"] = @messages
     end
+
     params
   end
 
   def update_template(res)
     case @method
     when "completions"
-      updated = @update_proc.call(res)
-      json = updated.to_json.strip
+      @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"
-      @template["messages"] << { "role" => "assistant", "content" => res }
-      @template["messages"] = @update_proc.call(@template["messages"])
+      @messages << { "role" => "assistant", "content" => res }
     end
   end
 
@@ -110,6 +130,7 @@ class MonadicApp
     wait
 
     params = prepare_params(input)
+
     print TTY::Cursor.save
 
     escaping = +""
@@ -158,6 +179,7 @@ class MonadicApp
     print "\n"
 
     update_template(res)
+    set_html if @html
   end
 
   def bind_research_mode(input, num_retry: 0)
@@ -166,6 +188,7 @@ class MonadicApp
     wait
 
     params = prepare_params(input)
+
     print TTY::Cursor.save
 
     @threads << true
@@ -179,7 +202,7 @@ class MonadicApp
       finished = false
       response = +""
       spinning = false
-      res = @completion.run(params, num_retry: num_retry) do |chunk|
+      res = @completion.run(params, num_retry: num_retry, tmp_json_file: TEMP_JSON, tmp_md_file: TEMP_MD) do |chunk|
         if finished && !response_all_shown
           response_all_shown = true
           @responses << response.sub(/\s+###\s*".*/m, "")
@@ -265,5 +288,6 @@ class MonadicApp
         break
       end
     end
+    set_html if @html
   end
 end

data/lib/monadic_chat/menu.rb

@@ -9,16 +9,16 @@ class MonadicApp
     clear_screen
     print TTY::Cursor.save
     parameter = PROMPT_SYSTEM.select("Select function:", per_page: 10, cycle: true, filter: true, default: 1, show_help: :never) do |menu|
-      menu.choice "#{BULLET} #{PASTEL.bold("cancel/return/escape")}   cancel this menu", "cancel"
-      menu.choice "#{BULLET} #{PASTEL.bold("params/settings/config")} show and change values of parameters", "params"
-      menu.choice "#{BULLET} #{PASTEL.bold("data/context")}           show currrent contextual info", "data"
-      menu.choice "#{BULLET} #{PASTEL.bold("html")}                   view contextual info on the web browser", "html"
-      menu.choice "#{BULLET} #{PASTEL.bold("reset")}                  reset context to original state", "reset"
-      menu.choice "#{BULLET} #{PASTEL.bold("save")}                   save current contextual info to file", "save"
-      menu.choice "#{BULLET} #{PASTEL.bold("load")}                   load current contextual info from file", "load"
-      menu.choice "#{BULLET} #{PASTEL.bold("clear/clean")}            clear screen", "clear"
-      menu.choice "#{BULLET} #{PASTEL.bold("readme/documentation")}   open readme/documentation", "readme"
-      menu.choice "#{BULLET} #{PASTEL.bold("exit/bye/quit")}          go back to main menu", "exit"
+      menu.choice "#{BULLET} #{PASTEL.bold("cancel/return/escape")}    Cancel this menu", "cancel"
+      menu.choice "#{BULLET} #{PASTEL.bold("params/settings/config")}  Show and change values of parameters", "params"
+      menu.choice "#{BULLET} #{PASTEL.bold("data/context")}            Show currrent contextual info", "data"
+      menu.choice "#{BULLET} #{PASTEL.bold("html")}                    View contextual info on the web browser", "html"
+      menu.choice "#{BULLET} #{PASTEL.bold("reset")}                   Reset context to initial state", "reset"
+      menu.choice "#{BULLET} #{PASTEL.bold("save")}                    Save current contextual info to file", "save"
+      menu.choice "#{BULLET} #{PASTEL.bold("load")}                    Load current contextual info from file", "load"
+      menu.choice "#{BULLET} #{PASTEL.bold("clear/clean")}             Clear screen", "clear"
+      menu.choice "#{BULLET} #{PASTEL.bold("readme/documentation")}    Open readme/documentation", "readme"
+      menu.choice "#{BULLET} #{PASTEL.bold("exit/bye/quit")}           Go back to main menu", "exit"
     end
 
     print TTY::Cursor.restore
@@ -33,7 +33,8 @@ class MonadicApp
     when "data"
       show_data
     when "html"
-      set_html
+      @html = true
+      show_html
     when "reset"
       reset
     when "save"
@@ -52,14 +53,10 @@ class MonadicApp
   end
 
   def reset
-    @params = @params_original.dup
-
-    case @method
-    when "completions"
-      @template = @template_original.dup
-    when "chat/completions"
-      @template = JSON.parse @template_original
-    end
+    @html = false
+    @params = @params_initial.dup
+    @messages = @messages_initial.dup
+    @template = @template_initial.dup
 
     if @placeholders.empty?
       print PROMPT_SYSTEM.prefix
@@ -133,9 +130,11 @@ class MonadicApp
         case @method
         when "completions"
           m = /\n\n```json\s*(\{.+\})\s*```\n\n/m.match(@template)
-          f.write JSON.pretty_generate(JSON.parse(m[1]))
+          data = JSON.parse(m[1])
+          data["messages"] = @messages
+          f.write JSON.pretty_generate(data)
         when "chat/completions"
-          f.write JSON.pretty_generate(@template)
+          f.write JSON.pretty_generate({ "messages" => @messages })
         end
 
         print "Data has been saved successfully\n"
@@ -170,14 +169,17 @@ class MonadicApp
       data = JSON.parse(json)
       case @method
       when "completions"
+        self.class.name.downcase.split("::")[-1]
+
         raise unless data["mode"] == self.class.name.downcase.split("::")[-1]
 
-        new_template = @template.sub(/\n\n```json\s*\{.+\}\s*```\n\n/m, "\n\n```json\n#{JSON.pretty_generate(data).strip}\n```\n\n")
-        @template = new_template
+        @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
         raise unless data["messages"] && data["messages"][0]["role"]
 
-        @template["messages"] = data["messages"]
+        @messages = data["messages"]
       end
       print "Data has been loaded successfully\n"
       true

data/lib/monadic_chat/open_ai.rb

@@ -81,16 +81,15 @@ module OpenAI
   class Completion
     attr_reader :access_token
 
-    def initialize(access_token, tmp_file: nil)
+    def initialize(access_token)
       @access_token = access_token
-      @tmp_file = tmp_file
     end
 
     def models
       OpenAI.models(@access_token)
     end
 
-    def run(params, num_retry: 1, &block)
+    def run(params, num_retry: 1, tmp_json_file: nil, tmp_md_file: nil, &block)
       method = OpenAI.model_to_method(params["model"])
 
       response = OpenAI.query(@access_token, "post", method, 60, params, &block)
@@ -102,7 +101,8 @@ module OpenAI
 
       case method
       when "completions"
-        get_json response ["choices"][0]["text"]
+        File.open(tmp_md_file, "w") { |f| f.write params["prompt"] } if tmp_md_file
+        get_json(response["choices"][0]["text"], tmp_json_file: tmp_json_file)
       when "chat/completions"
         response ["choices"][0]["text"]
       end
@@ -115,7 +115,7 @@ module OpenAI
       end
     end
 
-    def get_json(data)
+    def get_json(data, tmp_json_file: nil)
       case data
       when %r{<JSON>\n*(\{.+\})\n*</JSON>}m
         json = Regexp.last_match(1).gsub(/\r\n?/, "\n").gsub(/\r\n/) { "\n" }
@@ -126,7 +126,7 @@ module OpenAI
       else
         res = data
       end
-      File.open(@tmp_file, "w") { |f| f.write json } if @tmp_file
+      File.open(tmp_json_file, "w") { |f| f.write json } if tmp_json_file
       res
     end
 

data/lib/monadic_chat/version.rb

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

data/lib/monadic_chat.rb

@@ -46,6 +46,7 @@ module MonadicChat
 
   TEMP_HTML = File.join(Dir.home, "monadic_chat.html")
   TEMP_JSON = File.join(Dir.home, "monadic_chat.json")
+  TEMP_MD = File.join(Dir.home, "monadic_chat.md")
 
   style = +File.read(File.join(__dir__, "..", "assets", "github.css")).gsub(".markdown-") { "" }
   style << File.read(File.join(__dir__, "..", "assets", "pigments-default.css"))
@@ -126,7 +127,7 @@ module MonadicChat
         raise if OpenAI.models(token).empty?
 
         print "success\n"
-        OpenAI::Completion.new(token, tmp_file: TEMP_JSON)
+        OpenAI::Completion.new(token)
       rescue StandardError
         print "failure.\n"
         false

data/monadic_chat.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |spec|
   DESC
   spec.homepage = "https://github.com/yohasebe/monadic-chat"
   spec.license = "MIT"
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 2.6.10"
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
 
@@ -36,7 +36,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
-  spec.add_development_dependency "solargraph"
 
   spec.add_dependency "http"
   spec.add_dependency "kramdown"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: monadic-chat
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - yohasebe
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-12 00:00:00.000000000 Z
+date: 2023-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: solargraph
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: http
   requirement: !ruby/object:Gem::Requirement
@@ -261,6 +247,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".rspec"
+- ".ruby-version"
 - CHANGELOG.md
 - Gemfile
 - Gemfile.lock
@@ -273,6 +260,9 @@ files:
 - apps/code/code.json
 - apps/code/code.md
 - apps/code/code.rb
+- apps/linguistic/linguistic.json
+- apps/linguistic/linguistic.md
+- apps/linguistic/linguistic.rb
 - apps/novel/novel.json
 - apps/novel/novel.md
 - apps/novel/novel.rb
@@ -289,7 +279,6 @@ files:
 - doc/img/input-acess-token.png
 - doc/img/langacker-2001.svg
 - doc/img/linguistic-html.png
-- doc/img/monadic-chat-main-menu.png
 - doc/img/monadic-chat.svg
 - doc/img/readme-example-beatles-html.png
 - doc/img/readme-example-beatles.png
@@ -310,9 +299,6 @@ files:
 - lib/monadic_chat/parameters.rb
 - lib/monadic_chat/version.rb
 - monadic_chat.gemspec
-- samples/linguistic/linguistic.json
-- samples/linguistic/linguistic.md
-- samples/linguistic/linguistic.rb
 homepage: https://github.com/yohasebe/monadic-chat
 licenses:
 - MIT
@@ -329,14 +315,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.6.10
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.8
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Highly configurable CLI client app for OpenAI chat/text-completion API

data/samples/linguistic/linguistic.md

@@ -1,39 +0,0 @@
-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. Create a response to the following new prompt from the user and set your response to the "response" property of the JSON object shown below. All prompts by "user" in the "messages" property are continuous in content. If pasing the input sentence is extremely difficult, or the input is not enclosed in double quotes, let the user know.
-
-NEW PROMPT: {{PROMPT}}
-
-```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",
-  "mode": "linguistic",
-  "turns": 3,
-  "sentence_type": ["declarative"],
-  "sentiment": ["sad"],
-  "summary": "The user saw a beautiful sunset, but did not take a picture because the user did not have a camera.",
-  "tokens": 351,
-  "messages": [{"user": "\"We saw a beautiful sunset.\"", "assistant": "`[S [NP He] [VP [V saw] [NP [det a] [N' [Adj beautiful] [N sunset] ] ] ] ]`\n\n###\n\n"},{"user": "\"We didn't take a picture.\"", "assistant": "`[S [NP We] [IP [I didn't] [VP [V take] [NP [Det a] [N picture] ] ] ] ] ]`\n\n###\n\n"},{"user": "\"We didn't have a camera.\"", "assistant": "`[S [NP We] [IP [I didn't] [VP [V have] [NP [Det a] [N camera] ] ] ] ] ]`\n\n###\n\n"}]
-}
-```
-
-Make sure the following content requirements are all fulfilled:
-
-- keep the value of the "mode" property at "linguistic"
-- set the new prompt to the "prompt" property
-- create your response to the new prompt in accordance with the "messages" and set it to "response"
-- insert both the new prompt and the response after all the existing items in the "messages"
-- analyze the new prompt's sentence type and set a sentence type value such as "interrogative", "imperative", "exclamatory", or "declarative" to the "sentence_type" property
-- analyze the new prompt's sentiment and set one or more sentiment types such as "happy", "excited", "troubled", "upset", or "sad" to the "sentiment" property
-- summarize the user's messages so far and update the "summary" property with a text of fewer than 100 words using as many discourse markers such as "because", "therefore", "but", "so" to show the logical connection between the events.
-- update the value of "tokens" with the number of tokens of the resulting JSON object"
-
-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 and update the property so that the value of "turns" equals the number of the items in the "messages" of 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>".