jekyll-chatgpt-translate 0.0.40 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ce1b67a78ab62d8ff281da23c8d1c5c63d5b07934e42e49fcfa07886c9ced32
-  data.tar.gz: 39e13d4901343a950d4c3a5d21b6fdca94723efbba1bfb18fe5f82c0cb26c4ff
+  metadata.gz: 22b2e725c02a5de3447605daaad8d41fce5885908f59c8bc86cc676ac8d3a661
+  data.tar.gz: 5cb8610b0994bab60d9bf23d3aff7888f01f7ff0520e9dddc4e487e99ca94601
 SHA512:
-  metadata.gz: afe4e8981572c052dfabe2ed084f6e3eaaf7321297ca1d53cc750be81351429a1d7e7a2479da8d60008019224d8e29dd922437b19fa554729faccf533d61908d
-  data.tar.gz: 652431c0c7ec9153994b25ee4f480ebf374bddb77c6500bd451364cc38d4b4578ed3fe6acf83f4c55dc359b41a931626baef8a8257f907f0649044ce9559ae94
+  metadata.gz: f1bf2b84b63f9b82ce5bc28771ab52b3571a5b4d5629fe6e10038c968bad2127407a33e9d7f1d08a7b11c247f4748021695fc569794e3f9966cca3ec30f567cf
+  data.tar.gz: b6385f234df97f3e6f5ea37e555667a59b68db7c4f7ec82ee26bd6e27a4e7cc3df759b7243f50fdcee424a7ecff785a989898ce0c050596a2c616a36f9d3ef55

data/.rultor.yml

@@ -1,10 +1,10 @@
 docker:
-  image: yegor256/rultor-image:1.21.0
+  image: yegor256/rultor-image:1.22.0
 assets:
   rubygems.yml: yegor256/home#assets/rubygems.yml
 install: |
   pdd -f /dev/null
-  sudo bundle install --no-color "--gemfile=$(pwd)/Gemfile"
+  bundle install --no-color
 release:
   script: |-
     bundle exec rake

data/Gemfile

@@ -25,7 +25,7 @@
 source 'https://rubygems.org'
 gemspec
 
-gem 'cucumber', '9.0.2', require: false
+gem 'cucumber', '9.1.0', require: false
 gem 'kramdown-parser-gfm', '1.1.0', require: false
 gem 'minitest', '5.20.0', require: false
 gem 'rake', '13.1.0', require: false

data/features/cli.feature

@@ -66,6 +66,7 @@ Feature: Simple site building
       source: en
       version: ""
       api_key: "it-is-not-used, because EN to EN translation"
+      window_length: 1024
       layout: should-not-be-used
       targets:
         -

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 = '>= 3.0'
   s.name = 'jekyll-chatgpt-translate'
-  s.version = '0.0.40'
+  s.version = '0.0.42'
   s.license = 'MIT'
   s.summary = 'Translate Jekyll Pages Through ChatGPT'
   s.description = [

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

@@ -45,12 +45,13 @@ class GptTranslate::ChatGPT
   # +key+ OpenAI API Key, which can't be nil, but can be empty string, which means dry mode (no calls to OpenAI)
   # +source+ The language to translate from
   # +target+ The language to translate into
-  def initialize(key, model, source, target)
+  def initialize(key, model, source, target, client: OpenAI::Client.new(access_token: key))
     raise 'OpenAI key cannot be nil' if key.nil?
     @key = key
     @model = model
     @source = source
     @target = target
+    @client = client
   end
 
   def translate(markdown, min: 32, window_length: 2000)
@@ -115,9 +116,8 @@ class GptTranslate::ChatGPT
   end
 
   def translate_par(par)
-    client = OpenAI::Client.new(access_token: @key)
     if @@models_printed
-      Jekyll.logger.info("Available ChatGPT models: #{client.models.list['data'].map { |m| m['id'] }.join(', ')}")
+      Jekyll.logger.info("Available ChatGPT models: #{@client.models.list['data'].map { |m| m['id'] }.join(', ')}")
       @@models_printed = true
     end
     prompt = GptTranslate::Prompt.new(par, @source, @target).to_s
@@ -125,14 +125,15 @@ class GptTranslate::ChatGPT
     answer = nil
     attempt = 0
     begin
-      response = client.chat(
+      response = @client.chat(
         parameters: {
           model: @model,
           messages: [{ role: 'user', content: prompt }],
           temperature: 0.7
         }
       )
-      answer = JSON.parse(response).dig('choices', 0, 'message', 'content')
+      json = response.is_a?(Hash) ? response : JSON.parse(response)
+      answer = json.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/generator.rb

@@ -114,7 +114,11 @@ class GptTranslate::Generator < Jekyll::Generator
             config['source'] || 'en',
             lang
           )
-          foreign = gpt.translate(plain, min: min_chars, window_length: config['window_length'] || '2048')
+          foreign = gpt.translate(
+            plain,
+            min: min_chars,
+            window_length: (config['window_length'] || '2048').to_i
+          )
           File.write(
             path,
             [

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

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

data/test/test_chatgpt.rb

@@ -109,10 +109,26 @@ class GptTranslate::ChatGPTTest < Minitest::Test
     )
   end
 
+  def test_with_json
+    client = Object.new
+    def client.chat(*)
+      { 'choices' => [{ 'message' => { 'content' => 'done!' } }] }
+    end
+    chat = GptTranslate::ChatGPT.new('fake-key', 'gpt-3.5-turbo', 'en', 'ru', client: client)
+    assert_equal(
+      "done!\n\ndone!",
+      chat.translate(
+        "This is the first paragraph\n\nThis is second\n\nThis is third",
+        min: 1, window_length: 4
+      )
+    )
+  end
+
   private
 
   def stub_it!
-    stub_request(:any, 'https://api.openai.com/v1/chat/completions')
-      .to_return(body: '{"choices":[{"message":{"content": "done!"}}]}')
+    stub_request(:any, 'https://api.openai.com/v1/chat/completions').to_return(
+      body: '{"choices":[{"message":{"content": "done!"}}]}'
+    )
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-chatgpt-translate
 version: !ruby/object:Gem::Version
-  version: 0.0.40
+  version: 0.0.42
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-08 00:00:00.000000000 Z
+date: 2023-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: humanize
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.4.10
 signing_key: 
 specification_version: 4
 summary: Translate Jekyll Pages Through ChatGPT