add content translate prompt

rss-translator · May 9, 2024 · 0f9d786 · 0f9d786
1 parent fbe75e4
commit 0f9d786
Show file tree

Hide file tree

Showing 15 changed files with 211 additions and 35 deletions.
diff --git a/core/tasks.py b/core/tasks.py
@@ -237,7 +237,7 @@ def translate_feed(
                 cached = Translated_Content.is_translated(title, target_language)  # check cache db
                 translated_text = ''
                 if not cached:
-                    results = translate_engine.translate(title, target_language=target_language)
+                    results = translate_engine.translate(title, target_language=target_language, text_type="title")
                     translated_text = results.get("text", title)
                     total_tokens += results.get("tokens", 0)
                     translated_characters += len(title)
@@ -371,7 +371,7 @@ def content_translate(original_content: str, target_language: str, engine: Trans
             cached = Translated_Content.is_translated(text, target_language)
 
             if not cached:
-                results = engine.translate(text, target_language=target_language)
+                results = engine.translate(text, target_language=target_language, text_type="content")
                 total_tokens += results.get("tokens", 0)
                 total_characters += len(text)
 

diff --git a/locale/zh_Hans/LC_MESSAGES/django.po b/locale/zh_Hans/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-09 13:01+0000\n"
+"POT-Creation-Date: 2024-05-09 22:16+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,15 +38,15 @@ msgstr "引擎"
 msgid "Translator"
 msgstr "翻译器"
 
-#: core/admin.py:150 core/admin.py:376
+#: core/admin.py:150 core/admin.py:377
 msgid "Translated Feed URL"
 msgstr "翻译源地址"
 
-#: core/admin.py:158 core/admin.py:270 core/admin.py:367
+#: core/admin.py:158 core/admin.py:270 core/admin.py:368
 msgid "Size(KB)"
 msgstr "文件大小(KB)"
 
-#: core/admin.py:165 core/admin.py:384
+#: core/admin.py:165 core/admin.py:385
 msgid "Status"
 msgstr "状态"
 
@@ -70,11 +70,11 @@ msgstr "翻译语言"
 msgid "Valid"
 msgstr "验证"
 
-#: core/admin.py:289 core/models.py:16
+#: core/admin.py:290 core/models.py:16
 msgid "Feed URL"
 msgstr "源地址"
 
-#: core/admin.py:349 core/admin.py:422
+#: core/admin.py:350 core/admin.py:423
 msgid "Batch modification"
 msgstr "批量修改"
 
@@ -302,7 +302,17 @@ msgstr ""
 msgid "API URL"
 msgstr ""
 
-#: translator/models/claude.py:16 translator/models/deepl.py:13
+#: translator/models/base.py:85 translator/models/claude.py:15
+#: translator/models/gemini.py:15
+msgid "Title Translate Prompt"
+msgstr "标题翻译提示词"
+
+#: translator/models/base.py:86 translator/models/claude.py:16
+#: translator/models/gemini.py:16
+msgid "Content Translate Prompt"
+msgstr "内容翻译提示词"
+
+#: translator/models/claude.py:18 translator/models/deepl.py:13
 #: translator/models/deeplweb.py:12
 #: translator/models/google_translate_web.py:10
 msgid "Proxy(optional)"
@@ -313,7 +323,7 @@ msgid "API URL(optional)"
 msgstr ""
 
 #: translator/models/deeplweb.py:11 translator/models/deeplx.py:13
-#: translator/models/dev.py:11 translator/models/gemini.py:21
+#: translator/models/dev.py:11 translator/models/gemini.py:22
 #: translator/models/google_translate_web.py:11
 msgid "Request Interval(s)"
 msgstr "请求间隔"
@@ -322,10 +332,10 @@ msgstr "请求间隔"
 msgid "URL"
 msgstr ""
 
-#: utils/modelAdmin_utils.py:33 utils/modelAdmin_utils.py:47
+#: utils/modelAdmin_utils.py:34 utils/modelAdmin_utils.py:48
 msgid "Export selected feeds as OPML"
 msgstr "导出为 OPML"
 
-#: utils/modelAdmin_utils.py:58 utils/modelAdmin_utils.py:69
+#: utils/modelAdmin_utils.py:59 utils/modelAdmin_utils.py:70
 msgid "Force update"
 msgstr "强制更新"
diff --git a/templates/admin/base_site.html b/templates/admin/base_site.html
@@ -4,7 +4,7 @@
 <div id="footer" style="text-align: center;">
     <a href="https://rsstranslator.com" title="RSS Translator">RSS Translator</a> ·
     <a href="https://afdian.net/a/versun" title="Donate">Donate</a> ·
-    Version: 2024.5.9
+    Version: 2024.5.10
 
     <!--    <div class="social">-->
 

diff --git a/translator/admin.py b/translator/admin.py
@@ -12,7 +12,8 @@
 
 
 class BaseTranslatorAdmin(admin.ModelAdmin):
-    get_model_perms = lambda self, request: {} # 不显示在admin页面
+    get_model_perms = lambda self, request: {}  # 不显示在admin页面
+
     def save_model(self, request, obj, form, change):
         logging.info("Call save_model: %s", obj)
         # obj.valid = None
@@ -24,7 +25,7 @@ def save_model(self, request, obj, form, change):
             logging.error("Error in translator: %s", e)
         finally:
             obj.save()
-        return redirect('/translator')
+        return redirect("/translator")
 
     def is_valid(self, obj):
         return valid_icon(obj.valid)
@@ -38,11 +39,12 @@ def masked_api_key(self, obj):
         return ""
 
     masked_api_key.short_description = "API Key"
-    
+
     def delete_model(self, request, obj):
         super().delete_model(request, obj)
         # 重定向到指定URL
-        return redirect('/translator')
+        return redirect("/translator")
+
 
 class OpenAITranslatorAdmin(BaseTranslatorAdmin):
     fields = [
@@ -51,6 +53,7 @@ class OpenAITranslatorAdmin(BaseTranslatorAdmin):
         "base_url",
         "model",
         "translate_prompt",
+        "content_translate_prompt",
         "summary_prompt",
         "temperature",
         "top_p",
@@ -64,6 +67,7 @@ class OpenAITranslatorAdmin(BaseTranslatorAdmin):
         "masked_api_key",
         "model",
         "translate_prompt",
+        "content_translate_prompt",
         "summary_prompt",
         "max_tokens",
         "base_url",
@@ -78,6 +82,7 @@ class AzureAITranslatorAdmin(BaseTranslatorAdmin):
         "version",
         "model",
         "translate_prompt",
+        "content_translate_prompt",
         "summary_prompt",
         "temperature",
         "top_p",
@@ -92,6 +97,7 @@ class AzureAITranslatorAdmin(BaseTranslatorAdmin):
         "model",
         "version",
         "translate_prompt",
+        "content_translate_prompt",
         "summary_prompt",
         "max_tokens",
         "base_url",
@@ -144,6 +150,7 @@ class GeminiTranslatorAdmin(BaseTranslatorAdmin):
         "api_key",
         "model",
         "translate_prompt",
+        "content_translate_prompt",
         "summary_prompt",
         "temperature",
         "top_p",
@@ -157,6 +164,7 @@ class GeminiTranslatorAdmin(BaseTranslatorAdmin):
         "masked_api_key",
         "model",
         "translate_prompt",
+        "content_translate_prompt",
         "summary_prompt",
         "max_tokens",
         "interval",
@@ -182,6 +190,7 @@ class ClaudeTranslatorAdmin(BaseTranslatorAdmin):
         "base_url",
         "model",
         "translate_prompt",
+        "content_translate_prompt",
         "summary_prompt",
         "temperature",
         "top_p",
@@ -195,6 +204,7 @@ class ClaudeTranslatorAdmin(BaseTranslatorAdmin):
         "masked_api_key",
         "model",
         "translate_prompt",
+        "content_translate_prompt",
         "summary_prompt",
         "max_tokens",
         "base_url",
@@ -208,6 +218,7 @@ class MoonshotAITranslatorAdmin(BaseTranslatorAdmin):
         "base_url",
         "model",
         "translate_prompt",
+        "content_translate_prompt",
         "summary_prompt",
         "temperature",
         "top_p",
@@ -221,6 +232,7 @@ class MoonshotAITranslatorAdmin(BaseTranslatorAdmin):
         "masked_api_key",
         "model",
         "translate_prompt",
+        "content_translate_prompt",
         "summary_prompt",
         "max_tokens",
         "base_url",
@@ -234,6 +246,7 @@ class TogetherAITranslatorAdmin(BaseTranslatorAdmin):
         "base_url",
         "model",
         "translate_prompt",
+        "content_translate_prompt",
         "summary_prompt",
         "temperature",
         "top_p",
@@ -247,6 +260,7 @@ class TogetherAITranslatorAdmin(BaseTranslatorAdmin):
         "masked_api_key",
         "model",
         "translate_prompt",
+        "content_translate_prompt",
         "summary_prompt",
         "max_tokens",
         "base_url",
@@ -260,6 +274,7 @@ class OpenRouterAITranslatorAdmin(BaseTranslatorAdmin):
         "base_url",
         "model",
         "translate_prompt",
+        "content_translate_prompt",
         "summary_prompt",
         "temperature",
         "top_p",
@@ -273,6 +288,7 @@ class OpenRouterAITranslatorAdmin(BaseTranslatorAdmin):
         "masked_api_key",
         "model",
         "translate_prompt",
+        "content_translate_prompt",
         "summary_prompt",
         "max_tokens",
         "base_url",
@@ -286,6 +302,7 @@ class GroqTranslatorAdmin(BaseTranslatorAdmin):
         "base_url",
         "model",
         "translate_prompt",
+        "content_translate_prompt",
         "summary_prompt",
         "temperature",
         "top_p",
@@ -299,6 +316,7 @@ class GroqTranslatorAdmin(BaseTranslatorAdmin):
         "masked_api_key",
         "model",
         "translate_prompt",
+        "content_translate_prompt",
         "summary_prompt",
         "max_tokens",
         "base_url",
@@ -332,6 +350,7 @@ class TestTranslatorAdmin(BaseTranslatorAdmin):
     fields = ["name", "translated_text", "max_characters", "interval"]
     list_display = ["name", "is_valid", "translated_text", "max_characters", "interval"]
 
+
 core_admin_site.register(OpenAITranslator, OpenAITranslatorAdmin)
 core_admin_site.register(AzureAITranslator, AzureAITranslatorAdmin)
 core_admin_site.register(DeepLTranslator, DeepLTranslatorAdmin)
@@ -340,7 +359,9 @@ class TestTranslatorAdmin(BaseTranslatorAdmin):
 core_admin_site.register(MicrosoftTranslator, MicrosoftTranslatorAdmin)
 core_admin_site.register(CaiYunTranslator, CaiYunTranslatorAdmin)
 core_admin_site.register(GeminiTranslator, GeminiTranslatorAdmin)
-core_admin_site.register(GoogleTranslateWebTranslator, GoogleTranslateWebTranslatorAdmin)
+core_admin_site.register(
+    GoogleTranslateWebTranslator, GoogleTranslateWebTranslatorAdmin
+)
 core_admin_site.register(ClaudeTranslator, ClaudeTranslatorAdmin)
 core_admin_site.register(MoonshotAITranslator, MoonshotAITranslatorAdmin)
 core_admin_site.register(TogetherAITranslator, TogetherAITranslatorAdmin)