Compare commits
2
Commits
2eee87f5fa
...
f3255b4d73
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f3255b4d73 | ||
|
|
83ecea482f |
No files matched your search
@@ -30,6 +30,8 @@ data/feedback_media/
|
||||
# 运行期状态(第三十轮):会话落盘 / 视频归属落盘 —— 都是运行数据,且含账号名与凭证哈希,
|
||||
# 属"可重新生成、不该进版本库"的一类(重启后从空开始,语义上无害)
|
||||
data/sessions.json
|
||||
# 封禁历史(2026-11-19 补):运行时数据,且**含被封 IP 与操作人**,属隐私,不入库
|
||||
data/ban_history.jsonl
|
||||
data/video_owners.json
|
||||
|
||||
# 智能体运行记录(第三十八轮):运行时数据(谁在什么时候用了哪个智能体),
|
||||
|
||||
@@ -1,5 +1,40 @@
|
||||
# CHANGELOG
|
||||
|
||||
## 2026-11-19 · 修 OpenCode 模型同步(官方文档改版导致连续两天 exit=2)
|
||||
|
||||
**症状**:自动化日报的「三、模型清单同步」整块失败,`logs/model-sync.log` 连续两天:
|
||||
|
||||
```
|
||||
[2026-11-17 23:02:18] exit=2 抓取/解析失败:RuntimeError: OpenCode 文档没解析出 Endpoints 表(页面可能改版)
|
||||
[2026-11-18 23:02:29] exit=2 同上
|
||||
```
|
||||
|
||||
**根因**:官方把 `## Endpoints` 表改成了「去 console 页看 / 用 models 接口」,
|
||||
HTML 里已经没有带 `opencode.ai/` 地址的模型行,`fetch_opencode()` 的 `<tr>/<td>` 解析拿不到任何行。
|
||||
|
||||
**修法**:改为优先读官方 models 接口(**无需鉴权**,实测不带 token 也 200):
|
||||
|
||||
```
|
||||
GET https://opencode.ai/inference/go/v1/models # 与 /zen/go/v1/models 同源同内容
|
||||
```
|
||||
|
||||
每条模型自带 `id` / `name` / `type` / `api{chat-completions,responses,messages,generate-content}` /
|
||||
`recommended_api` / `limit{context,output}` / `cost.text.*.price`(都为 0 = 免费)/ `go.limited_regions`。
|
||||
脚本据此推导协议线、免费标记、地区限制,**HTML 表解析降级为兜底**(接口不可用才走)。
|
||||
|
||||
**同步结果**(2026-11-19 08:02 首次落盘):
|
||||
|
||||
| 动作 | 内容 |
|
||||
|---|---|
|
||||
| 删除 | `opencode/mimo-v2.5`、`opencode/mimo-v2.5-pro`(上游已被 V2.6 取代,文档也不再收录)|
|
||||
| 上下文 | `hy4-flash-free` → 1,048,576 / 65,536;`qwen4-max` → 1,000,000 / 262,144 |
|
||||
| 跳过 | `gemini-4-argon`(只有 generate-content 线);`beam-free`、`muse-spark-1.2/1.3-contributor`(`go.limited_regions`,与旧硬编码名单一致)|
|
||||
|
||||
落盘后网关 28 个模型、`/healthz` 200,`hot_reload` 自动生效未重启;再跑一次输出「无漂移」。
|
||||
`sync_onemin.py` 同步验证通过(49 接口 / 43 配置 / 跳过重名 6)。
|
||||
|
||||
---
|
||||
|
||||
## 2026-10-31 · 新增 1min.AI 供应商(43 个模型)
|
||||
|
||||
老板:「查看 https://docs.1min.ai/docs/api/openai-compatible 文档,把 1min 供应商加入 ai 网关项目里」。
|
||||
|
||||
@@ -327,6 +327,7 @@ class ServerConfig:
|
||||
webhook_allow_private: bool = False # 视频 callback_url 是否允许指向内网/回环地址(SSRF 防护,默认否)
|
||||
docs_enabled: bool = False # 是否开放 FastAPI 文档(/docs、/redoc、/openapi.json)——安全默认关
|
||||
auth_fail_limit_per_min: int = 20 # 同一来源 IP 每分钟允许的鉴权失败次数,超过 → 429(防暴力枚举)
|
||||
auth_fail_ban_seconds: int = 3600 # 超限后拉黑时长(秒);2026-11-06 新增,0=只限流不拉黑
|
||||
|
||||
|
||||
@dataclass
|
||||
@@ -861,6 +862,8 @@ def parse_config(raw: dict[str, Any]) -> GatewayConfig:
|
||||
docs_enabled=_opt_bool(srv_raw.get("docs_enabled"), "server.docs_enabled", False),
|
||||
auth_fail_limit_per_min=_opt_int(srv_raw.get("auth_fail_limit_per_min"),
|
||||
"server.auth_fail_limit_per_min", 20, minimum=1),
|
||||
auth_fail_ban_seconds=_opt_int(srv_raw.get("auth_fail_ban_seconds"),
|
||||
"server.auth_fail_ban_seconds", 3600, minimum=0),
|
||||
)
|
||||
|
||||
# 网关入口鉴权(客户端 key 数组,可配多用户)
|
||||
|
||||
+395
-7
@@ -953,6 +953,19 @@ async def _validate_callback_url(raw: str | None, allow_private: bool) -> None:
|
||||
# ── IP 级鉴权失败限流(安全报告:中低危——无 IP 限流可暴力枚举 / 刷流量)──
|
||||
_AUTH_FAILS: dict[str, deque] = {}
|
||||
_AUTH_FAIL_MAX_IPS = 1000 # 最多跟踪的 IP,超限清空一次(防内存膨胀)
|
||||
# 2026-11-06: 鉴权失败超限后拉黑一段时间(默认 1 小时),期间该 IP 一律 429。
|
||||
# key=IP, value=解封时间戳(time.time())。只影响这一个 IP,不波及其他来源。
|
||||
_BANNED: dict[str, float] = {}
|
||||
_BANNED_MAX_IPS = 10000 # 最多跟踪的封禁 IP,超限清最旧的一批(防内存膨胀)
|
||||
# 封禁备注(手动封禁时可填「谁、为什么」),与 _BANNED 同生命周期,解封/过期时一并清掉。
|
||||
_BAN_NOTES: dict[str, str] = {}
|
||||
# 永久封禁(不随时间过期)。与 _BANNED 分开存,免得拿"极大时间戳"糊弄,
|
||||
# 导致剩余时间算出天文数字、前端还得猜哪个算永久。
|
||||
_BANNED_FOREVER: set[str] = set()
|
||||
# 封禁操作历史(封/解封/延长),落盘 JSONL,重启不丢。只保留最近 _BAN_HISTORY_MAX 条。
|
||||
_BAN_HISTORY: list[dict] = []
|
||||
_BAN_HISTORY_MAX = 500
|
||||
_BAN_HISTORY_FILE = Path(__file__).resolve().parent.parent / "data" / "ban_history.jsonl"
|
||||
|
||||
|
||||
_TRUSTED_PROXY_IPS = {"127.0.0.1", "::1"} # 本机反代(nginx/openresty):只有它写的 XFF 可信
|
||||
@@ -979,10 +992,142 @@ def _client_ip(request: Request) -> str:
|
||||
return peer or "unknown"
|
||||
|
||||
|
||||
def _record_auth_fail(request: Request, limit_per_min: int) -> bool:
|
||||
"""记录一次鉴权失败;返回 True 表示该来源 60s 内已超限(应直接 429)。"""
|
||||
def _ban_remaining(ip: str) -> int:
|
||||
"""该 IP 还要被限制的秒数:0=未封禁,-1=永久封禁,>0=剩余秒数。
|
||||
|
||||
顺带清理已过期的定时封禁(投机清理,不要求调用方配合)。
|
||||
"""
|
||||
if ip in _BANNED_FOREVER:
|
||||
return -1
|
||||
exp = _BANNED.get(ip)
|
||||
if exp is None:
|
||||
return 0
|
||||
left = int(exp - time.time())
|
||||
if left <= 0:
|
||||
_BANNED.pop(ip, None)
|
||||
_BAN_NOTES.pop(ip, None)
|
||||
return 0
|
||||
return left
|
||||
|
||||
|
||||
def _ban_history_add(action: str, ip: str, *, seconds: int = 0,
|
||||
note: str = "", actor: str = "", permanent: bool = False) -> None:
|
||||
"""记一条封禁操作历史(封/解封/延长/清空),并追加到 JSONL。
|
||||
|
||||
历史上限 _BAN_HISTORY_MAX 条(内存),文件则是纯追加、由运维按需轮转。
|
||||
落盘失败不影响主流程 —— 封禁本身比日志重要。
|
||||
"""
|
||||
item = {
|
||||
"id": uuid.uuid4().hex[:12], # 删除时用的稳定标识(时间戳会撞,不能用)
|
||||
"ts": int(time.time()),
|
||||
"action": action, # ban / manual_ban / unban / unban_all / extend / auto_ban
|
||||
"ip": ip,
|
||||
"seconds": seconds,
|
||||
"permanent": permanent,
|
||||
"note": note,
|
||||
"actor": actor,
|
||||
}
|
||||
_BAN_HISTORY.append(item)
|
||||
if len(_BAN_HISTORY) > _BAN_HISTORY_MAX:
|
||||
del _BAN_HISTORY[: len(_BAN_HISTORY) - _BAN_HISTORY_MAX]
|
||||
try:
|
||||
_BAN_HISTORY_FILE.parent.mkdir(parents=True, exist_ok=True)
|
||||
with _BAN_HISTORY_FILE.open("a", encoding="utf-8") as fh:
|
||||
fh.write(json.dumps(item, ensure_ascii=False) + "\n")
|
||||
except OSError as e:
|
||||
log.warning("封禁历史上写盘失败(不影响封禁本身):%s", e)
|
||||
|
||||
|
||||
def _ban_history_save() -> None:
|
||||
"""把内存里的历史整体重写到 JSONL(删除后调用)。
|
||||
|
||||
为什么不是「删文件里某一行」:JSONL 没有索引,原地删要读全量再写回,
|
||||
代价和整体重写一样,但整体重写不会留下空洞或半行,更安全。
|
||||
"""
|
||||
try:
|
||||
_BAN_HISTORY_FILE.parent.mkdir(parents=True, exist_ok=True)
|
||||
tmp = _BAN_HISTORY_FILE.with_suffix(".jsonl.tmp")
|
||||
with tmp.open("w", encoding="utf-8") as fh:
|
||||
for h in _BAN_HISTORY:
|
||||
fh.write(json.dumps(h, ensure_ascii=False) + "\n")
|
||||
tmp.replace(_BAN_HISTORY_FILE) # 原子替换,避免写一半被读到
|
||||
except OSError as e:
|
||||
log.warning("封禁历史重写盘失败(不影响封禁本身):%s", e)
|
||||
|
||||
|
||||
def _ban_history_load() -> None:
|
||||
"""启动时把历史文件读回内存(文件丢了/坏了就当空历史,不阻塞启动)。
|
||||
|
||||
老版本写的行没有 id,这里补一个,保证删除接口对历史数据同样可用。
|
||||
"""
|
||||
try:
|
||||
if not _BAN_HISTORY_FILE.is_file():
|
||||
return
|
||||
with _BAN_HISTORY_FILE.open("r", encoding="utf-8") as fh:
|
||||
for line in fh:
|
||||
line = line.strip()
|
||||
if not line:
|
||||
continue
|
||||
try:
|
||||
h = json.loads(line)
|
||||
except json.JSONDecodeError:
|
||||
continue # 半行/坏行直接跳过,别为一条脏数据拖垮整个历史
|
||||
if not isinstance(h, dict):
|
||||
continue
|
||||
h.setdefault("id", uuid.uuid4().hex[:12])
|
||||
for k, dv in (("ts", 0), ("action", "unknown"), ("ip", ""), ("seconds", 0),
|
||||
("permanent", False), ("note", ""), ("actor", "")):
|
||||
h.setdefault(k, dv)
|
||||
_BAN_HISTORY.append(h)
|
||||
if len(_BAN_HISTORY) > _BAN_HISTORY_MAX:
|
||||
del _BAN_HISTORY[: len(_BAN_HISTORY) - _BAN_HISTORY_MAX]
|
||||
log.info("封禁历史已载入 %d 条", len(_BAN_HISTORY))
|
||||
except OSError as e:
|
||||
log.warning("封禁历史读取失败(按空历史启动):%s", e)
|
||||
|
||||
|
||||
_ban_history_load()
|
||||
|
||||
|
||||
def _record_auth_fail(request: Request, limit_per_min: int, ban_seconds: int = 3600) -> int:
|
||||
"""记录一次鉴权失败。
|
||||
|
||||
返回 0 表示还没到限流阈值(调用方按原样回 401);
|
||||
返回 >0 表示该来源应被 429,值是**还要等多少秒**:
|
||||
- 已被拉黑 → 剩余拉黑秒数
|
||||
- 本次刚触发 → ban_seconds(>0 时顺便写入封禁表)
|
||||
|
||||
2026-11-06: 从「只限流 60 秒」改成「超限即拉黑 ban_seconds 秒(默认 1 小时)」。
|
||||
只针对该 IP,其他来源完全不受影响。
|
||||
"""
|
||||
ip = _client_ip(request)
|
||||
now = time.time()
|
||||
|
||||
# 2026-11-06 安全网:回环 / 私网 / 本机反代永不拉黑。
|
||||
# 原因:网关只监听 127.0.0.1,正常流量都经 OpenResty 回源(带 XFF,能拿到真实 IP);
|
||||
# 但如果某次 XFF 缺失,_client_ip 会退回 peer=127.0.0.1 —— 一旦拉黑它,
|
||||
# 等于把**所有人**一起封死。这里直接豁免,宁可少封一个也不误伤全局。
|
||||
if ip in ("127.0.0.1", "::1", "localhost", "unknown", ""):
|
||||
dq0 = _AUTH_FAILS.get(ip)
|
||||
if dq0 is None:
|
||||
if len(_AUTH_FAILS) >= _AUTH_FAIL_MAX_IPS:
|
||||
_AUTH_FAILS.clear()
|
||||
dq0 = deque()
|
||||
_AUTH_FAILS[ip] = dq0
|
||||
dq0.append(now)
|
||||
while dq0 and now - dq0[0] > 60.0:
|
||||
dq0.popleft()
|
||||
# 仍然返回限流(保护服务),但不写封禁表
|
||||
return 60 if len(dq0) >= limit_per_min else 0
|
||||
if ip.startswith("10.") or ip.startswith("192.168.") or ip.startswith("172."):
|
||||
return 0 # 内网来源不参与封禁(自家设备误配 Key 不该被锁死)
|
||||
|
||||
# 已在封禁期内(含永久):直接返回,不再累计。
|
||||
# 注意 left 可能是 -1(永久),所以判断用真值而不是 >0。
|
||||
left = _ban_remaining(ip)
|
||||
if left:
|
||||
return left
|
||||
|
||||
dq = _AUTH_FAILS.get(ip)
|
||||
if dq is None:
|
||||
if len(_AUTH_FAILS) >= _AUTH_FAIL_MAX_IPS:
|
||||
@@ -992,7 +1137,22 @@ def _record_auth_fail(request: Request, limit_per_min: int) -> bool:
|
||||
dq.append(now)
|
||||
while dq and now - dq[0] > 60.0:
|
||||
dq.popleft()
|
||||
return len(dq) >= limit_per_min
|
||||
|
||||
if len(dq) >= limit_per_min:
|
||||
# 触发限流:清掉计数,按需写入封禁表
|
||||
_AUTH_FAILS.pop(ip, None)
|
||||
if ban_seconds > 0:
|
||||
if len(_BANNED) >= _BANNED_MAX_IPS:
|
||||
# 清掉最早解封的一批(保留最近的一半)
|
||||
keep = sorted(_BANNED.items(), key=lambda kv: kv[1])[-_BANNED_MAX_IPS // 2:]
|
||||
_BANNED.clear()
|
||||
_BANNED.update(dict(keep))
|
||||
_BANNED[ip] = now + ban_seconds
|
||||
_BAN_NOTES.pop(ip, None)
|
||||
log.warning("鉴权失败超限,拉黑 IP %s 共 %d 秒", ip, ban_seconds)
|
||||
return ban_seconds
|
||||
return 60
|
||||
return 0
|
||||
|
||||
|
||||
def _key_token(key: str) -> str | None:
|
||||
@@ -1127,8 +1287,12 @@ async def require_auth(
|
||||
log.info("已停用账号 %s 的 API Key 被调用,已拒绝(%s %s)",
|
||||
owner, request.method, request.url.path)
|
||||
raise HTTPException(403, "账号已被停用,请联系管理员")
|
||||
if _record_auth_fail(request, cfg.server.auth_fail_limit_per_min):
|
||||
raise HTTPException(429, "鉴权失败次数过多,已在 60 秒内触发限流,请稍后重试")
|
||||
_wait = _record_auth_fail(request, cfg.server.auth_fail_limit_per_min,
|
||||
cfg.server.auth_fail_ban_seconds)
|
||||
if _wait:
|
||||
_mins = max(1, (_wait + 59) // 60)
|
||||
raise HTTPException(429, f"鉴权失败次数过多,该 IP 已被限制访问,请 {_mins} 分钟后重试",
|
||||
headers={"Retry-After": str(_wait)})
|
||||
raise HTTPException(401, "无效或缺失的账号 / API Key", headers={"WWW-Authenticate": "Bearer"})
|
||||
account, role, kind = identity
|
||||
_set_identity(request, account, role)
|
||||
@@ -3550,8 +3714,12 @@ async def auth_login(request: Request):
|
||||
username = str(body.get("username") or "").strip()
|
||||
password = str(body.get("password") or "")
|
||||
if not username or not await _offload(_users.verify, username, password):
|
||||
if _record_auth_fail(request, _cfg().server.auth_fail_limit_per_min):
|
||||
raise HTTPException(429, "登录失败次数过多,已在 60 秒内触发限流,请稍后重试")
|
||||
_wait = _record_auth_fail(request, _cfg().server.auth_fail_limit_per_min,
|
||||
_cfg().server.auth_fail_ban_seconds)
|
||||
if _wait:
|
||||
_mins = max(1, (_wait + 59) // 60)
|
||||
raise HTTPException(429, f"登录失败次数过多,该 IP 已被限制访问,请 {_mins} 分钟后重试",
|
||||
headers={"Retry-After": str(_wait)})
|
||||
raise HTTPException(401, "账号或密码错误", headers={"WWW-Authenticate": "Bearer"})
|
||||
# 第二十四轮: 账号被管理员停用 → 密码对也不发会话,并明确告知原因(让人知道去找管理员,
|
||||
# 而不是反复试密码)。校验顺序在口令之后:不知道密码的人依旧只看到 401,探不出账号状态。
|
||||
@@ -3759,6 +3927,226 @@ def _require_session(request: Request) -> str:
|
||||
|
||||
|
||||
# ── 各账号自管 API Key(默认无,页面自建) ──
|
||||
# ── 鉴权失败拉黑管理(2026-11-06,仅管理员)────────────────────────────
|
||||
# 对应 _BANNED 字典(_record_auth_fail 写入)。只读 + 解封,不提供"手动封禁"
|
||||
# —— 手动封禁走 iptables/防火墙更合适,这里只负责查看和放行误封的 IP。
|
||||
@app.get("/admin/banned")
|
||||
async def admin_list_banned(request: Request, _auth=Depends(require_auth)):
|
||||
"""列出当前被封禁的 IP(仅管理员)。"""
|
||||
_require_admin(request)
|
||||
now = time.time()
|
||||
items = []
|
||||
for ip, exp in list(_BANNED.items()):
|
||||
left = int(exp - now)
|
||||
if left <= 0:
|
||||
_BANNED.pop(ip, None)
|
||||
_BAN_NOTES.pop(ip, None)
|
||||
continue
|
||||
items.append({
|
||||
"ip": ip,
|
||||
"banned_until": int(exp),
|
||||
"remaining_seconds": left,
|
||||
"remaining_minutes": (left + 59) // 60,
|
||||
"note": _BAN_NOTES.get(ip, ""),
|
||||
"permanent": False,
|
||||
})
|
||||
# 永久封禁排在最后(没有解封时间,按 IP 排)
|
||||
for ip in sorted(_BANNED_FOREVER):
|
||||
items.append({
|
||||
"ip": ip,
|
||||
"banned_until": 0,
|
||||
"remaining_seconds": -1,
|
||||
"remaining_minutes": -1,
|
||||
"note": _BAN_NOTES.get(ip, ""),
|
||||
"permanent": True,
|
||||
})
|
||||
items.sort(key=lambda x: (x["permanent"], x["banned_until"] or 0))
|
||||
return {
|
||||
"count": len(items),
|
||||
"ban_seconds": _cfg().server.auth_fail_ban_seconds,
|
||||
"auth_fail_limit_per_min": _cfg().server.auth_fail_limit_per_min,
|
||||
"items": items,
|
||||
}
|
||||
|
||||
|
||||
@app.post("/admin/banned")
|
||||
async def admin_ban(request: Request, _auth=Depends(require_auth)):
|
||||
"""手动封禁一个 IP(仅管理员)。
|
||||
|
||||
参数:{"ip": "1.2.3.4", "seconds": 3600};seconds 缺省用 server.auth_fail_ban_seconds。
|
||||
与自动拉黑共用 _BANNED 表,所以能在列表里看到、也能被同一个解封接口放行。
|
||||
白名单(回环/私网)同样豁免 —— 手动也封不掉本机反代,避免一键把全站弄挂。
|
||||
"""
|
||||
_require_admin(request)
|
||||
body = await _json_object(request)
|
||||
ip = str(body.get("ip") or "").strip()
|
||||
if not ip:
|
||||
raise HTTPException(400, "缺少参数 ip")
|
||||
# 只接受 IPv4/IPv6 字面量,挡住把整段/域名/通配塞进来的误操作
|
||||
try:
|
||||
ipaddress.ip_address(ip)
|
||||
except ValueError:
|
||||
raise HTTPException(400, f"不是合法的 IP 地址: {ip}")
|
||||
if ip in ("127.0.0.1", "::1", "localhost", "unknown", "") or ip.startswith(("10.", "192.168.", "172.")):
|
||||
raise HTTPException(400, "回环/内网地址不允许手动封禁(会把本机反代或自家设备一起锁死)")
|
||||
|
||||
permanent = bool(body.get("permanent"))
|
||||
default_sec = _cfg().server.auth_fail_ban_seconds or 3600
|
||||
if permanent:
|
||||
seconds = 0
|
||||
else:
|
||||
raw_sec = body.get("seconds")
|
||||
try:
|
||||
seconds = int(raw_sec) if raw_sec is not None else default_sec
|
||||
except (TypeError, ValueError):
|
||||
raise HTTPException(400, "seconds 必须是整数(秒)")
|
||||
if seconds < 60 or seconds > 30 * 86400:
|
||||
raise HTTPException(400, "seconds 需在 60 ~ 2592000(30 天)之间(永久请传 permanent=true)")
|
||||
|
||||
now = time.time()
|
||||
note = str(body.get("note") or "").strip()[:120]
|
||||
if permanent:
|
||||
_BANNED.pop(ip, None)
|
||||
_BANNED_FOREVER.add(ip)
|
||||
banned_until = 0
|
||||
else:
|
||||
if len(_BANNED) >= _BANNED_MAX_IPS:
|
||||
keep = sorted(_BANNED.items(), key=lambda kv: kv[1])[-_BANNED_MAX_IPS // 2:]
|
||||
_BANNED.clear()
|
||||
_BANNED.update(dict(keep))
|
||||
_BANNED_FOREVER.discard(ip)
|
||||
_BANNED[ip] = now + seconds
|
||||
banned_until = int(now + seconds)
|
||||
_AUTH_FAILS.pop(ip, None)
|
||||
if note:
|
||||
_BAN_NOTES[ip] = note
|
||||
else:
|
||||
_BAN_NOTES.pop(ip, None)
|
||||
log.warning("管理员 %s 手动封禁 IP %s %s%s", request.state.account, ip,
|
||||
"(永久)" if permanent else f"共 {seconds} 秒",
|
||||
f"(备注:{note})" if note else "")
|
||||
_ban_history_add("manual_ban", ip, seconds=seconds, note=note,
|
||||
actor=request.state.account, permanent=permanent)
|
||||
return {"status": "ok", "ip": ip, "banned_seconds": seconds,
|
||||
"banned_until": banned_until, "permanent": permanent}
|
||||
|
||||
|
||||
@app.put("/admin/banned/{ip}")
|
||||
async def admin_extend(request: Request, ip: str, _auth=Depends(require_auth)):
|
||||
"""延长某 IP 的封禁(仅管理员)。
|
||||
|
||||
参数:{"seconds": 3600} 或 {"permanent": true}。
|
||||
语义是**在当前剩余时间上加**,不是重置 —— 所以连点两次「延长 1 小时」= 续 2 小时。
|
||||
"""
|
||||
_require_admin(request)
|
||||
body = await _json_object(request)
|
||||
try:
|
||||
ipaddress.ip_address(ip)
|
||||
except ValueError:
|
||||
raise HTTPException(400, f"不是合法的 IP 地址: {ip}")
|
||||
|
||||
if ip not in _BANNED and ip not in _BANNED_FOREVER:
|
||||
raise HTTPException(404, f"{ip} 当前没有被封禁,无法延长")
|
||||
|
||||
permanent = bool(body.get("permanent"))
|
||||
now = time.time()
|
||||
if permanent:
|
||||
_BANNED.pop(ip, None)
|
||||
_BANNED_FOREVER.add(ip)
|
||||
total = 0
|
||||
else:
|
||||
raw_sec = body.get("seconds")
|
||||
try:
|
||||
seconds = int(raw_sec) if raw_sec is not None else (_cfg().server.auth_fail_ban_seconds or 3600)
|
||||
except (TypeError, ValueError):
|
||||
raise HTTPException(400, "seconds 必须是整数(秒)")
|
||||
if seconds < 60 or seconds > 30 * 86400:
|
||||
raise HTTPException(400, "seconds 需在 60 ~ 2592000(30 天)之间")
|
||||
if ip in _BANNED_FOREVER:
|
||||
# 永久封禁没有"剩余时间"可加,先转成定时再算
|
||||
_BANNED_FOREVER.discard(ip)
|
||||
base = now
|
||||
else:
|
||||
base = max(_BANNED.get(ip, now), now)
|
||||
_BANNED[ip] = base + seconds
|
||||
total = seconds
|
||||
log.warning("管理员 %s 延长 IP %s 的封禁:%s", request.state.account, ip,
|
||||
"改为永久" if permanent else f"+{total} 秒")
|
||||
_ban_history_add("extend", ip, seconds=total, actor=request.state.account, permanent=permanent)
|
||||
return {"status": "ok", "ip": ip, "extended_seconds": total, "permanent": permanent}
|
||||
|
||||
|
||||
@app.get("/admin/banned/history")
|
||||
async def admin_ban_history(request: Request, limit: int = 50, ip: str | None = None,
|
||||
_auth=Depends(require_auth)):
|
||||
"""封禁操作历史(仅管理员)。默认最近 50 条,可按 IP 过滤。"""
|
||||
_require_admin(request)
|
||||
rows = _BAN_HISTORY
|
||||
if ip:
|
||||
rows = [h for h in rows if h.get("ip") == ip]
|
||||
rows = rows[-max(1, min(limit, _BAN_HISTORY_MAX)):]
|
||||
return {"count": len(rows), "items": list(reversed(rows))}
|
||||
|
||||
|
||||
# ⚠️ 顺序敏感:下面两个必须以 "history" 结尾的路由**声明在** DELETE /admin/banned/{ip}
|
||||
# 之前,否则 FastAPI 会把 "history" 当成一个 IP 交给解封接口处理。
|
||||
@app.delete("/admin/banned/history/{hid}")
|
||||
async def admin_ban_history_delete(request: Request, hid: str, _auth=Depends(require_auth)):
|
||||
"""删除一条封禁历史(仅管理员)。只动历史记录,不影响任何实际封禁。"""
|
||||
_require_admin(request)
|
||||
keep = [h for h in _BAN_HISTORY if h.get("id") != hid]
|
||||
if len(keep) == len(_BAN_HISTORY):
|
||||
raise HTTPException(404, f"找不到历史记录 {hid}")
|
||||
_BAN_HISTORY[:] = keep
|
||||
_ban_history_save()
|
||||
log.info("管理员 %s 删除封禁历史 %s", request.state.account, hid)
|
||||
return {"status": "ok", "id": hid}
|
||||
|
||||
|
||||
@app.delete("/admin/banned/history")
|
||||
async def admin_ban_history_clear(request: Request, _auth=Depends(require_auth)):
|
||||
"""清空全部封禁历史(仅管理员)。只动历史记录,不影响任何实际封禁。"""
|
||||
_require_admin(request)
|
||||
n = len(_BAN_HISTORY)
|
||||
_BAN_HISTORY.clear()
|
||||
_ban_history_save()
|
||||
log.info("管理员 %s 清空封禁历史(共 %d 条)", request.state.account, n)
|
||||
return {"status": "ok", "cleared": n}
|
||||
|
||||
|
||||
@app.delete("/admin/banned/{ip}")
|
||||
async def admin_unban(request: Request, ip: str, _auth=Depends(require_auth)):
|
||||
"""解除某个 IP 的封禁(仅管理员)。"""
|
||||
_require_admin(request)
|
||||
# set.discard() 恒返回 None,不能拿它判断"是否存在",必须先查成员再删
|
||||
was_timed = _BANNED.pop(ip, None) is not None
|
||||
was_forever = ip in _BANNED_FOREVER
|
||||
_BANNED_FOREVER.discard(ip)
|
||||
existed = was_timed or was_forever
|
||||
_AUTH_FAILS.pop(ip, None) # 连失败计数一起清,避免刚放行又被立刻封回去
|
||||
_BAN_NOTES.pop(ip, None)
|
||||
log.info("管理员 %s 解除 IP %s 的封禁(原本存在=%s)",
|
||||
request.state.account, ip, existed)
|
||||
if existed:
|
||||
_ban_history_add("unban", ip, actor=request.state.account)
|
||||
return {"status": "ok", "ip": ip, "was_banned": existed}
|
||||
|
||||
|
||||
@app.delete("/admin/banned")
|
||||
async def admin_unban_all(request: Request, _auth=Depends(require_auth)):
|
||||
"""清空全部封禁(仅管理员)。用于批量误封后的快速恢复。"""
|
||||
_require_admin(request)
|
||||
n = len(_BANNED) + len(_BANNED_FOREVER)
|
||||
_BANNED.clear()
|
||||
_BANNED_FOREVER.clear()
|
||||
_BAN_NOTES.clear()
|
||||
_AUTH_FAILS.clear()
|
||||
log.info("管理员 %s 清空全部封禁(共 %d 个 IP)", request.state.account, n)
|
||||
if n:
|
||||
_ban_history_add("unban_all", "*", actor=request.state.account, note=f"清空 {n} 个")
|
||||
return {"status": "ok", "cleared": n}
|
||||
|
||||
|
||||
@app.get("/auth/apikeys")
|
||||
async def auth_list_apikeys(request: Request, _auth=Depends(require_auth)):
|
||||
"""列出本账号 Key(含明文,便于反复复制)。
|
||||
|
||||
+54
-20
@@ -232,8 +232,6 @@ providers:
|
||||
- id: "agnes-video-2.5-flash"
|
||||
display_name: "Agnes Video 2.5 Flash"
|
||||
type: "video"
|
||||
free: true # 2026-09-24 自动同步:文档「当前优惠」写当前限时免费(scripts/sync_models.py)
|
||||
free_limited: true # 限时免费;文档改口径后同步会自动撤掉这行
|
||||
# 2026-09-24 自动同步:官方文档新增(scripts/sync_models.py)
|
||||
- id: "agnes-2.5-pro"
|
||||
display_name: "Agnes 2.5 Pro"
|
||||
@@ -264,6 +262,11 @@ providers:
|
||||
context_window: 1000000 # 同步 2026-10-21(scripts/sync_models.py)
|
||||
max_output_tokens: 65536 # 同步 2026-10-21(scripts/sync_models.py)
|
||||
# 文档现价 ¥3/M 输入、¥6/M 输出
|
||||
# 2026-11-09 自动同步:官方文档新增(scripts/sync_models.py)
|
||||
- id: "agnes-2.5-pro-theta"
|
||||
display_name: "Agnes 2.5 Pro Theta"
|
||||
type: "text"
|
||||
# 文档现价 ¥3/M 输入、¥6/M 输出
|
||||
|
||||
opencode:
|
||||
name: "OpenCode Go"
|
||||
@@ -301,6 +304,7 @@ providers:
|
||||
responses:
|
||||
path: "/responses"
|
||||
auth: "bearer"
|
||||
rate_limit_rps: 3.0 # 2026-11-06 新增:主动限流,避免被上游 429
|
||||
# ── 模型 ─────────────────────────────────────────────────
|
||||
# models[].protocols = 该模型**能用哪几条线**(入站格式必须与出站一致)。
|
||||
# 取值:chat/completions | messages | responses;不写 = 只认 chat/completions。
|
||||
@@ -355,18 +359,6 @@ providers:
|
||||
context_window: 1000000 # 第三十三轮(2026-09-24):上下文窗口(token),每日同步维护
|
||||
max_output_tokens: 131072 # 最大输出(token)
|
||||
protocols: ["chat/completions"]
|
||||
- id: "mimo-v2.5"
|
||||
display_name: "MiMo V2.5"
|
||||
type: "text"
|
||||
context_window: 1000000 # 第三十三轮(2026-09-24):上下文窗口(token),每日同步维护
|
||||
max_output_tokens: 128000 # 最大输出(token)
|
||||
protocols: ["chat/completions"]
|
||||
- id: "mimo-v2.5-pro"
|
||||
display_name: "MiMo V2.5 Pro"
|
||||
type: "text"
|
||||
context_window: 1048576 # 第三十三轮(2026-09-24):上下文窗口(token),每日同步维护
|
||||
max_output_tokens: 128000 # 最大输出(token)
|
||||
protocols: ["chat/completions"]
|
||||
- id: "hy4-preview"
|
||||
display_name: "Hy4 Preview"
|
||||
type: "text"
|
||||
@@ -398,7 +390,7 @@ providers:
|
||||
display_name: "Kimi K3"
|
||||
type: "text"
|
||||
context_window: 1048576 # 第三十三轮(2026-09-24):上下文窗口(token),每日同步维护
|
||||
max_output_tokens: 131072 # 最大输出(token)
|
||||
max_output_tokens: 1048576 # 最大输出(token)
|
||||
protocols: ["chat/completions", "messages"]
|
||||
- id: "minimax-m3"
|
||||
display_name: "MiniMax M3"
|
||||
@@ -495,7 +487,7 @@ providers:
|
||||
display_name: "Kimi K3.1 Pro"
|
||||
type: "text"
|
||||
context_window: 1048576 # 同步 2026-10-25(scripts/sync_models.py)
|
||||
max_output_tokens: 131072 # 同步 2026-10-25(scripts/sync_models.py)
|
||||
max_output_tokens: 1048576 # 同步 2026-10-25(scripts/sync_models.py)
|
||||
# 协议线取自官方 Endpoints 表,未逐线实测(现网其它模型是实测过的)
|
||||
protocols: ["chat/completions"]
|
||||
# 2026-10-27 自动同步:官方文档新增(scripts/sync_models.py)
|
||||
@@ -507,6 +499,41 @@ providers:
|
||||
# 协议线取自官方 Endpoints 表,未逐线实测(现网其它模型是实测过的)
|
||||
protocols: ["chat/completions"]
|
||||
free: true # 官方价格表标 Free
|
||||
# 2026-11-06 自动同步:官方文档新增(scripts/sync_models.py)
|
||||
- id: "hy4"
|
||||
display_name: "Hy4"
|
||||
type: "text"
|
||||
context_window: 1048576 # 同步 2026-11-07(scripts/sync_models.py)
|
||||
max_output_tokens: 65536 # 同步 2026-11-07(scripts/sync_models.py)
|
||||
# 协议线取自官方 Endpoints 表,未逐线实测(现网其它模型是实测过的)
|
||||
protocols: ["chat/completions"]
|
||||
# 2026-11-07 自动同步:官方文档新增(scripts/sync_models.py)
|
||||
# 2026-11-10 自动同步:官方文档新增(scripts/sync_models.py)
|
||||
- id: "longcat-2.5-free"
|
||||
display_name: "Longcat 2.5 Free"
|
||||
type: "text"
|
||||
context_window: 1000000 # 同步 2026-11-10(scripts/sync_models.py)
|
||||
max_output_tokens: 262144 # 同步 2026-11-10(scripts/sync_models.py)
|
||||
# 协议线取自官方 Endpoints 表,未逐线实测(现网其它模型是实测过的)
|
||||
protocols: ["chat/completions"]
|
||||
free: true # 官方价格表标 Free
|
||||
# 2026-11-16 自动同步:官方文档新增(scripts/sync_models.py)
|
||||
- id: "hy4-flash-free"
|
||||
display_name: "Hy4 Flash Free"
|
||||
type: "text"
|
||||
context_window: 1048576 # 同步 2026-11-19(scripts/sync_models.py)
|
||||
max_output_tokens: 65536 # 同步 2026-11-19(scripts/sync_models.py)
|
||||
# 协议线取自官方 Endpoints 表,未逐线实测(现网其它模型是实测过的)
|
||||
protocols: ["chat/completions"]
|
||||
free: true # 官方价格表标 Free
|
||||
# 2026-11-16 自动同步:官方文档新增(scripts/sync_models.py)
|
||||
- id: "qwen4-max"
|
||||
display_name: "Qwen4 Max"
|
||||
type: "text"
|
||||
context_window: 1000000 # 同步 2026-11-19(scripts/sync_models.py)
|
||||
max_output_tokens: 262144 # 同步 2026-11-19(scripts/sync_models.py)
|
||||
# 协议线取自官方 Endpoints 表,未逐线实测(现网其它模型是实测过的)
|
||||
protocols: ["messages"]
|
||||
# 2026-10-09 自动同步:官方文档新增(scripts/sync_models.py)
|
||||
# ── Dots AI(小红书 Dots Studio,第三十六轮新增)──────────────
|
||||
# 官方文档:https://dots.ai/platform/docs(2026-09-28 通读)
|
||||
@@ -569,20 +596,26 @@ server:
|
||||
hot_reload: true # 监听 gateway.yaml mtime 自动重载(改配置免重启)
|
||||
hot_reload_interval: 15 # 重载检查间隔(秒)
|
||||
metrics_enabled: true # 记录调用指标(/metrics)
|
||||
rate_limit_rps: 20 # 全局单 user QPS 上限(2026-10-23 由 null 改为 20:防泄露 Key 打爆额度;
|
||||
rate_limit_rps: 50 # 全局单 user QPS 上限(2026-11-06 由 20 改为 50:多客户端并发时 20 太紧)(2026-10-23 由 null 改为 20:防泄露 Key 打爆额度;
|
||||
# 供应商级限流仍由 provider.rate_limit_rps 控制,两者取更严的那个)
|
||||
# 请求体字节上限。2026-09-24 从 2MB 提到 20MB:带图对话(生成/上传的 PNG 以
|
||||
# base64 内联进历史,单张 100KB~750KB)几张就顶爆 2MB → 上游 413
|
||||
# 「请求体超过上限 2000000 字节」。内部网关 + nginx 两层把关,保留限制只调大数字。
|
||||
max_body_size: 20000000
|
||||
cors_origins: ["*"] # CORS 允许来源(生产收紧为具体域名)
|
||||
cors_origins: # CORS 允许来源(2026-11-06 由 ["*"] 收紧为白名单)
|
||||
- "https://api.wangjinding.com"
|
||||
- "http://127.0.0.1:8808"
|
||||
- "http://localhost:8808"
|
||||
- "http://127.0.0.1:5173" # Vite dev server
|
||||
- "http://localhost:5173"
|
||||
graceful_shutdown: 30 # 优雅关闭等待在途请求的秒数
|
||||
# ── 防滥用 / 安全 ──
|
||||
batch_max_concurrency: 16 # /batch 并发上限(客户端 max_concurrency 会被钳到此值)
|
||||
batch_max_items: 64 # /batch 单次最大条目数(超出返回 400)
|
||||
webhook_allow_private: false # 视频 callback_url 是否允许指向内网/回环(SSRF 防护,默认禁)
|
||||
docs_enabled: false # FastAPI 文档(/docs、/openapi.json)是否开放(安全默认关)
|
||||
auth_fail_limit_per_min: 20 # 同一来源 IP 每分钟鉴权失败上限,超过 → 429(防暴力枚举)
|
||||
auth_fail_limit_per_min: 60 # 同一来源 IP 每分钟鉴权失败上限(2026-11-06 由 20 改为 60:客户端配错 Key 重试容易误触发),超过 → 429(防暴力枚举)
|
||||
auth_fail_ban_seconds: 3600 # 2026-11-06 新增:鉴权失败超限后拉黑 1 小时(0=只限流不拉黑)
|
||||
|
||||
# ── 供应商熔断(Circuit Breaker) ──────────────────────
|
||||
# 某供应商连续/滑动窗口失败达到 failure_threshold 就熔断 cooldown 秒,
|
||||
@@ -606,7 +639,8 @@ pricing:
|
||||
agnes-3.0-flash: { input: 0, output: 0 } # 同步 2026-09-24(原 0.35/1;文档现价 ¥0/M 输入、¥0/M 输出)
|
||||
agnes-2.5-flash: { input: 0, output: 0 } # 文档现价暂免(输入/输出/缓存命中均 ¥0/百万)
|
||||
agnes-2.5-pro: { input: 3, output: 6 } # 2026-09-24 自动同步(文档现价)
|
||||
agnes-2.5-pro-beta: { input: 3, output: 6 } # 2026-10-21 自动同步(文档现价)
|
||||
agnes-2.5-pro-beta: { input: 0.7, output: 2.1 } # 2026-10-21 自动同步(文档现价)
|
||||
agnes-2.5-pro-theta: { input: 0.7, output: 2 } # 2026-11-09 自动同步(文档现价)
|
||||
|
||||
# ── 媒体下载代理白名单(第十七轮)────────────────────────
|
||||
# 生成的图片/视频挂在第三方 CDN 上且不带 CORS 头,浏览器里既 fetch 不到 blob、
|
||||
|
||||
@@ -45,6 +45,7 @@ export function navGroups(isAdmin: boolean): NavGroup[] {
|
||||
// 第二十二轮定稿:管理员只处理反馈(「用户反馈」),不提意见 —— 所以这两项互斥。
|
||||
if (isAdmin) sys.push({ path: '/users', key: 'users', icon: 'users' })
|
||||
if (isAdmin) sys.push({ path: '/feedback-inbox', key: 'feedbackinbox', icon: 'inbox' })
|
||||
if (isAdmin) sys.push({ path: '/banned', key: 'banned', icon: 'ban' })
|
||||
// 第二十三轮追加:老板要求「网关配置先不要删掉、先隐藏起来,这块先不支持页面配置」→
|
||||
// 入口由 `lib/features.ts` 的开关统一控制(页面与路由都还在,只是不挂出来)。
|
||||
if (isAdmin && GATEWAY_CONFIG_ENABLED) sys.push({ path: '/gateway-config', key: 'gatewaycfg', icon: 'sliders' })
|
||||
|
||||
@@ -1,5 +1,69 @@
|
||||
// English locale resource
|
||||
export default {
|
||||
banned: {
|
||||
title: 'Banned IPs',
|
||||
count: '{n} IP(s) banned',
|
||||
rule: 'An IP is auto-banned for {mins} min after {n} auth failures within a minute. While banned, every API request from it returns 429; other sources are unaffected.',
|
||||
remaining: '{mins} min left',
|
||||
until: 'Unban at',
|
||||
unban: 'Unban',
|
||||
empty: 'No banned IPs',
|
||||
unbanned: 'Unbanned {ip}',
|
||||
clearAll: 'Unban all',
|
||||
clearTitle: 'Clear all bans',
|
||||
clearConfirm: 'Clear all bans? Those IPs can access immediately afterwards.',
|
||||
cleared: 'Cleared {n} ban(s)',
|
||||
manualTitle: 'Manual ban',
|
||||
manualSub: 'Ban an IP right away instead of waiting for the auto rule',
|
||||
manualHint: 'Public IPs only. Loopback and private ranges (10./192.168./172.) cannot be banned, so the local reverse proxy and your own LAN devices stay reachable.',
|
||||
ipPlaceholder: 'IP address, e.g. 1.2.3.4',
|
||||
notePlaceholder: 'Note (optional, e.g. "brute force")',
|
||||
doBan: 'Ban',
|
||||
ipRequired: 'Please enter an IP address',
|
||||
banned: 'Banned {ip} for {mins} min',
|
||||
bannedForever: 'Permanently banned {ip}',
|
||||
extend: 'Extend',
|
||||
extended: 'Extended {ip} by {mins} min',
|
||||
extendedForever: '{ip} is now banned permanently',
|
||||
toPermanent: 'Make permanent',
|
||||
permanentTag: 'permanent',
|
||||
neverExpire: 'Permanent — will not expire automatically',
|
||||
historyTitle: 'Ban history',
|
||||
historySub: 'Recent actions (ban / unban / extend)',
|
||||
historyEmpty: 'No ban actions yet',
|
||||
unitDay: '{n} day(s)',
|
||||
unitHour: '{n} hour(s)',
|
||||
unitMin: '{n} min',
|
||||
hisOps: 'Action',
|
||||
hisDelete: 'Delete',
|
||||
hisDeleted: 'History entry deleted',
|
||||
hisClearAll: 'Clear history',
|
||||
hisClearConfirm: 'Clear all ban history? This cannot be undone (active bans are not affected).',
|
||||
hisCleared: 'Cleared {n} history entries',
|
||||
hisTime: 'Time',
|
||||
hisAction: 'Action',
|
||||
hisIp: 'IP',
|
||||
hisDuration: 'Duration',
|
||||
hisActor: 'By',
|
||||
hisNote: 'Note',
|
||||
act: {
|
||||
manual_ban: 'manual ban',
|
||||
auto_ban: 'auto ban',
|
||||
extend: 'extend',
|
||||
unban: 'unban',
|
||||
unban_all: 'clear all',
|
||||
},
|
||||
dur: {
|
||||
m10: '10 minutes',
|
||||
m30: '30 minutes',
|
||||
h1: '1 hour',
|
||||
h6: '6 hours',
|
||||
d1: '1 day',
|
||||
d30: '30 days',
|
||||
forever: 'permanent',
|
||||
},
|
||||
},
|
||||
|
||||
nav: {
|
||||
title: 'API Gateway',
|
||||
connected: 'Connected to api.wangjinding.com',
|
||||
@@ -16,6 +80,7 @@ export default {
|
||||
menulogs: 'Logs',
|
||||
menufeedback: 'Feedback',
|
||||
menufeedbackinbox: 'User feedback',
|
||||
menubanned: 'Banned IPs',
|
||||
feedbackTodoTip: '{n} pending (open + in progress)',
|
||||
menusettings: 'Settings',
|
||||
control: 'Console',
|
||||
|
||||
@@ -1,5 +1,69 @@
|
||||
// 中文文案资源
|
||||
export default {
|
||||
banned: {
|
||||
title: '封禁列表',
|
||||
count: '共 {n} 个 IP 被封',
|
||||
rule: '同一 IP 每分钟鉴权失败达到 {n} 次即自动封禁 {mins} 分钟;被封期间该 IP 的所有 API 请求返回 429,其他来源不受影响。',
|
||||
remaining: '剩余 {mins} 分钟',
|
||||
until: '解封时间',
|
||||
unban: '解封',
|
||||
empty: '当前没有被封禁的 IP',
|
||||
unbanned: '已解封 {ip}',
|
||||
clearAll: '全部解封',
|
||||
clearTitle: '清空全部封禁',
|
||||
clearConfirm: '确定清空全部封禁?清空后这些 IP 可以立即重新访问。',
|
||||
cleared: '已清空 {n} 个封禁',
|
||||
manualTitle: '手动封禁',
|
||||
manualSub: '立即拉黑指定 IP,不必等它触发自动规则',
|
||||
manualHint: '只支持公网 IP;回环地址和内网段(10./192.168./172.)不允许封禁,避免把本机反代或自家设备锁死。',
|
||||
ipPlaceholder: 'IP 地址,例如 1.2.3.4',
|
||||
notePlaceholder: '备注(可选,例如「持续爆破」)',
|
||||
doBan: '封禁',
|
||||
ipRequired: '请先填写 IP 地址',
|
||||
banned: '已封禁 {ip},时长 {mins} 分钟',
|
||||
bannedForever: '已永久封禁 {ip}',
|
||||
extend: '延长',
|
||||
extended: '已为 {ip} 延长 {mins} 分钟',
|
||||
extendedForever: '{ip} 已改为永久封禁',
|
||||
toPermanent: '改为永久',
|
||||
permanentTag: '永久',
|
||||
neverExpire: '永久有效,不会自动解封',
|
||||
historyTitle: '封禁历史',
|
||||
historySub: '最近的操作记录(封禁 / 解封 / 延长)',
|
||||
historyEmpty: '还没有封禁操作记录',
|
||||
unitDay: '{n} 天',
|
||||
unitHour: '{n} 小时',
|
||||
unitMin: '{n} 分钟',
|
||||
hisOps: '操作',
|
||||
hisDelete: '删除',
|
||||
hisDeleted: '已删除该条历史',
|
||||
hisClearAll: '清空历史',
|
||||
hisClearConfirm: '确定清空全部封禁历史?此操作不可恢复(不会影响当前封禁)。',
|
||||
hisCleared: '已清空 {n} 条历史',
|
||||
hisTime: '时间',
|
||||
hisAction: '操作',
|
||||
hisIp: 'IP',
|
||||
hisDuration: '时长',
|
||||
hisActor: '操作人',
|
||||
hisNote: '备注',
|
||||
act: {
|
||||
manual_ban: '手动封禁',
|
||||
auto_ban: '自动封禁',
|
||||
extend: '延长',
|
||||
unban: '解封',
|
||||
unban_all: '清空',
|
||||
},
|
||||
dur: {
|
||||
m10: '10 分钟',
|
||||
m30: '30 分钟',
|
||||
h1: '1 小时',
|
||||
h6: '6 小时',
|
||||
d1: '1 天',
|
||||
d30: '30 天',
|
||||
forever: '永久',
|
||||
},
|
||||
},
|
||||
|
||||
nav: {
|
||||
title: 'API 网关',
|
||||
connected: '已连接 api.wangjinding.com',
|
||||
@@ -16,6 +80,7 @@ export default {
|
||||
menulogs: '日志',
|
||||
menufeedback: '意见反馈',
|
||||
menufeedbackinbox: '用户反馈',
|
||||
menubanned: '封禁管理',
|
||||
feedbackTodoTip: '{n} 条待办(未处理 + 处理中)',
|
||||
menusettings: '设置',
|
||||
control: '控制台',
|
||||
|
||||
@@ -25,6 +25,7 @@ const router = createRouter({
|
||||
{ path: 'keys', name: 'keys', component: () => import('./views/ApiKeys.vue') },
|
||||
{ path: 'users', name: 'users', component: () => import('./views/Users.vue'), meta: { admin: true } },
|
||||
{ path: 'feedback-inbox', name: 'feedbackinbox', component: () => import('./views/FeedbackInbox.vue'), meta: { admin: true } },
|
||||
{ path: 'banned', name: 'banned', component: () => import('./views/Banned.vue'), meta: { admin: true } },
|
||||
{ path: 'feedback', name: 'feedback', component: () => import('./views/Feedback.vue'), meta: { memberOnly: true } },
|
||||
{ path: 'gateway-config', name: 'gatewaycfg', component: () => import('./views/GatewayConfig.vue'), meta: { admin: true } },
|
||||
{ path: 'logs', name: 'logs', component: () => import('./views/Logs.vue') },
|
||||
|
||||
@@ -0,0 +1,395 @@
|
||||
<template>
|
||||
<div class="page page-col">
|
||||
<!-- ── 手动封禁 ─────────────────────────────────────────── -->
|
||||
<div class="card">
|
||||
<div class="card-h">
|
||||
<Icon name="ban" :size="15" />
|
||||
<b>{{ t('banned.manualTitle') }}</b>
|
||||
<span class="sub">{{ t('banned.manualSub') }}</span>
|
||||
</div>
|
||||
|
||||
<div class="ban-form">
|
||||
<el-input
|
||||
v-model="newIp" size="small" class="w-ip" clearable
|
||||
:placeholder="t('banned.ipPlaceholder')" @keyup.enter="doBan"
|
||||
/>
|
||||
<el-select v-model="newDur" size="small" class="w-dur">
|
||||
<el-option
|
||||
v-for="o in DURATIONS" :key="o.k" :value="o.k"
|
||||
:label="t(`banned.dur.${o.k}`)"
|
||||
/>
|
||||
</el-select>
|
||||
<el-input
|
||||
v-model="newNote" size="small" class="w-note" clearable
|
||||
:placeholder="t('banned.notePlaceholder')" @keyup.enter="doBan"
|
||||
/>
|
||||
<el-button type="primary" size="small" :loading="banning" @click="doBan">
|
||||
<Icon name="ban" :size="13" /><span>{{ t('banned.doBan') }}</span>
|
||||
</el-button>
|
||||
</div>
|
||||
<div class="form-hint">
|
||||
<Icon name="bell" :size="12" />
|
||||
<span>{{ t('banned.manualHint') }}</span>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ── 封禁列表 ─────────────────────────────────────────── -->
|
||||
<div class="card">
|
||||
<div class="card-h">
|
||||
<b>{{ t('banned.title') }}</b>
|
||||
<span class="sub">{{ t('banned.count', { n: items.length }) }}</span>
|
||||
<div class="pager">
|
||||
<el-button size="small" :loading="loading" @click="reload">
|
||||
<Icon name="refresh" :size="13" /><span>{{ t('common.refresh') }}</span>
|
||||
</el-button>
|
||||
<el-button size="small" type="danger" plain :disabled="!items.length" @click="clearAll">
|
||||
<Icon name="trash" :size="13" /><span>{{ t('banned.clearAll') }}</span>
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="warn-bar">
|
||||
<Icon name="ban" :size="14" />
|
||||
<span>{{ t('banned.rule', { n: limit, mins: banMinutes }) }}</span>
|
||||
</div>
|
||||
|
||||
<div v-if="items.length" class="ban-list">
|
||||
<div v-for="b in items" :key="b.ip" class="ban-row">
|
||||
<span class="dot" :class="{ perm: b.permanent }" />
|
||||
<div class="ban-main">
|
||||
<div class="ban-top">
|
||||
<b class="code ban-ip">{{ b.ip }}</b>
|
||||
<el-tag v-if="b.permanent" size="small" type="danger" effect="plain">
|
||||
{{ t('banned.permanentTag') }}
|
||||
</el-tag>
|
||||
<el-tag v-if="b.note" size="small" type="warning" effect="plain">
|
||||
{{ b.note }}
|
||||
</el-tag>
|
||||
</div>
|
||||
<div class="ban-meta">
|
||||
<template v-if="b.permanent">
|
||||
<span>{{ t('banned.neverExpire') }}</span>
|
||||
</template>
|
||||
<template v-else>
|
||||
<span>{{ t('banned.remaining', { mins: b.remaining_minutes }) }}</span>
|
||||
<span class="sep">·</span>
|
||||
<span>{{ t('banned.until') }} {{ fmtTs(b.banned_until) }}</span>
|
||||
</template>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ban-acts">
|
||||
<el-dropdown trigger="click" :disabled="b.permanent" @command="(k: string) => extend(b.ip, k)">
|
||||
<el-button size="small" :disabled="b.permanent">
|
||||
<Icon name="plus" :size="13" /><span>{{ t('banned.extend') }}</span>
|
||||
</el-button>
|
||||
<template #dropdown>
|
||||
<el-dropdown-menu>
|
||||
<el-dropdown-item v-for="o in DURATIONS" :key="o.k" :command="o.k">
|
||||
+{{ t(`banned.dur.${o.k}`) }}
|
||||
</el-dropdown-item>
|
||||
<el-dropdown-item command="forever" divided>
|
||||
{{ t('banned.toPermanent') }}
|
||||
</el-dropdown-item>
|
||||
</el-dropdown-menu>
|
||||
</template>
|
||||
</el-dropdown>
|
||||
<el-button size="small" @click="unban(b.ip)">
|
||||
<Icon name="check" :size="13" /><span>{{ t('banned.unban') }}</span>
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<el-empty v-else :description="t('banned.empty')" :image-size="72" />
|
||||
</div>
|
||||
|
||||
<!-- ── 封禁历史 ─────────────────────────────────────────── -->
|
||||
<div class="card">
|
||||
<div class="card-h">
|
||||
<Icon name="log" :size="15" />
|
||||
<b>{{ t('banned.historyTitle') }}</b>
|
||||
<span class="sub">{{ t('banned.historySub') }}</span>
|
||||
<div class="pager">
|
||||
<el-select v-model="hisLimit" size="small" class="w-his" @change="loadHistory">
|
||||
<el-option :value="20" label="20" />
|
||||
<el-option :value="50" label="50" />
|
||||
<el-option :value="100" label="100" />
|
||||
</el-select>
|
||||
<el-button size="small" :loading="hisLoading" @click="loadHistory">
|
||||
<Icon name="refresh" :size="13" /><span>{{ t('common.refresh') }}</span>
|
||||
</el-button>
|
||||
<el-button size="small" type="danger" plain :disabled="!history.length" @click="clearHistory">
|
||||
<Icon name="trash" :size="13" /><span>{{ t('banned.hisClearAll') }}</span>
|
||||
</el-button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<el-table v-if="history.length" :data="history" size="small" class="his-table">
|
||||
<el-table-column :label="t('banned.hisTime')" width="150">
|
||||
<template #default="{ row }">{{ fmtTs(row.ts) }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="t('banned.hisAction')" width="110">
|
||||
<template #default="{ row }">
|
||||
<el-tag :type="ACTION_TAG[row.action] || 'info'" size="small" effect="plain">
|
||||
{{ t(`banned.act.${row.action}`) }}
|
||||
</el-tag>
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="t('banned.hisIp')" min-width="140">
|
||||
<template #default="{ row }"><span class="code">{{ row.ip }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="t('banned.hisDuration')" width="110">
|
||||
<template #default="{ row }">
|
||||
{{ row.permanent ? t('banned.permanentTag') : (row.seconds ? fmtDur(row.seconds) : '—') }}
|
||||
</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="t('banned.hisActor')" width="110">
|
||||
<template #default="{ row }">{{ row.actor || '—' }}</template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="t('banned.hisNote')" min-width="140">
|
||||
<template #default="{ row }"><span class="muted-2">{{ row.note || '—' }}</span></template>
|
||||
</el-table-column>
|
||||
<el-table-column :label="t('banned.hisOps')" width="76" align="center">
|
||||
<template #default="{ row }">
|
||||
<el-button size="small" type="danger" text :title="t('common.delete')" @click="delHistory(row)">
|
||||
<Icon name="trash" :size="13" />
|
||||
</el-button>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
<el-empty v-else :description="t('banned.historyEmpty')" :image-size="60" />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import { computed, onMounted, onUnmounted, ref } from 'vue'
|
||||
import { useI18n } from 'vue-i18n'
|
||||
import { ElMessage, ElMessageBox } from 'element-plus'
|
||||
import { api, errText } from '../api'
|
||||
import Icon from '../components/Icon.vue'
|
||||
|
||||
const { t } = useI18n()
|
||||
const items = ref<any[]>([])
|
||||
const history = ref<any[]>([])
|
||||
const loading = ref(false)
|
||||
const banning = ref(false)
|
||||
const hisLoading = ref(false)
|
||||
const hisLimit = ref(50)
|
||||
const limit = ref(60)
|
||||
const banSeconds = ref(3600)
|
||||
let timer: any = null
|
||||
|
||||
const newIp = ref('')
|
||||
const newDur = ref('h1')
|
||||
const newNote = ref('')
|
||||
|
||||
const banMinutes = computed(() => Math.max(1, Math.round(banSeconds.value / 60)))
|
||||
|
||||
/** 时长预设。forever 走 permanent 字段,其余按秒传。 */
|
||||
const DURATIONS = [
|
||||
{ k: 'm10', v: 600 },
|
||||
{ k: 'm30', v: 1800 },
|
||||
{ k: 'h1', v: 3600 },
|
||||
{ k: 'h6', v: 21600 },
|
||||
{ k: 'd1', v: 86400 },
|
||||
{ k: 'd30', v: 2592000 },
|
||||
{ k: 'forever', v: 0 },
|
||||
] as { k: string; v: number }[]
|
||||
|
||||
const ACTION_TAG: Record<string, string> = {
|
||||
manual_ban: 'warning',
|
||||
auto_ban: 'info',
|
||||
extend: 'primary',
|
||||
unban: 'success',
|
||||
unban_all: 'danger',
|
||||
}
|
||||
|
||||
function fmtTs(ts: number): string {
|
||||
if (!ts) return '—'
|
||||
const d = new Date(ts * 1000)
|
||||
const p = (n: number) => String(n).padStart(2, '0')
|
||||
return `${d.getFullYear()}-${p(d.getMonth() + 1)}-${p(d.getDate())} ${p(d.getHours())}:${p(d.getMinutes())}`
|
||||
}
|
||||
|
||||
function fmtDur(sec: number): string {
|
||||
if (sec >= 86400 && sec % 86400 === 0) return t('banned.unitDay', { n: sec / 86400 })
|
||||
if (sec >= 3600) return t('banned.unitHour', { n: Math.round(sec / 3600) })
|
||||
return t('banned.unitMin', { n: Math.round(sec / 60) })
|
||||
}
|
||||
|
||||
function durPayload(k: string): any {
|
||||
if (k === 'forever') return { permanent: true }
|
||||
const d = DURATIONS.find((x) => x.k === k)
|
||||
return { seconds: d ? d.v : 3600 }
|
||||
}
|
||||
|
||||
async function reload() {
|
||||
loading.value = true
|
||||
try {
|
||||
const j = await api('/admin/banned')
|
||||
items.value = j.items || []
|
||||
if (typeof j.auth_fail_limit_per_min === 'number') limit.value = j.auth_fail_limit_per_min
|
||||
if (typeof j.ban_seconds === 'number' && j.ban_seconds > 0) banSeconds.value = j.ban_seconds
|
||||
} catch (e: any) {
|
||||
ElMessage.error(errText(e))
|
||||
} finally {
|
||||
loading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function loadHistory() {
|
||||
hisLoading.value = true
|
||||
try {
|
||||
const j = await api(`/admin/banned/history?limit=${hisLimit.value}`)
|
||||
history.value = j.items || []
|
||||
} catch (e: any) {
|
||||
ElMessage.error(errText(e))
|
||||
} finally {
|
||||
hisLoading.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function doBan() {
|
||||
const ip = newIp.value.trim()
|
||||
if (!ip) { ElMessage.warning(t('banned.ipRequired')); return }
|
||||
banning.value = true
|
||||
try {
|
||||
const j = await api('/admin/banned', {
|
||||
method: 'POST',
|
||||
body: JSON.stringify({ ip, note: newNote.value.trim(), ...durPayload(newDur.value) }),
|
||||
})
|
||||
ElMessage.success(
|
||||
j.permanent
|
||||
? t('banned.bannedForever', { ip: j.ip })
|
||||
: t('banned.banned', { ip: j.ip, mins: Math.round(j.banned_seconds / 60) }),
|
||||
)
|
||||
newIp.value = ''
|
||||
newNote.value = ''
|
||||
await Promise.all([reload(), loadHistory()])
|
||||
} catch (e: any) {
|
||||
ElMessage.error(errText(e))
|
||||
} finally {
|
||||
banning.value = false
|
||||
}
|
||||
}
|
||||
|
||||
async function extend(ip: string, k: string) {
|
||||
try {
|
||||
const j = await api(`/admin/banned/${encodeURIComponent(ip)}`, {
|
||||
method: 'PUT',
|
||||
body: JSON.stringify(durPayload(k)),
|
||||
})
|
||||
ElMessage.success(
|
||||
j.permanent ? t('banned.extendedForever', { ip }) : t('banned.extended', { ip, mins: Math.round(j.extended_seconds / 60) }),
|
||||
)
|
||||
await Promise.all([reload(), loadHistory()])
|
||||
} catch (e: any) {
|
||||
ElMessage.error(errText(e))
|
||||
}
|
||||
}
|
||||
|
||||
async function unban(ip: string) {
|
||||
try {
|
||||
await api(`/admin/banned/${encodeURIComponent(ip)}`, { method: 'DELETE' })
|
||||
ElMessage.success(t('banned.unbanned', { ip }))
|
||||
await Promise.all([reload(), loadHistory()])
|
||||
} catch (e: any) {
|
||||
ElMessage.error(errText(e))
|
||||
}
|
||||
}
|
||||
|
||||
async function delHistory(row: any) {
|
||||
try {
|
||||
await api(`/admin/banned/history/${encodeURIComponent(row.id)}`, { method: 'DELETE' })
|
||||
ElMessage.success(t('banned.hisDeleted'))
|
||||
await loadHistory()
|
||||
} catch (e: any) {
|
||||
ElMessage.error(errText(e))
|
||||
}
|
||||
}
|
||||
|
||||
async function clearHistory() {
|
||||
try {
|
||||
await ElMessageBox.confirm(t('banned.hisClearConfirm'), t('banned.hisClearAll'), { type: 'warning' })
|
||||
} catch { return }
|
||||
try {
|
||||
const j = await api('/admin/banned/history', { method: 'DELETE' })
|
||||
ElMessage.success(t('banned.hisCleared', { n: j.cleared ?? 0 }))
|
||||
await loadHistory()
|
||||
} catch (e: any) {
|
||||
ElMessage.error(errText(e))
|
||||
}
|
||||
}
|
||||
|
||||
async function clearAll() {
|
||||
try {
|
||||
await ElMessageBox.confirm(t('banned.clearConfirm'), t('banned.clearTitle'), { type: 'warning' })
|
||||
} catch { return }
|
||||
try {
|
||||
const j = await api('/admin/banned', { method: 'DELETE' })
|
||||
ElMessage.success(t('banned.cleared', { n: j.cleared ?? 0 }))
|
||||
await Promise.all([reload(), loadHistory()])
|
||||
} catch (e: any) {
|
||||
ElMessage.error(errText(e))
|
||||
}
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
reload()
|
||||
loadHistory()
|
||||
timer = setInterval(reload, 10000)
|
||||
})
|
||||
onUnmounted(() => { if (timer) clearInterval(timer) })
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
/* 手动封禁表单:一行放下,窄屏自动换行 */
|
||||
.ban-form { display: flex; align-items: center; gap: var(--gap-sm); flex-wrap: wrap; }
|
||||
.w-ip { width: 220px; }
|
||||
.w-dur { width: 130px; }
|
||||
.w-note { width: 200px; }
|
||||
.w-his { width: 84px; }
|
||||
.form-hint {
|
||||
display: flex; align-items: center; gap: 6px;
|
||||
margin-top: var(--gap-sm); font-size: 11.5px; line-height: 1.6; color: var(--muted-2);
|
||||
}
|
||||
.form-hint .gw-icon { flex: none; }
|
||||
|
||||
/* 规则提示条 —— 与 ApiKeys 的 warn-bar 同一套观感(那边是 scoped,这里要自带) */
|
||||
.warn-bar {
|
||||
display: flex; align-items: center; gap: 8px;
|
||||
background: var(--warn-soft); color: var(--warn);
|
||||
border-radius: var(--radius-s); padding: 9px 12px;
|
||||
font-size: 12px; line-height: 1.6; margin-bottom: var(--gap-sm);
|
||||
}
|
||||
.warn-bar .gw-icon { flex: none; }
|
||||
|
||||
.ban-list { display: flex; flex-direction: column; }
|
||||
.ban-row {
|
||||
display: flex; align-items: center; gap: var(--gap-sm);
|
||||
padding: 11px 2px; border-bottom: 1px solid var(--line);
|
||||
}
|
||||
.ban-row:last-child { border-bottom: none; }
|
||||
.ban-row .dot {
|
||||
flex: none; width: 7px; height: 7px; border-radius: 50%;
|
||||
background: var(--warn);
|
||||
}
|
||||
.ban-row .dot.perm { background: var(--err, #e5484d); }
|
||||
.ban-main { flex: 1; min-width: 0; }
|
||||
.ban-top { display: flex; align-items: center; gap: 8px; flex-wrap: wrap; }
|
||||
.ban-ip { font-size: 13px; font-weight: 600; }
|
||||
.ban-meta {
|
||||
margin-top: 3px; font-size: 11.5px; color: var(--muted-2);
|
||||
display: flex; align-items: center; gap: 6px; flex-wrap: wrap;
|
||||
}
|
||||
.ban-meta .sep { color: var(--line); }
|
||||
.ban-acts { display: flex; align-items: center; gap: 6px; flex: none; }
|
||||
.his-table { width: 100%; }
|
||||
|
||||
@media (max-width: 640px) {
|
||||
.w-ip, .w-note, .w-dur { width: 100%; }
|
||||
.ban-form :deep(.el-button) { width: 100%; }
|
||||
.ban-row { flex-wrap: wrap; }
|
||||
.ban-acts { width: 100%; justify-content: flex-end; }
|
||||
}
|
||||
</style>
|
||||
@@ -144,7 +144,7 @@
|
||||
import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { useI18n } from 'vue-i18n'
|
||||
import { api } from '../api'
|
||||
import { api, errText } from '../api'
|
||||
import Icon from '../components/Icon.vue'
|
||||
import { stamp } from '../lib/download'
|
||||
import { useSessionStore } from '../store/session'
|
||||
@@ -209,7 +209,7 @@ async function loadFull(row: any) {
|
||||
row.respLen = d.completion_len || 0
|
||||
row.full = true
|
||||
} catch (e: any) {
|
||||
row.fullErr = err(e)
|
||||
row.fullErr = errText(e)
|
||||
} finally {
|
||||
row.fullLoading = false
|
||||
}
|
||||
|
||||
+99
-2
@@ -114,6 +114,99 @@ OC_REGION_BLOCKED = {
|
||||
}
|
||||
OC_REGION_SKIPPED: list[str] = []
|
||||
|
||||
# ── 2026-11-19 文档二次改版:Endpoints 表不再逐条列 URL ──────────────
|
||||
# 官方把 `## Endpoints` 改成了「去看 console 页 / 用 models 接口」,HTML 里
|
||||
# 已经没有 `opencode.ai/` 的模型行 → 连续两天 exit=2「没解析出 Endpoints 表」。
|
||||
# 现在官方 models 接口直接给出机器可读的元数据(**无需鉴权**,实测不带 token 也 200):
|
||||
# GET https://opencode.ai/inference/go/v1/models (zen/go/v1/models 同源同内容)
|
||||
# 每条模型带:
|
||||
# id / name / type
|
||||
# api: {chat-completions|responses|messages|generate-content: {base_url, sdk}}
|
||||
# recommended_api: 官方推荐线
|
||||
# limit: {context, output}
|
||||
# cost.text.input.price / cost.text.output.price (都为 0 → 免费)
|
||||
# go.limited_regions: true → 对部分地区不开放(实测正是这三个 contributor / beam-free)
|
||||
# 口径:**以 models 接口为准**,HTML 表解析只作兜底;接口也挂了才报错。
|
||||
OC_MODELS_API = "https://opencode.ai/inference/go/v1/models"
|
||||
OC_MODELS_API_FALLBACK = "https://opencode.ai/zen/go/v1/models"
|
||||
|
||||
# models 接口的 api 键 → 网关协议线(网关只支持这三条线)
|
||||
OC_API_TO_PROTO = {
|
||||
"chat-completions": "chat/completions",
|
||||
"responses": "responses",
|
||||
"messages": "messages",
|
||||
}
|
||||
|
||||
|
||||
def _oc_protocol_from_api(model: dict) -> tuple[str | None, list[str]]:
|
||||
"""从 models 接口的 api / recommended_api 选网关协议线。
|
||||
|
||||
返回 (协议线, 文档声明的全部 api 键);认不出(例如只有 generate-content)返回 (None, keys)。
|
||||
"""
|
||||
keys = list((model.get("api") or {}).keys())
|
||||
supported = [OC_API_TO_PROTO[k] for k in keys if k in OC_API_TO_PROTO]
|
||||
if not supported:
|
||||
return None, keys
|
||||
rec = model.get("recommended_api")
|
||||
if rec in OC_API_TO_PROTO and OC_API_TO_PROTO[rec] in supported:
|
||||
return OC_API_TO_PROTO[rec], keys
|
||||
for proto in OC_PROTOCOLS: # 没有推荐或推荐不支持 → chat/completions 优先
|
||||
if proto in supported:
|
||||
return proto, keys
|
||||
return supported[0], keys
|
||||
|
||||
|
||||
def _oc_is_free(model: dict) -> bool:
|
||||
"""cost.text 的 input / output 单价都为 0 → 免费。"""
|
||||
price = (model.get("cost") or {}).get("text") or {}
|
||||
return ((price.get("input") or {}).get("price") == 0
|
||||
and (price.get("output") or {}).get("price") == 0)
|
||||
|
||||
|
||||
def fetch_opencode() -> dict[str, dict]:
|
||||
"""返回 {model_id: {name, protocol, free}}。
|
||||
|
||||
优先走官方 models 接口(稳定、机器可读);接口不可用时回退到旧的 HTML 表解析。
|
||||
"""
|
||||
payload = None
|
||||
err: Exception | None = None
|
||||
for url in (OC_MODELS_API, OC_MODELS_API_FALLBACK):
|
||||
try:
|
||||
payload = json.loads(_get(url, timeout=60))
|
||||
if isinstance(payload, dict) and payload.get("data"):
|
||||
break
|
||||
payload = None
|
||||
except Exception as exc: # noqa: BLE001
|
||||
err = exc
|
||||
|
||||
if not payload:
|
||||
print(f"[warn] OpenCode models 接口不可用({err}),回退 HTML 解析", file=sys.stderr)
|
||||
return _fetch_opencode_html()
|
||||
|
||||
models: dict[str, dict] = {}
|
||||
skipped: list[str] = []
|
||||
region_skipped: list[str] = []
|
||||
for m in payload["data"]:
|
||||
mid = m.get("id")
|
||||
if not mid or (m.get("type") or "chat") != "chat":
|
||||
continue
|
||||
if (m.get("go") or {}).get("limited_regions") or mid in OC_REGION_BLOCKED:
|
||||
region_skipped.append(mid)
|
||||
continue
|
||||
proto, keys = _oc_protocol_from_api(m)
|
||||
if proto is None:
|
||||
skipped.append(f"{mid}({'/'.join(keys) or '无 api 字段'})")
|
||||
continue
|
||||
models[mid] = {"name": m.get("name") or mid,
|
||||
"protocol": proto,
|
||||
"free": _oc_is_free(m)}
|
||||
|
||||
if not models:
|
||||
raise RuntimeError("OpenCode models 接口返回 0 个可用模型(接口可能改版)")
|
||||
OC_SKIPPED[:] = sorted(skipped)
|
||||
OC_REGION_SKIPPED[:] = sorted(region_skipped)
|
||||
return models
|
||||
|
||||
|
||||
def _oc_protocol(url: str) -> str | None:
|
||||
"""文档 Endpoint → 网关协议线;认不出返回 None。"""
|
||||
@@ -124,8 +217,12 @@ def _oc_protocol(url: str) -> str | None:
|
||||
return None
|
||||
|
||||
|
||||
def fetch_opencode() -> dict[str, dict]:
|
||||
"""返回 {model_id: {name, protocol, free}}。"""
|
||||
def _fetch_opencode_html() -> dict[str, dict]:
|
||||
"""【兜底】旧版 HTML 表解析。
|
||||
|
||||
2026-11-19 起官方 `## Endpoints` 表已不再逐条列 URL(内容搬到 console 页 +
|
||||
models 接口),这里正常不会走到;保留只为页面万一改回去时还能用。
|
||||
"""
|
||||
html = _get(OC_DOC_URL)
|
||||
models: dict[str, dict] = {}
|
||||
skipped: list[str] = []
|
||||
|
||||
Reference in new issue
Block a user