chore(deploy): agent.sh 加 upstream-save 子命令 + 修 upstream-test 抓真实状态码
- upstream-save <slot> <base> <base_anthropic>:直连网关改双协议地址,
auth/models/enabled 保持原值(凭据只从 .env 读,走统一白名单入口)
- upstream-test 改用 -w '%{http_code}' 抓 internal_redirect 后的上游真实状态码
(旧解析器把上游原始响应当 JSON 包装,拿不到状态码,glm/qwen 等验证失真)
This commit is contained in:
1 parent
49a8b81647
commit
391ccfbd1a
1 file changed
+56
-16
+56
-16
@@ -250,28 +250,37 @@ for u in items:
|
||||
# ① agent 自动化可调;② 出错时直接看厂商原话(不用肉眼对截图 OCR)。
|
||||
# 用法:bash deploy/agent.sh upstream-test minimax
|
||||
cmd_upstream_test() {
|
||||
local slot="$1" jar body
|
||||
local slot="$1" jar code body tmp
|
||||
jar="$(mktemp -t ipass-uptest.XXXXXX)"
|
||||
tmp="$(mktemp -t ipass-uptest-body.XXXXXX)"
|
||||
if ! live_login "$jar"; then
|
||||
echo "✗ 登录失败"; rm -f "$jar"; return 1
|
||||
echo "✗ 登录失败"; rm -f "$jar" "$tmp"; return 1
|
||||
fi
|
||||
body="$(live_curl -b "$jar" -H 'Content-Type: application/json' \
|
||||
# 测试接口是 internal_redirect 到上游真实接口,返回体=上游原始响应,
|
||||
# 状态码在 HTTP 状态行(不在 JSON 体里),所以单独用 -w 抓。
|
||||
code="$(live_curl -b "$jar" -H 'Content-Type: application/json' \
|
||||
-d "{\"slot\":\"$slot\"}" \
|
||||
-o "$tmp" -w '%{http_code}' \
|
||||
"https://$LIVE_HOST:$LIVE_PORT/api/admin/upstreams/test")"
|
||||
rm -f "$jar"
|
||||
if [ -z "$PY" ]; then printf '%s\n' "$body"; return 0; fi
|
||||
printf '%s' "$body" | "$PY" -c '
|
||||
import json, sys
|
||||
d = json.load(sys.stdin)
|
||||
data = d.get("data") or {}
|
||||
code = data.get("status_code") or d.get("code")
|
||||
status = data.get("status") or d.get("msg", "")
|
||||
body = data.get("body") or ""
|
||||
print(f" 上游 HTTP {code} {status}")
|
||||
if body:
|
||||
short = body if len(body) <= 300 else body[:300] + "…"
|
||||
print(" body:", short)
|
||||
body="$(cat "$tmp" 2>/dev/null)"
|
||||
rm -f "$jar" "$tmp"
|
||||
echo " 上游 HTTP $code"
|
||||
if [ -n "$body" ]; then
|
||||
if [ -n "$PY" ]; then
|
||||
printf '%s' "$body" | "$PY" -c '
|
||||
import sys,json
|
||||
b=sys.stdin.read()
|
||||
try:
|
||||
d=json.loads(b)
|
||||
s=json.dumps(d, ensure_ascii=False)
|
||||
print(" body:", s[:400] + ("…" if len(s)>400 else ""))
|
||||
except Exception:
|
||||
print(" body:", b[:400] + ("…" if len(b)>400 else ""))
|
||||
'
|
||||
else
|
||||
echo " body: ${body:0:400}"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
# 统计落盘/恢复状态(1.0.18+)。登录后读 /api/admin/stats/persist。
|
||||
@@ -340,6 +349,35 @@ print(" ✓ 已落盘 %s 键(%s)" % ((d.get("data") or {}).get("keys", "?")
|
||||
cmd_stats_persist
|
||||
}
|
||||
|
||||
# 直连网关改单条上游的 base / base_anthropic(不碰 auth/models/enabled)。
|
||||
# 用例:双协议地址改造后,把智谱/阿里这类「OpenAI 与 Anthropic 路径段不同」的
|
||||
# 上游的 Anthropic 地址显式写进去。凭据只从 .env 读,命令行不出现 key。
|
||||
cmd_upstream_save() {
|
||||
local jar slot base ba
|
||||
slot="${1:-}"; base="${2:-}"; ba="${3:-}"
|
||||
[ -n "$slot" ] && [ -n "$base" ] || {
|
||||
echo "用法: bash deploy/agent.sh upstream-save <slot> <base> <base_anthropic>" >&2
|
||||
echo " 例: bash deploy/agent.sh upstream-save glm \\" >&2
|
||||
echo " 'https://open.bigmodel.cn/api/coding/paas/v4' \\" >&2
|
||||
echo " 'https://open.bigmodel.cn/api/anthropic'" >&2
|
||||
exit 2
|
||||
}
|
||||
jar="$(mktemp -t ipass-live.XXXXXX)"
|
||||
if ! live_login "$jar"; then
|
||||
echo "✗ 登录失败(HTTP 非 200)"; rm -f "$jar"; exit 1
|
||||
fi
|
||||
echo "· 保存 $slot (auth/models/enabled 保持原值)"
|
||||
echo " base = $base"
|
||||
echo " base_anthropic= $ba"
|
||||
live_curl -b "$jar" -X POST \
|
||||
-H 'Content-Type: application/x-www-form-urlencoded' \
|
||||
--data-urlencode "slot=$slot" \
|
||||
--data-urlencode "base=$base" \
|
||||
--data-urlencode "base_anthropic=$ba" \
|
||||
"https://$LIVE_HOST:$LIVE_PORT/api/admin/upstreams/save" | pretty
|
||||
rm -f "$jar"
|
||||
}
|
||||
|
||||
CMD="${1:-}"; shift || true
|
||||
|
||||
case "$CMD" in
|
||||
@@ -354,6 +392,7 @@ case "$CMD" in
|
||||
upstreams) cmd_upstreams ;;
|
||||
upstream-test) [ -n "${1:-}" ] || { echo "用法: bash deploy/agent.sh upstream-test <slot>" >&2; exit 2; }
|
||||
cmd_upstream_test "$1" ;;
|
||||
upstream-save) cmd_upstream_save "${1:-}" "${2:-}" "${3:-}" ;;
|
||||
stats-persist) cmd_stats_persist ;;
|
||||
stats-dump) cmd_stats_dump ;;
|
||||
pull) IMG="$(resolve_image "${1:-}")"; echo "· 拉取 $IMG"
|
||||
@@ -394,6 +433,7 @@ iPass 控制面包装(凭据只从 .env 读,命令行里不出现任何 key
|
||||
bash deploy/agent.sh data users|domains|upstreams
|
||||
bash deploy/agent.sh upstreams # 上游排障:逐账号掩码/冷却/今日负载
|
||||
bash deploy/agent.sh upstream-test <slot> # 上游连通性:调测试接口并打印厂商真实响应
|
||||
bash deploy/agent.sh upstream-save <slot> <base> <base_anthropic> # 直连网关改双协议地址
|
||||
bash deploy/agent.sh stats-persist # 统计落盘状态(快照/内存键数、上次恢复)
|
||||
bash deploy/agent.sh stats-dump # 立即落盘一次并回读状态
|
||||
|
||||
|
||||
Reference in new issue
Block a user