Merge remote-tracking branch 'origin/main' into feat/AutoRoute

app/domain/gemini_models.py

@@ -45,7 +45,7 @@ class GenerationConfig(BaseModel):
 
 class SystemInstruction(BaseModel):
     role: str = "system"
-    parts: List[Dict[str, Any]] | Dict[str, Any]
+    parts: Union[List[Dict[str, Any]], Dict[str, Any]]
 
 
 class GeminiContent(BaseModel):

app/domain/image_models.py

@@ -1,23 +1,20 @@
+from typing import Union
+
+
 class ImageMetadata:
-    def __init__(self, width: int, height: int, filename: str, size: int, url: str, delete_url: str | None = None):
+    def __init__(self, width: int, height: int, filename: str, size: int, url: str, delete_url: Union[str, None] = None):
         self.width = width
         self.height = height
         self.filename = filename
         self.size = size
         self.url = url
         self.delete_url = delete_url
-    
-    
 class UploadResponse:
     def __init__(self, success: bool, code: str, message: str, data: ImageMetadata):
         self.success = success
         self.code = code
         self.message = message
         self.data = data
-    
-    
 class ImageUploader:
     def upload(self, file: bytes, filename: str) -> UploadResponse:
         raise NotImplementedError
-    
-    

app/service/key/key_manager.py

@@ -1,6 +1,6 @@
 import asyncio
 from itertools import cycle
-from typing import Dict
+from typing import Dict, Union
 
 from app.config.config import settings
 from app.log.logger import get_key_manager_logger
@@ -178,19 +178,20 @@ class KeyManager:
         if self.api_keys:
             return self.api_keys[0]
         if not self.api_keys:
-            logger.warning("API key list is empty, cannot get first valid key.")
+            logger.warning(
+                "API key list is empty, cannot get first valid key.")
             return ""
         return self.api_keys[0]
 
 
 _singleton_instance = None
 _singleton_lock = asyncio.Lock()
