feat(deploy): 新增 .11 一键更新脚本 + 上游多模型/模型发现/用量统计
功能(本轮 5 项需求的落地):
- 上游可挂多模型:llm-upstreams.json 每上游新增 models 清单(仅用于模型发现,不参与路由)
- 模型发现:GET /v1/models(OpenAI {object:list} 形状,网关本地应答)+ /api/v1/models + /api/v1/upstreams
- 用量统计:/api/admin/usage(管理台「用量统计」Tab)+ /api/v1/usage + /me 的 llm_usage 摘要
口径:只统计真正转发出去的请求,401/403/404/429 不计;与配额计数 st: 刻意分开
- 账号展示名 display_name(纯展示,不进 ukey:)
- 修复 /v1 版本段重复拼接(llm::join_target)→ 上游 base 自带 /v1 时不再 404 空体
- 修复删账号未清用量键(stats::forget)
部署脚本 deploy/update-ipass.sh:
- 拉镜像 → tar 备份数据 → 删旧容器 → 按旧容器复刻端口/挂载/网络起新容器 → 自检
- 参数从 docker inspect 静态配置读取(docker port 对停止态容器返回空,会让端口静默回落)
- 端口按 host:container 去重(inspect 同一映射含 IPv4/IPv6 两项,重复 -p 会 address already in use)
- --bg 用 setsid/start_new_session 真正脱离会话(仅 nohup & 会被父进程组连带杀掉)
- 旧镜像自动打 rollback-<时间> 标签,收尾打印回滚命令
回归:bash tests/run.sh all → 网关 78 + LLM 75 = 153 条断言全绿。
文档:readme §12.4 / §15 / §16、CLAUDE.md 常用操作 + 排障速查已同步。
This commit is contained in:
1 parent
94a48bef6e
commit
e38237dc4a
22 files changed
+1719
-93
No files matched your search
+165
-25
@@ -24,6 +24,7 @@ use crate::http;
|
||||
use crate::models::User;
|
||||
use crate::session;
|
||||
use crate::state;
|
||||
use crate::stats;
|
||||
use crate::upstreams;
|
||||
use crate::users;
|
||||
use crate::util;
|
||||
@@ -77,6 +78,7 @@ fn route(method: &str, uri: &str) -> Option<(Guard, Handler)> {
|
||||
("POST", "/api/admin/users/delete") => (Guard::Admin, h_admin_user_delete),
|
||||
("POST", "/api/admin/users/models") => (Guard::Admin, h_admin_user_models),
|
||||
("POST", "/api/admin/users/limits") => (Guard::Admin, h_admin_user_limits),
|
||||
("POST", "/api/admin/users/display") => (Guard::Admin, h_admin_user_display),
|
||||
("GET", "/api/admin/domains") => (Guard::Admin, h_admin_domains),
|
||||
("POST", "/api/admin/domains/review") => (Guard::Admin, h_admin_domain_review),
|
||||
("POST", "/api/admin/domains/create") => (Guard::Admin, h_admin_domain_create),
|
||||
@@ -85,7 +87,10 @@ fn route(method: &str, uri: &str) -> Option<(Guard, Handler)> {
|
||||
("GET", "/api/admin/upstreams") => (Guard::Admin, h_admin_upstreams),
|
||||
("POST", "/api/admin/upstreams/save") => (Guard::Admin, h_admin_upstream_save),
|
||||
("POST", "/api/admin/upstreams/delete") => (Guard::Admin, h_admin_upstream_delete),
|
||||
("GET", "/api/admin/usage") => (Guard::Admin, h_admin_usage),
|
||||
("GET", "/api/v1/me") => (Guard::User, h_me),
|
||||
("GET", "/api/v1/models") => (Guard::User, h_my_models),
|
||||
("GET", "/api/v1/usage") => (Guard::User, h_my_usage),
|
||||
("GET", "/api/v1/upstreams") => (Guard::User, h_my_upstreams),
|
||||
("GET", "/api/v1/domains") => (Guard::User, h_my_domains),
|
||||
("POST", "/api/v1/domains/apply") => (Guard::User, h_apply),
|
||||
@@ -217,24 +222,31 @@ fn h_admin_users(r: *mut ngx_http_request_t, _actor: Actor) -> Status {
|
||||
*counts.entry(d.owner).or_insert(0) += 1;
|
||||
}
|
||||
|
||||
let now = util::now();
|
||||
// 一次扫表拿到所有人的 LLM 用量(含各自的上游明细),避免逐账号查共享内存
|
||||
let usage: HashMap<String, stats::UserUsage> =
|
||||
stats::all_users(now).into_iter().map(|u| (u.username.clone(), u)).collect();
|
||||
|
||||
let items: Vec<Value> = users::all()
|
||||
.iter()
|
||||
.map(|u| {
|
||||
let mut v = users::view(u);
|
||||
let mut usage_json = json!({ "today": 0, "total": 0, "last_ts": 0, "last_ts_text": "" });
|
||||
if let Some(uu) = usage.get(&u.username) {
|
||||
usage_json = uu.usage.json();
|
||||
}
|
||||
if let Value::Object(ref mut m) = v {
|
||||
m.insert(
|
||||
"domain_count".to_owned(),
|
||||
json!(counts.get(&u.username).copied().unwrap_or(0)),
|
||||
);
|
||||
// 今日 LLM 用量:读 shm 的日窗计数(与热路径同一数据源)
|
||||
// 今日 LLM 用量:与热路径同一数据源(共享内存)——注意口径是
|
||||
// **已转发**的请求,不含被限流/越权拒掉的那些
|
||||
m.insert(
|
||||
"llm_today".to_owned(),
|
||||
json!(state::window_count(
|
||||
config::KEY_ST_PREFIX,
|
||||
&u.username,
|
||||
util::day_id(util::now())
|
||||
)),
|
||||
json!(usage.get(&u.username).map(|x| x.usage.today).unwrap_or(0)),
|
||||
);
|
||||
m.insert("llm_usage".to_owned(), usage_json);
|
||||
}
|
||||
v
|
||||
})
|
||||
@@ -249,14 +261,15 @@ fn h_admin_user_create(r: *mut ngx_http_request_t, _actor: Actor) -> Status {
|
||||
|
||||
match users::create(
|
||||
p.get("username").map(String::as_str).unwrap_or(""),
|
||||
p.get("display_name").map(String::as_str).unwrap_or(""),
|
||||
p.get("password").map(String::as_str).unwrap_or(""),
|
||||
p.get("role").map(String::as_str).unwrap_or("user"),
|
||||
grant_temp,
|
||||
) {
|
||||
Ok(user) => {
|
||||
util::log_notice(&format!(
|
||||
"[api] 创建账号 {} role={} temp_grant={grant_temp}",
|
||||
user.username, user.role
|
||||
"[api] 创建账号 {} name={} role={} temp_grant={grant_temp}",
|
||||
user.username, user.display_name, user.role
|
||||
));
|
||||
http::ok(r, users::view(&user), "账号创建成功")
|
||||
}
|
||||
@@ -264,6 +277,17 @@ fn h_admin_user_create(r: *mut ngx_http_request_t, _actor: Actor) -> Status {
|
||||
}
|
||||
}
|
||||
|
||||
/// 设置展示名(中文姓名等)。传空串 = 清空,前端回落到账号名。
|
||||
fn h_admin_user_display(r: *mut ngx_http_request_t, _actor: Actor) -> Status {
|
||||
let p = http::params(r);
|
||||
let username = p.get("username").map(|s| util::trim(s).to_owned()).unwrap_or_default();
|
||||
|
||||
match users::set_display_name(&username, p.get("display_name").map(String::as_str).unwrap_or("")) {
|
||||
Ok(u) => http::ok(r, users::view(&u), "已更新展示名"),
|
||||
Err(e) => http::fail(r, HTTPStatus::BAD_REQUEST, &e),
|
||||
}
|
||||
}
|
||||
|
||||
fn h_admin_user_key(r: *mut ngx_http_request_t, _actor: Actor) -> Status {
|
||||
let p = http::params(r);
|
||||
let username = p.get("username").map(|s| util::trim(s).to_owned()).unwrap_or_default();
|
||||
@@ -399,6 +423,8 @@ fn h_me(r: *mut ngx_http_request_t, actor: Actor) -> Status {
|
||||
"domains".to_owned(),
|
||||
json!(domains::view_all(&domains::by_owner(&user.username))),
|
||||
);
|
||||
// 用量摘要(明细走 /api/v1/usage)——让客户端一个请求就能决定要不要自我节流
|
||||
m.insert("llm_usage".to_owned(), stats::user(&user.username, util::now()).json());
|
||||
m.insert(
|
||||
"policy".to_owned(),
|
||||
json!({
|
||||
@@ -493,11 +519,16 @@ fn h_admin_upstream_save(r: *mut ngx_http_request_t, _actor: Actor) -> Status {
|
||||
Some(v) => util::to_bool(Some(v)),
|
||||
};
|
||||
|
||||
// models 缺省 = 保持原清单;显式传(哪怕是空串)= 覆盖。
|
||||
// 分隔符同时接受换行/逗号/顿号/分号——粘一份厂商文档里的模型列表是常见操作。
|
||||
let models = p.get("models").map(|raw| parse_model_list(raw));
|
||||
|
||||
let slot_raw = p.get("slot").map(String::as_str).unwrap_or("");
|
||||
|
||||
match upstreams::upsert(
|
||||
slot_raw,
|
||||
p.get("base").map(String::as_str).unwrap_or(""),
|
||||
models,
|
||||
p.get("auth"),
|
||||
enabled,
|
||||
p.get("note"),
|
||||
@@ -505,13 +536,26 @@ fn h_admin_upstream_save(r: *mut ngx_http_request_t, _actor: Actor) -> Status {
|
||||
Ok(up) => {
|
||||
// 用校验后的 slot 回显;直接拿原始入参会把大小写差异带进响应
|
||||
let slot = upstreams::validate_slot(slot_raw).unwrap_or_default();
|
||||
util::log_notice(&format!("[api] 保存 LLM 上游 {slot} enabled={enabled}"));
|
||||
util::log_notice(&format!(
|
||||
"[api] 保存 LLM 上游 {slot} enabled={enabled} models={}",
|
||||
up.models.len()
|
||||
));
|
||||
http::ok(r, upstreams::view(&slot, &up), "已保存")
|
||||
}
|
||||
Err(e) => http::fail(r, HTTPStatus::BAD_REQUEST, &e),
|
||||
}
|
||||
}
|
||||
|
||||
/// 把管理台/接口传入的模型列表串拆成模型名数组。
|
||||
///
|
||||
/// 允许的写法(混用也认):`a,b` / `a、b` / `a;b` / 一行一个。
|
||||
pub fn parse_model_list(raw: &str) -> Vec<String> {
|
||||
raw.split(|c: char| c == ',' || c == '、' || c == ';' || c == '\n' || c == '\r' || c == '\t')
|
||||
.map(|s| util::trim(s).to_owned())
|
||||
.filter(|s| !s.is_empty())
|
||||
.collect()
|
||||
}
|
||||
|
||||
fn h_admin_upstream_delete(r: *mut ngx_http_request_t, _actor: Actor) -> Status {
|
||||
let p = http::params(r);
|
||||
match upstreams::remove(p.get("slot").map(String::as_str).unwrap_or("")) {
|
||||
@@ -523,7 +567,18 @@ fn h_admin_upstream_delete(r: *mut ngx_http_request_t, _actor: Actor) -> Status
|
||||
}
|
||||
}
|
||||
|
||||
/// 设置某账号可用的 LLM 上游白名单。`models` 传空串 = 解除限制。
|
||||
/// 管理员:LLM 用量总览(每人 / 每上游 / 合计)。
|
||||
///
|
||||
/// 口径是**请求数**,且只统计真正转发出去的请求(见 `stats` 模块头注释)。
|
||||
/// 想看 token 级用量得改架构(自建 upstream 拦响应体),不在本项目范围。
|
||||
fn h_admin_usage(r: *mut ngx_http_request_t, _actor: Actor) -> Status {
|
||||
http::ok(r, stats::overview(util::now()), "ok")
|
||||
}
|
||||
|
||||
/// 设置某账号可用的 LLM 上游白名单(`models` 字段 = 上游 slot 列表,传空串 = 解除限制)。
|
||||
///
|
||||
/// 注意与**上游登记模型清单**(`Upstream.models`)是两件事:这里管"这个账号能用哪几家
|
||||
/// 上游",那里管"这家上游提供哪些模型"。白名单按 slot 生效,模型发现再按白名单过滤。
|
||||
fn h_admin_user_models(r: *mut ngx_http_request_t, _actor: Actor) -> Status {
|
||||
let p = http::params(r);
|
||||
let username = p.get("username").map(|s| util::trim(s).to_owned()).unwrap_or_default();
|
||||
@@ -589,30 +644,35 @@ fn h_admin_user_limits(r: *mut ngx_http_request_t, _actor: Actor) -> Status {
|
||||
}
|
||||
}
|
||||
|
||||
/// 账号态:看看自己能用哪些上游。
|
||||
///
|
||||
/// 刻意只回显 slot 与拼接好的 base_url——**不回显任何密钥**(连脱敏都不给,
|
||||
/// 上游密钥与调用方无关,没有知道的必要)。
|
||||
fn h_my_upstreams(r: *mut ngx_http_request_t, actor: Actor) -> Status {
|
||||
let Actor::User(user) = actor else {
|
||||
return http::fail(
|
||||
/// 账号态接口的公共前置:取账号身份,取不到就回 401。
|
||||
fn user_or_401(r: *mut ngx_http_request_t, actor: Actor) -> Result<User, Status> {
|
||||
match actor {
|
||||
Actor::User(u) => Ok(u),
|
||||
_ => Err(http::fail(
|
||||
r,
|
||||
HTTPStatus::UNAUTHORIZED,
|
||||
"API Key 无效或缺失,请在请求头携带 X-API-Key",
|
||||
);
|
||||
)),
|
||||
}
|
||||
}
|
||||
|
||||
/// 账号态:看看自己能用哪些上游。
|
||||
///
|
||||
/// 刻意只回显 slot / base_url / **模型清单**——**不回显任何密钥**(连脱敏都不给,
|
||||
/// 上游密钥与调用方无关,没有知道的必要)。
|
||||
fn h_my_upstreams(r: *mut ngx_http_request_t, actor: Actor) -> Status {
|
||||
let user = match user_or_401(r, actor) {
|
||||
Ok(u) => u,
|
||||
Err(e) => return e,
|
||||
};
|
||||
|
||||
let items: Vec<Value> = upstreams::all()
|
||||
let items: Vec<Value> = upstreams::available(&user.allowed_models)
|
||||
.into_iter()
|
||||
.filter(|(slot, up)| {
|
||||
up.enabled
|
||||
&& (user.allowed_models.is_empty()
|
||||
|| user.allowed_models.iter().any(|s| s == slot))
|
||||
})
|
||||
.map(|(slot, up)| {
|
||||
json!({
|
||||
"slot": slot,
|
||||
"base_url": format!("https://llm.yourdomain.com/{slot}"),
|
||||
"base_url": upstreams::base_url(&slot, &up),
|
||||
"models": up.models,
|
||||
"note": up.note,
|
||||
})
|
||||
})
|
||||
@@ -620,3 +680,83 @@ fn h_my_upstreams(r: *mut ngx_http_request_t, actor: Actor) -> Status {
|
||||
|
||||
http::ok(r, json!({ "items": items }), "ok")
|
||||
}
|
||||
|
||||
/// 账号态:列出自己**可用的模型**(上游登记的模型清单,按白名单过滤)。
|
||||
///
|
||||
/// 与 LLM 域名下的 `GET /v1/models` 是同一份数据:那边给 OpenAI SDK 用
|
||||
/// (形状 `{object:"list",data:[{id,...}]}`),这边给管理/自研客户端用
|
||||
/// (形状 `{code,msg,data}`,带 base_url 便于直接拼请求)。
|
||||
fn h_my_models(r: *mut ngx_http_request_t, actor: Actor) -> Status {
|
||||
let user = match user_or_401(r, actor) {
|
||||
Ok(u) => u,
|
||||
Err(e) => return e,
|
||||
};
|
||||
|
||||
let available = upstreams::available(&user.allowed_models);
|
||||
let mut items: Vec<Value> = Vec::new();
|
||||
for (slot, up) in &available {
|
||||
for model in &up.models {
|
||||
items.push(json!({
|
||||
"model": model,
|
||||
"slot": slot,
|
||||
"base_url": upstreams::base_url(slot, up),
|
||||
"note": up.note,
|
||||
}));
|
||||
}
|
||||
}
|
||||
|
||||
http::ok(
|
||||
r,
|
||||
json!({
|
||||
"items": items,
|
||||
"upstreams": available
|
||||
.iter()
|
||||
.map(|(slot, up)| json!({
|
||||
"slot": slot,
|
||||
"base_url": upstreams::base_url(slot, up),
|
||||
"models": up.models,
|
||||
}))
|
||||
.collect::<Vec<_>>(),
|
||||
}),
|
||||
"ok",
|
||||
)
|
||||
}
|
||||
|
||||
/// 账号态:查自己的 LLM 用量(今日 / 累计 / 最近调用 + 分上游明细)。
|
||||
fn h_my_usage(r: *mut ngx_http_request_t, actor: Actor) -> Status {
|
||||
let user = match user_or_401(r, actor) {
|
||||
Ok(u) => u,
|
||||
Err(e) => return e,
|
||||
};
|
||||
|
||||
let now = util::now();
|
||||
let usage = stats::user(&user.username, now);
|
||||
let models: Vec<Value> = stats::user_models(&user.username, now)
|
||||
.into_iter()
|
||||
.map(|(slot, u)| {
|
||||
json!({
|
||||
"slot": slot,
|
||||
"today": u.today,
|
||||
"total": u.total,
|
||||
"last_ts": u.last_ts,
|
||||
"last_ts_text": if u.last_ts > 0 { util::fmt_time(u.last_ts) } else { String::new() },
|
||||
})
|
||||
})
|
||||
.collect();
|
||||
|
||||
http::ok(
|
||||
r,
|
||||
json!({
|
||||
"username": user.username,
|
||||
"display_name": user.display_name,
|
||||
"today": usage.today,
|
||||
"total": usage.total,
|
||||
"last_ts": usage.last_ts,
|
||||
"last_ts_text": if usage.last_ts > 0 { util::fmt_time(usage.last_ts) } else { String::new() },
|
||||
"models": models,
|
||||
// 限额一起回显:客户端可据此自我节流,不必等 429
|
||||
"limits": { "rpm": user.llm_rpm, "daily": user.llm_daily },
|
||||
}),
|
||||
"ok",
|
||||
)
|
||||
}
|
||||
Reference in new issue
Block a user