v1.9.2: 修复 ctranslate2 在容器环境中的加载问题，采用延迟导入策略

Author: hgmzhn

doc/CHANGELOG_v1.9.2.md

@@ -23,6 +23,19 @@
 
 ## ⚡ 优化
 
+### 翻译器架构改进
+- **系统提示词与用户消息分离**：
+  - OpenAI 和 OpenAI HQ：系统提示词（包括断句提示、自定义提示、基础系统提示）现在放在 `system` role，用户消息只包含上下文、待翻译文本和图片
+  - Gemini 和 Gemini HQ：系统提示词放在 `system_instruction` 参数中，用户消息只包含上下文、待翻译文本和图片
+  - 图片始终放在用户消息的最后
+  - 更符合各 API 的最佳实践，提高翻译质量
+
+- **智能重试机制**：
+  - 新增重试提示功能，避免模型服务器缓存导致的重复错误
+  - 当翻译质量不合格（数量不匹配、质量检查失败、BR 标记缺失）需要重试时，会在用户消息中添加重试次数和失败原因
+  - 例如：`[Retry attempt #2] Reason: Translation count mismatch: expected 10, got 8`
+  - 有效解决某些第三方 API 代理的缓存问题
+
 ### 检测和过滤
 - **优化混合检测替换逻辑**：
   - 改进 YOLO OBB 检测器与主检测器的框合并算法
@@ -77,6 +90,38 @@
 
 ## 📝 技术细节
 
+### 翻译器消息结构优化
+
+**OpenAI 系列**：
+```python
+messages = [
+    {"role": "system", "content": "断句提示词\n\n自定义提示词\n\n基础系统提示词"},
+    {"role": "user", "content": [文本, 图片...]}  # 图片在最后
+]
+```
+
+**Gemini 系列**：
+```python
+# 初始化时
+GenerativeModel(
+    model_name="gemini-1.5-flash",
+    system_instruction="断句提示词\n\n自定义提示词\n\n基础系统提示词"
+)
+
+# 发送时
+contents = [文本, 图片...]  # 图片在最后
+```
+
+**重试提示示例**：
+```
+[Retry attempt #2] Reason: Quality check failed: Empty translation detected
+
+Please translate the following manga text regions:
+1. こんにちは
+2. さようなら
+...
+```
+
 ### 混合检测算法改进
 之前的逻辑只检查 YOLO 框是否完全包含**单个**主检测器框，可能导致以下问题：
 - YOLO 框包含了主检测器的框 A 和框 B

manga_translator/translators/__init__.py

@@ -11,7 +11,8 @@
 from .caiyun import CaiyunTranslator
 from .openai import OpenAITranslator
 from .nllb import NLLBTranslator, NLLBBigTranslator
-from .sugoi import JparacrawlTranslator, JparacrawlBigTranslator, SugoiTranslator
+# 延迟导入 sugoi 翻译器，避免在启动时加载 ctranslate2
+# from .sugoi import JparacrawlTranslator, JparacrawlBigTranslator, SugoiTranslator
 from .m2m100 import M2M100Translator, M2M100BigTranslator
 from .mbart50 import MBart50Translator
 from .selective import SelectiveOfflineTranslator, prepare as prepare_selective_translator
@@ -26,13 +27,49 @@
 from ..config import Config, Translator, TranslatorConfig, TranslatorChain
 from ..utils import Context
 