-_preserved_failure_counts: Dict[str, int] | None = None
-_preserved_vertex_failure_counts: Dict[str, int] | None = None
-_preserved_old_api_keys_for_reset: list | None = None
-_preserved_vertex_old_api_keys_for_reset: list | None = None
-_preserved_next_key_in_cycle: str | None = None
-_preserved_vertex_next_key_in_cycle: str | None = None
+_preserved_failure_counts: Union[Dict[str, int], None] = None
+_preserved_vertex_failure_counts: Union[Dict[str, int], None] = None
+_preserved_old_api_keys_for_reset: Union[list, None] = None
+_preserved_vertex_old_api_keys_for_reset: Union[list, None] = None
+_preserved_next_key_in_cycle: Union[str, None] = None
+_preserved_vertex_next_key_in_cycle: Union[str, None] = None
 
 
 async def get_key_manager_instance(
@@ -252,7 +253,8 @@ async def get_key_manager_instance(
                 _singleton_instance.vertex_key_failure_counts = (
                     current_vertex_failure_counts
                 )
-                logger.info("Inherited failure counts for applicable Vertex keys.")
+                logger.info(
+                    "Inherited failure counts for applicable Vertex keys.")
             _preserved_vertex_failure_counts = None
 
             # 2. 调整 key_cycle 的起始点
@@ -357,7 +359,7 @@ async def get_key_manager_instance(
                         f"Error determining start key for new Vertex key cycle from preserved state: {e}. "
                         "New cycle will start from the beginning."
                     )
-                
+
             if start_key_for_new_vertex_cycle and _singleton_instance.vertex_api_keys:
                 try:
                     target_idx = _singleton_instance.vertex_api_keys.index(
@@ -380,7 +382,7 @@ async def get_key_manager_instance(
                 except Exception as e:
                     logger.error(
                         f"Error advancing new Vertex key cycle: {e}. Cycle will start from beginning."
-                    ) 
+                    )
             else:
                 if _singleton_instance.vertex_api_keys:
                     logger.info(
@@ -418,7 +420,7 @@ async def reset_key_manager_instance():
             # 3. 保存 key_cycle 的下一个 key 提示
             try:
                 if _singleton_instance.api_keys:
-                    _preserved_next_key_in_cycle = (    
+                    _preserved_next_key_in_cycle = (
                         await _singleton_instance.get_next_key()
                     )
                 else:
@@ -427,9 +429,10 @@ async def reset_key_manager_instance():
                 logger.warning(
                     "Could not preserve next key hint: key cycle was empty or exhausted in old instance."
                 )
-                _preserved_next_key_in_cycle = None 
+                _preserved_next_key_in_cycle = None
             except Exception as e:
-                logger.error(f"Error preserving next key hint during reset: {e}")
+                logger.error(
+                    f"Error preserving next key hint during reset: {e}")
                 _preserved_next_key_in_cycle = None
 
             # 4. 保存 vertex_key_cycle 的下一个 key 提示
@@ -443,12 +446,12 @@ async def reset_key_manager_instance():
             except StopIteration:
                 logger.warning(
                     "Could not preserve next key hint: Vertex key cycle was empty or exhausted in old instance."
-                )   
+                )
                 _preserved_vertex_next_key_in_cycle = None
             except Exception as e:
-                logger.error(f"Error preserving next key hint during reset: {e}")
+                logger.error(
+                    f"Error preserving next key hint during reset: {e}")
                 _preserved_vertex_next_key_in_cycle = None
-                
 
             _singleton_instance = None
             logger.info(

app/service/stats/stats_service.py

@@ -1,6 +1,7 @@
 # app/service/stats_service.py
 
 import datetime
+from typing import Union
 
 from sqlalchemy import and_, case, func, or_, select
 
@@ -195,10 +196,11 @@ class StatsService:
             return details
 
         except Exception as e:
-            logger.error(f"Failed to get API call details for period '{period}': {e}")
+            logger.error(
+                f"Failed to get API call details for period '{period}': {e}")
             raise
 
-    async def get_key_usage_details_last_24h(self, key: str) -> dict | None:
+    async def get_key_usage_details_last_24h(self, key: str) -> Union[dict, None]:
         """
         获取指定 API 密钥在过去 24 小时内按模型统计的调用次数。
 
@@ -218,7 +220,8 @@ class StatsService:
         try:
             query = (
                 select(
-                    RequestLog.model_name, func.count(RequestLog.id).label("call_count")
+                    RequestLog.model_name, func.count(
+                        RequestLog.id).label("call_count")
                 )
                 .where(
                     RequestLog.api_key == key,
@@ -237,7 +240,8 @@ class StatsService:
                 )
                 return {}
 
-            usage_details = {row["model_name"]: row["call_count"] for row in results}
+            usage_details = {row["model_name"]: row["call_count"]
+                             for row in results}
             logger.info(
                 f"Successfully fetched usage details for key ending in ...{key[-4:]}: {usage_details}"
             )

app/static/js/config_editor.js

@@ -12,7 +12,7 @@ const PROXY_REGEX =
   /(?:https?|socks5):\/\/(?:[^:@\/]+(?::[^@\/]+)?@)?(?:[^:\/\s]+)(?::\d+)?/g;
 const VERTEX_API_KEY_REGEX = /AQ\.[a-zA-Z0-9_]{50}/g; // 新增 Vertex API Key 正则
 const MASKED_VALUE = "••••••••";
- 
+
 // DOM Elements - Global Scope for frequently accessed elements
 const safetySettingsContainer = document.getElementById(
   "SAFETY_SETTINGS_container"
@@ -31,7 +31,7 @@ const bulkDeleteProxyModal = document.getElementById("bulkDeleteProxyModal");
 const bulkDeleteProxyInput = document.getElementById("bulkDeleteProxyInput");
 const resetConfirmModal = document.getElementById("resetConfirmModal");
 const configForm = document.getElementById("configForm"); // Added for frequent use
- 
+
 // Vertex API Key Modal Elements
 const vertexApiKeyModal = document.getElementById("vertexApiKeyModal");
 const vertexApiKeyBulkInput = document.getElementById("vertexApiKeyBulkInput");
@@ -41,7 +41,7 @@ const bulkDeleteVertexApiKeyModal = document.getElementById(
 const bulkDeleteVertexApiKeyInput = document.getElementById(
   "bulkDeleteVertexApiKeyInput"
 );
- 
+
 // Model Helper Modal Elements
 const modelHelperModal = document.getElementById("modelHelperModal");
 const modelHelperTitleElement = document.getElementById("modelHelperTitle");
@@ -384,7 +384,7 @@ document.addEventListener("DOMContentLoaded", function () {
   }
 
   initializeSensitiveFields(); // Initialize sensitive field handling
- 
+
   // Vertex API Key Modal Elements and Events
   const addVertexApiKeyBtn = document.getElementById("addVertexApiKeyBtn");
   const closeVertexApiKeyModalBtn = document.getElementById(
@@ -408,7 +408,7 @@ document.addEventListener("DOMContentLoaded", function () {
   const confirmBulkDeleteVertexApiKeyBtn = document.getElementById(
     "confirmBulkDeleteVertexApiKeyBtn"
   );
- 
+
   if (addVertexApiKeyBtn) {
     addVertexApiKeyBtn.addEventListener("click", () => {
       openModal(vertexApiKeyModal);
@@ -428,7 +428,7 @@ document.addEventListener("DOMContentLoaded", function () {
       "click",
       handleBulkAddVertexApiKeys
     );
- 
+
   if (bulkDeleteVertexApiKeyBtn) {
     bulkDeleteVertexApiKeyBtn.addEventListener("click", () => {
       openModal(bulkDeleteVertexApiKeyModal);
@@ -448,7 +448,7 @@ document.addEventListener("DOMContentLoaded", function () {
       "click",
       handleBulkDeleteVertexApiKeys
     );
- 
+
   // Model Helper Modal Event Listeners
   if (closeModelHelperModalBtn) {
     closeModelHelperModalBtn.addEventListener("click", () =>
@@ -765,7 +765,7 @@ async function initConfig() {
       FAKE_STREAM_EMPTY_DATA_INTERVAL_SECONDS: 5,
       // --- 结束：处理假流式配置的默认值 ---
     };
- 
+
     populateForm(defaultConfig);
     if (configForm) {
       // Ensure form exists
@@ -1177,7 +1177,7 @@ function handleBulkDeleteProxies() {
   }
   bulkDeleteProxyInput.value = "";
 }
- 
+
 /**
  * Handles the bulk addition of Vertex API keys from the modal input.
  */
@@ -1192,10 +1192,10 @@ function handleBulkAddVertexApiKeys() {
   ) {
     return;
   }
- 
+
   const bulkText = vertexApiKeyBulkInput.value;
   const extractedKeys = bulkText.match(VERTEX_API_KEY_REGEX) || [];
- 
+
   const currentKeyInputs = vertexApiKeyContainer.querySelectorAll(
     `.${ARRAY_INPUT_CLASS}.${SENSITIVE_INPUT_CLASS}`
   );
@@ -1206,16 +1206,16 @@ function handleBulkAddVertexApiKeys() {
         : input.value;
     })
     .filter((key) => key && key.trim() !== "" && key !== MASKED_VALUE);
- 
+
   const combinedKeys = new Set([...currentKeys, ...extractedKeys]);
   const uniqueKeys = Array.from(combinedKeys);
- 
+
   vertexApiKeyContainer.innerHTML = ""; // Clear existing items
- 
+
   uniqueKeys.forEach((key) => {
     addArrayItemWithValue("VERTEX_API_KEYS", key); // VERTEX_API_KEYS are sensitive
   });
- 
+
   // Ensure new sensitive inputs are masked
   const newKeyInputs = vertexApiKeyContainer.querySelectorAll(
     `.${ARRAY_INPUT_CLASS}.${SENSITIVE_INPUT_CLASS}`
@@ -1229,7 +1229,7 @@ function handleBulkAddVertexApiKeys() {
       input.dispatchEvent(focusoutEvent);
     }
   });
- 
+
   closeModal(vertexApiKeyModal);
   showNotification(
     `添加/更新了 ${uniqueKeys.length} 个唯一 Vertex 密钥`,
@@ -1237,7 +1237,7 @@ function handleBulkAddVertexApiKeys() {
   );
   vertexApiKeyBulkInput.value = "";
 }
- 
+
 /**
  * Handles the bulk deletion of Vertex API keys based on input from the modal.
  */
@@ -1252,15 +1252,15 @@ function handleBulkDeleteVertexApiKeys() {
   ) {
     return;
   }
- 
+
   const bulkText = bulkDeleteVertexApiKeyInput.value;
   if (!bulkText.trim()) {
     showNotification("请粘贴需要删除的 Vertex API 密钥", "warning");
     return;
   }
- 
+
   const keysToDelete = new Set(bulkText.match(VERTEX_API_KEY_REGEX) || []);
- 
+
   if (keysToDelete.size === 0) {
     showNotification(
       "未在输入内容中提取到有效的 Vertex API 密钥格式",
@@ -1268,10 +1268,10 @@ function handleBulkDeleteVertexApiKeys() {
     );
     return;
   }
- 
+
   const keyItems = vertexApiKeyContainer.querySelectorAll(`.${ARRAY_ITEM_CLASS}`);
   let deleteCount = 0;
- 
+
   keyItems.forEach((item) => {
     const input = item.querySelector(
       `.${ARRAY_INPUT_CLASS}.${SENSITIVE_INPUT_CLASS}`
@@ -1286,9 +1286,9 @@ function handleBulkDeleteVertexApiKeys() {
       deleteCount++;
     }
   });
- 
+
   closeModal(bulkDeleteVertexApiKeyModal);
- 
+
   if (deleteCount > 0) {
     showNotification(`成功删除了 ${deleteCount} 个匹配的 Vertex 密钥`, "success");
   } else {
@@ -1296,7 +1296,7 @@ function handleBulkDeleteVertexApiKeys() {
   }
   bulkDeleteVertexApiKeyInput.value = "";
 }
- 
+
 /**
  * Switches the active configuration tab.
  * @param {string} tabId - The ID of the tab to switch to.
@@ -1442,7 +1442,7 @@ function addArrayItemWithValue(key, value) {
   const isSensitive =
     key === "API_KEYS" || isAllowedToken || isVertexApiKey; // 更新敏感判断
   const modelId = isThinkingModel ? generateUUID() : null;
- 
+
   const arrayItem = document.createElement("div");
   arrayItem.className = `${ARRAY_ITEM_CLASS} flex items-center mb-2 gap-2`;
   if (isThinkingModel) {
@@ -1535,14 +1535,14 @@ function createAndAppendBudgetMapItem(mapKey, mapValue, modelId) {
   valueInput.value = isNaN(intValue) ? 0 : intValue;
   valueInput.placeholder = "预算 (整数)";
   valueInput.className = `${MAP_VALUE_INPUT_CLASS} w-24 px-3 py-2 border border-gray-300 rounded-md focus:outline-none focus:border-primary-500 focus:ring focus:ring-primary-200 focus:ring-opacity-50`;
-  valueInput.min = 0;
-  valueInput.max = 24576;
+  valueInput.min = -1;
+  valueInput.max = 32767;
   valueInput.addEventListener("input", function () {
-    let val = this.value.replace(/[^0-9]/g, "");
+    let val = this.value.replace(/[^0-9-]/g, "");
     if (val !== "") {
       val = parseInt(val, 10);
-      if (val < 0) val = 0;
-      if (val > 24576) val = 24576;
+      if (val < -1) val = -1;
+      if (val > 32767) val = 32767;
     }
     this.value = val; // Corrected variable name
   });