jekyll-chatgpt-translate 0.0.14 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4b8a34c60ab2378b8dc26ab4b189ff3fa168cbb864c80db92a854d68b58def59
-  data.tar.gz: 3654fe32f201e8a155cd5f154129c24350333b6f2459cd86bb511c0acc22c0c1
+  metadata.gz: f3a1fa14a50caf08c780825e889b16c100e4afcd4042db089e49b33d01eece4a
+  data.tar.gz: 87cf1124880695e6efad136115b7dfd9e33a629e03f154adc5f7325f7f6e43e9
 SHA512:
-  metadata.gz: ea02f9faba8ffedaa3e25bd428bde6aaba7a7a484bda745cc270a9f97f1a40211b776cff7d5a8c5d297854f107ba311b10dd5885bb6eff8de353f4a8aa9778d6
-  data.tar.gz: 6f3cc93df6fff8290f3a6d45bc980a9c5b273154a98ab7c18ddff1571c55dd8c2796e9ef965c3a0df72ff175c42ed54b72f4b4ecb5d2d8bb21864ae3b4aa0c7c
+  metadata.gz: fb6b987ce7934d9294ba69f73d4d23bb3c74d6394cc5537ed956ee0b54b280f0ae79e5d12c9974ef75402f0586422700727d02304e44c4d7f5c74090c7b7c03c
+  data.tar.gz: 597a0397823b9d91a65ce1b8269f3117f37152b2ab9c8eafd501a9c4c0aaeec9ecd70022460616c2ae8c212605fb2fd1df347ab07b9accc5323e5931d7cfd037

data/jekyll-chatgpt-translate.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
   s.required_ruby_version = '>= 2.6'
   s.name = 'jekyll-chatgpt-translate'
-  s.version = '0.0.14'
+  s.version = '0.0.16'
   s.license = 'MIT'
   s.summary = 'Translate Jekyll Pages Through ChatGPT'
   s.description = [

data/lib/jekyll-chatgpt-translate/chatgpt.rb

@@ -25,6 +25,7 @@
 require 'jekyll'
 require 'openai'
 require 'iso-639'
+require_relative 'prompt'
 
 # The module we are in.
 module GptTranslate; end
@@ -51,7 +52,7 @@ class GptTranslate::ChatGPT
       if par.length <= 32
         Jekyll.logger.debug("Not translating this, b/c too short: \"#{par}\"")
         par
-      elsif par !~ /^[a-zA-Zа-яА-Я]/
+      elsif par !~ /^[[:alpha:]]/
         Jekyll.logger.debug("Not translating this, b/c it's not a plain text: \"#{par}\"")
         par
       elsif @key.empty?
@@ -66,38 +67,27 @@ class GptTranslate::ChatGPT
 
   def translate_par(par)
     start = Time.now
-    t = nil
+    answer = nil
     attempt = 0
     begin
+      prompt = GptTranslate::Prompt.new(par, @source, @target).to_s
       response = OpenAI::Client.new(access_token: @key).chat(
         parameters: {
           model: @model,
-          messages: [{
-            role: 'user',
-            content: "#{prompt}:\n\n#{par}"
-          }],
+          messages: [{ role: 'user', content: prompt }],
           temperature: 0.7
         }
       )
-      t = response.dig('choices', 0, 'message', 'content')
+      answer = response.dig('choices', 0, 'message', 'content')
+      Jekyll.logger.debug("ChatGPT prompt: \"#{prompt}\", ChatGPT answer: \"#{answer}\"")
     rescue StandardError => e
       attempt += 1
       retry if attempt < 4
       raise e
     end
     Jekyll.logger.info("Translated #{par.split.count} #{@source.upcase} words \
-to #{t.split.count} #{@target.upcase} words \
+to #{answer.split.count} #{@target.upcase} words \
 through #{@model} in #{(Time.now - start).round(2)}s")
-    t
-  end
-
-  def prompt
-    [
-      'Please, translate this paragraph from',
-      ISO_639.find_by_code(@source),
-      'to',
-      ISO_639.find_by_code(@target),
-      ', don\'t change proper nouns'
-    ].join(' ')
+    answer
   end
 end

data/lib/jekyll-chatgpt-translate/generator.rb

@@ -95,7 +95,7 @@ class GptTranslate::Generator < Jekyll::Generator
             '',
             translated,
             '',
-            "#{marker}\n{: .jekyll-chatgpt-translate}"
+            "#{marker} on #{Time.now.strftime('%d/%m/%Y %H:%M')}\n{: .jekyll-chatgpt-translate}"
           ].join("\n")
         )
         site.pages << Jekyll::Page.new(site, site.source, File.dirname(path), File.basename(path))

