mistral_translator 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 278978acb1df0d447293200f13ff58745640a62f5bf43a41ebc7b31db2d50b98
-  data.tar.gz: c86fc021d49a554fd4d44883e1383a5ea4ba82251074b4b358b3b5cf97f27fd2
+  metadata.gz: 242809c8a55ea79c9c436a2fc7b17d7a6deda5372090eaaa43b9a0863e1ba552
+  data.tar.gz: b6f86bc08b253f5ea4097e9fa1f3e901e41886067155c2fc595202694ce18acb
 SHA512:
-  metadata.gz: ca6e0c3b2e2346ab8432dfc24080adcb994f75df453111851d6f8441465d09107d59216fc84efc1f84acf823a4a4ec284c5d1b1212c8ceda9a3d8861e95a2208
-  data.tar.gz: 39b55072eb24870acd861b8c7ec7c8aa279a9f7b03b4a84f0cdabd4982c2d9f04da1b39b2eea05024d6e3a2c1bc7737ee95557f0eaa588c61ec3fbc5d04af540
+  metadata.gz: 6183a2226ee0985e5229c2cb203fed6cfb71ced4c2a0cdb28fba16115f5b6fdf28b860baba50db8f3461e64792267558f3413481e715c54f2f1b5bf0747d3647
+  data.tar.gz: a71be86ea71b15e50af048cbba672e5fdecd41e6d3cd1e1313d534d11d2af7747ac593cf36791ad805f9b6db4ff6d6d88853a8b166a046cc45747a66e879bf0c

data/CHANGELOG.md

@@ -1,5 +1,27 @@
 ## [Unreleased]
 
+## [0.3.2] - 2026-10-28
+
+### Fixed
+
+- Rich text adapters send the stored ActionText HTML (`to_html`) instead of the rendered one (`to_s`), which wrapped every translation in an extra `<div class="trix-content">` and inlined the rendered attachments. `ActionText::Content` values are now recognised too, not only `ActionText::RichText`.
+- `RecordTranslationService` passes `preserve_html: true` for rich text fields.
+- `RecordTranslationService#translate_to_all_locales` returns `false` when a translation fails. It returned `true`, so failures went unnoticed; successful translations are still saved.
+- `RecordTranslationService`, `Translator` and `Summarizer` stop retrying after a few `RateLimitError`s and raise, instead of retrying forever on top of the client's own backoff.
+- `translate_to_multiple` passes `preserve_html` to each translation; the option was ignored.
+- `translate_with_mistral` raised `ArgumentError` on every call. `from:` is now the source locale and `to:` the target locales, through a new `target_locales:` option of `RecordTranslationService`.
+- A glossary given as a string no longer raises `NoMethodError` in `PromptBuilder`.
+- `BasicRateLimiter` no longer sleeps while holding its lock, which blocked every other thread.
+- HTTP error messages no longer end with a stray brace.
+
+### Changed
+
+- CI token restricted to read access, and development dependencies updated (addressable, json, uri).
+
+### Removed
+
+- Unused helpers `log_prompt_debug` and `build_html_validation_instruction`.
+
 ## [0.3.1] - 2026-10-27
 
 ### Fixed

data/lib/mistral_translator/adapters.rb

@@ -43,24 +43,35 @@ module MistralTranslator
         value = get_field_value(field, locale)
         return false if value.nil?
 
-        # Gestion des rich text
-        if defined?(ActionText::RichText) && value.is_a?(ActionText::RichText)
-          !value.to_plain_text.to_s.strip.empty?
-        else
-          !value.to_s.strip.empty?
-        end
+        text = rich_text?(value) ? value.to_plain_text : value
+        !text.to_s.strip.empty?
       end
 
       def get_translatable_content(field, locale)
         value = get_field_value(field, locale)
         return nil if value.nil?
 
-        # Gestion des rich text - préserver le HTML
-        if defined?(ActionText::RichText) && value.is_a?(ActionText::RichText)
-          value.body.to_s
-        else
-          value.to_s
-        end
+        rich_text?(value) ? rich_text_html(value) : value.to_s
+      end
+
+      # ActionText::RichText (has_rich_text) ou ActionText::Content (son body)
+      def rich_text?(value)
+        (defined?(ActionText::RichText) && value.is_a?(ActionText::RichText)) ||
+          (defined?(ActionText::Content) && value.is_a?(ActionText::Content))
+      end
+
+      def rich_text_field?(field, locale)
+        rich_text?(get_field_value(field, locale))
+      end
+
+      private
+
+      # HTML tel que stocké, pièces jointes réduites à <action-text-attachment>.
+      # to_s rendrait le layout (<div class="trix-content">) et le contenu des
+      # pièces jointes, qui seraient alors enregistrés dans la traduction.
+      def rich_text_html(value)
+        content = value.respond_to?(:body) ? value.body : value
+        content&.to_html.to_s
       end
     end
 
