i/Aether
1
0
Fork 0
mirror of https://github.com/fawney19/Aether.git synced 2026-09-02 01:10:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复配置导入时 api_formats 与 endpoint 格式比较不一致的 bug

Browse Source 
原代码使用 .upper() 转大写与小写的 endpoint_formats 比较，
导致所有格式都被误判为"未配置对应 Endpoint"。
改为统一使用 normalize_signature_key 归一化后比较。
This commit is contained in:
fawney19
2026-02-05 16:51:52 +08:00
parent b35ddcba3f
commit 8ad53b9490
1 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/api/admin/system.py
View File

@@ -1295,6 +1295,8 @@ class AdminImportConfigAdapter(AdminApiAdapter):
stats["endpoints"]["created"] += 1
# 导入 Provider Keys（按 provider_id 归属）
from src.core.api_format.signature import normalize_signature_key
endpoint_format_rows = (
db.query(ProviderEndpoint.api_format)
.filter(ProviderEndpoint.provider_id == provider_id)
@@ -1303,8 +1305,6 @@ class AdminImportConfigAdapter(AdminApiAdapter):
endpoint_formats: set[str] = set()
for (api_format,) in endpoint_format_rows:
fmt = api_format.value if hasattr(api_format, "value") else str(api_format)
from src.core.api_format.signature import normalize_signature_key
endpoint_formats.add(normalize_signature_key(fmt))
existing_keys = (
db.query(ProviderAPIKey).filter(ProviderAPIKey.provider_id == provider_id).all()
@@ -1340,14 +1340,24 @@ class AdminImportConfigAdapter(AdminApiAdapter):
for fmt in raw_formats:
if not isinstance(fmt, str):
continue
fmt_upper = fmt.strip().upper()
if not fmt_upper or fmt_upper in seen:
fmt_stripped = fmt.strip()
if not fmt_stripped:
continue
seen.add(fmt_upper)
if endpoint_formats and fmt_upper not in endpoint_formats:
missing_formats.append(fmt_upper)
# 使用 normalize_signature_key 归一化，与 endpoint_formats 保持一致
try:
fmt_normalized = normalize_signature_key(fmt_stripped)
except (ValueError, KeyError):
# 无效的格式字符串，跳过
missing_formats.append(fmt_stripped.upper())
continue
normalized_formats.append(fmt_upper)
if fmt_normalized in seen:
continue
seen.add(fmt_normalized)
if endpoint_formats and fmt_normalized not in endpoint_formats:
missing_formats.append(fmt_normalized.upper())
continue
# 存储时使用大写格式以保持向后兼容
normalized_formats.append(fmt_normalized.upper())
if missing_formats:
stats["errors"].append(