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 的起始点
@@ -429,7 +431,8 @@ async def reset_key_manager_instance():
                 )
                 _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 提示
@@ -446,10 +449,10 @@ async def reset_key_manager_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(
                 "KeyManager instance has been reset. State (failure counts, old keys, next key hint) preserved for next instantiation."

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

@@ -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
   });

app/templates/config_editor.html

@@ -1,6 +1,6 @@
 {% extends "base.html" %} {% block title %}配置编辑器 - Gemini Balance{%
-  endblock %} {% block head_extra_styles %}
-  <style>
+endblock %} {% block head_extra_styles %}
+<style>
   /* config_editor.html specific styles */
   /* Animations (already in base.html, but keep fade-in class usage) */
   .fade-in {
@@ -673,9 +673,9 @@
     border-color: #3b82f6 !important; /* blue-500 */
     box-shadow: none !important; /* 移除focus阴影 */
   }
-  </style>
-  {% endblock %} {% block content %}
-  <div class="container max-w-6xl mx-auto px-4">
+</style>
+{% endblock %} {% block content %}
+<div class="container max-w-6xl mx-auto px-4">
   <div
     class="rounded-2xl shadow-xl p-6 md:p-8"
     style="
@@ -1309,7 +1309,7 @@
                         </div> -->
           <small class="text-gray-500 mt-1 block"
             >为每个思考模型设置预算（整数，最大值
-              24576），此项与上方模型列表自动关联。</small
+            32767），此项与上方模型列表自动关联。</small
           >
         </div>
         <!-- 安全设置 -->
@@ -1867,24 +1867,24 @@
       </div>
     </form>
   </div>
-  </div>
+</div>
 
-  <!-- Scroll buttons are now in base.html -->
-  <div class="scroll-buttons">
+<!-- Scroll buttons are now in base.html -->
+<div class="scroll-buttons">
   <button class="scroll-button" onclick="scrollToTop()" title="回到顶部">
     <i class="fas fa-chevron-up"></i>
   </button>
   <button class="scroll-button" onclick="scrollToBottom()" title="滚动到底部">
     <i class="fas fa-chevron-down"></i>
   </button>
-  </div>
+</div>
 
-  <!-- Notification component is now in base.html -->
-  <div id="notification" class="notification"></div>
-  <!-- Footer is now in base.html -->
+<!-- Notification component is now in base.html -->
+<div id="notification" class="notification"></div>
+<!-- Footer is now in base.html -->
 
-  <!-- API Key Add Modal -->
-  <div id="apiKeyModal" class="modal">
+<!-- API Key Add Modal -->
+<div id="apiKeyModal" class="modal">
   <div
     class="w-full max-w-lg mx-auto rounded-2xl shadow-2xl overflow-hidden animate-fade-in"
     style="
@@ -1930,10 +1930,10 @@
       </div>
     </div>
   </div>
-  </div>
+</div>
 
-  <!-- Bulk Delete API Key Modal -->
-  <div id="bulkDeleteApiKeyModal" class="modal">
+<!-- Bulk Delete API Key Modal -->
+<div id="bulkDeleteApiKeyModal" class="modal">
   <div
     class="w-full max-w-lg mx-auto rounded-2xl shadow-2xl overflow-hidden animate-fade-in"
     style="
@@ -1979,10 +1979,10 @@
       </div>
     </div>
   </div>
-  </div>
+</div>
 
-  <!-- Proxy Add Modal -->
-  <div id="proxyModal" class="modal">
+<!-- Proxy Add Modal -->
+<div id="proxyModal" class="modal">
   <div
     class="w-full max-w-lg mx-auto rounded-2xl shadow-2xl overflow-hidden animate-fade-in"
     style="
@@ -2028,10 +2028,10 @@
       </div>
     </div>
   </div>
-  </div>
+</div>
 
-  <!-- Bulk Delete Proxy Modal -->
-  <div id="bulkDeleteProxyModal" class="modal">
+<!-- Bulk Delete Proxy Modal -->
+<div id="bulkDeleteProxyModal" class="modal">
   <div
     class="w-full max-w-lg mx-auto rounded-2xl shadow-2xl overflow-hidden animate-fade-in"
     style="
@@ -2077,10 +2077,10 @@
       </div>
     </div>
   </div>
-  </div>
+</div>
 
-  <!-- Reset Confirmation Modal -->
-  <div id="resetConfirmModal" class="modal">
+<!-- Reset Confirmation Modal -->
+<div id="resetConfirmModal" class="modal">
   <div
     class="w-full max-w-md mx-auto rounded-2xl shadow-2xl overflow-hidden animate-fade-in"
     style="
@@ -2120,10 +2120,10 @@
       </div>
     </div>
   </div>
-  </div>
+</div>
  
-  <!-- Vertex API Key Add Modal -->
-  <div id="vertexApiKeyModal" class="modal">
+<!-- Vertex API Key Add Modal -->
+<div id="vertexApiKeyModal" class="modal">
   <div
     class="w-full max-w-lg mx-auto rounded-2xl shadow-2xl overflow-hidden animate-fade-in"
     style="
@@ -2169,10 +2169,10 @@
       </div>
     </div>
   </div>
-  </div>
+</div>
  
-  <!-- Bulk Delete Vertex API Key Modal -->
-  <div id="bulkDeleteVertexApiKeyModal" class="modal">
+<!-- Bulk Delete Vertex API Key Modal -->
+<div id="bulkDeleteVertexApiKeyModal" class="modal">
   <div
     class="w-full max-w-lg mx-auto rounded-2xl shadow-2xl overflow-hidden animate-fade-in"
     style="
@@ -2218,10 +2218,10 @@
       </div>
     </div>
   </div>
-  </div>
+</div>
  
-  <!-- Model Helper Modal -->
-  <div id="modelHelperModal" class="modal">
+<!-- Model Helper Modal -->
+<div id="modelHelperModal" class="modal">
   <div
     class="w-full max-w-lg mx-auto rounded-2xl shadow-2xl overflow-hidden animate-fade-in"
     style="
@@ -2267,12 +2267,12 @@
       </div>
     </div>
   </div>
-  </div>
+</div>
 
-  {% endblock %} {% block body_scripts %}
-  <script src="/static/js/config_editor.js"></script>
-  <!-- 增强下拉框样式和交互性 -->
-  <script>
+{% endblock %} {% block body_scripts %}
+<script src="/static/js/config_editor.js"></script>
+<!-- 增强下拉框样式和交互性 -->
+<script>
   document.addEventListener("DOMContentLoaded", function () {
     // 增强所有下拉框的交互性
     const selects = document.querySelectorAll(".form-select-themed");
@@ -2365,7 +2365,7 @@
         let val = this.value.replace(/[^0-9]/g, "");
         if (val !== "") {
           val = parseInt(val, 10);
-            if (val > 24576) val = 24576;
+          if (val > 32767) val = 32767;
         }
         this.value = val;
 
@@ -2377,6 +2377,5 @@
       });
     });
   });
-  </script>
-  {% endblock %}
-  
+</script>
+{% endblock %}