Update translator.py

translator.py

@@ -1,57 +1,21 @@
+"""
+translator.py
+"""
 import hashlib, hmac, json, os, random, time
 from datetime import datetime
-from typing import List, Sequence, Optional
-import requests
-import threading
-
-APP_TENCENT_SECRET_ID  = os.environ.get("TENCENT_SECRET_ID")
-APP_TENCENT_SECRET_KEY = os.environ.get("TENCENT_SECRET_KEY")
-APP_BAIDU_CREDENTIALS  = json.loads(os.environ.get("BAIDU_CREDENTIALS_JSON", "[]"))
-APP_ACCESS_KEY         = os.environ.get("TRANSLATOR_ACCESS_KEY")
+from typing import List, Sequence, Optional, Dict, Any
 
-TENCENT_TRANSLATE_URL = os.environ.get("TENCENT_TRANSLATE_URL", "https://tmt.tencentcloudapi.com")
-BAIDU_TRANSLATE_URL = os.environ.get("BAIDU_TRANSLATE_URL", "https://fanyi-api.baidu.com/api/trans/vip/translate")
+import requests
 
-_user_keys = threading.local()
+DEFAULT_TENCENT_SECRET_ID  = os.environ.get("TENCENT_SECRET_ID")
+DEFAULT_TENCENT_SECRET_KEY = os.environ.get("TENCENT_SECRET_KEY")
+DEFAULT_TENCENT_URL = os.environ.get("TENCENT_TRANSLATE_URL", "https://tmt.tencentcloudapi.com")
 
-def set_user_provided_keys(tencent_id, tencent_key, baidu_json_str):
-    _user_keys.tencent_id = tencent_id if tencent_id else None
-    _user_keys.tencent_key = tencent_key if tencent_key else None
-    try:
-        _user_keys.baidu_credentials = json.loads(baidu_json_str) if baidu_json_str else []
-    except json.JSONDecodeError:
-        _user_keys.baidu_credentials = []
-
-def clear_user_provided_keys():
-    if hasattr(_user_keys, 'tencent_id'): del _user_keys.tencent_id
-    if hasattr(_user_keys, 'tencent_key'): del _user_keys.tencent_key
-    if hasattr(_user_keys, 'baidu_credentials'): del _user_keys.baidu_credentials
-
-def _get_tencent_credentials():
-    user_id = getattr(_user_keys, 'tencent_id', None)
-    user_key = getattr(_user_keys, 'tencent_key', None)
-    if user_id and user_key:
-        # print("DEBUG: Using user-provided Tencent keys.")
-        return user_id, user_key
-    # print("DEBUG: Using app-level Tencent keys.")
-    return APP_TENCENT_SECRET_ID, APP_TENCENT_SECRET_KEY
-
-def _get_baidu_credentials():
-    user_creds = getattr(_user_keys, 'baidu_credentials', [])
-    if user_creds:
-        # print("DEBUG: Using user-provided Baidu credentials.")
-        return user_creds
-    # print("DEBUG: Using app-level Baidu credentials.")
-    return APP_BAIDU_CREDENTIALS
-_baidu_idx = 0
-def _next_baidu_cred():
-    global _baidu_idx
-    creds_list = _get_baidu_credentials()
-    if not creds_list:
-        return None
-    cred = creds_list[_baidu_idx]
-    _baidu_idx = (_baidu_idx + 1) % len(creds_list)
-    return cred
+DEFAULT_BAIDU_URL = os.environ.get("BAIDU_TRANSLATE_URL", "https://fanyi-api.baidu.com/api/trans/vip/translate")
+try:
+    DEFAULT_BAIDU_CREDENTIALS = json.loads(os.environ.get("BAIDU_CREDENTIALS_JSON", "[]"))
+except json.JSONDecodeError:
+    DEFAULT_BAIDU_CREDENTIALS = []
 
 def _sign(key: bytes, msg: str) -> bytes:
     return hmac.new(key, msg.encode("utf-8"), hashlib.sha256).digest()
@@ -62,11 +26,16 @@ def _tc3_signature(secret_key: str, date: str, service: str, string_to_sign: str
     secret_signing  = _sign(secret_service, "tc3_request")
     return hmac.new(secret_signing, string_to_sign.encode("utf-8"), hashlib.sha256).hexdigest()
 
-def _translate_with_tencent(texts: Sequence[str], src="auto", tgt="zh") -> Optional[List[str]]:
-    secret_id, secret_key = _get_tencent_credentials()
+def _translate_with_tencent_dynamic(
+    texts: Sequence[str],
+    secret_id: str,
+    secret_key: str,
+    url: str,
+    src="auto",
+    tgt="zh"
+) -> Optional[List[str]]:
     if not (secret_id and secret_key):
         return None
-
     service, host, action, version, region = "tmt", "tmt.tencentcloudapi.com", "TextTranslate", "2018-03-21", "ap-beijing"
     ts = int(time.time())
     date = datetime.utcfromtimestamp(ts).strftime("%Y-%m-%d")
@@ -74,78 +43,112 @@ def _translate_with_tencent(texts: Sequence[str], src="auto", tgt="zh") -> Optio
 
     payload = {"SourceText": "\n".join(texts), "Source": src, "Target": tgt, "ProjectId": 0}
     payload_str = json.dumps(payload, ensure_ascii=False)
-    hashed_request_payload = hashlib.sha256(payload_str.encode()).hexdigest()
 
-    canonical_headers = f"content-type:application/json; charset=utf-8\nhost:{host}\nx-tc-action:{action.lower()}\n"
-    signed_headers = "content-type;host;x-tc-action"
-    canonical_request = f"POST\n/\n\n{canonical_headers}\n{signed_headers}\n{hashed_request_payload}"
-    
+    canonical_request = "\n".join([
+        "POST", "/", "", f"content-type:application/json; charset=utf-8\nhost:{host}\nx-tc-action:{action.lower()}\n",
+        "content-type;host;x-tc-action", hashlib.sha256(payload_str.encode()).hexdigest(),
+    ])
     credential_scope = f"{date}/{service}/tc3_request"
-    string_to_sign = f"{algorithm}\n{ts}\n{credential_scope}\n{hashlib.sha256(canonical_request.encode()).hexdigest()}"
-    
+    string_to_sign = "\n".join([
+        algorithm, str(ts), credential_scope, hashlib.sha256(canonical_request.encode()).hexdigest(),
+    ])
     signature = _tc3_signature(secret_key, date, service, string_to_sign)
-    authorization = f"{algorithm} Credential={secret_id}/{credential_scope}, SignedHeaders={signed_headers}, Signature={signature}"
-
+    authorization = (
+        f"{algorithm} Credential={secret_id}/{credential_scope}, "
+        f"SignedHeaders=content-type;host;x-tc-action, Signature={signature}"
+    )
     headers = {
-        "Authorization": authorization, "Content-Type": "application/json; charset=utf-8",
-        "Host": host, "X-TC-Action": action, "X-TC-Timestamp": str(ts),
-        "X-TC-Version": version, "X-TC-Region": region,
+        "Authorization": authorization, "Content-Type": "application/json; charset=utf-8", "Host": host,
+        "X-TC-Action": action, "X-TC-Timestamp": str(ts), "X-TC-Version": version, "X-TC-Region": region,
     }
 
     try:
-        resp = requests.post(TENCENT_TRANSLATE_URL, headers=headers, data=payload_str, timeout=8)
+        resp = requests.post(url, headers=headers, data=payload_str, timeout=8)
         resp.raise_for_status()
         data = resp.json()
-        if "Error" in data.get("Response", {}):
-            print(f"[translator] Tencent API returned error: {data['Response']['Error']['Message']}")
-            return None
         return data["Response"]["TargetText"].split("\n")
     except Exception as e:
-        print(f"[translator] Tencent API request failed → {e}")
+        print(f"[translator] Dynamic Tencent API error → {e}")
         return None
 
-def _translate_with_baidu(texts: Sequence[str], src="auto", tgt="zh") -> Optional[List[str]]:
-    creds = _next_baidu_cred()
-    if not creds:
+def _translate_with_baidu_dynamic(
+    texts: Sequence[str],
+    baidu_creds_list: List[Dict[str, str]],
+    url: str,
+    src="auto",
+    tgt="zh"
+) -> Optional[List[str]]:
+    if not baidu_creds_list:
+        return None
+    
+    cred = random.choice(baidu_creds_list)
+    app_id, secret_key = cred.get("app_id"), cred.get("secret_key")
+    if not (app_id and secret_key):
         return None
-    app_id, secret_key = creds["app_id"], creds["secret_key"]
-    salt = random.randint(32768, 65536)
+
+    salt  = random.randint(32768, 65536)
     query = "\n".join(texts)
-    sign = hashlib.md5((app_id + query + str(salt) + secret_key).encode()).hexdigest()
+    sign  = hashlib.md5((app_id + query + str(salt) + secret_key).encode()).hexdigest()
     params = {"q": query, "from": src, "to": tgt, "appid": app_id, "salt": salt, "sign": sign}
-    
     try:
-        resp = requests.get(BAIDU_TRANSLATE_URL, params=params, timeout=8)
+        resp = requests.get(url, params=params, timeout=8)
         resp.raise_for_status()
         data = resp.json()
-        if "error_code" in data:
-            print(f"[translator] Baidu API returned error: {data['error_msg']} (code: {data['error_code']})")
+        if "trans_result" in data:
+            return [item["dst"] for item in data["trans_result"]]
+        else:
+            print(f"[translator] Baidu API returned error: {data.get('error_msg', 'Unknown error')}")
             return None
-        return [item["dst"] for item in data["trans_result"]]
     except Exception as e:
-        print(f"[translator] Baidu API request failed → {e}")
+        print(f"[translator] Dynamic Baidu API error → {e}")
         return None
 
-def translate_texts(texts: Sequence[str],
-                    src_lang: str = "auto",
-                    tgt_lang: str = "zh",
-                    access_key: str = None) -> List[str]:
+def translate_texts_with_dynamic_keys(
+    texts: Sequence[str],
+    tencent_id: str,
+    tencent_key: str,
+    baidu_json_str: str,
+    src_lang: str = "auto",
+    tgt_lang: str = "zh"
+) -> List[str]:
+    """
+    使用传入的密钥进行翻译。
+    """
     if not texts:
         return []
 
-    has_user_tencent = getattr(_user_keys, 'tencent_id', None) and getattr(_user_keys, 'tencent_key', None)
-    has_user_baidu = bool(getattr(_user_keys, 'baidu_credentials', []))
-
-    can_use_app_keys = False
-    if not (has_user_tencent or has_user_baidu):
-        if not APP_ACCESS_KEY:
-            can_use_app_keys = True
-        elif access_key and access_key == APP_ACCESS_KEY:
-            can_use_app_keys = True
-    if has_user_tencent or has_user_baidu or can_use_app_keys:
-        out = _translate_with_tencent(texts, src_lang, tgt_lang)
-        if out is None:
-            out = _translate_with_baidu(texts, src_lang, tgt_lang)
+    if tencent_id and tencent_key:
+        out = _translate_with_tencent_dynamic(texts, tencent_id, tencent_key, DEFAULT_TENCENT_URL, src_lang, tgt_lang)
         if out is not None:
             return out
-    return list(texts)
+    
+    baidu_creds = []
+    if baidu_json_str:
+        try:
+            baidu_creds = json.loads(baidu_json_str)
+            if not isinstance(baidu_creds, list): baidu_creds = []
+        except json.JSONDecodeError:
+            print("[translator] Invalid Baidu JSON provided by user.")
+            baidu_creds = []
+
+    if baidu_creds:
+        out = _translate_with_baidu_dynamic(texts, baidu_creds, DEFAULT_BAIDU_URL, src_lang, tgt_lang)
+        if out is not None:
+            return out
+
+    return list(texts)
+
+def translate_texts(texts: Sequence[str],
+                    src_lang: str = "auto",
+                    tgt_lang: str = "zh") -> List[str]:
+    """
+    (供所有者使用) 封装了对动态密钥函数的调用，使用环境变量中的默认凭证。
+    """
+    return translate_texts_with_dynamic_keys(
+        texts,
+        DEFAULT_TENCENT_SECRET_ID,
+        DEFAULT_TENCENT_SECRET_KEY,
+        json.dumps(DEFAULT_BAIDU_CREDENTIALS),
+        src_lang,
+        tgt_lang
+    )