fastlane-plugin-translate_gpt 0.1.9 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 954eb550c534e78643e493d55a44aad05a28ea4545a7f965b393efeec7d8113b
-  data.tar.gz: ca96f089100daaa43b0ed5942d03be22658a1ae0fecf7a24062eb7a4cb51dd11
+  metadata.gz: 853d06eecad9456f758e4dbdf4e766345d4a266d5d199608112c0947077dbee1
+  data.tar.gz: 7c3f0d6cda2bd029dcd0d5bb8313cc20c8bab024c6786571808fc9fd511af6c8
 SHA512:
-  metadata.gz: bb6ed4b1b44fd5c97ce495524ea644911d55d0bec333611c53be68c9aba8becb8687c4d5bce0fa228bee2c48fd3bec227729664afff0e742073cd8de2f7a6423
-  data.tar.gz: 1a1faac3623a8795115112629db8d0f35399bbee0c1b1295453f9236ef1c7b9cc7a4f26f855a5029f8d1f7fbd007e7a568c1779bacb8f84e262353ada3c28095
+  metadata.gz: 0f9ed56771f0e68f22c6325c2b6829036f38e31591d6d0c2b0b6dbc6ba1ff72665ed857daca1be73327f0e97b71e4c53b93d9449a9f0a81e9e1973da4b826a74
+  data.tar.gz: cb4812f57b1fa109a52534311bcd3d414d30f4c181ea3d927912ea0f810f86d9dc1a3a88b53f2afcf0aefd784e3d1201d66988518dae8437d1f12ac30229d3c3

data/README.md

@@ -54,6 +54,7 @@ The following options are available for `translate-gpt`:
 | `target_file` | The path to the output file for the translated strings. | `GPT_TARGET_FILE` |
 | `context` | Common context for the translation | `GPT_COMMON_CONTEXT` |
 | `bunch_size` | Number of strings to translate in a single request.| `GPT_BUNCH_SIZE` |
+| `max_input_tokens` | Maximum number of tokens in the input string. `bunch_size` will be ignored | `GPT_MAX_INPUT_TOKENS` |
 | `mark_for_review` | If string has been translated by GPT, mark it for review | `GPT_MARK_FOR_REVIEW` |
 
 **Note:** __I advise using `bunch_size`. It will reduce the number of API requests and translations will be more accurate.__

data/lib/fastlane/plugin/translate_gpt/actions/translate_gpt_action.rb

@@ -1,5 +1,4 @@
 require 'fastlane/action'
-require 'openai'
 require_relative '../helper/translate_gpt_helper'
 require 'loco_strings'
 
@@ -10,8 +9,11 @@ module Fastlane
         helper = Helper::TranslateGptHelper.new(params)
         helper.prepare_hashes
         bunch_size = params[:bunch_size]
+        max_input_tokens = params[:max_input_tokens]
         helper.log_input(bunch_size)
-        if bunch_size.nil? || bunch_size < 1
+        if !max_input_tokens.nil? && max_input_tokens > 0
+          helper.translate_bunch_with_tokenizer(max_input_tokens)
+        elsif bunch_size.nil? || bunch_size < 1
           helper.translate_strings
         else
           helper.translate_bunch_of_strings(bunch_size)
@@ -118,6 +120,13 @@ module Fastlane
             optional: true,
             type: Integer
           ),
+          FastlaneCore::ConfigItem.new(
+            key: :max_input_tokens,
+            env_name: 'GPT_MAX_INPUT_TOKENS',
+            description: 'Maximum number of tokens in the input request',
+            type: Integer,
+            optional: true
+          ),
           FastlaneCore::ConfigItem.new(
             key: :mark_for_review,
             env_name: 'GPT_MARK_FOR_REVIEW',
@@ -125,7 +134,7 @@ module Fastlane
             type: Boolean,
             optional: true,
             default_value: false
-          )
+          ),
         ]
       end
 

data/lib/fastlane/plugin/translate_gpt/helper/translate_gpt_helper.rb

@@ -1,6 +1,7 @@
 require 'fastlane_core/ui/ui'
 require 'loco_strings/parsers/xcstrings_file'
 require 'json'
+require 'openai'
 # rubocop:disable all
 
 module Fastlane
@@ -106,32 +107,78 @@ module Fastlane
         number_of_bunches = (@translation_count / bunch_size.to_f).ceil
         @keys_associations = {}
         @to_translate.each_slice(bunch_size) do |bunch|
-          prompt = prepare_bunch_prompt bunch
-          if prompt.empty?
-            UI.important "Empty prompt, skipping bunch"
+          begin 
+            progress = (bunch_index / number_of_bunches.to_f * 100).round
+            request_bunch(bunch, progress)
+            bunch_index += 1
+          rescue "Empty prompt"
             next
           end
