chore: 更新版本号至 2.1.3

本次提交将版本号从 2.1.2 更新至 2.1.3，以反映最新的代码更改和功能增强。这是一个常规的版本更新，未涉及其他功能或修复。

.env.example

@@ -1,13 +1,18 @@
-# MySQL数据库配置
+# 数据库配置
-MYSQL_HOST=
+DATABASE_TYPE=mysql
-MYSQL_PORT=
+#SQLITE_DATABASE=default_db
-MYSQL_USER=
+MYSQL_HOST=gemini-balance-mysql
-MYSQL_PASSWORD=
+#MYSQL_SOCKET=/run/mysqld/mysqld.sock
+MYSQL_PORT=3306
+MYSQL_USER=gemini
+MYSQL_PASSWORD=change_me
 MYSQL_DATABASE=default_db
 API_KEYS=["AIzaSyxxxxxxxxxxxxxxxxxxx","AIzaSyxxxxxxxxxxxxxxxxxxx"]
 ALLOWED_TOKENS=["sk-123456"]
-# AUTH_TOKEN=sk-123456
+AUTH_TOKEN=sk-123456
 TEST_MODEL=gemini-1.5-flash
+THINKING_MODELS=["gemini-2.5-flash-preview-04-17"]
+THINKING_BUDGET_MAP={"gemini-2.5-flash-preview-04-17": 4000}
 IMAGE_MODELS=["gemini-2.0-flash-exp"]
 SEARCH_MODELS=["gemini-2.0-flash-exp","gemini-2.0-pro-exp"]
 FILTERED_MODELS=["gemini-1.0-pro-vision-latest", "gemini-pro-vision", "chat-bison-001", "text-bison-001", "embedding-gecko-001"]
@@ -21,6 +26,9 @@ CHECK_INTERVAL_HOURS=1
 TIMEZONE=Asia/Shanghai
 # 请求超时时间（秒）
 TIME_OUT=300
+# 代理服务器配置 (支持 http 和 socks5)
+# 示例: PROXIES=["http://user:pass@host:port", "socks5://host:port"]
+PROXIES=[]
 #########################image_generate 相关配置###########################
 PAID_KEY=AIzaSyxxxxxxxxxxxxxxxxxxx
 CREATE_IMAGE_MODEL=imagen-3.0-generate-002
@@ -38,3 +46,23 @@ STREAM_SHORT_TEXT_THRESHOLD=10
 STREAM_LONG_TEXT_THRESHOLD=50
 STREAM_CHUNK_SIZE=5
 ##########################################################################
+######################### 日志配置 #######################################
+# 日志级别 (debug, info, warning, error, critical)，默认为 info
+LOG_LEVEL=info
+# 是否开启自动删除错误日志
+AUTO_DELETE_ERROR_LOGS_ENABLED=true
+# 自动删除多少天前的错误日志 (1, 7, 30)
+AUTO_DELETE_ERROR_LOGS_DAYS=7
+# 是否开启自动删除请求日志
+AUTO_DELETE_REQUEST_LOGS_ENABLED=false
+# 自动删除多少天前的请求日志 (1, 7, 30)
+AUTO_DELETE_REQUEST_LOGS_DAYS=30
+##########################################################################
+
+# 假流式配置 (Fake Streaming Configuration)
+FAKE_STREAM_ENABLED=True  # 是否启用假流式输出
+FAKE_STREAM_EMPTY_DATA_INTERVAL_SECONDS=5  # 假流式发送空数据的间隔时间（秒）
+
+# 安全设置 (JSON 字符串格式)
+# 注意：这里的示例值可能需要根据实际模型支持情况调整
+SAFETY_SETTINGS='[{"category": "HARM_CATEGORY_HARASSMENT", "threshold": "OFF"}, {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "OFF"}, {"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", "threshold": "OFF"}, {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "OFF"}, {"category": "HARM_CATEGORY_CIVIC_INTEGRITY", "threshold": "BLOCK_NONE"}]'

.gitignore

@@ -257,4 +257,5 @@ $RECYCLE.BIN/
 
 # Custom rules (everything added below won't be overriden by 'Generate .gitignore File' if you use 'Update' option)
 
-tests/
+tests/
+default_db

Dockerfile

@@ -4,6 +4,7 @@ WORKDIR /app
 
 # 复制所需文件到容器中
 COPY ./requirements.txt /app
+COPY ./VERSION /app
 
 RUN pip install --no-cache-dir -r requirements.txt
 COPY ./app /app/app

LICENSE

@@ -0,0 +1,17 @@
+知识共享署名-非商业性使用 4.0 国际 (CC BY-NC 4.0) 协议
+
+您可以自由地：
+- 共享 — 在任何媒介以任何形式复制、发行本作品
+- 演绎 — 修改、转换或以本作品为基础进行创作
+
+惟须遵守下列条件：
+- 署名 — 您必须给出适当的署名，提供指向本协议的链接，并指明是否（对原作）作了修改。您可以以任何合理方式进行，但不得以任何方式暗示许可方认可您或您的使用。
+- 非商业性使用 — 您不得将本作品用于商业目的，包括但不限于任何形式的商业倒卖、SaaS、API 付费接口、二次销售、打包出售、收费分发或其他直接或间接盈利行为。
+
+如需商业授权，请联系原作者获得书面许可。违者将承担相应法律责任。
+
+Creative Commons Attribution-NonCommercial 4.0 International Public License
+
+By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-NonCommercial 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
+
+Full license text: https://creativecommons.org/licenses/by-nc/4.0/legalcode

README.md

@@ -1,5 +1,9 @@
 # Gemini Balance - Gemini API 代理和负载均衡器
 
+> ⚠️ 本项目采用 CC BY-NC 4.0（署名-非商业性使用）协议，禁止任何形式的商业倒卖服务，详见 LICENSE 文件。
+
+> 本人从未在各个平台售卖服务，如有遇到售卖此服务者，那一定是倒卖狗，大家切记不要上当受骗。
+
 [![Python](https://img.shields.io/badge/Python-3.9%2B-blue.svg)](https://www.python.org/)
 [![FastAPI](https://img.shields.io/badge/FastAPI-0.100%2B-green.svg)](https://fastapi.tiangolo.com/)
 [![Uvicorn](https://img.shields.io/badge/Uvicorn-running-purple.svg)](https://www.uvicorn.org/)
@@ -63,6 +67,7 @@ app/
     >镜像地址: docker pull ghcr.io/snailyp/gemini-balance:latest
 * **模型列表自动维护**: 支持openai和gemini模型列表获取，与newapi自动获取模型列表完美兼容，无需手动填写。
 * **支持移除不使用的模型**: 默认提供的模型太多，很多用不上，可以通过`FILTERED_MODELS`过滤掉。
+* **代理支持**: 支持配置 HTTP/SOCKS5 代理服务器 (`PROXIES`)，用于访问 Gemini API，方便在特殊网络环境下使用。支持批量添加代理。
 
 ## 🚀 快速开始
 
@@ -86,6 +91,12 @@ app/
     * `-p 8000:8000`: 将容器的 8000 端口映射到主机的 8000 端口。
     * `--env-file .env`: 使用 `.env` 文件设置环境变量。
 
+    > 注意：如果使用 SQLite 数据库，需要挂载数据卷以持久化数据：
+    > ```bash
+    > docker run -d -p 8000:8000 --env-file .env -v /path/to/data:/app/data gemini-balance
+    > ```
+    > 其中 `/path/to/data` 是主机上的数据存储路径，`/app/data` 是容器内的数据目录。
+
 #### b) 用现有的docker镜像部署
 
 1. **拉取镜像**:
@@ -104,6 +115,12 @@ app/
    * `-p 8000:8000`: 将容器的 8000 端口映射到主机的 8000 端口 (根据需要调整)。
    * `--env-file .env`: 使用 `.env` 文件设置环境变量 (确保 `.env` 文件存在于执行命令的目录)。
 
+    > 注意：如果使用 SQLite 数据库，需要挂载数据卷以持久化数据：
+    > ```bash
+    > docker run -d -p 8000:8000 --env-file .env -v /path/to/data:/app/data ghcr.io/snailyp/gemini-balance:latest
+    > ```
+    > 其中 `/path/to/data` 是主机上的数据存储路径，`/app/data` 是容器内的数据目录。
+
 ### 本地运行 (适用于开发和测试)
 
 如果您想在本地直接运行源代码进行开发或测试，请按照以下步骤操作：
@@ -111,7 +128,7 @@ app/
 1. **确保已完成准备工作**:
     * 克隆仓库到本地。
     * 安装 Python 3.9 或更高版本。
-    * 在项目根目录下创建并配置好 `.env` 文件 (参考前面的“配置环境变量”部分)。
+    * 在项目根目录下创建并配置好 `.env` 文件 (参考前面的"配置环境变量"部分)。
     * 安装项目依赖：
 
         ```bash
@@ -138,15 +155,18 @@ app/
 | 配置项                       | 说明                                                     | 默认值                             |
 | :--------------------------- | :------------------------------------------------------- | :---------------------------------------------------- |
 | **数据库配置**               |                                                          |                                                       |
-| `MYSQL_HOST`                 | 必填，MySQL 数据库主机地址                               | `localhost`                                           |
+| `DATABASE_TYPE`              | 可选，数据库类型，支持 `mysql` 或 `sqlite`               | `mysql`                                              |
-| `MYSQL_PORT`                 | 必填，MySQL 数据库端口                                   | `3306`                                                |
+| `SQLITE_DATABASE`            | 可选，当使用 `sqlite` 时必填，SQLite 数据库文件路径 | `default_db`                                         |
-| `MYSQL_USER`                 | 必填，MySQL 数据库用户名                                 | `your_db_user`                                        |
+| `MYSQL_HOST`                 | 当使用 `mysql` 时必填，MySQL 数据库主机地址    | `localhost`                                          |
-| `MYSQL_PASSWORD`             | 必填，MySQL 数据库密码                                   | `your_db_password`                                    |
+| `MYSQL_SOCKET`               | 可选，MySQL 数据库 socket 地址                          | `/var/run/mysqld/mysqld.sock`                        |
-| `MYSQL_DATABASE`             | 必填，MySQL 数据库名称                                   | `defaultdb`                                   |
+| `MYSQL_PORT`                 | 当使用 `mysql` 时必填，MySQL 数据库端口        | `3306`                                               |
+| `MYSQL_USER`                 | 当使用 `mysql` 时必填，MySQL 数据库用户名      | `your_db_user`                                       |
+| `MYSQL_PASSWORD`             | 当使用 `mysql` 时必填，MySQL 数据库密码        | `your_db_password`                                   |
+| `MYSQL_DATABASE`             | 当使用 `mysql` 时必填，MySQL 数据库名称        | `defaultdb`                                          |
 | **API 相关配置**             |                                                          |                                                       |
 | `API_KEYS`                   | 必填，Gemini API 密钥列表，用于负载均衡                        | `["your-gemini-api-key-1", "your-gemini-api-key-2"]`  |
 | `ALLOWED_TOKENS`             | 必填，允许访问的 Token 列表                                    | `["your-access-token-1", "your-access-token-2"]`      |
-| `AUTH_TOKEN`                 | 可选，超级管理员token，具有所有权限，不填默认使用 ALLOWED_TOKENS 的第一个 | `""`                                                  |
+| `AUTH_TOKEN`                 | 可选，超级管理员token，具有所有权限，不填默认使用 ALLOWED_TOKENS 的第一个 | `sk-123456`                                                  |
 | `TEST_MODEL`                 | 可选，用于测试密钥是否可用的模型名                             | `gemini-1.5-flash`                                    |
 | `IMAGE_MODELS`               | 可选，支持绘图功能的模型列表                                   | `["gemini-2.0-flash-exp"]`                            |
 | `SEARCH_MODELS`              | 可选，支持搜索功能的模型列表                                   | `["gemini-2.0-flash-exp"]`                            |
@@ -154,19 +174,28 @@ app/
 | `TOOLS_CODE_EXECUTION_ENABLED` | 可选，是否启用代码执行工具                                     | `false`                                               |
 | `SHOW_SEARCH_LINK`           | 可选，是否在响应中显示搜索结果链接                             | `true`                                                |
 | `SHOW_THINKING_PROCESS`      | 可选，是否显示模型思考过程                                     | `true`                                                |
+| `THINKING_MODELS`            | 可选，支持思考功能的模型列表                                   | `[]`                                                  |
+| `THINKING_BUDGET_MAP`        | 可选，思考功能预算映射 (模型名:预算值)                         | `{}`                                                  |
 | `BASE_URL`                   | 可选，Gemini API 基础 URL，默认无需修改                        | `https://generativelanguage.googleapis.com/v1beta`    |
 | `MAX_FAILURES`               | 可选，允许单个key失败的次数                                    | `3`                                                   |
 | `MAX_RETRIES`                | 可选，API 请求失败时的最大重试次数                             | `3`                                                   |
 | `CHECK_INTERVAL_HOURS`       | 可选，检查禁用 Key 是否恢复的时间间隔 (小时)                   | `1`                                                   |
 | `TIMEZONE`                   | 可选，应用程序使用的时区                                       | `Asia/Shanghai`                                       |
 | `TIME_OUT`                   | 可选，请求超时时间 (秒)                                        | `300`                                                 |
+| `PROXIES`                    | 可选，代理服务器列表 (例如 `http://user:pass@host:port`, `socks5://host:port`) | `[]`                                                  |
+| `LOG_LEVEL`                  | 可选，日志级别，例如 DEBUG, INFO, WARNING, ERROR, CRITICAL     | `INFO`                                                |
+| `AUTO_DELETE_ERROR_LOGS_ENABLED` | 可选，是否开启自动删除错误日志                                 | `true`                                                |
+| `AUTO_DELETE_ERROR_LOGS_DAYS`  | 可选，自动删除多少天前的错误日志 (例如 1, 7, 30)             | `7`                                                   |
+| `AUTO_DELETE_REQUEST_LOGS_ENABLED`| 可选，是否开启自动删除请求日志                               | `false`                                               |
+| `AUTO_DELETE_REQUEST_LOGS_DAYS` | 可选，自动删除多少天前的请求日志 (例如 1, 7, 30)           | `30`                                                  |
+| `SAFETY_SETTINGS`            | 可选，安全设置 (JSON 字符串格式)，用于配置内容安全阈值。示例值可能需要根据实际模型支持情况调整。 | `[{"category": "HARM_CATEGORY_HARASSMENT", "threshold": "OFF"}, {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "OFF"}, {"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", "threshold": "OFF"}, {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "OFF"}, {"category": "HARM_CATEGORY_CIVIC_INTEGRITY", "threshold": "BLOCK_NONE"}]` |
 | **图像生成相关**             |                                                          |                                                       |
 | `PAID_KEY`                   | 可选，付费版API Key，用于图片生成等高级功能                    | `your-paid-api-key`                                   |
 | `CREATE_IMAGE_MODEL`         | 可选，图片生成模型                                             | `imagen-3.0-generate-002`                             |
 | `UPLOAD_PROVIDER`            | 可选，图片上传提供商: `smms`, `picgo`, `cloudflare_imgbed`     | `smms`                                                |
 | `SMMS_SECRET_TOKEN`          | 可选，SM.MS图床的API Token                                     | `your-smms-token`                                     |
-| `PICGO_API_KEY`              | 可选，PicoGo图床的API Key                                      | `your-picogo-apikey`                                  |
+| `PICGO_API_KEY`              | 可选，[PicoGo](https://www.picgo.net/)图床的API Key                                      | `your-picogo-apikey`                                  |
-| `CLOUDFLARE_IMGBED_URL`      | 可选，CloudFlare 图床上传地址                                  | `https://xxxxxxx.pages.dev/upload`                    |
+| `CLOUDFLARE_IMGBED_URL`      | 可选，[CloudFlare](https://github.com/MarSeventh/CloudFlare-ImgBed) 图床上传地址                                  | `https://xxxxxxx.pages.dev/upload`                    |
 | `CLOUDFLARE_IMGBED_AUTH_CODE`| 可选，CloudFlare图床的鉴权key                                  | `your-cloudflare-imgber-auth-code`                    |
 | **流式优化器相关**           |                                                          |                                                       |
 | `STREAM_OPTIMIZER_ENABLED`   | 可选，是否启用流式输出优化                                     | `false`                                               |
@@ -175,6 +204,9 @@ app/
 | `STREAM_SHORT_TEXT_THRESHOLD`| 可选，短文本阈值                                               | `10`                                                  |
 | `STREAM_LONG_TEXT_THRESHOLD` | 可选，长文本阈值                                               | `50`                                                  |
 | `STREAM_CHUNK_SIZE`          | 可选，流式输出块大小                                           | `5`                                                   |
+| **伪流式 (Fake Stream) 相关** |                                                          |                                                       |
+| `FAKE_STREAM_ENABLED`        | 可选，是否启用伪流式传输，用于不支持流式的模型或场景           | `false`                                               |
+| `FAKE_STREAM_EMPTY_DATA_INTERVAL_SECONDS` | 可选，伪流式传输时发送心跳空数据的间隔秒数                   | `5`                                                   |
 
 ## ⚙️ API 端点
 
@@ -186,28 +218,47 @@ app/
 * `POST /models/{model_name}:generateContent`: 使用指定的 Gemini 模型生成内容。
 * `POST /models/{model_name}:streamGenerateContent`: 使用指定的 Gemini 模型流式生成内容。
 
-### OpenAI API 相关 (`(/hf)/v1`)
+### OpenAI API 相关
 
-* `GET /v1/models`: 列出可用的 OpenAI 模型。
+* `GET (/hf)/v1/models`: 列出可用的模型 (底层用的gemini格式)。
-* `POST /v1/chat/completions`: 通过 OpenAI API 进行聊天补全。
+* `POST (/hf)/v1/chat/completions`: 进行聊天补全 (底层用的gemini格式, 支持流式传输)。
-* `POST /v1/images/generations`: 通过 OpenAI API 生成图像。
+* `POST (/hf)/v1/embeddings`: 创建文本嵌入 (底层用的gemini格式)。
-* `POST /v1/embeddings`: 通过 OpenAI API 创建文本嵌入。
+* `POST (/hf)/v1/images/generations`: 生成图像 (底层用的gemini格式)。
+* `GET /openai/v1/models`: 列出可用的模型 (底层用的openai格式)。
+* `POST /openai/v1/chat/completions`: 进行聊天补全 (底层用的openai格式, 支持流式传输, 可防止截断，速度也快)。
+* `POST /openai/v1/embeddings`: 创建文本嵌入 (底层用的openai格式)。
+* `POST /openai/v1/images/generations`: 生成图像 (底层用的openai格式)。
 
 ## 🤝 贡献
 
 欢迎提交 Pull Request 或 Issue。
 
+## 🎉 特别鸣谢
+
+特别鸣谢以下项目和平台为本项目提供图床服务:
+
+* [PicGo](https://www.picgo.net/)
+* [SM.MS](https://smms.app/)
+* [CloudFlare-ImgBed](https://github.com/MarSeventh/CloudFlare-ImgBed) 开源项目
+
 ## 🙏 感谢贡献者
 
 感谢所有为本项目做出贡献的开发者！
 
-<a href="https://github.com/toddyoe" title="toddyoe"><img src="https://avatars.githubusercontent.com/u/167494546?s=64&v=4" width="64" height="64"></a>
+[![Contributors](https://contrib.rocks/image?repo=snailyp/gemini-balance)](https://github.com/snailyp/gemini-balance/graphs/contributors)
-<a href="https://github.com/yangtb2024" title="yangtb2024"><img src="https://avatars.githubusercontent.com/u/164613316?s=64&v=4" width="64" height="64"></a>
-<a href="https://github.com/cr-zhichen" title="cr-zhichen"><img src="https://avatars.githubusercontent.com/u/57337795?s=64&v=4" width="64" height="64"></a>
-<a href="https://github.com/BetterAndBetterII" title="BetterAndBetterII"><img src="https://avatars.githubusercontent.com/u/141388234?s=96&v=4" width="64" height="64"></a>
-<a href="https://github.com/yanhao98" title="yanhao98"><img src="https://avatars.githubusercontent.com/u/37316281?s=64&v=4" width="64" height="64"></a>
-<a href="https://github.com/Haoyu99" title="Haoyu99"><img src="https://avatars.githubusercontent.com/u/93185981?s=60&v=4" width="64" height="64"></a>
 
-## 📄 许可证
+## ⭐ Star History
 
-本项目采用 MIT 许可证。
+[![Star History Chart](https://api.star-history.com/svg?repos=snailyp/gemini-balance&type=Date)](https://star-history.com/#snailyp/gemini-balance&Date)
+
+## 💖 友情项目
+
+* **[OneLine](https://github.com/chengtx809/OneLine)** by [chengtx809](https://github.com/chengtx809) - OneLine一线：AI驱动的热点事件时间轴生成工具
+
+## 🎁 项目支持
+
+如果你觉得这个项目对你有帮助，可以考虑通过 [爱发电](https://afdian.com/a/snaily) 支持我。
+
+## 许可证
+
+本项目采用 CC BY-NC 4.0（署名-非商业性使用）协议，禁止任何形式的商业倒卖服务，详见 LICENSE 文件。

VERSION

@@ -0,0 +1 @@
+2.1.3

app/config/config.py

@@ -1,33 +1,55 @@
 """
 应用程序配置模块
 """
+
 import datetime
 import json
-from typing import List, Any, Dict, Type
+from typing import Any, Dict, List, Type
 
-from pydantic import ValidationError
+from pydantic import ValidationError, ValidationInfo, field_validator
 from pydantic_settings import BaseSettings
-from sqlalchemy import insert, update, select
+from sqlalchemy import insert, select, update
 
-from app.core.constants import API_VERSION, DEFAULT_CREATE_IMAGE_MODEL, DEFAULT_FILTER_MODELS, DEFAULT_MODEL, DEFAULT_STREAM_CHUNK_SIZE, DEFAULT_STREAM_LONG_TEXT_THRESHOLD, DEFAULT_STREAM_MAX_DELAY, DEFAULT_STREAM_MIN_DELAY, DEFAULT_STREAM_SHORT_TEXT_THRESHOLD, DEFAULT_TIMEOUT, MAX_RETRIES
+from app.core.constants import (
-from app.log.logger import get_config_logger
+    API_VERSION,
-# 延迟导入以避免循环依赖，仅在 sync_initial_settings 中使用
+    DEFAULT_CREATE_IMAGE_MODEL,
-# from app.database.connection import database
+    DEFAULT_FILTER_MODELS,
-# from app.database.models import Settings as SettingsModel
+    DEFAULT_MODEL,
-# from app.database.services import get_all_settings # get_all_settings 可能不适合启动时调用，直接查询
+    DEFAULT_SAFETY_SETTINGS,
-
+    DEFAULT_STREAM_CHUNK_SIZE,
-logger = get_config_logger()
+    DEFAULT_STREAM_LONG_TEXT_THRESHOLD,
+    DEFAULT_STREAM_MAX_DELAY,
+    DEFAULT_STREAM_MIN_DELAY,
+    DEFAULT_STREAM_SHORT_TEXT_THRESHOLD,
+    DEFAULT_TIMEOUT,
+    MAX_RETRIES,
+)
+from app.log.logger import Logger
 
 
 class Settings(BaseSettings):
-    """应用程序配置"""
     # 数据库配置
-    MYSQL_HOST: str
+    DATABASE_TYPE: str = "mysql"  # sqlite 或 mysql
-    MYSQL_PORT: int
+    SQLITE_DATABASE: str = "default_db"
-    MYSQL_USER: str
+    MYSQL_HOST: str = ""
-    MYSQL_PASSWORD: str
+    MYSQL_PORT: int = 3306
-    MYSQL_DATABASE: str
+    MYSQL_USER: str = ""
-    
+    MYSQL_PASSWORD: str = ""
+    MYSQL_DATABASE: str = ""
+    MYSQL_SOCKET: str = ""
+
+    # 验证 MySQL 配置
+    @field_validator(
+        "MYSQL_HOST", "MYSQL_PORT", "MYSQL_USER", "MYSQL_PASSWORD", "MYSQL_DATABASE"
+    )
+    def validate_mysql_config(cls, v: Any, info: ValidationInfo) -> Any:
+        if info.data.get("DATABASE_TYPE") == "mysql":
+            if v is None or v == "":
+                raise ValueError(
+                    "MySQL configuration is required when DATABASE_TYPE is 'mysql'"
+                )
+        return v
+
     # API相关配置
     API_KEYS: List[str]
     ALLOWED_TOKENS: List[str]
@@ -37,7 +59,8 @@ class Settings(BaseSettings):
     TEST_MODEL: str = DEFAULT_MODEL
     TIME_OUT: int = DEFAULT_TIMEOUT
     MAX_RETRIES: int = MAX_RETRIES
-    
+    PROXIES: List[str] = []  # 新增：代理服务器列表
+
     # 模型相关配置
     SEARCH_MODELS: List[str] = ["gemini-2.0-flash-exp"]
     IMAGE_MODELS: List[str] = ["gemini-2.0-flash-exp"]
@@ -45,7 +68,9 @@ class Settings(BaseSettings):
     TOOLS_CODE_EXECUTION_ENABLED: bool = False
     SHOW_SEARCH_LINK: bool = True
     SHOW_THINKING_PROCESS: bool = True
-    
+    THINKING_MODELS: List[str] = []  # 新增：用于思考过程的模型列表
+    THINKING_BUDGET_MAP: Dict[str, float] = {}  # 新增：模型对应的预算映射
+
     # 图像生成相关配置
     PAID_KEY: str = ""
     CREATE_IMAGE_MODEL: str = DEFAULT_CREATE_IMAGE_MODEL
@@ -54,7 +79,7 @@ class Settings(BaseSettings):
     PICGO_API_KEY: str = ""
     CLOUDFLARE_IMGBED_URL: str = ""
     CLOUDFLARE_IMGBED_AUTH_CODE: str = ""
-    
+
     # 流式输出优化器配置
     STREAM_OPTIMIZER_ENABLED: bool = False
     STREAM_MIN_DELAY: float = DEFAULT_STREAM_MIN_DELAY
@@ -63,9 +88,25 @@ class Settings(BaseSettings):
     STREAM_LONG_TEXT_THRESHOLD: int = DEFAULT_STREAM_LONG_TEXT_THRESHOLD
     STREAM_CHUNK_SIZE: int = DEFAULT_STREAM_CHUNK_SIZE
 
+    # 假流式配置 (Fake Streaming Configuration)
+    FAKE_STREAM_ENABLED: bool = False  # 是否启用假流式输出
+    FAKE_STREAM_EMPTY_DATA_INTERVAL_SECONDS: int = 5  # 假流式发送空数据的间隔时间（秒）
+
     # 调度器配置
-    CHECK_INTERVAL_HOURS: int = 1 # 默认检查间隔为1小时
+    CHECK_INTERVAL_HOURS: int = 1  # 默认检查间隔为1小时
-    TIMEZONE: str = "Asia/Shanghai" # 默认时区
+    TIMEZONE: str = "Asia/Shanghai"  # 默认时区
+
+    # github
+    GITHUB_REPO_OWNER: str = "snailyp"
+    GITHUB_REPO_NAME: str = "gemini-balance"
+
+    # 日志配置
+    LOG_LEVEL: str = "INFO"  # 默认日志级别
+    AUTO_DELETE_ERROR_LOGS_ENABLED: bool = True  # 是否开启自动删除错误日志
+    AUTO_DELETE_ERROR_LOGS_DAYS: int = 7  # 自动删除多少天前的错误日志 (1, 7, 30)
+    AUTO_DELETE_REQUEST_LOGS_ENABLED: bool = False  # 是否开启自动删除请求日志
+    AUTO_DELETE_REQUEST_LOGS_DAYS: int = 30  # 自动删除多少天前的请求日志 (1, 7, 30)
+    SAFETY_SETTINGS: List[Dict[str, str]] = DEFAULT_SAFETY_SETTINGS  # 新增：安全设置
 
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
@@ -73,35 +114,118 @@ class Settings(BaseSettings):
         if not self.AUTH_TOKEN and self.ALLOWED_TOKENS:
             self.AUTH_TOKEN = self.ALLOWED_TOKENS[0]
 
+
 # 创建全局配置实例
 settings = Settings()
 
+
 def _parse_db_value(key: str, db_value: str, target_type: Type) -> Any:
     """尝试将数据库字符串值解析为目标 Python 类型"""
+    from app.log.logger import get_config_logger  # 函数内导入
+
+    logger = get_config_logger()  # 函数内初始化
     try:
+        # 处理 List[str]
         if target_type == List[str]:
-            # 尝试解析 JSON 列表，如果失败则按逗号分割
             try:
                 parsed = json.loads(db_value)
                 if isinstance(parsed, list):
                     return [str(item) for item in parsed]
             except json.JSONDecodeError:
-                # 回退到逗号分割，去除空格
+                return [item.strip() for item in db_value.split(",") if item.strip()]
-                return [item.strip() for item in db_value.split(',') if item.strip()]
+            logger.warning(
-            # 如果解析后不是列表或解析失败，返回空列表或进行其他处理
+                f"Could not parse '{db_value}' as List[str] for key '{key}', falling back to comma split or empty list."
-            logger.warning(f"Could not parse '{db_value}' as List[str] for key '{key}', falling back to comma split or empty list.")
+            )
-            return [item.strip() for item in db_value.split(',') if item.strip()] # Fallback
+            return [item.strip() for item in db_value.split(",") if item.strip()]
+        # 处理 Dict[str, float]
+        elif target_type == Dict[str, float]:
+            parsed_dict = {}
+            try:
+                # First attempt: standard JSON parsing
+                parsed = json.loads(db_value)
+                if isinstance(parsed, dict):
+                    parsed_dict = {str(k): float(v) for k, v in parsed.items()}
+                else:
+                    logger.warning(
+                        f"Parsed DB value for key '{key}' is not a dictionary type. Value: {db_value}"
+                    )
+            except (json.JSONDecodeError, ValueError, TypeError) as e1:
+                # Second attempt: try replacing single quotes if JSONDecodeError occurred
+                if isinstance(e1, json.JSONDecodeError) and "'" in db_value:
+                    logger.warning(
+                        f"Failed initial JSON parse for key '{key}'. Attempting to replace single quotes. Error: {e1}"
+                    )
+                    try:
+                        corrected_db_value = db_value.replace("'", '"')
+                        parsed = json.loads(corrected_db_value)
+                        if isinstance(parsed, dict):
+                            parsed_dict = {str(k): float(v) for k, v in parsed.items()}
+                        else:
+                            logger.warning(
+                                f"Parsed DB value (after quote replacement) for key '{key}' is not a dictionary type. Value: {corrected_db_value}"
+                            )
+                    except (json.JSONDecodeError, ValueError, TypeError) as e2:
+                        logger.error(
+                            f"Could not parse '{db_value}' as Dict[str, float] for key '{key}' even after replacing quotes: {e2}. Returning empty dict."
+                        )
+                else:
+                    # Log other errors (ValueError, TypeError) or JSON errors without single quotes
+                    logger.error(
+                        f"Could not parse '{db_value}' as Dict[str, float] for key '{key}': {e1}. Returning empty dict."
+                    )
+            return parsed_dict  # Return the parsed dict or an empty one if all attempts fail
+        # 处理 List[Dict[str, str]]
+        elif target_type == List[Dict[str, str]]:
+            try:
+                parsed = json.loads(db_value)
+                if isinstance(parsed, list):
+                    # 验证列表中的每个元素是否为字典，并且键和值都是字符串
+                    valid = all(
+                        isinstance(item, dict)
+                        and all(isinstance(k, str) for k in item.keys())
+                        and all(isinstance(v, str) for v in item.values())
+                        for item in parsed
+                    )
+                    if valid:
+                        return parsed
+                    else:
+                        logger.warning(
+                            f"Invalid structure in List[Dict[str, str]] for key '{key}'. Value: {db_value}"
+                        )
+                        return []  # 或者返回默认值？这里返回空列表
+                else:
+                    logger.warning(
+                        f"Parsed DB value for key '{key}' is not a list type. Value: {db_value}"
+                    )
+                    return []
+            except json.JSONDecodeError:
+                logger.error(
+                    f"Could not parse '{db_value}' as JSON for List[Dict[str, str]] for key '{key}'. Returning empty list."
+                )
+                return []
+            except Exception as e:
+                logger.error(
+                    f"Error parsing List[Dict[str, str]] for key '{key}': {e}. Value: {db_value}. Returning empty list."
+                )
+                return []
+        # 处理 bool
         elif target_type == bool:
-            return db_value.lower() in ('true', '1', 'yes', 'on')
+            return db_value.lower() in ("true", "1", "yes", "on")
+        # 处理 int
         elif target_type == int:
             return int(db_value)
+        # 处理 float
         elif target_type == float:
             return float(db_value)
-        else: # 默认为 str 或其他 pydantic 能处理的类型
+        # 默认为 str 或其他 pydantic 能直接处理的类型
+        else:
             return db_value
     except (ValueError, TypeError, json.JSONDecodeError) as e:
-        logger.warning(f"Failed to parse db_value '{db_value}' for key '{key}' as type {target_type}: {e}. Using original string value.")
+        logger.warning(
-        return db_value # 解析失败则返回原始字符串
+            f"Failed to parse db_value '{db_value}' for key '{key}' as type {target_type}: {e}. Using original string value."
+        )
+        return db_value  # 解析失败则返回原始字符串
+
 
 async def sync_initial_settings():
     """
@@ -110,6 +234,9 @@ async def sync_initial_settings():
     2. 将数据库设置合并到内存 settings (数据库优先)。
     3. 将最终的内存 settings 同步回数据库。
     """
+    from app.log.logger import get_config_logger  # 函数内导入
+
+    logger = get_config_logger()  # 函数内初始化
     # 延迟导入以避免循环依赖和确保数据库连接已初始化
     from app.database.connection import database
     from app.database.models import Settings as SettingsModel
@@ -122,7 +249,9 @@ async def sync_initial_settings():
             await database.connect()
             logger.info("Database connection established for initial sync.")
         except Exception as e:
-            logger.error(f"Failed to connect to database for initial settings sync: {e}. Skipping sync.")
+            logger.error(
+                f"Failed to connect to database for initial settings sync: {e}. Skipping sync."
+            )
             return
 
     try:
@@ -131,18 +260,30 @@ async def sync_initial_settings():
         try:
             query = select(SettingsModel.key, SettingsModel.value)
             results = await database.fetch_all(query)
-            db_settings_raw = [{"key": row["key"], "value": row["value"]} for row in results]
+            db_settings_raw = [
+                {"key": row["key"], "value": row["value"]} for row in results
+            ]
             logger.info(f"Fetched {len(db_settings_raw)} settings from database.")
         except Exception as e:
-            logger.error(f"Failed to fetch settings from database: {e}. Proceeding with environment/dotenv settings.")
+            logger.error(
+                f"Failed to fetch settings from database: {e}. Proceeding with environment/dotenv settings."
+            )
             # 即使数据库读取失败，也要继续执行，确保基于 env/dotenv 的配置能同步到数据库
 
-        db_settings_map: Dict[str, str] = {s['key']: s['value'] for s in db_settings_raw}
+        db_settings_map: Dict[str, str] = {
+            s["key"]: s["value"] for s in db_settings_raw
+        }
 
         # 2. 将数据库设置合并到内存 settings (数据库优先)
         updated_in_memory = False
 
         for key, db_value in db_settings_map.items():
+            if key == "DATABASE_TYPE":
+                logger.debug(
+                    f"Skipping update of '{key}' in memory from database. "
+                    "This setting is controlled by environment/dotenv."
+                )
+                continue
             if hasattr(settings, key):
                 target_type = Settings.__annotations__.get(key)
                 if target_type:
@@ -153,39 +294,54 @@ async def sync_initial_settings():
                         # 比较解析后的值和内存中的值
                         # 注意：对于列表等复杂类型，直接比较可能不够健壮，但这里简化处理
                         if parsed_db_value != memory_value:
-                             # 检查类型是否匹配，以防解析函数返回了不兼容的类型
+                            # 检查类型是否匹配，以防解析函数返回了不兼容的类型
-                            # 优先处理 List[str] 类型，避免直接对泛型使用 isinstance
+                            type_match = False
-                            if target_type == List[str]:
+                            if target_type == List[str] and isinstance(
-                                if isinstance(parsed_db_value, list):
+                                parsed_db_value, list
-                                    # 可以选择性地添加对列表元素的检查，但这里保持简化
+                            ):
-                                    setattr(settings, key, parsed_db_value)
+                                type_match = True
-                                    logger.info(f"Updated setting '{key}' in memory from database value (List[str]).")
+                            elif target_type == Dict[str, float] and isinstance(
-                                    updated_in_memory = True
+                                parsed_db_value, dict
-                                else:
+                            ):
-                                     logger.warning(f"Parsed DB value type mismatch for key '{key}'. Expected List[str], got {type(parsed_db_value)}. Skipping update.")
+                                type_match = True
-                            # 对于其他非泛型类型，使用常规的 isinstance 检查
+                            elif target_type not in (
-                            elif isinstance(parsed_db_value, target_type):
+                                List[str],
+                                Dict[str, float],
+                            ) and isinstance(parsed_db_value, target_type):
+                                type_match = True
+
+                            if type_match:
                                 setattr(settings, key, parsed_db_value)
-                                logger.info(f"Updated setting '{key}' in memory from database value.")
+                                logger.debug(
+                                    f"Updated setting '{key}' in memory from database value ({target_type})."
+                                )
                                 updated_in_memory = True
                             else:
-                                logger.warning(f"Parsed DB value type mismatch for key '{key}'. Expected {target_type}, got {type(parsed_db_value)}. Skipping update.")
+                                logger.warning(
+                                    f"Parsed DB value type mismatch for key '{key}'. Expected {target_type}, got {type(parsed_db_value)}. Skipping update."
+                                )
 
                     except Exception as e:
-                        logger.error(f"Error processing database setting for key '{key}': {e}")
+                        logger.error(
+                            f"Error processing database setting for key '{key}': {e}"
+                        )
             else:
-                 logger.warning(f"Database setting '{key}' not found in Settings model definition. Ignoring.")
+                logger.warning(
-
+                    f"Database setting '{key}' not found in Settings model definition. Ignoring."
+                )
 
         # 如果内存中有更新，重新验证 Pydantic 模型（可选但推荐）
         if updated_in_memory:
             try:
                 # 重新加载以确保类型转换和验证
                 settings = Settings(**settings.model_dump())
-                logger.info("Settings object re-validated after merging database values.")
+                logger.info(
+                    "Settings object re-validated after merging database values."
+                )
             except ValidationError as e:
-                 logger.error(f"Validation error after merging database settings: {e}. Settings might be inconsistent.")
+                logger.error(
-
+                    f"Validation error after merging database settings: {e}. Settings might be inconsistent."
+                )
 
         # 3. 将最终的内存 settings 同步回数据库
         final_memory_settings = settings.model_dump()
@@ -196,19 +352,30 @@ async def sync_initial_settings():
         existing_db_keys = set(db_settings_map.keys())
 
         for key, value in final_memory_settings.items():
+            if key == "DATABASE_TYPE":
+                logger.debug(
+                    f"Skipping synchronization of '{key}' to database. "
+                    "This setting is controlled by environment/dotenv."
+                )
+                continue
+
             # 序列化值为字符串或 JSON 字符串
-            if isinstance(value, list):
+            if isinstance(value, (list, dict)):  # 处理列表和字典
-                db_value = json.dumps(value)
+                db_value = json.dumps(
+                    value, ensure_ascii=False
+                )  # 使用 ensure_ascii=False 以支持非 ASCII 字符
             elif isinstance(value, bool):
                 db_value = str(value).lower()
+            elif value is None:  # 处理 None 值
+                db_value = ""  # 或者根据需要设为 NULL 或其他标记
             else:
                 db_value = str(value)
 
             data = {
-                'key': key,
+                "key": key,
-                'value': db_value,
+                "value": db_value,
-                'description': f"{key} configuration setting", # 默认描述
+                "description": f"{key} configuration setting",  # 默认描述
-                'updated_at': now
+                "updated_at": now,
             }
 
             if key in existing_db_keys:
@@ -217,7 +384,7 @@ async def sync_initial_settings():
                     settings_to_update.append(data)
             else:
                 # 如果键不在数据库中，则插入
-                data['created_at'] = now
+                data["created_at"] = now
                 settings_to_insert.append(data)
 
         # 在事务中执行批量插入和更新
@@ -226,48 +393,78 @@ async def sync_initial_settings():
                 async with database.transaction():
                     if settings_to_insert:
                         # 获取现有描述以避免覆盖
-                        query_existing = select(SettingsModel.key, SettingsModel.description).where(SettingsModel.key.in_([s['key'] for s in settings_to_insert]))
+                        query_existing = select(
-                        existing_desc = {row['key']: row['description'] for row in await database.fetch_all(query_existing)}
+                            SettingsModel.key, SettingsModel.description
+                        ).where(
+                            SettingsModel.key.in_(
+                                [s["key"] for s in settings_to_insert]
+                            )
+                        )
+                        existing_desc = {
+                            row["key"]: row["description"]
+                            for row in await database.fetch_all(query_existing)
+                        }
                         for item in settings_to_insert:
-                            item['description'] = existing_desc.get(item['key'], item['description'])
+                            item["description"] = existing_desc.get(
+                                item["key"], item["description"]
+                            )
 
                         query_insert = insert(SettingsModel).values(settings_to_insert)
                         await database.execute(query=query_insert)
-                        logger.info(f"Synced (inserted) {len(settings_to_insert)} settings to database.")
+                        logger.info(
+                            f"Synced (inserted) {len(settings_to_insert)} settings to database."
+                        )
 
                     if settings_to_update:
                         # 获取现有描述以避免覆盖
-                        query_existing = select(SettingsModel.key, SettingsModel.description).where(SettingsModel.key.in_([s['key'] for s in settings_to_update]))
+                        query_existing = select(
-                        existing_desc = {row['key']: row['description'] for row in await database.fetch_all(query_existing)}
+                            SettingsModel.key, SettingsModel.description
+                        ).where(
+                            SettingsModel.key.in_(
+                                [s["key"] for s in settings_to_update]
+                            )
+                        )
+                        existing_desc = {
+                            row["key"]: row["description"]
+                            for row in await database.fetch_all(query_existing)
+                        }
 
                         for setting_data in settings_to_update:
-                            setting_data['description'] = existing_desc.get(setting_data['key'], setting_data['description'])
+                            setting_data["description"] = existing_desc.get(
+                                setting_data["key"], setting_data["description"]
+                            )
                             query_update = (
                                 update(SettingsModel)
-                                .where(SettingsModel.key == setting_data['key'])
+                                .where(SettingsModel.key == setting_data["key"])
                                 .values(
-                                    value=setting_data['value'],
+                                    value=setting_data["value"],
-                                    description=setting_data['description'],
+                                    description=setting_data["description"],
-                                    updated_at=setting_data['updated_at']
+                                    updated_at=setting_data["updated_at"],
                                 )
                             )
                             await database.execute(query=query_update)
-                        logger.info(f"Synced (updated) {len(settings_to_update)} settings to database.")
+                        logger.info(
+                            f"Synced (updated) {len(settings_to_update)} settings to database."
+                        )
             except Exception as e:
-                logger.error(f"Failed to sync settings to database during startup: {str(e)}")
+                logger.error(
+                    f"Failed to sync settings to database during startup: {str(e)}"
+                )
         else:
-            logger.info("No setting changes detected between memory and database during initial sync.")
+            logger.info(
+                "No setting changes detected between memory and database during initial sync."
+            )
+
+        # 刷新日志等级
+        Logger.update_log_levels(final_memory_settings.get("LOG_LEVEL"))
 
     except Exception as e:
         logger.error(f"An unexpected error occurred during initial settings sync: {e}")
     finally:
         if database.is_connected:
-             try:
+            try:
-                 # Don't disconnect if it's managed elsewhere (e.g., FastAPI lifespan)
+                pass
-                 # await database.disconnect()
+            except Exception as e:
-                 # logger.info("Database connection closed after initial sync.")
+                logger.error(f"Error disconnecting database after initial sync: {e}")
-                 pass # Assume connection lifecycle is managed by the application lifespan
-             except Exception as e:
-                 logger.error(f"Error disconnecting database after initial sync: {e}")
 
     logger.info("Initial settings synchronization finished.")

app/core/application.py

@@ -1,9 +1,8 @@
-"""
-应用程序工厂模块，负责创建和配置FastAPI应用程序实例
-"""
 from contextlib import asynccontextmanager
+from pathlib import Path # Add pathlib import
 from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
+from fastapi.templating import Jinja2Templates
 
 from app.config.config import settings, sync_initial_settings
 from app.log.logger import get_application_logger
@@ -11,56 +10,114 @@ from app.middleware.middleware import setup_middlewares
 from app.exception.exceptions import setup_exception_handlers
 from app.router.routes import setup_routers
 from app.service.key.key_manager import get_key_manager_instance
-from app.core.initialization import initialize_app
 from app.database.connection import connect_to_db, disconnect_from_db
+from app.utils.helpers import get_current_version # Import from helpers
 from app.database.initialization import initialize_database
-from app.scheduler.key_checker import start_scheduler, stop_scheduler # 导入调度器函数
+from app.scheduler.scheduled_tasks import start_scheduler, stop_scheduler
+from app.service.update.update_service import check_for_updates
 
 logger = get_application_logger()
 
+# Define project paths using pathlib
+# Assuming this file is at app/core/application.py
+PROJECT_ROOT = Path(__file__).resolve().parent.parent.parent
+# VERSION_FILE_PATH = PROJECT_ROOT / "VERSION" # Removed: Defined in helpers.py
+STATIC_DIR = PROJECT_ROOT / "app" / "static"
+TEMPLATES_DIR = PROJECT_ROOT / "app" / "templates"
+
+# Removed _get_current_version function definition, moved to helpers.py
+
+# 初始化模板引擎，并添加全局变量
+templates = Jinja2Templates(directory="app/templates")
+
+# 定义一个函数来更新模板全局变量
+def update_template_globals(app: FastAPI, update_info: dict):
+    # Jinja2Templates 实例没有直接更新全局变量的方法
+    # 我们需要在请求上下文中传递这些变量，或者修改 Jinja 环境
+    # 更简单的方法是将其存储在 app.state 中，并在渲染时传递
+    app.state.update_info = update_info
+    logger.info(f"Update info stored in app.state: {update_info}")
+
+
+# --- Helper functions for lifespan ---
+
+async def _setup_database_and_config(app_settings):
+    """Initializes database, syncs settings, and initializes KeyManager."""
+    initialize_database()
+    logger.info("Database initialized successfully")
+    await connect_to_db()
+    await sync_initial_settings()
+    # Initialize KeyManager using potentially updated settings
+    await get_key_manager_instance(app_settings.API_KEYS)
+    logger.info("Database, config sync, and KeyManager initialized successfully")
+
+async def _shutdown_database():
+    """Disconnects from the database."""
+    await disconnect_from_db()
+
+def _start_scheduler():
+    """Starts the background scheduler."""
+    try:
+        start_scheduler()
+        logger.info("Scheduler started successfully.")
+    except Exception as e:
+         logger.error(f"Failed to start scheduler: {e}")
+
+def _stop_scheduler():
+    """Stops the background scheduler."""
+    stop_scheduler()
+
+async def _perform_update_check(app: FastAPI):
+    """Checks for updates and stores the info in app.state."""
+    update_available, latest_version, error_message = await check_for_updates()
+    current_version = get_current_version() # Use imported function
+    update_info = {
+        "update_available": update_available,
+        "latest_version": latest_version,
+        "error_message": error_message,
+        "current_version": current_version
+    }
+    # Ensure app.state exists and store update info
+    if not hasattr(app, "state"):
+        from starlette.datastructures import State
+        app.state = State()
+    app.state.update_info = update_info
+    logger.info(f"Update check completed. Info: {update_info}")
+
+# --- Application Lifespan ---
+
 @asynccontextmanager
 async def lifespan(app: FastAPI):
     """
-    应用程序生命周期管理器
+    Manages the application startup and shutdown events.
     
     Args:
         app: FastAPI应用实例
     """
-    # 启动事件
+    # Startup events
     logger.info("Application starting up...")
     try:
-        # 初始化数据库
+        # Setup database, config, and KeyManager
-        initialize_database()
+        await _setup_database_and_config(settings) # Pass settings object
-        logger.info("Database initialized successfully")
+
-        
+        # Perform update check after core components are ready
-        # 连接到数据库
+        # await _perform_update_check(app) # Removed: Version check moved to frontend API call
-        await connect_to_db()
+
-        
+        # Start the scheduler
-        # 同步初始配置（DB优先，然后同步回DB）
+        _start_scheduler()
-        await sync_initial_settings()
 
-        # 初始化KeyManager (使用可能已从DB更新的settings)
-        await get_key_manager_instance(settings.API_KEYS)
-        logger.info("KeyManager initialized successfully")
     except Exception as e:
-        logger.error(f"Failed to initialize application: {str(e)}")
+        logger.critical(f"Critical error during application startup: {str(e)}", exc_info=True)
-        raise
+        # Depending on the severity, you might want to prevent the app from fully starting
+        # For now, we log critically and let it yield, potentially in a broken state.
+        # Consider adding more robust error handling here if startup failures should halt the app.
 
-    # 启动调度器
+    yield  # Application runs
-    start_scheduler()
-    logger.info("Scheduler started successfully.")
 
-    yield  # 应用程序运行期间
+    # Shutdown events
-    
-    # 关闭事件
     logger.info("Application shutting down...")
-    
+    _stop_scheduler()
-    # 停止调度器
+    await _shutdown_database()
-    stop_scheduler()
-    logger.info("Scheduler stopped.")
-
-    # 断开数据库连接
-    await disconnect_from_db()
 
 def create_app() -> FastAPI:
     """
@@ -69,20 +126,33 @@ def create_app() -> FastAPI:
     Returns:
         FastAPI: 配置好的FastAPI应用程序实例
     """
-    # 初始化应用程序
+    # Removed: initialize_app() call
-    initialize_app()
+
-    
     # 创建FastAPI应用
+    # Read version from file for consistency
+    current_version = get_current_version() # Use imported function
     app = FastAPI(
         title="Gemini Balance API",
         description="Gemini API代理服务，支持负载均衡和密钥管理",
-        version="1.0.0",
+        version=current_version,
         lifespan=lifespan
     )
-    
+
+    # Initialize app.state early to ensure it exists before lifespan potentially uses it
+    if not hasattr(app, "state"):
+        from starlette.datastructures import State
+        app.state = State()
+    # Set a default/initial state for update_info
+    app.state.update_info = {
+        "update_available": False,
+        "latest_version": None,
+        "error_message": "Initializing...",
+        "current_version": current_version # Use version read earlier
+    }
+
     # 配置静态文件
-    app.mount("/static", StaticFiles(directory="app/static"), name="static")
+    app.mount("/static", StaticFiles(directory=str(STATIC_DIR)), name="static")
-    
+
     # 配置中间件
     setup_middlewares(app)
     

app/core/constants.py

@@ -40,3 +40,40 @@ DEFAULT_STREAM_CHUNK_SIZE = 5
 # 正则表达式模式
 IMAGE_URL_PATTERN = r'!\[(.*?)\]\((.*?)\)'
 DATA_URL_PATTERN = r'data:([^;]+);base64,(.+)'
+
+# Audio/Video Settings
+SUPPORTED_AUDIO_FORMATS = ["wav", "mp3", "flac", "ogg"]
+SUPPORTED_VIDEO_FORMATS = ["mp4", "mov", "avi", "webm"]
+MAX_AUDIO_SIZE_BYTES = 50 * 1024 * 1024  # Example: 50MB limit for Base64 payload
+MAX_VIDEO_SIZE_BYTES = 200 * 1024 * 1024 # Example: 200MB limit
+
+# Optional: Define MIME type mappings if needed, or handle directly in converter
+AUDIO_FORMAT_TO_MIMETYPE = {
+    "wav": "audio/wav",
+    "mp3": "audio/mpeg",
+    "flac": "audio/flac",
+    "ogg": "audio/ogg",
+}
+
+VIDEO_FORMAT_TO_MIMETYPE = {
+    "mp4": "video/mp4",
+    "mov": "video/quicktime",
+    "avi": "video/x-msvideo",
+    "webm": "video/webm",
+}
+
+GEMINI_2_FLASH_EXP_SAFETY_SETTINGS = [
+            {"category": "HARM_CATEGORY_HARASSMENT", "threshold": "OFF"},
+            {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "OFF"},
+            {"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", "threshold": "OFF"},
+            {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "OFF"},
+            {"category": "HARM_CATEGORY_CIVIC_INTEGRITY", "threshold": "OFF"},
+        ]
+
+DEFAULT_SAFETY_SETTINGS = [
+        {"category": "HARM_CATEGORY_HARASSMENT", "threshold": "OFF"},
+        {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "OFF"},
+        {"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", "threshold": "OFF"},
+        {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "OFF"},
+        {"category": "HARM_CATEGORY_CIVIC_INTEGRITY", "threshold": "BLOCK_NONE"},
+    ]

app/core/initialization.py

@@ -1,40 +0,0 @@
-"""
-应用程序初始化模块
-"""
-from pathlib import Path
-from typing import List
-
-from app.log.logger import get_initialization_logger
-
-logger = get_initialization_logger()
-
-
-def ensure_directories_exist(directories: List[str]) -> None:
-    """
-    确保指定的目录存在，如果不存在则创建
-    
-    Args:
-        directories: 要确保存在的目录列表
-    """
-    for directory in directories:
-        try:
-            Path(directory).mkdir(parents=True, exist_ok=True)
-            logger.info(f"Ensured directory exists: {directory}")
-        except Exception as e:
-            logger.error(f"Failed to create directory {directory}: {str(e)}")
-
-
-def initialize_app() -> None:
-    """
-    初始化应用程序，确保所需的目录和文件都存在
-    """
-    # 确保必要的目录存在
-    required_directories = [
-        "app/static/css",
-        "app/static/js",
-        "app/static/icons",
-        "app/templates",
-    ]
-    
-    ensure_directories_exist(required_directories)
-    logger.info("core initialization completed")

app/database/connection.py

@@ -1,8 +1,10 @@
 """
 数据库连接池模块
 """
+from pathlib import Path
 from databases import Database
 from sqlalchemy import create_engine, MetaData
+# from sqlalchemy.orm import sessionmaker # 不再需要
 from sqlalchemy.ext.declarative import declarative_base
 
 from app.config.config import settings
@@ -11,7 +13,19 @@ from app.log.logger import get_database_logger
 logger = get_database_logger()
 
 # 数据库URL
-DATABASE_URL = f"mysql+pymysql://{settings.MYSQL_USER}:{settings.MYSQL_PASSWORD}@{settings.MYSQL_HOST}:{settings.MYSQL_PORT}/{settings.MYSQL_DATABASE}"
+if settings.DATABASE_TYPE == "sqlite":
+    # 确保 data 目录存在
+    data_dir = Path("data")
+    data_dir.mkdir(exist_ok=True)
+    db_path = data_dir / settings.SQLITE_DATABASE
+    DATABASE_URL = f"sqlite:///{db_path}"
+elif settings.DATABASE_TYPE == "mysql":
+    if settings.MYSQL_SOCKET:
+        DATABASE_URL = f"mysql+pymysql://{settings.MYSQL_USER}:{settings.MYSQL_PASSWORD}@/{settings.MYSQL_DATABASE}?unix_socket={settings.MYSQL_SOCKET}"
+    else:
+        DATABASE_URL = f"mysql+pymysql://{settings.MYSQL_USER}:{settings.MYSQL_PASSWORD}@{settings.MYSQL_HOST}:{settings.MYSQL_PORT}/{settings.MYSQL_DATABASE}"
+else:
+    raise ValueError("Unsupported database type. Please set DATABASE_TYPE to 'sqlite' or 'mysql'.")
 
 # 创建数据库引擎
 # pool_pre_ping=True: 在从连接池获取连接前执行简单的 "ping" 测试，确保连接有效
@@ -23,22 +37,27 @@ metadata = MetaData()
 # 创建基类
 Base = declarative_base(metadata=metadata)
 
-# 创建数据库连接池，并配置连接池参数
+# 创建数据库连接池，并配置连接池参数，在sqlite中不使用连接池
 # min_size/max_size: 连接池的最小/最大连接数
 # pool_recycle=3600: 连接在池中允许存在的最大秒数（生命周期）。
 #                    设置为 3600 秒（1小时），确保在 MySQL 默认的 wait_timeout (通常8小时) 或其他网络超时之前回收连接。
 #                    如果遇到连接失效问题，可以尝试调低此值，使其小于实际的 wait_timeout 或网络超时时间。
 # databases 库会自动处理连接失效后的重连尝试。
-database = Database(DATABASE_URL, min_size=5, max_size=20, pool_recycle=1800) # Reduced recycle time to 30 mins
+if settings.DATABASE_TYPE == "sqlite":
+    database = Database(DATABASE_URL)
+else:
+    database = Database(DATABASE_URL, min_size=5, max_size=20, pool_recycle=1800) # Reduced recycle time to 30 mins
 
+# 移除了 SessionLocal 和 get_db 函数
 
+# --- Async connection functions for lifespan/async routes ---
 async def connect_to_db():
     """
     连接到数据库
     """
     try:
         await database.connect()
-        logger.info("Connected to database")
+        logger.info(f"Connected to {settings.DATABASE_TYPE}")
     except Exception as e:
         logger.error(f"Failed to connect to database: {str(e)}")
         raise
@@ -50,6 +69,6 @@ async def disconnect_from_db():
     """
     try:
         await database.disconnect()
-        logger.info("Disconnected from database")
+        logger.info(f"Disconnected from {settings.DATABASE_TYPE}")
     except Exception as e:
         logger.error(f"Failed to disconnect from database: {str(e)}")

app/database/services.py

@@ -1,14 +1,12 @@
 """
 数据库服务模块
 """
+from typing import List, Optional, Dict, Any, Union
+from datetime import datetime
+from sqlalchemy import func, desc, asc, select, insert, update, delete
 import json
-from typing import Dict, List, Optional, Any, Union
-from datetime import datetime # Keep this import
-
-from sqlalchemy import select, insert, update, func
-
 from app.database.connection import database
-from app.database.models import Settings, ErrorLog, RequestLog # Import RequestLog
+from app.database.models import Settings, ErrorLog, RequestLog
 from app.log.logger import get_database_logger
 
 logger = get_database_logger()
@@ -157,25 +155,39 @@ async def get_error_logs(
     offset: int = 0,
     key_search: Optional[str] = None,
     error_search: Optional[str] = None,
+    error_code_search: Optional[str] = None,
     start_date: Optional[datetime] = None,
-    end_date: Optional[datetime] = None
+    end_date: Optional[datetime] = None,
+    sort_by: str = 'id',        # 新增排序字段
+    sort_order: str = 'desc'   # 新增排序顺序 ('asc' or 'desc')
 ) -> List[Dict[str, Any]]:
     """
-    获取错误日志，支持搜索和日期过滤
+    获取错误日志，支持搜索、日期过滤和排序
 
     Args:
         limit (int): 限制数量
         offset (int): 偏移量
         key_search (Optional[str]): Gemini密钥搜索词 (模糊匹配)
         error_search (Optional[str]): 错误类型或日志内容搜索词 (模糊匹配)
+        error_code_search (Optional[str]): 错误码搜索词 (精确匹配)
         start_date (Optional[datetime]): 开始日期时间
         end_date (Optional[datetime]): 结束日期时间
+        sort_by (str): 排序字段 (例如 'id', 'request_time')
+        sort_order (str): 排序顺序 ('asc' or 'desc')
 
     Returns:
         List[Dict[str, Any]]: 错误日志列表
     """
     try:
-        query = select(ErrorLog)
+        query = select(
+            ErrorLog.id,
+            ErrorLog.gemini_key,
+            ErrorLog.model_name,
+            ErrorLog.error_type,
+            ErrorLog.error_log,
+            ErrorLog.error_code,
+            ErrorLog.request_time
+        )
         
         # Apply filters
         if key_search:
@@ -190,10 +202,28 @@ async def get_error_logs(
         if end_date:
             # Use the datetime object directly for comparison
             query = query.where(ErrorLog.request_time < end_date)
+        if error_code_search:
+            try:
+                # Attempt to convert search string to integer for exact match
+                error_code_int = int(error_code_search)
+                query = query.where(ErrorLog.error_code == error_code_int)
+            except ValueError:
+                # If conversion fails, log a warning and potentially skip this filter
+                # or handle as needed (e.g., return no results for invalid code format)
+                logger.warning(f"Invalid format for error_code_search: '{error_code_search}'. Expected an integer. Skipping error code filter.")
+                # Optionally, force no results if the format is invalid:
+                # query = query.where(False) # This ensures no rows are returned
+
+        # 添加排序逻辑
+        sort_column = getattr(ErrorLog, sort_by, ErrorLog.id) # 获取排序字段，默认为 id
+        if sort_order.lower() == 'asc':
+            query = query.order_by(asc(sort_column))
+        else:
+            query = query.order_by(desc(sort_column))
+
+        # Apply limit and offset
+        query = query.limit(limit).offset(offset)
 
-        # Apply ordering, limit, and offset
-        query = query.order_by(ErrorLog.request_time.desc()).limit(limit).offset(offset)
-        
         result = await database.fetch_all(query)
         return [dict(row) for row in result]
     except Exception as e:
@@ -204,6 +234,7 @@ async def get_error_logs(
 async def get_error_logs_count(
     key_search: Optional[str] = None,
     error_search: Optional[str] = None,
+    error_code_search: Optional[str] = None, # Added error code search
     start_date: Optional[datetime] = None,
     end_date: Optional[datetime] = None
 ) -> int:
@@ -213,6 +244,7 @@ async def get_error_logs_count(
     Args:
         key_search (Optional[str]): Gemini密钥搜索词 (模糊匹配)
         error_search (Optional[str]): 错误类型或日志内容搜索词 (模糊匹配)
+        error_code_search (Optional[str]): 错误码搜索词 (精确匹配)
         start_date (Optional[datetime]): 开始日期时间
         end_date (Optional[datetime]): 结束日期时间
 
@@ -235,6 +267,16 @@ async def get_error_logs_count(
         if end_date:
             # Use the datetime object directly for comparison
             query = query.where(ErrorLog.request_time < end_date)
+        if error_code_search:
+            try:
+                # Attempt to convert search string to integer for exact match
+                error_code_int = int(error_code_search)
+                query = query.where(ErrorLog.error_code == error_code_int)
+            except ValueError:
+                # If conversion fails, log a warning and potentially skip this filter
+                logger.warning(f"Invalid format for error_code_search in count: '{error_code_search}'. Expected an integer. Skipping error code filter.")
+                # Optionally, force count to 0 if the format is invalid:
+                # return 0 # Or query = query.where(False) before fetching
 
         count_result = await database.fetch_one(query)
         return count_result[0] if count_result else 0
@@ -242,6 +284,99 @@ async def get_error_logs_count(
         logger.exception(f"Failed to count error logs with filters: {str(e)}") # Use exception for stack trace
         raise
 
+
+# 新增函数：获取单条错误日志详情
+async def get_error_log_details(log_id: int) -> Optional[Dict[str, Any]]:
+    """
+    根据 ID 获取单个错误日志的详细信息
+
+    Args:
+        log_id (int): 错误日志的 ID
+
+    Returns:
+        Optional[Dict[str, Any]]: 包含日志详细信息的字典，如果未找到则返回 None
+    """
+    try:
+        query = select(ErrorLog).where(ErrorLog.id == log_id)
+        result = await database.fetch_one(query)
+        if result:
+            # 将 request_msg (JSONB) 转换为字符串以便在 API 中返回
+            log_dict = dict(result)
+            if 'request_msg' in log_dict and log_dict['request_msg'] is not None:
+                # 确保即使是 None 或非 JSON 数据也能处理
+                try:
+                    log_dict['request_msg'] = json.dumps(log_dict['request_msg'], ensure_ascii=False, indent=2)
+                except TypeError:
+                    log_dict['request_msg'] = str(log_dict['request_msg']) # Fallback to string
+            return log_dict
+        else:
+            return None
+    except Exception as e:
+        logger.exception(f"Failed to get error log details for ID {log_id}: {str(e)}")
+        raise
+
+# --- 异步删除函数 (使用 databases 库) ---
+
+async def delete_error_logs_by_ids(log_ids: List[int]) -> int:
+    """
+    根据提供的 ID 列表批量删除错误日志 (异步)。
+
+    Args:
+        log_ids: 要删除的错误日志 ID 列表。
+
+    Returns:
+        int: 实际删除的日志数量。
+    """
+    if not log_ids:
+        return 0
+    try:
+        # 使用 databases 执行删除
+        query = delete(ErrorLog).where(ErrorLog.id.in_(log_ids))
+        # execute 返回受影响的行数，但 databases 库的 execute 不直接返回 rowcount
+        # 我们需要先查询是否存在，或者依赖数据库约束/触发器（如果适用）
+        # 或者，我们可以执行删除并假设成功，除非抛出异常
+        # 为了简单起见，我们执行删除并记录日志，不精确返回删除数量
+        # 如果需要精确数量，需要先执行 SELECT COUNT(*)
+        await database.execute(query)
+        # 注意：databases 的 execute 不返回 rowcount，所以我们不能直接返回删除的数量
+        # 返回 log_ids 的长度作为尝试删除的数量，或者返回 0/1 表示操作尝试
+        logger.info(f"Attempted bulk deletion for error logs with IDs: {log_ids}")
+        return len(log_ids) # 返回尝试删除的数量
+    except Exception as e:
+        # 数据库连接或执行错误
+        logger.error(f"Error during bulk deletion of error logs {log_ids}: {e}", exc_info=True)
+        raise # Re-raise the exception for the router to handle
+
+async def delete_error_log_by_id(log_id: int) -> bool:
+    """
+    根据 ID 删除单个错误日志 (异步)。
+
+    Args:
+        log_id: 要删除的错误日志 ID。
+
+    Returns:
+        bool: 如果成功删除返回 True，否则返回 False。
+    """
+    try:
+        # 先检查是否存在 (可选，但更明确)
+        check_query = select(ErrorLog.id).where(ErrorLog.id == log_id)
+        exists = await database.fetch_one(check_query)
+
+        if not exists:
+            logger.warning(f"Attempted to delete non-existent error log with ID: {log_id}")
+            return False # 或者可以抛出 404 异常，由路由处理
+
+        # 执行删除
+        delete_query = delete(ErrorLog).where(ErrorLog.id == log_id)
+        await database.execute(delete_query)
+        logger.info(f"Successfully deleted error log with ID: {log_id}")
+        return True
+    except Exception as e:
+        logger.error(f"Error deleting error log with ID {log_id}: {e}", exc_info=True)
+        raise # Re-raise the exception for the router to handle
+
+# --- RequestLog Services (保持异步) ---
+
 # 新增函数：添加请求日志
 async def add_request_log(
     model_name: Optional[str],

app/domain/gemini_models.py

@@ -1,12 +1,30 @@
-from typing import List, Optional, Dict, Any, Literal, Union
+from typing import Any, Dict, List, Literal, Optional, Union
-from pydantic import BaseModel
+
+from pydantic import BaseModel, Field
 
 from app.core.constants import DEFAULT_TEMPERATURE, DEFAULT_TOP_K, DEFAULT_TOP_P
 
 
 class SafetySetting(BaseModel):
-    category: Optional[Literal["HARM_CATEGORY_HATE_SPEECH", "HARM_CATEGORY_DANGEROUS_CONTENT", "HARM_CATEGORY_HARASSMENT", "HARM_CATEGORY_SEXUALLY_EXPLICIT", "HARM_CATEGORY_CIVIC_INTEGRITY"]] = None
+    category: Optional[
-    threshold: Optional[Literal["HARM_BLOCK_THRESHOLD_UNSPECIFIED", "BLOCK_LOW_AND_ABOVE", "BLOCK_MEDIUM_AND_ABOVE", "BLOCK_ONLY_HIGH", "BLOCK_NONE", "OFF"]] = None
+        Literal[
+            "HARM_CATEGORY_HATE_SPEECH",
+            "HARM_CATEGORY_DANGEROUS_CONTENT",
+            "HARM_CATEGORY_HARASSMENT",
+            "HARM_CATEGORY_SEXUALLY_EXPLICIT",
+            "HARM_CATEGORY_CIVIC_INTEGRITY",
+        ]
+    ] = None
+    threshold: Optional[
+        Literal[
+            "HARM_BLOCK_THRESHOLD_UNSPECIFIED",
+            "BLOCK_LOW_AND_ABOVE",
+            "BLOCK_MEDIUM_AND_ABOVE",
+            "BLOCK_ONLY_HIGH",
+            "BLOCK_NONE",
+            "OFF",
+        ]
+    ] = None
 
 
 class GenerationConfig(BaseModel):
@@ -26,7 +44,7 @@ class GenerationConfig(BaseModel):
 
 class SystemInstruction(BaseModel):
     role: str = "system"
-    parts: List[Dict[str, Any]]
+    parts: List[Dict[str, Any]] | Dict[str, Any]
 
 
 class GeminiContent(BaseModel):
@@ -37,6 +55,24 @@ class GeminiContent(BaseModel):
 class GeminiRequest(BaseModel):
     contents: List[GeminiContent] = []
     tools: Optional[Union[List[Dict[str, Any]], Dict[str, Any]]] = []
-    safetySettings: Optional[List[SafetySetting]] = None
+    safetySettings: Optional[List[SafetySetting]] = Field(
-    generationConfig: Optional[GenerationConfig] = None
+        default=None, alias="safety_settings"
-    systemInstruction: Optional[SystemInstruction] = None
+    )
+    generationConfig: Optional[GenerationConfig] = Field(
+        default=None, alias="generation_config"
+    )
+    systemInstruction: Optional[SystemInstruction] = Field(
+        default=None, alias="system_instruction"
+    )
+
+    class Config:
+        populate_by_name = True
+
+
+class ResetSelectedKeysRequest(BaseModel):
+    keys: List[str]
+    key_type: str
+
+
+class VerifySelectedKeysRequest(BaseModel):
+    keys: List[str]

app/domain/openai_models.py

@@ -1,5 +1,5 @@
 from pydantic import BaseModel
-from typing import List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 
 from app.core.constants import DEFAULT_MODEL, DEFAULT_TEMPERATURE, DEFAULT_TOP_K, DEFAULT_TOP_P
 
@@ -9,11 +9,14 @@ class ChatRequest(BaseModel):
     model: str = DEFAULT_MODEL
     temperature: Optional[float] = DEFAULT_TEMPERATURE
     stream: Optional[bool] = False
-    tools: Optional[List[dict]] = []
     max_tokens: Optional[int] = None
     top_p: Optional[float] = DEFAULT_TOP_P
     top_k: Optional[int] = DEFAULT_TOP_K
-    stop: Optional[List[str]] = []
+    stop: Optional[Union[List[str],str]] = None
+    reasoning_effort: Optional[str] = None
+    tools: Optional[Union[List[Dict[str, Any]], Dict[str, Any]]] = []
+    tool_choice: Optional[str] = None
+    response_format: Optional[dict] = None
 
 
 class EmbeddingRequest(BaseModel):
@@ -23,10 +26,10 @@ class EmbeddingRequest(BaseModel):
 
 
 class ImageGenerationRequest(BaseModel):
-    model: str = "DALL-E-3"
+    model: str = "imagen-3.0-generate-002"
     prompt: str = ""
     n: int = 1
     size: Optional[str] = "1024x1024"
-    quality: Optional[str] = ""
+    quality: Optional[str] = None
-    style: Optional[str] = ""
+    style: Optional[str] = None
     response_format: Optional[str] = "url"

app/handler/error_handler.py

@@ -0,0 +1,32 @@
+from contextlib import asynccontextmanager
+from fastapi import HTTPException
+import logging
+
+@asynccontextmanager
+async def handle_route_errors(logger: logging.Logger, operation_name: str, success_message: str = None, failure_message: str = None):
+    """
+    一个异步上下文管理器，用于统一处理 FastAPI 路由中的常见错误和日志记录。
+
+    Args:
+        logger: 用于记录日志的 Logger 实例。
+        operation_name: 操作的名称，用于日志记录和错误详情。
+        success_message: 操作成功时记录的自定义消息 (可选)。
+        failure_message: 操作失败时记录的自定义消息 (可选)。
+    """
+    default_success_msg = f"{operation_name} request successful"
+    default_failure_msg = f"{operation_name} request failed"
+
+    logger.info("-" * 50 + operation_name + "-" * 50)
+    try:
+        yield
+        logger.info(success_message or default_success_msg)
+    except HTTPException as http_exc:
+        # 如果已经是 HTTPException，直接重新抛出，保留原始状态码和详情
+        logger.error(f"{failure_message or default_failure_msg}: {http_exc.detail} (Status: {http_exc.status_code})")
+        raise http_exc
+    except Exception as e:
+        # 对于其他所有异常，记录错误并抛出标准的 500 错误
+        logger.error(f"{failure_message or default_failure_msg}: {str(e)}")
+        raise HTTPException(
+            status_code=500, detail=f"Internal server error during {operation_name}"
+        ) from e

app/handler/message_converter.py

@@ -1,62 +1,70 @@
-# app/services/chat/message_converter.py
+import base64
-
-from abc import ABC, abstractmethod
 import json
 import re
+from abc import ABC, abstractmethod
 from typing import Any, Dict, List, Optional
-import requests
-import base64
 
-from app.core.constants import DATA_URL_PATTERN, IMAGE_URL_PATTERN, SUPPORTED_ROLES
+import requests
+
+from app.core.constants import (
+    AUDIO_FORMAT_TO_MIMETYPE,
+    DATA_URL_PATTERN,
+    IMAGE_URL_PATTERN,
+    MAX_AUDIO_SIZE_BYTES,
+    MAX_VIDEO_SIZE_BYTES,
+    SUPPORTED_AUDIO_FORMATS,
+    SUPPORTED_ROLES,
+    SUPPORTED_VIDEO_FORMATS,
+    VIDEO_FORMAT_TO_MIMETYPE,
+)
+from app.log.logger import get_message_converter_logger
+
+logger = get_message_converter_logger()
 
 
 class MessageConverter(ABC):
     """消息转换器基类"""
 
     @abstractmethod
-    def convert(self, messages: List[Dict[str, Any]]) -> tuple[List[Dict[str, Any]], Optional[Dict[str, Any]]]:
+    def convert(
+        self, messages: List[Dict[str, Any]]
+    ) -> tuple[List[Dict[str, Any]], Optional[Dict[str, Any]]]:
         pass
 
+
 def _get_mime_type_and_data(base64_string):
     """
     从 base64 字符串中提取 MIME 类型和数据。
-    
+
     参数:
         base64_string (str): 可能包含 MIME 类型信息的 base64 字符串
-        
+
     返回:
         tuple: (mime_type, encoded_data)
     """
     # 检查字符串是否以 "data:" 格式开始
-    if base64_string.startswith('data:'):
+    if base64_string.startswith("data:"):
         # 提取 MIME 类型和数据
         pattern = DATA_URL_PATTERN
         match = re.match(pattern, base64_string)
         if match:
-            mime_type = "image/jpeg" if match.group(1) == "image/jpg" else match.group(1)
+            mime_type = (
+                "image/jpeg" if match.group(1) == "image/jpg" else match.group(1)
+            )
             encoded_data = match.group(2)
             return mime_type, encoded_data
-    
+
     # 如果不是预期格式，假定它只是数据部分
     return None, base64_string
 
+
 def _convert_image(image_url: str) -> Dict[str, Any]:
     if image_url.startswith("data:image"):
         mime_type, encoded_data = _get_mime_type_and_data(image_url)
-        return {
+        return {"inline_data": {"mime_type": mime_type, "data": encoded_data}}
-            "inline_data": {
-                "mime_type": mime_type,
-                "data": encoded_data
-            }
-        }
     else:
         encoded_data = _convert_image_to_base64(image_url)
-        return {
+        return {"inline_data": {"mime_type": "image/png", "data": encoded_data}}
-            "inline_data": {
-                "mime_type": "image/png",
-                "data": encoded_data
-            }
-        }
 
 
 def _convert_image_to_base64(url: str) -> str:
@@ -70,7 +78,7 @@ def _convert_image_to_base64(url: str) -> str:
     response = requests.get(url)
     if response.status_code == 200:
         # 将图片内容转换为base64
-        img_data = base64.b64encode(response.content).decode('utf-8')
+        img_data = base64.b64encode(response.content).decode("utf-8")
         return img_data
     else:
         raise Exception(f"Failed to fetch image: {response.status_code}")
@@ -94,12 +102,9 @@ def _process_text_with_image(text: str) -> List[Dict[str, Any]]:
         # 将URL对应的图片转换为base64
         try:
             base64_data = _convert_image_to_base64(img_url)
-            parts.append({
+            parts.append(
-                "inlineData": {
+                {"inline_data": {"mimeType": "image/png", "data": base64_data}}
-                    "mimeType": "image/png",
+            )
-                    "data": base64_data
-                }
-            })
         except Exception:
             # 如果转换失败，回退到文本模式
             parts.append({"text": text})
@@ -112,42 +117,215 @@ def _process_text_with_image(text: str) -> List[Dict[str, Any]]:
 class OpenAIMessageConverter(MessageConverter):
     """OpenAI消息格式转换器"""
 
-    def convert(self, messages: List[Dict[str, Any]]) -> tuple[List[Dict[str, Any]], Optional[Dict[str, Any]]]:
+    def _validate_media_data(
+        self, format: str, data: str, supported_formats: List[str], max_size: int
+    ) -> tuple[Optional[str], Optional[str]]:
+        """Validates format and size of Base64 media data."""
+        if format.lower() not in supported_formats:
+            logger.error(
+                f"Unsupported media format: {format}. Supported: {supported_formats}"
+            )
+            raise ValueError(f"Unsupported media format: {format}")
+
+        try:
+            # Decode Base64 to check size
+            # Be careful with memory usage for very large files
+            # Consider streaming decoding or checking length heuristic first if memory is a concern
+            decoded_data = base64.b64decode(
+                data, validate=True
+            )  # Use validate=True for stricter check
+            if len(decoded_data) > max_size:
+                logger.error(
+                    f"Media data size ({len(decoded_data)} bytes) exceeds limit ({max_size} bytes)."
+                )
+                raise ValueError(
+                    f"Media data size exceeds limit of {max_size // 1024 // 1024}MB"
+                )
+            # No need to return decoded_data, just the original base64 if valid
+            return data
+        except base64.binascii.Error as e:
+            logger.error(f"Invalid Base64 data provided: {e}")
+            raise ValueError("Invalid Base64 data")
+        except Exception as e:
+            logger.error(f"Error validating media data: {e}")
+            raise
+
+    def convert(
+        self, messages: List[Dict[str, Any]]
+    ) -> tuple[List[Dict[str, Any]], Optional[Dict[str, Any]]]:
         converted_messages = []
         system_instruction_parts = []
 
         for idx, msg in enumerate(messages):
             role = msg.get("role", "")
-            
             parts = []
-            # 特别处理最后一个assistant的消息，按\n\n分割
+
-            if "content" in msg and isinstance(msg["content"], str) and msg["content"] and role == "assistant" and idx == len(messages) - 2:
+            if "content" in msg and isinstance(msg["content"], list):
-                # 按\n\n分割消息
+                for content_item in msg["content"]:
-                content_parts = msg["content"].split("\n\n")
+                    if not isinstance(content_item, dict):
-                for part in content_parts:
+                        # Skip non-dict items if any unexpected format appears
-                    if not part.strip():  # 跳过空内容
+                        logger.warning(
+                            f"Skipping unexpected content item format: {type(content_item)}"
+                        )
                         continue
-                    # 处理可能包含图片的文本
+
-                    parts.extend(_process_text_with_image(part))
+                    content_type = content_item.get("type")
-            elif "content" in msg and isinstance(msg["content"], str) and msg["content"]:
+
-                # 请求 gemini 接口时如果包含 content 字段但内容为空时会返回 400 错误，所以需要判断是否为空并移除
+                    if content_type == "text" and content_item.get("text"):
+                        parts.append({"text": content_item["text"]})
+                    elif content_type == "image_url" and content_item.get(
+                        "image_url", {}
+                    ).get("url"):
+                        try:
+                            parts.append(
+                                _convert_image(content_item["image_url"]["url"])
+                            )
+                        except Exception as e:
+                            logger.error(
+                                f"Failed to convert image URL {content_item['image_url']['url']}: {e}"
+                            )
+                            # Decide how to handle: skip part, add error text, etc.
+                            parts.append(
+                                {
+                                    "text": f"[Error processing image: {content_item['image_url']['url']}]"
+                                }
+                            )
+                    # --- Add handling for input_audio ---
+                    elif content_type == "input_audio" and content_item.get(
+                        "input_audio"
+                    ):
+                        audio_info = content_item["input_audio"]
+                        audio_data = audio_info.get("data")
+                        audio_format = audio_info.get("format", "").lower()
+
+                        if not audio_data or not audio_format:
+                            logger.warning(
+                                "Skipping audio part due to missing data or format."
+                            )
+                            continue
+
+                        try:
+                            # Validate size and format
+                            validated_data = self._validate_media_data(
+                                audio_format,
+                                audio_data,
+                                SUPPORTED_AUDIO_FORMATS,
+                                MAX_AUDIO_SIZE_BYTES,
+                            )
+
+                            # Get MIME type
+                            mime_type = AUDIO_FORMAT_TO_MIMETYPE.get(audio_format)
+                            if not mime_type:
+                                # Should not happen if format validation passed, but double-check
+                                logger.error(
+                                    f"Could not find MIME type for supported format: {audio_format}"
+                                )
+                                raise ValueError(
+                                    f"Internal error: MIME type mapping missing for {audio_format}"
+                                )
+
+                            parts.append(
+                                {
+                                    "inline_data": {
+                                        "mimeType": mime_type,
+                                        "data": validated_data,  # Use the validated Base64 data
+                                    }
+                                }
+                            )
+                            logger.debug(
+                                f"Successfully added audio part (format: {audio_format})"
+                            )
+
+                        except ValueError as e:
+                            logger.error(
+                                f"Skipping audio part due to validation error: {e}"
+                            )
+                            parts.append({"text": f"[Error processing audio: {e}]"})
+                        except Exception:
+                            logger.exception("Unexpected error processing audio part.")
+                            parts.append(
+                                {"text": "[Unexpected error processing audio]"}
+                            )
+
+                    elif content_type == "input_video" and content_item.get(
+                        "input_video"
+                    ):
+                        video_info = content_item["input_video"]
+                        video_data = video_info.get("data")
+                        video_format = video_info.get("format", "").lower()
+
+                        if not video_data or not video_format:
+                            logger.warning(
+                                "Skipping video part due to missing data or format."
+                            )
+                            continue
+
+                        try:
+                            validated_data = self._validate_media_data(
+                                video_format,
+                                video_data,
+                                SUPPORTED_VIDEO_FORMATS,
+                                MAX_VIDEO_SIZE_BYTES,
+                            )
+                            mime_type = VIDEO_FORMAT_TO_MIMETYPE.get(video_format)
+                            if not mime_type:
+                                raise ValueError(
+                                    f"Internal error: MIME type mapping missing for {video_format}"
+                                )
+
+                            parts.append(
+                                {
+                                    "inline_data": {
+                                        "mimeType": mime_type,
+                                        "data": validated_data,
+                                    }
+                                }
+                            )
+                            logger.debug(
+                                f"Successfully added video part (format: {video_format})"
+                            )
+
+                        except ValueError as e:
+                            logger.error(
+                                f"Skipping video part due to validation error: {e}"
+                            )
+                            parts.append({"text": f"[Error processing video: {e}]"})
+                        except Exception:
+                            logger.exception("Unexpected error processing video part.")
+                            parts.append(
+                                {"text": "[Unexpected error processing video]"}
+                            )
+
+                    else:
+                        # Log unrecognized but present types
+                        if content_type:
+                            logger.warning(
+                                f"Unsupported content type or missing data in structured content: {content_type}"
+                            )
+
+            elif (
+                "content" in msg and isinstance(msg["content"], str) and msg["content"]
+            ):
                 parts.extend(_process_text_with_image(msg["content"]))
-            elif "content" in msg and isinstance(msg["content"], list):
-                for content in msg["content"]:
-                    if isinstance(content, str) and content:
-                        parts.append({"text": content})
-                    elif isinstance(content, dict):
-                        if content["type"] == "text" and content["text"]:
-                            parts.append({"text": content["text"]})
-                        elif content["type"] == "image_url":
-                            parts.append(_convert_image(content["image_url"]["url"]))
             elif "tool_calls" in msg and isinstance(msg["tool_calls"], list):
+                # Keep existing tool call processing
                 for tool_call in msg["tool_calls"]:
-                    function_call = tool_call.get("function",{})
+                    function_call = tool_call.get("function", {})
-                    function_call["args"] = json.loads(function_call.get("arguments","{}"))
+                    # Sanitize arguments loading
-                    del function_call["arguments"]
+                    arguments_str = function_call.get("arguments", "{}")
+                    try:
+                        function_call["args"] = json.loads(arguments_str)
+                    except json.JSONDecodeError:
+                        logger.warning(
+                            f"Failed to decode tool call arguments: {arguments_str}"
+                        )
+                        function_call["args"] = {}
+                    if "arguments" in function_call:
+                        if "arguments" in function_call:
+                            del function_call["arguments"]
+
                     parts.append({"functionCall": function_call})
-            
+
             if role not in SUPPORTED_ROLES:
                 if role == "tool":
                     role = "user"
@@ -159,7 +337,14 @@ class OpenAIMessageConverter(MessageConverter):
                         role = "model"
             if parts:
                 if role == "system":
-                    system_instruction_parts.extend(parts)
+                    text_only_parts = [p for p in parts if "text" in p]
+                    if len(text_only_parts) != len(parts):
+                        logger.warning(
+                            "Non-text parts found in system message; discarding them."
+                        )
+                    if text_only_parts:
+                        system_instruction_parts.extend(text_only_parts)
+
                 else:
                     converted_messages.append({"role": role, "parts": parts})
 
@@ -171,4 +356,4 @@ class OpenAIMessageConverter(MessageConverter):
                 "parts": system_instruction_parts,
             }
         )
-        return converted_messages, system_instruction
+        return converted_messages, system_instruction

app/handler/response_handler.py

@@ -1,13 +1,12 @@
-# app/services/chat/response_handler.py
-
 import base64
 import json
 import random
 import string
-from abc import ABC, abstractmethod
-from typing import Dict, Any, List, Optional
 import time
 import uuid
+from abc import ABC, abstractmethod
+from typing import Any, Dict, List, Optional
+
 from app.config.config import settings
 from app.utils.uploader import ImageUploaderFactory
 
@@ -16,7 +15,9 @@ class ResponseHandler(ABC):
     """响应处理器基类"""
 
     @abstractmethod
-    def handle_response(self, response: Dict[str, Any], model: str, stream: bool = False) -> Dict[str, Any]:
+    def handle_response(
+        self, response: Dict[str, Any], model: str, stream: bool = False
+    ) -> Dict[str, Any]:
         pass
 
 
@@ -27,32 +28,44 @@ class GeminiResponseHandler(ResponseHandler):
         self.thinking_first = True
         self.thinking_status = False
 
-    def handle_response(self, response: Dict[str, Any], model: str, stream: bool = False) -> Dict[str, Any]:
+    def handle_response(
+        self, response: Dict[str, Any], model: str, stream: bool = False, usage_metadata: Optional[Dict[str, Any]] = None
+    ) -> Dict[str, Any]:
         if stream:
             return _handle_gemini_stream_response(response, model, stream)
         return _handle_gemini_normal_response(response, model, stream)
 
 
-def _handle_openai_stream_response(response: Dict[str, Any], model: str, finish_reason: str) -> Dict[str, Any]:
+def _handle_openai_stream_response(
-    text, tool_calls = _extract_result(response, model, stream=True, gemini_format=False)
+    response: Dict[str, Any], model: str, finish_reason: str, usage_metadata: Optional[Dict[str, Any]]
+) -> Dict[str, Any]:
+    text, tool_calls = _extract_result(
+        response, model, stream=True, gemini_format=False
+    )
     if not text and not tool_calls:
         delta = {}
     else:
         delta = {"content": text, "role": "assistant"}
         if tool_calls:
             delta["tool_calls"] = tool_calls
-
+    template_chunk = {
-    return {
         "id": f"chatcmpl-{uuid.uuid4()}",
         "object": "chat.completion.chunk",
         "created": int(time.time()),
         "model": model,
         "choices": [{"index": 0, "delta": delta, "finish_reason": finish_reason}],
     }
+    if usage_metadata:
+        template_chunk["usage"] = {"prompt_tokens": usage_metadata.get("promptTokenCount", 0), "completion_tokens": usage_metadata.get("candidatesTokenCount",0), "total_tokens": usage_metadata.get("totalTokenCount", 0)}
+    return template_chunk
 
 
-def _handle_openai_normal_response(response: Dict[str, Any], model: str, finish_reason: str) -> Dict[str, Any]:
+def _handle_openai_normal_response(
-    text, tool_calls = _extract_result(response, model, stream=False, gemini_format=False)
+    response: Dict[str, Any], model: str, finish_reason: str, usage_metadata: Optional[Dict[str, Any]]
+) -> Dict[str, Any]:
+    text, tool_calls = _extract_result(
+        response, model, stream=False, gemini_format=False
+    )
     return {
         "id": f"chatcmpl-{uuid.uuid4()}",
         "object": "chat.completion",
@@ -61,11 +74,15 @@ def _handle_openai_normal_response(response: Dict[str, Any], model: str, finish_
         "choices": [
             {
                 "index": 0,
-                "message": {"role": "assistant", "content": text, "tool_calls": tool_calls},
+                "message": {
+                    "role": "assistant",
+                    "content": text,
+                    "tool_calls": tool_calls,
+                },
                 "finish_reason": finish_reason,
             }
         ],
-        "usage": {"prompt_tokens": 0, "completion_tokens": 0, "total_tokens": 0},
+        "usage": {"prompt_tokens": usage_metadata.get("promptTokenCount", 0), "completion_tokens": usage_metadata.get("candidatesTokenCount",0), "total_tokens": usage_metadata.get("totalTokenCount", 0)},
     }
 
 
@@ -78,59 +95,68 @@ class OpenAIResponseHandler(ResponseHandler):
         self.thinking_status = False
 
     def handle_response(
-            self,
+        self,
-            response: Dict[str, Any],
+        response: Dict[str, Any],
-            model: str,
+        model: str,
-            stream: bool = False,
+        stream: bool = False,
-            finish_reason: str = None
+        finish_reason: str = None,
+        usage_metadata: Optional[Dict[str, Any]] = None,
     ) -> Optional[Dict[str, Any]]:
         if stream:
-            return _handle_openai_stream_response(response, model, finish_reason)
+            return _handle_openai_stream_response(response, model, finish_reason, usage_metadata)
-        return _handle_openai_normal_response(response, model, finish_reason)
+        return _handle_openai_normal_response(response, model, finish_reason, usage_metadata)
-    
+
-    def handle_image_chat_response(self, image_str: str, model: str, stream=False, finish_reason="stop"):
+    def handle_image_chat_response(
+        self, image_str: str, model: str, stream=False, finish_reason="stop"
+    ):
         if stream:
-            return _handle_openai_stream_image_response(image_str,model,finish_reason)
+            return _handle_openai_stream_image_response(image_str, model, finish_reason)
-        return _handle_openai_normal_image_response(image_str,model,finish_reason)
+        return _handle_openai_normal_image_response(image_str, model, finish_reason)
-       
+
-            
+
-def _handle_openai_stream_image_response(image_str: str,model: str,finish_reason: str) -> Dict[str, Any]:
+def _handle_openai_stream_image_response(
+    image_str: str, model: str, finish_reason: str
+) -> Dict[str, Any]:
     return {
         "id": f"chatcmpl-{uuid.uuid4()}",
         "object": "chat.completion.chunk",
         "created": int(time.time()),
         "model": model,
-        "choices": [{
+        "choices": [
-            "index": 0,
+            {
-            "delta": {"content": image_str} if image_str else {},
+                "index": 0,
-            "finish_reason": finish_reason
+                "delta": {"content": image_str} if image_str else {},
-        }]
+                "finish_reason": finish_reason,
+            }
+        ],
     }
 
 
-def _handle_openai_normal_image_response(image_str: str,model: str,finish_reason: str) -> Dict[str, Any]:
+def _handle_openai_normal_image_response(
+    image_str: str, model: str, finish_reason: str
+) -> Dict[str, Any]:
     return {
         "id": f"chatcmpl-{uuid.uuid4()}",
         "object": "chat.completion",
         "created": int(time.time()),
         "model": model,
-        "choices": [{
+        "choices": [
-            "index": 0,
+            {
-            "message": {
+                "index": 0,
-                "role": "assistant",
+                "message": {"role": "assistant", "content": image_str},
-                "content": image_str
+                "finish_reason": finish_reason,
-            },
+            }
-            "finish_reason": finish_reason
+        ],
-        }],
+        "usage": {"prompt_tokens": 0, "completion_tokens": 0, "total_tokens": 0},
-        "usage": {
-            "prompt_tokens": 0,
-            "completion_tokens": 0,
-            "total_tokens": 0
-        }
     }
 
 
-def _extract_result(response: Dict[str, Any], model: str, stream: bool = False, gemini_format: bool = False) -> tuple[str, List[Dict[str, Any]]]:
+def _extract_result(
+    response: Dict[str, Any],
+    model: str,
+    stream: bool = False,
+    gemini_format: bool = False,
+) -> tuple[str, List[Dict[str, Any]]]:
     text, tool_calls = "", []
     if stream:
         if response.get("candidates"):
@@ -146,13 +172,9 @@ def _extract_result(response: Dict[str, Any], model: str, stream: bool = False,
             elif "codeExecution" in parts[0]:
                 text = _format_code_block(parts[0]["codeExecution"])
             elif "executableCodeResult" in parts[0]:
-                text = _format_execution_result(
+                text = _format_execution_result(parts[0]["executableCodeResult"])
-                    parts[0]["executableCodeResult"]
-                )
             elif "codeExecutionResult" in parts[0]:
-                text = _format_execution_result(
+                text = _format_execution_result(parts[0]["codeExecutionResult"])
-                    parts[0]["codeExecutionResult"]
-                )
             elif "inlineData" in parts[0]:
                 text = _extract_image_data(parts[0])
             else:
@@ -166,10 +188,10 @@ def _extract_result(response: Dict[str, Any], model: str, stream: bool = False,
                 if settings.SHOW_THINKING_PROCESS:
                     if len(candidate["content"]["parts"]) == 2:
                         text = (
-                                "> thinking\n\n"
+                            "> thinking\n\n"
-                                + candidate["content"]["parts"][0]["text"]
+                            + candidate["content"]["parts"][0]["text"]
-                                + "\n\n---\n> output\n\n"
+                            + "\n\n---\n> output\n\n"
-                                + candidate["content"]["parts"][1]["text"]
+                            + candidate["content"]["parts"][1]["text"]
                         )
                     else:
                         text = candidate["content"]["parts"][0]["text"]
@@ -187,34 +209,47 @@ def _extract_result(response: Dict[str, Any], model: str, stream: bool = False,
                         elif "inlineData" in part:
                             text += _extract_image_data(part)
 
-
             text = _add_search_link_text(model, candidate, text)
-            tool_calls = _extract_tool_calls(candidate["content"]["parts"], gemini_format)
+            tool_calls = _extract_tool_calls(
+                candidate["content"]["parts"], gemini_format
+            )
         else:
             text = "暂无返回"
     return text, tool_calls
 
+
 def _extract_image_data(part: dict) -> str:
     image_uploader = None
     if settings.UPLOAD_PROVIDER == "smms":
-        image_uploader = ImageUploaderFactory.create(provider=settings.UPLOAD_PROVIDER,api_key=settings.SMMS_SECRET_TOKEN)
+        image_uploader = ImageUploaderFactory.create(
+            provider=settings.UPLOAD_PROVIDER, api_key=settings.SMMS_SECRET_TOKEN
+        )
     elif settings.UPLOAD_PROVIDER == "picgo":
-        image_uploader = ImageUploaderFactory.create(provider=settings.UPLOAD_PROVIDER,api_key=settings.PICGO_API_KEY)
+        image_uploader = ImageUploaderFactory.create(
+            provider=settings.UPLOAD_PROVIDER, api_key=settings.PICGO_API_KEY
+        )
     elif settings.UPLOAD_PROVIDER == "cloudflare_imgbed":
-        image_uploader = ImageUploaderFactory.create(provider=settings.UPLOAD_PROVIDER,base_url=settings.CLOUDFLARE_IMGBED_URL,auth_code=settings.CLOUDFLARE_IMGBED_AUTH_CODE)
+        image_uploader = ImageUploaderFactory.create(
+            provider=settings.UPLOAD_PROVIDER,
+            base_url=settings.CLOUDFLARE_IMGBED_URL,
+            auth_code=settings.CLOUDFLARE_IMGBED_AUTH_CODE,
+        )
     current_date = time.strftime("%Y/%m/%d")
     filename = f"{current_date}/{uuid.uuid4().hex[:8]}.png"
     base64_data = part["inlineData"]["data"]
-    #将base64_data转成bytes数组
+    # 将base64_data转成bytes数组
     bytes_data = base64.b64decode(base64_data)
-    upload_response = image_uploader.upload(bytes_data,filename)
+    upload_response = image_uploader.upload(bytes_data, filename)
     if upload_response.success:
         text = f"\n\n![image]({upload_response.data.url})\n\n"
     else:
         text = ""
     return text
-    
+
-def _extract_tool_calls(parts: List[Dict[str, Any]], gemini_format: bool) -> List[Dict[str, Any]]:
+
+def _extract_tool_calls(
+    parts: List[Dict[str, Any]], gemini_format: bool
+) -> List[Dict[str, Any]]:
     """提取工具调用信息"""
     if not parts or not isinstance(parts, list):
         return []
@@ -250,8 +285,12 @@ def _extract_tool_calls(parts: List[Dict[str, Any]], gemini_format: bool) -> Lis
     return tool_calls
 
 
-def _handle_gemini_stream_response(response: Dict[str, Any], model: str, stream: bool) -> Dict[str, Any]:
+def _handle_gemini_stream_response(
-    text, tool_calls = _extract_result(response, model, stream=stream, gemini_format=True)
+    response: Dict[str, Any], model: str, stream: bool
+) -> Dict[str, Any]:
+    text, tool_calls = _extract_result(
+        response, model, stream=stream, gemini_format=True
+    )
     if tool_calls:
         content = {"parts": tool_calls, "role": "model"}
     else:
@@ -260,8 +299,12 @@ def _handle_gemini_stream_response(response: Dict[str, Any], model: str, stream:
     return response
 
 
-def _handle_gemini_normal_response(response: Dict[str, Any], model: str, stream: bool) -> Dict[str, Any]:
+def _handle_gemini_normal_response(
-    text, tool_calls = _extract_result(response, model, stream=stream, gemini_format=True)
+    response: Dict[str, Any], model: str, stream: bool
+) -> Dict[str, Any]:
+    text, tool_calls = _extract_result(
+        response, model, stream=stream, gemini_format=True
+    )
     if tool_calls:
         content = {"parts": tool_calls, "role": "model"}
     else:
@@ -279,10 +322,10 @@ def _format_code_block(code_data: dict) -> str:
 
 def _add_search_link_text(model: str, candidate: dict, text: str) -> str:
     if (
-            settings.SHOW_SEARCH_LINK
+        settings.SHOW_SEARCH_LINK
-            and model.endswith("-search")
+        and model.endswith("-search")
-            and "groundingMetadata" in candidate
+        and "groundingMetadata" in candidate
-            and "groundingChunks" in candidate["groundingMetadata"]
+        and "groundingChunks" in candidate["groundingMetadata"]
     ):
         grounding_chunks = candidate["groundingMetadata"]["groundingChunks"]
         text += "\n\n---\n\n"

app/handler/retry_handler.py

@@ -1,9 +1,8 @@
-# app/services/chat/retry_handler.py
 
 from functools import wraps
 from typing import Callable, TypeVar
 
-from app.core.constants import MAX_RETRIES
+from app.config.config import settings
 from app.log.logger import get_retry_logger
 
 T = TypeVar("T")
@@ -13,8 +12,7 @@ logger = get_retry_logger()
 class RetryHandler:
     """重试处理装饰器"""
 
-    def __init__(self, max_retries: int = MAX_RETRIES, key_arg: str = "api_key"):
+    def __init__(self, key_arg: str = "api_key"):
-        self.max_retries = max_retries
         self.key_arg = key_arg
 
     def __call__(self, func: Callable[..., T]) -> Callable[..., T]:
@@ -22,22 +20,27 @@ class RetryHandler:
         async def wrapper(*args, **kwargs) -> T:
             last_exception = None
 
-            for attempt in range(self.max_retries):
+            for attempt in range(settings.MAX_RETRIES):
+                retries = attempt + 1
                 try:
                     return await func(*args, **kwargs)
                 except Exception as e:
                     last_exception = e
                     logger.warning(
-                        f"API call failed with error: {str(e)}. Attempt {attempt + 1} of {self.max_retries}"
+                        f"API call failed with error: {str(e)}. Attempt {retries} of {settings.MAX_RETRIES}"
                     )
 
                     # 从函数参数中获取 key_manager
                     key_manager = kwargs.get("key_manager")
                     if key_manager:
                         old_key = kwargs.get(self.key_arg)
-                        new_key = await key_manager.handle_api_failure(old_key)
+                        new_key = await key_manager.handle_api_failure(old_key, retries)
-                        kwargs[self.key_arg] = new_key
+                        if new_key:
-                        logger.info(f"Switched to new API key: {new_key}")
+                            kwargs[self.key_arg] = new_key
+                            logger.info(f"Switched to new API key: {new_key}")
+                        else:
+                            logger.error(f"No valid API key available after {retries} retries.")
+                            break
 
             logger.error(
                 f"All retry attempts failed, raising final exception: {str(last_exception)}"

app/handler/stream_optimizer.py

@@ -1,4 +1,3 @@
-# app/services/chat/stream_optimizer.py
 
 import asyncio
 import math
@@ -107,15 +106,11 @@ class StreamOptimizer:
 
         # 计算智能延迟时间
         delay = self.calculate_delay(len(text))
-        # if self.logger:
-        #     self.logger.info(f"Text length: {len(text)}, delay: {delay:.4f}s")
 
         # 根据文本长度决定输出方式
         if len(text) >= self.long_text_threshold:
             # 长文本：分块输出
             chunks = self.split_text_into_chunks(text)
-            # if self.logger:
-            #     self.logger.info(f"Long text: splitting into {len(chunks)} chunks")
             for chunk_text in chunks:
                 chunk_response = create_response_chunk(chunk_text)
                 yield format_chunk(chunk_response)

app/log/logger.py

@@ -1,19 +1,19 @@
 import logging
+import platform
 import sys
 from typing import Dict, Optional
-import platform
 
 # ANSI转义序列颜色代码
 COLORS = {
-    'DEBUG': '\033[34m',  # 蓝色
+    "DEBUG": "\033[34m",  # 蓝色
-    'INFO': '\033[32m',  # 绿色
+    "INFO": "\033[32m",  # 绿色
-    'WARNING': '\033[33m',  # 黄色
+    "WARNING": "\033[33m",  # 黄色
-    'ERROR': '\033[31m',  # 红色
+    "ERROR": "\033[31m",  # 红色
-    'CRITICAL': '\033[1;31m'  # 红色加粗
+    "CRITICAL": "\033[1;31m",  # 红色加粗
 }
 
 # Windows系统启用ANSI支持
-if platform.system() == 'Windows':
+if platform.system() == "Windows":
     import ctypes
 
     kernel32 = ctypes.windll.kernel32
@@ -27,15 +27,17 @@ class ColoredFormatter(logging.Formatter):
 
     def format(self, record):
         # 获取对应级别的颜色代码
-        color = COLORS.get(record.levelname, '')
+        color = COLORS.get(record.levelname, "")
         # 添加颜色代码和重置代码
         record.levelname = f"{color}{record.levelname}\033[0m"
+        # 创建包含文件名和行号的固定宽度字符串
+        record.fileloc = f"[{record.filename}:{record.lineno}]"
         return super().format(record)
 
 
-# 日志格式
+# 日志格式 - 使用 fileloc 并设置固定宽度 (例如 30)
 FORMATTER = ColoredFormatter(
-    "%(asctime)s - %(name)s - %(levelname)s - [%(filename)s:%(lineno)d] - %(message)s"
+    "%(asctime)s | %(levelname)-17s | %(fileloc)-30s | %(message)s"
 )
 
 # 日志级别映射
@@ -55,21 +57,28 @@ class Logger:
     _loggers: Dict[str, logging.Logger] = {}
 
     @staticmethod
-    def setup_logger(
+    def setup_logger(name: str) -> logging.Logger:
-            name: str,
-            level: str = "debug",
-    ) -> logging.Logger:
         """
         设置并获取logger
         :param name: logger名称
-        :param level: 日志级别
         :return: logger实例
         """
+        # 导入 settings 对象
+        from app.config.config import settings
+
+        # 从全局配置获取日志级别
+        log_level_str = settings.LOG_LEVEL.lower()
+        level = LOG_LEVELS.get(log_level_str, logging.INFO)
+
         if name in Logger._loggers:
-            return Logger._loggers[name]
+            # 如果 logger 已存在，检查并更新其级别（如果需要）
+            existing_logger = Logger._loggers[name]
+            if existing_logger.level != level:
+                existing_logger.setLevel(level)
+            return existing_logger
 
         logger = logging.getLogger(name)
-        logger.setLevel(LOG_LEVELS.get(level.lower(), logging.INFO))
+        logger.setLevel(level)
         logger.propagate = False
 
         # 添加控制台输出
@@ -89,6 +98,22 @@ class Logger:
         """
         return Logger._loggers.get(name)
 
+    @staticmethod
+    def update_log_levels(log_level: str):
+        """
+        根据当前的全局配置更新所有已创建 logger 的日志级别。
+        """
+        log_level_str = log_level.lower()
+        new_level = LOG_LEVELS.get(log_level_str, logging.INFO)
+
+        updated_count = 0
+        for logger_name, logger_instance in Logger._loggers.items():
+            if logger_instance.level != new_level:
+                logger_instance.setLevel(new_level)
+                # 可选：记录级别变更日志，但注意避免在日志模块内部产生过多日志
+                # print(f"Updated log level for logger '{logger_name}' to {log_level_str.upper()}")
+                updated_count += 1
+
 
 # 预定义的loggers
 def get_openai_logger():
@@ -172,4 +197,29 @@ def get_log_routes_logger():
 
 
 def get_stats_logger():
-    return Logger.setup_logger("stats")
+    return Logger.setup_logger("stats")
+
+
+def get_update_logger():
+    return Logger.setup_logger("update_service")
+
+
+def get_scheduler_routes():
+    return Logger.setup_logger("scheduler_routes")
+
+
+def get_message_converter_logger():
+    return Logger.setup_logger("message_converter")
+
+
+def get_api_client_logger():
+    return Logger.setup_logger("api_client")
+
+
+def get_openai_compatible_logger():
+    return Logger.setup_logger("openai_compatible")
+
+
+def get_error_log_logger():
+    return Logger.setup_logger("error_log")
+

app/main.py

@@ -1,18 +1,11 @@
-"""
-应用程序入口模块
-"""
-
 import uvicorn
 
 from app.core.application import create_app
 from app.log.logger import get_main_logger
 
-# 创建应用程序实例
 app = create_app()
 
-# 配置日志
-logger = get_main_logger()
-
 if __name__ == "__main__":
+    logger = get_main_logger()
     logger.info("Starting application server...")
     uvicorn.run(app, host="0.0.0.0", port=8001)

app/middleware/middleware.py

@@ -30,6 +30,8 @@ class AuthMiddleware(BaseHTTPMiddleware):
             and not request.url.path.startswith(f"/{API_VERSION}")
             and not request.url.path.startswith("/health")
             and not request.url.path.startswith("/hf")
+            and not request.url.path.startswith("/openai")
+            and not request.url.path.startswith("/api/version/check")
         ):
 
             auth_token = request.cookies.get("auth_token")

app/middleware/request_logging_middleware.py

@@ -26,7 +26,7 @@ class RequestLoggingMiddleware(BaseHTTPMiddleware):
                         f"Formatted request body:\n{json.dumps(formatted_body, indent=2, ensure_ascii=False)}"
                     )
                 except json.JSONDecodeError:
-                    logger.info("Request body is not valid JSON.")
+                    logger.error("Request body is not valid JSON.")
         except Exception as e:
             logger.error(f"Error reading request body: {str(e)}")
 

app/router/config_routes.py

@@ -1,15 +1,17 @@
 """
 配置路由模块
 """
-from typing import Any, Dict
+
+from typing import Any, Dict, List
+
 from fastapi import APIRouter, HTTPException, Request
 from fastapi.responses import RedirectResponse
+from pydantic import BaseModel, Field
 
 from app.core.security import verify_auth_token
-from app.log.logger import get_config_routes_logger
+from app.log.logger import Logger, get_config_routes_logger
 from app.service.config.config_service import ConfigService
 
-# 创建路由
 router = APIRouter(prefix="/api/config", tags=["config"])
 
 logger = get_config_routes_logger()
@@ -31,8 +33,13 @@ async def update_config(config_data: Dict[str, Any], request: Request):
         logger.warning("Unauthorized access attempt to config page")
         return RedirectResponse(url="/", status_code=302)
     try:
-        return await ConfigService.update_config(config_data)
+        result = await ConfigService.update_config(config_data)
+        # 配置更新成功后，立即更新所有 logger 的级别
+        Logger.update_log_levels(config_data["LOG_LEVEL"])
+        logger.info("Log levels updated after configuration change.")
+        return result
     except Exception as e:
+        logger.error(f"Error updating config or log levels: {e}", exc_info=True)
         raise HTTPException(status_code=400, detail=str(e))
 
 
@@ -46,3 +53,90 @@ async def reset_config(request: Request):
         return await ConfigService.reset_config()
     except Exception as e:
         raise HTTPException(status_code=400, detail=str(e))
+
+
+# Pydantic model for bulk delete request
+class DeleteKeysRequest(BaseModel):
+    keys: List[str] = Field(..., description="List of API keys to delete")
+
+
+@router.delete("/keys/{key_to_delete}", response_model=Dict[str, Any])
+async def delete_single_key(key_to_delete: str, request: Request):
+    auth_token = request.cookies.get("auth_token")
+    if not auth_token or not verify_auth_token(auth_token):
+        logger.warning(f"Unauthorized attempt to delete key: {key_to_delete}")
+        return RedirectResponse(url="/", status_code=302)
+    try:
+        logger.info(f"Attempting to delete key: {key_to_delete}")
+        result = await ConfigService.delete_key(key_to_delete)
+        if not result.get("success"):
+            # Optionally, translate specific errors to HTTP status codes
+            # For now, let's assume 400 for any failure from service if not found,
+            # or 500 if it was an unexpected error (though service should handle that)
+            raise HTTPException(
+                status_code=(
+                    404 if "not found" in result.get("message", "").lower() else 400
+                ),
+                detail=result.get("message"),
+            )
+        return result
+    except HTTPException as e:
+        # Re-raise HTTPExceptions directly
+        raise e
+    except Exception as e:
+        logger.error(f"Error deleting key '{key_to_delete}': {e}", exc_info=True)
+        raise HTTPException(status_code=500, detail=f"Error deleting key: {str(e)}")
+
+
+@router.post("/keys/delete-selected", response_model=Dict[str, Any])
+async def delete_selected_keys_route(
+    delete_request: DeleteKeysRequest, request: Request
+):
+    auth_token = request.cookies.get("auth_token")
+    if not auth_token or not verify_auth_token(auth_token):
+        logger.warning("Unauthorized attempt to bulk delete keys")
+        return RedirectResponse(url="/", status_code=302)
+
+    if not delete_request.keys:
+        logger.warning("Attempt to bulk delete keys with an empty list.")
+        raise HTTPException(status_code=400, detail="No keys provided for deletion.")
+
+    try:
+        logger.info(f"Attempting to bulk delete {len(delete_request.keys)} keys.")
+        result = await ConfigService.delete_selected_keys(delete_request.keys)
+        # Similar to single delete, we can check result["success"]
+        if not result.get("success") and result.get("deleted_count", 0) == 0:
+            # If no keys were actually deleted, it might be a client error (e.g., all keys not found)
+            # or an empty list was somehow passed despite the check above.
+            raise HTTPException(
+                status_code=400, detail=result.get("message", "Failed to delete keys.")
+            )
+        # If some keys were deleted but others not found, it's still a partial success, return 200 with details.
+        return result
+    except HTTPException as e:
+        raise e
+    except Exception as e:
+        logger.error(f"Error bulk deleting keys: {e}", exc_info=True)
+        raise HTTPException(
+            status_code=500, detail=f"Error bulk deleting keys: {str(e)}"
+        )
+
+
+@router.get("/ui/models")
+async def get_ui_models(request: Request):
+    auth_token_cookie = request.cookies.get("auth_token")
+    if not auth_token_cookie or not verify_auth_token(auth_token_cookie):
+        logger.warning("Unauthorized access attempt to /api/config/ui/models")
+        raise HTTPException(status_code=403, detail="Not authenticated")
+
+    try:
+        models = await ConfigService.fetch_ui_models()
+        return models
+    except HTTPException as e:
+        raise e
+    except Exception as e:
+        logger.error(f"Unexpected error in /ui/models endpoint: {e}", exc_info=True)
+        raise HTTPException(
+            status_code=500,
+            detail=f"An unexpected error occurred while fetching UI models: {str(e)}",
+        )

app/router/error_log_routes.py

@@ -0,0 +1,211 @@
+"""
+日志路由模块
+"""
+
+from datetime import datetime
+from typing import Dict, List, Optional
+
+from fastapi import (
+    APIRouter,
+    Body,
+    HTTPException,
+    Path,
+    Query,
+    Request,
+    Response,
+    status,
+)
+from pydantic import BaseModel
+
+from app.core.security import verify_auth_token
+from app.log.logger import get_log_routes_logger
+from app.service.error_log import error_log_service
+
+router = APIRouter(prefix="/api/logs", tags=["logs"])
+
+logger = get_log_routes_logger()
+
+
+class ErrorLogListItem(BaseModel):
+    id: int
+    gemini_key: Optional[str] = None
+    error_type: Optional[str] = None
+    error_code: Optional[int] = None
+    model_name: Optional[str] = None
+    request_time: Optional[datetime] = None
+
+
+class ErrorLogListResponse(BaseModel):
+    logs: List[ErrorLogListItem]
+    total: int
+
+
+@router.get("/errors", response_model=ErrorLogListResponse)
+async def get_error_logs_api(
+    request: Request,
+    limit: int = Query(10, ge=1, le=1000),
+    offset: int = Query(0, ge=0),
+    key_search: Optional[str] = Query(
+        None, description="Search term for Gemini key (partial match)"
+    ),
+    error_search: Optional[str] = Query(
+        None, description="Search term for error type or log message"
+    ),
+    error_code_search: Optional[str] = Query(
+        None, description="Search term for error code"
+    ),
+    start_date: Optional[datetime] = Query(
+        None, description="Start datetime for filtering"
+    ),
+    end_date: Optional[datetime] = Query(
+        None, description="End datetime for filtering"
+    ),
+    sort_by: str = Query(
+        "id", description="Field to sort by (e.g., 'id', 'request_time')"
+    ),
+    sort_order: str = Query("desc", description="Sort order ('asc' or 'desc')"),
+):
+    """
+    获取错误日志列表 (返回错误码)，支持过滤和排序
+
+    Args:
+        request: 请求对象
+        limit: 限制数量
+        offset: 偏移量
+        key_search: 密钥搜索
+        error_search: 错误搜索 (可能搜索类型或日志内容，由DB层决定)
+        error_code_search: 错误码搜索
+        start_date: 开始日期
+        end_date: 结束日期
+        sort_by: 排序字段
+        sort_order: 排序顺序
+
+    Returns:
+        ErrorLogListResponse: An object containing the list of logs (with error_code) and the total count.
+    """
+    auth_token = request.cookies.get("auth_token")
+    if not auth_token or not verify_auth_token(auth_token):
+        logger.warning("Unauthorized access attempt to error logs list")
+        raise HTTPException(status_code=401, detail="Not authenticated")
+
+    try:
+        result = await error_log_service.process_get_error_logs(
+            limit=limit,
+            offset=offset,
+            key_search=key_search,
+            error_search=error_search,
+            error_code_search=error_code_search,
+            start_date=start_date,
+            end_date=end_date,
+            sort_by=sort_by,
+            sort_order=sort_order,
+        )
+        logs_data = result["logs"]
+        total_count = result["total"]
+
+        validated_logs = [ErrorLogListItem(**log) for log in logs_data]
+        return ErrorLogListResponse(logs=validated_logs, total=total_count)
+    except Exception as e:
+        logger.exception(f"Failed to get error logs list: {str(e)}")
+        raise HTTPException(
+            status_code=500, detail=f"Failed to get error logs list: {str(e)}"
+        )
+
+
+class ErrorLogDetailResponse(BaseModel):
+    id: int
+    gemini_key: Optional[str] = None
+    error_type: Optional[str] = None
+    error_log: Optional[str] = None
+    request_msg: Optional[str] = None
+    model_name: Optional[str] = None
+    request_time: Optional[datetime] = None
+
+
+@router.get("/errors/{log_id}/details", response_model=ErrorLogDetailResponse)
+async def get_error_log_detail_api(request: Request, log_id: int = Path(..., ge=1)):
+    """
+    根据日志 ID 获取错误日志的详细信息 (包括 error_log 和 request_msg)
+    """
+    auth_token = request.cookies.get("auth_token")
+    if not auth_token or not verify_auth_token(auth_token):
+        logger.warning(
+            f"Unauthorized access attempt to error log details for ID: {log_id}"
+        )
+        raise HTTPException(status_code=401, detail="Not authenticated")
+
+    try:
+        log_details = await error_log_service.process_get_error_log_details(
+            log_id=log_id
+        )
+        if not log_details:
+            raise HTTPException(status_code=404, detail="Error log not found")
+
+        return ErrorLogDetailResponse(**log_details)
+    except HTTPException as http_exc:
+        raise http_exc
+    except Exception as e:
+        logger.exception(f"Failed to get error log details for ID {log_id}: {str(e)}")
+        raise HTTPException(
+            status_code=500, detail=f"Failed to get error log details: {str(e)}"
+        )
+
+
+@router.delete("/errors", status_code=status.HTTP_204_NO_CONTENT)
+async def delete_error_logs_bulk_api(
+    request: Request, payload: Dict[str, List[int]] = Body(...)
+):
+    """
+    批量删除错误日志 (异步)
+    """
+    auth_token = request.cookies.get("auth_token")
+    if not auth_token or not verify_auth_token(auth_token):
+        logger.warning("Unauthorized access attempt to bulk delete error logs")
+        raise HTTPException(status_code=401, detail="Not authenticated")
+
+    log_ids = payload.get("ids")
+    if not log_ids:
+        raise HTTPException(status_code=400, detail="No log IDs provided for deletion.")
+
+    try:
+        deleted_count = await error_log_service.process_delete_error_logs_by_ids(
+            log_ids
+        )
+        # 注意：异步函数返回的是尝试删除的数量，可能不是精确值
+        logger.info(
+            f"Attempted bulk deletion for {deleted_count} error logs with IDs: {log_ids}"
+        )
+        return Response(status_code=status.HTTP_204_NO_CONTENT)
+    except Exception as e:
+        logger.exception(f"Error bulk deleting error logs with IDs {log_ids}: {str(e)}")
+        raise HTTPException(
+            status_code=500, detail="Internal server error during bulk deletion"
+        )
+
+
+@router.delete("/errors/{log_id}", status_code=status.HTTP_204_NO_CONTENT)
+async def delete_error_log_api(request: Request, log_id: int = Path(..., ge=1)):
+    """
+    删除单个错误日志 (异步)
+    """
+    auth_token = request.cookies.get("auth_token")
+    if not auth_token or not verify_auth_token(auth_token):
+        logger.warning(f"Unauthorized access attempt to delete error log ID: {log_id}")
+        raise HTTPException(status_code=401, detail="Not authenticated")
+
+    try:
+        success = await error_log_service.process_delete_error_log_by_id(log_id)
+        if not success:
+            # 服务层现在在未找到时返回 False，我们在这里转换为 404
+            raise HTTPException(
+                status_code=404, detail=f"Error log with ID {log_id} not found"
+            )
+        logger.info(f"Successfully deleted error log with ID: {log_id}")
+        return Response(status_code=status.HTTP_204_NO_CONTENT)
+    except HTTPException as http_exc:
+        raise http_exc
+    except Exception as e:
+        logger.exception(f"Error deleting error log with ID {log_id}: {str(e)}")
+        raise HTTPException(
+            status_code=500, detail="Internal server error during deletion"
+        )

app/router/gemini_routes.py

@@ -1,22 +1,22 @@
 from fastapi import APIRouter, Depends, HTTPException
 from fastapi.responses import StreamingResponse, JSONResponse
 from copy import deepcopy
+import asyncio
 from app.config.config import settings
 from app.log.logger import get_gemini_logger
 from app.core.security import SecurityService
-from app.domain.gemini_models import GeminiContent, GeminiRequest
+from app.domain.gemini_models import GeminiContent, GeminiRequest, ResetSelectedKeysRequest, VerifySelectedKeysRequest
 from app.service.chat.gemini_chat_service import GeminiChatService
 from app.service.key.key_manager import KeyManager, get_key_manager_instance
 from app.service.model.model_service import ModelService
 from app.handler.retry_handler import RetryHandler
+from app.handler.error_handler import handle_route_errors
 from app.core.constants import API_VERSION
 
-# 路由设置
 router = APIRouter(prefix=f"/gemini/{API_VERSION}")
 router_v1beta = APIRouter(prefix=f"/{API_VERSION}")
 logger = get_gemini_logger()
 
-# 初始化服务
 security_service = SecurityService()
 model_service = ModelService()
 
@@ -42,109 +42,114 @@ async def list_models(
     _=Depends(security_service.verify_key_or_goog_api_key),
     key_manager: KeyManager = Depends(get_key_manager)
 ):
-    """获取可用的Gemini模型列表"""
+    """获取可用的 Gemini 模型列表，并根据配置添加衍生模型（搜索、图像、非思考）。"""
-    logger.info("-" * 50 + "list_gemini_models" + "-" * 50)
+    operation_name = "list_gemini_models"
+    logger.info("-" * 50 + operation_name + "-" * 50)
     logger.info("Handling Gemini models list request")
-    
+
-    api_key = await key_manager.get_first_valid_key()
+    try:
-    logger.info(f"Using API key: {api_key}")
+        api_key = await key_manager.get_first_valid_key()
-    
+        if not api_key:
-    models_json = model_service.get_gemini_models(api_key)
+            raise HTTPException(status_code=503, detail="No valid API keys available to fetch models.")
-    model_mapping = {x.get("name", "").split("/", maxsplit=1)[1]: x for x in models_json["models"]}
+        logger.info(f"Using API key: {api_key}")
-    
+
-    # 添加搜索模型
+        models_data = await model_service.get_gemini_models(api_key)
-    if model_service.search_models:
+        if not models_data or "models" not in models_data:
-        for name in model_service.search_models:
+            raise HTTPException(status_code=500, detail="Failed to fetch base models list.")
-            model = model_mapping.get(name)
+
+        models_json = deepcopy(models_data)
+        model_mapping = {x.get("name", "").split("/", maxsplit=1)[-1]: x for x in models_json.get("models", [])}
+
+        def add_derived_model(base_name, suffix, display_suffix):
+            model = model_mapping.get(base_name)
             if not model:
-                continue
+                logger.warning(f"Base model '{base_name}' not found for derived model '{suffix}'.")
-                
+                return
             item = deepcopy(model)
-            item["name"] = f"models/{name}-search"
+            item["name"] = f"models/{base_name}{suffix}"
-            display_name = f'{item.get("displayName")} For Search'
+            display_name = f'{item.get("displayName", base_name)}{display_suffix}'
             item["displayName"] = display_name
             item["description"] = display_name
-            
             models_json["models"].append(item)
-    
+
-    # 添加图像生成模型
+        if settings.SEARCH_MODELS:
-    if model_service.image_models:
+            for name in settings.SEARCH_MODELS:
-        for name in model_service.image_models:
+                add_derived_model(name, "-search", " For Search")
-            model = model_mapping.get(name)
+        if settings.IMAGE_MODELS:
-            if not model:
+            for name in settings.IMAGE_MODELS:
-                continue
+                 add_derived_model(name, "-image", " For Image")
-                
+        if settings.THINKING_MODELS:
-            item = deepcopy(model)
+            for name in settings.THINKING_MODELS:
-            item["name"] = f"models/{name}-image"
+                add_derived_model(name, "-non-thinking", " Non Thinking")
-            display_name = f'{item.get("displayName")} For Image'
+
-            item["displayName"] = display_name
+        logger.info("Gemini models list request successful")
-            item["description"] = display_name
+        return models_json
-            
+    except HTTPException as http_exc:
-            models_json["models"].append(item)
+        raise http_exc
-            
+    except Exception as e:
-    return models_json
+        logger.error(f"Error getting Gemini models list: {str(e)}")
+        raise HTTPException(
+            status_code=500, detail="Internal server error while fetching Gemini models list"
+        ) from e
 
 
 @router.post("/models/{model_name}:generateContent")
 @router_v1beta.post("/models/{model_name}:generateContent")
-@RetryHandler(max_retries=settings.MAX_RETRIES, key_arg="api_key")
+@RetryHandler(key_arg="api_key")
 async def generate_content(
     model_name: str,
     request: GeminiRequest,
     _=Depends(security_service.verify_key_or_goog_api_key),
     api_key: str = Depends(get_next_working_key),
+    key_manager: KeyManager = Depends(get_key_manager),
     chat_service: GeminiChatService = Depends(get_chat_service)
 ):
-    """非流式生成内容"""
+    """处理 Gemini 非流式内容生成请求。"""
-    logger.info("-" * 50 + "gemini_generate_content" + "-" * 50)
+    operation_name = "gemini_generate_content"
-    logger.info(f"Handling Gemini content generation request for model: {model_name}")
+    async with handle_route_errors(logger, operation_name, failure_message="Content generation failed"):
-    logger.info(f"Request: \n{request.model_dump_json(indent=2)}")
+        logger.info(f"Handling Gemini content generation request for model: {model_name}")
-    logger.info(f"Using API key: {api_key}")
+        logger.debug(f"Request: \n{request.model_dump_json(indent=2)}")
-    
+        logger.info(f"Using API key: {api_key}")
-    if not model_service.check_model_support(model_name):
+
-        raise HTTPException(status_code=400, detail=f"Model {model_name} is not supported")
+        if not await model_service.check_model_support(model_name):
-    
+            raise HTTPException(status_code=400, detail=f"Model {model_name} is not supported")
-    try:
+
         response = await chat_service.generate_content(
             model=model_name,
             request=request,
             api_key=api_key
         )
         return response
-    except Exception as e:
-        logger.error(f"Chat completion failed after retries: {str(e)}")
-        raise HTTPException(status_code=500, detail="Chat completion failed") from e
 
 
 @router.post("/models/{model_name}:streamGenerateContent")
 @router_v1beta.post("/models/{model_name}:streamGenerateContent")
-@RetryHandler(max_retries=settings.MAX_RETRIES, key_arg="api_key")
+@RetryHandler(key_arg="api_key")
 async def stream_generate_content(
     model_name: str,
     request: GeminiRequest,
     _=Depends(security_service.verify_key_or_goog_api_key),
     api_key: str = Depends(get_next_working_key),
+    key_manager: KeyManager = Depends(get_key_manager),
     chat_service: GeminiChatService = Depends(get_chat_service)
 ):
-    """流式生成内容"""
+    """处理 Gemini 流式内容生成请求。"""
-    logger.info("-" * 50 + "gemini_stream_generate_content" + "-" * 50)
+    operation_name = "gemini_stream_generate_content"
-    logger.info(f"Handling Gemini streaming content generation for model: {model_name}")
+    async with handle_route_errors(logger, operation_name, failure_message="Streaming request initiation failed"):
-    logger.info(f"Request: \n{request.model_dump_json(indent=2)}")
+        logger.info(f"Handling Gemini streaming content generation for model: {model_name}")
-    logger.info(f"Using API key: {api_key}")
+        logger.debug(f"Request: \n{request.model_dump_json(indent=2)}")
-    
+        logger.info(f"Using API key: {api_key}")
-    if not model_service.check_model_support(model_name):
+
-        raise HTTPException(status_code=400, detail=f"Model {model_name} is not supported")
+        if not await model_service.check_model_support(model_name):
-    
+            raise HTTPException(status_code=400, detail=f"Model {model_name} is not supported")
-    try:
+
         response_stream = chat_service.stream_generate_content(
             model=model_name,
             request=request,
             api_key=api_key
         )
         return StreamingResponse(response_stream, media_type="text/event-stream")
-    except Exception as e:
+
-        logger.error(f"Streaming request failed: {str(e)}")
-        raise HTTPException(status_code=500, detail="Streaming request failed") from e
 
 @router.post("/reset-all-fail-counts")
 async def reset_all_key_fail_counts(key_type: str = None, key_manager: KeyManager = Depends(get_key_manager)):
@@ -183,6 +188,55 @@ async def reset_all_key_fail_counts(key_type: str = None, key_manager: KeyManage
     except Exception as e:
         logger.error(f"Failed to reset key failure counts: {str(e)}")
         return JSONResponse({"success": False, "message": f"批量重置失败: {str(e)}"}, status_code=500)
+    
+    
+@router.post("/reset-selected-fail-counts")
+async def reset_selected_key_fail_counts(
+    request: ResetSelectedKeysRequest,
+    key_manager: KeyManager = Depends(get_key_manager)
+):
+    """批量重置选定Gemini API密钥的失败计数"""
+    logger.info("-" * 50 + "reset_selected_gemini_key_fail_counts" + "-" * 50)
+    keys_to_reset = request.keys
+    key_type = request.key_type
+    logger.info(f"Received reset request for {len(keys_to_reset)} selected {key_type} keys.")
+
+    if not keys_to_reset:
+        return JSONResponse({"success": False, "message": "没有提供需要重置的密钥"}, status_code=400)
+
+    reset_count = 0
+    errors = []
+
+    try:
+        for key in keys_to_reset:
+            try:
+                result = await key_manager.reset_key_failure_count(key)
+                if result:
+                    reset_count += 1
+                else:
+                    logger.warning(f"Key not found during selective reset: {key}")
+            except Exception as key_error:
+                logger.error(f"Error resetting key {key}: {str(key_error)}")
+                errors.append(f"Key {key}: {str(key_error)}")
+
+        if errors:
+             error_message = f"批量重置完成，但出现错误: {'; '.join(errors)}"
+             final_success = reset_count > 0
+             status_code = 207 if final_success and errors else 500
+             return JSONResponse({
+                 "success": final_success,
+                 "message": error_message,
+                 "reset_count": reset_count
+             }, status_code=status_code)
+
+        return JSONResponse({
+            "success": True,
+            "message": f"成功重置 {reset_count} 个选定 {key_type} 密钥的失败计数",
+            "reset_count": reset_count
+        })
+    except Exception as e:
+        logger.error(f"Failed to process reset selected key failure counts request: {str(e)}")
+        return JSONResponse({"success": False, "message": f"批量重置处理失败: {str(e)}"}, status_code=500)
 
 
 @router.post("/reset-fail-count/{api_key}")
@@ -200,6 +254,7 @@ async def reset_key_fail_count(api_key: str, key_manager: KeyManager = Depends(g
         logger.error(f"Failed to reset key failure count: {str(e)}")
         return JSONResponse({"success": False, "message": f"重置失败: {str(e)}"}, status_code=500)
 
+
 @router.post("/verify-key/{api_key}")
 async def verify_key(api_key: str, chat_service: GeminiChatService = Depends(get_chat_service), key_manager: KeyManager = Depends(get_key_manager)):
     """验证Gemini API密钥的有效性"""
@@ -207,14 +262,14 @@ async def verify_key(api_key: str, chat_service: GeminiChatService = Depends(get
     logger.info("Verifying API key validity")
     
     try:
-        # 使用generate_content接口测试key的有效性
         gemini_request = GeminiRequest(
             contents=[
                 GeminiContent(
                     role="user",
-                    parts=[{"text": "hi"}]
+                    parts=[{"text": "hi"}],
                 )
-            ]
+            ],
+            generation_config={"temperature": 0.7, "top_p": 1.0, "max_output_tokens": 10}
         )
         
         response = await chat_service.generate_content(
@@ -228,10 +283,92 @@ async def verify_key(api_key: str, chat_service: GeminiChatService = Depends(get
     except Exception as e:
         logger.error(f"Key verification failed: {str(e)}")
         
-        # 验证出现异常时增加失败计数
         async with key_manager.failure_count_lock:
             if api_key in key_manager.key_failure_counts:
                 key_manager.key_failure_counts[api_key] += 1
                 logger.warning(f"Verification exception for key: {api_key}, incrementing failure count")
         
-        return JSONResponse({"status": "invalid", "error": str(e)})
+        return JSONResponse({"status": "invalid", "error": str(e)})
+
+
+@router.post("/verify-selected-keys")
+async def verify_selected_keys(
+    request: VerifySelectedKeysRequest,
+    chat_service: GeminiChatService = Depends(get_chat_service),
+    key_manager: KeyManager = Depends(get_key_manager)
+):
+    """批量验证选定Gemini API密钥的有效性"""
+    logger.info("-" * 50 + "verify_selected_gemini_keys" + "-" * 50)
+    keys_to_verify = request.keys
+    logger.info(f"Received verification request for {len(keys_to_verify)} selected keys.")
+
+    if not keys_to_verify:
+        return JSONResponse({"success": False, "message": "没有提供需要验证的密钥"}, status_code=400)
+
+    successful_keys = []
+    failed_keys = {}
+
+    async def _verify_single_key(api_key: str):
+        """内部函数，用于验证单个密钥并处理异常"""
+        nonlocal successful_keys, failed_keys
+        try:
+            gemini_request = GeminiRequest(
+                contents=[GeminiContent(role="user", parts=[{"text": "hi"}])],
+                generation_config={"temperature": 0.7, "top_p": 1.0, "max_output_tokens": 10}
+            )
+            await chat_service.generate_content(
+                settings.TEST_MODEL,
+                gemini_request,
+                api_key
+            )
+            successful_keys.append(api_key)
+            return api_key, "valid", None
+        except Exception as e:
+            error_message = str(e)
+            logger.warning(f"Key verification failed for {api_key}: {error_message}")
+            async with key_manager.failure_count_lock:
+                if api_key in key_manager.key_failure_counts:
+                    key_manager.key_failure_counts[api_key] += 1
+                    logger.warning(f"Bulk verification exception for key: {api_key}, incrementing failure count")
+                else:
+                     key_manager.key_failure_counts[api_key] = 1
+                     logger.warning(f"Bulk verification exception for key: {api_key}, initializing failure count to 1")
+            failed_keys[api_key] = error_message
+            return api_key, "invalid", error_message
+
+    tasks = [_verify_single_key(key) for key in keys_to_verify]
+    results = await asyncio.gather(*tasks, return_exceptions=True)
+
+    for result in results:
+        if isinstance(result, Exception):
+            logger.error(f"An unexpected error occurred during bulk verification task: {result}")
+        elif result:
+             if not isinstance(result, Exception) and result:
+                 key, status, error = result
+             elif isinstance(result, Exception):
+                 logger.error(f"Task execution error during bulk verification: {result}")
+
+    valid_count = len(successful_keys)
+    invalid_count = len(failed_keys)
+    logger.info(f"Bulk verification finished. Valid: {valid_count}, Invalid: {invalid_count}")
+
+    if failed_keys:
+        message = f"批量验证完成。成功: {valid_count}, 失败: {invalid_count}。"
+        return JSONResponse({
+            "success": True,
+            "message": message,
+            "successful_keys": successful_keys,
+            "failed_keys": failed_keys,
+            "valid_count": valid_count,
+            "invalid_count": invalid_count
+        })
+    else:
+        message = f"批量验证成功完成。所有 {valid_count} 个密钥均有效。"
+        return JSONResponse({
+            "success": True,
+            "message": message,
+            "successful_keys": successful_keys,
+            "failed_keys": {},
+            "valid_count": valid_count,
+            "invalid_count": 0
+        })

app/router/log_routes.py

@@ -1,71 +0,0 @@
-"""
-日志路由模块
-"""
-from typing import Any, Dict, List, Optional
-from datetime import datetime
-from pydantic import BaseModel
-from fastapi import APIRouter, HTTPException, Request, Query
-from fastapi.responses import RedirectResponse
-
-from app.core.security import verify_auth_token
-from app.log.logger import get_log_routes_logger
-from app.database.services import get_error_logs, get_error_logs_count
-
-# 创建路由
-router = APIRouter(prefix="/api/logs", tags=["logs"])
-
-logger = get_log_routes_logger()
-
-
-# Define a response model that includes the total count for pagination
-class ErrorLogResponse(BaseModel):
-    logs: List[Dict[str, Any]]
-    total: int
-
-@router.get("/errors", response_model=ErrorLogResponse)
-async def get_error_logs_api(
-    request: Request,
-    limit: int = Query(20, ge=1, le=1000), # Default to 20 to match frontend
-    offset: int = Query(0, ge=0),
-    key_search: Optional[str] = Query(None, description="Search term for Gemini key (partial match)"),
-    error_search: Optional[str] = Query(None, description="Search term for error type or log message"),
-    start_date: Optional[datetime] = Query(None, description="Start datetime for filtering (YYYY-MM-DDTHH:MM)"),
-    end_date: Optional[datetime] = Query(None, description="End datetime for filtering (YYYY-MM-DDTHH:MM)")
-):
-    """
-    获取错误日志
-    
-    Args:
-        request: 请求对象
-        limit: 限制数量
-        offset: 偏移量
-    
-    Returns:
-        ErrorLogResponse: An object containing the list of logs and the total count.
-    """
-    auth_token = request.cookies.get("auth_token")
-    if not auth_token or not verify_auth_token(auth_token):
-        logger.warning("Unauthorized access attempt to error logs")
-        return RedirectResponse(url="/", status_code=302)
-    
-    try:
-        # Fetch logs with search parameters
-        logs = await get_error_logs(
-            limit=limit,
-            offset=offset,
-            key_search=key_search,
-            error_search=error_search,
-            start_date=start_date,
-            end_date=end_date
-        )
-        # Fetch total count with the same search parameters
-        total_count = await get_error_logs_count(
-            key_search=key_search,
-            error_search=error_search,
-            start_date=start_date,
-            end_date=end_date
-        )
-        return ErrorLogResponse(logs=logs, total=total_count)
-    except Exception as e:
-        logger.exception(f"Failed to get error logs: {str(e)}") # Use logger.exception for stack trace
-        raise HTTPException(status_code=500, detail=f"Failed to get error logs: {str(e)}")

app/router/openai_compatiable_routes.py

@@ -0,0 +1,113 @@
+from fastapi import APIRouter, Depends
+from fastapi.responses import StreamingResponse
+
+from app.config.config import settings
+from app.core.security import SecurityService
+from app.domain.openai_models import (
+    ChatRequest,
+    EmbeddingRequest,
+    ImageGenerationRequest,
+)
+from app.handler.retry_handler import RetryHandler
+from app.handler.error_handler import handle_route_errors
+from app.log.logger import get_openai_compatible_logger
+from app.service.key.key_manager import KeyManager, get_key_manager_instance
+from app.service.openai_compatiable.openai_compatiable_service import OpenAICompatiableService
+
+
+router = APIRouter()
+logger = get_openai_compatible_logger()
+
+security_service = SecurityService()
+
+async def get_key_manager():
+    return await get_key_manager_instance()
+
+
+async def get_next_working_key_wrapper(
+    key_manager: KeyManager = Depends(get_key_manager),
+):
+    return await key_manager.get_next_working_key()
+
+
+async def get_openai_service(key_manager: KeyManager = Depends(get_key_manager)):
+    """获取OpenAI聊天服务实例"""
+    return OpenAICompatiableService(settings.BASE_URL, key_manager)
+
+
+@router.get("/openai/v1/models")
+async def list_models(
+    _=Depends(security_service.verify_authorization),
+    key_manager: KeyManager = Depends(get_key_manager),
+    openai_service: OpenAICompatiableService = Depends(get_openai_service),
+):
+    """获取可用模型列表。"""
+    operation_name = "list_models"
+    async with handle_route_errors(logger, operation_name):
+        logger.info("Handling models list request")
+        api_key = await key_manager.get_first_valid_key()
+        logger.info(f"Using API key: {api_key}")
+        return await openai_service.get_models(api_key)
+
+
+@router.post("/openai/v1/chat/completions")
+@RetryHandler(key_arg="api_key")
+async def chat_completion(
+    request: ChatRequest,
+    _=Depends(security_service.verify_authorization),
+    api_key: str = Depends(get_next_working_key_wrapper),
+    key_manager: KeyManager = Depends(get_key_manager),
+    openai_service: OpenAICompatiableService = Depends(get_openai_service),
+):
+    """处理聊天补全请求，支持流式响应和特定模型切换。"""
+    operation_name = "chat_completion"
+    is_image_chat = request.model == f"{settings.CREATE_IMAGE_MODEL}-chat"
+    current_api_key = api_key
+    if is_image_chat:
+        current_api_key = await key_manager.get_paid_key()
+
+    async with handle_route_errors(logger, operation_name):
+        logger.info(f"Handling chat completion request for model: {request.model}")
+        logger.debug(f"Request: \n{request.model_dump_json(indent=2)}")
+        logger.info(f"Using API key: {current_api_key}")
+
+        if is_image_chat:
+            response = await openai_service.create_image_chat_completion(request, current_api_key)
+            return response
+        else:
+            response = await openai_service.create_chat_completion(request, current_api_key)
+            if request.stream:
+                return StreamingResponse(response, media_type="text/event-stream")
+            return response
+
+
+@router.post("/openai/v1/images/generations")
+async def generate_image(
+    request: ImageGenerationRequest,
+    _=Depends(security_service.verify_authorization),
+    openai_service: OpenAICompatiableService = Depends(get_openai_service),
+):
+    """处理图像生成请求。"""
+    operation_name = "generate_image"
+    async with handle_route_errors(logger, operation_name):
+        logger.info(f"Handling image generation request for prompt: {request.prompt}")
+        request.model = settings.CREATE_IMAGE_MODEL
+        return await openai_service.generate_images(request)
+
+
+@router.post("/openai/v1/embeddings")
+async def embedding(
+    request: EmbeddingRequest,
+    _=Depends(security_service.verify_authorization),
+    key_manager: KeyManager = Depends(get_key_manager),
+    openai_service: OpenAICompatiableService = Depends(get_openai_service),
+):
+    """处理文本嵌入请求。"""
+    operation_name = "embedding"
+    async with handle_route_errors(logger, operation_name):
+        logger.info(f"Handling embedding request for model: {request.model}")
+        api_key = await key_manager.get_next_working_key()
+        logger.info(f"Using API key: {api_key}")
+        return await openai_service.create_embeddings(
+            input_text=request.input, model=request.model, api_key=api_key
+        )

app/router/openai_routes.py

@@ -9,6 +9,7 @@ from app.domain.openai_models import (
     ImageGenerationRequest,
 )
 from app.handler.retry_handler import RetryHandler
+from app.handler.error_handler import handle_route_errors
 from app.log.logger import get_openai_logger
 from app.service.chat.openai_chat_service import OpenAIChatService
 from app.service.embedding.embedding_service import EmbeddingService
@@ -19,7 +20,6 @@ from app.service.model.model_service import ModelService
 router = APIRouter()
 logger = get_openai_logger()
 
-# 初始化服务
 security_service = SecurityService()
 model_service = ModelService()
 embedding_service = EmbeddingService()
@@ -47,56 +47,52 @@ async def list_models(
     _=Depends(security_service.verify_authorization),
     key_manager: KeyManager = Depends(get_key_manager),
 ):
-    logger.info("-" * 50 + "list_models" + "-" * 50)
+    """获取可用的 OpenAI 模型列表 (兼容 Gemini 和 OpenAI)。"""
-    logger.info("Handling models list request")
+    operation_name = "list_models"
-    api_key = await key_manager.get_first_valid_key()
+    async with handle_route_errors(logger, operation_name):
-    logger.info(f"Using API key: {api_key}")
+        logger.info("Handling models list request")
-    try:
+        api_key = await key_manager.get_first_valid_key()
-        return model_service.get_gemini_openai_models(api_key)
+        logger.info(f"Using API key: {api_key}")
-    except Exception as e:
+        return await model_service.get_gemini_openai_models(api_key)
-        logger.error(f"Error getting models list: {str(e)}")
-        raise HTTPException(
-            status_code=500, detail="Internal server error while fetching models list"
-        ) from e
 
 
 @router.post("/v1/chat/completions")
 @router.post("/hf/v1/chat/completions")
-@RetryHandler(max_retries=settings.MAX_RETRIES, key_arg="api_key")
+@RetryHandler(key_arg="api_key")
 async def chat_completion(
     request: ChatRequest,
     _=Depends(security_service.verify_authorization),
     api_key: str = Depends(get_next_working_key_wrapper),
-    key_manager: KeyManager = Depends(get_key_manager), # 保留 key_manager 用于获取 paid_key
+    key_manager: KeyManager = Depends(get_key_manager),
     chat_service: OpenAIChatService = Depends(get_openai_chat_service),
 ):
-    # 如果model是imagen3,使用paid_key
+    """处理 OpenAI 聊天补全请求，支持流式响应和特定模型切换。"""
-    if request.model == f"{settings.CREATE_IMAGE_MODEL}-chat":
+    operation_name = "chat_completion"
-        api_key = await key_manager.get_paid_key()
+    is_image_chat = request.model == f"{settings.CREATE_IMAGE_MODEL}-chat"
-    logger.info("-" * 50 + "chat_completion" + "-" * 50)
+    current_api_key = api_key
-    logger.info(f"Handling chat completion request for model: {request.model}")
+    if is_image_chat:
-    logger.info(f"Request: \n{request.model_dump_json(indent=2)}")
+        current_api_key = await key_manager.get_paid_key()
-    logger.info(f"Using API key: {api_key}")
 
-    if not model_service.check_model_support(request.model):
+    async with handle_route_errors(logger, operation_name):
-        raise HTTPException(
+        logger.info(f"Handling chat completion request for model: {request.model}")
-            status_code=400, detail=f"Model {request.model} is not supported"
+        logger.debug(f"Request: \n{request.model_dump_json(indent=2)}")
-        )
+        logger.info(f"Using API key: {current_api_key}")
 
-    try:
+        if not await model_service.check_model_support(request.model):
-        # 如果model是imagen3,使用paid_key
+            raise HTTPException(
-        if request.model == f"{settings.CREATE_IMAGE_MODEL}-chat":
+                status_code=400, detail=f"Model {request.model} is not supported"
-            response = await chat_service.create_image_chat_completion(request=request)
+            )
+
+        if is_image_chat:
+            response = await chat_service.create_image_chat_completion(request, current_api_key)
+            if request.stream:
+                return StreamingResponse(response, media_type="text/event-stream")
+            return response
         else:
-            response = await chat_service.create_chat_completion(request, api_key)
+            response = await chat_service.create_chat_completion(request, current_api_key)
-        # 处理流式响应
+            if request.stream:
-        if request.stream:
+                return StreamingResponse(response, media_type="text/event-stream")
-            return StreamingResponse(response, media_type="text/event-stream")
+            return response
-        logger.info("Chat completion request successful")
-        return response
-    except Exception as e:
-        logger.error(f"Chat completion failed after retries: {str(e)}")
-        raise HTTPException(status_code=500, detail="Chat completion failed") from e
 
 
 @router.post("/v1/images/generations")
@@ -105,18 +101,12 @@ async def generate_image(
     request: ImageGenerationRequest,
     _=Depends(security_service.verify_authorization),
 ):
-    logger.info("-" * 50 + "generate_image" + "-" * 50)
+    """处理 OpenAI 图像生成请求。"""
-    logger.info(f"Handling image generation request for prompt: {request.prompt}")
+    operation_name = "generate_image"
-
+    async with handle_route_errors(logger, operation_name):
-    try:
+        logger.info(f"Handling image generation request for prompt: {request.prompt}")
         response = image_create_service.generate_images(request)
-        logger.info("Image generation request successful")
         return response
-    except Exception as e:
-        logger.error(f"Image generation request failed: {str(e)}")
-        raise HTTPException(
-            status_code=500, detail="Image generation request failed"
-        ) from e
 
 
 @router.post("/v1/embeddings")
@@ -126,19 +116,16 @@ async def embedding(
     _=Depends(security_service.verify_authorization),
     key_manager: KeyManager = Depends(get_key_manager),
 ):
-    logger.info("-" * 50 + "embedding" + "-" * 50)
+    """处理 OpenAI 文本嵌入请求。"""
-    logger.info(f"Handling embedding request for model: {request.model}")
+    operation_name = "embedding"
-    api_key = await key_manager.get_next_working_key()
+    async with handle_route_errors(logger, operation_name):
-    logger.info(f"Using API key: {api_key}")
+        logger.info(f"Handling embedding request for model: {request.model}")
-    try:
+        api_key = await key_manager.get_next_working_key()
+        logger.info(f"Using API key: {api_key}")
         response = await embedding_service.create_embedding(
             input_text=request.input, model=request.model, api_key=api_key
         )
-        logger.info("Embedding request successful")
         return response
-    except Exception as e:
-        logger.error(f"Embedding request failed: {str(e)}")
-        raise HTTPException(status_code=500, detail="Embedding request failed") from e
 
 
 @router.get("/v1/keys/list")
@@ -147,10 +134,10 @@ async def get_keys_list(
     _=Depends(security_service.verify_auth_token),
     key_manager: KeyManager = Depends(get_key_manager),
 ):
-    """获取有效和无效的API key列表"""
+    """获取有效和无效的API key列表 (需要管理 Token 认证)。"""
-    logger.info("-" * 50 + "get_keys_list" + "-" * 50)
+    operation_name = "get_keys_list"
-    logger.info("Handling keys list request")
+    async with handle_route_errors(logger, operation_name):
-    try:
+        logger.info("Handling keys list request")
         keys_status = await key_manager.get_keys_by_status()
         return {
             "status": "success",
@@ -160,8 +147,3 @@ async def get_keys_list(
             },
             "total": len(keys_status["valid_keys"]) + len(keys_status["invalid_keys"]),
         }
-    except Exception as e:
-        logger.error(f"Error getting keys list: {str(e)}")
-        raise HTTPException(
-            status_code=500, detail="Internal server error while fetching keys list"
-        ) from e

app/router/routes.py

@@ -8,13 +8,12 @@ from fastapi.templating import Jinja2Templates
 
 from app.core.security import verify_auth_token
 from app.log.logger import get_routes_logger
-from app.router import gemini_routes, openai_routes, config_routes, log_routes, scheduler_routes # 新增导入
+from app.router import error_log_routes, gemini_routes, openai_routes, config_routes, scheduler_routes, stats_routes, version_routes, openai_compatiable_routes
 from app.service.key.key_manager import get_key_manager_instance
-from app.service.stats_service import get_api_usage_stats, get_api_call_details # <-- Import stats service and details function
+from app.service.stats.stats_service import StatsService
 
 logger = get_routes_logger()
 
-# 配置Jinja2模板
 templates = Jinja2Templates(directory="app/templates")
 
 
@@ -25,20 +24,20 @@ def setup_routers(app: FastAPI) -> None:
     Args:
         app: FastAPI应用程序实例
     """
-    # 包含API路由
     app.include_router(openai_routes.router)
     app.include_router(gemini_routes.router)
     app.include_router(gemini_routes.router_v1beta)
     app.include_router(config_routes.router)
-    app.include_router(log_routes.router)
+    app.include_router(error_log_routes.router)
-    app.include_router(scheduler_routes.router) # 新增包含 scheduler 路由
+    app.include_router(scheduler_routes.router)
+    app.include_router(stats_routes.router)
+    app.include_router(version_routes.router)
+    app.include_router(openai_compatiable_routes.router)
 
-    # 添加页面路由
     setup_page_routes(app)
 
-    # 添加健康检查路由
     setup_health_routes(app)
-    setup_api_stats_routes(app) # Add API stats routes
+    setup_api_stats_routes(app)
 
 
 def setup_page_routes(app: FastAPI) -> None:
@@ -92,8 +91,8 @@ def setup_page_routes(app: FastAPI) -> None:
             valid_key_count = len(keys_status["valid_keys"])
             invalid_key_count = len(keys_status["invalid_keys"])
 
-            # Get API usage stats
+            stats_service = StatsService()
-            api_stats = await get_api_usage_stats()
+            api_stats = await stats_service.get_api_usage_stats()
             logger.info(f"API stats retrieved: {api_stats}")
 
             logger.info(f"Keys status retrieved successfully. Total keys: {total_keys}")
@@ -103,16 +102,14 @@ def setup_page_routes(app: FastAPI) -> None:
                     "request": request,
                     "valid_keys": keys_status["valid_keys"],
                     "invalid_keys": keys_status["invalid_keys"],
-                    "total_keys": total_keys, # Renamed for clarity
+                    "total_keys": total_keys,
-                    "valid_key_count": valid_key_count, # Added count
+                    "valid_key_count": valid_key_count,
-                    "invalid_key_count": invalid_key_count, # Added count
+                    "invalid_key_count": invalid_key_count,
-                    "api_stats": api_stats, # <-- Pass stats to template
+                    "api_stats": api_stats,
                 },
             )
         except Exception as e:
             logger.error(f"Error retrieving keys status or API stats: {str(e)}")
-            # Optionally, render template with error or default stats
-            # For now, re-raise to show error page
             raise
             
     @app.get("/config", response_class=HTMLResponse)
@@ -172,15 +169,14 @@ def setup_api_stats_routes(app: FastAPI) -> None:
     async def api_stats_details(request: Request, period: str):
         """获取指定时间段内的 API 调用详情"""
         try:
-            # 验证认证
             auth_token = request.cookies.get("auth_token")
             if not auth_token or not verify_auth_token(auth_token):
                 logger.warning("Unauthorized access attempt to API stats details")
-                # Returning JSON error instead of redirect for API endpoint
                 return {"error": "Unauthorized"}, 401
 
             logger.info(f"Fetching API call details for period: {period}")
-            details = await get_api_call_details(period)
+            stats_service = StatsService()
+            details = await stats_service.get_api_call_details(period)
             return details
         except ValueError as e:
             logger.warning(f"Invalid period requested for API stats details: {period} - {str(e)}")

app/router/scheduler_routes.py

@@ -2,22 +2,20 @@
 定时任务控制路由模块
 """
 
-from fastapi import APIRouter, Request, HTTPException, status # 移除 Depends, 添加 Request
+from fastapi import APIRouter, Request, HTTPException, status
 from fastapi.responses import JSONResponse
 
-from app.core.security import verify_auth_token # 导入 verify_auth_token
+from app.core.security import verify_auth_token
-from app.scheduler.key_checker import start_scheduler, stop_scheduler
+from app.scheduler.scheduled_tasks import start_scheduler, stop_scheduler
-from app.log.logger import get_routes_logger # 使用路由日志记录器
+from app.log.logger import get_scheduler_routes
 
-logger = get_routes_logger()
+logger = get_scheduler_routes()
 
 router = APIRouter(
     prefix="/api/scheduler",
     tags=["Scheduler"]
-    # 移除全局依赖
 )
 
-# 认证检查的辅助函数
 async def verify_token(request: Request):
     auth_token = request.cookies.get("auth_token")
     if not auth_token or not verify_auth_token(auth_token):
@@ -29,14 +27,12 @@ async def verify_token(request: Request):
         )
 
 @router.post("/start", summary="启动定时任务")
-async def start_scheduler_endpoint(request: Request): # 添加 request 参数
+async def start_scheduler_endpoint(request: Request):
     """Start the background scheduler task"""
-    """
+    await verify_token(request)
-    await verify_token(request) # 在函数开始处进行认证检查
-    """
     try:
         logger.info("Received request to start scheduler.")
-        start_scheduler() # 调用 key_checker 中的函数
+        start_scheduler()
         return JSONResponse(content={"message": "Scheduler started successfully."}, status_code=status.HTTP_200_OK)
     except Exception as e:
         logger.error(f"Error starting scheduler: {str(e)}", exc_info=True)
@@ -46,14 +42,12 @@ async def start_scheduler_endpoint(request: Request): # 添加 request 参数
         )
 
 @router.post("/stop", summary="停止定时任务")
-async def stop_scheduler_endpoint(request: Request): # 添加 request 参数
+async def stop_scheduler_endpoint(request: Request):
     """Stop the background scheduler task"""
-    """
+    await verify_token(request)
-    await verify_token(request) # 在函数开始处进行认证检查
-    """
     try:
         logger.info("Received request to stop scheduler.")
-        stop_scheduler() # 调用 key_checker 中的函数
+        stop_scheduler()
         return JSONResponse(content={"message": "Scheduler stopped successfully."}, status_code=status.HTTP_200_OK)
     except Exception as e:
         logger.error(f"Error stopping scheduler: {str(e)}", exc_info=True)

app/router/stats_routes.py

@@ -0,0 +1,55 @@
+from fastapi import APIRouter, Depends, HTTPException, Request
+from starlette import status
+from app.core.security import verify_auth_token
+from app.service.stats.stats_service import StatsService
+from app.log.logger import get_stats_logger
+
+logger = get_stats_logger()
+
+
+async def verify_token(request: Request):
+    auth_token = request.cookies.get("auth_token")
+    if not auth_token or not verify_auth_token(auth_token):
+        logger.warning("Unauthorized access attempt to scheduler API")
+        raise HTTPException(
+            status_code=status.HTTP_401_UNAUTHORIZED,
+            detail="Not authenticated",
+            headers={"WWW-Authenticate": "Bearer"},
+        )
+
+router = APIRouter(
+    prefix="/api",
+    tags=["stats"],
+    dependencies=[Depends(verify_token)]
+)
+
+stats_service = StatsService()
+
+@router.get("/key-usage-details/{key}",
+            summary="获取指定密钥最近24小时的模型调用次数",
+            description="根据提供的 API 密钥，返回过去24小时内每个模型被调用的次数统计。")
+async def get_key_usage_details(key: str):
+    """
+    Retrieves the model usage count for a specific API key within the last 24 hours.
+
+    Args:
+        key: The API key to get usage details for.
+
+    Returns:
+        A dictionary with model names as keys and their call counts as values.
+        Example: {"gemini-pro": 10, "gemini-1.5-pro-latest": 5}
+
+    Raises:
+        HTTPException: If an error occurs during data retrieval.
+    """
+    try:
+        usage_details = await stats_service.get_key_usage_details_last_24h(key)
+        if usage_details is None:
+            return {}
+        return usage_details
+    except Exception as e:
+        logger.error(f"Error fetching key usage details for key {key[:4]}...: {e}")
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"获取密钥使用详情时出错: {e}"
+        )

app/router/version_routes.py

@@ -0,0 +1,37 @@
+from fastapi import APIRouter, HTTPException
+from pydantic import BaseModel, Field
+from typing import Optional
+
+from app.service.update.update_service import check_for_updates
+from app.utils.helpers import get_current_version
+from app.log.logger import get_update_logger
+
+router = APIRouter(prefix="/api/version", tags=["Version"])
+logger = get_update_logger()
+
+class VersionInfo(BaseModel):
+    current_version: str = Field(..., description="当前应用程序版本")
+    latest_version: Optional[str] = Field(None, description="可用的最新版本")
+    update_available: bool = Field(False, description="是否有可用更新")
+    error_message: Optional[str] = Field(None, description="检查更新时发生的错误信息")
+
+@router.get("/check", response_model=VersionInfo, summary="检查应用程序更新")
+async def get_version_info():
+    """
+    检查当前应用程序版本与最新的 GitHub release 版本。
+    """
+    try:
+        current_version = get_current_version()
+        update_available, latest_version, error_message = await check_for_updates()
+
+        logger.info(f"Version check API result: current={current_version}, latest={latest_version}, available={update_available}, error='{error_message}'")
+
+        return VersionInfo(
+            current_version=current_version,
+            latest_version=latest_version,
+            update_available=update_available,
+            error_message=error_message
+        )
+    except Exception as e:
+        logger.error(f"Error in /api/version/check endpoint: {e}", exc_info=True)
+        raise HTTPException(status_code=500, detail="检查版本信息时发生内部错误")

app/scheduler/key_checker.py

@@ -1,100 +0,0 @@
-from apscheduler.schedulers.asyncio import AsyncIOScheduler
-from app.service.key.key_manager import get_key_manager_instance
-from app.service.chat.gemini_chat_service import GeminiChatService
-from app.domain.gemini_models import GeminiRequest, GeminiContent
-from app.config.config import settings
-from app.log.logger import Logger # 导入 Logger 类
-
-logger = Logger.setup_logger("scheduler") # 使用 Logger.setup_logger
-
-async def check_failed_keys():
-    """
-    定时检查失败次数大于0的API密钥，并尝试验证它们。
-    如果验证成功，重置失败计数；如果失败，增加失败计数。
-    """
-    logger.info("Starting scheduled check for failed API keys...")
-    try:
-        key_manager = await get_key_manager_instance()
-        # 确保 KeyManager 已经初始化
-        if not key_manager or not hasattr(key_manager, 'key_failure_counts'):
-            logger.warning("KeyManager instance not available or not initialized. Skipping check.")
-            return
-
-        # 创建 GeminiChatService 实例用于验证
-        # 注意：这里直接创建实例，而不是通过依赖注入，因为这是后台任务
-        chat_service = GeminiChatService(settings.BASE_URL, key_manager)
-
-        # 获取需要检查的 key 列表 (失败次数 > 0)
-        keys_to_check = []
-        async with key_manager.failure_count_lock: # 访问共享数据需要加锁
-            # 复制一份以避免在迭代时修改字典
-            failure_counts_copy = key_manager.key_failure_counts.copy()
-            keys_to_check = [key for key, count in failure_counts_copy.items() if count > 0] # 检查所有失败次数大于0的key
-
-        if not keys_to_check:
-            logger.info("No keys with failure count > 0 found. Skipping verification.")
-            return
-
-        logger.info(f"Found {len(keys_to_check)} keys with failure count > 0 to verify.")
-
-        for key in keys_to_check:
-            # 隐藏部分 key 用于日志记录
-            log_key = f"{key[:4]}...{key[-4:]}" if len(key) > 8 else key
-            logger.info(f"Verifying key: {log_key}...")
-            try:
-                # 构造测试请求
-                gemini_request = GeminiRequest(
-                    contents=[
-                        GeminiContent(
-                            role="user",
-                            parts=[{"text": "hi"}] # 使用简单的文本进行验证
-                        )
-                    ]
-                )
-                # 调用 generate_content 进行验证
-                await chat_service.generate_content(
-                    settings.TEST_MODEL, # 使用配置中定义的测试模型
-                    gemini_request,
-                    key
-                )
-                # 如果没有抛出异常，说明 key 有效
-                logger.info(f"Key {log_key} verification successful. Resetting failure count.")
-                await key_manager.reset_key_failure_count(key)
-            except Exception as e:
-                # 验证失败，增加失败计数
-                logger.warning(f"Key {log_key} verification failed: {str(e)}. Incrementing failure count.")
-                # 直接操作计数器，需要加锁
-                async with key_manager.failure_count_lock:
-                    # 再次检查 key 是否存在且失败次数未达上限
-                    if key in key_manager.key_failure_counts and key_manager.key_failure_counts[key] < key_manager.MAX_FAILURES:
-                        key_manager.key_failure_counts[key] += 1
-                        logger.info(f"Failure count for key {log_key} incremented to {key_manager.key_failure_counts[key]}.")
-                    elif key in key_manager.key_failure_counts:
-                         logger.warning(f"Key {log_key} reached MAX_FAILURES ({key_manager.MAX_FAILURES}). Not incrementing further.")
-
-
-    except Exception as e:
-        logger.error(f"An error occurred during the scheduled key check: {str(e)}", exc_info=True)
-
-def setup_scheduler():
-    """设置并启动 APScheduler"""
-    scheduler = AsyncIOScheduler(timezone=str(settings.TIMEZONE)) # 从配置读取时区
-    # 添加定时任务，例如每小时执行一次 (可以调整)
-    scheduler.add_job(check_failed_keys, 'interval', hours=settings.CHECK_INTERVAL_HOURS)
-    scheduler.start()
-    logger.info(f"Scheduler started. Key check job scheduled to run every {settings.CHECK_INTERVAL_HOURS} hour(s).")
-    return scheduler
-
-# 可以在这里添加一个全局的 scheduler 实例，以便在应用关闭时优雅地停止
-scheduler_instance = None
-
-def start_scheduler():
-    global scheduler_instance
-    if scheduler_instance is None:
-        scheduler_instance = setup_scheduler()
-
-def stop_scheduler():
-    global scheduler_instance
-    if scheduler_instance and scheduler_instance.running:
-        scheduler_instance.shutdown()
-        logger.info("Scheduler stopped.")

app/scheduler/scheduled_tasks.py

@@ -0,0 +1,162 @@
+
+from apscheduler.schedulers.asyncio import AsyncIOScheduler
+
+from app.config.config import settings
+from app.domain.gemini_models import GeminiContent, GeminiRequest
+from app.log.logger import Logger
+from app.service.chat.gemini_chat_service import GeminiChatService
+from app.service.error_log.error_log_service import delete_old_error_logs
+from app.service.key.key_manager import get_key_manager_instance
+from app.service.request_log.request_log_service import delete_old_request_logs_task
+
+logger = Logger.setup_logger("scheduler")
+
+
+async def check_failed_keys():
+    """
+    定时检查失败次数大于0的API密钥，并尝试验证它们。
+    如果验证成功，重置失败计数；如果失败，增加失败计数。
+    """
+    logger.info("Starting scheduled check for failed API keys...")
+    try:
+        key_manager = await get_key_manager_instance()
+        # 确保 KeyManager 已经初始化
+        if not key_manager or not hasattr(key_manager, "key_failure_counts"):
+            logger.warning(
+                "KeyManager instance not available or not initialized. Skipping check."
+            )
+            return
+
+        # 创建 GeminiChatService 实例用于验证
+        # 注意：这里直接创建实例，而不是通过依赖注入，因为这是后台任务
+        chat_service = GeminiChatService(settings.BASE_URL, key_manager)
+
+        # 获取需要检查的 key 列表 (失败次数 > 0)
+        keys_to_check = []
+        async with key_manager.failure_count_lock:  # 访问共享数据需要加锁
+            # 复制一份以避免在迭代时修改字典
+            failure_counts_copy = key_manager.key_failure_counts.copy()
+            keys_to_check = [
+                key for key, count in failure_counts_copy.items() if count > 0
+            ]  # 检查所有失败次数大于0的key
+
+        if not keys_to_check:
+            logger.info("No keys with failure count > 0 found. Skipping verification.")
+            return
+
+        logger.info(
+            f"Found {len(keys_to_check)} keys with failure count > 0 to verify."
+        )
+
+        for key in keys_to_check:
+            # 隐藏部分 key 用于日志记录
+            log_key = f"{key[:4]}...{key[-4:]}" if len(key) > 8 else key
+            logger.info(f"Verifying key: {log_key}...")
+            try:
+                # 构造测试请求
+                gemini_request = GeminiRequest(
+                    contents=[
+                        GeminiContent(
+                            role="user",
+                            parts=[{"text": "hi"}],  # 使用简单的文本进行验证
+                        )
+                    ]
+                )
+                # 调用 generate_content 进行验证
+                await chat_service.generate_content(
+                    settings.TEST_MODEL, gemini_request, key  # 使用配置中定义的测试模型
+                )
+                # 如果没有抛出异常，说明 key 有效
+                logger.info(
+                    f"Key {log_key} verification successful. Resetting failure count."
+                )
+                await key_manager.reset_key_failure_count(key)
+            except Exception as e:
+                # 验证失败，增加失败计数
+                logger.warning(
+                    f"Key {log_key} verification failed: {str(e)}. Incrementing failure count."
+                )
+                # 直接操作计数器，需要加锁
+                async with key_manager.failure_count_lock:
+                    # 再次检查 key 是否存在且失败次数未达上限
+                    if (
+                        key in key_manager.key_failure_counts
+                        and key_manager.key_failure_counts[key]
+                        < key_manager.MAX_FAILURES
+                    ):
+                        key_manager.key_failure_counts[key] += 1
+                        logger.info(
+                            f"Failure count for key {log_key} incremented to {key_manager.key_failure_counts[key]}."
+                        )
+                    elif key in key_manager.key_failure_counts:
+                        logger.warning(
+                            f"Key {log_key} reached MAX_FAILURES ({key_manager.MAX_FAILURES}). Not incrementing further."
+                        )
+
+    except Exception as e:
+        logger.error(
+            f"An error occurred during the scheduled key check: {str(e)}", exc_info=True
+        )
+
+
+def setup_scheduler():
+    """设置并启动 APScheduler"""
+    scheduler = AsyncIOScheduler(timezone=str(settings.TIMEZONE))  # 从配置读取时区
+    # 添加检查失败密钥的定时任务
+    scheduler.add_job(
+        check_failed_keys,
+        "interval",
+        hours=settings.CHECK_INTERVAL_HOURS,
+        id="check_failed_keys_job",
+        name="Check Failed API Keys",
+    )
+    logger.info(
+        f"Key check job scheduled to run every {settings.CHECK_INTERVAL_HOURS} hour(s)."
+    )
+
+    # 新增：添加自动删除错误日志的定时任务，每天凌晨3点执行
+    scheduler.add_job(
+        delete_old_error_logs,
+        "cron",
+        hour=3,
+        minute=0,
+        id="delete_old_error_logs_job",
+        name="Delete Old Error Logs",
+    )
+    logger.info("Auto-delete error logs job scheduled to run daily at 3:00 AM.")
+
+    # 新增：添加自动删除请求日志的定时任务，每天凌晨3点05分执行
+    scheduler.add_job(
+        delete_old_request_logs_task,
+        "cron",
+        hour=3,
+        minute=5,
+        id="delete_old_request_logs_job",
+        name="Delete Old Request Logs",
+    )
+    logger.info(
+        f"Auto-delete request logs job scheduled to run daily at 3:05 AM, if enabled and AUTO_DELETE_REQUEST_LOGS_DAYS is set to {settings.AUTO_DELETE_REQUEST_LOGS_DAYS} days."
+    )
+
+    scheduler.start()
+    logger.info("Scheduler started with all jobs.")
+    return scheduler
+
+
+# 可以在这里添加一个全局的 scheduler 实例，以便在应用关闭时优雅地停止
+scheduler_instance = None
+
+
+def start_scheduler():
+    global scheduler_instance
+    if scheduler_instance is None or not scheduler_instance.running:
+        logger.info("Starting scheduler...")
+        scheduler_instance = setup_scheduler()
+    logger.info("Scheduler is already running.")
+
+
+def stop_scheduler():
+    global scheduler_instance
+    if scheduler_instance and scheduler_instance.running:
+        scheduler_instance.shutdown()
+        logger.info("Scheduler stopped.")

app/service/chat/gemini_chat_service.py

@@ -2,17 +2,18 @@
 
 import json
 import re
-import datetime # Add datetime import
+import datetime
-import time # Add time import
+import time
 from typing import Any, AsyncGenerator, Dict, List
 from app.config.config import settings
+from app.core.constants import GEMINI_2_FLASH_EXP_SAFETY_SETTINGS
 from app.domain.gemini_models import GeminiRequest
 from app.handler.response_handler import GeminiResponseHandler
 from app.handler.stream_optimizer import gemini_optimizer
 from app.log.logger import get_gemini_logger
 from app.service.client.api_client import GeminiApiClient
 from app.service.key.key_manager import KeyManager
-from app.database.services import add_error_log, add_request_log # Import add_request_log
+from app.database.services import add_error_log, add_request_log
 
 logger = get_gemini_logger()
 
@@ -73,20 +74,8 @@ def _build_tools(model: str, payload: Dict[str, Any]) -> List[Dict[str, Any]]:
 def _get_safety_settings(model: str) -> List[Dict[str, str]]:
     """获取安全设置"""
     if model == "gemini-2.0-flash-exp":
-        return [
+        return GEMINI_2_FLASH_EXP_SAFETY_SETTINGS
-            {"category": "HARM_CATEGORY_HARASSMENT", "threshold": "OFF"},
+    return settings.SAFETY_SETTINGS
-            {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "OFF"},
-            {"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", "threshold": "OFF"},
-            {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "OFF"},
-            {"category": "HARM_CATEGORY_CIVIC_INTEGRITY", "threshold": "OFF"},
-        ]
-    return [
-        {"category": "HARM_CATEGORY_HARASSMENT", "threshold": "BLOCK_NONE"},
-        {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "BLOCK_NONE"},
-        {"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", "threshold": "BLOCK_NONE"},
-        {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "BLOCK_NONE"},
-        {"category": "HARM_CATEGORY_CIVIC_INTEGRITY", "threshold": "BLOCK_NONE"},
-    ]
 
 
 def _build_payload(model: str, request: GeminiRequest) -> Dict[str, Any]:
@@ -101,13 +90,19 @@ def _build_payload(model: str, request: GeminiRequest) -> Dict[str, Any]:
         "contents": request_dict.get("contents", []),
         "tools": _build_tools(model, request_dict),
         "safetySettings": _get_safety_settings(model),
-        "generationConfig": request_dict.get("generationConfig", {}),
+        "generationConfig": request_dict.get("generationConfig"),
-        "systemInstruction": request_dict.get("systemInstruction", ""),
+        "systemInstruction": request_dict.get("systemInstruction"),
     }
 
     if model.endswith("-image") or model.endswith("-image-generation"):
         payload.pop("systemInstruction")
         payload["generationConfig"]["responseModalities"] = ["Text", "Image"]
+        
+    if model.endswith("-non-thinking"):
+        payload["generationConfig"]["thinkingConfig"] = {"thinkingBudget": 0} 
+    if model in settings.THINKING_BUDGET_MAP:
+        payload["generationConfig"]["thinkingConfig"] = {"thinkingBudget": settings.THINKING_BUDGET_MAP.get(model,1000)}
+
     return payload
 
 
@@ -156,10 +151,6 @@ class GeminiChatService:
 
         try:
             response = await self.api_client.generate_content(payload, model, api_key)
-            # Assuming success if no exception is raised and response is received
-            # The actual status code might be within the response structure or headers,
-            # but api_client doesn't seem to expose it directly here.
-            # We'll assume 200 for success if no exception.
             is_success = True
             status_code = 200 # Assume 200 on success
             return self.response_handler.handle_response(response, model, stream=False)
@@ -178,7 +169,7 @@ class GeminiChatService:
             await add_error_log(
                 gemini_key=api_key,
                 model_name=model,
-                error_type="gemini_chat_service",
+                error_type="gemini-chat-non-stream",
                 error_log=error_log_msg,
                 error_code=status_code,
                 request_msg=payload
@@ -204,96 +195,90 @@ class GeminiChatService:
         retries = 0
         max_retries = settings.MAX_RETRIES
         payload = _build_payload(model, request)
-        start_time = time.perf_counter() # Record start time before loop
-        request_datetime = datetime.datetime.now()
         is_success = False
         status_code = None
-        final_api_key = api_key # Store the initial key
+        final_api_key = api_key
 
-        try:
+        while retries < max_retries:
-            while retries < max_retries:
+            request_datetime = datetime.datetime.now()
-                current_attempt_key = api_key # Key used for this attempt
+            start_time = time.perf_counter()
-                final_api_key = current_attempt_key # Update final key used
+            current_attempt_key = api_key
-                try:
+            final_api_key = current_attempt_key # Update final key used
-                    async for line in self.api_client.stream_generate_content(
+            try:
-                        payload, model, current_attempt_key
+                async for line in self.api_client.stream_generate_content(
-                    ):
+                    payload, model, current_attempt_key
-                        # print(line)
+                ):
-                        if line.startswith("data:"):
+                    # print(line)
-                            line = line[6:]
+                    if line.startswith("data:"):
-                            response_data = self.response_handler.handle_response(
+                        line = line[6:]
-                                json.loads(line), model, stream=True
+                        response_data = self.response_handler.handle_response(
-                            )
+                            json.loads(line), model, stream=True
-                            text = self._extract_text_from_response(response_data)
-                            # 如果有文本内容，且开启了流式输出优化器，则使用流式输出优化器处理
-                            if text and settings.STREAM_OPTIMIZER_ENABLED:
-                                # 使用流式输出优化器处理文本输出
-                                async for (
-                                    optimized_chunk
-                                ) in gemini_optimizer.optimize_stream_output(
-                                    text,
-                                    lambda t: self._create_char_response(response_data, t),
-                                    lambda c: "data: " + json.dumps(c) + "\n\n",
-                                ):
-                                    yield optimized_chunk
-                            else:
-                                # 如果没有文本内容（如工具调用等），整块输出
-                                yield "data: " + json.dumps(response_data) + "\n\n"
-                    logger.info("Streaming completed successfully")
-                    is_success = True
-                    status_code = 200 # Assume 200 on success
-                    break # Exit loop on success
-                except Exception as e:
-                    retries += 1
-                    is_success = False # Mark as failed for this attempt
-                    error_log_msg = str(e)
-                    logger.warning(
-                        f"Streaming API call failed with error: {error_log_msg}. Attempt {retries} of {max_retries}"
-                    )
-                    # Parse error code for logging
-                    match = re.search(r"status code (\d+)", error_log_msg)
-                    if match:
-                        status_code = int(match.group(1))
-                    else:
-                        status_code = 500 # Default if parsing fails
-
-                    # Log error to error log table
-                    await add_error_log(
-                        gemini_key=current_attempt_key, # Log key used for this failed attempt
-                        model_name=model,
-                        error_log=error_log_msg,
-                        error_code=status_code,
-                        request_msg=payload
-                    )
-
-                    # Attempt to switch API Key
-                    api_key = await self.key_manager.handle_api_failure(current_attempt_key, retries)
-                    if api_key:
-                        logger.info(f"Switched to new API key: {api_key}")
-                    else: # No more keys or retries exceeded by handle_api_failure logic
-                         logger.error(f"No valid API key available after {retries} retries.")
-                         break # Exit loop if no key available
-
-                    if retries >= max_retries:
-                        logger.error(
-                            f"Max retries ({max_retries}) reached for streaming."
                         )
-                        break # Exit loop after max retries
+                        text = self._extract_text_from_response(response_data)
-        finally:
+                        # 如果有文本内容，且开启了流式输出优化器，则使用流式输出优化器处理
-            # Log the final outcome of the streaming request
+                        if text and settings.STREAM_OPTIMIZER_ENABLED:
-            end_time = time.perf_counter()
+                            # 使用流式输出优化器处理文本输出
-            latency_ms = int((end_time - start_time) * 1000)
+                            async for (
-            await add_request_log(
+                                optimized_chunk
-                model_name=model,
+                            ) in gemini_optimizer.optimize_stream_output(
-                api_key=final_api_key, # Log the last key used
+                                text,
-                is_success=is_success, # Log the final success status
+                                lambda t: self._create_char_response(response_data, t),
-                status_code=status_code, # Log the last known status code
+                                lambda c: "data: " + json.dumps(c) + "\n\n",
-                latency_ms=latency_ms, # Log total time including retries
+                            ):
-                request_time=request_datetime
+                                yield optimized_chunk
-            )
+                        else:
-            # If the loop finished due to failure, ensure an exception is raised if not already handled
+                            # 如果没有文本内容（如工具调用等），整块输出
-            if not is_success and retries >= max_retries:
+                            yield "data: " + json.dumps(response_data) + "\n\n"
-                 # We need to raise an exception here if the loop exited due to max retries failure
+                logger.info("Streaming completed successfully")
-                 # However, the original code structure doesn't explicitly raise here after the loop.
+                is_success = True
-                 # For now, we just log. Consider raising HTTPException if needed.
+                status_code = 200
-                 pass
+                break
+            except Exception as e:
+                retries += 1
+                is_success = False
+                error_log_msg = str(e)
+                logger.warning(
+                    f"Streaming API call failed with error: {error_log_msg}. Attempt {retries} of {max_retries}"
+                )
+                # Parse error code for logging
+                match = re.search(r"status code (\d+)", error_log_msg)
+                if match:
+                    status_code = int(match.group(1))
+                else:
+                    status_code = 500
+
+                # Log error to error log table
+                await add_error_log(
+                    gemini_key=current_attempt_key, # Log key used for this failed attempt
+                    model_name=model,
+                    error_type="gemini-chat-stream",
+                    error_log=error_log_msg,
+                    error_code=status_code,
+                    request_msg=payload
+                )
+
+                # Attempt to switch API Key
+                api_key = await self.key_manager.handle_api_failure(current_attempt_key, retries)
+                if api_key:
+                    logger.info(f"Switched to new API key: {api_key}")
+                else: # No more keys or retries exceeded by handle_api_failure logic
+                        logger.error(f"No valid API key available after {retries} retries.")
+                        break # Exit loop if no key available
+
+                if retries >= max_retries:
+                    logger.error(
+                        f"Max retries ({max_retries}) reached for streaming."
+                    )
+                    break # Exit loop after max retries
+            finally:
+                # Log the final outcome of the streaming request
+                end_time = time.perf_counter()
+                latency_ms = int((end_time - start_time) * 1000)
+                await add_request_log(
+                    model_name=model,
+                    api_key=final_api_key, # Log the last key used
+                    is_success=is_success, # Log the final success status
+                    status_code=status_code, # Log the last known status code
+                    latency_ms=latency_ms, # Log total time including retries
+                    request_time=request_datetime
+                )

app/service/chat/openai_chat_service.py

@@ -1,13 +1,19 @@
 # app/services/chat_service.py
 
+import asyncio
+import datetime
 import json
 import re
-import datetime # Add datetime import
+import time
-import time # Add time import
 from copy import deepcopy
 from typing import Any, AsyncGenerator, Dict, List, Optional, Union
 
 from app.config.config import settings
+from app.core.constants import GEMINI_2_FLASH_EXP_SAFETY_SETTINGS
+from app.database.services import (
+    add_error_log,
+    add_request_log,
+)
 from app.domain.openai_models import ChatRequest, ImageGenerationRequest
 from app.handler.message_converter import OpenAIMessageConverter
 from app.handler.response_handler import OpenAIResponseHandler
@@ -16,17 +22,16 @@ from app.log.logger import get_openai_logger
 from app.service.client.api_client import GeminiApiClient
 from app.service.image.image_create_service import ImageCreateService
 from app.service.key.key_manager import KeyManager
-from app.database.services import add_error_log, add_request_log # Import add_request_log
 
 logger = get_openai_logger()
 
 
-def _has_image_parts(contents: List[Dict[str, Any]]) -> bool:
+def _has_media_parts(contents: List[Dict[str, Any]]) -> bool:
-    """判断消息是否包含图片部分"""
+    """判断消息是否包含图片、音频或视频部分 (inline_data)"""
     for content in contents:
-        if "parts" in content:
+        if content and "parts" in content and isinstance(content["parts"], list):
             for part in content["parts"]:
-                if "image_url" in part or "inline_data" in part:
+                if isinstance(part, dict) and "inline_data" in part:
                     return True
     return False
 
@@ -46,9 +51,13 @@ def _build_tools(
             or model.endswith("-image")
             or model.endswith("-image-generation")
         )
-        and not _has_image_parts(messages)
+        and not _has_media_parts(messages)  # Use the updated check
     ):
         tool["codeExecution"] = {}
+        logger.debug("Code execution tool enabled.")
+    elif _has_media_parts(messages):
+        logger.debug("Code execution tool disabled due to media parts presence.")
+
     if model.endswith("-search"):
         tool["googleSearch"] = {}
 
@@ -62,7 +71,9 @@ def _build_tools(
             if item.get("type", "") == "function" and item.get("function"):
                 function = deepcopy(item.get("function"))
                 parameters = function.get("parameters", {})
-                if parameters.get("type") == "object" and not parameters.get("properties", {}):
+                if parameters.get("type") == "object" and not parameters.get(
+                    "properties", {}
+                ):
                     function.pop("parameters", None)
 
                 function_declarations.append(function)
@@ -93,20 +104,8 @@ def _get_safety_settings(model: str) -> List[Dict[str, str]]:
     #     and "gemini-2.0-pro-exp" not in model
     # ):
     if model == "gemini-2.0-flash-exp":
-        return [
+        return GEMINI_2_FLASH_EXP_SAFETY_SETTINGS
-            {"category": "HARM_CATEGORY_HARASSMENT", "threshold": "OFF"},
+    return settings.SAFETY_SETTINGS
-            {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "OFF"},
-            {"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", "threshold": "OFF"},
-            {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "OFF"},
-            {"category": "HARM_CATEGORY_CIVIC_INTEGRITY", "threshold": "OFF"},
-        ]
-    return [
-        {"category": "HARM_CATEGORY_HARASSMENT", "threshold": "BLOCK_NONE"},
-        {"category": "HARM_CATEGORY_HATE_SPEECH", "threshold": "BLOCK_NONE"},
-        {"category": "HARM_CATEGORY_SEXUALLY_EXPLICIT", "threshold": "BLOCK_NONE"},
-        {"category": "HARM_CATEGORY_DANGEROUS_CONTENT", "threshold": "BLOCK_NONE"},
-        {"category": "HARM_CATEGORY_CIVIC_INTEGRITY", "threshold": "BLOCK_NONE"},
-    ]
 
 
 def _build_payload(
@@ -130,6 +129,12 @@ def _build_payload(
         payload["generationConfig"]["maxOutputTokens"] = request.max_tokens
     if request.model.endswith("-image") or request.model.endswith("-image-generation"):
         payload["generationConfig"]["responseModalities"] = ["Text", "Image"]
+    if request.model.endswith("-non-thinking"):
+        payload["generationConfig"]["thinkingConfig"] = {"thinkingBudget": 0}
+    if request.model in settings.THINKING_BUDGET_MAP:
+        payload["generationConfig"]["thinkingConfig"] = {
+            "thinkingBudget": settings.THINKING_BUDGET_MAP.get(request.model, 1000)
+        }
 
     if (
         instruction
@@ -200,10 +205,15 @@ class OpenAIChatService:
         response = None
         try:
             response = await self.api_client.generate_content(payload, model, api_key)
+            usage_metadata = response.get("usageMetadata", {})
             is_success = True
-            status_code = 200 # Assume 200 on success
+            status_code = 200
             return self.response_handler.handle_response(
-                response, model, stream=False, finish_reason="stop"
+                response,
+                model,
+                stream=False,
+                finish_reason="stop",
+                usage_metadata=usage_metadata,
             )
         except Exception as e:
             is_success = False
@@ -214,17 +224,17 @@ class OpenAIChatService:
             if match:
                 status_code = int(match.group(1))
             else:
-                status_code = 500 # Default if parsing fails
+                status_code = 500
 
             await add_error_log(
-                gemini_key=api_key, # Note: Parameter name is gemini_key in add_error_log
+                gemini_key=api_key,
                 model_name=model,
-                error_type="openai_chat_service", # Indicate service type
+                error_type="openai-chat-non-stream",
                 error_log=error_log_msg,
                 error_code=status_code,
-                request_msg=payload
+                request_msg=payload,
             )
-            raise e # Re-throw exception
+            raise e
         finally:
             end_time = time.perf_counter()
             latency_ms = int((end_time - start_time) * 1000)
@@ -234,127 +244,232 @@ class OpenAIChatService:
                 is_success=is_success,
                 status_code=status_code,
                 latency_ms=latency_ms,
-                request_time=request_datetime
+                request_time=request_datetime,
             )
 
+    async def _fake_stream_logic_impl(
+        self, model: str, payload: Dict[str, Any], api_key: str
+    ) -> AsyncGenerator[str, None]:
+        """处理伪流式 (fake stream) 的核心逻辑"""
+        logger.info(
+            f"Fake streaming enabled for model: {model}. Calling non-streaming endpoint."
+        )
+        keep_sending_empty_data = True
+
+        async def send_empty_data_locally() -> AsyncGenerator[str, None]:
+            """定期发送空数据以保持连接"""
+            while keep_sending_empty_data:
+                await asyncio.sleep(settings.FAKE_STREAM_EMPTY_DATA_INTERVAL_SECONDS)
+                if keep_sending_empty_data:
+                    empty_chunk = self.response_handler.handle_response({}, model, stream=True, finish_reason='stop', usage_metadata=None)
+                    yield f"data: {json.dumps(empty_chunk)}\n\n"
+                    logger.debug("Sent empty data chunk for fake stream heartbeat.")
+
+        empty_data_generator = send_empty_data_locally()
+        api_response_task = asyncio.create_task(
+            self.api_client.generate_content(payload, model, api_key)
+        )
+
+        try:
+            while not api_response_task.done():
+                try:
+                    next_empty_chunk = await asyncio.wait_for(
+                        empty_data_generator.__anext__(), timeout=0.1
+                    )
+                    yield next_empty_chunk
+                except asyncio.TimeoutError:
+                    pass
+                except (
+                    StopAsyncIteration
+                ):
+                    break
+
+            response = await api_response_task
+        finally:
+            keep_sending_empty_data = False
+
+        if response and response.get("candidates"):
+            response = self.response_handler.handle_response(response, model, stream=True, finish_reason='stop', usage_metadata=response.get("usageMetadata", {}))
+            yield f"data: {json.dumps(response)}\n\n"
+            logger.info(f"Sent full response content for fake stream: {model}")
+        else:
+            error_message = "Failed to get response from model"
+            if (
+                response and isinstance(response, dict) and response.get("error")
+            ):
+                error_details = response.get("error")
+                if isinstance(error_details, dict):
+                    error_message = error_details.get("message", error_message)
+
+            logger.error(
+                f"No candidates or error in response for fake stream model {model}: {response}"
+            )
+            error_chunk = self.response_handler.handle_response({}, model, stream=True, finish_reason='stop', usage_metadata=None)
+            yield f"data: {json.dumps(error_chunk)}\n\n"
+
+    async def _real_stream_logic_impl(
+        self, model: str, payload: Dict[str, Any], api_key: str
+    ) -> AsyncGenerator[str, None]:
+        """处理真实流式 (real stream) 的核心逻辑"""
+        tool_call_flag = False
+        usage_metadata = None
+        async for line in self.api_client.stream_generate_content(
+            payload, model, api_key
+        ):
+            if line.startswith("data:"):
+                chunk_str = line[6:]
+                if not chunk_str or chunk_str.isspace():
+                    logger.debug(
+                        f"Received empty data line for model {model}, skipping."
+                    )
+                    continue
+                try:
+                    chunk = json.loads(chunk_str)
+                    usage_metadata = chunk.get("usageMetadata", {})
+                except json.JSONDecodeError:
+                    logger.error(
+                        f"Failed to decode JSON from stream for model {model}: {chunk_str}"
+                    )
+                    continue
+                openai_chunk = self.response_handler.handle_response(
+                    chunk, model, stream=True, finish_reason=None, usage_metadata=usage_metadata
+                )
+                if openai_chunk:
+                    text = self._extract_text_from_openai_chunk(openai_chunk)
+                    if text and settings.STREAM_OPTIMIZER_ENABLED:
+                        async for (
+                            optimized_chunk_data
+                        ) in openai_optimizer.optimize_stream_output(
+                            text,
+                            lambda t: self._create_char_openai_chunk(openai_chunk, t),
+                            lambda c: f"data: {json.dumps(c)}\n\n",
+                        ):
+                            yield optimized_chunk_data
+                    else:
+                        if openai_chunk.get("choices") and openai_chunk["choices"][0].get("delta", {}).get("tool_calls"):
+                            tool_call_flag = True
+
+                        yield f"data: {json.dumps(openai_chunk)}\n\n"
+
+        if tool_call_flag:
+            yield f"data: {json.dumps(self.response_handler.handle_response({}, model, stream=True, finish_reason='tool_calls', usage_metadata=usage_metadata))}\n\n"
+        else:
+            yield f"data: {json.dumps(self.response_handler.handle_response({}, model, stream=True, finish_reason='stop', usage_metadata=usage_metadata))}\n\n"
+
     async def _handle_stream_completion(
         self, model: str, payload: Dict[str, Any], api_key: str
     ) -> AsyncGenerator[str, None]:
-        """处理流式聊天完成，添加重试逻辑"""
+        """处理流式聊天完成，添加重试逻辑和假流式支持"""
         retries = 0
         max_retries = settings.MAX_RETRIES
-        start_time = time.perf_counter() # Record start time before loop
-        request_datetime = datetime.datetime.now()
         is_success = False
         status_code = None
-        final_api_key = api_key # Store the initial key
+        final_api_key = api_key
 
-        try:
+        while retries < max_retries:
-            while retries < max_retries:
+            start_time = time.perf_counter()
-                current_attempt_key = api_key # Key used for this attempt
+            request_datetime = datetime.datetime.now()
-                final_api_key = current_attempt_key # Update final key used
+            current_attempt_key = final_api_key
-                try:
+
-                    tool_call_flag = False
+            try:
-                    async for line in self.api_client.stream_generate_content(
+                stream_generator = None
-                        payload, model, current_attempt_key
+                if settings.FAKE_STREAM_ENABLED:
-                    ):
+                    logger.info(
-                        # print(line)
+                        f"Using fake stream logic for model: {model}, Attempt: {retries + 1}"
-                        if line.startswith("data:"):
-                            chunk = json.loads(line[6:])
-                            openai_chunk = self.response_handler.handle_response(
-                                chunk, model, stream=True, finish_reason=None
-                            )
-                            if openai_chunk:
-                                # 提取文本内容
-                                text = self._extract_text_from_openai_chunk(openai_chunk)
-                                if text and settings.STREAM_OPTIMIZER_ENABLED:
-                                    # 使用流式输出优化器处理文本输出
-                                    async for (
-                                        optimized_chunk
-                                    ) in openai_optimizer.optimize_stream_output(
-                                        text,
-                                        lambda t: self._create_char_openai_chunk(
-                                            openai_chunk, t
-                                        ),
-                                        lambda c: f"data: {json.dumps(c)}\n\n",
-                                    ):
-                                        yield optimized_chunk
-                                else:
-                                    # 如果没有文本内容（如工具调用等），整块输出
-                                    if "tool_calls" in json.dumps(openai_chunk):
-                                        tool_call_flag = True
-                                    yield f"data: {json.dumps(openai_chunk)}\n\n"
-                    if tool_call_flag:
-                        yield f"data: {json.dumps(self.response_handler.handle_response({}, model, stream=True, finish_reason='tool_calls'))}\n\n"
-                    else:
-                        yield f"data: {json.dumps(self.response_handler.handle_response({}, model, stream=True, finish_reason='stop'))}\n\n"
-                    yield "data: [DONE]\n\n"
-                    logger.info("Streaming completed successfully")
-                    is_success = True
-                    status_code = 200 # Assume 200 on success
-                    break  # 成功后退出循环
-                except Exception as e:
-                    retries += 1
-                    is_success = False # Mark as failed for this attempt
-                    error_log_msg = str(e)
-                    logger.warning(
-                        f"Streaming API call failed with error: {error_log_msg}. Attempt {retries} of {max_retries}"
                     )
-                    # Parse error code for logging
+                    stream_generator = self._fake_stream_logic_impl(
-                    match = re.search(r"status code (\d+)", error_log_msg)
+                        model, payload, current_attempt_key
-                    if match:
+                    )
-                        status_code = int(match.group(1))
+                else:
-                    else:
+                    logger.info(
-                        status_code = 500 # Default if parsing fails
+                        f"Using real stream logic for model: {model}, Attempt: {retries + 1}"
-
+                    )
-                    # Log error to error log table
+                    stream_generator = self._real_stream_logic_impl(
-                    await add_error_log(
+                        model, payload, current_attempt_key
-                        gemini_key=current_attempt_key, # Note: Parameter name is gemini_key
-                        model_name=model,
-                        error_type="openai_chat_service", # Indicate service type
-                        error_log=error_log_msg,
-                        error_code=status_code,
-                        request_msg=payload
                     )
 
-                    # Attempt to switch API Key
+                async for chunk_data in stream_generator:
-                    # Ensure key_manager is available (might need adjustment if not always passed)
+                    yield chunk_data
-                    if self.key_manager:
-                        api_key = await self.key_manager.handle_api_failure(current_attempt_key, retries)
-                        if api_key:
-                            logger.info(f"Switched to new API key: {api_key}")
-                        else:
-                            logger.error(f"No valid API key available after {retries} retries.")
-                            break # Exit loop if no key available
-                    else:
-                         logger.error("KeyManager not available for retry logic.")
-                         break # Exit loop if key manager is missing
 
-                    if retries >= max_retries:
+                yield "data: [DONE]\n\n"
-                        logger.error(
+                logger.info(
-                            f"Max retries ({max_retries}) reached for streaming."
+                    f"Streaming completed successfully for model: {model}, FakeStream: {settings.FAKE_STREAM_ENABLED}, Attempt: {retries + 1}"
+                )
+                is_success = True
+                status_code = 200
+                break
+
+            except Exception as e:
+                retries += 1
+                is_success = False
+                error_log_msg = str(e)
+                logger.warning(
+                    f"Streaming API call failed with error: {error_log_msg}. Attempt {retries} of {max_retries} with key {current_attempt_key}"
+                )
+
+                match = re.search(r"status code (\\d+)", error_log_msg)
+                if match:
+                    status_code = int(match.group(1))
+                else:
+                    if isinstance(e, asyncio.TimeoutError):
+                        status_code = 408
+                    else:
+                        status_code = 500
+
+                await add_error_log(
+                    gemini_key=current_attempt_key,
+                    model_name=model,
+                    error_type="openai-chat-stream",
+                    error_log=error_log_msg,
+                    error_code=status_code,
+                    request_msg=payload,
+                )
+
+                if self.key_manager:
+                    new_api_key = await self.key_manager.handle_api_failure(
+                        current_attempt_key, retries
+                    )
+                    if new_api_key and new_api_key != current_attempt_key:
+                        final_api_key = new_api_key
+                        logger.info(
+                            f"Switched to new API key for next attempt: {final_api_key}"
                         )
-                        break # Exit loop after max retries
+                    elif not new_api_key:
-        finally:
+                        logger.error(
-            # Log the final outcome of the streaming request
+                            f"No valid API key available after {retries} retries, ceasing attempts for this request."
-            end_time = time.perf_counter()
+                        )
-            latency_ms = int((end_time - start_time) * 1000)
+                        break
-            await add_request_log(
+                else:
-                model_name=model,
+                    logger.error(
-                api_key=final_api_key, # Log the last key used
+                        "KeyManager not available, cannot switch API key. Ceasing attempts for this request."
-                is_success=is_success, # Log the final success status
+                    )
-                status_code=status_code, # Log the last known status code
+                    break
-                latency_ms=latency_ms, # Log total time including retries
+
-                request_time=request_datetime
+                if retries >= max_retries:
+                    logger.error(
+                        f"Max retries ({max_retries}) reached for streaming model {model}."
+                    )
+            finally:
+                end_time = time.perf_counter()
+                latency_ms = int((end_time - start_time) * 1000)
+                await add_request_log(
+                    model_name=model,
+                    api_key=current_attempt_key,
+                    is_success=is_success,
+                    status_code=status_code,
+                    latency_ms=latency_ms,
+                    request_time=request_datetime,
+                )
+
+        if not is_success:
+            logger.error(
+                f"Streaming failed permanently for model {model} after {retries} attempts."
             )
-            # If the loop finished due to failure, yield error and DONE
+            yield f"data: {json.dumps({'error': f'Streaming failed after {retries} retries.'})}\n\n"
-            if not is_success and retries >= max_retries:
+            yield "data: [DONE]\n\n"
-                 yield f"data: {json.dumps({'error': 'Streaming failed after retries'})}\n\n"
-                 yield "data: [DONE]\n\n"
 
     async def create_image_chat_completion(
-        self,
+        self, request: ChatRequest, api_key: str
-        request: ChatRequest,
     ) -> Union[Dict[str, Any], AsyncGenerator[str, None]]:
 
         image_generate_request = ImageGenerationRequest()
@@ -364,41 +479,127 @@ class OpenAIChatService:
         )
 
         if request.stream:
-            return self._handle_stream_image_completion(request.model, image_res)
+            return self._handle_stream_image_completion(
+                request.model, image_res, api_key
+            )
         else:
-            return self._handle_normal_image_completion(request.model, image_res)
+            return await self._handle_normal_image_completion(
+                request.model, image_res, api_key
+            )
 
     async def _handle_stream_image_completion(
-        self, model: str, image_data: str
+        self, model: str, image_data: str, api_key: str
     ) -> AsyncGenerator[str, None]:
-        if image_data:
+        logger.info(f"Starting stream image completion for model: {model}")
-            openai_chunk = self.response_handler.handle_image_chat_response(
+        start_time = time.perf_counter()
-                image_data, model, stream=True, finish_reason=None
+        request_datetime = datetime.datetime.now()
+        is_success = False
+        status_code = None
+
+        try:
+            if image_data:
+                openai_chunk = self.response_handler.handle_image_chat_response(
+                    image_data, model, stream=True, finish_reason=None
+                )
+                if openai_chunk:
+                    # 提取文本内容
+                    text = self._extract_text_from_openai_chunk(openai_chunk)
+                    if text:
+                        # 使用流式输出优化器处理文本输出
+                        async for (
+                            optimized_chunk
+                        ) in openai_optimizer.optimize_stream_output(
+                            text,
+                            lambda t: self._create_char_openai_chunk(openai_chunk, t),
+                            lambda c: f"data: {json.dumps(c)}\n\n",
+                        ):
+                            yield optimized_chunk
+                    else:
+                        # 如果没有文本内容（如图片URL等），整块输出
+                        yield f"data: {json.dumps(openai_chunk)}\n\n"
+            yield f"data: {json.dumps(self.response_handler.handle_response({}, model, stream=True, finish_reason='stop'))}\n\n"
+            logger.info(
+                f"Stream image completion finished successfully for model: {model}"
+            )
+            is_success = True
+            status_code = 200
+            yield "data: [DONE]\n\n"
+        except Exception as e:
+            is_success = False
+            error_log_msg = f"Stream image completion failed for model {model}: {e}"
+            logger.error(error_log_msg)
+            status_code = 500
+            await add_error_log(
+                gemini_key=api_key,
+                model_name=model,
+                error_type="openai-image-stream",
+                error_log=error_log_msg,
+                error_code=status_code,
+                request_msg={"image_data_truncated": image_data[:1000]},
+            )
+            yield f"data: {json.dumps({'error': error_log_msg})}\n\n"
+            yield "data: [DONE]\n\n"
+        finally:
+            end_time = time.perf_counter()
+            latency_ms = int((end_time - start_time) * 1000)
+            logger.info(
+                f"Stream image completion for model {model} took {latency_ms} ms. Success: {is_success}"
+            )
+            await add_request_log(
+                model_name=model,
+                api_key=api_key,
+                is_success=is_success,
+                status_code=status_code,
+                latency_ms=latency_ms,
+                request_time=request_datetime,
             )
-            if openai_chunk:
-                # 提取文本内容
-                text = self._extract_text_from_openai_chunk(openai_chunk)
-                if text:
-                    # 使用流式输出优化器处理文本输出
-                    async for (
-                        optimized_chunk
-                    ) in openai_optimizer.optimize_stream_output(
-                        text,
-                        lambda t: self._create_char_openai_chunk(openai_chunk, t),
-                        lambda c: f"data: {json.dumps(c)}\n\n",
-                    ):
-                        yield optimized_chunk
-                else:
-                    # 如果没有文本内容（如图片URL等），整块输出
-                    yield f"data: {json.dumps(openai_chunk)}\n\n"
-        yield f"data: {json.dumps(self.response_handler.handle_response({}, model, stream=True, finish_reason='stop'))}\n\n"
-        yield "data: [DONE]\n\n"
-        logger.info("Image chat streaming completed successfully")
 
-    def _handle_normal_image_completion(
+    async def _handle_normal_image_completion(
-        self, model: str, image_data: str
+        self, model: str, image_data: str, api_key: str
     ) -> Dict[str, Any]:
+        logger.info(f"Starting normal image completion for model: {model}")
+        start_time = time.perf_counter()
+        request_datetime = datetime.datetime.now()
+        is_success = False
+        status_code = None
+        result = None
 
-        return self.response_handler.handle_image_chat_response(
+        try:
-            image_data, model, stream=False, finish_reason="stop"
+            result = self.response_handler.handle_image_chat_response(
-        )
+                image_data, model, stream=False, finish_reason="stop"
+            )
+            logger.info(
+                f"Normal image completion finished successfully for model: {model}"
+            )
+            is_success = True
+            status_code = 200
+            return result
+        except Exception as e:
+            is_success = False
+            error_log_msg = f"Normal image completion failed for model {model}: {e}"
+            logger.error(error_log_msg)
+            status_code = 500
+            await add_error_log(
+                gemini_key=api_key,
+                model_name=model,
+                error_type="openai-image-non-stream",
+                error_log=error_log_msg,
+                error_code=status_code,
+                request_msg={"image_data_truncated": image_data[:1000]},
+            )
+            # Re-raise the exception so the caller knows about the failure
+            raise e
+        finally:
+            end_time = time.perf_counter()
+            latency_ms = int((end_time - start_time) * 1000)
+            logger.info(
+                f"Normal image completion for model {model} took {latency_ms} ms. Success: {is_success}"
+            )
+            await add_request_log(
+                model_name=model,
+                api_key=api_key,
+                is_success=is_success,
+                status_code=status_code,
+                latency_ms=latency_ms,
+                request_time=request_datetime,
+            )

app/service/client/api_client.py

@@ -1,11 +1,14 @@
 # app/services/chat/api_client.py
 
-from typing import Dict, Any, AsyncGenerator
+from typing import Dict, Any, AsyncGenerator, Optional
 import httpx
+import random
 from abc import ABC, abstractmethod
-
+from app.config.config import settings
+from app.log.logger import get_api_client_logger
 from app.core.constants import DEFAULT_TIMEOUT
 
+logger = get_api_client_logger()
 
 class ApiClient(ABC):
     """API客户端基类"""
@@ -31,14 +34,47 @@ class GeminiApiClient(ApiClient):
             model = model[:-7]
         if model.endswith("-image"):
             model = model[:-6]
-
+        if model.endswith("-non-thinking"):
+            model = model[:-13]
+        if "-search" in model and "-non-thinking" in model:
+            model = model[:-20]
         return model
 
+    async def get_models(self, api_key: str) -> Optional[Dict[str, Any]]:
+        """获取可用的 Gemini 模型列表"""
+        timeout = httpx.Timeout(timeout=5)
+        
+        proxy_to_use = None
+        if settings.PROXIES:
+            proxy_to_use = random.choice(settings.PROXIES)
+            logger.info(f"Using proxy for getting models: {proxy_to_use}")
+
+        async with httpx.AsyncClient(timeout=timeout, proxy=proxy_to_use) as client:
+            url = f"{self.base_url}/models?key={api_key}"
+            try:
+                response = await client.get(url)
+                response.raise_for_status()  # 如果状态码不是 2xx，则引发 HTTPStatusError
+                return response.json()
+            except httpx.HTTPStatusError as e:
+                logger.error(f"获取模型列表失败: {e.response.status_code}")
+                logger.error(e.response.text)
+                # 返回 None 而不是抛出异常，以便上层处理
+                return None
+            except httpx.RequestError as e:
+                logger.error(f"请求模型列表失败: {e}")
+                # 返回 None 而不是抛出异常
+                return None
+            
     async def generate_content(self, payload: Dict[str, Any], model: str, api_key: str) -> Dict[str, Any]:
         timeout = httpx.Timeout(self.timeout, read=self.timeout)
         model = self._get_real_model(model)
 
-        async with httpx.AsyncClient(timeout=timeout) as client:
+        proxy_to_use = None
+        if settings.PROXIES:
+            proxy_to_use = random.choice(settings.PROXIES)
+            logger.info(f"Using proxy: {proxy_to_use}")
+            
+        async with httpx.AsyncClient(timeout=timeout, proxy=proxy_to_use) as client:
             url = f"{self.base_url}/models/{model}:generateContent?key={api_key}"
             response = await client.post(url, json=payload)
             if response.status_code != 200:
@@ -50,7 +86,12 @@ class GeminiApiClient(ApiClient):
         timeout = httpx.Timeout(self.timeout, read=self.timeout)
         model = self._get_real_model(model)
         
-        async with httpx.AsyncClient(timeout=timeout) as client:
+        proxy_to_use = None
+        if settings.PROXIES:
+            proxy_to_use = random.choice(settings.PROXIES)
+            logger.info(f"Using proxy: {proxy_to_use}")
+
+        async with httpx.AsyncClient(timeout=timeout, proxy=proxy_to_use) as client:
             url = f"{self.base_url}/models/{model}:streamGenerateContent?alt=sse&key={api_key}"
             async with client.stream(method="POST", url=url, json=payload) as response:
                 if response.status_code != 200:
@@ -59,3 +100,96 @@ class GeminiApiClient(ApiClient):
                     raise Exception(f"API call failed with status code {response.status_code}, {error_msg}")
                 async for line in response.aiter_lines():
                     yield line
+
+
+class OpenaiApiClient(ApiClient):
+    """OpenAI API客户端"""
+
+    def __init__(self, base_url: str, timeout: int = DEFAULT_TIMEOUT):
+        self.base_url = base_url
+        self.timeout = timeout
+        
+    async def get_models(self, api_key: str) -> Dict[str, Any]:
+        timeout = httpx.Timeout(self.timeout, read=self.timeout)
+        async with httpx.AsyncClient(timeout=timeout) as client:
+            url = f"{self.base_url}/openai/models"
+            headers = {"Authorization": f"Bearer {api_key}"}
+            response = await client.get(url, headers=headers)
+            if response.status_code != 200:
+                error_content = response.text
+                raise Exception(f"API call failed with status code {response.status_code}, {error_content}")
+            return response.json()
+
+    async def generate_content(self, payload: Dict[str, Any], api_key: str) -> Dict[str, Any]:
+        timeout = httpx.Timeout(self.timeout, read=self.timeout)
+        
+        proxy_to_use = None
+        if settings.PROXIES:
+            proxy_to_use = random.choice(settings.PROXIES)
+            logger.info(f"Using proxy: {proxy_to_use}")
+
+        async with httpx.AsyncClient(timeout=timeout, proxy=proxy_to_use) as client:
+            url = f"{self.base_url}/openai/chat/completions"
+            headers = {"Authorization": f"Bearer {api_key}"}
+            response = await client.post(url, json=payload, headers=headers)
+            if response.status_code != 200:
+                error_content = response.text
+                raise Exception(f"API call failed with status code {response.status_code}, {error_content}")
+            return response.json()
+
+    async def stream_generate_content(self, payload: Dict[str, Any], api_key: str) -> AsyncGenerator[str, None]:
+        timeout = httpx.Timeout(self.timeout, read=self.timeout)
+        
+        proxy_to_use = None
+        if settings.PROXIES:
+            proxy_to_use = random.choice(settings.PROXIES)
+            logger.info(f"Using proxy: {proxy_to_use}")
+
+        async with httpx.AsyncClient(timeout=timeout, proxy=proxy_to_use) as client:
+            url = f"{self.base_url}/openai/chat/completions"
+            headers = {"Authorization": f"Bearer {api_key}"}
+            async with client.stream(method="POST", url=url, json=payload, headers=headers) as response:
+                if response.status_code != 200:
+                    error_content = await response.aread()
+                    error_msg = error_content.decode("utf-8")
+                    raise Exception(f"API call failed with status code {response.status_code}, {error_msg}")
+                async for line in response.aiter_lines():
+                    yield line
+    
+    async def create_embeddings(self, input: str, model: str, api_key: str) -> Dict[str, Any]:
+        timeout = httpx.Timeout(self.timeout, read=self.timeout)
+        
+        proxy_to_use = None
+        if settings.PROXIES:
+            proxy_to_use = random.choice(settings.PROXIES)
+            logger.info(f"Using proxy: {proxy_to_use}")
+
+        async with httpx.AsyncClient(timeout=timeout, proxy=proxy_to_use) as client:
+            url = f"{self.base_url}/openai/embeddings"
+            headers = {"Authorization": f"Bearer {api_key}"}
+            payload = {
+                "input": input,
+                "model": model,
+            }
+            response = await client.post(url, json=payload, headers=headers)
+            if response.status_code != 200:
+                error_content = response.text
+                raise Exception(f"API call failed with status code {response.status_code}, {error_content}")
+            return response.json()
+                    
+    async def generate_images(self, payload: Dict[str, Any], api_key: str) -> Dict[str, Any]:
+        timeout = httpx.Timeout(self.timeout, read=self.timeout)
+        
+        proxy_to_use = None
+        if settings.PROXIES:
+            proxy_to_use = random.choice(settings.PROXIES)
+            logger.info(f"Using proxy: {proxy_to_use}")
+
+        async with httpx.AsyncClient(timeout=timeout, proxy=proxy_to_use) as client:
+            url = f"{self.base_url}/openai/images/generations"
+            headers = {"Authorization": f"Bearer {api_key}"}
+            response = await client.post(url, json=payload, headers=headers)
+            if response.status_code != 200:
+                error_content = response.text
+                raise Exception(f"API call failed with status code {response.status_code}, {error_content}")
+            return response.json()

app/service/config/config_service.py

@@ -1,41 +1,49 @@
 """
 配置服务模块
 """
+
 import datetime
 import json
 from typing import Any, Dict, List
 
 from dotenv import find_dotenv, load_dotenv
+from fastapi import HTTPException
 from sqlalchemy import insert, update
 
+from app.config.config import Settings as ConfigSettings
 from app.config.config import settings
 from app.database.connection import database
 from app.database.models import Settings
-from app.config.config import Settings as ConfigSettings
 from app.database.services import get_all_settings
-from app.service.key.key_manager import get_key_manager_instance, reset_key_manager_instance
 from app.log.logger import get_config_routes_logger
+from app.service.key.key_manager import (
+    get_key_manager_instance,
+    reset_key_manager_instance,
+)
+from app.service.model.model_service import ModelService
 
 logger = get_config_routes_logger()
 
 
 class ConfigService:
     """配置服务类，用于管理应用程序配置"""
-    
+
     @staticmethod
     async def get_config() -> Dict[str, Any]:
         return settings.model_dump()
-    
+
     @staticmethod
     async def update_config(config_data: Dict[str, Any]) -> Dict[str, Any]:
         for key, value in config_data.items():
             if hasattr(settings, key):
                 setattr(settings, key, value)
-                logger.info(f"Updated setting in memory: {key}") 
+                logger.debug(f"Updated setting in memory: {key}")
-        
+
         # 获取现有设置
         existing_settings_raw: List[Dict[str, Any]] = await get_all_settings()
-        existing_settings_map: Dict[str, Dict[str, Any]] = {s['key']: s for s in existing_settings_raw}
+        existing_settings_map: Dict[str, Dict[str, Any]] = {
+            s["key"]: s for s in existing_settings_raw
+        }
         existing_keys = set(existing_settings_map.keys())
 
         settings_to_update: List[Dict[str, Any]] = []
@@ -47,30 +55,34 @@ class ConfigService:
             # 处理不同类型的值
             if isinstance(value, list):
                 db_value = json.dumps(value)
+            elif isinstance(value, dict):  # 新增对 dict 类型的处理
+                db_value = json.dumps(value)
             elif isinstance(value, bool):
                 db_value = str(value).lower()
             else:
                 db_value = str(value)
 
             # 仅当值发生变化时才更新
-            if key in existing_keys and existing_settings_map[key]['value'] == db_value:
+            if key in existing_keys and existing_settings_map[key]["value"] == db_value:
-                continue 
+                continue
 
-            description = f"{key}配置项" 
+            description = f"{key}配置项"
 
             data = {
-                'key': key,
+                "key": key,
-                'value': db_value,
+                "value": db_value,
-                'description': description,
+                "description": description,
-                'updated_at': now
+                "updated_at": now,
             }
 
             if key in existing_keys:
                 # Preserve original description if not explicitly provided
-                data['description'] = existing_settings_map[key].get('description', description)
+                data["description"] = existing_settings_map[key].get(
+                    "description", description
+                )
                 settings_to_update.append(data)
             else:
-                data['created_at'] = now
+                data["created_at"] = now
                 settings_to_insert.append(data)
 
         # 在事务中执行批量插入和更新
@@ -80,17 +92,19 @@ class ConfigService:
                     if settings_to_insert:
                         query_insert = insert(Settings).values(settings_to_insert)
                         await database.execute(query=query_insert)
-                        logger.info(f"Bulk inserted {len(settings_to_insert)} settings.")
+                        logger.info(
+                            f"Bulk inserted {len(settings_to_insert)} settings."
+                        )
 
                     if settings_to_update:
                         for setting_data in settings_to_update:
                             query_update = (
                                 update(Settings)
-                                .where(Settings.key == setting_data['key'])
+                                .where(Settings.key == setting_data["key"])
                                 .values(
-                                    value=setting_data['value'],
+                                    value=setting_data["value"],
-                                    description=setting_data['description'],
+                                    description=setting_data["description"],
-                                    updated_at=setting_data['updated_at']
+                                    updated_at=setting_data["updated_at"],
                                 )
                             )
                             await database.execute(query=query_update)
@@ -110,7 +124,79 @@ class ConfigService:
             # For now, we log the error and continue
 
         return await ConfigService.get_config()
-    
+
+    @staticmethod
+    async def delete_key(key_to_delete: str) -> Dict[str, Any]:
+        """删除单个API密钥"""
+        # 确保 settings.API_KEYS 是一个列表
+        if not isinstance(settings.API_KEYS, list):
+            settings.API_KEYS = []
+
+        original_keys_count = len(settings.API_KEYS)
+        # 创建一个不包含待删除密钥的新列表
+        updated_api_keys = [k for k in settings.API_KEYS if k != key_to_delete]
+
+        if len(updated_api_keys) < original_keys_count:
+            # 密钥已找到并从列表中移除
+            settings.API_KEYS = updated_api_keys  # 首先更新内存中的 settings
+            # 使用 update_config 持久化更改，它同时处理数据库和 KeyManager
+            await ConfigService.update_config({"API_KEYS": settings.API_KEYS})
+            logger.info(f"密钥 '{key_to_delete}' 已成功删除。")
+            return {"success": True, "message": f"密钥 '{key_to_delete}' 已成功删除。"}
+        else:
+            # 未找到密钥
+            logger.warning(f"尝试删除密钥 '{key_to_delete}'，但未找到该密钥。")
+            return {"success": False, "message": f"未找到密钥 '{key_to_delete}'。"}
+
+    @staticmethod
+    async def delete_selected_keys(keys_to_delete: List[str]) -> Dict[str, Any]:
+        """批量删除选定的API密钥"""
+        if not isinstance(settings.API_KEYS, list):
+            settings.API_KEYS = []
+
+        deleted_count = 0
+        not_found_keys: List[str] = []
+
+        current_api_keys = list(settings.API_KEYS)  # 创建副本以进行修改
+        keys_actually_removed: List[str] = []
+
+        for key_to_del in keys_to_delete:
+            if key_to_del in current_api_keys:
+                current_api_keys.remove(key_to_del)
+                keys_actually_removed.append(key_to_del)
+                deleted_count += 1
+            else:
+                not_found_keys.append(key_to_del)
+
+        if deleted_count > 0:
+            settings.API_KEYS = current_api_keys  # 更新内存中的 settings
+            await ConfigService.update_config({"API_KEYS": settings.API_KEYS})
+            logger.info(
+                f"成功删除 {deleted_count} 个密钥。密钥: {keys_actually_removed}"
+            )
+            message = f"成功删除 {deleted_count} 个密钥。"
+            if not_found_keys:
+                message += f" {len(not_found_keys)} 个密钥未找到: {not_found_keys}。"
+            return {
+                "success": True,
+                "message": message,
+                "deleted_count": deleted_count,
+                "not_found_keys": not_found_keys,
+            }
+        else:
+            message = "没有密钥被删除。"
+            if not_found_keys:  # 如果提供了密钥但都未找到
+                message = f"所有 {len(not_found_keys)} 个指定的密钥均未找到: {not_found_keys}。"
+            elif not keys_to_delete:  # 如果 keys_to_delete 列表为空
+                message = "未指定要删除的密钥。"
+            logger.warning(message)
+            return {
+                "success": False,
+                "message": message,
+                "deleted_count": 0,
+                "not_found_keys": not_found_keys,
+            }
+
     @staticmethod
     async def reset_config() -> Dict[str, Any]:
         """
@@ -122,7 +208,9 @@ class ConfigService:
         """
         # 1. 重新加载配置对象，它应该处理环境变量和 .env 的优先级
         _reload_settings()
-        logger.info("Settings object reloaded, prioritizing system environment variables then .env file.")
+        logger.info(
+            "Settings object reloaded, prioritizing system environment variables then .env file."
+        )
 
         # 2. 重置并重新初始化 KeyManager
         try:
@@ -138,6 +226,36 @@ class ConfigService:
         # 3. 返回更新后的配置
         return await ConfigService.get_config()
 
+    @staticmethod
+    async def fetch_ui_models() -> List[Dict[str, Any]]:
+        """获取用于UI显示的模型列表"""
+        try:
+            key_manager = await get_key_manager_instance()
+            model_service = ModelService()
+
+            api_key = await key_manager.get_first_valid_key()
+            if not api_key:
+                logger.error("No valid API keys available to fetch model list for UI.")
+                raise HTTPException(
+                    status_code=500,
+                    detail="No valid API keys available to fetch model list.",
+                )
+
+            models = await model_service.get_gemini_openai_models(api_key)
+            return models
+        except HTTPException as e:
+            # Re-raise HTTPExceptions directly if they are already specific
+            raise e
+        except Exception as e:
+            logger.error(
+                f"Failed to fetch models for UI in ConfigService: {e}", exc_info=True
+            )
+            # Raise a generic HTTPException for other errors
+            raise HTTPException(
+                status_code=500, detail=f"Failed to fetch models for UI: {str(e)}"
+            )
+
+
 # 重新加载配置的函数
 def _reload_settings():
     """重新加载环境变量并更新配置"""
@@ -145,4 +263,4 @@ def _reload_settings():
     load_dotenv(find_dotenv(), override=True)
     # 更新现有 settings 对象的属性，而不是新建实例
     for key, value in ConfigSettings().model_dump().items():
-        setattr(settings, key, value)
+        setattr(settings, key, value)

app/service/embedding/embedding_service.py

@@ -1,9 +1,15 @@
+import datetime
+import time
+import re # For potential status code parsing from generic errors
 from typing import List, Union
 
 import openai
+from openai import APIStatusError # Import specific error type
 from openai.types import CreateEmbeddingResponse
+
 from app.config.config import settings
 from app.log.logger import get_embeddings_logger
+from app.database.services import add_error_log, add_request_log # Import DB logging functions
 
 logger = get_embeddings_logger()
 
@@ -13,11 +19,64 @@ class EmbeddingService:
     async def create_embedding(
         self, input_text: Union[str, List[str]], model: str, api_key: str
     ) -> CreateEmbeddingResponse:
-        """Create embeddings using OpenAI API"""
+        """Create embeddings using OpenAI API with database logging"""
+        start_time = time.perf_counter()
+        request_datetime = datetime.datetime.now()
+        is_success = False
+        status_code = None
+        response = None
+        error_log_msg = ""
+        # Prepare request message for logging (truncate if list or long string)
+        if isinstance(input_text, list):
+            request_msg_log = {"input_truncated": [str(item)[:100] + "..." if len(str(item)) > 100 else str(item) for item in input_text[:5]]}
+            if len(input_text) > 5:
+                 request_msg_log["input_truncated"].append("...")
+        else:
+            request_msg_log = {"input_truncated": input_text[:1000] + "..." if len(input_text) > 1000 else input_text}
+
+
         try:
             client = openai.OpenAI(api_key=api_key, base_url=settings.BASE_URL)
             response = client.embeddings.create(input=input_text, model=model)
+            is_success = True
+            status_code = 200
             return response
+        except APIStatusError as e:
+            is_success = False
+            status_code = e.status_code
+            error_log_msg = f"OpenAI API error: {e}"
+            logger.error(f"Error creating embedding (APIStatusError): {error_log_msg}")
+            raise e # Re-raise the specific error
         except Exception as e:
-            logger.error(f"Error creating embedding: {str(e)}")
+            is_success = False
-            raise
+            error_log_msg = f"Generic error: {e}"
+            logger.error(f"Error creating embedding (Exception): {error_log_msg}")
+            # Try to parse status code from generic error (less reliable)
+            match = re.search(r"status code (\d+)", str(e))
+            if match:
+                status_code = int(match.group(1))
+            else:
+                status_code = 500 # Default if parsing fails
+            raise e # Re-raise the generic error
+        finally:
+            end_time = time.perf_counter()
+            latency_ms = int((end_time - start_time) * 1000)
+            if not is_success:
+                 # Log error to database if it failed
+                 await add_error_log(
+                     gemini_key=api_key, # Using gemini_key parameter name for consistency
+                     model_name=model,
+                     error_type="openai-embedding",
+                     error_log=error_log_msg,
+                     error_code=status_code,
+                     request_msg=request_msg_log
+                 )
+            # Log request outcome to database regardless of success/failure
+            await add_request_log(
+                model_name=model,
+                api_key=api_key,
+                is_success=is_success,
+                status_code=status_code,
+                latency_ms=latency_ms,
+                request_time=request_datetime
+            )

app/service/error_log/error_log_service.py

@@ -0,0 +1,155 @@
+from datetime import datetime, timedelta, timezone
+from typing import Any, Dict, List, Optional
+
+from sqlalchemy import delete, func, select
+
+from app.config.config import settings
+from app.database import services as db_services
+from app.database.connection import database
+from app.database.models import ErrorLog
+from app.log.logger import get_error_log_logger
+
+logger = get_error_log_logger()
+
+
+async def delete_old_error_logs():
+    """
+    Deletes error logs older than a specified number of days,
+    based on the AUTO_DELETE_ERROR_LOGS_ENABLED and AUTO_DELETE_ERROR_LOGS_DAYS settings.
+    """
+    if not settings.AUTO_DELETE_ERROR_LOGS_ENABLED:
+        logger.info("Auto-deletion of error logs is disabled. Skipping.")
+        return
+
+    days_to_keep = settings.AUTO_DELETE_ERROR_LOGS_DAYS
+    if not isinstance(days_to_keep, int) or days_to_keep <= 0:
+        logger.error(
+            f"Invalid AUTO_DELETE_ERROR_LOGS_DAYS value: {days_to_keep}. Must be a positive integer. Skipping deletion."
+        )
+        return
+
+    cutoff_date = datetime.now(timezone.utc) - timedelta(days=days_to_keep)
+
+    logger.info(
+        f"Attempting to delete error logs older than {days_to_keep} days (before {cutoff_date.strftime('%Y-%m-%d %H:%M:%S %Z')})."
+    )
+
+    try:
+        if not database.is_connected:
+            await database.connect()
+            logger.info("Database connection established for deleting error logs.")
+
+        # First, count how many logs will be deleted (optional, for logging)
+        count_query = select(func.count(ErrorLog.id)).where(
+            ErrorLog.request_time < cutoff_date
+        )
+        num_logs_to_delete = await database.fetch_val(count_query)
+
+        if num_logs_to_delete == 0:
+            logger.info(
+                "No error logs found older than the specified period. No deletion needed."
+            )
+            return
+
+        logger.info(f"Found {num_logs_to_delete} error logs to delete.")
+
+        # Perform the deletion
+        query = delete(ErrorLog).where(ErrorLog.request_time < cutoff_date)
+        await database.execute(query)
+        logger.info(
+            f"Successfully deleted {num_logs_to_delete} error logs older than {days_to_keep} days."
+        )
+
+    except Exception as e:
+        logger.error(
+            f"Error during automatic deletion of error logs: {e}", exc_info=True
+        )
+
+
+async def process_get_error_logs(
+    limit: int,
+    offset: int,
+    key_search: Optional[str],
+    error_search: Optional[str],
+    error_code_search: Optional[str],
+    start_date: Optional[datetime],
+    end_date: Optional[datetime],
+    sort_by: str,
+    sort_order: str,
+) -> Dict[str, Any]:
+    """
+    处理错误日志的检索，支持分页和过滤。
+    """
+    try:
+        logs_data = await db_services.get_error_logs(
+            limit=limit,
+            offset=offset,
+            key_search=key_search,
+            error_search=error_search,
+            error_code_search=error_code_search,
+            start_date=start_date,
+            end_date=end_date,
+            sort_by=sort_by,
+            sort_order=sort_order,
+        )
+        total_count = await db_services.get_error_logs_count(
+            key_search=key_search,
+            error_search=error_search,
+            error_code_search=error_code_search,
+            start_date=start_date,
+            end_date=end_date,
+        )
+        return {"logs": logs_data, "total": total_count}
+    except Exception as e:
+        logger.error(f"Service error in process_get_error_logs: {e}", exc_info=True)
+        raise
+
+
+async def process_get_error_log_details(log_id: int) -> Optional[Dict[str, Any]]:
+    """
+    处理特定错误日志详细信息的检索。
+    如果未找到，则返回 None。
+    """
+    try:
+        log_details = await db_services.get_error_log_details(log_id=log_id)
+        return log_details
+    except Exception as e:
+        logger.error(
+            f"Service error in process_get_error_log_details for ID {log_id}: {e}",
+            exc_info=True,
+        )
+        raise
+
+
+async def process_delete_error_logs_by_ids(log_ids: List[int]) -> int:
+    """
+    按 ID 批量删除错误日志。
+    返回尝试删除的日志数量。
+    """
+    if not log_ids:
+        return 0
+    try:
+        deleted_count = await db_services.delete_error_logs_by_ids(log_ids)
+        return deleted_count
+    except Exception as e:
+        logger.error(
+            f"Service error in process_delete_error_logs_by_ids for IDs {log_ids}: {e}",
+            exc_info=True,
+        )
+        raise
+
+
+async def process_delete_error_log_by_id(log_id: int) -> bool:
+    """
+    按 ID 删除单个错误日志。
+    如果删除成功（或找到日志并尝试删除），则返回 True，否则返回 False。
+    """
+    try:
+        success = await db_services.delete_error_log_by_id(log_id)
+        return success
+    except Exception as e:
+        logger.error(
+            f"Service error in process_delete_error_log_by_id for ID {log_id}: {e}",
+            exc_info=True,
+        )
+        raise

app/service/image/image_create_service.py

@@ -17,7 +17,6 @@ logger = get_image_create_logger()
 class ImageCreateService:
     def __init__(self, aspect_ratio="1:1"):
         self.image_model = settings.CREATE_IMAGE_MODEL
-        self.paid_key = settings.PAID_KEY
         self.aspect_ratio = aspect_ratio
 
     def parse_prompt_parameters(self, prompt: str) -> tuple:
@@ -53,7 +52,7 @@ class ImageCreateService:
         return prompt, n, aspect_ratio
 
     def generate_images(self, request: ImageGenerationRequest):
-        client = genai.Client(api_key=self.paid_key)
+        client = genai.Client(api_key=settings.PAID_KEY)
 
         if request.size == "1024x1024":
             self.aspect_ratio = "1:1"
@@ -89,7 +88,6 @@ class ImageCreateService:
                 aspect_ratio=self.aspect_ratio,
                 safety_filter_level="BLOCK_LOW_AND_ABOVE",
                 person_generation="ALLOW_ADULT",
-                # language="auto"
             ),
         )
 

app/service/key/key_manager.py

@@ -2,7 +2,6 @@ import asyncio
 from itertools import cycle
 from typing import Dict
 
-
 from app.config.config import settings
 from app.log.logger import get_key_manager_logger
 
@@ -37,7 +36,7 @@ class KeyManager:
         async with self.failure_count_lock:
             for key in self.key_failure_counts:
                 self.key_failure_counts[key] = 0
-                
+
     async def reset_key_failure_count(self, key: str) -> bool:
         """重置指定key的失败计数"""
         async with self.failure_count_lock:
@@ -45,7 +44,9 @@ class KeyManager:
                 self.key_failure_counts[key] = 0
                 logger.info(f"Reset failure count for key: {key}")
                 return True
-            logger.warning(f"Attempt to reset failure count for non-existent key: {key}")
+            logger.warning(
+                f"Attempt to reset failure count for non-existent key: {key}"
+            )
             return False
 
     async def get_next_working_key(self) -> str:
@@ -62,7 +63,7 @@ class KeyManager:
                 # await self.reset_failure_counts() 取消重置
                 return current_key
 
-    async def handle_api_failure(self, api_key: str,retries: int) -> str:
+    async def handle_api_failure(self, api_key: str, retries: int) -> str:
         """处理API调用失败"""
         async with self.failure_count_lock:
             self.key_failure_counts[api_key] += 1
@@ -72,7 +73,7 @@ class KeyManager:
                 )
         if retries < settings.MAX_RETRIES:
             return await self.get_next_working_key()
-        else: 
+        else:
             return ""
 
     def get_fail_count(self, key: str) -> int:
@@ -100,10 +101,32 @@ class KeyManager:
             for key in self.key_failure_counts:
                 if self.key_failure_counts[key] < self.MAX_FAILURES:
                     return key
-        return self.api_keys[0]
+        # 如果所有 key 都无效，或者列表为空，则尝试返回第一个（如果列表不为空）
+        # 或者根据具体逻辑处理，这里保持原样，可能在空列表或全无效时需要调整
+        if self.api_keys:
+            return self.api_keys[0]
+        # 如果 api_keys 为空，这里会出问题。实际应用中应有非空保证或更好处理。
+        # 为了保持接口一致性，如果列表为空，可能应该抛出异常或返回特定值。
+        # 暂且假设 api_keys 不会为空，或者调用者处理后续的空 key 问题。
+        # 根据现有代码，如果api_keys为空，self.api_keys[0]会报错。
+        # 如果没有有效key且列表不空，返回第一个。若列表为空，这里会出IndexError。
+        # 更安全的做法是：
+        if not self.api_keys:
+            logger.warning("API key list is empty, cannot get first valid key.")
+            # Depending on desired behavior, either raise error or return an indicator like "" or None
+            # For now, let's allow it to potentially fail if a key is expected by caller
+            # but it's better to be explicit. Let's return empty string for consistency with handle_api_failure
+            return ""
+        return self.api_keys[
+            0
+        ]  # Fallback to the first key if no key is "valid" but list is not empty
+
 
 _singleton_instance = None
 _singleton_lock = asyncio.Lock()
+_preserved_failure_counts: Dict[str, int] | None = None
+_preserved_old_api_keys_for_reset: list | None = None
+_preserved_next_key_in_cycle: str | None = None
 
 
 async def get_key_manager_instance(api_keys: list = None) -> KeyManager:
@@ -112,22 +135,174 @@ async def get_key_manager_instance(api_keys: list = None) -> KeyManager:
 
     如果尚未创建实例，将使用提供的 api_keys 初始化 KeyManager。
     如果已创建实例，则忽略 api_keys 参数，返回现有单例。
+    如果在重置后调用，会尝试恢复之前的状态（失败计数、循环位置）。
     """
-    global _singleton_instance
+    global _singleton_instance, _preserved_failure_counts, _preserved_old_api_keys_for_reset, _preserved_next_key_in_cycle
 
     async with _singleton_lock:
         if _singleton_instance is None:
             if api_keys is None:
-                raise ValueError("API keys are required to initialize the KeyManager")
+                # This case needs careful handling. If it's the very first call, api_keys are required.
+                # If it's after a reset and no api_keys are provided, what should happen?
+                # The original ValueError was "API keys are required to initialize the KeyManager".
+                # Let's assume if api_keys is None here, it's an error unless we are restoring from non-None _preserved_old_api_keys_for_reset.
+                # However, the user's request implies new api_keys will be part of the reset flow.
+                # For now, stick to a strict requirement for api_keys if _singleton_instance is None.
+                raise ValueError(
+                    "API keys are required to initialize or re-initialize the KeyManager instance."
+                )
+            if not api_keys:  # Handle case where api_keys is an empty list
+                logger.warning(
+                    "Initializing KeyManager with an empty list of API keys."
+                )
+                # Consider if this should be an error or allowed. Current KeyManager supports it.
+
             _singleton_instance = KeyManager(api_keys)
-            logger.info("KeyManager instance created.")
+            logger.info(
+                f"KeyManager instance created/re-created with {len(api_keys)} API keys."
+            )
+
+            # 1. 恢复失败计数
+            if _preserved_failure_counts:
+                # Initialize new instance's failure_counts for all new keys to 0
+                current_failure_counts = {
+                    key: 0 for key in _singleton_instance.api_keys
+                }
+                # Inherit counts for keys that exist in both old and new lists
+                for key, count in _preserved_failure_counts.items():
+                    if key in current_failure_counts:
+                        current_failure_counts[key] = count
+                _singleton_instance.key_failure_counts = current_failure_counts
+                logger.info("Inherited failure counts for applicable keys.")
+            _preserved_failure_counts = None  # Clear after use
+
+            # 2. 调整 key_cycle 的起始点
+            start_key_for_new_cycle = None
+            if (
+                _preserved_old_api_keys_for_reset
+                and _preserved_next_key_in_cycle
+                and _singleton_instance.api_keys  # Ensure new api_keys list is not empty
+            ):
+                try:
+                    # Find the index of the preserved next key in the *old* list
+                    start_idx_in_old = _preserved_old_api_keys_for_reset.index(
+                        _preserved_next_key_in_cycle
+                    )
+
+                    # Iterate through the old key list (circularly) starting from _preserved_next_key_in_cycle
+                    # Find the first key that also exists in the new api_keys list
+                    for i in range(len(_preserved_old_api_keys_for_reset)):
+                        current_old_key_idx = (start_idx_in_old + i) % len(
+                            _preserved_old_api_keys_for_reset
+                        )
+                        key_candidate = _preserved_old_api_keys_for_reset[
+                            current_old_key_idx
+                        ]
+                        if key_candidate in _singleton_instance.api_keys:
+                            start_key_for_new_cycle = key_candidate
+                            break
+                except ValueError:
+                    logger.warning(
+                        f"Preserved next key '{_preserved_next_key_in_cycle}' not found in preserved old API keys. "
+                        "New cycle will start from the beginning of the new list."
+                    )
+                except Exception as e:
+                    logger.error(
+                        f"Error determining start key for new cycle from preserved state: {e}. "
+                        "New cycle will start from the beginning."
+                    )
+
+            if start_key_for_new_cycle and _singleton_instance.api_keys:
+                try:
+                    # Find the index of the determined start_key in the new api_keys list
+                    target_idx = _singleton_instance.api_keys.index(
+                        start_key_for_new_cycle
+                    )
+                    # Advance the new cycle by calling next() target_idx times
+                    # This positions the cycle so that the *next* call to next() will yield start_key_for_new_cycle
+                    for _ in range(target_idx):
+                        next(_singleton_instance.key_cycle)
+                    logger.info(
+                        f"Key cycle in new instance advanced. Next call to get_next_key() will yield: {start_key_for_new_cycle}"
+                    )
+                except ValueError:
+                    # This should not happen if start_key_for_new_cycle was correctly found in api_keys
+                    logger.warning(
+                        f"Determined start key '{start_key_for_new_cycle}' not found in new API keys during cycle advancement. "
+                        "New cycle will start from the beginning."
+                    )
+                except (
+                    StopIteration
+                ):  # Should not happen with cycle unless api_keys is empty, handled by _singleton_instance.api_keys check
+                    logger.error(
+                        "StopIteration while advancing key cycle, implies empty new API key list previously missed."
+                    )
+                except Exception as e:
+                    logger.error(
+                        f"Error advancing new key cycle: {e}. Cycle will start from beginning."
+                    )
+            else:
+                if _singleton_instance.api_keys:
+                    logger.info(
+                        "New key cycle will start from the beginning of the new API key list (no specific start key determined or needed)."
+                    )
+                else:
+                    logger.info(
+                        "New key cycle not applicable as the new API key list is empty."
+                    )
+
+            # 清理所有保存的状态
+            _preserved_old_api_keys_for_reset = None
+            _preserved_next_key_in_cycle = None
+            # _preserved_failure_counts already cleared
+
         return _singleton_instance
 
-    
+
 async def reset_key_manager_instance():
-    """重置 KeyManager 单例实例"""
+    """
-    global _singleton_instance
+    重置 KeyManager 单例实例。
+    将保存当前实例的状态（失败计数、旧 API keys、下一个 key 提示）
+    以供下一次 get_key_manager_instance 调用时恢复。
+    """
+    global _singleton_instance, _preserved_failure_counts, _preserved_old_api_keys_for_reset, _preserved_next_key_in_cycle
     async with _singleton_lock:
         if _singleton_instance:
+            # 1. 保存失败计数
+            _preserved_failure_counts = _singleton_instance.key_failure_counts.copy()
+
+            # 2. 保存旧的 API keys 列表
+            _preserved_old_api_keys_for_reset = _singleton_instance.api_keys.copy()
+
+            # 3. 保存 key_cycle 的下一个 key 提示
+            # This should be the key that get_next_key() would return next.
+            try:
+                if (
+                    _singleton_instance.api_keys
+                ):  # Only if there are keys to cycle through
+                    # Calling get_next_key() consumes one key and returns it. This is the key
+                    # we want the new cycle to effectively start with.
+                    _preserved_next_key_in_cycle = (
+                        await _singleton_instance.get_next_key()
+                    )
+                else:
+                    _preserved_next_key_in_cycle = None  # No keys, so no next key
+            except (
+                StopIteration
+            ):  # Should be caught by "if _singleton_instance.api_keys"
+                logger.warning(
+                    "Could not preserve next key hint: key cycle was empty or exhausted in old instance."
+                )
+                _preserved_next_key_in_cycle = None
+            except Exception as e:
+                logger.error(f"Error preserving next key hint during reset: {e}")
+                _preserved_next_key_in_cycle = None
+
             _singleton_instance = None
-            logger.info("KeyManager instance reset.")
+            logger.info(
+                "KeyManager instance has been reset. State (failure counts, old keys, next key hint) preserved for next instantiation."
+            )
+        else:
+            logger.info(
+                "KeyManager instance was not set (or already reset), no reset action performed."
+            )

app/service/model/model_service.py

@@ -1,50 +1,47 @@
 from datetime import datetime, timezone
 from typing import Any, Dict, Optional
 
-import requests
-
 from app.config.config import settings
 from app.log.logger import get_model_logger
+from app.service.client.api_client import GeminiApiClient
 
 logger = get_model_logger()
 
 
 class ModelService:
-    def get_gemini_models(self, api_key: str) -> Optional[Dict[str, Any]]:
+    async def get_gemini_models(self, api_key: str) -> Optional[Dict[str, Any]]:
-        url = f"{settings.BASE_URL}/models?key={api_key}"
+        """使用 GeminiApiClient 获取并过滤模型列表"""
+        api_client = GeminiApiClient(base_url=settings.BASE_URL) # 实例化客户端
+        gemini_models = await api_client.get_models(api_key)
 
-        try:
+        if gemini_models is None:
-            response = requests.get(url)
+            logger.error("从 API 客户端获取模型列表失败。")
-            if response.status_code == 200:
-                gemini_models = response.json()
-
-                filtered_models_list = []
-                for model in gemini_models.get("models", []):
-                    model_id = model["name"].split("/")[-1]
-                    if model_id not in settings.FILTERED_MODELS:
-                        filtered_models_list.append(model)
-                    else:
-                        logger.info(f"Filtered out model: {model_id}")
-
-                gemini_models["models"] = filtered_models_list
-                return gemini_models
-            else:
-                logger.error(f"Error: {response.status_code}")
-                logger.error(response.text)
-                return None
-        except requests.RequestException as e:
-            logger.error(f"Request failed: {e}")
             return None
 
-    def get_gemini_openai_models(self, api_key: str) -> Optional[Dict[str, Any]]:
         try:
-            gemini_models = self.get_gemini_models(api_key)
+            filtered_models_list = []
-            return self.convert_to_openai_models_format(gemini_models)
+            for model in gemini_models.get("models", []):
-        except requests.RequestException as e:
+                model_id = model["name"].split("/")[-1]
-            logger.error(f"Request failed: {e}")
+                if model_id not in settings.FILTERED_MODELS:
+                    filtered_models_list.append(model)
+                else:
+                    logger.debug(f"Filtered out model: {model_id}")
+
+            gemini_models["models"] = filtered_models_list
+            return gemini_models
+        except Exception as e:
+            logger.error(f"处理模型列表时出错: {e}")
             return None
 
-    def convert_to_openai_models_format(
+    async def get_gemini_openai_models(self, api_key: str) -> Optional[Dict[str, Any]]:
+        """获取 Gemini 模型并转换为 OpenAI 格式"""
+        gemini_models = await self.get_gemini_models(api_key)
+        if gemini_models is None:
+            return None
+        
+        return await self.convert_to_openai_models_format(gemini_models)
+
+    async def convert_to_openai_models_format(
         self, gemini_models: Dict[str, Any]
     ) -> Dict[str, Any]:
         openai_format = {"object": "list", "data": [], "success": True}
@@ -70,6 +67,10 @@ class ModelService:
                 image_model = openai_model.copy()
                 image_model["id"] = f"{model_id}-image"
                 openai_format["data"].append(image_model)
+            if model_id in settings.THINKING_MODELS:
+                non_thinking_model = openai_model.copy()
+                non_thinking_model["id"] = f"{model_id}-non-thinking"
+                openai_format["data"].append(non_thinking_model)
 
         if settings.CREATE_IMAGE_MODEL:
             image_model = openai_model.copy()
@@ -77,7 +78,7 @@ class ModelService:
             openai_format["data"].append(image_model)
         return openai_format
 
-    def check_model_support(self, model: str) -> bool:
+    async def check_model_support(self, model: str) -> bool:
         if not model or not isinstance(model, str):
             return False
 

app/service/openai_compatiable/openai_compatiable_service.py

@@ -0,0 +1,197 @@
+
+import datetime
+import json
+import re
+import time
+from typing import Any, AsyncGenerator, Dict, Union
+
+from app.config.config import settings
+from app.database.services import (
+    add_error_log,
+    add_request_log,
+)
+from app.domain.openai_models import ChatRequest, ImageGenerationRequest
+from app.service.client.api_client import OpenaiApiClient
+from app.service.key.key_manager import KeyManager
+from app.log.logger import get_openai_compatible_logger
+
+logger = get_openai_compatible_logger()
+
+class OpenAICompatiableService:
+
+    def __init__(self, base_url: str, key_manager: KeyManager = None):
+        self.key_manager = key_manager
+        self.base_url = base_url
+        self.api_client = OpenaiApiClient(base_url, settings.TIME_OUT)
+        
+    async def get_models(self, api_key: str) -> Dict[str, Any]:
+        return await self.api_client.get_models(api_key)
+
+    async def create_chat_completion(
+        self,
+        request: ChatRequest,
+        api_key: str,
+    ) -> Union[Dict[str, Any], AsyncGenerator[str, None]]:
+        """创建聊天完成"""
+        request_dict = request.model_dump()
+        # 移除值为null的
+        request_dict = {k: v for k, v in request_dict.items() if v is not None}
+        del request_dict["top_k"] # 删除top_k参数，目前不支持该参数
+        if request.stream:
+            return self._handle_stream_completion(request.model, request_dict, api_key)
+        return await self._handle_normal_completion(request.model, request_dict, api_key)
+
+    async def generate_images(
+        self,
+        request: ImageGenerationRequest,
+    ) -> Dict[str, Any]:
+        """生成图片"""
+        request_dict = request.model_dump()
+        # 移除值为null的
+        request_dict = {k: v for k, v in request_dict.items() if v is not None}
+        api_key = settings.PAID_KEY
+        return await self.api_client.generate_images(request_dict, api_key)
+
+    async def create_embeddings(
+        self,
+        input_text: str,
+        model: str,
+        api_key: str,
+    ) -> Dict[str, Any]:
+        """创建嵌入"""
+        return await self.api_client.create_embeddings(input_text, model, api_key)
+
+    async def _handle_normal_completion(
+        self, model: str, request: dict, api_key: str
+    ) -> Dict[str, Any]:
+        """处理普通聊天完成"""
+        start_time = time.perf_counter()
+        request_datetime = datetime.datetime.now()
+        is_success = False
+        status_code = None
+        response = None
+        try:
+            response = await self.api_client.generate_content(request, api_key)
+            is_success = True
+            status_code = 200
+            return response
+        except Exception as e:
+            is_success = False
+            error_log_msg = str(e)
+            logger.error(f"Normal API call failed with error: {error_log_msg}")
+            # Try to parse status code from exception
+            match = re.search(r"status code (\d+)", error_log_msg)
+            if match:
+                status_code = int(match.group(1))
+            else:
+                status_code = 500
+
+            await add_error_log(
+                gemini_key=api_key,
+                model_name=model,
+                error_type="openai-compatiable-non-stream",
+                error_log=error_log_msg,
+                error_code=status_code,
+                request_msg=request,
+            )
+            raise e
+        finally:
+            end_time = time.perf_counter()
+            latency_ms = int((end_time - start_time) * 1000)
+            await add_request_log(
+                model_name=model,
+                api_key=api_key,
+                is_success=is_success,
+                status_code=status_code,
+                latency_ms=latency_ms,
+                request_time=request_datetime,
+            )
+
+    async def _handle_stream_completion(
+        self, model: str, payload: dict, api_key: str
+    ) -> AsyncGenerator[str, None]:
+        """处理流式聊天完成，添加重试逻辑"""
+        retries = 0
+        max_retries = settings.MAX_RETRIES
+        is_success = False
+        status_code = None
+        final_api_key = api_key
+
+        while retries < max_retries:
+            start_time = time.perf_counter()
+            request_datetime = datetime.datetime.now()
+            current_attempt_key = api_key
+            final_api_key = current_attempt_key
+            try:
+                async for line in self.api_client.stream_generate_content(
+                    payload, current_attempt_key
+                ):
+                    if line.startswith("data:"):
+                        # print(line)
+                        yield line + "\n\n"
+                logger.info("Streaming completed successfully")
+                is_success = True
+                status_code = 200
+                break  # 成功后退出循环
+            except Exception as e:
+                retries += 1
+                is_success = False
+                error_log_msg = str(e)
+                logger.warning(
+                    f"Streaming API call failed with error: {error_log_msg}. Attempt {retries} of {max_retries}"
+                )
+                # Parse error code for logging
+                match = re.search(r"status code (\d+)", error_log_msg)
+                if match:
+                    status_code = int(match.group(1))
+                else:
+                    status_code = 500
+
+                # Log error to error log table
+                await add_error_log(
+                    gemini_key=current_attempt_key,
+                    model_name=model,
+                    error_type="openai-compatiable-stream",
+                    error_log=error_log_msg,
+                    error_code=status_code,
+                    request_msg=payload,
+                )
+
+                # Attempt to switch API Key
+                # Ensure key_manager is available (might need adjustment if not always passed)
+                if self.key_manager:
+                    api_key = await self.key_manager.handle_api_failure(
+                        current_attempt_key, retries
+                    )
+                    if api_key:
+                        logger.info(f"Switched to new API key: {api_key}")
+                    else:
+                        logger.error(
+                            f"No valid API key available after {retries} retries."
+                        )
+                        break 
+                else:
+                    logger.error("KeyManager not available for retry logic.")
+                    break 
+
+                if retries >= max_retries:
+                    logger.error(f"Max retries ({max_retries}) reached for streaming.")
+                    break
+            finally:
+                # Log the final outcome of the streaming request
+                end_time = time.perf_counter()
+                latency_ms = int((end_time - start_time) * 1000)
+                await add_request_log(
+                    model_name=model,
+                    api_key=final_api_key,
+                    is_success=is_success,
+                    status_code=status_code,
+                    latency_ms=latency_ms,
+                    request_time=request_datetime,
+                )
+                # If the loop finished due to failure, yield error and DONE
+                if not is_success and retries >= max_retries:
+                    yield f"data: {json.dumps({'error': 'Streaming failed after retries'})}\n\n"
+                    yield "data: [DONE]\n\n"
+                    
+    

app/service/request_log/request_log_service.py

@@ -0,0 +1,50 @@
+"""
+Service for request log operations.
+"""
+
+from datetime import datetime, timedelta
+
+from sqlalchemy import delete
+
+from app import database
+from app.config.config import settings
+from app.database.models import RequestLog
+from app.log.logger import Logger
+
+logger = Logger.setup_logger("request_log_service")
+
+
+async def delete_old_request_logs_task():
+    """
+    定时删除旧的请求日志。
+    """
+    if not settings.AUTO_DELETE_REQUEST_LOGS_ENABLED:
+        logger.info(
+            "Auto-delete for request logs is disabled by settings. Skipping task."
+        )
+        return
+
+    days_to_keep = settings.AUTO_DELETE_REQUEST_LOGS_DAYS
+    logger.info(
+        f"Starting scheduled task to delete old request logs older than {days_to_keep} days."
+    )
+
+    try:
+        cutoff_date = datetime.now(datetime.timezone.utc) - timedelta(days=days_to_keep)
+
+        query = delete(RequestLog).where(RequestLog.request_time < cutoff_date)
+
+        if not database.is_connected:
+            logger.info("Connecting to database for request log deletion.")
+            await database.connect()
+
+        result = await database.execute(query)
+        logger.info(
+            f"Request logs older than {cutoff_date} potentially deleted. Rows affected: {result.rowcount if result else 'N/A'}"
+        )
+
+    except Exception as e:
+        logger.error(
+            f"An error occurred during the scheduled request log deletion: {str(e)}",
+            exc_info=True,
+        )

app/service/stats/stats_service.py

@@ -0,0 +1,255 @@
+# app/service/stats_service.py
+
+import datetime
+
+from sqlalchemy import and_, case, func, or_, select
+
+from app.database.connection import database
+from app.database.models import RequestLog
+from app.log.logger import get_stats_logger
+
+logger = get_stats_logger()
+
+
+class StatsService:
+    """Service class for handling statistics related operations."""
+
+    async def get_calls_in_last_seconds(self, seconds: int) -> dict[str, int]:
+        """获取过去 N 秒内的调用次数 (总数、成功、失败)"""
+        try:
+            cutoff_time = datetime.datetime.now() - datetime.timedelta(seconds=seconds)
+            query = select(
+                func.count(RequestLog.id).label("total"),
+                func.sum(
+                    case(
+                        (
+                            and_(
+                                RequestLog.status_code >= 200,
+                                RequestLog.status_code < 300,
+                            ),
+                            1,
+                        ),
+                        else_=0,
+                    )
+                ).label("success"),
+                func.sum(
+                    case(
+                        (
+                            or_(
+                                RequestLog.status_code < 200,
+                                RequestLog.status_code >= 300,
+                            ),
+                            1,
+                        ),
+                        (RequestLog.status_code is None, 1),  # type: ignore
+                        else_=0,
+                    )
+                ).label("failure"),
+            ).where(RequestLog.request_time >= cutoff_time)
+            result = await database.fetch_one(query)
+            if result:
+                return {
+                    "total": result["total"] or 0,
+                    "success": result["success"] or 0,
+                    "failure": result["failure"] or 0,
+                }
+            return {"total": 0, "success": 0, "failure": 0}
+        except Exception as e:
+            logger.error(f"Failed to get calls in last {seconds} seconds: {e}")
+            return {"total": 0, "success": 0, "failure": 0}
+
+    async def get_calls_in_last_minutes(self, minutes: int) -> dict[str, int]:
+        """获取过去 N 分钟内的调用次数 (总数、成功、失败)"""
+        return await self.get_calls_in_last_seconds(minutes * 60)
+
+    async def get_calls_in_last_hours(self, hours: int) -> dict[str, int]:
+        """获取过去 N 小时内的调用次数 (总数、成功、失败)"""
+        return await self.get_calls_in_last_seconds(hours * 3600)
+
+    async def get_calls_in_current_month(self) -> dict[str, int]:
+        """获取当前自然月内的调用次数 (总数、成功、失败)"""
+        try:
+            now = datetime.datetime.now()
+            start_of_month = now.replace(
+                day=1, hour=0, minute=0, second=0, microsecond=0
+            )
+            query = select(
+                func.count(RequestLog.id).label("total"),
+                func.sum(
+                    case(
+                        (
+                            and_(
+                                RequestLog.status_code >= 200,
+                                RequestLog.status_code < 300,
+                            ),
+                            1,
+                        ),
+                        else_=0,
+                    )
+                ).label("success"),
+                func.sum(
+                    case(
+                        (
+                            or_(
+                                RequestLog.status_code < 200,
+                                RequestLog.status_code >= 300,
+                            ),
+                            1,
+                        ),
+                        (RequestLog.status_code is None, 1),  # type: ignore
+                        else_=0,
+                    )
+                ).label("failure"),
+            ).where(RequestLog.request_time >= start_of_month)
+            result = await database.fetch_one(query)
+            if result:
+                return {
+                    "total": result["total"] or 0,
+                    "success": result["success"] or 0,
+                    "failure": result["failure"] or 0,
+                }
+            return {"total": 0, "success": 0, "failure": 0}
+        except Exception as e:
+            logger.error(f"Failed to get calls in current month: {e}")
+            return {"total": 0, "success": 0, "failure": 0}
+
+    async def get_api_usage_stats(self) -> dict:
+        """获取所有需要的 API 使用统计数据 (总数、成功、失败)"""
+        try:
+            stats_1m = await self.get_calls_in_last_minutes(1)
+            stats_1h = await self.get_calls_in_last_hours(1)
+            stats_24h = await self.get_calls_in_last_hours(24)
+            stats_month = await self.get_calls_in_current_month()
+
+            return {
+                "calls_1m": stats_1m,
+                "calls_1h": stats_1h,
+                "calls_24h": stats_24h,
+                "calls_month": stats_month,
+            }
+        except Exception as e:
+            logger.error(f"Failed to get API usage stats: {e}")
+            default_stat = {"total": 0, "success": 0, "failure": 0}
+            return {
+                "calls_1m": default_stat.copy(),
+                "calls_1h": default_stat.copy(),
+                "calls_24h": default_stat.copy(),
+                "calls_month": default_stat.copy(),
+            }
+
+    async def get_api_call_details(self, period: str) -> list[dict]:
+        """
+        获取指定时间段内的 API 调用详情
+
+        Args:
+            period: 时间段标识 ('1m', '1h', '24h')
+
+        Returns:
+            包含调用详情的字典列表，每个字典包含 timestamp, key, model, status
+
+        Raises:
+            ValueError: 如果 period 无效
+        """
+        now = datetime.datetime.now()
+        if period == "1m":
+            start_time = now - datetime.timedelta(minutes=1)
+        elif period == "1h":
+            start_time = now - datetime.timedelta(hours=1)
+        elif period == "24h":
+            start_time = now - datetime.timedelta(hours=24)
+        else:
+            raise ValueError(f"无效的时间段标识: {period}")
+
+        try:
+            query = (
+                select(
+                    RequestLog.request_time.label("timestamp"),
+                    RequestLog.api_key.label("key"),
+                    RequestLog.model_name.label("model"),
+                    RequestLog.status_code,  # We might need to map this to 'success'/'failure' later
+                )
+                .where(RequestLog.request_time >= start_time)
+                .order_by(RequestLog.request_time.desc())
+            )  # Order by most recent first
+
+            results = await database.fetch_all(query)
+
+            # Convert results to list of dicts and map status_code
+            details = []
+            for row in results:
+                status = "failure"  # 默认状态为 failure，如果 status_code 有效且在 200-299 范围内则更新为 success
+                if row["status_code"] is not None:  # 检查 status_code 是否为空
+                    status = "success" if 200 <= row["status_code"] < 300 else "failure"
+                details.append(
+                    {
+                        "timestamp": row[
+                            "timestamp"
+                        ].isoformat(),  # Use ISO format for JS compatibility
+                        "key": row["key"],
+                        "model": row["model"],
+                        "status": status,
+                    }
+                )
+            logger.info(
+                f"Retrieved {len(details)} API call details for period '{period}'"
+            )
+            return details
+
+        except Exception as e:
+            logger.error(f"Failed to get API call details for period '{period}': {e}")
+            # Re-raise the exception to be handled by the route
+            raise
+
+    async def get_key_usage_details_last_24h(self, key: str) -> dict | None:
+        """
+        获取指定 API 密钥在过去 24 小时内按模型统计的调用次数。
+
+        Args:
+            key: 要查询的 API 密钥。
+
+        Returns:
+            一个字典，其中键是模型名称，值是调用次数。
+            如果查询出错或没有找到记录，可能返回 None 或空字典。
+            Example: {"gemini-pro": 10, "gemini-1.5-pro-latest": 5}
+        """
+        logger.info(
+            f"Fetching usage details for key ending in ...{key[-4:]} for the last 24h."
+        )
+        cutoff_time = datetime.datetime.now() - datetime.timedelta(hours=24)
+
+        try:
+            query = (
+                select(
+                    RequestLog.model_name, func.count(RequestLog.id).label("call_count")
+                )
+                .where(
+                    RequestLog.api_key == key,
+                    RequestLog.request_time >= cutoff_time,
+                    RequestLog.model_name.isnot(None),  # Ensure model_name is not null
+                )
+                .group_by(RequestLog.model_name)
+                .order_by(func.count(RequestLog.id).desc())  # Order by count descending
+            )
+
+            results = await database.fetch_all(query)
+
+            if not results:
+                logger.info(
+                    f"No usage details found for key ending in ...{key[-4:]} in the last 24h."
+                )
+                return {}  # Return empty dict if no records found
+
+            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}"
+            )
+            return usage_details
+
+        except Exception as e:
+            logger.error(
+                f"Failed to get key usage details for key ending in ...{key[-4:]}: {e}",
+                exc_info=True,
+            )
+            # Depending on requirements, you might return None or raise the exception
+            # Raising allows the route handler to return a 500 error.
+            raise  # Re-raise the exception

app/service/stats_service.py

@@ -1,123 +0,0 @@
-# app/service/stats_service.py
-
-import datetime
-from sqlalchemy import select, func
-
-from app.database.connection import database
-from app.database.models import RequestLog
-from app.log.logger import get_stats_logger
-
-logger = get_stats_logger()
-
-async def get_calls_in_last_seconds(seconds: int) -> int:
-    """获取过去 N 秒内的调用次数 (包括成功和失败)"""
-    try:
-        cutoff_time = datetime.datetime.now() - datetime.timedelta(seconds=seconds)
-        query = select(func.count(RequestLog.id)).where(
-            RequestLog.request_time >= cutoff_time
-        )
-        count_result = await database.fetch_one(query)
-        return count_result[0] if count_result else 0
-    except Exception as e:
-        logger.error(f"Failed to get calls in last {seconds} seconds: {e}")
-        return 0 # Return 0 on error
-
-async def get_calls_in_last_minutes(minutes: int) -> int:
-    """获取过去 N 分钟内的调用次数 (包括成功和失败)"""
-    return await get_calls_in_last_seconds(minutes * 60)
-
-async def get_calls_in_last_hours(hours: int) -> int:
-    """获取过去 N 小时内的调用次数 (包括成功和失败)"""
-    return await get_calls_in_last_seconds(hours * 3600)
-
-async def get_calls_in_current_month() -> int:
-    """获取当前自然月内的调用次数 (包括成功和失败)"""
-    try:
-        now = datetime.datetime.now()
-        start_of_month = now.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
-        query = select(func.count(RequestLog.id)).where(
-            RequestLog.request_time >= start_of_month
-        )
-        count_result = await database.fetch_one(query)
-        return count_result[0] if count_result else 0
-    except Exception as e:
-        logger.error(f"Failed to get calls in current month: {e}")
-        return 0 # Return 0 on error
-
-async def get_api_usage_stats() -> dict:
-    """获取所有需要的 API 使用统计数据"""
-    try:
-        calls_1m = await get_calls_in_last_minutes(1)
-        calls_1h = await get_calls_in_last_hours(1)
-        calls_24h = await get_calls_in_last_hours(24)
-        calls_month = await get_calls_in_current_month()
-
-        return {
-            "calls_1m": calls_1m,
-            "calls_1h": calls_1h,
-            "calls_24h": calls_24h,
-            "calls_month": calls_month,
-        }
-    except Exception as e:
-        logger.error(f"Failed to get API usage stats: {e}")
-        # Return default values on error
-        return {
-            "calls_1m": 0,
-            "calls_1h": 0,
-            "calls_24h": 0,
-            "calls_month": 0,
-        }
-
-
-async def get_api_call_details(period: str) -> list[dict]:
-    """
-    获取指定时间段内的 API 调用详情
-
-    Args:
-        period: 时间段标识 ('1m', '1h', '24h')
-
-    Returns:
-        包含调用详情的字典列表，每个字典包含 timestamp, key, model, status
-
-    Raises:
-        ValueError: 如果 period 无效
-    """
-    now = datetime.datetime.now()
-    if period == '1m':
-        start_time = now - datetime.timedelta(minutes=1)
-    elif period == '1h':
-        start_time = now - datetime.timedelta(hours=1)
-    elif period == '24h':
-        start_time = now - datetime.timedelta(hours=24)
-    else:
-        raise ValueError(f"无效的时间段标识: {period}")
-
-    try:
-        query = select(
-            RequestLog.request_time.label("timestamp"),
-            RequestLog.api_key.label("key"),
-            RequestLog.model_name.label("model"),
-            RequestLog.status_code # We might need to map this to 'success'/'failure' later
-        ).where(
-            RequestLog.request_time >= start_time
-        ).order_by(RequestLog.request_time.desc()) # Order by most recent first
-
-        results = await database.fetch_all(query)
-
-        # Convert results to list of dicts and map status_code
-        details = []
-        for row in results:
-            status = 'success' if 200 <= row['status_code'] < 300 else 'failure'
-            details.append({
-                "timestamp": row['timestamp'].isoformat(), # Use ISO format for JS compatibility
-                "key": row['key'],
-                "model": row['model'],
-                "status": status
-            })
-        logger.info(f"Retrieved {len(details)} API call details for period '{period}'")
-        return details
-
-    except Exception as e:
-        logger.error(f"Failed to get API call details for period '{period}': {e}")
-        # Re-raise the exception to be handled by the route
-        raise

app/service/update/update_service.py

@@ -0,0 +1,108 @@
+import httpx
+from packaging import version
+from typing import Optional, Tuple
+
+from app.config.config import settings
+from app.log.logger import get_update_logger
+
+logger = get_update_logger()
+
+# GitHub repository details are read from settings (defined in app/config/config.py or environment variables)
+
+# GITHUB_API_URL will be constructed inside the function to ensure settings are loaded
+
+VERSION_FILE_PATH = "VERSION" # Path relative to project root
+
+async def check_for_updates() -> Tuple[bool, Optional[str], Optional[str]]:
+    """
+    通过比较当前版本与最新的 GitHub release 来检查应用程序更新。
+
+    Returns:
+        Tuple[bool, Optional[str], Optional[str]]: 一个元组，包含：
+            - bool: 如果有可用更新则为 True，否则为 False。
+            - Optional[str]: 如果有可用更新，则为最新的版本字符串，否则为 None。
+            - Optional[str]: 如果检查失败，则为错误消息，否则为 None。
+    """
+    try:
+        # Read current version from VERSION file
+        # Ensure the path is correct relative to the execution context or use absolute path if needed
+        # Assuming execution from project root d:/develop/pythonProjects/gemini-balance
+        with open(VERSION_FILE_PATH, 'r', encoding='utf-8') as f:
+            current_v = f.read().strip()
+        if not current_v:
+            logger.error(f"VERSION file ('{VERSION_FILE_PATH}') is empty.")
+            return False, None, f"VERSION file ('{VERSION_FILE_PATH}') is empty."
+    except FileNotFoundError:
+        logger.error(f"VERSION file not found at '{VERSION_FILE_PATH}'. Make sure it exists in the project root.")
+        return False, None, f"VERSION file not found at '{VERSION_FILE_PATH}'."
+    except IOError as e:
+        logger.error(f"Error reading VERSION file ('{VERSION_FILE_PATH}'): {e}")
+        return False, None, f"Error reading VERSION file ('{VERSION_FILE_PATH}')."
+
+    logger.info(f"当前应用程序版本 (from {VERSION_FILE_PATH}): {current_v}")
+
+    # Check if repository details are configured in settings
+    if not settings.GITHUB_REPO_OWNER or not settings.GITHUB_REPO_NAME or \
+       settings.GITHUB_REPO_OWNER == "your_owner" or settings.GITHUB_REPO_NAME == "your_repo":
+        logger.warning("GitHub repository owner/name not configured in settings. Skipping update check.")
+        return False, None, "Update check skipped: Repository not configured in settings."
+
+    # Construct the API URL inside the function to ensure settings are loaded
+    github_api_url = f"https://api.github.com/repos/{settings.GITHUB_REPO_OWNER}/{settings.GITHUB_REPO_NAME}/releases/latest"
+    logger.debug(f"Checking for updates at URL: {github_api_url}") # Log the URL for debugging
+
+    try:
+        async with httpx.AsyncClient(timeout=10.0) as client:
+            # 添加 User-Agent 头，GitHub API 可能需要
+            headers = {
+                "Accept": "application/vnd.github.v3+json",
+                "User-Agent": f"{settings.GITHUB_REPO_NAME}-UpdateChecker/1.0" # Use repo name from settings for User-Agent
+            }
+            response = await client.get(github_api_url, headers=headers) # Use the locally constructed URL
+            response.raise_for_status() # 对错误的 HTTP 状态码（4xx 或 5xx）抛出异常
+
+            latest_release = response.json()
+            latest_v_str = latest_release.get("tag_name")
+
+            if not latest_v_str:
+                logger.warning("在最新的 GitHub release 响应中找不到 'tag_name'。")
+                return False, None, "无法从 GitHub 解析最新版本。"
+
+            # 移除 tag 名称中可能存在的 'v' 前缀
+            if latest_v_str.startswith('v'):
+                latest_v_str = latest_v_str[1:]
+
+            logger.info(f"在 GitHub 上找到的最新版本: {latest_v_str}")
+
+            # 比较版本
+            current_version = version.parse(current_v)
+            latest_version = version.parse(latest_v_str)
+
+            if latest_version > current_version:
+                logger.info(f"有可用更新: {current_v} -> {latest_v_str}")
+                return True, latest_v_str, None
+            else:
+                logger.info("应用程序已是最新版本。")
+                return False, None, None
+
+    except httpx.HTTPStatusError as e:
+        logger.error(f"检查更新时发生 HTTP 错误: {e.response.status_code} - {e.response.text}")
+        # 避免向用户显示详细的错误文本
+        error_msg = f"获取更新信息失败 (HTTP {e.response.status_code})。"
+        if e.response.status_code == 404:
+            error_msg += " 请检查仓库名称是否正确或仓库是否有发布版本。"
+        elif e.response.status_code == 403:
+             error_msg += " API 速率限制或权限问题。"
+        return False, None, error_msg
+    except httpx.RequestError as e:
+        logger.error(f"检查更新时发生网络错误: {e}")
+        return False, None, "更新检查期间发生网络错误。"
+    except version.InvalidVersion:
+        # Note: latest_v_str might not be defined if the error occurs before fetching it.
+        # Consider adding a check or default value for logging.
+        latest_v_str_for_log = latest_v_str if 'latest_v_str' in locals() else 'N/A'
+        logger.error(f"发现无效的版本格式。当前 (from {VERSION_FILE_PATH}): '{current_v}', 最新: '{latest_v_str_for_log}'")
+        return False, None, "遇到无效的版本格式。"
+    except Exception as e:
+        logger.error(f"更新检查期间发生意外错误: {e}", exc_info=True)
+        return False, None, "发生意外错误。"

app/static/js/auth.js

@@ -1,18 +0,0 @@
-if ('serviceWorker' in navigator) {
-    window.addEventListener('load', () => {
-        navigator.serviceWorker.register('/static/service-worker.js')
-            .then(registration => {
-                console.log('ServiceWorker注册成功:', registration.scope);
-            })
-            .catch(error => {
-                console.log('ServiceWorker注册失败:', error);
-            });
-    });
-}
-
-document.addEventListener('DOMContentLoaded', () => {
-    const copyrightYear = document.querySelector('.copyright script');
-    if (copyrightYear) {
-        copyrightYear.textContent = new Date().getFullYear();
-    }
-});

app/static/service-worker.js

@@ -17,13 +17,27 @@ self.addEventListener('install', event => {
 
 self.addEventListener('fetch', event => {
   event.respondWith(
-    caches.match(event.request)
+    caches.open(CACHE_NAME).then(cache => {
-      .then(response => {
+      // 1. 尝试从缓存获取
-        if (response) {
+      return cache.match(event.request).then(responseFromCache => {
-          return response;
+        // 2. 同时从网络获取 (后台进行)
-        }
+        const fetchPromise = fetch(event.request).then(responseFromNetwork => {
-        return fetch(event.request);
+          // 3. 网络请求成功，更新缓存
-      })
+          cache.put(event.request, responseFromNetwork.clone());
+          return responseFromNetwork;
+        }).catch(err => {
+          // 网络请求失败时，可以选择记录错误或不执行任何操作
+          console.error('Network fetch failed:', err);
+          // 确保即使网络失败，如果缓存存在，我们仍然返回缓存
+          // 如果缓存也不存在，则此 Promise 会 reject
+          throw err;
+        });
+
+        // 4. 如果缓存存在，立即返回缓存；否则等待网络响应
+        //    后台的网络请求仍在进行，用于更新缓存
+        return responseFromCache || fetchPromise;
+      });
+    })
   );
 });
 

app/templates/base.html

@@ -1,265 +1,369 @@
 <!DOCTYPE html>
 <html lang="zh-CN">
-<head>
+  <head>
-    <meta charset="UTF-8">
+    <meta charset="UTF-8" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>{% block title %}Gemini Balance{% endblock %}</title>
-    <link rel="manifest" href="/static/manifest.json">
+    <link rel="manifest" href="/static/manifest.json" />
-    <meta name="theme-color" content="#4F46E5">
+    <meta name="theme-color" content="#4F46E5" />
-    <meta name="apple-mobile-web-app-capable" content="yes">
+    <meta name="apple-mobile-web-app-capable" content="yes" />
-    <meta name="apple-mobile-web-app-status-bar-style" content="black">
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
-    <meta name="apple-mobile-web-app-title" content="GBalance">
+    <meta name="apple-mobile-web-app-title" content="GBalance" />
-    <link rel="icon" href="/static/icons/icon-192x192.png">
+    <link rel="icon" href="/static/icons/icon-192x192.png" />
-    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap" rel="stylesheet">
+    <link
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+      href="https://fonts.googleapis.com/css2?family=Inter:wght@300;400;500;600;700&display=swap"
+      rel="stylesheet"
+    />
+    <link
+      rel="stylesheet"
+      href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css"
+    />
     <script src="https://cdn.tailwindcss.com"></script>
     <script>
-        tailwind.config = {
+      tailwind.config = {
-            theme: {
+        theme: {
-                extend: {
+          extend: {
-                    colors: {
+            colors: {
-                        primary: {
+              primary: {
-                            50: '#eef2ff',
+                50: "#eef2ff",
-                            100: '#e0e7ff',
+                100: "#e0e7ff",
-                            200: '#c7d2fe',
+                200: "#c7d2fe",
-                            300: '#a5b4fc',
+                300: "#a5b4fc",
-                            400: '#818cf8',
+                400: "#818cf8",
-                            500: '#6366f1',
+                500: "#6366f1",
-                            600: '#4f46e5',
+                600: "#4f46e5",
-                            700: '#4338ca',
+                700: "#4338ca",
-                            800: '#3730a3',
+                800: "#3730a3",
-                            900: '#312e81',
+                900: "#312e81",
-                        },
+              },
-                        success: {
+              success: {
-                            50: '#ecfdf5',
+                50: "#ecfdf5",
-                            500: '#10b981',
+                500: "#10b981",
-                            600: '#059669'
+                600: "#059669",
-                        },
+              },
-                        danger: {
+              danger: {
-                            50: '#fef2f2',
+                50: "#fef2f2",
-                            500: '#ef4444',
+                500: "#ef4444",
-                            600: '#dc2626'
+                600: "#dc2626",
-                        }
+              },
-                    },
+            },
-                    fontFamily: {
+            fontFamily: {
-                        sans: ['Inter', 'sans-serif'],
+              sans: ["Inter", "sans-serif"],
-                        mono: ['JetBrains Mono', 'SFMono-Regular', 'Menlo', 'Monaco', 'Consolas', 'monospace'],
+              mono: [
-                    },
+                "JetBrains Mono",
-                    animation: {
+                "SFMono-Regular",
-                        'fade-in': 'fadeIn 0.5s ease-out',
+                "Menlo",
-                        'slide-up': 'slideUp 0.5s ease-out',
+                "Monaco",
-                        'slide-down': 'slideDown 0.5s ease-out',
+                "Consolas",
-                        'shake': 'shake 0.5s ease-in-out',
+                "monospace",
-                        'spin': 'spin 1s linear infinite',
+              ],
-                    },
+            },
-                    keyframes: {
+            animation: {
-                        fadeIn: {
+              "fade-in": "fadeIn 0.5s ease-out",
-                            '0%': { opacity: '0' },
+              "slide-up": "slideUp 0.5s ease-out",
-                            '100%': { opacity: '1' },
+              "slide-down": "slideDown 0.5s ease-out",
-                        },
+              shake: "shake 0.5s ease-in-out",
-                        slideUp: {
+              spin: "spin 1s linear infinite",
-                            '0%': { transform: 'translateY(20px)', opacity: '0' },
+            },
-                            '100%': { transform: 'translateY(0)', opacity: '1' },
+            keyframes: {
-                        },
+              fadeIn: {
-                        slideDown: {
+                "0%": { opacity: "0" },
-                            '0%': { transform: 'translateY(-20px)', opacity: '0' },
+                "100%": { opacity: "1" },
-                            '100%': { transform: 'translateY(0)', opacity: '1' },
+              },
-                        },
+              slideUp: {
-                        shake: {
+                "0%": { transform: "translateY(20px)", opacity: "0" },
-                            '0%, 100%': { transform: 'translateX(0)' },
+                "100%": { transform: "translateY(0)", opacity: "1" },
-                            '25%': { transform: 'translateX(-5px)' },
+              },
-                            '75%': { transform: 'translateX(5px)' },
+              slideDown: {
-                        },
+                "0%": { transform: "translateY(-20px)", opacity: "0" },
-                         spin: {
+                "100%": { transform: "translateY(0)", opacity: "1" },
-                            '0%': { transform: 'rotate(0deg)' },
+              },
-                            '100%': { transform: 'rotate(360deg)' },
+              shake: {
-                        },
+                "0%, 100%": { transform: "translateX(0)" },
-                    },
+                "25%": { transform: "translateX(-5px)" },
-                }
+                "75%": { transform: "translateX(5px)" },
-            }
+              },
-        }
+              spin: {
+                "0%": { transform: "rotate(0deg)" },
+                "100%": { transform: "rotate(360deg)" },
+              },
+            },
+          },
+        },
+      };
     </script>
     <style>
-        .glass-card {
+      .glass-card {
-            background: rgba(255, 255, 255, 0.85); /* Slightly increased opacity for better readability */
+          background: rgba(255, 255, 255, 0.85); /* Slightly increased opacity for better readability */
-            backdrop-filter: blur(16px);
+          backdrop-filter: blur(16px);
-            -webkit-backdrop-filter: blur(16px);
+          -webkit-backdrop-filter: blur(16px);
-            border: 1px solid rgba(255, 255, 255, 0.18); /* Subtle border */
+          border: 1px solid rgba(255, 255, 255, 0.18); /* Subtle border */
-        }
+      }
-        .bg-gradient {
+      .bg-gradient {
-            background: linear-gradient(135deg, #4F46E5 0%, #7C3AED 50%, #EC4899 100%);
+          background: linear-gradient(135deg, #4F46E5 0%, #7C3AED 50%, #EC4899 100%);
-        }
+      }
-        /* Scrollbar styling */
+      /* Scrollbar styling */
-        ::-webkit-scrollbar {
+      ::-webkit-scrollbar {
-            width: 8px;
+          width: 8px;
-            height: 8px;
+          height: 8px;
-        }
+      }
-        ::-webkit-scrollbar-track {
+      ::-webkit-scrollbar-track {
-            background: rgba(243, 244, 246, 0.8); /* bg-gray-100 with opacity */
+          background: rgba(243, 244, 246, 0.8); /* bg-gray-100 with opacity */
-            border-radius: 10px;
+          border-radius: 10px;
-        }
+      }
-        ::-webkit-scrollbar-thumb {
+      ::-webkit-scrollbar-thumb {
-            background: rgba(79, 70, 229, 0.4); /* primary-600 with opacity */
+          background: rgba(79, 70, 229, 0.4); /* primary-600 with opacity */
-            border-radius: 10px;
+          border-radius: 10px;
-        }
+      }
-        ::-webkit-scrollbar-thumb:hover {
+      ::-webkit-scrollbar-thumb:hover {
-            background: rgba(79, 70, 229, 0.6); /* primary-600 with more opacity */
+          background: rgba(79, 70, 229, 0.6); /* primary-600 with more opacity */
-        }
+      }
-        /* Basic modal styles */
+      /* Basic modal styles */
-        .modal {
+      .modal {
-            display: none;
+          display: none;
-            position: fixed;
+          position: fixed;
-            z-index: 50;
+          z-index: 50;
-            left: 0;
+          left: 0;
-            top: 0;
+          top: 0;
-            width: 100%;
+          width: 100%;
-            height: 100%;
+          height: 100%;
-            background-color: rgba(0,0,0,0.5);
+          background-color: rgba(0,0,0,0.5);
-            backdrop-filter: blur(4px);
+          backdrop-filter: blur(4px);
-        }
+      }
-        .modal.show {
+      .modal.show {
-            display: flex;
+          display: flex;
-            align-items: center;
+          align-items: center;
-            justify-content: center;
+          justify-content: center;
-        }
+      }
-        /* Loading spinner */
+      /* Loading spinner */
-        .loading-spin {
+      .loading-spin {
-            animation: spin 1s linear infinite;
+          animation: spin 1s linear infinite;
-        }
+      }
-        @keyframes spin {
+      @keyframes spin {
-            from { transform: rotate(0deg); }
+          from { transform: rotate(0deg); }
-            to { transform: rotate(360deg); }
+          to { transform: rotate(360deg); }
-        }
+      }
-        /* Notification */
+      /* Notification */
-        .notification {
+      .notification {
-            position: fixed;
+          position: fixed;
-            bottom: 5rem; /* Adjusted from bottom-20 */
+          bottom: 5rem; /* Adjusted from bottom-20 */
-            left: 50%;
+          left: 50%;
-            transform: translateX(-50%);
+          transform: translateX(-50%);
-            padding: 0.75rem 1.25rem; /* px-5 py-3 */
+          padding: 0.75rem 1.25rem; /* px-5 py-3 */
-            border-radius: 0.5rem; /* rounded-lg */
+          border-radius: 0.5rem; /* rounded-lg */
-            background-color: rgba(0, 0, 0, 0.8);
+          background-color: rgba(0, 0, 0, 0.8);
-            color: white;
+          color: white;
-            font-weight: 500; /* font-medium */
+          font-weight: 500; /* font-medium */
-            z-index: 50;
+          z-index: 1000; /* Increased z-index */
-            opacity: 0;
+          opacity: 0;
-            transition: opacity 0.3s ease-in-out, transform 0.3s ease-in-out;
+          transition: opacity 0.3s ease-in-out, transform 0.3s ease-in-out;
-        }
+      }
-        .notification.show {
+      .notification.show {
-            opacity: 1;
+          opacity: 1;
-            transform: translate(-50%, 0);
+          transform: translate(-50%, 0);
-        }
+      }
-        .notification.error {
+      .notification.error {
-             background-color: rgba(220, 38, 38, 0.8); /* danger-600 with opacity */
+           background-color: rgba(220, 38, 38, 0.8); /* danger-600 with opacity */
-        }
+      }
-        /* Scroll buttons */
+      /* Scroll buttons */
-        .scroll-buttons {
+      .scroll-buttons {
-            position: fixed;
+          position: fixed;
-            right: 1.25rem; /* right-5 */
+          right: 1.25rem; /* right-5 */
-            bottom: 5rem; /* bottom-20 */
+          bottom: 5rem; /* bottom-20 */
-            display: flex;
+          display: flex;
-            flex-direction: column;
+          flex-direction: column;
-            gap: 0.5rem; /* gap-2 */
+          gap: 0.5rem; /* gap-2 */
-            z-index: 10;
+          z-index: 10;
-        }
+      }
-        .scroll-button {
+      .scroll-button {
-            width: 2.5rem; /* w-10 */
+          width: 2.5rem; /* w-10 */
-            height: 2.5rem; /* h-10 */
+          height: 2.5rem; /* h-10 */
-            background-color: #4f46e5; /* bg-primary-600 */
+          background-color: #4f46e5; /* bg-primary-600 */
-            color: white;
+          color: white;
-            border-radius: 9999px; /* rounded-full */
+          border-radius: 9999px; /* rounded-full */
-            box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06); /* shadow-md */
+          box-shadow: 0 4px 6px -1px rgba(0, 0, 0, 0.1), 0 2px 4px -1px rgba(0, 0, 0, 0.06); /* shadow-md */
-            display: flex;
+          display: flex;
-            align-items: center;
+          align-items: center;
-            justify-content: center;
+          justify-content: center;
-            transition: all 0.3s ease-in-out;
+          transition: all 0.3s ease-in-out;
-        }
+      }
-        .scroll-button:hover {
+      .scroll-button:hover {
-            background-color: #4338ca; /* hover:bg-primary-700 */
+          background-color: #4338ca; /* hover:bg-primary-700 */
-            box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05); /* hover:shadow-lg */
+          box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05); /* hover:shadow-lg */
-        }
+      }
-        {% block head_extra_styles %}
+      {% block head_extra_styles %}
-        {% endblock %}
+      {% endblock %}
     </style>
     {% block head_extra_scripts %}{% endblock %}
-</head>
+  </head>
-<body class="bg-gradient min-h-screen text-gray-800 pt-6 pb-16">
+  <body class="bg-gradient min-h-screen text-gray-800 pt-6 pb-16">
-
     {% block content %}{% endblock %}
 
     <!-- 底部版权 -->
-    <div class="fixed bottom-0 left-0 w-full py-3 bg-white bg-opacity-80 backdrop-blur-md text-center text-sm text-gray-600 border-t border-gray-200">
+    <div
-        © <span id="copyright-year"></span> by
+      class="fixed bottom-0 left-0 w-full py-3 bg-white bg-opacity-80 backdrop-blur-md text-sm text-gray-800 border-t border-gray-200 flex flex-col items-center space-y-1"
-        <a href="https://linux.do/u/snaily" target="_blank" class="text-primary-600 hover:text-primary-800 transition duration-300">
+    >
-            <img src="https://linux.do/user_avatar/linux.do/snaily/288/306510_2.gif" alt="snaily" class="inline-block w-5 h-5 rounded-full align-middle mr-1">snaily
+      <!-- 第一行 -->
-        </a> |
+      <div class="flex items-center justify-center space-x-2">
-        <a href="https://github.com/snailyp/gemini-balance" target="_blank" class="text-primary-600 hover:text-primary-800 transition duration-300">
+        <span>© <span id="copyright-year"></span> by</span>
-            <i class="fab fa-github"></i> GitHub
+        <a
+          href="https://linux.do/u/snaily"
+          target="_blank"
+          class="text-primary-600 hover:text-primary-800 transition duration-300 flex items-center"
+        >
+          <img
+            src="https://linux.do/user_avatar/linux.do/snaily/288/306510_2.gif"
+            alt="snaily"
+            class="inline-block w-5 h-5 rounded-full align-middle mr-1"
+          />snaily
         </a>
+        <span class="text-gray-400">|</span>
+        <a
+          href="https://github.com/snailyp/gemini-balance"
+          target="_blank"
+          class="text-primary-600 hover:text-primary-800 transition duration-300 flex items-center"
+        >
+          <i class="fab fa-github mr-1"></i> GitHub
+        </a>
+      </div>
+      <!-- 第二行 -->
+      <div class="flex items-center justify-center space-x-2 text-xs">
+        <a
+          href="https://gb-docs.snaily.top/guide/supportme.html"
+          target="_blank"
+          class="text-primary-600 hover:text-primary-800 transition duration-300 flex items-center"
+        >
+          <i class="fas fa-drumstick-bite text-yellow-600 mr-1"></i> 给作者加鸡腿
+        </a>
+        <span class="text-gray-400">|</span>
+        <a
+          href="https://gb-docs.snaily.top"
+          target="_blank"
+          class="text-primary-600 hover:text-primary-800 transition duration-300 flex items-center"
+        >
+          <i class="fas fa-book mr-1"></i> 在线文档
+        </a>
+        <span class="text-gray-400">|</span>
+        <span class="text-yellow-600 font-semibold flex items-center">
+          <i class="fas fa-exclamation-triangle mr-1"></i>免费项目，谨防诈骗
+        </span>
+        <span id="version-info-container" class="inline-flex items-center">
+          <!-- Version info will be loaded here by JavaScript -->
+        </span>
+      </div>
     </div>
 
     <!-- 通用JS -->
     <script>
-        // 设置版权年份
+      // 设置版权年份
-        document.getElementById('copyright-year').textContent = new Date().getFullYear();
+      document.getElementById("copyright-year").textContent =
+        new Date().getFullYear();
 
-        // 滚动到顶部/底部函数 (如果页面需要)
+      // 滚动到顶部/底部函数 (如果页面需要)
-        function scrollToTop() {
+      function scrollToTop() {
-            window.scrollTo({ top: 0, behavior: 'smooth' });
+        window.scrollTo({ top: 0, behavior: "smooth" });
-        }
+      }
-        function scrollToBottom() {
+      function scrollToBottom() {
-            window.scrollTo({ top: document.body.scrollHeight, behavior: 'smooth' });
+        window.scrollTo({
+          top: document.body.scrollHeight,
+          behavior: "smooth",
+        });
+      }
+
+      // 显示通知
+      function showNotification(message, type = "success", duration = 3000) {
+        const notification =
+          document.getElementById("notification") ||
+          createNotificationElement();
+        if (!notification) return;
+
+        notification.textContent = message;
+        notification.className = "notification show"; // Reset classes
+        if (type === "error") {
+          notification.classList.add("error");
         }
 
-        // 显示通知
+        // Clear previous timeout if exists
-        function showNotification(message, type = 'success', duration = 3000) {
+        if (notification.timeoutId) {
-            const notification = document.getElementById('notification') || createNotificationElement();
+          clearTimeout(notification.timeoutId);
-            if (!notification) return;
-
-            notification.textContent = message;
-            notification.className = 'notification show'; // Reset classes
-            if (type === 'error') {
-                notification.classList.add('error');
-            }
-
-            // Clear previous timeout if exists
-            if (notification.timeoutId) {
-                clearTimeout(notification.timeoutId);
-            }
-
-            notification.timeoutId = setTimeout(() => {
-                notification.classList.remove('show');
-                // Optional: remove the element after fade out if dynamically created
-                // setTimeout(() => notification.remove(), 300);
-            }, duration);
         }
 
-        // Helper to create notification element if it doesn't exist
+        notification.timeoutId = setTimeout(() => {
-        function createNotificationElement() {
+          notification.classList.remove("show");
-            let notification = document.getElementById('notification');
+          // Optional: remove the element after fade out if dynamically created
-            if (!notification) {
+          // setTimeout(() => notification.remove(), 300);
-                notification = document.createElement('div');
+        }, duration);
-                notification.id = 'notification';
+      }
-                notification.className = 'notification';
-                document.body.appendChild(notification);
-            }
-            return notification;
-        }
 
-        // 页面刷新带加载状态
+      // Helper to create notification element if it doesn't exist
-        function refreshPage(button) {
+      function createNotificationElement() {
-            if (button) {
+        let notification = document.getElementById("notification");
-                const icon = button.querySelector('i');
+        if (!notification) {
-                if (icon) {
+          notification = document.createElement("div");
-                    icon.classList.add('loading-spin');
+          notification.id = "notification";
-                }
+          notification.className = "notification";
-            }
+          document.body.appendChild(notification);
-            setTimeout(() => {
-                window.location.reload();
-            }, 300); // Short delay to show spinner
         }
+        return notification;
+      }
 
+      // 页面刷新带加载状态
+      function refreshPage(button) {
+        if (button) {
+          const icon = button.querySelector("i");
+          if (icon) {
+            icon.classList.add("loading-spin");
+          }
+        }
+        setTimeout(() => {
+          window.location.reload();
+        }, 300); // Short delay to show spinner
+      }
+
+      // --- Version Check ---
+      const versionInfoContainer = document.getElementById(
+        "version-info-container"
+      );
+
+      async function fetchVersionInfo() {
+        if (!versionInfoContainer) return;
+        versionInfoContainer.innerHTML =
+          '<span class="mx-1">|</span><span class="text-xs text-gray-700">检查更新中...</span>'; // Initial loading state
+
+        try {
+          const response = await fetch("/api/version/check");
+          if (!response.ok) {
+            throw new Error(`HTTP error! status: ${response.status}`);
+          }
+          const data = await response.json();
+
+          let versionHtml = `<span class="mx-1">|</span><span class="text-xs text-gray-800">v${data.current_version}</span>`;
+          if (data.update_available) {
+            versionHtml += `
+                        <span class="mx-1">|</span>
+                        <a href="https://github.com/snailyp/gemini-balance/releases/latest" target="_blank" class="text-yellow-600 hover:text-yellow-800 transition duration-300 animate-pulse">
+                            <i class="fas fa-arrow-up"></i> 新版本: v${data.latest_version}
+                        </a>`;
+          } else if (data.error_message) {
+            versionHtml += `
+                        <span class="mx-1">|</span>
+                        <span class="text-xs text-red-500" title="${data.error_message}">更新检查失败</span>`;
+          } else {
+            versionHtml += `<span class="mx-1">|</span><span class="text-xs text-green-500">已是最新</span>`; // Indicate up-to-date
+          }
+          versionInfoContainer.innerHTML = versionHtml;
+        } catch (error) {
+          console.error("Error fetching version info:", error);
+          versionInfoContainer.innerHTML = `<span class="mx-1">|</span><span class="text-xs text-red-500" title="无法连接到服务器或解析响应">更新检查失败</span>`;
+        }
+      }
+
+      // Fetch immediately on load
+      fetchVersionInfo();
+
+      // Fetch periodically (e.g., every hour)
+      setInterval(fetchVersionInfo, 3600000); // 3600000 ms = 1 hour
     </script>
     {% block body_scripts %}{% endblock %}
-</body>
+  </body>
-</html>
+</html>

app/templates/error_logs.html

@@ -1,242 +1,636 @@
-{% extends "base.html" %}
+{% extends "base.html" %} {% block title %}错误日志管理 - Gemini Balance{%
-
+endblock %} {% block head_extra_styles %}
-{% block title %}错误日志管理 - Gemini Balance{% endblock %}
-
-{% block head_extra_styles %}
 <style>
-    /* error_logs.html specific styles */
+  /* error_logs.html specific styles */
-    /* Table styles */
+  .styled-table th {
-    .styled-table th {
+    position: sticky;
-        position: sticky;
+    top: 0;
-        top: 0;
+    background-color: rgba(80, 60, 160, 0.8); /* theming: table header bg */
-        background: #f3f4f6; /* bg-gray-100 */
+    color: #ffffff !important; /* theming: table header text, ensured light */
-        z-index: 10;
+    z-index: 10;
+    border-bottom: 1px solid rgba(120, 100, 200, 0.4);
+  }
+  .styled-table tbody tr:hover {
+    background-color: rgba(90, 70, 170, 0.4); /* theming: table row hover */
+  }
+  .styled-table td {
+    padding: 12px 20px;
+    vertical-align: middle;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 250px;
+    color: #d1d5db; /* theming: table cell text (gray-300) */
+    border-bottom: 1px solid rgba(120, 100, 200, 0.2); /* theming: cell border */
+  }
+  .styled-table td:nth-child(4) {
+    white-space: nowrap;
+  }
+  .btn-view-details {
+    background-color: rgba(107, 70, 193, 0.4); /* theming */
+    color: #c4b5fd; /* theming */
+    padding: 6px 12px;
+    border-radius: 6px;
+    font-weight: 500;
+    transition: all 0.2s ease-in-out;
+    border: 1px solid rgba(120, 100, 200, 0.6); /* theming */
+  }
+  .btn-view-details:hover {
+    background-color: rgba(120, 100, 200, 0.6); /* theming */
+    color: #ede9fe; /* theming */
+    box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
+  }
+  @media (max-width: 768px) {
+    .search-container {
+      grid-template-columns: 1fr;
     }
-    .styled-table tbody tr:hover {
+  }
-        background-color: #f9fafb; /* bg-gray-50 */
+
+  input[type="text"],
+  input[type="datetime-local"],
+  select,
+  button {
+    height: 36px !important;
+  }
+  .form-input-themed,
+  input[type="datetime-local"],
+  select#pageSize {
+    background-color: rgba(255, 255, 255, 0.1) !important;
+    border-color: rgba(120, 100, 200, 0.5) !important;
+    color: #ffffff !important;
+  }
+  .form-input-themed::placeholder,
+  input[type="datetime-local"]::placeholder {
+    color: #a0aec0 !important;
+  }
+  .form-input-themed:focus,
+  input[type="datetime-local"]:focus,
+  select#pageSize:focus {
+    border-color: #a78bfa !important;
+    box-shadow: 0 0 0 3px rgba(167, 139, 250, 0.4) !important;
+  }
+  select#pageSize {
+    /* Styles from config_editor.html .form-select-themed, adapted for select#pageSize */
+    background-color: rgba(60, 40, 130, 0.6) !important;
+    border: 1px solid rgba(167, 139, 250, 0.7) !important;
+    color: #ffffff !important;
+    background-image: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='none' viewBox='0 0 20 20'%3e%3cpath stroke='%23d8b4fe' stroke-linecap='round' stroke-linejoin='round' stroke-width='2' d='M6 8l4 4 4-4'/%3e%3c/svg%3e") !important;
+    appearance: none !important;
+    padding: 0.6rem 2.5rem 0.6rem 0.8rem !important;
+    background-repeat: no-repeat !important;
+    background-position: right 0.6rem center !important;
+    background-size: 1.5em 1.5em !important;
+    border-radius: 0.5rem !important;
+    font-weight: 500 !important;
+    height: 36px !important; /* Retain original height or use auto */
+    box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1) !important;
+    cursor: pointer !important;
+  }
+
+  select#pageSize:focus {
+    border-color: #d8b4fe !important; /* violet-300 */
+    box-shadow: 0 0 0 3px rgba(216, 180, 254, 0.4) !important; /* ring-violet-300 */
+    outline: none !important;
+  }
+
+  select#pageSize option {
+    background-color: rgba(76, 29, 149, 0.95) !important; /* 暗紫色背景 */
+    color: #ffffff !important;
+    padding: 8px !important;
+  }
+
+  .date-range-container {
+    display: flex;
+    align-items: center;
+    gap: 0.5rem;
+  }
+
+  @media (max-width: 640px) {
+    input[type="datetime-local"] {
+      min-width: 0;
+      width: 100%;
     }
-    .styled-table td {
+  }
-         padding: 12px 20px;
+  label {
-         vertical-align: middle;
+    color: #e2e8f0 !important; /* Light gray/white for labels */
-         white-space: nowrap;
+    font-weight: 500;
-         overflow: hidden;
+  }
-         text-overflow: ellipsis;
+
-         max-width: 250px;
+  /* 导航链接悬停样式 (从 config_editor.html 复制) */
-    }
+  .nav-link {
-    /* Ensure error log column does not wrap and remove max-width */
+    transition: all 0.2s ease-in-out;
-    .styled-table td:nth-child(4) { /* Assuming error log is the 4th column */
+  }
-        /* max-width: none; */
+
-        white-space: nowrap;
+  .nav-link:hover {
-    }
+    background-color: rgba(120, 100, 200, 0.6) !important;
-    .btn-view-details {
+    transform: translateY(-2px);
-        background-color: #eef2ff; /* primary-50 */
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.2);
-        color: #4f46e5; /* primary-600 */
+  }
-        padding: 6px 12px;
+
-        border-radius: 6px;
+  /* Ensure text around pageSize select is light */
-        font-weight: 500;
+  .pagination-text {
-        transition: all 0.2s ease-in-out;
+    color: #e2e8f0 !important; /* Light gray/white for text */
-        border: 1px solid #c7d2fe; /* primary-200 */
+    font-weight: 500;
-    }
+  }
-    .btn-view-details:hover {
+
-        background-color: #c7d2fe; /* primary-200 */
+  /* Pagination custom styles */
-        color: #4338ca; /* primary-700 */
+  .pagination li a, .pagination li span { /* Assuming 'span' might be used for non-clickable items like '...' */
-        box-shadow: 0 2px 4px rgba(0,0,0,0.05);
+    display: flex; /* For centering content if icons are used */
-    }
+    align-items: center;
-    @media (max-width: 768px) {
+    justify-content: center;
-        .search-container {
+    padding: 0.5rem 0.75rem; /* Adjust padding as needed */
-            grid-template-columns: 1fr;
+    line-height: 1.25;
-        }
+    color: #e2e8f0; /* Light gray/white text */
-    }
+    background-color: rgba(107, 70, 193, 0.4); /* Consistent with other buttons */
-    /* Modal styles are in base.html */
+    border: 1px solid rgba(120, 100, 200, 0.6); /* Consistent with other buttons */
+    border-radius: 0.375rem; /* Tailwind's rounded-md */
+    transition: all 0.2s ease-in-out;
+    min-width: 36px; /* Ensure minimum width for small numbers */
+    text-align: center;
+  }
+
+  .pagination li a:hover, .pagination li span:hover:not(.disabled) { /* Avoid hover on disabled spans */
+    color: #ffffff;
+    background-color: rgba(120, 100, 200, 0.6); /* Consistent with other button hovers */
+    border-color: rgba(167, 139, 250, 0.8);
+  }
+
+  .pagination li.active a, .pagination li.active span { /* Assuming 'active' class for current page */
+    color: #ffffff !important;
+    background-color: #7c3aed !important; /* Violet-600, ensure it overrides */
+    border-color: #7c3aed !important;
+    font-weight: 600; /* Make active page number bolder */
+  }
+
+  .pagination li.disabled a, .pagination li.disabled span { /* Assuming 'disabled' class */
+    color: rgba(226, 232, 240, 0.6) !important;
+    background-color: rgba(80, 60, 160, 0.3) !important; /* Slightly more visible than pure disabled */
+    border-color: rgba(120, 100, 200, 0.4) !important;
+    cursor: not-allowed;
+    pointer-events: none;
+  }
 </style>
-{% endblock %}
+{% endblock %} {% block content %}
+<div class="container mx-auto px-4">
+  <div
+    class="rounded-2xl shadow-xl p-6 md:p-8"
+    style="
+      background-color: rgba(80, 60, 160, 0.3);
+      backdrop-filter: blur(10px);
+      -webkit-backdrop-filter: blur(10px);
+      border: 1px solid rgba(150, 130, 230, 0.3);
+    "
+  >
+    <h1
+      class="text-3xl font-extrabold text-center text-transparent bg-clip-text bg-gradient-to-r from-violet-400 to-pink-400 mb-4"
+    >
+      <img
+        src="/static/icons/logo.png"
+        alt="Gemini Balance Logo"
+        class="h-9 inline-block align-middle mr-2"
+      />
+      Gemini Balance - 错误日志
+    </h1>
 
-{% block content %}
+    <!-- Navigation Tabs -->
-    <div class="container mx-auto px-4"> <!-- Removed max-width-7xl for wider content -->
+    <div class="flex justify-center mb-8 overflow-x-auto pb-2 gap-2">
-        <div class="glass-card rounded-2xl shadow-xl p-6 md:p-8">
+      <a
-            <!-- Removed refresh button from top right -->
+        href="/config"
-            
+        class="nav-link whitespace-nowrap flex items-center justify-center gap-2 px-6 py-3 font-medium rounded-lg text-gray-200 hover:text-white transition-all duration-200"
-            <h1 class="text-3xl font-extrabold text-center text-transparent bg-clip-text bg-gradient-to-r from-primary-600 to-primary-700 mb-4">
+        style="background-color: rgba(107, 70, 193, 0.4)"
-                 <img src="/static/icons/logo.png" alt="Gemini Balance Logo" class="h-9 inline-block align-middle mr-2">
+      >
-                 Gemini Balance - 错误日志
+        <i class="fas fa-cog"></i> 配置编辑
-            </h1>
+      </a>
-            
+      <a
-            <!-- Navigation Tabs -->
+        href="/keys"
-            <div class="flex justify-center mb-8 overflow-x-auto pb-2 gap-2">
+        class="nav-link whitespace-nowrap flex items-center justify-center gap-2 px-6 py-3 font-medium rounded-lg text-gray-200 hover:text-white transition-all duration-200"
-                <a href="/config" class="whitespace-nowrap flex items-center justify-center gap-2 px-6 py-3 font-medium rounded-lg bg-white bg-opacity-50 hover:bg-opacity-70 text-gray-700 transition-all duration-200">
+        style="background-color: rgba(107, 70, 193, 0.4)"
-                    <i class="fas fa-cog"></i> 配置编辑
+      >
-                </a>
+        <i class="fas fa-tachometer-alt"></i> 监控面板
-                <a href="/keys" class="whitespace-nowrap flex items-center justify-center gap-2 px-6 py-3 font-medium rounded-lg bg-white bg-opacity-50 hover:bg-opacity-70 text-gray-700 transition-all duration-200">
+      </a>
-                    <i class="fas fa-tachometer-alt"></i> 监控面板
+      <a
-                </a>
+        href="/logs"
-                <a href="/logs" class="whitespace-nowrap flex items-center justify-center gap-2 px-6 py-3 font-medium rounded-lg bg-primary-600 text-white shadow-md">
+        class="whitespace-nowrap flex items-center justify-center gap-2 px-6 py-3 font-medium rounded-lg bg-violet-600 text-white shadow-md"
-                    <i class="fas fa-exclamation-triangle"></i> 错误日志
+      >
-                </a>
+        <i class="fas fa-exclamation-triangle"></i> 错误日志
-            </div>
+      </a>
-            
-            <!-- 主内容区域 -->
-            <div class="bg-white bg-opacity-70 rounded-xl p-6 shadow-lg animate-fade-in">
-                <h2 class="text-xl font-bold mb-6 pb-3 border-b border-gray-200 flex items-center gap-2">
-                    <i class="fas fa-bug text-primary-600"></i> 错误日志列表
-                </h2>
-                
-                <!-- 控制区域 (Refresh button removed, page size moved below) -->
-                <!-- Removed the original controls div -->
-                
-                <!-- 搜索控件 -->
-                <div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-5 gap-3 mb-6">
-                    <input type="text" id="keySearch" placeholder="搜索密钥 (部分)" class="px-4 py-3 rounded-lg border border-gray-300 focus:border-primary-500 focus:ring focus:ring-primary-200 focus:ring-opacity-50 col-span-1 lg:col-span-1">
-                    <input type="text" id="errorSearch" placeholder="搜索错误类型/日志" class="px-4 py-3 rounded-lg border border-gray-300 focus:border-primary-500 focus:ring focus:ring-primary-200 focus:ring-opacity-50 col-span-1 lg:col-span-1">
-                    <div class="flex items-center gap-2 col-span-1 lg:col-span-2">
-                        <input type="datetime-local" id="startDate" class="px-4 py-3 rounded-lg border border-gray-300 focus:border-primary-500 focus:ring focus:ring-primary-200 focus:ring-opacity-50 flex-1 text-sm">
-                        <span class="text-gray-700">至</span>
-                        <input type="datetime-local" id="endDate" class="px-4 py-3 rounded-lg border border-gray-300 focus:border-primary-500 focus:ring focus:ring-primary-200 focus:ring-opacity-50 flex-1 text-sm">
-                    </div>
-                    <button id="searchBtn" class="flex items-center justify-center gap-2 bg-primary-600 hover:bg-primary-700 text-white px-4 py-3 rounded-lg font-medium transition-all duration-200 col-span-1">
-                        <i class="fas fa-search"></i> 搜索
-                    </button>
-                </div>
-                
-                <!-- 表格容器 - Enhanced Styling -->
-                <div class="overflow-x-auto rounded-lg border border-gray-200 mb-6 bg-white"> <!-- Removed shadow, added border -->
-                    <table class="styled-table w-full min-w-full text-sm"> <!-- Added text-sm -->
-                        <thead>
-                            <tr class="bg-primary-50 text-left text-primary-800"> <!-- Changed header background and text color -->
-                                <th class="px-5 py-3 font-semibold rounded-tl-lg">ID</th> <!-- Increased padding, adjusted rounding -->
-                                <th class="px-5 py-3 font-semibold">Gemini密钥</th>
-                                <th class="px-5 py-3 font-semibold">错误类型</th>
-                                <th class="px-5 py-3 font-semibold">错误日志</th>
-                                <th class="px-5 py-3 font-semibold">模型名称</th>
-                                <th class="px-5 py-3 font-semibold">请求时间</th>
-                                <th class="px-5 py-3 font-semibold rounded-tr-lg">操作</th> <!-- Adjusted rounding -->
-                            </tr>
-                        </thead>
-                        <tbody id="errorLogsTable" class="divide-y divide-gray-200">
-                            <!-- 错误日志数据将通过JavaScript动态加载 -->
-                        </tbody>
-                    </table>
-                </div>
-                
-                <!-- 状态指示器 -->
-                <div id="loadingIndicator" class="flex items-center justify-center p-8 hidden">
-                    <div class="animate-spin rounded-full h-12 w-12 border-b-2 border-primary-600"></div>
-                    <p class="ml-4 text-lg text-gray-700 font-medium">加载中，请稍候...</p>
-                </div>
-                
-                <div id="noDataMessage" class="text-center py-12 text-gray-500 hidden">
-                    <i class="fas fa-inbox text-5xl mb-3"></i>
-                    <p class="text-lg">暂无错误日志数据</p>
-                </div>
-                
-                <div id="errorMessage" class="bg-danger-50 text-danger-600 p-4 rounded-lg font-medium text-center hidden">
-                    <i class="fas fa-exclamation-circle mr-2"></i>
-                    加载错误日志失败，请稍后重试。
-                </div>
-                
-                <!-- 分页与每页显示控件 -->
-                <div class="flex flex-col sm:flex-row justify-between items-center mt-6 gap-4">
-                     <!-- 每页显示控件 (Moved here) -->
-                     <div class="flex items-center gap-2 text-sm text-gray-700">
-                        <label for="pageSize" class="font-medium">每页显示:</label>
-                        <select id="pageSize" class="rounded-md border border-gray-300 focus:ring focus:ring-primary-200 focus:border-primary-500 px-2 py-1 bg-white text-sm">
-                            <option value="10">10</option>
-                            <option value="20" selected>20</option>
-                            <option value="50">50</option>
-                            <option value="100">100</option>
-                        </select>
-                        <span>条</span>
-                    </div>
-                    <!-- 分页控件 -->
-                    <div class="flex items-center gap-4"> <!-- Wrapper for pagination and input -->
-                        <ul class="pagination flex items-center gap-1" id="pagination">
-                            <!-- 分页控件将通过JavaScript动态加载 -->
-                        </ul>
-                        <!-- 页码输入跳转 -->
-                        <div class="flex items-center gap-1">
-                            <input type="number" id="pageInput" min="1" class="w-16 px-2 py-1 rounded-md border border-gray-300 text-sm focus:ring focus:ring-primary-200 focus:border-primary-500" placeholder="页码">
-                            <button id="goToPageBtn" class="px-3 py-1 bg-primary-600 hover:bg-primary-700 text-white text-sm rounded-md transition">跳转</button>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
     </div>
-    
-    <!-- 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>
-    
-    <!-- Notification component is now in base.html (use id="notification") -->
-    <div id="notification" class="notification"></div>
-    <!-- Footer is now in base.html -->
-    
-    <!-- 日志详情模态框 -->
-    <div id="logDetailModal" class="modal">
-        <div class="w-full max-w-6xl mx-auto bg-white rounded-2xl shadow-2xl overflow-hidden animate-fade-in"> <!-- Increased max-width to 6xl -->
-            <div class="p-6">
-                <div class="flex justify-between items-center border-b border-gray-200 pb-4 mb-4">
-                    <h2 class="text-xl font-bold text-gray-800">错误日志详情</h2>
-                    <button id="closeLogDetailModalBtn" class="text-gray-400 hover:text-gray-600 text-xl">&times;</button>
-                </div>
-                
-                <div class="space-y-4 max-h-[60vh] overflow-y-auto p-1">
-                    <div class="bg-gray-50 p-4 rounded-lg">
-                        <h6 class="text-sm font-semibold text-gray-600 mb-1">Gemini密钥:</h6>
-                        <pre id="modalGeminiKey" class="font-mono text-sm bg-gray-100 p-3 rounded overflow-x-auto"></pre>
-                    </div>
-                    
-                    <div class="bg-gray-50 p-4 rounded-lg">
-                        <h6 class="text-sm font-semibold text-gray-600 mb-1">错误类型:</h6>
-                        <p id="modalErrorType" class="text-danger-600 font-medium"></p>
-                    </div>
-                    
-                    <div class="bg-gray-50 p-4 rounded-lg relative group"> <!-- Added relative and group -->
-                        <h6 class="text-sm font-semibold text-gray-600 mb-1">错误日志:</h6>
-                        <pre id="modalErrorLog" class="font-mono text-sm bg-gray-100 p-3 rounded overflow-x-auto whitespace-pre-wrap"></pre>
-                        <button class="copy-btn absolute top-2 right-2 bg-gray-200 hover:bg-gray-300 text-gray-600 p-1.5 rounded opacity-0 group-hover:opacity-100 transition-opacity" data-target="modalErrorLog" title="复制错误日志">
-                            <i class="far fa-copy"></i>
-                        </button>
-                    </div>
-                    
-                    <div class="bg-gray-50 p-4 rounded-lg relative group"> <!-- Added relative and group -->
-                        <h6 class="text-sm font-semibold text-gray-600 mb-1">请求消息:</h6>
-                        <pre id="modalRequestMsg" class="font-mono text-sm bg-gray-100 p-3 rounded overflow-x-auto whitespace-pre-wrap"></pre>
-                         <button class="copy-btn absolute top-2 right-2 bg-gray-200 hover:bg-gray-300 text-gray-600 p-1.5 rounded opacity-0 group-hover:opacity-100 transition-opacity" data-target="modalRequestMsg" title="复制请求消息">
-                            <i class="far fa-copy"></i>
-                        </button>
-                    </div>
-                    
-                    <div class="bg-gray-50 p-4 rounded-lg">
-                        <h6 class="text-sm font-semibold text-gray-600 mb-1">模型名称:</h6>
-                        <p id="modalModelName" class="font-medium"></p>
-                    </div>
-                    
-                    <div class="bg-gray-50 p-4 rounded-lg">
-                        <h6 class="text-sm font-semibold text-gray-600 mb-1">请求时间:</h6>
-                        <p id="modalRequestTime" class="font-medium"></p>
-                    </div>
-                </div>
-                
-                <div class="flex justify-end mt-6">
-                    <button type="button" id="closeModalFooterBtn" class="bg-gray-200 hover:bg-gray-300 text-gray-800 px-6 py-2 rounded-lg font-medium transition">关闭</button>
-                </div>
-            </div>
-        </div>
-    </div>
-    
-{% endblock %}
 
-{% block body_scripts %}
+    <!-- 主内容区域 -->
-    <script src="{{ url_for('static', path='/js/error_logs.js') }}"></script>
+    <div
-    <script>
+      class="rounded-xl p-6 shadow-lg animate-fade-in"
-        // error_logs.html specific JS initialization (if any)
+      style="
-        // e.g., initialize date pickers or other elements if needed
+        background-color: rgba(70, 50, 150, 0.5);
-        // The main logic is in error_logs.js
+        backdrop-filter: blur(5px);
-    </script>
+        -webkit-backdrop-filter: blur(5px);
+        border: 1px solid rgba(120, 100, 200, 0.2);
+      "
+    >
+      <h2
+        class="text-xl font-bold mb-6 pb-3 border-b flex items-center gap-2 text-gray-100 border-violet-300 border-opacity-30"
+      >
+        <i class="fas fa-bug text-violet-400"></i> 错误日志列表
+      </h2>
+
+      <!-- 搜索与操作控件 -->
+      <div
+        class="grid grid-cols-1 lg:grid-cols-[1fr_auto] items-center gap-4 mb-6"
+      >
+        <div
+          class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-3 w-full"
+        >
+          <input
+            type="text"
+            id="keySearch"
+            placeholder="搜索密钥 (部分)"
+            class="px-3 py-1 rounded-lg border form-input-themed"
+          />
+          <input
+            type="text"
+            id="errorSearch"
+            placeholder="搜索错误类型/日志"
+            class="px-3 py-1 rounded-lg border form-input-themed"
+          />
+          <input
+            type="text"
+            id="errorCodeSearch"
+            placeholder="搜索错误码"
+            class="px-3 py-1 rounded-lg border form-input-themed"
+          />
+          <div
+            class="grid grid-cols-1 sm:grid-cols-2 gap-2 col-span-1 sm:col-span-2 lg:col-span-3 mt-2"
+          >
+            <div class="flex items-center gap-2">
+              <label class="text-sm text-gray-300 whitespace-nowrap"
+                >开始时间:</label
+              >
+              <input
+                type="datetime-local"
+                id="startDate"
+                class="px-3 py-1 rounded-lg border text-sm w-full"
+              />
+            </div>
+            <div class="flex items-center gap-2">
+              <label class="text-sm text-gray-300 whitespace-nowrap"
+                >结束时间:</label
+              >
+              <input
+                type="datetime-local"
+                id="endDate"
+                class="px-3 py-1 rounded-lg border text-sm w-full"
+              />
+            </div>
+          </div>
+        </div>
+        <div class="flex items-center gap-3 flex-shrink-0">
+          <button
+            id="searchBtn"
+            class="flex items-center justify-center px-4 py-1.5 bg-violet-600 hover:bg-violet-700 text-white rounded-lg font-medium transition-all duration-200 shadow-sm hover:shadow-md whitespace-nowrap"
+          >
+            <i class="fas fa-search mr-1.5"></i>搜索
+          </button>
+          <button
+            id="copySelectedKeysBtn"
+            class="flex items-center justify-center px-4 py-1.5 bg-sky-600 hover:bg-sky-700 text-white rounded-lg font-medium transition-all duration-200 disabled:opacity-50 disabled:cursor-not-allowed shadow-sm hover:shadow-md whitespace-nowrap"
+            disabled
+          >
+            <i class="far fa-copy mr-1.5"></i>复制
+          </button>
+          <button
+            id="deleteSelectedBtn"
+            class="flex items-center justify-center px-4 py-1.5 bg-red-600 hover:bg-red-700 text-white rounded-lg font-medium transition-all duration-200 disabled:opacity-50 disabled:cursor-not-allowed shadow-sm hover:shadow-md whitespace-nowrap"
+            disabled
+          >
+            <i class="fas fa-trash-alt mr-1.5"></i>删除
+          </button>
+        </div>
+      </div>
+
+      <!-- 表格容器 -->
+      <div
+        class="overflow-x-auto rounded-lg border mb-6"
+        style="border-color: rgba(120, 100, 200, 0.3)"
+      >
+        <table class="styled-table w-full min-w-full text-sm">
+          <thead>
+            <tr class="text-left">
+              <th
+                class="px-3 py-3 font-semibold rounded-tl-lg w-12 text-center"
+              >
+                <input
+                  type="checkbox"
+                  id="selectAllCheckbox"
+                  class="form-checkbox h-4 w-4 text-violet-500 border-gray-500 rounded focus:ring-violet-500 bg-transparent"
+                />
+              </th>
+              <th class="px-5 py-3 font-semibold cursor-pointer" id="sortById">
+                ID <i class="fas fa-sort ml-1"></i>
+              </th>
+              <th class="px-5 py-3 font-semibold">Gemini密钥</th>
+              <th class="px-5 py-3 font-semibold">错误类型</th>
+              <th class="px-5 py-3 font-semibold">错误码</th>
+              <th class="px-5 py-3 font-semibold">模型名称</th>
+              <th class="px-5 py-3 font-semibold">请求时间</th>
+              <th class="px-5 py-3 font-semibold rounded-tr-lg text-center">
+                操作
+              </th>
+            </tr>
+          </thead>
+          <tbody
+            id="errorLogsTable"
+            class="divide-y"
+            style="border-color: rgba(120, 100, 200, 0.2)"
+          >
+            <!-- 错误日志数据将通过JavaScript动态加载 -->
+          </tbody>
+        </table>
+      </div>
+
+      <!-- 状态指示器 -->
+      <div
+        id="loadingIndicator"
+        class="flex items-center justify-center p-8 hidden"
+      >
+        <div
+          class="animate-spin rounded-full h-12 w-12 border-b-2 border-violet-400"
+        ></div>
+        <p class="ml-4 text-lg text-gray-300 font-medium">加载中，请稍候...</p>
+      </div>
+
+      <div id="noDataMessage" class="text-center py-12 text-gray-400 hidden">
+        <i class="fas fa-inbox text-5xl mb-3"></i>
+        <p class="text-lg">暂无错误日志数据</p>
+      </div>
+
+      <div
+        id="errorMessage"
+        class="p-4 rounded-lg font-medium text-center hidden"
+        style="background-color: rgba(220, 38, 38, 0.2); color: #fca5a5"
+      >
+        <i class="fas fa-exclamation-circle mr-2"></i>
+        加载错误日志失败，请稍后重试。
+      </div>
+
+      <!-- 分页与每页显示控件 -->
+      <div
+        class="flex flex-col sm:flex-row justify-between items-center mt-6 gap-4"
+      >
+        <div class="flex items-center gap-2 text-sm text-gray-300">
+          <label for="pageSize" class="font-medium pagination-text"
+            >每页显示:</label
+          >
+          <select
+            id="pageSize"
+            class="rounded-md border focus:ring focus:border-violet-400 px-2 py-1 text-sm"
+          >
+            <option value="10">10</option>
+            <option value="20" selected>20</option>
+            <option value="50">50</option>
+            <option value="100">100</option>
+          </select>
+          <span class="pagination-text">条</span>
+        </div>
+        <div class="flex items-center gap-4">
+          <ul class="pagination flex items-center gap-1" id="pagination">
+            <!-- 分页控件将通过JavaScript动态加载 -->
+          </ul>
+          <div class="flex items-center gap-1">
+            <input
+              type="number"
+              id="pageInput"
+              min="1"
+              class="w-16 px-2 py-1 rounded-md border text-sm focus:ring focus:border-violet-400 form-input-themed"
+              placeholder="页码"
+            />
+            <button
+              id="goToPageBtn"
+              class="px-3 py-1 bg-violet-600 hover:bg-violet-700 text-white text-sm rounded-md transition"
+            >
+              跳转
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 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>
+
+<!-- Notification component is now in base.html (use id="notification") -->
+<div id="notification" class="notification"></div>
+<!-- Footer is now in base.html -->
+
+<!-- 日志详情模态框 -->
+<div id="logDetailModal" class="modal">
+  <div
+    class="w-full max-w-6xl mx-auto rounded-2xl shadow-2xl overflow-hidden animate-fade-in"
+    style="
+      background-color: rgba(70, 50, 150, 0.95);
+      color: #ffffff;
+      border: 1px solid rgba(120, 100, 200, 0.4);
+    "
+  >
+    <div class="p-6">
+      <div
+        class="flex justify-between items-center pb-4 mb-4"
+        style="border-bottom: 1px solid rgba(120, 100, 200, 0.4)"
+      >
+        <h2 class="text-xl font-bold text-gray-100">错误日志详情</h2>
+        <button
+          id="closeLogDetailModalBtn"
+          class="text-gray-300 hover:text-gray-100 text-xl"
+        >
+          &times;
+        </button>
+      </div>
+
+      <div class="space-y-4 max-h-[60vh] overflow-y-auto p-1">
+        <div
+          class="p-4 rounded-lg relative group"
+          style="background-color: rgba(80, 60, 160, 0.3)"
+        >
+          <h6 class="text-sm font-semibold text-violet-200 mb-1">
+            Gemini密钥:
+          </h6>
+          <pre
+            id="modalGeminiKey"
+            class="font-mono text-sm p-3 rounded overflow-x-auto"
+            style="background-color: rgba(0, 0, 0, 0.2); color: #e5e7eb"
+          ></pre>
+          <button
+            class="copy-btn absolute top-2 right-2 hover:bg-gray-600 text-gray-300 p-1.5 rounded opacity-0 group-hover:opacity-100 transition-opacity"
+            style="background-color: rgba(0, 0, 0, 0.3)"
+            data-target="modalGeminiKey"
+            title="复制密钥"
+          >
+            <i class="far fa-copy"></i>
+          </button>
+        </div>
+
+        <div
+          class="p-4 rounded-lg relative group"
+          style="background-color: rgba(80, 60, 160, 0.3)"
+        >
+          <h6 class="text-sm font-semibold text-violet-200 mb-1">错误类型:</h6>
+          <p id="modalErrorType" class="text-red-300 font-medium pr-8"></p>
+          <button
+            class="copy-btn absolute top-2 right-2 hover:bg-gray-600 text-gray-300 p-1.5 rounded opacity-0 group-hover:opacity-100 transition-opacity"
+            style="background-color: rgba(0, 0, 0, 0.3)"
+            data-target="modalErrorType"
+            title="复制错误类型"
+          >
+            <i class="far fa-copy"></i>
+          </button>
+        </div>
+
+        <div
+          class="p-4 rounded-lg relative group"
+          style="background-color: rgba(80, 60, 160, 0.3)"
+        >
+          <h6 class="text-sm font-semibold text-violet-200 mb-1">错误日志:</h6>
+          <pre
+            id="modalErrorLog"
+            class="font-mono text-sm p-3 rounded overflow-x-auto whitespace-pre-wrap"
+            style="background-color: rgba(0, 0, 0, 0.2); color: #e5e7eb"
+          ></pre>
+          <button
+            class="copy-btn absolute top-2 right-2 hover:bg-gray-600 text-gray-300 p-1.5 rounded opacity-0 group-hover:opacity-100 transition-opacity"
+            style="background-color: rgba(0, 0, 0, 0.3)"
+            data-target="modalErrorLog"
+            title="复制错误日志"
+          >
+            <i class="far fa-copy"></i>
+          </button>
+        </div>
+
+        <div
+          class="p-4 rounded-lg relative group"
+          style="background-color: rgba(80, 60, 160, 0.3)"
+        >
+          <h6 class="text-sm font-semibold text-violet-200 mb-1">请求消息:</h6>
+          <pre
+            id="modalRequestMsg"
+            class="font-mono text-sm p-3 rounded overflow-x-auto whitespace-pre-wrap"
+            style="background-color: rgba(0, 0, 0, 0.2); color: #e5e7eb"
+          ></pre>
+          <button
+            class="copy-btn absolute top-2 right-2 hover:bg-gray-600 text-gray-300 p-1.5 rounded opacity-0 group-hover:opacity-100 transition-opacity"
+            style="background-color: rgba(0, 0, 0, 0.3)"
+            data-target="modalRequestMsg"
+            title="复制请求消息"
+          >
+            <i class="far fa-copy"></i>
+          </button>
+        </div>
+
+        <div
+          class="p-4 rounded-lg relative group"
+          style="background-color: rgba(80, 60, 160, 0.3)"
+        >
+          <h6 class="text-sm font-semibold text-violet-200 mb-1">模型名称:</h6>
+          <p id="modalModelName" class="font-medium pr-8 text-gray-200"></p>
+          <button
+            class="copy-btn absolute top-2 right-2 hover:bg-gray-600 text-gray-300 p-1.5 rounded opacity-0 group-hover:opacity-100 transition-opacity"
+            style="background-color: rgba(0, 0, 0, 0.3)"
+            data-target="modalModelName"
+            title="复制模型名称"
+          >
+            <i class="far fa-copy"></i>
+          </button>
+        </div>
+
+        <div
+          class="p-4 rounded-lg relative group"
+          style="background-color: rgba(80, 60, 160, 0.3)"
+        >
+          <h6 class="text-sm font-semibold text-violet-200 mb-1">请求时间:</h6>
+          <p id="modalRequestTime" class="font-medium pr-8 text-gray-200"></p>
+          <button
+            class="copy-btn absolute top-2 right-2 hover:bg-gray-600 text-gray-300 p-1.5 rounded opacity-0 group-hover:opacity-100 transition-opacity"
+            style="background-color: rgba(0, 0, 0, 0.3)"
+            data-target="modalRequestTime"
+            title="复制请求时间"
+          >
+            <i class="far fa-copy"></i>
+          </button>
+        </div>
+      </div>
+
+      <div
+        class="flex justify-end mt-6 pt-4"
+        style="border-top: 1px solid rgba(120, 100, 200, 0.4)"
+      >
+        <button
+          type="button"
+          id="closeModalFooterBtn"
+          class="bg-gray-500 bg-opacity-50 hover:bg-opacity-70 text-gray-200 px-6 py-2 rounded-lg font-medium transition"
+        >
+          关闭
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<!-- 删除确认模态框 -->
+<div id="deleteConfirmModal" class="modal">
+  <div
+    class="w-full max-w-md mx-auto rounded-xl shadow-xl overflow-hidden animate-fade-in"
+    style="
+      background-color: rgba(70, 50, 150, 0.95);
+      color: #ffffff;
+      border: 1px solid rgba(120, 100, 200, 0.4);
+    "
+  >
+    <div class="p-6">
+      <div
+        class="flex justify-between items-center pb-3 mb-4"
+        style="border-bottom: 1px solid rgba(120, 100, 200, 0.4)"
+      >
+        <h2 class="text-lg font-semibold text-gray-100">确认删除</h2>
+        <button
+          id="closeDeleteConfirmModalBtn"
+          class="text-gray-300 hover:text-gray-100 text-xl"
+        >
+          &times;
+        </button>
+      </div>
+      <p id="deleteConfirmMessage" class="text-gray-300 mb-6">
+        你确定要删除选中的项目吗？此操作不可恢复！
+      </p>
+      <div class="flex justify-end gap-3">
+        <button
+          id="cancelDeleteBtn"
+          type="button"
+          class="bg-gray-500 bg-opacity-50 hover:bg-opacity-70 text-gray-200 px-5 py-2 rounded-lg font-medium transition"
+        >
+          取消
+        </button>
+        <button
+          id="confirmDeleteBtn"
+          type="button"
+          class="bg-red-600 hover:bg-red-700 text-white px-5 py-2 rounded-lg font-medium transition"
+        >
+          确认删除
+        </button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endblock %} {% block body_scripts %}
+<script src="/static/js/error_logs.js"></script>
+<script>
+  // error_logs.html specific JS initialization (if any)
+  // e.g., initialize date pickers or other elements if needed
+  // The main logic is in error_logs.js
+</script>
 {% endblock %}

app/utils/helpers.py

@@ -6,9 +6,19 @@ import re
 import base64
 import requests
 from typing import Dict, Any, List, Optional, Tuple
+from pathlib import Path
+import logging # Import logging
 
 from app.core.constants import DATA_URL_PATTERN, IMAGE_URL_PATTERN, VALID_IMAGE_RATIOS
 
+# Define logger for helper functions if needed, or use specific loggers
+helper_logger = logging.getLogger("app.utils") # Or use a more specific logger if available
+
+# Define project root and version file path here for get_current_version
+# Assuming this file is at app/utils/helpers.py
+PROJECT_ROOT = Path(__file__).resolve().parent.parent.parent
+VERSION_FILE_PATH = PROJECT_ROOT / "VERSION"
+
 
 def extract_mime_type_and_data(base64_string: str) -> Tuple[Optional[str], str]:
     """
@@ -146,3 +156,21 @@ def is_valid_api_key(key: str) -> bool:
     return False
 
 
+
+def get_current_version(default_version: str = "0.0.0") -> str:
+    """Reads the current version from the VERSION file."""
+    version_file = VERSION_FILE_PATH # Use Path object defined above
+    try:
+        # Use Path object's open method
+        with version_file.open('r', encoding='utf-8') as f:
+            version = f.read().strip()
+        if not version:
+            helper_logger.warning(f"VERSION file ('{version_file}') is empty. Using default version '{default_version}'.")
+            return default_version
+        return version
+    except FileNotFoundError:
+        helper_logger.warning(f"VERSION file not found at '{version_file}'. Using default version '{default_version}'.")
+        return default_version
+    except IOError as e:
+        helper_logger.error(f"Error reading VERSION file ('{version_file}'): {e}. Using default version '{default_version}'.")
+        return default_version

docker-compose.yml

@@ -1,9 +1,39 @@
-version: '3'
+volumes:
-
+  mysql_data:
 services:
   gemini-balance:
-    build: .
+    image: ghcr.io/snailyp/gemini-balance:latest
+    container_name: gemini-balance
+    restart: unless-stopped
     ports:
       - "8000:8000"
     env_file:
       - .env
+    depends_on:
+      mysql:
+        condition: service_healthy
+    healthcheck:
+      test: ["CMD-SHELL", "python -c \"import requests; exit(0) if requests.get('http://localhost:8000/health').status_code == 200 else exit(1)\""]
+      interval: 30s
+      timeout: 5s
+      retries: 3
+      start_period: 10s
+  mysql:
+    image: mysql:8
+    container_name: gemini-balance-mysql
+    restart: unless-stopped
+    environment:
+      MYSQL_ROOT_PASSWORD: your_root_password
+      MYSQL_DATABASE: ${MYSQL_DATABASE}
+      MYSQL_USER: ${MYSQL_USER}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+    # ports:
+    #   - "3306:3306"
+    volumes:
+      - mysql_data:/var/lib/mysql
+    healthcheck:
+      test: ["CMD", "mysqladmin", "ping", "-h", "127.0.0.1"]
+      interval: 10s # 每隔10秒检查一次
+      timeout: 5s   # 每次检查的超时时间为5秒
+      retries: 3    # 重试3次失败后标记为 unhealthy
+      start_period: 30s # 容器启动后等待30秒再开始第一次健康检查

requirements.txt

@@ -1,5 +1,5 @@
 fastapi
-httpx
+httpx[socks]
 openai
 pydantic
 pydantic_settings
@@ -14,6 +14,8 @@ cryptography # 支持 MySQL 8+ caching_sha2_password 验证
 pymysql
 sqlalchemy
 aiomysql
+aiosqlite
 databases
 python-dotenv
-apscheduler # 添加定时任务库
+apscheduler
+packaging