@@ -167,16 +178,22 @@ module MistralTranslator
   # Service de traduction utilisant les adaptateurs
   module Adapters
     class RecordTranslationService
-      def initialize(record, translatable_fields, adapter: nil, source_locale: nil)
+      MAX_RATE_LIMIT_RETRIES = 3
+
+      # target_locales : toutes les locales de l'adaptateur par défaut
+      def initialize(record, translatable_fields, adapter: nil, source_locale: nil, target_locales: nil)
         @record = record
         @translatable_fields = Array(translatable_fields)
         @adapter = adapter || Adapters::AdapterFactory.build_for(record)
         @source_locale = source_locale
+        @target_locales = target_locales&.map(&:to_sym)
       end
 
+      # Enregistre les traductions obtenues ; renvoie false si l'une a échoué.
       def translate_to_all_locales
         return false if @translatable_fields.empty?
 
+        @failed = false
         ActiveRecord::Base.transaction do
           @translatable_fields.each do |field|
             translate_field(field)
@@ -184,7 +201,7 @@ module MistralTranslator
           @adapter.save_record!
         end
 
-        true
+        !@failed
       rescue StandardError => e
         Rails.logger.error "Translation failed: #{e.message}" if defined?(Rails)
         false
@@ -198,34 +215,57 @@ module MistralTranslator
 
         return if source_content.nil? || source_content.strip.empty?
 
+        options = rich_text_field?(field, source_locale) ? { preserve_html: true } : {}
         target_locales = @adapter.available_locales - [source_locale]
+        target_locales &= @target_locales if @target_locales
 
         target_locales.each do |target_locale|
-          translate_to_locale(field, source_content, source_locale, target_locale)
-          sleep(2) # Rate limiting basique
+          translated = translate_to_locale(field, source_content, source_locale, target_locale, options)
+          sleep(2) if translated # Rate limiting basique
         end
       end
 
-      def translate_to_locale(field, content, source_locale, target_locale)
-        translated_content = MistralTranslator.translate(
-          content,
-          from: source_locale.to_s,
-          to: target_locale.to_s
-        )
+      # Les adaptateurs fournis par l'application n'héritent pas forcément de BaseAdapter.
+      def rich_text_field?(field, locale)
+        @adapter.respond_to?(:rich_text_field?) && @adapter.rich_text_field?(field, locale)
+      end
 
-        if translated_content && !translated_content.strip.empty?
-          @adapter.set_field_value(field, target_locale,
-                                   translated_content)
-        end
-      rescue MistralTranslator::RateLimitError => e
-        Rails.logger.warn "Rate limit: #{e.message}" if defined?(Rails)
-        sleep(2)
-        retry
-      rescue StandardError => e
-        if defined?(Rails)
-          Rails.logger.error "Translation error for #{field} #{source_locale}->#{target_locale}: #{e.message}"
+      def translate_to_locale(field, content, source_locale, target_locale, options)
+        rate_limit_retries = 0
+        begin
+          translated_content = MistralTranslator.translate(
+            content,
+            from: source_locale.to_s,
+            to: target_locale.to_s,
+            **options
+          )
+
+          if translated_content && !translated_content.strip.empty?
+            @adapter.set_field_value(field, target_locale,
+                                     translated_content)
+          end
+          true
+        rescue MistralTranslator::RateLimitError => e
+          Rails.logger.warn "Rate limit: #{e.message}" if defined?(Rails)
+          rate_limit_retries += 1
+          if rate_limit_retries <= MAX_RATE_LIMIT_RETRIES
+            sleep(2)
+            retry
+          end
+          record_failure(field, source_locale, target_locale, e)
+          false
+        rescue StandardError => e
+          record_failure(field, source_locale, target_locale, e)
+          false
         end
       end
+
+      def record_failure(field, source_locale, target_locale, error)
+        @failed = true
+        return unless defined?(Rails)
+
+        Rails.logger.error "Translation error for #{field} #{source_locale}->#{target_locale}: #{error.message}"
+      end
     end
   end
 

data/lib/mistral_translator/client_helpers.rb

