反重力缓存

Author: su-kaka

config.py

@@ -39,6 +39,7 @@
     "COMPATIBILITY_MODE": "compatibility_mode_enabled",
     "RETURN_THOUGHTS_TO_FRONTEND": "return_thoughts_to_frontend",
     "ANTIGRAVITY_STREAM2NOSTREAM": "antigravity_stream2nostream",
+    "ANTIGRAVITY_SWITCH_CREDENTIAL": "antigravity_switch_credential_enabled",
     "HOST": "host",
     "PORT": "port",
     "API_PASSWORD": "api_password",
@@ -354,6 +355,24 @@ async def get_antigravity_stream2nostream() -> bool:
     return bool(await get_config_value("antigravity_stream2nostream", True))
 
 
+async def get_antigravity_switch_credential_enabled() -> bool:
+    """
+    Get antigravity switch credential setting.
+
+    控制antigravity在重试时是否切换凭证。
+    禁用时会持续使用当前凭证，直到该凭证对当前模型进入CD或被禁用。
+
+    Environment variable: ANTIGRAVITY_SWITCH_CREDENTIAL
+    Database config key: antigravity_switch_credential_enabled
+    Default: False
+    """
+    env_value = os.getenv("ANTIGRAVITY_SWITCH_CREDENTIAL")
+    if env_value:
+        return env_value.lower() in ("true", "1", "yes", "on")
+
+    return bool(await get_config_value("antigravity_switch_credential_enabled", False))
+
+
 async def get_oauth_proxy_url() -> str:
     """
     Get OAuth proxy URL setting.

front/common.js

@@ -2756,6 +2756,7 @@ function populateConfigForm() {
     document.getElementById('compatibilityModeEnabled').checked = Boolean(c.compatibility_mode_enabled);
     document.getElementById('returnThoughtsToFrontend').checked = Boolean(c.return_thoughts_to_frontend !== false);
     document.getElementById('antigravityStream2nostream').checked = Boolean(c.antigravity_stream2nostream !== false);
+    document.getElementById('antigravitySwitchCredentialEnabled').checked = Boolean(c.antigravity_switch_credential_enabled);
 
     setConfigField('antiTruncationMaxAttempts', c.anti_truncation_max_attempts || 3);
 
@@ -2809,6 +2810,7 @@ async function saveConfig() {
             compatibility_mode_enabled: getChecked('compatibilityModeEnabled'),
             return_thoughts_to_frontend: getChecked('returnThoughtsToFrontend'),
             antigravity_stream2nostream: getChecked('antigravityStream2nostream'),
+            antigravity_switch_credential_enabled: getChecked('antigravitySwitchCredentialEnabled'),
             anti_truncation_max_attempts: getInt('antiTruncationMaxAttempts', 3),
             keepalive_url: getValue('keepaliveUrl'),
             keepalive_interval: getInt('keepaliveInterval', 60)

front/control_panel.html

@@ -2194,6 +2194,19 @@ <h4>兼容性配置</h4>
                                     <br><strong>默认：</strong>已启用
                                 </div>
                             </div>
+
+                            <div class="form-group">
+                                <label>
+                                    <input type="checkbox" id="antigravitySwitchCredentialEnabled" class="config-checkbox" />
+                                    Antigravity切换凭证
+                                </label>
+                                <small class="config-note">启用后重试时切换凭证；禁用时保持当前凭证，直到该凭证对当前模型进入CD或被禁用 <span
+                                        style="color: #28a745;">✓ 支持热更新</span></small>
+                                <div class="config-info"
+                                    style="background-color: #e8f5e9; border: 1px solid #66bb6a; color: #1b5e20;">
+                                    <strong>✅ 说明：</strong>默认关闭，便于连续使用同一凭证；当发生模型CD或自动禁用时仍会切换。
+                                </div>
+                            </div>
                         </div>
 
                         <div class="config-group">

front/control_panel_mobile.html

@@ -1927,6 +1927,21 @@ <h4 style="margin-top: 0; margin-bottom: 15px;">兼容性配置</h4>
                                     <br><strong>默认：</strong>已启用
                                 </div>
                             </div>
+
+                            <div class="form-group">
+                                <label style="display: flex; align-items: center; gap: 8px;">
+                                    <input type="checkbox" id="antigravitySwitchCredentialEnabled"
+                                        style="width: auto; margin: 0;" />
+                                    Antigravity切换凭证
+                                </label>
+                                <small
+                                    style="display: block; color: #666; font-size: 12px; margin-top: 5px;">启用后重试时切换凭证；禁用时保持当前凭证，直到该凭证对当前模型进入CD或被禁用
+                                    <span style="color: #28a745;">✓ 支持热更新</span></small>
+                                <div
+                                    style="background-color: #e8f5e9; border: 1px solid #66bb6a; border-radius: 6px; padding: 12px; margin-top: 8px; font-size: 13px; color: #1b5e20;">
+                                    <strong>✅ 说明：</strong>默认关闭，便于连续使用同一凭证；当发生模型CD或自动禁用时仍会切换。
+                                </div>
+                            </div>
                         </div>
 
                         <div class="card">

src/api/antigravity.py

@@ -14,6 +14,7 @@
 from config import (
     get_antigravity_api_url,
     get_antigravity_stream2nostream,
+    get_antigravity_switch_credential_enabled,
     get_auto_ban_error_codes,
 )
 from log import log
@@ -26,6 +27,7 @@
 # 导入共同的基础功能
 from src.api.utils import (
     handle_error_with_retry,
+    check_should_auto_ban,
     get_retry_config,
     record_api_call_success,
     record_api_call_error,
@@ -262,6 +264,7 @@ async def stream_request(
         Response对象（错误时）或 bytes流/str流（成功时）
     """
     model_name = body.get("model", "")