data/lib/jekyll-chatgpt-translate/plain.rb

@@ -40,36 +40,26 @@ class GptTranslate::Plain
   def to_s
     # To turn compact lists into proper lists
     @markdown.gsub(/([^\n])\n(\s*\*)/, "\\1\n\n\\2").split(/\n{2,}/).compact.map do |par|
-      # par.gsub!("\n", ' ')
-      par.gsub!("\t", ' ')
-      par.gsub!(/ {2,}/, ' ')
+      par.strip!
       # Liquid tags are removed, but this implementation is primitive
       # Seehttps://stackoverflow.com/questions/
       par.gsub!(/{{[^}]+}}/, '')
       par.gsub!(/{%.+?%}/, '')
       par.gsub!(/<!--.+?-->/m, '')
-      par.strip!
-      Redcarpet::Markdown.new(Strip).render(par)
+      par = Redcarpet::Markdown.new(Strip).render(par)
+      par.gsub!("\t", '  ')
+      par.gsub!(/\n+/, ' ') unless par.start_with?('```')
+      par.gsub!(/ {2,}/, ' ') unless par.start_with?('```')
+      par.strip
     end.join("\n\n").gsub(/\n{2,}/, "\n\n").strip
   end
 
-  # # To ignore/remove Liquid tags.
-  # class NullDrop < Liquid::Drop
-  #   def method_missing(*)
-  #     nil
-  #   end
-
-  #   def respond_to_missing?(*)
-  #     true
-  #   end
-  # end
-
   # Markdown to pain text.
   class Strip < Redcarpet::Render::Base
     %i[
       block_code block_quote
       block_html
-      autolink codespan double_emphasis
+      autolink double_emphasis
       emphasis underline
       triple_emphasis strikethrough
       superscript highlight quote
@@ -81,8 +71,16 @@ class GptTranslate::Plain
       end
     end
 
-    def raw_html(_content)
-      'HTML'
+    def codespan(content)
+      if content.start_with?("\n")
+        "```#{content}```"
+      else
+        content
+      end
+    end
+
+    def raw_html(content)
+      content
     end
 
     def list(content, _type)

data/lib/jekyll-chatgpt-translate/prompt.rb

@@ -0,0 +1,59 @@
+# frozen_string_literal: true
+
+# (The MIT License)
+#
+# Copyright (c) 2023 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'iso-639'
+
+# The module we are in.
+module GptTranslate; end
+
+# Prompt for ChatGPT.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2023 Yegor Bugayenko
+# License:: MIT
+class GptTranslate::Prompt
+  # Ctor.
+  # +par+ Text to translate
+  # +source+ The language to translate from
+  # +target+ The language to translate into
+  def initialize(par, source, target)
+    @par = par
+    @source = source
+    @target = target
+  end
+
+  def to_s
+    from = ISO_639.find_by_code(@source)
+    raise "Unknown source language ISO-639 code: \"#{@source}\"" if from.nil?
+    to = ISO_639.find_by_code(@target)
+    raise "Unknown source language ISO-639 code: \"#{@target}\"" if to.nil?
+    head = [
+      'Please, translate the following paragraph from ',
+      from[3],
+      ' to ',
+      to[3],
+      ', don\'t change proper nouns'
+    ].join
+    "#{head}:\n\n#{@par}"
+  end
+end

data/lib/jekyll-chatgpt-translate/version.rb

@@ -23,5 +23,5 @@
 # SOFTWARE.
 
 module GptTranslate
-  VERSION = '0.0.14'
+  VERSION = '0.0.16'
 end

data/test/test_plain.rb

@@ -34,6 +34,7 @@ class GptTranslate::PlainTest < Minitest::Test
     assert_equal('Hello, world!', GptTranslate::Plain.new('Hello, **world**!').to_s)
     assert_equal('Hello, Jeff!', GptTranslate::Plain.new('Hello, _Jeff_!').to_s)
     assert_equal("Hi\n\nBye", GptTranslate::Plain.new("  Hi\n\nBye\n\n\n").to_s)
+    assert_equal('Hi, dude!', GptTranslate::Plain.new("  Hi,\ndude!\n").to_s)
   end
 
   def test_lists
@@ -77,17 +78,24 @@ class GptTranslate::PlainTest < Minitest::Test
 
   def test_code_block
     assert_equal(
-      "Hello:\n\nJava",
+      "Hello:\n\n```\nJava\n```",
       GptTranslate::Plain.new("Hello:\n\n```\nJava\n```\n").to_s
     )
   end
 
   def test_html
     assert_equal(
-      'This is picture: HTML!',
+      'This is picture: <img src="a"/>!',
       GptTranslate::Plain.new('This is picture: <img src="a"/>!').to_s
     )
-    assert_equal('HTML', GptTranslate::Plain.new('<img src="a"/>').to_s)
+    assert_equal('<img src="a"/>', GptTranslate::Plain.new('<img src="a"/>').to_s)
+  end
+
+  def test_big_code
+    assert_equal(
+      "```\nHello\n```",
+      GptTranslate::Plain.new("```\nHello\n```").to_s
+    )
   end
 
   def test_liquid_tags
@@ -96,7 +104,7 @@ class GptTranslate::PlainTest < Minitest::Test
       GptTranslate::Plain.new('Hello, {{ Java }}!').to_s
     )
     assert_equal(
-      'Hello,  dude !',
+      'Hello, dude !',
       GptTranslate::Plain.new('Hello, {% if a %} dude {% endif %}!').to_s
     )
     assert_equal(

data/test/test_prompt.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+
+# (The MIT License)
+#
+# Copyright (c) 2023 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'minitest/autorun'
+require_relative '../lib/jekyll-chatgpt-translate/prompt'
+
+# Prompt test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2023 Yegor Bugayenko
+# License:: MIT
+class GptTranslate::PromptTest < Minitest::Test
+  def par(body, source, target)
+    "Please, translate the following paragraph from #{source} to #{target}, don't change proper nouns:\n\n#{body}"
+  end
+
+  def test_english_to_russian
+    assert_equal(
+      par('Hello, dude!', 'English', 'Russian'),
+      GptTranslate::Prompt.new('Hello, dude!', 'en', 'ru').to_s
+    )
+  end
+
+  def test_english_to_chinese
+    assert_equal(
+      par('Hello, Jeff!', 'English', 'Chinese'),
+      GptTranslate::Prompt.new('Hello, Jeff!', 'en', 'zh').to_s
+    )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-chatgpt-translate
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.16
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -110,6 +110,7 @@ files:
 - lib/jekyll-chatgpt-translate/permalink.rb
 - lib/jekyll-chatgpt-translate/ping.rb
 - lib/jekyll-chatgpt-translate/plain.rb
+- lib/jekyll-chatgpt-translate/prompt.rb
 - lib/jekyll-chatgpt-translate/version.rb
 - logo.png
 - renovate.json
@@ -119,6 +120,7 @@ files:
 - test/test_permalink.rb
 - test/test_ping.rb
 - test/test_plain.rb
+- test/test_prompt.rb
 homepage: https://github.com/yegor256/jekyll-chatgpt-translate
 licenses:
 - MIT