@@ -101,9 +101,9 @@ module MistralTranslator
           # Rate limit sera géré séparément
           nil
         when 400..499
-          raise ApiError, "Client error (#{response.code})}"
+          raise ApiError, "Client error (#{response.code})"
         when 500..599
-          raise ApiError, "Server error (#{response.code})}"
+          raise ApiError, "Server error (#{response.code})"
         end
       end
 

data/lib/mistral_translator/helpers.rb

@@ -258,10 +258,11 @@ module MistralTranslator
 
     # Module pour inclure dans les classes Rails si souhaité
     module RecordHelpers
-      def translate_with_mistral(fields, from:, to:, **)
+      def translate_with_mistral(fields, from:, to:)
         adapter = MistralTranslator::Adapters::AdapterFactory.build_for(self)
-        service = MistralTranslator::Adapters::RecordTranslationService.new(self, fields, adapter: adapter, from: from,
-                                                                                          to: to, **)
+        service = MistralTranslator::Adapters::RecordTranslationService.new(
+          self, fields, adapter: adapter, source_locale: from, target_locales: Array(to)
+        )
         service.translate_to_all_locales
       end
 

data/lib/mistral_translator/prompt_helpers.rb

@@ -51,14 +51,6 @@ module MistralTranslator
           Ne traduis que le contenu textuel à l'intérieur des balises.
         HTML_INSTRUCTION
       end
-
-      def build_html_validation_instruction
-        <<~HTML_VALIDATION
-
-          IMPORTANT : Vérifie que le HTML est valide et bien formé.
-          Corrige toute erreur de structure HTML si nécessaire.
-        HTML_VALIDATION
-      end
     end
 
     # Helper pour les instructions de formatage

data/lib/mistral_translator/prompt_metadata_helpers.rb

@@ -8,7 +8,7 @@ module MistralTranslator
       additions = []
 
       additions << '"has_context": true' if context && !context.to_s.strip.empty?
-      additions << '"has_glossary": true' if glossary && !glossary.to_s.strip.empty? && glossary.any?
+      additions << '"has_glossary": true' if glossary_present?(glossary)
       additions << '"preserve_html": true' if preserve_html
 
       additions.any? ? ",\n              #{additions.join(",\n              ")}" : ""
@@ -23,20 +23,16 @@ module MistralTranslator
       additions.any? ? ",\n              #{additions.join(",\n              ")}" : ""
     end
 
+    # Le glossaire est un Hash ou une chaîne : String ne répond pas à #any?
+    def glossary_present?(glossary)
+      return glossary.any? if glossary.is_a?(Hash)
+
+      !glossary.to_s.strip.empty?
+    end
+
     def log_prompt_generation(prompt_type, source_locale, target_locale)
       message = "Generated #{prompt_type} prompt for #{source_locale} -> #{target_locale}"
       Logger.debug_if_verbose(message, sensitive: false)
     end
-
-    def log_prompt_debug(_prompt)
-      return unless ENV["MISTRAL_TRANSLATOR_DEBUG"]
-
-      if defined?(Rails) && Rails.respond_to?(:logger)
-        Rails.logger.info message
-      elsif ENV["MISTRAL_TRANSLATOR_DEBUG"]
-        # Log de debug seulement si mode verbose activé
-        Logger.debug_if_verbose(message, sensitive: false)
-      end
-    end
   end
 end

data/lib/mistral_translator/security.rb

@@ -42,30 +42,32 @@ module MistralTranslator
         @mutex = Mutex.new
       end
 
+      # Réserve un créneau sous verrou, puis attend hors du verrou : les autres
+      # threads réservent les créneaux suivants au lieu d'être bloqués.
       def wait_and_record!
-        @mutex.synchronize do
-          cleanup_old_requests
-          if @requests.size >= @max_requests
-            wait_time = calculate_wait_time
-            sleep(wait_time) if wait_time.positive?
-          end
-          @requests << Time.now
+        wait_time = @mutex.synchronize do
+          now = Time.now
+          cleanup_old_requests(now)
+          slot = next_slot(now)
+          @requests << slot
+          slot - now
         end
+        sleep(wait_time) if wait_time.positive?
       end
 
       private
 
-      def cleanup_old_requests
-        cutoff_time = Time.now - @window_seconds
+      def cleanup_old_requests(now)
+        cutoff_time = now - @window_seconds
         @requests.reject! { |request_time| request_time < cutoff_time }
       end
 
