jekyll-chatgpt-translate 0.0.38 → 0.0.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80751d33457d149991f93ebca9daf89429ba1709b7345e58d575968b789518a1
-  data.tar.gz: b85c071213cf44098791d31d86fdf92cc386664bba2f15d16c04e8aed5edcb11
+  metadata.gz: 8ce1b67a78ab62d8ff281da23c8d1c5c63d5b07934e42e49fcfa07886c9ced32
+  data.tar.gz: 39e13d4901343a950d4c3a5d21b6fdca94723efbba1bfb18fe5f82c0cb26c4ff
 SHA512:
-  metadata.gz: fb1a09e8c6521002e20f664bdaf4ac343dbbb1c838e88bd596271c9f25ec06ac462d40b454a72233dcb8f3be344483ae94cc4621dd0ea0a2e4feb64976c14245
-  data.tar.gz: 79b0d7871805fc4ce024135b9d8e52929dd06db1e39e325671fbc61be931084f7e72564a6a2d618b4fbe139b3cc6f5c0e4568d35a98bfe784a6436ece0f881b3
+  metadata.gz: afe4e8981572c052dfabe2ed084f6e3eaaf7321297ca1d53cc750be81351429a1d7e7a2479da8d60008019224d8e29dd922437b19fa554729faccf533d61908d
+  data.tar.gz: 652431c0c7ec9153994b25ee4f480ebf374bddb77c6500bd451364cc38d4b4578ed3fe6acf83f4c55dc359b41a931626baef8a8257f907f0649044ce9559ae94

data/.github/workflows/rake.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04, macos-12, windows-2022]
-        ruby: [2.7, 3.1]
+        ruby: [3.1]
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

data/Gemfile

@@ -27,9 +27,9 @@ gemspec
 
 gem 'cucumber', '9.0.2', require: false
 gem 'kramdown-parser-gfm', '1.1.0', require: false
-gem 'minitest', '5.19.0', require: false
-gem 'rake', '13.0.6', require: false
-gem 'rubocop', '1.56.4', require: false
-gem 'rubocop-rspec', '2.24.0', require: false
+gem 'minitest', '5.20.0', require: false
+gem 'rake', '13.1.0', require: false
+gem 'rubocop', '1.57.2', require: false
+gem 'rubocop-rspec', '2.25.0', require: false
 gem 'simplecov', '0.22.0', require: false
 gem 'webmock', '3.19.1', require: false

data/README.md

@@ -9,7 +9,8 @@ works for [my blog](https://github.com/yegor256/ru.yegor256.com),
 for example [this page](https://ru.yegor256.com/2023-08-13-dictators.html) is translated to 
 [English](https://ru.yegor256.com/english/2023-08-13-dictators.html).
 
-Install it first:
+Install it first (you need [Ruby 3+](https://www.ruby-lang.org/en/news/2020/12/25/ruby-3-0-0-released/) 
+and [Jekyll 3+](https://jekyllrb.com/)):
 
 ```
 gem install jekyll-chatgpt-translate

data/jekyll-chatgpt-translate.gemspec

@@ -26,9 +26,9 @@ require 'English'
 
 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.required_ruby_version = '>= 3.0'
   s.name = 'jekyll-chatgpt-translate'
-  s.version = '0.0.38'
+  s.version = '0.0.40'
   s.license = 'MIT'
   s.summary = 'Translate Jekyll Pages Through ChatGPT'
   s.description = [
@@ -46,7 +46,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'iri', '>= 0'
   s.add_runtime_dependency 'iso-639', '>= 0'
   s.add_runtime_dependency 'jekyll', '>= 3'
+  s.add_runtime_dependency 'json', '>= 2'
   s.add_runtime_dependency 'redcarpet', '>= 3'
   s.add_runtime_dependency 'ruby-openai', '>= 5'
+  s.add_runtime_dependency 'tiktoken_ruby', '>= 0.0.6'
   s.metadata['rubygems_mfa_required'] = 'true'
 end

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

@@ -23,8 +23,10 @@
 # SOFTWARE.
 
 require 'jekyll'
+require 'json'
 require 'openai'
 require 'iso-639'
+require 'tiktoken_ruby'
 require_relative 'pars'
 require_relative 'prompt'
 
@@ -92,7 +94,7 @@ class GptTranslate::ChatGPT
       end
       accum = []
       until later[i].nil?
-        already = accum.join.split.count
+        already = Tiktoken.encoding_for_model('gpt-4').encode(accum.join).length
         if already > window_length
           Jekyll.logger.debug("Already #{already} words, over the window_length of #{window_length}")
           break
@@ -130,7 +132,7 @@ class GptTranslate::ChatGPT
           temperature: 0.7
         }
       )
-      answer = response.dig('choices', 0, 'message', 'content')
+      answer = JSON.parse(response).dig('choices', 0, 'message', 'content')
       if answer.nil?
         Jekyll.logger.error("No content returned by ChatGPT: #{response}")
         raise 'No content returned by ChatGPT'

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

@@ -23,5 +23,5 @@
 # SOFTWARE.
 
 module GptTranslate
-  VERSION = '0.0.38'
+  VERSION = '0.0.40'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-chatgpt-translate
 version: !ruby/object:Gem::Version
-  version: 0.0.38
+  version: 0.0.40
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-02 00:00:00.000000000 Z
+date: 2023-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: humanize
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -94,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: tiktoken_ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.6
 description: Add this plugin to your Jekyll site and all posts will be automatically
   translated to the languages of your choice through ChatGPT
 email: yegor256@gmail.com
@@ -151,7 +179,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="