+    switch_credential_enabled = await get_antigravity_switch_credential_enabled()
 
     # 1. 获取有效凭证
     cred_result = await credential_manager.get_valid_credential(
@@ -361,6 +364,7 @@ def apply_cred_result(cred_result: Tuple[str, Dict[str, Any]]) -> bool:
     for attempt in range(max_retries + 1):
         success_recorded = False  # 标记是否已记录成功
         need_retry = False  # 标记是否需要重试
+        should_force_switch = False
 
         try:
             async for chunk in stream_post_async(
@@ -393,8 +397,13 @@ def apply_cred_result(cred_result: Tuple[str, Dict[str, Any]]) -> bool:
                             except Exception:
                                 pass
 
+                        if cooldown_until is not None:
+                            should_force_switch = True
+                        elif await check_should_auto_ban(status_code):
+                            should_force_switch = True
+
                         # 预热下一个凭证
-                        if next_cred_task is None and attempt < max_retries:
+                        if (switch_credential_enabled or should_force_switch) and next_cred_task is None and attempt < max_retries:
                             next_cred_task = asyncio.create_task(
                                 credential_manager.get_valid_credential(
                                     mode="antigravity", model_name=model_name
@@ -479,21 +488,24 @@ def apply_cred_result(cred_result: Tuple[str, Dict[str, Any]]) -> bool:
             if need_retry:
                 log.info(f"[ANTIGRAVITY STREAM] 重试请求 (attempt {attempt + 2}/{max_retries + 1})...")
 
-                switched, next_cred_task = await _switch_credential_for_retry(
-                    next_cred_task=next_cred_task,
-                    retry_interval=retry_interval,
-                    refresh_credential_fast=refresh_credential_fast,
-                    apply_cred_result=apply_cred_result,
-                    log_prefix="[ANTIGRAVITY STREAM]",
-                )
-                if not switched:
-                    log.error("[ANTIGRAVITY STREAM] 重试时无可用凭证或令牌")
-                    yield Response(
-                        content=json.dumps({"error": "当前无可用凭证"}),
-                        status_code=500,
-                        media_type="application/json"
+                if switch_credential_enabled or should_force_switch:
+                    switched, next_cred_task = await _switch_credential_for_retry(
+                        next_cred_task=next_cred_task,
+                        retry_interval=retry_interval,
+                        refresh_credential_fast=refresh_credential_fast,
+                        apply_cred_result=apply_cred_result,
+                        log_prefix="[ANTIGRAVITY STREAM]",
                     )
-                    return
+                    if not switched:
+                        log.error("[ANTIGRAVITY STREAM] 重试时无可用凭证或令牌")
+                        yield Response(
+                            content=json.dumps({"error": "当前无可用凭证"}),
+                            status_code=500,
+                            media_type="application/json"
+                        )
+                        return
+                else:
+                    await asyncio.sleep(retry_interval)
                 continue  # 重试
 
         except Exception as e:
@@ -558,6 +570,7 @@ async def non_stream_request(
     log.debug("[ANTIGRAVITY] 使用传统非流式模式")
 
     model_name = body.get("model", "")
+    switch_credential_enabled = await get_antigravity_switch_credential_enabled()
 
     # 1. 获取有效凭证
     cred_result = await credential_manager.get_valid_credential(
@@ -654,6 +667,7 @@ def apply_cred_result(cred_result: Tuple[str, Dict[str, Any]]) -> bool:
 
     for attempt in range(max_retries + 1):
         need_retry = False  # 标记是否需要重试
+        should_force_switch = False
 
         try:
             response = await post_async(
@@ -725,8 +739,13 @@ def apply_cred_result(cred_result: Tuple[str, Dict[str, Any]]) -> bool:
                         except Exception:
                             pass
 
+                    if cooldown_until is not None:
+                        should_force_switch = True
+                    elif await check_should_auto_ban(status_code):
+                        should_force_switch = True
+
                     # 并行预热下一个凭证,不阻塞当前处理
-                    if next_cred_task is None and attempt < max_retries:
+                    if (switch_credential_enabled or should_force_switch) and next_cred_task is None and attempt < max_retries:
                         next_cred_task = asyncio.create_task(
                             credential_manager.get_valid_credential(
                                 mode="antigravity", model_name=model_name
@@ -767,20 +786,23 @@ def apply_cred_result(cred_result: Tuple[str, Dict[str, Any]]) -> bool:
             if need_retry:
                 log.info(f"[ANTIGRAVITY] 重试请求 (attempt {attempt + 2}/{max_retries + 1})...")
 
-                switched, next_cred_task = await _switch_credential_for_retry(
-                    next_cred_task=next_cred_task,
-                    retry_interval=retry_interval,
-                    refresh_credential_fast=refresh_credential_fast,
-                    apply_cred_result=apply_cred_result,
-                    log_prefix="[ANTIGRAVITY]",
-                )
-                if not switched:
-                    log.error("[ANTIGRAVITY] 重试时无可用凭证或令牌")
-                    return Response(
-                        content=json.dumps({"error": "当前无可用凭证"}),
-                        status_code=500,
-                        media_type="application/json"
+                if switch_credential_enabled or should_force_switch:
+                    switched, next_cred_task = await _switch_credential_for_retry(
+                        next_cred_task=next_cred_task,
+                        retry_interval=retry_interval,
+                        refresh_credential_fast=refresh_credential_fast,
+                        apply_cred_result=apply_cred_result,
+                        log_prefix="[ANTIGRAVITY]",
                     )
+                    if not switched:
+                        log.error("[ANTIGRAVITY] 重试时无可用凭证或令牌")
+                        return Response(
+                            content=json.dumps({"error": "当前无可用凭证"}),
+                            status_code=500,
+                            media_type="application/json"
+                        )
+                else:
+                    await asyncio.sleep(retry_interval)
                 continue  # 重试
 
         except Exception as e:

src/panel/config_routes.py

@@ -58,6 +58,7 @@ async def get_config(token: str = Depends(verify_panel_token)):
 
         # Antigravity流式转非流式配置
         current_config["antigravity_stream2nostream"] = await config.get_antigravity_stream2nostream()
+        current_config["antigravity_switch_credential_enabled"] = await config.get_antigravity_switch_credential_enabled()
 
         # 保活配置
         current_config["keepalive_url"] = await config.get_keepalive_url()
@@ -142,6 +143,10 @@ async def save_config(request: ConfigSaveRequest, token: str = Depends(verify_pa
             if not isinstance(new_config["antigravity_stream2nostream"], bool):
                 raise HTTPException(status_code=400, detail="Antigravity流式转非流式开关必须是布尔值")
 
+        if "antigravity_switch_credential_enabled" in new_config:
+            if not isinstance(new_config["antigravity_switch_credential_enabled"], bool):
+                raise HTTPException(status_code=400, detail="Antigravity切换凭证开关必须是布尔值")
+
         # 验证保活配置
         if "keepalive_url" in new_config:
             if not isinstance(new_config["keepalive_url"], str):