+# 延迟导入函数
+def _get_sugoi_translators():
+    """延迟导入 Sugoi 相关翻译器"""
+    from .sugoi import JparacrawlTranslator, JparacrawlBigTranslator, SugoiTranslator
+    return JparacrawlTranslator, JparacrawlBigTranslator, SugoiTranslator
+
+# 使用懒加载的占位符
+_sugoi_translators_loaded = False
+_JparacrawlTranslator = None
+_JparacrawlBigTranslator = None
+_SugoiTranslator = None
+
+def _ensure_sugoi_loaded():
+    """确保 Sugoi 翻译器已加载"""
+    global _sugoi_translators_loaded, _JparacrawlTranslator, _JparacrawlBigTranslator, _SugoiTranslator
+    if not _sugoi_translators_loaded:
+        _JparacrawlTranslator, _JparacrawlBigTranslator, _SugoiTranslator = _get_sugoi_translators()
+        _sugoi_translators_loaded = True
+
+class _LazyTranslatorProxy:
+    """延迟加载翻译器的代理类"""
+    def __init__(self, translator_name):
+        self.translator_name = translator_name
+        self._translator_class = None
+    
+    def __call__(self, *args, **kwargs):
+        if self._translator_class is None:
+            _ensure_sugoi_loaded()
+            if self.translator_name == 'sugoi':
+                self._translator_class = _SugoiTranslator
+            elif self.translator_name == 'jparacrawl':
+                self._translator_class = _JparacrawlTranslator
+            elif self.translator_name == 'jparacrawl_big':
+                self._translator_class = _JparacrawlBigTranslator
+        return self._translator_class(*args, **kwargs)
+
 OFFLINE_TRANSLATORS = {
     Translator.offline: SelectiveOfflineTranslator,
     Translator.nllb: NLLBTranslator,
     Translator.nllb_big: NLLBBigTranslator,
-    Translator.sugoi: SugoiTranslator,
-    Translator.jparacrawl: JparacrawlTranslator,
-    Translator.jparacrawl_big: JparacrawlBigTranslator,
+    Translator.sugoi: _LazyTranslatorProxy('sugoi'),
+    Translator.jparacrawl: _LazyTranslatorProxy('jparacrawl'),
+    Translator.jparacrawl_big: _LazyTranslatorProxy('jparacrawl_big'),
     Translator.m2m100: M2M100Translator,
     Translator.m2m100_big: M2M100BigTranslator,
     Translator.mbart50: MBart50Translator,

manga_translator/translators/common.py

@@ -157,7 +157,35 @@ def _check_cancelled(self):
         if self._cancel_check_callback and self._cancel_check_callback():
             raise asyncio.CancelledError("Translation cancelled by user")
 
-    def _build_user_prompt_for_texts(self, texts: List[str], ctx=None, prev_context: str = "") -> str:
+    def _get_retry_hint(self, attempt: int, reason: str = "") -> str:
+        """
+        生成重试提示信息，用于避免模型服务器缓存导致的重复错误
+        
+        Args:
+            attempt: 当前尝试次数
+            reason: 重试原因（可选）
+            
+        Returns:
+            重试提示字符串
+        """
+        hints = [
+            f"[Retry attempt #{attempt}]",
+            f"[This is attempt #{attempt}, please provide a different response]",
+            f"[Attempt {attempt}: Previous response had issues, please try again]",
+            f"[Retry #{attempt}: Please ensure quality this time]",
+            f"[Attempt {attempt} - Previous attempts failed quality check]"
+        ]
+        
+        # 根据尝试次数选择不同的提示（循环使用）
+        base_hint = hints[(attempt - 1) % len(hints)]
+        
+        # 如果提供了原因，添加到提示中
+        if reason:
+            return f"{base_hint} Reason: {reason}\n\n"
+        else:
+            return f"{base_hint}\n\n"
+    
+    def _build_user_prompt_for_texts(self, texts: List[str], ctx=None, prev_context: str = "", retry_attempt: int = 0, retry_reason: str = "") -> str:
         """
         统一的用户提示词构建方法（纯文本翻译）
         适用于 openai.py 和 gemini.py
@@ -166,6 +194,8 @@ def _build_user_prompt_for_texts(self, texts: List[str], ctx=None, prev_context:
             texts: 要翻译的文本列表
             ctx: 上下文对象（可选）
             prev_context: 历史上下文（可选）
+            retry_attempt: 重试次数（可选，用于避免缓存）
+            retry_reason: 重试原因（可选）
 
         Returns:
             构建好的用户提示词字符串
@@ -176,6 +206,10 @@ def _build_user_prompt_for_texts(self, texts: List[str], ctx=None, prev_context:
             enable_ai_break = getattr(ctx.config.render, 'disable_auto_wrap', False)
 
         prompt = ""
+        
+        # 添加重试提示（如果是重试）
+        if retry_attempt > 0:
+            prompt += self._get_retry_hint(retry_attempt, retry_reason)
 
         # 添加多页上下文（如果有）
         if prev_context:
@@ -201,7 +235,7 @@ def _build_user_prompt_for_texts(self, texts: List[str], ctx=None, prev_context:
 
         return prompt
 
-    def _build_user_prompt_for_hq(self, batch_data: List, ctx=None, prev_context: str = "") -> str:
+    def _build_user_prompt_for_hq(self, batch_data: List, ctx=None, prev_context: str = "", retry_attempt: int = 0, retry_reason: str = "") -> str:
         """
         统一的用户提示词构建方法（高质量多模态翻译）
         适用于 openai_hq.py 和 gemini_hq.py
@@ -210,6 +244,8 @@ def _build_user_prompt_for_hq(self, batch_data: List, ctx=None, prev_context: st
             batch_data: 批次数据列表，包含图片和原文
             ctx: 上下文对象（可选）
             prev_context: 历史上下文（可选）
+            retry_attempt: 重试次数（可选，用于避免缓存）
+            retry_reason: 重试原因（可选）
 
         Returns:
             构建好的用户提示词字符串
@@ -220,6 +256,10 @@ def _build_user_prompt_for_hq(self, batch_data: List, ctx=None, prev_context: st
             enable_ai_break = getattr(ctx.config.render, 'disable_auto_wrap', False)
 
         prompt = ""
+        
+        # 添加重试提示（如果是重试）
+        if retry_attempt > 0:
+            prompt += self._get_retry_hint(retry_attempt, retry_reason)
 
         # 添加多页上下文（如果有）
         if prev_context:

manga_translator/translators/gemini.py

@@ -226,9 +226,9 @@ def _build_system_prompt(self, source_lang: str, target_lang: str, custom_prompt
         final_prompt += base_prompt
         return final_prompt
 
-    def _build_user_prompt(self, texts: List[str], ctx: Any) -> str:
+    def _build_user_prompt(self, texts: List[str], ctx: Any, retry_attempt: int = 0, retry_reason: str = "") -> str:
         """构建用户提示词（纯文本版）- 使用统一方法，只包含上下文和待翻译文本"""
-        return self._build_user_prompt_for_texts(texts, ctx, self.prev_context)
+        return self._build_user_prompt_for_texts(texts, ctx, self.prev_context, retry_attempt=retry_attempt, retry_reason=retry_reason)
 
     def _get_system_instruction(self, source_lang: str, target_lang: str, custom_prompt_json: Dict[str, Any] = None, line_break_prompt_json: Dict[str, Any] = None) -> str:
         """获取完整的系统指令（包含断句提示词、自定义提示词和基础系统提示词）"""
@@ -257,20 +257,15 @@ async def _translate_batch(self, texts: List[str], source_lang: str, target_lang
             self.logger.error("Gemini客户端初始化失败")
             return texts
 
-        # 构建用户提示词（只包含上下文和待翻译文本，不包含系统指令）
-        user_prompt = self._build_user_prompt(texts, ctx)
+        # 初始化重试信息
+        retry_attempt = 0
+        retry_reason = ""
 
         # 发送请求
         max_retries = self.attempts
         attempt = 0
         is_infinite = max_retries == -1
         local_attempt = 0  # 本次批次的尝试次数
-
-        # 动态构建请求参数 - 默认总是发送安全设置
-        request_args = {
-            "contents": user_prompt,
-            "safety_settings": self.safety_settings
-        }
 
         # 标记是否需要回退（不发送安全设置）
         should_retry_without_safety = False
@@ -294,6 +289,15 @@ def generate_content_with_logging(**kwargs):
             if local_attempt > self._SPLIT_THRESHOLD and len(texts) > 1 and split_level < self._MAX_SPLIT_ATTEMPTS:
                 self.logger.warning(f"Triggering split after {local_attempt} local attempts")
                 raise self.SplitException(local_attempt, texts)
+            
+            # 构建用户提示词（包含重试信息以避免缓存）
+            user_prompt = self._build_user_prompt(texts, ctx, retry_attempt=retry_attempt, retry_reason=retry_reason)
+            
+            # 动态构建请求参数 - 默认总是发送安全设置
+            request_args = {
+                "contents": user_prompt,
+                "safety_settings": self.safety_settings
+            }
 
             try:
                 # RPM限制
@@ -371,9 +375,10 @@ def generate_content_with_logging(**kwargs):
 
                 # Strict validation: must match input count
                 if len(translations) != len(texts):
-                    attempt += 1
+                    retry_attempt += 1
+                    retry_reason = f"Translation count mismatch: expected {len(texts)}, got {len(translations)}"
                     log_attempt = f"{attempt}/{max_retries}" if not is_infinite else f"Attempt {attempt}"
-                    self.logger.warning(f"[{log_attempt}] Translation count mismatch: expected {len(texts)}, got {len(translations)}. Retrying...")
+                    self.logger.warning(f"[{log_attempt}] {retry_reason}. Retrying...")
                     self.logger.warning(f"Expected texts: {texts}")
                     self.logger.warning(f"Got translations: {translations}")
 
@@ -386,9 +391,10 @@ def generate_content_with_logging(**kwargs):
                 # 质量验证：检查空翻译、合并翻译、可疑符号等
                 is_valid, error_msg = self._validate_translation_quality(texts, translations)
                 if not is_valid:
-                    attempt += 1
+                    retry_attempt += 1
+                    retry_reason = f"Quality check failed: {error_msg}"
                     log_attempt = f"{attempt}/{max_retries}" if not is_infinite else f"Attempt {attempt}"
-                    self.logger.warning(f"[{log_attempt}] Quality check failed: {error_msg}. Retrying...")
+                    self.logger.warning(f"[{log_attempt}] {retry_reason}. Retrying...")
 
                     if not is_infinite and attempt >= max_retries:
                         raise Exception(f"Quality check failed after {max_retries} attempts: {error_msg}")
@@ -404,9 +410,10 @@ def generate_content_with_logging(**kwargs):
 
                 # BR检查：检查翻译结果是否包含必要的[BR]标记
                 if not self._validate_br_markers(translations, queries=texts, ctx=ctx):
-                    attempt += 1
+                    retry_attempt += 1
+                    retry_reason = "BR markers missing in translations"
                     log_attempt = f"{attempt}/{max_retries}" if not is_infinite else f"Attempt {attempt}"
-                    self.logger.warning(f"[{log_attempt}] BR markers missing, retrying...")
+                    self.logger.warning(f"[{log_attempt}] {retry_reason}, retrying...")
 
                     # 如果达到最大重试次数，抛出友好的异常
                     if not is_infinite and attempt >= max_retries: