Support DEEPSEEK_ACCOUNT2 and DEEPSEEK_ACCOUNT3 secrets

app/config.py

@@ -7,15 +7,15 @@ logger = logging.getLogger(__name__)
 CONFIG_PATH = os.getenv("CONFIG_PATH", "config.json")
 SENSITIVE_ACCOUNT_FIELDS = {"password", "token", "hif_dliq", "hif_leim"}
 KEYS_PLACEHOLDER = "$DEEPSEEK_API_KEY"
-ACCOUNT_PLACEHOLDER = "$DEEPSEEK_ACCOUNT"
 PASSWORD_PLACEHOLDER = "$DEEPSEEK_PASSWORD"
+ACCOUNT_ENV_NAMES = ["DEEPSEEK_ACCOUNT", "DEEPSEEK_ACCOUNT2", "DEEPSEEK_ACCOUNT3"]
 
 
-def _account_from_env() -> dict:
-    account = os.getenv("DEEPSEEK_ACCOUNT", "").strip()
-    password = os.getenv("DEEPSEEK_PASSWORD", "").strip()
-    if not account or not password:
-        return {}
+def _account_placeholders() -> set[str]:
+    return {f"${name}" for name in ACCOUNT_ENV_NAMES}
+
+
+def _account_from_value(account: str, password: str) -> dict:
     env_account = {"password": password, "token": ""}
     if "@" in account:
         env_account["email"] = account
@@ -24,6 +24,21 @@ def _account_from_env() -> dict:
     return env_account
 
 
+def _accounts_from_env() -> list[dict]:
+    password = os.getenv("DEEPSEEK_PASSWORD", "").strip()
+    if not password:
+        return []
+    accounts = []
+    seen = set()
+    for env_name in ACCOUNT_ENV_NAMES:
+        account = os.getenv(env_name, "").strip()
+        if not account or account in seen:
+            continue
+        seen.add(account)
+        accounts.append(_account_from_value(account, password))
+    return accounts
+
+
 def _merge_env_secrets(config: dict) -> dict:
     merged = dict(config) if isinstance(config, dict) else {}
 
@@ -31,33 +46,42 @@ def _merge_env_secrets(config: dict) -> dict:
     if api_key:
         merged["keys"] = [api_key]
 
-    env_account = _account_from_env()
-    if env_account:
+    env_accounts = _accounts_from_env()
+    if env_accounts:
         accounts = merged.get("accounts")
         if not isinstance(accounts, list):
             accounts = []
-        desired_identity = env_account.get("email") or env_account.get("mobile")
-        identity_key = "email" if "email" in env_account else "mobile"
-        replaced = False
+        placeholders = _account_placeholders()
+        desired_accounts = {
+            (account.get("email") or account.get("mobile")): account
+            for account in env_accounts
+        }
         merged_accounts = []
         for account in accounts:
             if not isinstance(account, dict):
                 continue
             current_identity = account.get("email") or account.get("mobile")
-            if current_identity in {desired_identity, ACCOUNT_PLACEHOLDER}:
+            if current_identity in desired_accounts or current_identity in placeholders:
+                desired_account = desired_accounts.get(current_identity)
+                if desired_account is None and len(desired_accounts) == 1:
+                    desired_account = next(iter(desired_accounts.values()))
+                if desired_account is None:
+                    continue
+                desired_identity = desired_account.get("email") or desired_account.get("mobile")
+                identity_key = "email" if "email" in desired_account else "mobile"
                 updated = {
                     k: v
                     for k, v in account.items()
                     if k not in {"email", "mobile", "password", "token", "hif_dliq", "hif_leim"}
                 }
                 updated[identity_key] = desired_identity
-                updated["password"] = env_account["password"]
+                updated["password"] = desired_account["password"]
                 merged_accounts.append(updated)
-                replaced = True
+                desired_accounts.pop(desired_identity, None)
             else:
                 merged_accounts.append(account)
-        if not replaced:
-            merged_accounts.append(env_account)
+        for remaining in desired_accounts.values():
+            merged_accounts.append(remaining)
         merged["accounts"] = merged_accounts
 
     return merged
@@ -79,8 +103,14 @@ def _sanitize_for_persistence(obj):
                 continue
             if key in SENSITIVE_ACCOUNT_FIELDS:
                 continue
-            if key in {"mobile", "email"} and os.getenv("DEEPSEEK_ACCOUNT", "").strip():
-                sanitized[key] = ACCOUNT_PLACEHOLDER
+            if key in {"mobile", "email"} and isinstance(value, str):
+                for env_name in ACCOUNT_ENV_NAMES:
+                    env_value = os.getenv(env_name, "").strip()
+                    if env_value and value == env_value:
+                        sanitized[key] = f"${env_name}"
+                        break
+                else:
+                    sanitized[key] = _sanitize_for_persistence(value)
                 continue
             sanitized[key] = _sanitize_for_persistence(value)
         return sanitized

start_hf.py

@@ -7,8 +7,8 @@ from pathlib import Path
 
 SENSITIVE_FIELDS = {"keys", "password", "token", "hif_dliq", "hif_leim"}
 KEYS_PLACEHOLDER = "$DEEPSEEK_API_KEY"
-ACCOUNT_PLACEHOLDER = "$DEEPSEEK_ACCOUNT"
 PASSWORD_PLACEHOLDER = "$DEEPSEEK_PASSWORD"
+ACCOUNT_ENV_NAMES = ["DEEPSEEK_ACCOUNT", "DEEPSEEK_ACCOUNT2", "DEEPSEEK_ACCOUNT3"]
 
 
 def _sanitize_for_persistence(obj):
@@ -27,8 +27,14 @@ def _sanitize_for_persistence(obj):
                 continue
             if key in SENSITIVE_FIELDS:
                 continue
-            if key in {"mobile", "email"} and os.getenv("DEEPSEEK_ACCOUNT", "").strip():
-                sanitized[key] = ACCOUNT_PLACEHOLDER
+            if key in {"mobile", "email"} and isinstance(value, str):
+                for env_name in ACCOUNT_ENV_NAMES:
+                    env_value = os.getenv(env_name, "").strip()
+                    if env_value and value == env_value:
+                        sanitized[key] = f"${env_name}"
+                        break
+                else:
+                    sanitized[key] = _sanitize_for_persistence(value)
                 continue
             sanitized[key] = _sanitize_for_persistence(value)
         return sanitized
@@ -55,10 +61,15 @@ def prepare_runtime_files() -> None:
 
     if os.getenv("DEEPSEEK_API_KEY", "").strip():
         config.setdefault("keys", [])
-    if os.getenv("DEEPSEEK_ACCOUNT", "").strip() and os.getenv("DEEPSEEK_PASSWORD", "").strip():
-        accounts = config.get("accounts")
-        if not isinstance(accounts, list) or not accounts:
-            config["accounts"] = [{"mobile": ACCOUNT_PLACEHOLDER, "password": PASSWORD_PLACEHOLDER}]
+    if os.getenv("DEEPSEEK_PASSWORD", "").strip():
+        placeholder_accounts = []
+        for env_name in ACCOUNT_ENV_NAMES:
+            if os.getenv(env_name, "").strip():
+                placeholder_accounts.append({"mobile": f"${env_name}", "password": PASSWORD_PLACEHOLDER})
+        if placeholder_accounts:
+            accounts = config.get("accounts")
+            if not isinstance(accounts, list) or not accounts:
+                config["accounts"] = placeholder_accounts
 
     config_path.write_text(
         json.dumps(_sanitize_for_persistence(config), ensure_ascii=False, indent=2),