Merge pull request #5 from wanniwa/3.0.0

3.0.0

Author: wanniwa

.gitignore

@@ -1,6 +1,10 @@
 .idea
+.vscode
 .venv
 /dist
 /build
 AppData
 /log
+__pycache__
+.DS_Store
+dist.zip

README.md

@@ -58,6 +58,13 @@ If my tool has been helpful for your translation work, I would appreciate it if
 4. click Generate button
 5. After completing the generation, a mod translation package will be generated
 
+## Changelog
+
+- **3.0.0**
+  - **Translation model**: Fully revamped translation model support, bringing better quality, stability and compatibility.
+  - **Core**: Optimized the translation workflow to better cooperate with the new models.
+  - **Other**: Minor experience improvements and bug fixes.
+
 ## Support framework
 1. [CP] Content Patcher
 2. [i18n] i18n/default.json

Transtar.spec

@@ -0,0 +1,58 @@
+# -*- mode: python ; coding: utf-8 -*-
+from PyInstaller.utils.hooks import collect_all
+
+datas = []
+binaries = []
+hiddenimports = ['sklearn', 'PySide6-Fluent-Widgets~=1.10.4', 'pyside6~=6.10.1', 'hjson~=3.1.0', 'translatepy~=2.3', 'rich~=14.2.0', 'deepl~=1.27.0', 'packaging>=25.0', 'appdirs', '', 'google-genai', 'openai', 'boto3', 'cohere', 'anthropic', 'tiktoken']
+tmp_ret = collect_all('sklearn')
+datas += tmp_ret[0]; binaries += tmp_ret[1]; hiddenimports += tmp_ret[2]
+
+
+a = Analysis(
+    ['main.py'],
+    pathex=[],
+    binaries=binaries,
+    datas=datas,
+    hiddenimports=hiddenimports,
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=['jaxlib'],
+    noarchive=False,
+    optimize=0,
+)
+pyz = PYZ(a.pure)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    [],
+    exclude_binaries=True,
+    name='Transtar',
+    debug=False,
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    console=False,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+    icon=['app/resource/images/icon.icns'],
+)
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name='Transtar',
+)
+app = BUNDLE(
+    coll,
+    name='Transtar.app',
+    icon='./app/resource/images/icon.icns',
+    bundle_identifier=None,
+)

app/api/paratranz/api.py

@@ -1,5 +1,5 @@
 from typing import List, Dict
-from ...common.config import cfg
+from ...common.config import appConfig
 from ..base import BaseAPI
 from .exceptions import ParatranzAPIError
 import wjson
@@ -12,17 +12,17 @@ class ParatranzAPI(BaseAPI):
 
     def get_headers(self) -> Dict[str, str]:
         """获取请求头"""
-        if not cfg.paratranz_token.value:
+        if not appConfig.paratranz_token.value:
             raise ParatranzAPIError("Paratranz token not configured")
         return {
-            'Authorization': cfg.paratranz_token.value,
+            'Authorization': appConfig.paratranz_token.value,
         }
 
     def _get_project_id(self) -> str:
         """获取项目ID"""
-        if not cfg.paratranz_project_id.value:
+        if not appConfig.paratranz_project_id.value:
             raise ParatranzAPIError("Paratranz project ID not configured")
-        return cfg.paratranz_project_id.value
+        return appConfig.paratranz_project_id.value
 
     def get_project_files(self) -> List[dict]:
         """获取项目文件列表"""

app/common/config.py

@@ -1,16 +1,16 @@
 # coding:utf-8
+import json
+import os
 import sys
 from enum import Enum
 
 from PySide6.QtCore import QLocale
 from qfluentwidgets import (qconfig, QConfig, ConfigItem, OptionsConfigItem, BoolValidator,
                             OptionsValidator, Theme, ConfigSerializer, RangeConfigItem, RangeValidator)
 
-from .setting import CONFIG_FILE
+from .setting import CONFIG_FILE, TRANS_CONFIG_FILE
 from .constant import LANGUAGES
 
-models = ['google', 'deepl', 'gpt-3.5-turbo', 'gpt-4', 'gpt-4-turbo-2024-04-09', 'gpt-4o', 'gpt-4o-mini', 'custom model']
-
 
 class Language(Enum):
     """ Language enumeration """
@@ -46,16 +46,6 @@ class Config(QConfig):
     """ Config of application """
     i18n_extract_cp = ConfigItem("Translation", "i18n_extract_cp", False, BoolValidator())
     i18n_source_flag = ConfigItem("Translation", "i18n_source_flag", False, BoolValidator())
-    trans_model = OptionsConfigItem("Translation", "trans_model", "google", OptionsValidator(models))
-    ai_base_url = OptionsConfigItem("Translation", "ai_base_url", "")
-    trans_custom_model = OptionsConfigItem("Translation", "trans_custom_model", "")
-
-    ai_batch_size = RangeConfigItem("Translation", "ai_batch_size", 5, RangeValidator(1, 50))
-    thread_count = RangeConfigItem("Translation", "thread_count", 5, RangeValidator(1, 20))
-    ai_prompt = ConfigItem("Translation", "ai_prompt",
-                           "You are currently a professional Stardew Valley mod translator. ", None)
-    api_key = ConfigItem("Translation", "api_key", "", None)
-
     source_language = OptionsConfigItem(
         "Translation", "source_language", LANGUAGES['English'], OptionsValidator(LANGUAGES.values()), restart=False)
     to_language = OptionsConfigItem(
@@ -71,7 +61,29 @@ class Config(QConfig):
     # 本地字典界面每页显示条数
     localDictPageSize = ConfigItem("LocalDict", "pageSize", 100)
 
+    # 任务设置
+    trans_platform = ConfigItem("TaskSettings", "trans_platform", "google", None)
+    task_prompt = ConfigItem("TaskSettings", "prompt", "You are currently a professional Stardew Valley mod translator.", None)
+    task_split_mode = OptionsConfigItem("TaskSettings", "split_mode", "token", OptionsValidator(["token", "count"]))
+    task_split_token_limit = RangeConfigItem("TaskSettings", "split_token_limit", 3000, RangeValidator(100, 200000))
+    task_token_reserve = RangeConfigItem("TaskSettings", "token_reserve", 512, RangeValidator(0, 20000))
+    task_split_count_limit = RangeConfigItem("TaskSettings", "split_count_limit", 20, RangeValidator(1, 500))
+    task_concurrency = RangeConfigItem("TaskSettings", "concurrency", 0, RangeValidator(0, 100))
+    task_request_timeout = RangeConfigItem("TaskSettings", "request_timeout", 120, RangeValidator(10, 3600))
+    task_max_rounds = RangeConfigItem("TaskSettings", "max_rounds", 1, RangeValidator(1, 50))
+
+
+# 载入配置文件
+def load_config(path) -> dict:
+    config = {}
+    if os.path.exists(path):
+        with open(path, "r", encoding="utf-8") as reader:
+            config = json.load(reader)
+    return config
+
+
+appConfig = Config()
+appConfig.themeMode.value = Theme.AUTO
+qconfig.load(str(CONFIG_FILE.absolute()), appConfig)
 
-cfg = Config()
-cfg.themeMode.value = Theme.AUTO
-qconfig.load(str(CONFIG_FILE.absolute()), cfg)
+# transConfig = load_config(str(TRANS_CONFIG_FILE.absolute()))

app/common/constant.py

@@ -14,6 +14,7 @@
     "Portuguese": "pt",
     "Russian": "ru",
     "Spanish": "es",
+    "Thai": "th",
     "Turkish": "tr",
     "Vietnamese": "vi",
     "Bahasa Indonesia": "id"