-          max_retries = 10
-          times_retried = 0
+          if bunch_index < number_of_bunches - 1 then wait end
+        end
+      end 
 
-          # translate the source string to the target language
-          begin
-            request_bunch_translate(bunch, prompt, bunch_index, number_of_bunches)
-            bunch_index += 1
-          rescue Net::ReadTimeout => error
-            if times_retried < max_retries
-              times_retried += 1
-              UI.important "Failed to request translation, retry #{times_retried}/#{max_retries}"
-              wait 1
-              retry
-            else
-              UI.error "Can't translate the bunch: #{error}"
+      def translate_bunch_with_tokenizer(max_tokens)
+        string_index = 0 
+        @keys_associations = {}
+        current_bunch = {}
+        @to_translate.each do |key, string|
+          string_index += 1
+          tmp_bunch = current_bunch.clone
+          tmp_bunch[key] = string
+
+          prompt = prepare_bunch_prompt tmp_bunch
+          tokens = OpenAI.rough_token_count(prompt)
+          if tokens > max_tokens
+            if current_bunch.empty?
+              string_index -= 1
+              UI.error "Can't translate #{key}: string is too long"
+              next
             end
+            prompt = prepare_bunch_prompt current_bunch
+            progress = (string_index / @translation_count.to_f * 100).round
+            request_bunch(bunch, progress)
+            current_bunch = {}
+            current_bunch[key] = string
+            if progress < 100 then wait end
+          else 
+            current_bunch = tmp_bunch
           end
-          if bunch_index < number_of_bunches - 1 then wait end
         end
+
+        if !current_bunch.empty?
+          prompt = prepare_bunch_prompt current_bunch
+          progress = (string_index / @translation_count.to_f * 100).round
+          request_bunch(current_bunch, progress)
+        end
+
       end 
 
+      def request_bunch(bunch, progress) 
+        UI.message "[#{progress}%] Translating #{bunch.size} strings..."
+        prompt = prepare_bunch_prompt bunch
+        if prompt.empty?
+          UI.important "Empty prompt, skipping bunch"
+          raise "Empty prompt"
+        end
+        max_retries = 10
+        times_retried = 0
+
+        # translate the source string to the target language
+        begin
+          request_bunch_translate(bunch, prompt, progress)
+        rescue Net::ReadTimeout => error
+          if times_retried < max_retries
+            times_retried += 1
+            UI.important "Failed to request translation, retry #{times_retried}/#{max_retries}"
+            wait 1
+            retry
+          else
+            UI.error "Can't translate the bunch: #{error}"
+          end
+        end
+      end
+
       # Prepare the prompt for the GPT API
       def prepare_prompt(string) 
         prompt = "I want you to act as a translator for a mobile application strings. " + \
@@ -160,7 +207,7 @@ module Fastlane
 
         json_hash = []
         strings.each do |key, string|
-          UI.message "Translating #{key} - #{string.value}"
+          # UI.message "Translating #{key} - #{string.value}"
           next if string.nil?
 
           string_hash = {}
@@ -228,7 +275,7 @@ module Fastlane
         end
       end
 
-      def request_bunch_translate(strings, prompt, index, number_of_bunches)
+      def request_bunch_translate(strings, prompt, progress)
         response = @client.chat(
           parameters: {
             model: @params[:model_name],
@@ -242,7 +289,7 @@ module Fastlane
         error = response.dig("error", "message")
         
         #key_log = Colorizer::colorize(key, :blue)
-        index_log = Colorizer::colorize("[#{index + 1}/#{number_of_bunches}]", :white)
+        index_log = Colorizer::colorize("[#{progress}%]", :white)
         if error
           UI.error "#{index_log} Error translating: #{error}"
         else

data/lib/fastlane/plugin/translate_gpt/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module TranslateGpt
-    VERSION = '0.1.9'
+    VERSION = '0.1.10'
   end
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-translate_gpt
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.1.10
 platform: ruby
 authors:
 - Aleksei Cherepanov
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-27 00:00:00.000000000 Z
+date: 2025-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: loco_strings
@@ -30,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: 7.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: 7.3.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -178,7 +177,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description:
 email: ftp27host@gmail.com
 executables: []
 extensions: []
@@ -197,7 +195,6 @@ metadata:
   homepage_uri: https://github.com/ftp27/fastlane-plugin-translate_gpt
   source_code_uri: https://github.com/ftp27/fastlane-plugin-translate_gpt
   github_repo: https://github.com/ftp27/fastlane-plugin-translate_gpt
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -212,8 +209,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.19
-signing_key:
+rubygems_version: 3.6.2
 specification_version: 4
 summary: This fastlane plugin provides an easy way to use the OpenAI GPT language
   model to translate strings in your iOS application.