-      def calculate_wait_time
-        return 0 if @requests.empty?
+      # Premier instant où la fenêtre compte moins de max_requests requêtes,
+      # créneaux déjà réservés compris
+      def next_slot(now)
+        return now if @requests.size < @max_requests
 
-        oldest_request = @requests.min
-        time_until_oldest_expires = (oldest_request + @window_seconds) - Time.now
-        [time_until_oldest_expires, 0].max
+        @requests.sort[@requests.size - @max_requests] + @window_seconds
       end
     end
   end

data/lib/mistral_translator/summarizer.rb

@@ -146,10 +146,13 @@ module MistralTranslator
         log_debug("Max retries reached for #{target_locale}, giving up")
         raise e
       end
-    rescue RateLimitError => e
+    rescue RateLimitError
+      # Le client a déjà relancé avec backoff : quelques tentatives de plus suffisent.
+      raise if attempt >= DEFAULT_RETRY_COUNT
+
       log_rate_limit_hit("summary", target_locale)
       sleep(DEFAULT_RETRY_DELAY)
-      retry
+      summarize_with_retry(text, target_locale, max_words, attempt + 1)
     end
     # rubocop:enable Metrics/PerceivedComplexity
 

data/lib/mistral_translator/translator.rb

@@ -71,12 +71,13 @@ module MistralTranslator
       source_locale = LocaleHelper.validate_locale!(from)
       target_locales = Array(to).map { |locale| LocaleHelper.validate_locale!(locale) }
 
+      translation_options = { context: options[:context], glossary: options[:glossary] }
+      translation_options[:preserve_html] = true if options[:preserve_html]
+
       if options[:use_batch] && target_locales.size > 3
-        translate_to_multiple_batch(text, source_locale, target_locales, context: options[:context],
-                                                                         glossary: options[:glossary])
+        translate_to_multiple_batch(text, source_locale, target_locales, **translation_options)
       else
-        translate_to_multiple_sequential(text, source_locale, target_locales, context: options[:context],
-                                                                              glossary: options[:glossary])
+        translate_to_multiple_sequential(text, source_locale, target_locales, **translation_options)
       end
     end
 
@@ -184,9 +185,12 @@ module MistralTranslator
         translate_with_retry(text, source_locale, target_locale, attempt + 1, **options)
       end
     rescue RateLimitError
+      # Le client a déjà relancé avec backoff : quelques tentatives de plus suffisent.
+      raise if attempt >= DEFAULT_RETRY_COUNT
+
       log_rate_limit_hit(source_locale, target_locale)
       sleep(DEFAULT_RETRY_DELAY)
-      retry
+      translate_with_retry(text, source_locale, target_locale, attempt + 1, **options)
     end
 
     # Ces méthodes sont héritées via RequestHelper

data/lib/mistral_translator/translator_helpers.rb

@@ -228,10 +228,14 @@ module MistralTranslator
 
     # Helper pour traductions multi-cibles
     module MultiTargetHelper
-      def translate_to_multiple_batch(text, source_locale, target_locales, context: nil, glossary: nil)
+      DEFAULT_MULTI_TARGET_OPTIONS = { context: nil, glossary: nil }.freeze
+
+      # options : context, glossary, preserve_html
+      def translate_to_multiple_batch(text, source_locale, target_locales, **options)
+        options = DEFAULT_MULTI_TARGET_OPTIONS.merge(options)
         requests = target_locales.map do |target_locale|
           {
-            prompt: build_translation_prompt(text, source_locale, target_locale, context: context, glossary: glossary),
+            prompt: build_translation_prompt(text, source_locale, target_locale, **options),
             from: source_locale,
             to: target_locale,
             original_text: text
@@ -252,13 +256,14 @@ module MistralTranslator
         results
       end
 
-      def translate_to_multiple_sequential(text, source_locale, target_locales, context: nil, glossary: nil)
+      def translate_to_multiple_sequential(text, source_locale, target_locales, **options)
+        options = DEFAULT_MULTI_TARGET_OPTIONS.merge(options)
         results = {}
 
         target_locales.each_with_index do |target_locale, index|
           sleep(MistralTranslator::Translator::DEFAULT_RETRY_DELAY) if index.positive?
           results[target_locale] =
-            translate_with_retry(text, source_locale, target_locale, context: context, glossary: glossary)
+            translate_with_retry(text, source_locale, target_locale, **options)
         end
 
         results

data/lib/mistral_translator/version.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module MistralTranslator
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 
   # Informations additionnelles sur la gem
   API_VERSION = "v1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mistral_translator
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Pierre Cherbero