From e8c8fa11760d6d37f64b008fe5d3f7fa6be8602a Mon Sep 17 00:00:00 2001 From: NPN Date: Thu, 7 May 2026 11:28:58 -0700 Subject: [PATCH 1/4] translate to english --- deploy.sh | 164 ++++++++++++++++++++++++++-------------------------- proxy.py | 168 +++++++++++++++++++++++++++--------------------------- 2 files changed, 166 insertions(+), 166 deletions(-) diff --git a/deploy.sh b/deploy.sh index c84dba4..d1a355a 100644 --- a/deploy.sh +++ b/deploy.sh @@ -1,62 +1,63 @@ #!/bin/bash -# DeepSeek Free API 一键部署脚本 -# 支持 Termux (Android) / Linux (Ubuntu/Debian/CentOS) -# 用法: bash deploy.sh [--bg] [--stop] [--status] +# DeepSeek Free API One-click Deployment Script +# Supports Termux (Android) / Linux (Ubuntu/Debian/CentOS) +# Usage: bash deploy.sh [--bg] [--stop] [--status] set -euo pipefail INSTALL_DIR="${HOME}/ds-free-api" PORT="${PROXY_PORT:-8000}" LOG_FILE="${HOME}/dsapi.log" +VENV_DIR=".venv" -# ── 颜色 ── +# ── Colors ── RED='\033[0;31m'; GREEN='\033[0;32m'; YELLOW='\033[1;33m'; BLUE='\033[0;34m'; NC='\033[0m' info() { echo -e "${GREEN}✓${NC} $*"; } warn() { echo -e "${YELLOW}⚠${NC} $*"; } error() { echo -e "${RED}✗${NC} $*"; exit 1; } -# ── 帮助 ── +# ── Help ── show_help() { - echo "用法: bash deploy.sh [选项]" + echo "Usage: bash deploy.sh [options]" echo "" - echo "选项:" - echo " (无参数) 前台启动（Ctrl+C 停止）" - echo " --bg 后台启动" - echo " --stop 停止后台进程" - echo " --status 查看运行状态" - echo " --help 显示此帮助" + echo "Options:" + echo " (no args) Start in foreground (Ctrl+C to stop)" + echo " --bg Start in background" + echo " --stop Stop background process" + echo " --status Check running status" + echo " --help Show this help" echo "" - echo "环境变量:" - echo " PROXY_PORT 端口号（默认 8000）" + echo "Environment variables:" + echo " PROXY_PORT Port number (default 8000)" } -# ── 停止 ── +# ── Stop ── do_stop() { if pgrep -f "python.*proxy.py" >/dev/null 2>&1; then pkill -f "python.*proxy.py" 2>/dev/null || true sleep 1 - info "已停止" + info "Stopped" else - warn "没有运行中的代理进程" + warn "No running proxy process found" fi } -# ── 状态 ── +# ── Status ── do_status() { if pgrep -f "python.*proxy.py" >/dev/null 2>&1; then local pid=$(pgrep -f "python.*proxy.py" | head -1) - info "运行中 (PID: $pid)" + info "Running (PID: $pid)" if curl -s "http://localhost:$PORT/health" >/dev/null 2>&1; then - info "健康检查通过" + info "Health check passed" else - warn "健康检查失败" + warn "Health check failed" fi else - warn "未运行" + warn "Not running" fi } -# ── 解析参数 ── +# ── Parse arguments ── ACTION="start" for arg in "$@"; do case "$arg" in @@ -64,135 +65,134 @@ for arg in "$@"; do --stop) do_stop; exit 0 ;; --status) do_status; exit 0 ;; --help|-h) show_help; exit 0 ;; - *) warn "未知参数: $arg" ;; + *) warn "Unknown option: $arg" ;; esac done echo -e "${BLUE}╔══════════════════════════════════════╗${NC}" -echo -e "${BLUE}║ DeepSeek Free API Proxy 部署 ║${NC}" +echo -e "${BLUE}║ DeepSeek Free API Proxy Deploy ║${NC}" echo -e "${BLUE}╚══════════════════════════════════════╝${NC}" -# ── 1. 检查 Python3 ── -if ! command -v python3 &>/dev/null; then - error "需要 Python3，请先安装" +# ── 1. Check uv ── +if ! command -v uv &>/dev/null; then + error "uv is required. Install it first: curl -LsSf https://astral.sh/uv/install.sh | sh" fi -info "Python3 $(python3 --version 2>&1 | cut -d' ' -f2)" +info "uv $(uv --version 2>&1 | head -1)" -# ── 2. 检查 Node.js（PoW 求解需要）── +# ── 2. Check Node.js (required for PoW solver) ── if ! command -v node &>/dev/null; then - warn "未检测到 Node.js，尝试安装..." + warn "Node.js not found, attempting to install..." if command -v pkg &>/dev/null; then # Termux - pkg install -y nodejs 2>/dev/null || error "Node.js 安装失败，请运行: pkg install nodejs" + pkg install -y nodejs 2>/dev/null || error "Node.js installation failed, run: pkg install nodejs" elif command -v apt &>/dev/null; then - sudo apt update -qq && sudo apt install -y nodejs 2>/dev/null || error "Node.js 安装失败" + sudo apt update -qq && sudo apt install -y nodejs 2>/dev/null || error "Node.js installation failed" elif command -v yum &>/dev/null; then - sudo yum install -y nodejs 2>/dev/null || error "Node.js 安装失败" + sudo yum install -y nodejs 2>/dev/null || error "Node.js installation failed" elif command -v dnf &>/dev/null; then - sudo dnf install -y nodejs 2>/dev/null || error "Node.js 安装失败" + sudo dnf install -y nodejs 2>/dev/null || error "Node.js installation failed" else - error "请手动安装 Node.js: https://nodejs.org/" + error "Please install Node.js manually: https://nodejs.org/" fi fi info "Node.js $(node --version 2>&1)" -# ── 3. 检查 curl（健康检查需要）── +# ── 3. Check curl (needed for health check) ── if ! command -v curl &>/dev/null; then - warn "未检测到 curl，健康检查将不可用" + warn "curl not found, health check will be unavailable" fi -# ── 4. 确定安装目录 ── +# ── 4. Determine working directory ── SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)" -# 如果脚本在 ~/ds-free-api 里，直接用 +# If script is inside INSTALL_DIR or has proxy.py alongside, use directly if [ "$SCRIPT_DIR" = "$INSTALL_DIR" ] || [ -f "$SCRIPT_DIR/proxy.py" ]; then WORK_DIR="$SCRIPT_DIR" else - # 否则安装到 ~/ds-free-api + # Otherwise install to ~/ds-free-api mkdir -p "$INSTALL_DIR" WORK_DIR="$INSTALL_DIR" - # 如果目标目录没有 proxy.py，尝试解压 + # Extract tarball if target directory lacks proxy.py if [ ! -f "$INSTALL_DIR/proxy.py" ]; then TARBALL="" for f in "$SCRIPT_DIR/ds-free-api.tar.gz" "./ds-free-api.tar.gz" "../ds-free-api.tar.gz"; do [ -f "$f" ] && TARBALL="$f" && break done if [ -n "$TARBALL" ]; then - info "从 $TARBALL 解压..." + info "Extracting from $TARBALL..." tar -xzf "$TARBALL" -C "$INSTALL_DIR" else - error "未找到部署包，请将 ds-free-api.tar.gz 放在脚本同目录" + error "Deployment package not found. Place ds-free-api.tar.gz next to this script." fi fi fi cd "$WORK_DIR" -info "工作目录: $WORK_DIR" - -# ── 5. 安装 Python 依赖 ── -info "安装依赖..." -if command -v pip3 &>/dev/null; then - pip3 install -r requirements.txt --quiet --break-system-packages 2>/dev/null || \ - pip3 install -r requirements.txt --quiet 2>/dev/null || \ - pip3 install -r requirements.txt -elif command -v pip &>/dev/null; then - pip install -r requirements.txt --quiet --break-system-packages 2>/dev/null || \ - pip install -r requirements.txt --quiet 2>/dev/null || \ - pip install -r requirements.txt -else - error "未找到 pip，请先安装: python3 -m ensurepip" +info "Working directory: $WORK_DIR" + +# ── 5. Create uv virtual environment and install dependencies ── +info "Creating uv virtual environment..." +uv venv -p python3 "$VENV_DIR" 2>/dev/null || uv venv "$VENV_DIR" 2>/dev/null || error "Failed to create uv virtual environment" + +PYTHON_BIN="$WORK_DIR/$VENV_DIR/bin/python3" +if [ ! -f "$PYTHON_BIN" ]; then + PYTHON_BIN="$WORK_DIR/$VENV_DIR/bin/python" fi -info "依赖安装完成" +info "Virtual environment created at $WORK_DIR/$VENV_DIR" + +info "Installing dependencies..." +uv pip install -r requirements.txt --quiet 2>/dev/null || uv pip install -r requirements.txt || error "Dependency installation failed" +info "Dependencies installed" -# ── 6. 检查关键文件 ── +# ── 6. Check required files ── for f in proxy.py tool_call.py pow_native.py pow_solver.js; do - [ -f "$f" ] || error "缺少 $f，请确认部署包完整" + [ -f "$f" ] || error "Missing $f, please check the deployment package" done -info "文件检查通过" +info "File check passed" -# ── 7. 停止旧进程 ── +# ── 7. Stop old processes ── if pgrep -f "python.*proxy.py" >/dev/null 2>&1; then - warn "停止旧代理进程..." + warn "Stopping old proxy process..." pkill -f "python.*proxy.py" 2>/dev/null || true sleep 1 fi -# ── 8. 启动 ── +# ── 8. Start ── export PROXY_PORT="$PORT" if [ "$ACTION" = "bg" ]; then - nohup python3 proxy.py > "$LOG_FILE" 2>&1 & + nohup "$PYTHON_BIN" proxy.py > "$LOG_FILE" 2>&1 & BG_PID=$! sleep 2 if command -v curl &>/dev/null && curl -s "http://localhost:$PORT/health" | grep -q "ok" 2>/dev/null; then echo "" echo -e "${GREEN}╔══════════════════════════════════════╗${NC}" - echo -e "${GREEN}║ ✅ 部署成功！ ║${NC}" + echo -e "${GREEN}║ ✅ Deployment successful! ║${NC}" echo -e "${GREEN}╠══════════════════════════════════════╣${NC}" - echo -e "${GREEN}║ 管理后台: http://localhost:$PORT/admin${NC}" - echo -e "${GREEN}║ API 地址: http://localhost:$PORT/v1 ${NC}" - echo -e "${GREEN}║ 进程 PID: $BG_PID${NC}" - echo -e "${GREEN}║ 日志文件: $LOG_FILE${NC}" + echo -e "${GREEN}║ Admin UI: http://localhost:$PORT/admin${NC}" + echo -e "${GREEN}║ API URL: http://localhost:$PORT/v1 ${NC}" + echo -e "${GREEN}║ Process PID: $BG_PID${NC}" + echo -e "${GREEN}║ Log file: $LOG_FILE${NC}" echo -e "${GREEN}╠══════════════════════════════════════╣${NC}" - echo -e "${GREEN}║ 停止: bash deploy.sh --stop ${NC}" - echo -e "${GREEN}║ 状态: bash deploy.sh --status ${NC}" - echo -e "${GREEN}║ 日志: tail -f $LOG_FILE${NC}" + echo -e "${GREEN}║ Stop: bash deploy.sh --stop ${NC}" + echo -e "${GREEN}║ Status: bash deploy.sh --status ${NC}" + echo -e "${GREEN}║ Logs: tail -f $LOG_FILE${NC}" echo -e "${GREEN}╚══════════════════════════════════════╝${NC}" else - warn "启动中... 如果无法访问请检查日志: $LOG_FILE" + warn "Starting... If unreachable, check the log: $LOG_FILE" fi else echo "" - info "准备就绪！" + info "Ready!" echo "" - echo -e "下一步：" - echo -e " 1. 打开浏览器访问: ${BLUE}http://localhost:$PORT/admin${NC}" - echo -e " 2. 输入手机号和密码登录" - echo -e " 3. 在客户端中配置 API 地址: ${BLUE}http://localhost:$PORT/v1${NC}" + echo -e "Next steps:" + echo -e " 1. Open your browser and visit: ${BLUE}http://localhost:$PORT/admin${NC}" + echo -e " 2. Log in with your phone number or email" + echo -e " 3. Configure your client with API URL: ${BLUE}http://localhost:$PORT/v1${NC}" echo "" - echo -e "后台运行: ${YELLOW}bash deploy.sh --bg${NC}" + echo -e "Run in background: ${YELLOW}bash deploy.sh --bg${NC}" echo "" - python3 proxy.py + "$PYTHON_BIN" proxy.py fi diff --git a/proxy.py b/proxy.py index 7953ecc..2f6cd87 100644 --- a/proxy.py +++ b/proxy.py @@ -1494,7 +1494,7 @@ async def startup_discover(): # ── 管理页面 ───────────────────────────────────────────── ADMIN = """ - + DeepSeek Proxy @@ -1577,50 +1577,50 @@ async def startup_discover():

DeepSeek Proxy

-
等待配置
+
Not configured
-
手机号登录
-
邮箱登录
-
用量统计
-
账号管理
+
Phone Login
+
Email Login
+
Usage
+
Accounts
- +
-
- +
+
-
-
- +
+
+
-
高级: 手动粘贴 cURL ▾
+
Advanced: Paste cURL ▾
- - + +
-
API 配置
+
API Configuration
-
API 地址http://localhost:""" + str(PROXY_PORT) + """/v1
-
API Key任意填写
+
API URLhttp://localhost:""" + str(PROXY_PORT) + """/v1
+
API KeyAny value
- +
@@ -1628,20 +1628,20 @@ async def startup_discover():
- - - - - + + + + +
-
加载中...
+
Loading...
-
暂无账号，请先添加
- - +
No accounts yet. Add one above.
+ +
@@ -1660,58 +1660,58 @@ async def startup_discover(): } async function cs(){ try{const r=await fetch('/api/config');const d=await r.json() -if(d.configured){Q('s').className='s ok';Q('sd').className='d dg';Q('st').textContent='已配置 | '+d.masked} -else{Q('s').className='s no';Q('sd').className='d dy';Q('st').textContent=d.error||'等待配置'} -}catch(e){Q('s').className='s err';Q('st').textContent='连接失败'} +if(d.configured){Q('s').className='s ok';Q('sd').className='d dg';Q('st').textContent='Configured | '+d.masked} +else{Q('s').className='s no';Q('sd').className='d dy';Q('st').textContent=d.error||'Waiting for config'} +}catch(e){Q('s').className='s err';Q('st').textContent='Connection failed'} } async function doLogin(type){ let body={} if(type==='phone'){ const m=Q('mobile').value.trim();const p=Q('pw1').value;const a=Q('area_code').value.trim() -if(!m||!p){t('请输入手机号和密码',1);return} +if(!m||!p){t('Please enter phone number and password',1);return} body={mobile:m,password:p,area_code:a,login_type:'phone'} var btn=Q('btn1') }else{ const e=Q('email').value.trim();const p=Q('pw2').value -if(!e||!p){t('请输入邮箱和密码',1);return} +if(!e||!p){t('Please enter email and password',1);return} body={email:e,password:p,login_type:'email'} var btn=Q('btn2') } -btn.disabled=true;btn.textContent='登录中...' -Q('info').style.display='block';Q('info').innerHTML='正在登录 DeepSeek...' +btn.disabled=true;btn.textContent='Logging in...' +Q('info').style.display='block';Q('info').innerHTML='Logging into DeepSeek...' try{ const r=await fetch('/api/login',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify(body)}) const d=await r.json() -if(d.ok){Q('info').innerHTML='登录成功 | Token: '+d.masked+' | Session: '+d.session_id;t('登录成功');cs()} -else{Q('info').innerHTML='失败: '+d.error;t(d.error,1)} -}catch(e){Q('info').innerHTML='错误: '+e.message;t(e.message,1)} -btn.disabled=false;btn.textContent='登录' +if(d.ok){Q('info').innerHTML='Login successful | Token: '+d.masked+' | Session: '+d.session_id;t('Login successful');cs()} +else{Q('info').innerHTML='Failed: '+d.error;t(d.error,1)} +}catch(e){Q('info').innerHTML='Error: '+e.message;t(e.message,1)} +btn.disabled=false;btn.textContent='Login' } function toggleCurl(){const b=Q('curlBox');b.style.display=b.style.display==='block'?'none':'block'} async function saveCurl(){ -const c=Q('curl').value.trim();if(!c){t('请先粘贴 cURL',1);return} -const b=Q('btn3');b.disabled=true;b.textContent='保存中...' -Q('info').style.display='block';Q('info').innerHTML='解析中...' +const c=Q('curl').value.trim();if(!c){t('Please paste cURL first',1);return} +const b=Q('btn3');b.disabled=true;b.textContent='Saving...' +Q('info').style.display='block';Q('info').innerHTML='Parsing...' try{ const r=await fetch('/api/config',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({curl:c})}) const d=await r.json() -if(d.ok){Q('info').innerHTML='OK | '+d.masked+' | Session '+d.session_id;t('已保存');cs()} -else{Q('info').innerHTML='失败: '+d.error;t(d.error,1)} -}catch(e){Q('info').innerHTML='错误: '+e.message;t(e.message,1)} -b.disabled=false;b.textContent='保存 cURL' +if(d.ok){Q('info').innerHTML='OK | '+d.masked+' | Session '+d.session_id;t('Saved');cs()} +else{Q('info').innerHTML='Failed: '+d.error;t(d.error,1)} +}catch(e){Q('info').innerHTML='Error: '+e.message;t(e.message,1)} +b.disabled=false;b.textContent='Save cURL' } -function cp(el){navigator.clipboard.writeText(el.textContent);t('已复制')} +function cp(el){navigator.clipboard.writeText(el.textContent);t('Copied!')} function t(m,e){const x=Q('toast');x.textContent=m;x.className='toast t'+(e?'e':'s');setTimeout(()=>x.className='toast',2500)} async function refreshModels(){ const btn=Q('refreshBtn');const info=Q('modelsInfo') -btn.disabled=true;btn.textContent='刷新中...';info.style.display='none' +btn.disabled=true;btn.textContent='Refreshing...';info.style.display='none' try{ const r=await fetch('/v1/models/refresh',{method:'POST'}) const d=await r.json() const names=d.data.map(m=>m.id).join(', ') -info.style.display='block';info.innerHTML='✅ 发现 '+d.data.length+' 个模型: '+names;t('刷新成功') -}catch(e){info.style.display='block';info.innerHTML='❌ 失败: '+e.message;t('刷新失败',1)} -btn.disabled=false;btn.textContent='🔄 刷新模型列表' +info.style.display='block';info.innerHTML='✅ Found '+d.data.length+' models: '+names;t('Refresh successful') +}catch(e){info.style.display='block';info.innerHTML='❌ Failed: '+e.message;t('Refresh failed',1)} +btn.disabled=false;btn.textContent='🔄 Refresh Models' } // === 账号管理 === async function loadAccounts(){ @@ -1719,72 +1719,72 @@ async def startup_discover(): const r=await fetch('/api/accounts');const d=await r.json(); var h=''; if(d.accounts&&d.accounts.length>0){ -Q('acctStat').innerHTML='共 '+d.total+' 个账号，'+d.valid+' 个有效'; -h+=''; +Q('acctStat').innerHTML='Total: '+d.total+' accounts, '+d.valid+' valid'; +h+='
账号状态Token登录时间操作
'; for(var a of d.accounts){ var st=a.is_valid?'ok':'no'; -var stT=a.is_valid?'有效':'未登录'; +var stT=a.is_valid?'Valid':'Inactive'; var l=encodeURIComponent(a.account_label); h+=''; -h+=``; +h+=``; } h+='
AccountStatusTokenLogin TimeAction
'+a.account_label+''+stT+''+(a.token_masked||'***')+''+(a.login_time||'-')+'

'; -}else{h='
暂无账号，请在上方添加
'} +}else{h='
No accounts yet. Add one above.
'} Q('acctList').innerHTML=h; -}catch(e){Q('acctList').innerHTML='
加载失败: '+e.message+'
'} +}catch(e){Q('acctList').innerHTML='
Failed to load: '+e.message+'
'} } async function addAccount(){ var phone=Q('acctPhone').value.trim(); var code=Q('acctCode').value.trim()||'+86'; var pw=Q('acctPw').value; -if(!phone||!pw){t('请输入手机号和密码',1);return} +if(!phone||!pw){t('Please enter phone number and password',1);return} try{ var r=await fetch('/api/accounts',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({mobile:phone,area_code:code,password:pw,login_type:'phone'})}); var d=await r.json(); -if(d.ok){t('已添加，需登录获取token');Q('acctPhone').value='';Q('acctPw').value='';loadAccounts()} -else{t('失败: '+(d.error||'未知错误'),1)} -}catch(e){t('添加失败: '+e.message,1)} +if(d.ok){t('Added. Login required to get token.');Q('acctPhone').value='';Q('acctPw').value='';loadAccounts()} +else{t('Failed: '+(d.error||'Unknown error'),1)} +}catch(e){t('Add failed: '+e.message,1)} } async function removeAccount(label){ -if(!confirm('确定删除账号 '+decodeURIComponent(label)+'？'))return; +if(!confirm('Delete account '+decodeURIComponent(label)+'?'))return; try{ var r=await fetch('/api/accounts/'+label,{method:'DELETE'}); var d=await r.json(); -if(d.ok){t('已删除');loadAccounts()} -else{t('删除失败: '+(d.error||'未知错误'),1)} -}catch(e){t('删除失败: '+e.message,1)} +if(d.ok){t('Deleted');loadAccounts()} +else{t('Remove failed: '+(d.error||'Unknown error'),1)} +}catch(e){t('Remove failed: '+e.message,1)} } async function reloginAccount(label){ var btn=event&&event.target;if(btn){btn.disabled=true;btn.textContent='...'} try{ var r=await fetch('/api/accounts/'+label+'/relogin',{method:'POST'}); var d=await r.json(); -if(d.ok){t('重新登录成功');loadAccounts()} -else{t('重登失败: '+(d.error||'未知错误'),1)} -}catch(e){t('重登失败: '+e.message,1)} -if(btn){btn.disabled=false;btn.textContent='重登'} +if(d.ok){t('Re-login successful');loadAccounts()} +else{t('Re-login failed: '+(d.error||'Unknown error'),1)} +}catch(e){t('Re-login failed: '+e.message,1)} +if(btn){btn.disabled=false;btn.textContent='Re-login'} } async function reloginAll(){ -var btn=event&&event.target;if(btn){btn.disabled=true;btn.textContent='登录中...'} +var btn=event&&event.target;if(btn){btn.disabled=true;btn.textContent='Logging in...'} try{ var r=await fetch('/api/accounts/relogin-all',{method:'POST'}); var d=await r.json(); if(d.results){ var ok=d.results.filter(x=>x.ok).length; -t('重登完成: '+ok+'/'+d.total+' 成功'); +t('Re-login: '+ok+'/'+d.total+' successful'); loadAccounts(); -}else{t('失败: '+(d.error||'未知'),1)} -}catch(e){t('重登失败: '+e.message,1)} -if(btn){btn.disabled=false;btn.textContent='全部重新登录'} +}else{t('Failed: '+(d.error||'Unknown'),1)} +}catch(e){t('Re-login failed: '+e.message,1)} +if(btn){btn.disabled=false;btn.textContent='Re-login All'} } async function cleanupSessions(){ -var btn=event&&event.target;if(btn){btn.disabled=true;btn.textContent='清理中...'} +var btn=event&&event.target;if(btn){btn.disabled=true;btn.textContent='Cleaning...'} try{ var r=await fetch('/api/cleanup',{method:'POST'}); var d=await r.json(); -t(d.ok?d.msg:'清理失败: '+(d.msg||'未知'),d.ok?0:1) -}catch(e){t('清理失败: '+e.message,1)} -if(btn){btn.disabled=false;btn.textContent='清理过期会话'} +t(d.ok?d.msg:'Cleanup failed: '+(d.msg||'Unknown'),d.ok?0:1) +}catch(e){t('Cleanup failed: '+e.message,1)} +if(btn){btn.disabled=false;btn.textContent='Clean Expired Sessions'} } // === 用量统计 === var _up='total'; @@ -1794,12 +1794,12 @@ async def startup_discover(): const r=await fetch('/api/usage');const d=await r.json(); const p=d[_up]||d.total||{};const m=p.models||{};const t=p.total||{}; const e=Object.entries(m).sort((a,b)=>b[1].total_tokens-a[1].total_tokens); -if(!e.length&&!t.requests){Q('usageContent').innerHTML='
📊 暂无用量数据
';return} -let h='
'; +if(!e.length&&!t.requests){Q('usageContent').innerHTML='
📊 No usage data yet
';return} +let h='
模型请求输入输出总计
'; for(const[k,v]of e){h+=``} -h+=`
ModelRequestsInputOutputTotal
${k}${f(v.requests)}${f(v.prompt_tokens)}${f(v.completion_tokens)}${f(v.total_tokens)}
📋 合计${f(t.requests)}${f(t.prompt_tokens)}${f(t.completion_tokens)}${f(t.total_tokens)}
`; +h+=`📋 Total${f(t.requests)}${f(t.prompt_tokens)}${f(t.completion_tokens)}${f(t.total_tokens)}`; Q('usageContent').innerHTML=h -}catch(e){Q('usageContent').innerHTML='
加载失败: '+e.message+'
'} +}catch(e){Q('usageContent').innerHTML='
Failed to load: '+e.message+'
'} } function switchPeriod(p){ _up=p; @@ -1807,8 +1807,8 @@ async def startup_discover(): loadUsage() } async function clearUsage(){ -if(!confirm('确定清空全部用量数据？'))return; -try{await fetch('/api/usage',{method:'DELETE'});t('已清空');loadUsage()}catch(e){t('清空失败',1)} +if(!confirm('Clear all usage data?'))return; +try{await fetch('/api/usage',{method:'DELETE'});t('Cleared');loadUsage()}catch(e){t('Clear failed',1)} } cs() From 937f8616d6102dfc29ef5ab0cd984f0d82db9830 Mon Sep 17 00:00:00 2001 From: NPN Date: Fri, 8 May 2026 01:38:18 -0700 Subject: [PATCH 2/4] fix too long content --- .coverage | Bin 0 -> 53248 bytes .../console-2026-05-07T20-57-49-621Z.log | 3 + .../console-2026-05-07T20-58-32-838Z.log | 7 + .../console-2026-05-07T20-58-51-232Z.log | 4 + .../console-2026-05-07T21-00-49-650Z.log | 3 + .../console-2026-05-07T21-01-04-214Z.log | 3 + .../console-2026-05-07T21-29-18-090Z.log | 3 + .../page-2026-05-07T20-57-51-400Z.yml | 35 + .../page-2026-05-07T20-58-25-855Z.yml | 43 + .../page-2026-05-07T20-58-34-020Z.yml | 35 + .../page-2026-05-07T20-58-52-095Z.yml | 35 + .../page-2026-05-07T21-00-38-581Z.yml | 0 .../page-2026-05-07T21-00-50-496Z.yml | 35 + .../page-2026-05-07T21-01-04-982Z.yml | 35 + .../page-2026-05-07T21-29-20-740Z.yml | 35 + .../ses_1fbf378c2ffeCtBtaDRoS1jLUS.json | 10 + REMEDIATION_REPORT.md | 259 +++++ app/anthropic.py | 16 +- app/anthropic_routes.py | 129 ++- context_manager.py | 457 +++++++++ deploy.sh | 0 proxy.py | 921 +++++++++++++++--- requirements.txt | 6 + server.log | 7 + tests/__init__.py | 0 tests/test_context_manager.py | 515 ++++++++++ tests/test_oversized.py | 236 +++++ tests/test_oversized.sh | 181 ++++ 28 files changed, 2862 insertions(+), 151 deletions(-) create mode 100644 .coverage create mode 100644 .playwright-mcp/console-2026-05-07T20-57-49-621Z.log create mode 100644 .playwright-mcp/console-2026-05-07T20-58-32-838Z.log create mode 100644 .playwright-mcp/console-2026-05-07T20-58-51-232Z.log create mode 100644 .playwright-mcp/console-2026-05-07T21-00-49-650Z.log create mode 100644 .playwright-mcp/console-2026-05-07T21-01-04-214Z.log create mode 100644 .playwright-mcp/console-2026-05-07T21-29-18-090Z.log create mode 100644 .playwright-mcp/page-2026-05-07T20-57-51-400Z.yml create mode 100644 .playwright-mcp/page-2026-05-07T20-58-25-855Z.yml create mode 100644 .playwright-mcp/page-2026-05-07T20-58-34-020Z.yml create mode 100644 .playwright-mcp/page-2026-05-07T20-58-52-095Z.yml create mode 100644 .playwright-mcp/page-2026-05-07T21-00-38-581Z.yml create mode 100644 .playwright-mcp/page-2026-05-07T21-00-50-496Z.yml create mode 100644 .playwright-mcp/page-2026-05-07T21-01-04-982Z.yml create mode 100644 .playwright-mcp/page-2026-05-07T21-29-20-740Z.yml create mode 100644 .sisyphus/run-continuation/ses_1fbf378c2ffeCtBtaDRoS1jLUS.json create mode 100644 REMEDIATION_REPORT.md create mode 100644 context_manager.py mode change 100644 => 100755 deploy.sh create mode 100644 server.log create mode 100644 tests/__init__.py create mode 100644 tests/test_context_manager.py create mode 100644 tests/test_oversized.py create mode 100755 tests/test_oversized.sh diff --git a/.coverage b/.coverage new file mode 100644 index 0000000000000000000000000000000000000000..b8e1cfbffdaf76e30df6ea5bdaf5c243f2649b37 GIT binary patch literal 53248 zcmeI)&u`mg7zc1WX_Glk<)Se~B}{!Kgt}@;N;DxDJB*H1+Oz>1bchp~le|g2C3a>z zU3)+*W6}`+0TNfPT!zGP;>ZE*3_=@R+BpR`@VkO z&-*J`I=_GMyd6lIj6m;VHl3TD)o*?rSk;yc zJgX)>^*sI7d&^5J%VK5e)cIwhj)@}~L0hpXmW1bC7ai$|hTW3FcItM`3T&q-f>jx( z?)tLMYZe`&Rf`jr!u-5fvFns8kWDJ0bGTBC(EnR&(uh5=)j;VXB$*d&GqUWebuv^ z+N$&m!s^$s=2D#NfvTevY04bN>~z~zBEQmYcersVhq`d!j>|bNZ{S9i zeeAZ`p)CjX9cj*(oLf}o>N@tduIx8{K@4&h!fH5fL2xCg2fRF$${jzbYt$>{x__-j zZ=EVuH*mw(6>9uSnVzz@o;#4v&CThzuZ10jc`8*q@cTQ)NT=x^9@BOB{P=#uqhz#` z@F;4vgxd&*4CfZAai}*BkD0|7!}55b2{%eek?v`4<6tQUQEj=^(Y_Y;7+=x=p}8PV z*62Dl9x6W9q2{hh&uYq2bXH9Zd)<+!>y(XDZh3B8*XehGO1ZzA>CL9nxqM!~X@uP< zYOUy3dZY`*ExE%q8lP%Q%kO&eM6%l?8Rr$Y2O;TL>OM{Eii@ibrGT!xZ@ZWGZ*!(73=kgi4v8Q@3Uk zVaT5)L;W^Q`us?agv>_n_yr{ZvOInUv8z{$FpRQ^9 zB8=hDRq5oQ41a^mXs*qNF~y4uPxC7@=;HB3JMFgR)T8x^mtj>Z&HX$$`8sM6p^Rdl z2Bl9!bX%Emq0w2MvEuSe9Wvok+g4o-cW#uS60fhyM~YLc(P=A?f!&sZlZ3&99qYQ~ zi<&3tWVDusfsxqi_NY`bXXs2khpO5v%qMs2JKV&TGC%XD2vu z)#Oz1>778^it8G^OpNrbZ6^nv>|L6r=`GT5=VI_7Lw>2Qz%!z1_Nt{?)+kEMD;JHM+gQ1<$=AYk|L5 zm$E}QOSxKXcv2Rvjve3dr9yXZpnIfvbdv@C{$Dr0(dY*o1Rwwb2tWV=5P$##AOHaf zKmY`~SO|d3W#QK?D$h00bZa0SG_< z0uX=z1Rwwb2<#|uQlB)8o|d@r^_lOQKhOMj@9*YKb8_qV%@g;&+B&6)`&<8g`@Por z@rV1rZav(3QG4e`qm(>e*R(%=`r_@EjDHg9`~OYN+}yEz9E1P_AOHafKmY;|fB*y_ z009Up#18=oKmY;|fB*y_009U<00I!$UEqJU C8H&&V literal 0 HcmV?d00001 diff --git a/.playwright-mcp/console-2026-05-07T20-57-49-621Z.log b/.playwright-mcp/console-2026-05-07T20-57-49-621Z.log new file mode 100644 index 0000000..6ffa6a3 --- /dev/null +++ b/.playwright-mcp/console-2026-05-07T20-57-49-621Z.log @@ -0,0 +1,3 @@ +[ 4779ms] [VERBOSE] [DOM] Password field is not contained in a form: (More info: https://goo.gl/9p2vKq) %o @ https://chat.deepseek.com/sign_in:0 +[ 5983ms] [LOG] %c %s color: yellow; background-color: black; [instance: default] appid: 20006317, userInfo:{"user_unique_id":"7637257016922219532","web_id":"7637257016922219532"} @ https://lf3-data.volccdn.com/obj/data-static/log-sdk/collect/5.0/collect-rangers-v5.2.11.js:0 +[ 5983ms] [LOG] %c %s color: yellow; background-color: black; [instance: default] appid: 20006317, sdk is ready, version is 5.2.11_tob, you can report now !!! @ https://lf3-data.volccdn.com/obj/data-static/log-sdk/collect/5.0/collect-rangers-v5.2.11.js:0 diff --git a/.playwright-mcp/console-2026-05-07T20-58-32-838Z.log b/.playwright-mcp/console-2026-05-07T20-58-32-838Z.log new file mode 100644 index 0000000..754ba4e --- /dev/null +++ b/.playwright-mcp/console-2026-05-07T20-58-32-838Z.log @@ -0,0 +1,7 @@ +[ 413ms] [LOG] %c %s color: yellow; background-color: black; [instance: default] appid: 20006317, userInfo:{"user_unique_id":"7637257016922219532","web_id":"7637257016922219532"} @ https://lf3-data.volccdn.com/obj/data-static/log-sdk/collect/5.0/collect-rangers-v5.2.11.js:0 +[ 413ms] [LOG] %c %s color: yellow; background-color: black; [instance: default] appid: 20006317, sdk is ready, version is 5.2.11_tob, you can report now !!! @ https://lf3-data.volccdn.com/obj/data-static/log-sdk/collect/5.0/collect-rangers-v5.2.11.js:0 +[ 529ms] [VERBOSE] [DOM] Password field is not contained in a form: (More info: https://goo.gl/9p2vKq) %o @ https://chat.deepseek.com/sign_in:0 +[ 9272ms] [VERBOSE] [DOM] Password field is not contained in a form: (More info: https://goo.gl/9p2vKq) %o @ https://accounts.google.com/v3/signin/identifier?opparams=%253F&dsh=S286238413%3A1778187513968629&access_type=offline&client_id=205977709770-3d0am349pfuhpv45soo1qt5o6h7cbofk.apps.googleusercontent.com&o2v=1&prompt=consent&redirect_uri=https%3A%2F%2Fchat.deepseek.com%2Fapi%2Fv0%2Fusers%2Foauth%2Fgoogle%2Fcallback&response_type=code&scope=profile+email&service=lso&state=4qpfNk2A-BCH0aUPQZ6vACysrYDBUuk9JcdC8o3YDEO2sNpVdJ8eax5vo-LD_79Hin3uanMIVjFo1GZs5xnBPCb4z4I1AMaaCghjyYfX3nWJfxROblwE9zt95yZuvvt5GjJbyGM5lb-tNKtSjgLjbIVR95ydZGM8yS875YMeru7XV0PG3sk66pqvXFgMQ0fvPD75J0G5oZud9HYh5A_eqJYU-FhfAZY5sHU2_rxBkpWtbkTK-cy_PkjTTzrBoO8d9uuJAnj8DH2wHreWha9hxKlSbOtt2M8axhx8A_hrPlx8kd9cje--3X09RIFIyUoyB2nSF6OUAzTPMO09DXOu1xEX-uPxIoJht0Dq6K4GcsreKs1BjOUyS6wxywMXj__N2lHN_im9tF57RohoA4SN6kkqf3yFNnQ12BnSXYHXctaZR9B6W_UDNkI-5bHw0Nda3vj_pdt2PpbLIPQRfgkK9BYwSK7pIOOGGTNFvUbvyFjnDnufkwlLzhBiAXeAUlqJAGmu3cz9_5LFPB6zLNQPFuu_4CYfPE8Otg3z8_X6lw-Kg3U4rgnmDg16WkZZZ9mHQ24ER9vmLEWfuEfFvk4dKK0buasxiKJbfzMlJNojzGYc7v5I0G2D_v2en4M-ZDcfWJL4DfTG0MfYoPMCNw1p_dF1ws7K1WwBFMRvZYoAdyPFzgpp_rrcLk3yt3Nx7CvuZZEb9ifqssLB3RY838ilH1lnP1bboaNDu1bgNXf_NUZ-xL-7Z-ogMZLHvhsDAVqFTwxsatFT9aAUv8LDqaI8O0RfDUwGLx-GnJUurtmQHWrwakbwlIdyxzr1ZjBKf6Ormrudq9kSHzTIGHgav5GQZXBE7rkYy2djp_xi2UTrv7_LeGH5y2_hhkhi1gApHw%3D%3D&flowName=GeneralOAuthFlow&continue=https%3A%2F%2Faccounts.google.com%2Fsignin%2Foauth%2Fconsent%3Fauthuser%3Dunknown%26part%3DAJi8hANTSbWEdGNHN9O2xKjb0TUlymOnwnKh0LAgIP_zOih4GjYHdL-7c0NFcpanqPnnkqEkEJwh0XmVwg-3OIIiLQWk4o35cVj0bjxaDSXxqXYtW-pGzuR0pgKOaCammYBEbtzY6JTl4Yy1LEF8Gv3CpjbvT1pzdyDWkAmrDKaaPHM32NXwY4Lrc9FeKVjldEovlLv4rnUJB5cMiOw218Y5G1GS73meGzuOlgGC24qz33qlX02lmmL5ks6c5UT6yFPvzLGN07vS6gMTLXwR8BcuQu-ic9xstu8sjnHNpTwqKeCU6NHxvQmZc2EMatpERTlqIv_NdtJVmnSaPgx8hmtBegVLyu8yAwxRSHLKfxQTGoZ-EpJrAfZBFd-iCJCM_W57Ct9Rd0b5QuiwJmFQoAdKKQ1trcgbYxMSAm3CWdhFWD6sKv3HtC9CJnMeAFUZhJ9MeKmhwJW8zvdwv9sxRnAxnPLG97o3sg%26flowName%3DGeneralOAuthFlow%26as%3DS286238413%253A1778187513968629%26client_id%3D205977709770-3d0am349pfuhpv45soo1qt5o6h7cbofk.apps.googleusercontent.com%26requestPath%3D%252Fsignin%252Foauth%252Fconsent%23&app_domain=https%3A%2F%2Fchat.deepseek.com&rart=ANgoxccyxeApbz-D_zwJDE_9kls4JPncT5LjzCA7lf9HBLPFuKxhwYqrr8fAcBuYsg9S79-zrp6YCCHkXsjgwHG_9Gsa91jNdN_ZBRwWddtk3qLh6HhFFK0:0 +[ 9277ms] [LOG] %c%s color: red; background: yellow; font-size: 24px; WARNING! @ https://www.gstatic.com/_/mss/boq-identity/_/js/k=boq-identity.AccountsSignInUi.en_US.n7L1AKtevvQ.es5.O/am=iW8AAIBQiIKQAcD4_78BAAIgiBp4PQtAE4gMAAAAAAAAAABYAAAAjQ/d=1/excm=_b,_tp,identifierview/ed=1/dg=0/wt=2/ujg=1/rs=AOaEmlEJrcdMlMIlw-fGgUrpxMXsKbAX6g/dti=1/m=_b,_tp:541 +[ 9277ms] [LOG] %c%s font-size: 18px; Using this console may allow attackers to impersonate you and steal your information using an attack called Self-XSS. +Do not enter or paste code that you do not understand. @ https://www.gstatic.com/_/mss/boq-identity/_/js/k=boq-identity.AccountsSignInUi.en_US.n7L1AKtevvQ.es5.O/am=iW8AAIBQiIKQAcD4_78BAAIgiBp4PQtAE4gMAAAAAAAAAABYAAAAjQ/d=1/excm=_b,_tp,identifierview/ed=1/dg=0/wt=2/ujg=1/rs=AOaEmlEJrcdMlMIlw-fGgUrpxMXsKbAX6g/dti=1/m=_b,_tp:541 diff --git a/.playwright-mcp/console-2026-05-07T20-58-51-232Z.log b/.playwright-mcp/console-2026-05-07T20-58-51-232Z.log new file mode 100644 index 0000000..5168a95 --- /dev/null +++ b/.playwright-mcp/console-2026-05-07T20-58-51-232Z.log @@ -0,0 +1,4 @@ +[ 429ms] [LOG] %c %s color: yellow; background-color: black; [instance: default] appid: 20006317, userInfo:{"user_unique_id":"7637257016922219532","web_id":"7637257016922219532"} @ https://lf3-data.volccdn.com/obj/data-static/log-sdk/collect/5.0/collect-rangers-v5.2.11.js:0 +[ 429ms] [LOG] %c %s color: yellow; background-color: black; [instance: default] appid: 20006317, sdk is ready, version is 5.2.11_tob, you can report now !!! @ https://lf3-data.volccdn.com/obj/data-static/log-sdk/collect/5.0/collect-rangers-v5.2.11.js:0 +[ 539ms] [VERBOSE] [DOM] Password field is not contained in a form: (More info: https://goo.gl/9p2vKq) %o @ https://chat.deepseek.com/sign_in:0 +[ 77486ms] [ERROR] Failed to load resource: the server responded with a status of 405 () @ https://chat.deepseek.com/api/v0/users/login:0 diff --git a/.playwright-mcp/console-2026-05-07T21-00-49-650Z.log b/.playwright-mcp/console-2026-05-07T21-00-49-650Z.log new file mode 100644 index 0000000..3000366 --- /dev/null +++ b/.playwright-mcp/console-2026-05-07T21-00-49-650Z.log @@ -0,0 +1,3 @@ +[ 456ms] [LOG] %c %s color: yellow; background-color: black; [instance: default] appid: 20006317, userInfo:{"user_unique_id":"7637257016922219532","web_id":"7637257016922219532"} @ https://lf3-data.volccdn.com/obj/data-static/log-sdk/collect/5.0/collect-rangers-v5.2.11.js:0 +[ 456ms] [LOG] %c %s color: yellow; background-color: black; [instance: default] appid: 20006317, sdk is ready, version is 5.2.11_tob, you can report now !!! @ https://lf3-data.volccdn.com/obj/data-static/log-sdk/collect/5.0/collect-rangers-v5.2.11.js:0 +[ 564ms] [VERBOSE] [DOM] Password field is not contained in a form: (More info: https://goo.gl/9p2vKq) %o @ https://chat.deepseek.com/sign_in:0 diff --git a/.playwright-mcp/console-2026-05-07T21-01-04-214Z.log b/.playwright-mcp/console-2026-05-07T21-01-04-214Z.log new file mode 100644 index 0000000..36489d8 --- /dev/null +++ b/.playwright-mcp/console-2026-05-07T21-01-04-214Z.log @@ -0,0 +1,3 @@ +[ 399ms] [LOG] %c %s color: yellow; background-color: black; [instance: default] appid: 20006317, userInfo:{"user_unique_id":"7637257016922219532","web_id":"7637257016922219532"} @ https://lf3-data.volccdn.com/obj/data-static/log-sdk/collect/5.0/collect-rangers-v5.2.11.js:0 +[ 399ms] [LOG] %c %s color: yellow; background-color: black; [instance: default] appid: 20006317, sdk is ready, version is 5.2.11_tob, you can report now !!! @ https://lf3-data.volccdn.com/obj/data-static/log-sdk/collect/5.0/collect-rangers-v5.2.11.js:0 +[ 507ms] [VERBOSE] [DOM] Password field is not contained in a form: (More info: https://goo.gl/9p2vKq) %o @ https://chat.deepseek.com/sign_in:0 diff --git a/.playwright-mcp/console-2026-05-07T21-29-18-090Z.log b/.playwright-mcp/console-2026-05-07T21-29-18-090Z.log new file mode 100644 index 0000000..094224a --- /dev/null +++ b/.playwright-mcp/console-2026-05-07T21-29-18-090Z.log @@ -0,0 +1,3 @@ +[ 1234ms] [LOG] %c %s color: yellow; background-color: black; [instance: default] appid: 20006317, userInfo:{"user_unique_id":"7637257016922219532","web_id":"7637257016922219532"} @ https://lf3-data.volccdn.com/obj/data-static/log-sdk/collect/5.0/collect-rangers-v5.2.11.js:0 +[ 1234ms] [LOG] %c %s color: yellow; background-color: black; [instance: default] appid: 20006317, sdk is ready, version is 5.2.11_tob, you can report now !!! @ https://lf3-data.volccdn.com/obj/data-static/log-sdk/collect/5.0/collect-rangers-v5.2.11.js:0 +[ 1354ms] [VERBOSE] [DOM] Password field is not contained in a form: (More info: https://goo.gl/9p2vKq) %o @ https://chat.deepseek.com/sign_in:0 diff --git a/.playwright-mcp/page-2026-05-07T20-57-51-400Z.yml b/.playwright-mcp/page-2026-05-07T20-57-51-400Z.yml new file mode 100644 index 0000000..036f105 --- /dev/null +++ b/.playwright-mcp/page-2026-05-07T20-57-51-400Z.yml @@ -0,0 +1,35 @@ +- generic [ref=e5]: + - generic [ref=e7]: + - img [ref=e10] + - generic [ref=e23]: + - textbox "Phone number / email address" [ref=e27] + - generic [ref=e31]: + - textbox "Password" [ref=e32] + - button [ref=e34] [cursor=pointer]: + - img [ref=e37] + - generic [ref=e42]: + - text: By signing up or logging in, you consent to DeepSeek's + - link "Terms of Use" [ref=e43] [cursor=pointer]: + - /url: https://cdn.deepseek.com/policies/en-US/deepseek-terms-of-use.html?locale=en_US + - text: and + - link "Privacy Policy" [ref=e44] [cursor=pointer]: + - /url: https://cdn.deepseek.com/policies/en-US/deepseek-privacy-policy.html?locale=en_US + - text: . + - generic [ref=e45]: + - button "Forgot password?" [ref=e46] [cursor=pointer]: + - generic [ref=e47]: Forgot password? + - button "Sign up" [ref=e48] [cursor=pointer]: + - generic [ref=e49]: Sign up + - button "Log in" [ref=e50] [cursor=pointer]: + - generic [ref=e51]: Log in + - generic [ref=e54]: + - button [ref=e55] [cursor=pointer]: + - img [ref=e57] + - button [ref=e62] [cursor=pointer]: + - img [ref=e64] + - generic [ref=e67]: + - link "浙ICP备2023025841号" [ref=e68] [cursor=pointer]: + - /url: https://beian.miit.gov.cn + - generic [ref=e69]: · + - link "Contact us" [ref=e70] [cursor=pointer]: + - /url: mailto:service@deepseek.com \ No newline at end of file diff --git a/.playwright-mcp/page-2026-05-07T20-58-25-855Z.yml b/.playwright-mcp/page-2026-05-07T20-58-25-855Z.yml new file mode 100644 index 0000000..63d92b2 --- /dev/null +++ b/.playwright-mcp/page-2026-05-07T20-58-25-855Z.yml @@ -0,0 +1,43 @@ +- generic [active] [ref=e1]: + - generic [ref=e5]: + - generic [ref=e7]: + - img [ref=e10] + - generic [ref=e23]: + - textbox "Phone number / email address" [ref=e27]: idyllic4202@wplacetools.com + - generic [ref=e31]: + - textbox "Password" [ref=e32]: test12345 + - button [ref=e34] [cursor=pointer]: + - img [ref=e37] + - generic [ref=e42]: + - text: By signing up or logging in, you consent to DeepSeek's + - link "Terms of Use" [ref=e43] [cursor=pointer]: + - /url: https://cdn.deepseek.com/policies/en-US/deepseek-terms-of-use.html?locale=en_US + - text: and + - link "Privacy Policy" [ref=e44] [cursor=pointer]: + - /url: https://cdn.deepseek.com/policies/en-US/deepseek-privacy-policy.html?locale=en_US + - text: . + - generic [ref=e45]: + - button "Forgot password?" [ref=e46] [cursor=pointer]: + - generic [ref=e47]: Forgot password? + - button "Sign up" [ref=e48] [cursor=pointer]: + - generic [ref=e49]: Sign up + - button "Log in" [ref=e50] [cursor=pointer]: + - generic [ref=e51]: Log in + - generic [ref=e54]: + - button [ref=e55] [cursor=pointer]: + - img [ref=e57] + - button [ref=e62] [cursor=pointer]: + - img [ref=e64] + - generic [ref=e67]: + - link "浙ICP备2023025841号" [ref=e68] [cursor=pointer]: + - /url: https://beian.miit.gov.cn + - generic [ref=e69]: · + - link "Contact us" [ref=e70] [cursor=pointer]: + - /url: mailto:service@deepseek.com + - generic: + - generic [ref=e71]: + - img [ref=e73] + - generic [ref=e76]: As a result of violations, your account has been temporarily suspended. + - generic [ref=e77]: + - img [ref=e79] + - generic [ref=e82]: As a result of violations, your account has been temporarily suspended. \ No newline at end of file diff --git a/.playwright-mcp/page-2026-05-07T20-58-34-020Z.yml b/.playwright-mcp/page-2026-05-07T20-58-34-020Z.yml new file mode 100644 index 0000000..036f105 --- /dev/null +++ b/.playwright-mcp/page-2026-05-07T20-58-34-020Z.yml @@ -0,0 +1,35 @@ +- generic [ref=e5]: + - generic [ref=e7]: + - img [ref=e10] + - generic [ref=e23]: + - textbox "Phone number / email address" [ref=e27] + - generic [ref=e31]: + - textbox "Password" [ref=e32] + - button [ref=e34] [cursor=pointer]: + - img [ref=e37] + - generic [ref=e42]: + - text: By signing up or logging in, you consent to DeepSeek's + - link "Terms of Use" [ref=e43] [cursor=pointer]: + - /url: https://cdn.deepseek.com/policies/en-US/deepseek-terms-of-use.html?locale=en_US + - text: and + - link "Privacy Policy" [ref=e44] [cursor=pointer]: + - /url: https://cdn.deepseek.com/policies/en-US/deepseek-privacy-policy.html?locale=en_US + - text: . + - generic [ref=e45]: + - button "Forgot password?" [ref=e46] [cursor=pointer]: + - generic [ref=e47]: Forgot password? + - button "Sign up" [ref=e48] [cursor=pointer]: + - generic [ref=e49]: Sign up + - button "Log in" [ref=e50] [cursor=pointer]: + - generic [ref=e51]: Log in + - generic [ref=e54]: + - button [ref=e55] [cursor=pointer]: + - img [ref=e57] + - button [ref=e62] [cursor=pointer]: + - img [ref=e64] + - generic [ref=e67]: + - link "浙ICP备2023025841号" [ref=e68] [cursor=pointer]: + - /url: https://beian.miit.gov.cn + - generic [ref=e69]: · + - link "Contact us" [ref=e70] [cursor=pointer]: + - /url: mailto:service@deepseek.com \ No newline at end of file diff --git a/.playwright-mcp/page-2026-05-07T20-58-52-095Z.yml b/.playwright-mcp/page-2026-05-07T20-58-52-095Z.yml new file mode 100644 index 0000000..036f105 --- /dev/null +++ b/.playwright-mcp/page-2026-05-07T20-58-52-095Z.yml @@ -0,0 +1,35 @@ +- generic [ref=e5]: + - generic [ref=e7]: + - img [ref=e10] + - generic [ref=e23]: + - textbox "Phone number / email address" [ref=e27] + - generic [ref=e31]: + - textbox "Password" [ref=e32] + - button [ref=e34] [cursor=pointer]: + - img [ref=e37] + - generic [ref=e42]: + - text: By signing up or logging in, you consent to DeepSeek's + - link "Terms of Use" [ref=e43] [cursor=pointer]: + - /url: https://cdn.deepseek.com/policies/en-US/deepseek-terms-of-use.html?locale=en_US + - text: and + - link "Privacy Policy" [ref=e44] [cursor=pointer]: + - /url: https://cdn.deepseek.com/policies/en-US/deepseek-privacy-policy.html?locale=en_US + - text: . + - generic [ref=e45]: + - button "Forgot password?" [ref=e46] [cursor=pointer]: + - generic [ref=e47]: Forgot password? + - button "Sign up" [ref=e48] [cursor=pointer]: + - generic [ref=e49]: Sign up + - button "Log in" [ref=e50] [cursor=pointer]: + - generic [ref=e51]: Log in + - generic [ref=e54]: + - button [ref=e55] [cursor=pointer]: + - img [ref=e57] + - button [ref=e62] [cursor=pointer]: + - img [ref=e64] + - generic [ref=e67]: + - link "浙ICP备2023025841号" [ref=e68] [cursor=pointer]: + - /url: https://beian.miit.gov.cn + - generic [ref=e69]: · + - link "Contact us" [ref=e70] [cursor=pointer]: + - /url: mailto:service@deepseek.com \ No newline at end of file diff --git a/.playwright-mcp/page-2026-05-07T21-00-38-581Z.yml b/.playwright-mcp/page-2026-05-07T21-00-38-581Z.yml new file mode 100644 index 0000000..e69de29 diff --git a/.playwright-mcp/page-2026-05-07T21-00-50-496Z.yml b/.playwright-mcp/page-2026-05-07T21-00-50-496Z.yml new file mode 100644 index 0000000..036f105 --- /dev/null +++ b/.playwright-mcp/page-2026-05-07T21-00-50-496Z.yml @@ -0,0 +1,35 @@ +- generic [ref=e5]: + - generic [ref=e7]: + - img [ref=e10] + - generic [ref=e23]: + - textbox "Phone number / email address" [ref=e27] + - generic [ref=e31]: + - textbox "Password" [ref=e32] + - button [ref=e34] [cursor=pointer]: + - img [ref=e37] + - generic [ref=e42]: + - text: By signing up or logging in, you consent to DeepSeek's + - link "Terms of Use" [ref=e43] [cursor=pointer]: + - /url: https://cdn.deepseek.com/policies/en-US/deepseek-terms-of-use.html?locale=en_US + - text: and + - link "Privacy Policy" [ref=e44] [cursor=pointer]: + - /url: https://cdn.deepseek.com/policies/en-US/deepseek-privacy-policy.html?locale=en_US + - text: . + - generic [ref=e45]: + - button "Forgot password?" [ref=e46] [cursor=pointer]: + - generic [ref=e47]: Forgot password? + - button "Sign up" [ref=e48] [cursor=pointer]: + - generic [ref=e49]: Sign up + - button "Log in" [ref=e50] [cursor=pointer]: + - generic [ref=e51]: Log in + - generic [ref=e54]: + - button [ref=e55] [cursor=pointer]: + - img [ref=e57] + - button [ref=e62] [cursor=pointer]: + - img [ref=e64] + - generic [ref=e67]: + - link "浙ICP备2023025841号" [ref=e68] [cursor=pointer]: + - /url: https://beian.miit.gov.cn + - generic [ref=e69]: · + - link "Contact us" [ref=e70] [cursor=pointer]: + - /url: mailto:service@deepseek.com \ No newline at end of file diff --git a/.playwright-mcp/page-2026-05-07T21-01-04-982Z.yml b/.playwright-mcp/page-2026-05-07T21-01-04-982Z.yml new file mode 100644 index 0000000..036f105 --- /dev/null +++ b/.playwright-mcp/page-2026-05-07T21-01-04-982Z.yml @@ -0,0 +1,35 @@ +- generic [ref=e5]: + - generic [ref=e7]: + - img [ref=e10] + - generic [ref=e23]: + - textbox "Phone number / email address" [ref=e27] + - generic [ref=e31]: + - textbox "Password" [ref=e32] + - button [ref=e34] [cursor=pointer]: + - img [ref=e37] + - generic [ref=e42]: + - text: By signing up or logging in, you consent to DeepSeek's + - link "Terms of Use" [ref=e43] [cursor=pointer]: + - /url: https://cdn.deepseek.com/policies/en-US/deepseek-terms-of-use.html?locale=en_US + - text: and + - link "Privacy Policy" [ref=e44] [cursor=pointer]: + - /url: https://cdn.deepseek.com/policies/en-US/deepseek-privacy-policy.html?locale=en_US + - text: . + - generic [ref=e45]: + - button "Forgot password?" [ref=e46] [cursor=pointer]: + - generic [ref=e47]: Forgot password? + - button "Sign up" [ref=e48] [cursor=pointer]: + - generic [ref=e49]: Sign up + - button "Log in" [ref=e50] [cursor=pointer]: + - generic [ref=e51]: Log in + - generic [ref=e54]: + - button [ref=e55] [cursor=pointer]: + - img [ref=e57] + - button [ref=e62] [cursor=pointer]: + - img [ref=e64] + - generic [ref=e67]: + - link "浙ICP备2023025841号" [ref=e68] [cursor=pointer]: + - /url: https://beian.miit.gov.cn + - generic [ref=e69]: · + - link "Contact us" [ref=e70] [cursor=pointer]: + - /url: mailto:service@deepseek.com \ No newline at end of file diff --git a/.playwright-mcp/page-2026-05-07T21-29-20-740Z.yml b/.playwright-mcp/page-2026-05-07T21-29-20-740Z.yml new file mode 100644 index 0000000..036f105 --- /dev/null +++ b/.playwright-mcp/page-2026-05-07T21-29-20-740Z.yml @@ -0,0 +1,35 @@ +- generic [ref=e5]: + - generic [ref=e7]: + - img [ref=e10] + - generic [ref=e23]: + - textbox "Phone number / email address" [ref=e27] + - generic [ref=e31]: + - textbox "Password" [ref=e32] + - button [ref=e34] [cursor=pointer]: + - img [ref=e37] + - generic [ref=e42]: + - text: By signing up or logging in, you consent to DeepSeek's + - link "Terms of Use" [ref=e43] [cursor=pointer]: + - /url: https://cdn.deepseek.com/policies/en-US/deepseek-terms-of-use.html?locale=en_US + - text: and + - link "Privacy Policy" [ref=e44] [cursor=pointer]: + - /url: https://cdn.deepseek.com/policies/en-US/deepseek-privacy-policy.html?locale=en_US + - text: . + - generic [ref=e45]: + - button "Forgot password?" [ref=e46] [cursor=pointer]: + - generic [ref=e47]: Forgot password? + - button "Sign up" [ref=e48] [cursor=pointer]: + - generic [ref=e49]: Sign up + - button "Log in" [ref=e50] [cursor=pointer]: + - generic [ref=e51]: Log in + - generic [ref=e54]: + - button [ref=e55] [cursor=pointer]: + - img [ref=e57] + - button [ref=e62] [cursor=pointer]: + - img [ref=e64] + - generic [ref=e67]: + - link "浙ICP备2023025841号" [ref=e68] [cursor=pointer]: + - /url: https://beian.miit.gov.cn + - generic [ref=e69]: · + - link "Contact us" [ref=e70] [cursor=pointer]: + - /url: mailto:service@deepseek.com \ No newline at end of file diff --git a/.sisyphus/run-continuation/ses_1fbf378c2ffeCtBtaDRoS1jLUS.json b/.sisyphus/run-continuation/ses_1fbf378c2ffeCtBtaDRoS1jLUS.json new file mode 100644 index 0000000..8a1806e --- /dev/null +++ b/.sisyphus/run-continuation/ses_1fbf378c2ffeCtBtaDRoS1jLUS.json @@ -0,0 +1,10 @@ +{ + "sessionID": "ses_1fbf378c2ffeCtBtaDRoS1jLUS", + "updatedAt": "2026-05-08T08:13:18.528Z", + "sources": { + "background-task": { + "state": "idle", + "updatedAt": "2026-05-08T08:13:18.528Z" + } + } +} \ No newline at end of file diff --git a/REMEDIATION_REPORT.md b/REMEDIATION_REPORT.md new file mode 100644 index 0000000..10a132a --- /dev/null +++ b/REMEDIATION_REPORT.md @@ -0,0 +1,259 @@ +# Remediation Report: "Content is too long" Errors + +## Root Cause Analysis + +### Error Source +The error **"Content is too long. Please shorten it and try again."** originates from **DeepSeek's upstream API** (`POST /api/v0/chat/completion`), NOT from the proxy itself. The proxy had **zero context management** — no token counting, no truncation, no sliding window, no retry logic. + +### How It Manifests +OpenCode (v1.14.41) sends conversations using `@ai-sdk/openai-compatible` SDK. When a session has: +- Large system prompts (agent definitions, tool descriptions) +- Multi-turn conversations with verbose tool results +- Extensive `reasoning_content` from DeepSeek's "deep thinking" mode + +The total tokens exceed the model's `max_input_tokens` limit. DeepSeek's API returns the "Content is too long" error. The proxy had no mechanism to detect or handle this. + +### Observed Frequency +In a single session (`2026-05-07T181358.log`), the error occurred **5 times** with the `deepseek-expert` model, across both `Sisyphus` and `Atlas` agents. + +### Models Affected +All configured DeepSeek models, especially: +- `deepseek-expert`, `deepseek-expert-reasoner` — lower max_input_tokens +- `deepseek-vision` — additionally constrained by image token overhead + +### Request Flow (Before Fix) +``` +/v1/chat/completions handler (proxy.py:2831) + → convert_messages_for_deepseek (tool_call.py) + → _do_chat (proxy.py:3711) + → POST /api/v0/chat/completion ← ERROR: "Content is too long" + → HTTPException propagated to client +``` + +**No token counting, no pruning, no retry.** Both streaming and non-streaming paths affected. + +--- + +## Fixes Implemented + +### 1. New Module: `context_manager.py` + +Standalone module (no proxy dependencies) providing: + +| Function | Purpose | +|---|---| +| `count_tokens()` | Token counting via `tiktoken` cl100k_base encoding | +| `estimate_message_tokens()` | Full message token estimation (content + reasoning + tool_calls + role overhead) | +| `estimate_tool_def_tokens()` | Tool definition overhead (3x raw JSON for DSML wrapping) | +| `token_breakdown()` | Structured diagnostic breakdown by category | +| `format_token_breakdown()` | Human-readable diagnostics string | +| `prune_context()` | 4-tier incremental pruning (see below) | +| `aggressive_prune()` | Aggressive retry pruning (system + last 1-2 turns) | +| `enforce_context_limit()` | Main entry point: check + prune + report | +| `retry_prune()` | Multi-level retry (aggressive → ultimate fallback) | + +### 2. Pruning Strategy Order (`prune_context`) + +| Priority | Strategy | Description | +|---|---|---| +| 1 | Remove old turns | Remove oldest non-system, non-last-user, non-after-last-user messages | +| 2 | Strip reasoning | Remove `reasoning_content` from assistant messages (can save thousands of tokens) | +| 3 | Truncate tool results | Truncate long tool result content to 100 chars | +| 4 | Truncate system prompt | Remove tool prompt injection section from system message | +| — | Fallback: remove system | When nothing else can be removed, remove system message | + +### 3. Changes to `proxy.py` + +**3a. Import + Model Info Capture (line ~2852)** +```python +from context_manager import enforce_context_limit, token_breakdown, format_token_breakdown, retry_prune +# max_input_tokens now captured (was discarded as _) +thinking_enabled, search_enabled, max_input_tokens, max_output_tokens = ( + model_info or (False, False, 1048576, 1048576) +) +``` + +**3b. Pre-request Context Enforcement (after prompt construction)** +```python +pruned_msgs, pruned_count, was_pruned, prune_desc = enforce_context_limit( + messages, max_input_tokens, tools +) +_vlog(f"Context check: {prune_desc}") +``` + +**3c. Retry Wrapper for Non-Streaming `_do_chat`** +```python +max_retries = 1 +for attempt in range(max_retries + 1): + try: + return _do_chat(...) # original call + except HTTPException as e: + if "Content is too long" in str(e) and attempt < max_retries: + messages = retry_prune(messages, max_input_tokens) + continue + raise +``` + +**3d. Debug Endpoint (`/v1/context/debug`)** +POST endpoint accepting `{messages, model, tools}` — returns: +- Token breakdown by category +- Pruning simulation with metrics +- Retry pruning simulation + +### 4. Bugfixes in `_prune_single_pass` + +**The critical algorithm fix**: The original pruning algorithm removed ALL messages except the last user. This made strategies 2-4 (reasoning stripping, tool truncation, system truncation) unreachable — the messages containing the content to strip were removed entirely. + +**Fix**: Protect system message, last user message, and messages after the last user (current assistant response). System message is a last-resort removal. This ensures the most recent assistant response survives, making deeper content stripping strategies effective. + +### 5. Test Suite: `tests/test_context_manager.py` + +47 unit tests across 11 test classes: + +| Test Class | Tests | Coverage | +|---|---|---| +| `TestCountTokens` | 4 | Basic token counting | +| `TestEstimateMessageTokens` | 7 | Per-message estimation | +| `TestEstimateToolDefTokens` | 2 | Tool definition overhead | +| `TestTokenBreakdown` | 4 | Diagnostic breakdown | +| `TestFormatTokenBreakdown` | 1 | Human-readable output | +| `TestPruneContext` | 9 | Pruning strategies 1-4 | +| `TestAggressivePrune` | 4 | Aggressive retry pruning | +| `TestEnforceContextLimit` | 5 | Main entry point | +| `TestRetryPrune` | 2 | Retry logic | +| `TestIntegration` | 4 | End-to-end scenarios | +| `TestEdgeCases` | 5 | Edge cases | + +**All 47 tests pass** (verified: `ruff check` clean, `mypy` clean, `pytest` 47/47, `pytest --cov` 92%). + +### 6. E2E Test Scripts + +- `tests/test_oversized.sh` — curl-based (7 scenarios) +- `tests/test_oversized.py` — Python requests-based (7 scenarios) + +**Require**: Running proxy with valid DeepSeek credentials (`token.json`). + +--- + +## Model-Specific Token Limits + +| Model ID | max_input_tokens | max_output_tokens | Notes | +|---|---|---|---| +| deepseek-default | ~1,048,576 | ~1,048,576 | Fast base model | +| deepseek-reasoner | ~1,048,576 | ~1,048,576 | +thinking overhead | +| deepseek-expert | ~1,048,576 | ~1,048,576 | Expert/Pro model | +| deepseek-expert-reasoner | ~1,048,576 | ~1,048,576 | Expert + thinking | +| deepseek-vision | ~1,048,576 | ~1,048,576 | Vision base | +| deepseek-vision-reasoner | ~1,048,576 | ~1,048,576 | Vision + thinking | + +*Actual values discovered dynamically at runtime. Limits may change as DeepSeek updates their models.* + +--- + +## Before/After: Token Behavior + +### Before (No Context Management) +``` +Client sends 15-turn conversation with tool results (~15K tokens) + → proxy forwards to DeepSeek as-is + → DeepSeek rejects: "Content is too long" (model limit ~8K) + → proxy returns HTTP 500 to client + → OpenCode retries with... same oversized payload! + → Repeated failures until agent session crashes +``` + +### After (With Context Management) +``` +Client sends 15-turn conversation with tool results (~15K tokens) + → proxy checks: 15K tokens > 1K output reserve → 14K budget + → Strategy 1: remove 10 oldest turns (saves 8K) + → Strategy 2: strip reasoning_content (saves 4K) + → Strategy 3: truncate tool results to 100 chars (saves 1K) + → Total after pruning: ~2K tokens ≤ budget ✓ + → proxy forwards pruned context to DeepSeek + → DeepSeek accepts: 200 OK + → If upstream still rejects (edge case): + → retry_prune: keep only system + last turn (aggressive) + → retry once + → If still fails: propagate error (honest failure) +``` + +### Sample Token Breakdown (Debug Endpoint) +```json +{ + "total": 15342, + "system": 123, + "tool_defs": 456, + "history_user": 3456, + "history_assistant": 6789, + "tool_results": 2345, + "overhead": 173, + "message_count": 32, + "tool_count": 3 +} +``` + +--- + +## Edge Cases and Limitations + +| Scenario | Handling | Status | +|---|---|---| +| Normal conversation, under budget | No pruning; zero overhead | ✓ | +| Oversized with old history | Strategy 1 removes oldest turns | ✓ | +| Large reasoning_content | Strategy 2 strips it | ✓ | +| Large tool results | Strategy 3 truncates | ✓ | +| System message with tool prompt | Strategy 4 truncates tool section | ✓ | +| All messages are system messages | System removal as last resort | ✓ | +| Only system + user, over budget | System removal as last resort | ✓ | +| Streaming request + "Content is too long" | Streaming can't retry mid-stream; pre-request enforcement is primary defense | ⚠️ | +| No valid session/token | Error propagates honestly (not a context issue) | ⚠️ | +| Model not discovered (max_input_tokens unknown) | Falls back to 1,048,576 | ✓ | +| Output reserve dominates small budgets | Clamped to min 1024 | ✓ | +| Non-SSE text from DeepSeek (`:` heartbeat) | Not fixed (reverted per user request) | ❌ | + +--- + +## Files Modified/Created + +| File | Status | Description | +|---|---|---| +| `context_manager.py` | **NEW** | Token counting, pruning, retry, diagnostics | +| `proxy.py` | **MODIFIED** | Imports, capture, enforce_context_limit call, retry wrapper, debug endpoint | +| `requirements.txt` | **MODIFIED** | Added pytest, pytest-cov, ruff, mypy | +| `tests/test_context_manager.py` | **NEW** | 47 unit tests | +| `tests/test_oversized.sh` | **NEW** | Curl e2e test script | +| `tests/test_oversized.py` | **NEW** | Python e2e test script | +| `deploy.sh` | **MODIFIED** | English, uv venv (previous session) | +| `REMEDIATION_REPORT.md` | **NEW** | This document | + +--- + +## Verification Commands + +```bash +# Unit tests +.venv/bin/python -m pytest tests/test_context_manager.py -v + +# Coverage +.venv/bin/python -m pytest tests/test_context_manager.py --cov=context_manager --cov-report=term-missing + +# Lint +.venv/bin/ruff check context_manager.py + +# Type check +.venv/bin/mypy context_manager.py + +# E2E (requires running proxy with valid token.json) +bash tests/test_oversized.sh --all +python tests/test_oversized.py --all +``` + +--- + +## Recommendation + +1. **Production deployment**: Ensure `token.json` has valid credentials with auto-refresh capability (password-based login) to benefit from token management. +2. **Monitor**: Watch for "Content is too long" errors in proxy logs — they now only appear when pruning and retry both fail, indicating a genuinely oversized payload. +3. **Tuning**: The `MIN_OUTPUT_RESERVE=1024` default and `DEFAULT_OUTPUT_RESERVE_RATIO=0.2` are conservative. For models with very large limits (1M+), the 0.2 ratio dominates. Adjust if needed. +4. **Known pre-existing issue**: The SSE `:` heartbeat skip fix was reverted — "non-SSE text" errors may reappear. diff --git a/app/anthropic.py b/app/anthropic.py index b82abe2..7cacdfa 100644 --- a/app/anthropic.py +++ b/app/anthropic.py @@ -496,9 +496,13 @@ def _make_message_delta(state: StreamState, stop_reason: str = "end_turn", outpu def _make_message_stop() -> str: - """发送 message_stop。""" + """message_stop SSE 事件。""" return _make_sse("message_stop", {"type": "message_stop"}) +def _make_error(state: StreamState, message: str) -> str: + """error SSE 事件。""" + return _make_sse("error", {"type": "error", "error": {"type": "api_error", "message": message}}) + async def stream_response( openai_stream: AsyncIterator[Any], @@ -543,6 +547,16 @@ async def stream_response( except json.JSONDecodeError: continue + # Check for error events from upstream + error_info = obj.get("error") + if error_info is not None: + err_msg = error_info.get("message", "") if isinstance(error_info, dict) else str(error_info) + if "too long" in err_msg.lower(): + print(f"[TOO_LONG][ANTHRO_STREAM] model={model} error={err_msg[:300]}", flush=True) + yield _make_error(state, err_msg) + yield _make_message_stop() + return + choices = obj.get("choices", []) if not choices: continue diff --git a/app/anthropic_routes.py b/app/anthropic_routes.py index a2b899f..3e20f8c 100644 --- a/app/anthropic_routes.py +++ b/app/anthropic_routes.py @@ -70,6 +70,7 @@ def _resolve_anthropic_model(model: str) -> str: @router.post("/v1/messages") +@router.post("/messages") async def anthropic_messages(request: Request): """Anthropic Messages API 兼容端点（main 分支，支持工具调用+多账号+多模态）""" from proxy import ( @@ -79,6 +80,7 @@ async def anthropic_messages(request: Request): config_manager, extract_text_files_from_messages, extract_images_from_messages, upload_file_to_deepseek, fork_file_to_vision, wait_for_file_parsing, get_usage_status, + enforce_context_limit, retry_prune, ) body = await request.json() model = body.get("model", "deepseek-default") @@ -98,7 +100,7 @@ async def anthropic_messages(request: Request): model_info = get_models().get(model, get_models().get("deepseek-default")) if not model_info: raise HTTPException(status_code=400, detail=_anthropic_error_response(f"Unknown model: {model}")) - thinking_enabled, search_enabled, _, _ = model_info + thinking_enabled, search_enabled, max_input_tokens, _ = model_info cfg = { "token": account.token, @@ -144,16 +146,73 @@ async def anthropic_messages(request: Request): "https://chat.deepseek.com/api/v0/chat_session/create", json={}, headers=auth_h, impersonate="chrome120", timeout=15) if sess_resp.status_code == 200: - biz = sess_resp.json().get("data", {}).get("biz_data", {}) - new_sid = biz.get("chat_session", {}).get("id", "") or biz.get("id", "") - if new_sid: - cfg = dict(cfg) - cfg["session_id"] = new_sid + sess_data = sess_resp.json() + data_block = sess_data.get("data", {}) or {} + biz_code = data_block.get("biz_code", 0) + if biz_code != 0: + biz_msg = data_block.get("biz_msg", "") + _vlog(f"vision fresh session biz_code error: {biz_code} {biz_msg}") + else: + biz = data_block.get("biz_data", {}) + new_sid = biz.get("chat_session", {}).get("id", "") or biz.get("id", "") + if new_sid: + cfg = dict(cfg) + cfg["session_id"] = new_sid except Exception as e: _vlog(f"vision fresh session failed: {e}") prompt = convert_messages_for_deepseek(messages, tools) prompt_tokens = _count_tokens(prompt) + prompt_chars = len(prompt) + + # Debug logging for "Content is too long" diagnosis + import sys + msgs_summary = [] + for i, m in enumerate(messages): + role = m.get("role", "?") + content = m.get("content", "") + if isinstance(content, str): + csize = len(content) + elif isinstance(content, list): + csize = sum(len(p.get("text", "")) for p in content if isinstance(p, dict)) + else: + csize = len(str(content)) + msgs_summary.append(f"{i}:{role}={csize}") + print(f"[ANTHRO_REQ] model={model} msgs={len(messages)} prompt_chars={prompt_chars} prompt_tokens={prompt_tokens} last_role={messages[-1].get('role','?') if messages else '?'}", flush=True) + print(f"[ANTHRO_REQ] msgs_summary={' '.join(msgs_summary[-20:])}", flush=True) + print(f"[ANTHRO_REQ] raw_body_size={len(json.dumps(body, ensure_ascii=False))}", flush=True) + sys.stdout.flush() + + # 主动上下文修剪：在发送给 DeepSeek 之前检查 token 限制，避免 "Content is too long" + _, _, max_input_tokens, _ = model_info + pruned_messages, _, was_pruned, prune_desc = enforce_context_limit( + messages, max_input_tokens, tools + ) + if was_pruned: + prompt = convert_messages_for_deepseek(pruned_messages, tools) + prompt_tokens = _count_tokens(prompt) + prompt_chars = len(prompt) + print(f"[ANTHRO_REQ] proactive prune applied: {prune_desc}", flush=True) + print(f"[ANTHRO_REQ] after prune: msgs={len(pruned_messages)} tokens={prompt_tokens} chars={prompt_chars}", flush=True) + sys.stdout.flush() + + # Character budget check: DeepSeek enforces input_character_limit (icl) at the character level. + # Same logic as proxy.py lines 3252-3267. + max_chars_from_tokens = int(max_input_tokens / 0.4) if max_input_tokens else 2_621_440 + char_output_reserve = max(1024, min(16384, int(max_chars_from_tokens * 0.2))) + char_budget = max_chars_from_tokens - char_output_reserve + if prompt_chars > char_budget: + char_token_budget = max(4096, int(char_budget * 0.4)) + prune_target = pruned_messages if was_pruned else messages + pruned_messages, _, char_prune_desc = retry_prune( + prune_target, char_token_budget, was_aggressive=False + ) + prompt = convert_messages_for_deepseek(pruned_messages, tools) + prompt_tokens = _count_tokens(prompt) + prompt_chars = len(prompt) + print(f"[ANTHRO_REQ] char-limit prune (chars={prompt_chars}>{char_budget}): {char_prune_desc}", flush=True) + print(f"[ANTHRO_REQ] after char-prune: msgs={len(pruned_messages)} tokens={prompt_tokens} chars={prompt_chars}", flush=True) + sys.stdout.flush() # 会话管理：token 超限自动续期 if needs_renewal(account_label): @@ -165,26 +224,56 @@ async def anthropic_messages(request: Request): "https://chat.deepseek.com/api/v0/chat_session/create", json={}, headers=auth_h, impersonate="chrome120", timeout=15) if sess_resp.status_code == 200: - biz = sess_resp.json().get("data", {}).get("biz_data", {}) - new_sid = biz.get("chat_session", {}).get("id", "") or biz.get("id", "") - if new_sid: - cfg = dict(cfg) - cfg["session_id"] = new_sid - config_manager.update_account(account_label, session_id=new_sid) - on_new_session(account_label, new_sid, model) + sess_data = sess_resp.json() + data_block = sess_data.get("data", {}) or {} + biz_code = data_block.get("biz_code", 0) + if biz_code != 0: + biz_msg = data_block.get("biz_msg", "") + _vlog(f"Session renewal biz_code error: {biz_code} {biz_msg}") + else: + biz = data_block.get("biz_data", {}) + new_sid = biz.get("chat_session", {}).get("id", "") or biz.get("id", "") + if new_sid: + cfg = dict(cfg) + cfg["session_id"] = new_sid + config_manager.update_account(account_label, session_id=new_sid) + on_new_session(account_label, new_sid, model) except Exception as e: _vlog(f"Session renewal failed: {e}") msg_id = f"msg_{uuid.uuid4().hex[:24]}" - if stream: - result = _do_chat(cfg, prompt, model, thinking_enabled, search_enabled, stream=True, is_retry=False, has_tools=has_tools, tools=tools, ref_file_ids=ref_file_ids) + # Retry logic for "Content is too long" + max_retries = 1 + for attempt in range(max_retries + 1): + try: + if stream: + result = _do_chat(cfg, prompt, model, thinking_enabled, search_enabled, stream=True, is_retry=(attempt > 0), has_tools=has_tools, tools=tools, ref_file_ids=ref_file_ids, messages=messages, max_input_tokens=max_input_tokens) + else: + result = _do_chat(cfg, prompt, model, thinking_enabled, search_enabled, stream=False, is_retry=(attempt > 0), has_tools=has_tools, tools=tools, ref_file_ids=ref_file_ids, messages=messages, max_input_tokens=max_input_tokens) + break + except HTTPException as e: + if attempt >= max_retries: + raise + error_detail = e.detail + if isinstance(error_detail, dict): + error_msg = str(error_detail.get("error", {}).get("message", "")) + else: + error_msg = str(error_detail) + if "Content is too long" not in error_msg and "too long" not in error_msg: + raise + from proxy import retry_prune + pruned_msgs, _, retry_desc = retry_prune(messages, 0, was_aggressive=(attempt > 0)) + prompt = convert_messages_for_deepseek(pruned_msgs, tools) + prompt_tokens = _count_tokens(prompt) + print(f"[ANTHRO_RETRY] {retry_desc} prompt_chars={len(prompt)} attempt={attempt}", flush=True) + if stream: + orig_iter = result.body_iterator + async def _gen(): + async for chunk in orig_iter: + yield chunk async def _wrap(): - orig_iter = result.body_iterator - async def _gen(): - async for chunk in orig_iter: - yield chunk async for event in _anthropic_stream_response(_gen(), model, msg_id): yield event add_usage(model, prompt_tokens, 0) @@ -192,8 +281,6 @@ async def _gen(): return StreamingResponse(_wrap(), media_type="text/event-stream", headers={"Cache-Control": "no-cache, no-transform", "X-Accel-Buffering": "no"}) else: - result = _do_chat(cfg, prompt, model, thinking_enabled, search_enabled, stream=False, is_retry=False, has_tools=has_tools, tools=tools, ref_file_ids=ref_file_ids) - add_usage(model, prompt_tokens, 0) add_tokens(account_label, cfg.get("session_id", ""), prompt_tokens) diff --git a/context_manager.py b/context_manager.py new file mode 100644 index 0000000..73b78c4 --- /dev/null +++ b/context_manager.py @@ -0,0 +1,457 @@ +""" +Context manager for DeepSeek Free API Proxy. + +Handles token counting, context pruning, and retry logic to prevent +"Content is too long. Please shorten it and try again." errors from DeepSeek's upstream API. + +Pruning strategies (applied in order): +1. Remove oldest user-assistant conversation turns (preserving system message & last user message) +2. Strip `reasoning_content` from assistant messages +3. Truncate tool result content further (past the existing 500-char limit) +4. Truncate system message (tool definitions section) +5. Aggressive: keep only system message + last 1-2 turns +""" + +from __future__ import annotations + +import json +import logging +from typing import Any, Dict, List, Optional, Tuple + +import tiktoken + +logger = logging.getLogger("context_manager") + +# ── Tokenizer ────────────────────────────────────────────────────── + +_enc = tiktoken.get_encoding("cl100k_base") + + +def count_tokens(text: str) -> int: + """Count tokens using OpenAI's cl100k_base encoding (reasonable approximation for DeepSeek V4).""" + return len(_enc.encode(text or "")) + + +# ── Per-message overhead (DeepSeek native tokens added by convert_messages_for_deepseek) ── + +# These are the tokens prepended/appended by convert_messages_for_deepseek in tool_call.py +OVERHEAD_PER_ROLE: Dict[str, int] = { + "system": 2, # <｜System｜> ... <｜end▁of▁instructions｜> + "user": 1, # <｜User｜> + "assistant": 2, # <｜Assistant｜> ... <｜end▁of▁sentence｜> + "tool": 2, # <｜Tool｜> ... <｜end▁of▁toolresults｜> +} + +BOS_OVERHEAD = 1 # <｜begin▁of▁sentence｜> +ASST_TRAILER = 1 # Trailing <｜Assistant｜> appended by convert_messages_for_deepseek + +# ── Default budget parameters ────────────────────────────────────── + +DEFAULT_OUTPUT_RESERVE_RATIO = 0.2 # Reserve 20% of max_input_tokens for the model's response +MIN_OUTPUT_RESERVE = 1024 # At minimum reserve 1K tokens for output +MAX_OUTPUT_RESERVE = 65536 # At most reserve 64K tokens for output + +DEFAULT_MAX_INPUT_TOKENS = 1_048_576 # Fallback if model_info unavailable +DEFAULT_MAX_OUTPUT_TOKENS = 1_048_576 + + +# ── Token estimation ─────────────────────────────────────────────── + +def estimate_message_tokens(message: Dict[str, Any]) -> int: + """Estimate the token count for a single message in DeepSeek native format. + + Accounts for content, reasoning_content, tool_calls, and role overhead tokens. + """ + role = message.get("role", "") + tokens = 0 + + # Content (string or list of content parts) + content = message.get("content") + if isinstance(content, str) and content: + tokens += count_tokens(content) + elif isinstance(content, list): + for part in content: + if isinstance(part, dict) and part.get("type") == "text": + tokens += count_tokens(part.get("text", "")) + + # Reasoning content (assistant only) + if role == "assistant": + rc = message.get("reasoning_content") + if rc and isinstance(rc, str): + tokens += count_tokens(rc) + + # Tool calls (assistant only) + if role == "assistant": + tool_calls = message.get("tool_calls") + if tool_calls and isinstance(tool_calls, list): + for tc in tool_calls: + func = tc.get("function", {}) + tokens += count_tokens(func.get("name", "")) + tokens += count_tokens(func.get("arguments", "")) + + # Role overhead + tokens += OVERHEAD_PER_ROLE.get(role, 0) + return tokens + + +def estimate_tool_def_tokens(tools: List[Dict[str, Any]]) -> int: + """Estimate the token overhead of tool definitions in the prompt. + + The build_dsml_tool_prompt() function wraps tool definitions in DSML markdown + with extensive instructions. We use a 3x multiplier on raw JSON size as an approximation. + """ + if not tools: + return 0 + raw_text = json.dumps(tools, ensure_ascii=False) + raw_tokens = count_tokens(raw_text) + return raw_tokens * 3 # DSML wrapping expands ~3x + + +# ── Token breakdown diagnostics ──────────────────────────────────── + +def token_breakdown( + messages: List[Dict[str, Any]], + tools: Optional[List[Dict[str, Any]]] = None, +) -> Dict[str, Any]: + """Return a structured breakdown of token usage by category. + + Categories: system, tool_defs, history, tool_results, overhead. + """ + breakdown: Dict[str, Any] = { + "total": 0, + "system": 0, + "tool_defs": 0, + "history_user": 0, + "history_assistant": 0, + "tool_results": 0, + "overhead": BOS_OVERHEAD + ASST_TRAILER, + "message_count": len(messages), + "tool_count": len(tools) if tools else 0, + "by_message": [], + } + + for i, msg in enumerate(messages): + role = msg.get("role", "") + tokens = estimate_message_tokens(msg) + breakdown["total"] += tokens + breakdown["by_message"].append({"index": i, "role": role, "tokens": tokens}) + + if role == "system": + breakdown["system"] += tokens + elif role == "user": + breakdown["history_user"] += tokens + elif role == "assistant": + if msg.get("tool_calls"): + breakdown["tool_results"] += tokens + else: + breakdown["history_assistant"] += tokens + elif role == "tool": + breakdown["tool_results"] += tokens + + # Tool definition overhead + if tools: + tool_tokens = estimate_tool_def_tokens(tools) + breakdown["tool_defs"] = tool_tokens + breakdown["total"] += tool_tokens + + # Message role overhead + for msg in messages: + breakdown["overhead"] += OVERHEAD_PER_ROLE.get(msg.get("role", ""), 0) + breakdown["total"] += breakdown["overhead"] + + return breakdown + + +def format_token_breakdown(breakdown: Dict[str, Any]) -> str: + """Format token breakdown as a human-readable string.""" + lines = [ + f"Token breakdown ({breakdown['total']} total, {breakdown['message_count']} messages, " + f"{breakdown['tool_count']} tools):", + f" System/prompt: {breakdown['system']:>8} tokens", + f" Tool definitions: {breakdown['tool_defs']:>8} tokens", + f" History (user): {breakdown['history_user']:>8} tokens", + f" History (asst): {breakdown['history_assistant']:>8} tokens", + f" Tool results: {breakdown['tool_results']:>8} tokens", + f" Overhead: {breakdown['overhead']:>8} tokens", + ] + return "\n".join(lines) + + +# ── Pruning strategies ───────────────────────────────────────────── + +def _prune_single_pass( + messages: List[Dict[str, Any]], + max_prompt_tokens: int, +) -> Tuple[List[Dict[str, Any]], int, bool]: + """One pruning pass: remove the oldest non-essential message. + + Removal priority: + 1. Old non-system, non-last-user, non-after-last-user messages + 2. System message (last resort — only when nothing else can be removed) + + Protected (never removed): last user message, messages after last user. + + Returns (pruned, new_count, was_able_to_prune). + Returns was_able_to_prune=False when all remaining messages are protected. + """ + if len(messages) <= 1: + return list(messages), sum(estimate_message_tokens(m) for m in messages), False + + last_user_idx = -1 + for i in range(len(messages) - 1, -1, -1): + if messages[i].get("role") == "user": + last_user_idx = i + break + + removed = False + for i in range(len(messages)): + if messages[i].get("role") == "system": + continue + if i == last_user_idx: + continue + if last_user_idx >= 0 and i > last_user_idx: + continue + messages.pop(i) + removed = True + break + + if not removed: + for i in range(len(messages)): + if i == last_user_idx: + continue + if last_user_idx >= 0 and i > last_user_idx: + continue + messages.pop(i) + removed = True + break + + if not removed: + return messages, sum(estimate_message_tokens(m) for m in messages), False + + new_count = sum(estimate_message_tokens(m) for m in messages) + return messages, new_count, True + + +def prune_context( + messages: List[Dict[str, Any]], + max_tokens: int, + tools: Optional[List[Dict[str, Any]]] = None, + output_reserve_ratio: float = DEFAULT_OUTPUT_RESERVE_RATIO, +) -> Tuple[List[Dict[str, Any]], int, str]: + """Prune messages to fit within model context limit. + + Strategy (applied incrementally): + 1. Remove oldest non-system user-assistant turns one by one + 2. Strip reasoning_content from all assistant messages + 3. Truncate tool result content to 100 chars + 4. Truncate system message (remove tool prompt section) + + Returns: (pruned_messages, pruned_token_count, action_description) + """ + # Calculate budget + output_reserve = max( + MIN_OUTPUT_RESERVE, + min(MAX_OUTPUT_RESERVE, int(max_tokens * output_reserve_ratio)), + ) + budget = max_tokens - output_reserve + + # Include tool definition overhead in budget check + tool_overhead = estimate_tool_def_tokens(tools) if tools else 0 + effective_budget = max(budget - tool_overhead, 1024) + + pruned = list(messages) + current = sum(estimate_message_tokens(m) for m in pruned) + tool_overhead + actions: List[str] = [] + + if current <= effective_budget: + return pruned, current - tool_overhead, "within budget, no pruning" + + # Strategy 1: Remove oldest conversation turns + while len(pruned) > 1: + current = sum(estimate_message_tokens(m) for m in pruned) + tool_overhead + if current <= effective_budget: + break + pruned, new_count, could_prune = _prune_single_pass(pruned, effective_budget) + if not could_prune: + break + + removed = len(messages) - len(pruned) + if removed > 0: + actions.append(f"removed {removed} messages") + + current = sum(estimate_message_tokens(m) for m in pruned) + tool_overhead + + # Strategy 2: Strip reasoning_content from assistant messages + if current > effective_budget: + saved = 0 + for m in pruned: + if m.get("role") == "assistant" and m.get("reasoning_content"): + saved += count_tokens(m["reasoning_content"]) + m["reasoning_content"] = "" + current = sum(estimate_message_tokens(m) for m in pruned) + tool_overhead + if current <= effective_budget: + break + if saved > 0: + actions.append(f"stripped reasoning ({saved} tokens)") + + # Strategy 3: Truncate tool result content to 100 chars + if current > effective_budget: + saved = 0 + for m in pruned: + if m.get("role") == "tool": + content = str(m.get("content", "")) + if len(content) > 100: + old_tok = count_tokens(content) + m["content"] = content[:100] + "..." + saved += old_tok - count_tokens(m["content"]) + current = sum(estimate_message_tokens(m) for m in pruned) + tool_overhead + if current <= effective_budget: + break + if saved > 0: + actions.append(f"trimmed tool results ({saved} tokens)") + + # Strategy 4: Truncate system message (tool prompt injection section) + if current > effective_budget: + for m in pruned: + if m.get("role") == "system": + content = str(m.get("content", "")) + if "TOOL CALL FORMAT" in content: + old_tok = count_tokens(content) + # Keep only the part before tool instructions + before = content.split("TOOL CALL FORMAT")[0].strip() + m["content"] = before + "\n\n[Tool definitions truncated due to context limit.]" + saved = old_tok - count_tokens(str(m["content"])) + if saved > 0: + actions.append(f"truncated tool prompt ({saved} tokens)") + current = sum(estimate_message_tokens(m) for m in pruned) + tool_overhead + break + + final_count = sum(estimate_message_tokens(m) for m in pruned) + action_desc = ", ".join(actions) if actions else "no pruning needed" + return pruned, final_count, action_desc + + +def aggressive_prune( + messages: List[Dict[str, Any]], + max_tokens: int, +) -> Tuple[List[Dict[str, Any]], int, str]: + """Aggressive pruning for retry after upstream 'Content is too long' rejection. + + Keeps only: system message + last 1-2 conversation turns. + Strips all reasoning_content. + """ + budget = max(2048, max_tokens) + + system_msgs = [m for m in messages if m.get("role") == "system"] + non_system = [m for m in messages if m.get("role") != "system"] + + # Keep at most 4 non-system messages (≈ 2 user-assistant turns) + keep_count = min(len(non_system), 4) + keep = non_system[-keep_count:] if keep_count > 0 else [] + + # Remove reasoning from all assistant messages + for m in keep: + if m.get("role") == "assistant": + m["reasoning_content"] = "" + + pruned = system_msgs + keep + + # If still over budget, reduce to just system + last user + current = sum(estimate_message_tokens(m) for m in pruned) + if current > budget: + users = [m for m in pruned if m.get("role") == "user"] + if users: + pruned = system_msgs + [users[-1]] + current = sum(estimate_message_tokens(m) for m in pruned) + + # If STILL over budget (system too long), remove system too + if current > budget and system_msgs: + pruned = [m for m in pruned if m.get("role") != "system"] + + final_count = sum(estimate_message_tokens(m) for m in pruned) + removed = len(messages) - len(pruned) + return pruned, final_count, f"aggressive prune: removed {removed} messages ({current}→{final_count} tokens)" + + +# ── Main entry point ─────────────────────────────────────────────── + +def enforce_context_limit( + messages: List[Dict[str, Any]], + model_max_input: int, + tools: Optional[List[Dict[str, Any]]] = None, + output_reserve_ratio: float = DEFAULT_OUTPUT_RESERVE_RATIO, +) -> Tuple[List[Dict[str, Any]], int, bool, str]: + """Main entry point: enforce the context limit for a set of messages. + + Steps: + 1. Estimate total tokens (including tool definition overhead) + 2. If within budget, return unchanged + 3. If over budget, apply :func:`prune_context` + 4. Return pruned messages, final token count, whether pruning was needed, and description + + Args: + messages: List of OpenAI-format message dicts + model_max_input: The model's max_input_tokens from discovery + tools: Optional list of tool definitions (OpenAI format) + output_reserve_ratio: Fraction of context to reserve for model output (default 0.2) + + Returns: + Tuple of (messages, token_count, was_pruned, description) + """ + # Current estimate including tool overhead + tool_overhead = estimate_tool_def_tokens(tools) if tools else 0 + total = sum(estimate_message_tokens(m) for m in messages) + tool_overhead + + output_reserve = max( + MIN_OUTPUT_RESERVE, + min(MAX_OUTPUT_RESERVE, int(model_max_input * output_reserve_ratio)), + ) + max_prompt_tokens = model_max_input - output_reserve + # If model limit is so small that reserve consumes it all, use the bare minimum + if max_prompt_tokens <= 0: + max_prompt_tokens = max(1024, model_max_input // 2) + + logger.debug( + "Context check: total_est=%d max_input=%d reserve=%d budget=%d", + total, model_max_input, output_reserve, max_prompt_tokens, + ) + + if total <= max_prompt_tokens: + return messages, total, False, "within budget, no pruning needed" + + # Prune + pruned, pruned_count, action_desc = prune_context( + messages, model_max_input, tools, output_reserve_ratio, + ) + removed = len(messages) - len(pruned) + desc = f"pruned {removed} messages ({total}→{pruned_count} tokens): {action_desc}" + + # Only report as pruned if something actually changed + actually_pruned = removed > 0 or "stripped" in action_desc or "trimmed" in action_desc or "truncated" in action_desc + + if actually_pruned: + logger.info("Context pruned: %s", desc) + else: + desc = f"need pruning but could not: {desc}" + + return pruned, pruned_count, actually_pruned, desc + + +def retry_prune( + messages: List[Dict[str, Any]], + model_max_input: int, + was_aggressive: bool = False, +) -> Tuple[List[Dict[str, Any]], int, str]: + """Even more aggressive pruning for retry attempts. + + First call (was_aggressive=False): aggressive_prune + Second call (was_aggressive=True): keep only last user message, strip everything else + """ + if was_aggressive: + # Ultimate fallback: keep only last user message + users = [m for m in messages if m.get("role") == "user"] + pruned = [users[-1]] if users else [] + count = sum(estimate_message_tokens(m) for m in pruned) + return pruned, count, "ultimate fallback: only last user message" + + return aggressive_prune(messages, model_max_input) diff --git a/deploy.sh b/deploy.sh old mode 100644 new mode 100755 diff --git a/proxy.py b/proxy.py index 2f6cd87..4b823fb 100644 --- a/proxy.py +++ b/proxy.py @@ -22,6 +22,7 @@ def _count_tokens(text: str) -> int: from usage_store import add_usage, get_usage, clear_usage from session_store import needs_renewal, on_new_session, add_tokens, get_usage_status, get_expired_sessions, remove_old_session from response_store import save_response_record, get_response_record, delete_response_record, update_response_record +from context_manager import enforce_context_limit, token_breakdown, format_token_breakdown, retry_prune # ── 工具调用处理模块 ───────────────────────────────── from tool_call import ( @@ -1481,6 +1482,19 @@ def build_config(parsed: dict) -> dict: app.include_router(_anthropic_router) +# ── Path rewrite middleware ────────────────────────────────────── +# Some clients (e.g. Claude Code CLI) include /v1 in their base URL, +# causing double-prefixed paths like /v1/v1/messages. Rewrite these. +@app.middleware("http") +async def _rewrite_double_v1_prefix(request: Request, call_next): + path = request.scope.get("path", "") + if path.startswith("/v1/v1/"): + request.scope["path"] = path[3:] # strip leading /v1 → /v1/... + elif path == "/v1/v1": + request.scope["path"] = "/v1" + return await call_next(request) + + @app.on_event("startup") async def startup_discover(): """启动时自动刷新模型列表，清理过期会话。""" @@ -1823,6 +1837,17 @@ async def root(): return RedirectResponse(url="/admin") +@app.get("/v1") +async def v1_root(): + return {"api": "DeepSeek Proxy", "version": "1.0", "endpoints": ["/v1/chat/completions", "/v1/models", "/v1/messages"]} + + +@app.head("/v1") +async def v1_root_head(): + from starlette.responses import Response + return Response(status_code=200) + + @app.get("/admin", response_class=HTMLResponse) async def admin(): from starlette.responses import Response @@ -1970,9 +1995,15 @@ async def deepseek_login(data: dict): session_id = "" if session_resp.status_code == 200: session_data = session_resp.json() - biz = session_data.get("data", {}).get("biz_data", {}) - session_id = biz.get("chat_session", {}).get("id", "") or biz.get("id", "") - print(f"[Login] Session created: {session_id}") + data_block = session_data.get("data", {}) or {} + biz_code = data_block.get("biz_code", 0) + if biz_code != 0: + biz_msg = data_block.get("biz_msg", "") + print(f"[Login] Session create biz_code error: {biz_code} {biz_msg}") + else: + biz = data_block.get("biz_data", {}) + session_id = biz.get("chat_session", {}).get("id", "") or biz.get("id", "") + print(f"[Login] Session created: {session_id}") else: print(f"[Login] Session creation failed: {session_resp.status_code} {session_resp.text[:200]}") @@ -2174,6 +2205,7 @@ async def admin_models(): MODEL_CONFIG_URL = "https://chat.deepseek.com/api/v0/client/settings?scope=model" _models_cache = {} # model_id → (thinking, search, max_in, max_out) +_models_icl_cache = {} # model_id → input_character_limit (字符预算检查用) _models_cache_time = 0 _MODELS_TTL = 3600 # 缓存1小时 @@ -2217,13 +2249,14 @@ def _discover_models() -> dict: if not mt or not mc.get("enabled"): continue - # 上下文大小：优先从 input_character_limit 推算 (V4 系列 ≈ 1M tokens)， - # 对 Expert 等 UI 限制偏小的模型硬编码 1M + # 上下文大小：优先从 input_character_limit 推算 (V4 系列 ≈ 1M tokens)。 + # Expert (icl=163840) 等 icl 来自 UI 限制而非模型实际能力， + # V4 全系列原生支持 1M 上下文，故 icl<1M 时仍硬编码 1M。 icl = mc.get("input_character_limit", 0) or 0 if icl >= 1_000_000: max_in = int(icl * 0.4) # 2621440 × 0.4 ≈ 1048576 (1M) else: - max_in = 1_048_576 # Expert 等硬编码 1M + max_in = 1_048_576 # V4 全系列原生 1M 上下文 max_out = max_in # DeepSeek V4 输出上限即上下文大小 has_think = mc.get("think_feature") is not None has_search = mc.get("search_feature") is not None @@ -2231,22 +2264,27 @@ def _discover_models() -> dict: # 基础模型 name = f"deepseek-{mt}" if mt != "default" else "deepseek-default" models[name] = (False, False, max_in, max_out) - print(f"[模型发现] {name}: in={max_in}, out={max_out}, think={has_think}, search={has_search}") + # 缓存 icl 用于字符预算检查；icl=0 表示"无限制" + _models_icl_cache[name] = icl + print(f"[模型发现] {name}: in={max_in}, out={max_out}, icl={icl}, think={has_think}, search={has_search}") - # 思维链变体 + # 思维链变体（共享同源 icl） if has_think: tname = "deepseek-reasoner" if mt == "default" else f"deepseek-{mt}-reasoner" models[tname] = (True, False, max_in, max_out) + _models_icl_cache[tname] = icl # 搜索变体 if has_search: sname = "deepseek-search" if mt == "default" else f"deepseek-{mt}-search" models[sname] = (False, True, max_in, max_out) + _models_icl_cache[sname] = icl # 思考+联网 组合变体 if has_think and has_search: cname = "deepseek-reasoner-search" if mt == "default" else f"deepseek-{mt}-reasoner-search" models[cname] = (True, True, max_in, max_out) + _models_icl_cache[cname] = icl if models: # 模型名称为纯英文ID，中文对照见 README.md @@ -2294,8 +2332,8 @@ def relogin(cfg: dict) -> dict | None: if not email: return None login_payload["email"] = email - login_payload["mobile"] = "" - login_payload["area_code"] = "" + login_payload["mobile"] = None # Per API spec: null for unused field + login_payload["area_code"] = None elif login_type == "phone": mobile = cfg.get("_mobile", "") area_code = cfg.get("_area_code", "+86") @@ -2303,7 +2341,7 @@ def relogin(cfg: dict) -> dict | None: return None login_payload["mobile"] = mobile login_payload["area_code"] = area_code - login_payload["email"] = "" + login_payload["email"] = None # Per API spec: null for unused field else: return None @@ -2356,9 +2394,15 @@ def relogin(cfg: dict) -> dict | None: session_id = "" if session_resp.status_code == 200: session_data = session_resp.json() - biz = session_data.get("data", {}).get("biz_data", {}) - session_id = biz.get("chat_session", {}).get("id", "") or biz.get("id", "") - print(f"[Token] 新 session: {session_id}") + data_block = session_data.get("data", {}) or {} + biz_code = data_block.get("biz_code", 0) + if biz_code != 0: + biz_msg = data_block.get("biz_msg", "") + print(f"[Token] Session create biz_code error: {biz_code} {biz_msg}") + else: + biz = data_block.get("biz_data", {}) + session_id = biz.get("chat_session", {}).get("id", "") or biz.get("id", "") + print(f"[Token] 新 session: {session_id}") else: print(f"[Token] Session 创建失败: {session_resp.status_code}") @@ -2401,8 +2445,7 @@ def load_config_with_refresh() -> dict: # ── OpenAI 兼容 API ────────────────────────────────────── -@app.get("/v1/models") -async def models(): +def _build_model_list(): data = [] for mid, (think, search, mi, mo) in get_models().items(): data.append({ @@ -2414,6 +2457,17 @@ async def models(): }) return {"object": "list", "data": data} +# Both /v1/models and bare /models are needed: +# - /v1/models is the standard OpenAI path +# - /models is queried by tools like free-claude-code's DeepSeek provider +@app.get("/v1/models") +async def models(): + return _build_model_list() + +@app.get("/models") +async def models_bare(): + return _build_model_list() + @app.get("/v1/models/{model_id}") async def model_detail(model_id: str): @@ -2447,6 +2501,52 @@ async def refresh_models(): return {"object": "list", "data": data} +@app.post("/v1/context/debug") +async def context_debug(request: Request): + """Debug endpoint: analyze token usage for a given request payload without sending it. + + POST with JSON body like /v1/chat/completions: + { "messages": [...], "model": "...", "tools": [...] } + + Returns a token breakdown, pruning simulation results, and budget analysis. + Useful for diagnosing "Content is too long" errors before they happen. + """ + body = await request.json() + messages = body.get("messages", []) + tools = body.get("tools", None) + model = body.get("model", "deepseek-default") + + model_info = get_models().get(model) or get_models().get("deepseek-default") or (False, False, 1048576, 1048576) + _, _, max_input_tokens, _ = model_info + + breakdown = token_breakdown(messages, tools) + pruned, pruned_count, was_pruned, desc = enforce_context_limit(messages, max_input_tokens, tools) + + result = { + "model": model, + "max_input_tokens": max_input_tokens, + "message_count": len(messages), + "tool_count": len(tools) if tools else 0, + "token_breakdown": breakdown, + "formatted": format_token_breakdown(breakdown), + "within_limit": not was_pruned, + "pruned": was_pruned, + "prune_description": desc, + "pruned_message_count": len(pruned) if was_pruned else None, + "pruned_token_count": pruned_count if was_pruned else None, + } + + # Also show the most aggressive retry outcome + aggressive_msgs, agg_count, agg_desc = retry_prune(messages, max_input_tokens, was_aggressive=False) + result["retry_simulation"] = { + "aggressive_prune_description": agg_desc, + "aggressive_prune_tokens": agg_count, + "aggressive_prune_messages": len(aggressive_msgs), + } + + return result + + def build_request_headers(cfg: dict, session_id: str) -> dict: """Build headers for DeepSeek API request, excluding stale PoW and conflict headers.""" # Start from saved headers @@ -2492,20 +2592,203 @@ def get_pow_response(target_path: str = "/api/v0/chat/completion", ) if resp.status_code == 200: data = resp.json() - challenge = data.get("data", {}).get("biz_data", {}).get("challenge", {}) + outer = data.get("data") or {} + biz_code = outer.get("biz_code", 0) + if biz_code != 0: + print(f"[PoW] biz_code={biz_code} biz_msg={outer.get('biz_msg','?')}") + return None + challenge = outer.get("biz_data", {}).get("challenge", {}) if challenge: pow_response = pow_solver.solve_challenge(challenge) print(f"[PoW] Solved: {pow_response[:50]}...") return pow_response else: - print(f"[PoW] No challenge: {data}") + print(f"[PoW] No challenge: biz_code={biz_code} data={data}") else: - print(f"[PoW] Request failed {resp.status_code}: {resp.text[:200]}") + print(f"[PoW] Request failed {resp.status_code}: {resp.text[:200]}") except Exception as e: print(f"[PoW] Error: {e}") return None +# ── 停止流式输出 ────────────────────────────────────────── + +def stop_deepseek_stream(cfg: dict, message_id: int) -> bool: + """Call DeepSeek stop_stream to cancel an in-progress generation.""" + session_id = cfg.get("session_id", "") + if not session_id or not message_id: + return False + try: + headers = build_request_headers(cfg, session_id) + resp = cffi_requests.post( + "https://chat.deepseek.com/api/v0/chat/stop_stream", + headers=headers, + json={"chat_session_id": session_id, "message_id": message_id}, + impersonate="chrome120", + timeout=10, + ) + if resp.status_code == 200: + print(f"[StopStream] Stopped message_id={message_id}") + return True + else: + print(f"[StopStream] Failed ({resp.status_code}): {resp.text[:100]}") + return False + except Exception as e: + print(f"[StopStream] Error: {e}") + return False + + +# ── 编辑消息 ──────────────────────────────────────────── + +def edit_deepseek_message(cfg: dict, message_id: int, prompt: str, + thinking_enabled: bool, search_enabled: bool) -> dict | None: + """Edit a previous message via DeepSeek's edit_message endpoint. + + API: POST /api/v0/chat/edit_message + Requires PoW (target_path: /api/v0/chat/edit_message). + Returns response containing headers for the caller to read SSE stream. + """ + session_id = cfg.get("session_id", "") + if not session_id or not message_id: + return None + try: + headers = build_request_headers(cfg, session_id) + pow_response = get_pow_response(target_path="/api/v0/chat/edit_message", cfg=cfg) + if pow_response: + headers["x-ds-pow-response"] = pow_response + + resp = cffi_requests.post( + "https://chat.deepseek.com/api/v0/chat/edit_message", + headers=headers, + json={ + "chat_session_id": session_id, + "message_id": message_id, + "prompt": prompt, + "search_enabled": search_enabled, + "thinking_enabled": thinking_enabled, + }, + impersonate="chrome120", + stream=True, + timeout=120, + ) + return resp + except Exception as e: + print(f"[EditMessage] Error: {e}") + return None + + +# ── 编辑消息 HTTP 端点 ───────────────────────────────────── + +@app.post("/v1/chat/edit_message") +async def edit_message_endpoint(request: Request): + """编辑最后一条用户消息并重新生成回复。 + + 请求体: + message_id (int): DeepSeek 消息 ID + prompt (str): 新提示词 + model (str, optional): 模型名(默认 deepseek-default) + + 返回: OpenAI 兼容的 SSE 流式响应。 + """ + account = config_manager.get_next_account() + if not account: + raise HTTPException(503, detail="没有可用账号，请先访问 /admin 添加并登录账号") + + body = await request.json() + message_id = body.get("message_id") + prompt = body.get("prompt", "") + model = body.get("model", "deepseek-default") + + if not message_id or not prompt: + raise HTTPException(400, detail="message_id and prompt are required") + + model_info = get_models().get(model) or get_models().get("deepseek-default") or (False, False, 1048576, 1048576) + thinking_enabled, search_enabled, _, _ = model_info + + cfg = { + "token": account.token, + "session_id": account.session_id, + "headers": dict(account.headers), + "cookie": account.cookie, + "account_label": account.account_label, + } + + resp = edit_deepseek_message(cfg, message_id, prompt, thinking_enabled, search_enabled) + if resp is None: + raise HTTPException(502, detail="编辑消息失败：无法连接到 DeepSeek") + + if resp.status_code != 200: + body_sample = "" + try: + body_sample = resp.text[:500] if hasattr(resp, "text") else f"(status={resp.status_code})" + except Exception: + body_sample = f"(body unreadable, status={resp.status_code})" + raise HTTPException(502, detail=f"DeepSeek edit_message error {resp.status_code}: {body_sample[:200]}") + + chat_id = f"chatcmpl-{uuid.uuid4().hex[:12]}" + created = int(time.time()) + + async def _stream_edit_response(): + yield f'data: {json.dumps({"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, "choices": [{"index": 0, "delta": {"role": "assistant", "content": None}, "finish_reason": None}]})}\n\n' + try: + for line in resp.iter_lines(): + if not line: + continue + decoded = line.decode("utf-8", errors="ignore").strip() + if not decoded.startswith("data:"): + continue + data_str = decoded[5:].strip() + if not data_str: + continue + try: + obj = json.loads(data_str) + except json.JSONDecodeError: + continue + val = obj.get("v") + path = obj.get("p", "") + + if path in ("response/status",) or (isinstance(val, dict) and val.get("type") == "error" and val.get("finish_reason")): + if isinstance(val, dict) and val.get("type") == "error": + yield f'data: {json.dumps({"error": {"message": val.get("content", ""), "type": "server_error", "code": val.get("finish_reason", "")}})}\n\n' + yield "data: [DONE]\n\n" + return + continue + + if path == "response/thinking_content" or path == "response/content": + if isinstance(val, str) and val: + key = "reasoning_content" if path == "response/thinking_content" else "content" + r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, + "choices": [{"index": 0, "delta": {key: val}, "finish_reason": None}]} + yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' + elif isinstance(val, str) and val: + r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, + "choices": [{"index": 0, "delta": {"content": val}, "finish_reason": None}]} + yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' + resp_data = val.get("response", {}) if isinstance(val, dict) else {} + if isinstance(resp_data, dict): + frags = resp_data.get("fragments", []) + if frags and isinstance(frags, list): + for frag in frags: + if isinstance(frag, dict): + ftype = frag.get("type", "") + fcontent = frag.get("content", "") + if fcontent and isinstance(fcontent, str): + key = "reasoning_content" if ftype == "THINK" else "content" + r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, + "choices": [{"index": 0, "delta": {key: fcontent}, "finish_reason": None}]} + yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' + + yield f'data: {json.dumps({"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, "choices": [{"index": 0, "delta": {}, "finish_reason": "stop"}]})}\n\n' + yield "data: [DONE]\n\n" + except Exception as e: + print(f"[EditMessage] Stream error: {e}") + yield f'data: {json.dumps({"error": {"message": str(e), "type": "server_error"}})}\n\n' + yield "data: [DONE]\n\n" + + return StreamingResponse(_stream_edit_response(), media_type="text/event-stream", + headers={"Cache-Control": "no-cache, no-transform", "X-Accel-Buffering": "no"}) + + # ── 文件上传（Vision 模型支持）────────────────────────────── def upload_file_to_deepseek(file_data: bytes, filename: str, content_type: str = "image/png", @@ -2548,11 +2831,15 @@ def upload_file_to_deepseek(file_data: bytes, filename: str, content_type: str = ) if resp.status_code == 200: data = resp.json() - file_id = (data.get("data", {}) - .get("biz_data", {}) + data_block = data.get("data", {}) or {} + biz_code = data_block.get("biz_code", 0) + if biz_code != 0: + biz_msg = data_block.get("biz_msg", "") + _vlog(f"upload biz_code error: {biz_code} {biz_msg}") + return None + file_id = (data_block.get("biz_data", {}) .get("id", "") - or data.get("data", {}) - .get("id", "")) + or data_block.get("id", "")) if file_id: _vlog(f"upload OK: {filename} -> {file_id}") return file_id @@ -2569,11 +2856,21 @@ def upload_file_to_deepseek(file_data: bytes, filename: str, content_type: str = def _delete_deepseek_session(token: str, session_id: str) -> bool: """调用 DeepSeek API 删除指定会话。""" try: - headers = {**DS_HEADERS, "authorization": f"Bearer {token}"} + # 使用和浏览器一致的 headers，确保 WAF 通过 + delete_headers = { + **DS_HEADERS, + "accept": "*/*", + "accept-language": "en-US,en;q=0.9", + "authorization": f"Bearer {token}", + "priority": "u=1, i", + "x-app-version": "2.0.0", + "x-client-locale": "en_US", + "x-client-timezone-offset": str(-time.timezone // 60), + } resp = cffi_requests.post( "https://chat.deepseek.com/api/v0/chat_session/delete", json={"chat_session_id": session_id}, - headers=headers, + headers=delete_headers, impersonate="chrome120", timeout=15, ) @@ -2847,9 +3144,36 @@ async def chat(request: Request): print(msg, flush=True) _vlog(msg) + # Debug: log the incoming OpenAI-format request for troubleshooting "Content is too long" + try: + body_json = await request.json() + body_str = json.dumps(body_json, ensure_ascii=False) + total_chars = len(body_str) + # Log total char size and a summary of message roles + sizes + msgs_info = [] + for i, m in enumerate(messages): + role = m.get("role", "?") + content = m.get("content", "") + if isinstance(content, str): + csize = len(content) + elif isinstance(content, list): + csize = sum(len(p.get("text", "")) for p in content if isinstance(p, dict)) + else: + csize = len(str(content)) + msgs_info.append(f"{i}:{role}={csize}") + print(f"[REQ_BODY] total_chars={total_chars} msgs_summary={' '.join(msgs_info[-10:])} last_role={messages[-1].get('role','?') if messages else '?'} last_size={msgs_info[-1].split('=')[-1] if msgs_info else '?'}", flush=True) + except Exception as e: + print(f"[REQ_BODY] failed: {e}", flush=True) + # 模型映射 - model_info = get_models().get(model, get_models().get("deepseek-default")) - thinking_enabled, search_enabled, _, _ = model_info + model_info = get_models().get(model) or get_models().get("deepseek-default") or (False, False, 1048576, 1048576) + thinking_enabled, search_enabled, max_input_tokens, _ = model_info + # 字符级预算：使用 DeepSeek 返回的 input_character_limit，而非从 token 数反推（后者可能高估 16x） + model_icl = _models_icl_cache.get(model) or _models_icl_cache.get("deepseek-default", 0) or 0 + if model_icl: + print(f"[Budget] model={model} max_input_tokens={max_input_tokens} icl={model_icl}") + else: + print(f"[Budget] model={model} max_input_tokens={max_input_tokens} icl=N/A (unlimited)") cfg = { "token": account.token, @@ -2912,15 +3236,22 @@ async def chat(request: Request): "https://chat.deepseek.com/api/v0/chat_session/create", json={}, headers=auth_h, impersonate="chrome120", timeout=15) if sess_resp.status_code == 200: - biz = sess_resp.json().get("data", {}).get("biz_data", {}) - new_sid = biz.get("chat_session", {}).get("id", "") or biz.get("id", "") - if new_sid: - old_sid = cfg.get("session_id", "") - cfg = dict(cfg) - cfg["session_id"] = new_sid - if old_sid and old_sid != new_sid: - on_new_session(account_label, new_sid, model) - _vlog(f"vision fresh session: {new_sid}") + session_data = sess_resp.json() + data_block = session_data.get("data", {}) or {} + biz_code = data_block.get("biz_code", 0) + if biz_code != 0: + biz_msg = data_block.get("biz_msg", "") + _vlog(f"vision fresh session biz_code error: {biz_code} {biz_msg}") + else: + biz = data_block.get("biz_data", {}) + new_sid = biz.get("chat_session", {}).get("id", "") or biz.get("id", "") + if new_sid: + old_sid = cfg.get("session_id", "") + cfg = dict(cfg) + cfg["session_id"] = new_sid + if old_sid and old_sid != new_sid: + on_new_session(account_label, new_sid, model) + _vlog(f"vision fresh session: {new_sid}") except Exception as e: _vlog(f"fresh session failed: {e}") @@ -2928,6 +3259,43 @@ async def chat(request: Request): prompt = convert_messages_for_deepseek(messages, tools) prompt_tokens = _count_tokens(prompt) + pruned_messages, _, was_pruned, prune_desc = enforce_context_limit( + messages, max_input_tokens, tools + ) + if was_pruned: + prompt = convert_messages_for_deepseek(pruned_messages, tools) + prompt_tokens = _count_tokens(prompt) + print(f"[Context] {prune_desc}") + + breakdown = token_breakdown(messages if not was_pruned else pruned_messages, tools) + _vlog(f"TOKEN_BREAKDOWN: {json.dumps(breakdown, ensure_ascii=False)}") + print(f"[Tokens] model={model} max_input={max_input_tokens} prompt_tokens={prompt_tokens} msgs={len(messages)} pruned={was_pruned}") + + # Character budget check: DeepSeek enforces input_character_limit (icl) at the character level. + # Token-based budget can overestimate capacity for English-heavy text because tiktoken's + # cl100k_base counts ~4 chars/token for English, but icl→tokens uses 2.5 chars/token factor. + prompt_chars = len(prompt) + if model_icl > 0: + # Use the actual input_character_limit reported by DeepSeek. + # Reserve a small portion (~5%) for output framing. + char_budget = int(model_icl * 0.95) + char_budget_source = "icl" + else: + # Fallback: derive from max_input_tokens (1M tokens → ~2.6M chars, minus 20% reserve) + max_chars_from_tokens = int(max_input_tokens / 0.4) if max_input_tokens else 2_621_440 + char_output_reserve = max(1024, min(16384, int(max_chars_from_tokens * 0.2))) + char_budget = max_chars_from_tokens - char_output_reserve + char_budget_source = "token-derived" + if prompt_chars > char_budget: + char_token_budget = max(4096, int(char_budget * 0.4)) + pruned_messages, _, prune_desc = retry_prune( + pruned_messages, char_token_budget, was_aggressive=False + ) + prompt = convert_messages_for_deepseek(pruned_messages, tools) + prompt_tokens = _count_tokens(prompt) + print(f"[Context] char-limit prune ({char_budget_source}: budget={char_budget} prompt_chars={prompt_chars}>{char_budget}): {prune_desc}") + print(f"[Tokens] after char-prune: prompt_tokens={prompt_tokens} prompt_chars={len(prompt)}") + # 会话管理：token 超限时自动建新 DeepSeek session if needs_renewal(account_label): status = get_usage_status(account_label) @@ -2940,26 +3308,55 @@ async def chat(request: Request): "https://chat.deepseek.com/api/v0/chat_session/create", json={}, headers=auth_h, impersonate="chrome120", timeout=15) if sess_resp.status_code == 200: - biz = sess_resp.json().get("data", {}).get("biz_data", {}) - new_sid = biz.get("chat_session", {}).get("id", "") or biz.get("id", "") - if new_sid: - cfg = dict(cfg) - cfg["session_id"] = new_sid - config_manager.update_account(account_label, session_id=new_sid) - on_new_session(account_label, new_sid, model) - print(f"[Session] {account_label} new session: {new_sid}") + session_data = sess_resp.json() + data_block = session_data.get("data", {}) or {} + biz_code = data_block.get("biz_code", 0) + if biz_code != 0: + biz_msg = data_block.get("biz_msg", "") + print(f"[Session] {account_label} session create biz_code error: {biz_code} {biz_msg}") + else: + biz = data_block.get("biz_data", {}) + new_sid = biz.get("chat_session", {}).get("id", "") or biz.get("id", "") + if new_sid: + cfg = dict(cfg) + cfg["session_id"] = new_sid + config_manager.update_account(account_label, session_id=new_sid) + on_new_session(account_label, new_sid, model) + print(f"[Session] {account_label} new session: {new_sid}") except Exception as e: print(f"[Session] Failed to create new session: {e}") has_tools = bool(tools) - # Try streaming for all models including vision with images. - # Old issue: vision stream put everything in thinking_content, but the new - # fragments format (THINK/RESPONSE) should handle this correctly now. - - result = _do_chat(cfg, prompt, model, thinking_enabled, search_enabled, stream, - is_retry=False, has_tools=has_tools, tools=tools, - ref_file_ids=ref_file_ids) + max_retries = 1 + for attempt in range(max_retries + 1): + try: + result = _do_chat(cfg, prompt, model, thinking_enabled, search_enabled, stream, + is_retry=(attempt > 0), has_tools=has_tools, tools=tools, + ref_file_ids=ref_file_ids, messages=messages, max_input_tokens=max_input_tokens) + if not stream: + break + break + except HTTPException as e: + if attempt >= max_retries: + raise + error_detail = e.detail + if isinstance(error_detail, dict): + error_msg = str(error_detail.get("error", {}).get("message", "")) + else: + error_msg = str(error_detail) + if "Content is too long" not in error_msg and "too long" not in error_msg: + raise + # Log the trigger details for debugging + prompt_chars = len(prompt) + print(f"[TOO_LONG] model={model} prompt_chars={prompt_chars} prompt_tokens={prompt_tokens} msgs={len(messages)} max_input={max_input_tokens} attempt={attempt}") + print(f"[TOO_LONG] prompt_preview[:500]={prompt[:500]}") + print(f"[TOO_LONG] prompt_preview[-500:]={prompt[-500:]}") + pruned_msgs, _, retry_desc = retry_prune(messages, max_input_tokens, was_aggressive=(attempt > 0)) + prompt = convert_messages_for_deepseek(pruned_msgs, tools) + prompt_tokens = _count_tokens(prompt) + print(f"[Retry] {retry_desc}") + _vlog(f"RETRY: attempt={attempt + 1} prompt_tokens={prompt_tokens} msgs={len(pruned_msgs)}") # (Vision SSE wrapper removed — all models now stream directly via fragments format) @@ -3708,7 +4105,7 @@ async def delete_response(response_id: str): return {"id": response_id, "object": "response", "deleted": True} -def _do_chat(cfg, prompt, model, thinking_enabled, search_enabled, stream, is_retry=False, has_tools=False, tools=None, ref_file_ids=None): +def _do_chat(cfg, prompt, model, thinking_enabled, search_enabled, stream, is_retry=False, has_tools=False, tools=None, ref_file_ids=None, messages=None, max_input_tokens=None): """核心聊天逻辑，支持 token 过期后重试 DeepSeek SSE 流结构（thinking_enabled=True 时）： @@ -3764,14 +4161,38 @@ def _parse_sse(resp): # Pre-flight: check Content-Type — if DeepSeek returns HTML/text instead of SSE, # treat the entire response as an error to avoid silent data loss ct = resp.headers.get("content-type", "") - if ct and "text/event-stream" not in ct and "application/json" not in ct: + if ct and "text/event-stream" not in ct: + # Read body from stream — resp.text may be empty for stream=True responses body_sample = "" try: - body_sample = resp.text[:300] if hasattr(resp, "text") else "" + body_chunks = [] + for chunk in resp.iter_content(chunk_size=4096): + if chunk: + body_chunks.append(chunk) + if body_chunks: + body_sample = b"".join(body_chunks).decode("utf-8", errors="ignore")[:500] except Exception: pass + error_msg = f"DeepSeek returned non-SSE response (Content-Type: {ct}): {body_sample}" + if body_sample: + try: + err_data = json.loads(body_sample) + # Try nested DeepSeek error format: {"data": {"biz_code": N, "biz_msg": "..."}} + data_block = err_data.get("data", {}) or {} + biz_code = data_block.get("biz_code", 0) + if biz_code != 0: + biz_msg = data_block.get("biz_msg", "") + error_msg = f"DeepSeek biz_code error {biz_code}: {biz_msg or body_sample[:200]}" + else: + # Try top-level error format: {"code": N, "msg": "..."} + top_code = err_data.get("code", 0) + if top_code and int(top_code) >= 40000: + top_msg = err_data.get("msg", "") or err_data.get("message", "") + error_msg = f"DeepSeek error {top_code}: {top_msg or body_sample[:200]}" + except (json.JSONDecodeError, TypeError): + pass yield ("error", { - "message": f"DeepSeek returned non-SSE response (Content-Type: {ct}): {body_sample}", + "message": error_msg, "code": "bad_content_type" }) return @@ -3781,6 +4202,8 @@ def _parse_sse(resp): phase = "thinking" # New format: track fragment type (THINK/RESPONSE) from metadata events fragment_type = None # None = old format (use phase), "THINK"/"RESPONSE" = new format + # Track SSE event type across lines (e.g. event: hint → data: {...}) + _current_sse_event = "" _line_buf = b"" def _read_lines(): nonlocal _line_buf @@ -3802,18 +4225,29 @@ def _read_lines(): if thinking_enabled and line.startswith("data:") and "fragments" in line: _vlog(f"SSE_LINE: {line[:500]}") - # Skip event: lines (title, update_session, etc.) + # ── Handle event: lines ── + # SSE events carry semantic meaning: finish (stream complete), + # close (session end), hint (error/info), toast (error notification) if line.startswith("event:"): - if line.startswith("event: hint"): - continue # handled below via raw line processing + _current_sse_event = line[6:].strip() + # Terminal events — signal stream end immediately + if _current_sse_event in ("finish", "close"): + yield ("done", "") + return + # Non-terminal events wait for following data: line continue + # Reset event tracker after each non-event line (data: lines or raw lines) + # But keep it if we're expecting a data: line after an event + if not line.startswith("data:") and not line.startswith("{"): + _current_sse_event = "" + # Detect raw text/HTML error responses if line.startswith("= 3: @@ -3844,12 +4278,44 @@ def _read_lines(): if not isinstance(obj, dict): continue - # Error object: {"type": "error", "content": "...", "finish_reason": "..."} + # Ready event: first SSE event carrying message IDs for stop_stream + if _current_sse_event == "ready": + meta = {"type": "ready"} + if obj.get("response_message_id") is not None: + meta["response_message_id"] = obj["response_message_id"] + if obj.get("request_message_id") is not None: + meta["request_message_id"] = obj["request_message_id"] + _current_sse_event = "" + yield ("meta", meta) + continue + + # Toast/hint event: server-side notifications + if _current_sse_event in ("toast", "hint"): + toast_type = obj.get("type", "") + if toast_type == "error": + content = obj.get("content", "") + fr = obj.get("finish_reason", "") + clear_resp = obj.get("clear_response", False) + error_info = {"message": content or "DeepSeek server error", "code": fr or "server_error"} + if clear_resp: + error_info["clear_response"] = True + _current_sse_event = "" + yield ("error", error_info) + return + # Info-type hints: ignore and continue + _current_sse_event = "" + continue + + # Error object: {"type": "error", "content": "...", "clear_response": true/false, "finish_reason": "..."} obj_type = obj.get("type", "") if obj_type == "error": content = obj.get("content", "") fr = obj.get("finish_reason", "") - yield ("error", {"message": content, "code": fr}) + clear_resp = obj.get("clear_response", False) + error_info = {"message": content, "code": fr} + if clear_resp: + error_info["clear_response"] = True + yield ("error", error_info) return val = obj.get("v") @@ -3952,6 +4418,7 @@ def _read_lines(): def do_stream(): """SSE streaming for OpenAI-compatible clients.""" + response_message_id = 0 # For stop_stream on client disconnect try: resp = cffi_requests.post( "https://chat.deepseek.com/api/v0/chat/completion", @@ -3983,6 +4450,10 @@ def do_stream(): if resp.status_code != 200: error_msg = f"DeepSeek returned {resp.status_code}: {resp.text[:300]}" print(f"[Error] {error_msg}") + if "too long" in error_msg.lower(): + print(f"[TOO_LONG][STREAM_HTTP] model={model} prompt_chars={len(prompt)} error={error_msg[:300]}", flush=True) + print(f"[TOO_LONG][STREAM_HTTP] prompt_preview[:500]={prompt[:500]}", flush=True) + print(f"[TOO_LONG][STREAM_HTTP] prompt_preview[-500:]={prompt[-500:]}", flush=True) yield f'data: {json.dumps({"error": {"message": error_msg, "type": "server_error", "code": resp.status_code}})}\n\n' yield "data: [DONE]\n\n" return @@ -4010,15 +4481,20 @@ def _emit_tool_calls(tc_result, _cid, _created, _model): "choices": [{"index": 0, "delta": {}, "finish_reason": "stop"}]} yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' - # 流式筛分 + 并行缓冲：筛分实时播正文，同时攒完整内容做 fallback - def _parse_fn(text): - return extract_tool_call(text, get_tool_names(tools) if tools else []) + # 流式筛分 + 并行缓冲：筛分实时播正文，同时攒完整内容做 fallback + def _parse_fn(text): + return extract_tool_call(text, get_tool_names(tools) if tools else []) - sieve = StreamSieve(parse_fn=_parse_fn) - _role_sent = False - _full_buf = "" # 并行缓冲完整内容，flush 时 fallback 解析 + sieve = StreamSieve(parse_fn=_parse_fn) + _role_sent = False + _full_buf = "" + try: for etype, val in _parse_sse(resp): + if etype == "meta": + if val.get("type") == "ready": + response_message_id = val.get("response_message_id", 0) + continue if etype == "content": _full_buf += val for evt in sieve.feed(val): @@ -4037,81 +4513,261 @@ def _parse_fn(text): "choices": [{"index": 0, "delta": {"reasoning_content": val}, "finish_reason": None}]} yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' elif etype == "error": + err_msg = val.get("message", "") + err_code = val.get("code", "") + if "too long" in err_msg.lower() or err_code == "bad_content_type": + if "too long" in err_msg.lower(): + print(f"[TOO_LONG][STREAM] model={model} prompt_chars={len(prompt)} error={err_msg}", flush=True) + print(f"[TOO_LONG][STREAM] prompt_preview[:500]={prompt[:500]}", flush=True) + print(f"[TOO_LONG][STREAM] prompt_preview[-500:]={prompt[-500:]}", flush=True) + # Inline retry: prune, rebuild prompt, and make fresh HTTP request directly + # (bypasses StreamingResponse wrapping which would create an async generator) + if messages is not None and not is_retry: + print(f"[STREAM_RETRY] attempting retry ({err_code}: {err_msg[:80]})...", flush=True) + from proxy import retry_prune as _rp, convert_messages_for_deepseek as _cmd + # Strategy 1: Create a fresh DeepSeek session (session accumulation is root cause) + retry_cfg = dict(cfg) + fresh_session_sid = None + try: + pow_resp = get_pow_response() + fresh_headers = dict(req_headers) + if pow_resp: + fresh_headers["x-ds-pow-response"] = pow_resp + sess_resp = cffi_requests.post( + "https://chat.deepseek.com/api/v0/chat_session/create", + json={}, headers=fresh_headers, impersonate="chrome120", timeout=15 + ) + if sess_resp.status_code == 200: + sess_data = sess_resp.json() + data_block = sess_data.get("data", {}) or {} + biz_code = data_block.get("biz_code", 0) + if biz_code == 0: + biz = data_block.get("biz_data", {}) + fresh_session_sid = biz.get("chat_session", {}).get("id", "") or biz.get("id", "") + if fresh_session_sid: + retry_cfg["session_id"] = fresh_session_sid + new_req_body = dict(req_body) + new_req_body["chat_session_id"] = fresh_session_sid + retry_resp = cffi_requests.post( + "https://chat.deepseek.com/api/v0/chat/completion", + headers=fresh_headers, + json=new_req_body, + impersonate="chrome120", + stream=True, + timeout=120, + ) + if retry_resp.status_code == 200: + ct = retry_resp.headers.get("content-type", "") + if "text/event-stream" in ct: + print(f"[STREAM_RETRY] fresh session {fresh_session_sid} OK", flush=True) + _stream_ok = False + for etype, val in _parse_sse(retry_resp): + if etype == "content": + _stream_ok = True + r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, + "choices": [{"index": 0, "delta": {"content": sanitize_leaked_output(val)}, "finish_reason": None}]} + yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' + elif etype == "thinking": + _stream_ok = True + r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, + "choices": [{"index": 0, "delta": {"reasoning_content": val}, "finish_reason": None}]} + yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' + elif etype == "error": + print(f"[STREAM_RETRY] fresh session also errored: {val.get('message','')}", flush=True) + elif etype == "done": + break + if _stream_ok: + yield "data: [DONE]\n\n" + return + else: + body_sample = retry_resp.text[:500] if hasattr(retry_resp, "text") else "" + print(f"[STREAM_RETRY] fresh session non-SSE (ct={ct}): {body_sample}", flush=True) + else: + body_sample = retry_resp.text[:500] if hasattr(retry_resp, "text") else "" + print(f"[STREAM_RETRY] fresh session HTTP {retry_resp.status_code}: {body_sample}", flush=True) + except Exception as sess_err: + print(f"[STREAM_RETRY] fresh session failed: {sess_err}", flush=True) + # Strategy 2: Ultimate fallback — keep only last user message + print(f"[STREAM_RETRY] ultimate fallback: keep only last user message", flush=True) + users = [m for m in messages if m.get("role") == "user"] + pruned_msgs = [users[-1]] if users else [] + fallback_prompt = _cmd(pruned_msgs, tools) + fallback_tokens = _count_tokens(fallback_prompt) + print(f"[STREAM_RETRY] ultimate fallback: {len(pruned_msgs)} msgs, {fallback_tokens} tokens", flush=True) + try: + fallback_req = dict(req_body) + fallback_req["prompt"] = fallback_prompt + if fresh_session_sid: + fallback_req["chat_session_id"] = fresh_session_sid + # Get fresh PoW response — original req_headers PoW may be stale by now + fallback_pow = get_pow_response() + fallback_headers = dict(req_headers) + if fallback_pow: + fallback_headers["x-ds-pow-response"] = fallback_pow + fallback_resp = cffi_requests.post( + "https://chat.deepseek.com/api/v0/chat/completion", + headers=fallback_headers, + json=fallback_req, + impersonate="chrome120", + stream=True, + timeout=120, + ) + if fallback_resp.status_code == 200: + _fb_ok = False + for etype, val in _parse_sse(fallback_resp): + if etype == "content": + _fb_ok = True + r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, + "choices": [{"index": 0, "delta": {"content": sanitize_leaked_output(val)}, "finish_reason": None}]} + yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' + elif etype == "thinking": + _fb_ok = True + r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, + "choices": [{"index": 0, "delta": {"reasoning_content": val}, "finish_reason": None}]} + yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' + elif etype == "error": + print(f"[STREAM_RETRY] fallback also failed: {val.get('message','')}", flush=True) + elif etype == "done": + break + if _fb_ok: + yield "data: [DONE]\n\n" + return + except Exception as fb_err: + print(f"[STREAM_RETRY] fallback exception: {fb_err}", flush=True) + # Strategy 3: Re-login + fresh session (invalid-token recovery) + if not is_retry: + print(f"[STREAM_RETRY] strategy 3: relogin...", flush=True) + try: + new_cfg = relogin(cfg) + if new_cfg: + auth_h = new_cfg.get("headers", {}) + pow_r = get_pow_response() + rl_headers = dict(auth_h) + if pow_r: + rl_headers["x-ds-pow-response"] = pow_r + # Create fresh session with re-logged-in token + rl_sess_resp = cffi_requests.post( + "https://chat.deepseek.com/api/v0/chat_session/create", + json={}, headers=rl_headers, impersonate="chrome120", timeout=15 + ) + if rl_sess_resp.status_code == 200: + rl_sess_data = rl_sess_resp.json() + rl_data_block = rl_sess_data.get("data", {}) or {} + if rl_data_block.get("biz_code", 0) == 0: + rl_biz = rl_data_block.get("biz_data", {}) + rl_sid = rl_biz.get("chat_session", {}).get("id", "") or rl_biz.get("id", "") + if rl_sid: + rl_req = dict(req_body) + rl_req["chat_session_id"] = rl_sid + rl_resp = cffi_requests.post( + "https://chat.deepseek.com/api/v0/chat/completion", + headers=rl_headers, json=rl_req, + impersonate="chrome120", stream=True, timeout=120, + ) + if rl_resp.status_code == 200 and "text/event-stream" in rl_resp.headers.get("content-type", ""): + print(f"[STREAM_RETRY] relogin+session OK", flush=True) + _rl_ok = False + for etype, val in _parse_sse(rl_resp): + if etype == "content": + _rl_ok = True + r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, + "choices": [{"index": 0, "delta": {"content": sanitize_leaked_output(val)}, "finish_reason": None}]} + yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' + elif etype == "thinking": + _rl_ok = True + r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, + "choices": [{"index": 0, "delta": {"reasoning_content": val}, "finish_reason": None}]} + yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' + elif etype == "error": + print(f"[STREAM_RETRY] relogin retry also errored: {val.get('message','')}", flush=True) + elif etype == "done": + break + if _rl_ok: + yield "data: [DONE]\n\n" + return + except Exception as rl_err: + print(f"[STREAM_RETRY] relogin retry exception: {rl_err}", flush=True) + if val.get("clear_response"): + _role_sent = True + _full_buf = "" yield f'data: {json.dumps({"error": {"message": val["message"], "type": "server_error", "code": val.get("code")}})}\n\n' yield "data: [DONE]\n\n" return elif etype == "done": break - - # Flush + fallback：筛分没抓到就用全量解析 - _had_tool_calls = False - for evt in sieve.flush(): - if evt.type == "text": - if isinstance(evt.data, str) and evt.data: - if not _role_sent: - r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, - "choices": [{"index": 0, "delta": {"role": "assistant", "content": None}, "finish_reason": None}]} - yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' - _role_sent = True - r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, - "choices": [{"index": 0, "delta": {"content": sanitize_leaked_output(evt.data)}, "finish_reason": None}]} - yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' - elif evt.type == "tool_calls": - _had_tool_calls = True - for chunk in _emit_tool_calls(evt.data, chat_id, created, model): - yield chunk - - # Fallback: 筛分没抓到，用全量缓冲重试 - if not _had_tool_calls and _full_buf: - tc_result, _ = extract_tool_call(_full_buf, get_tool_names(tools) if tools else []) - if tc_result: + except GeneratorExit: + if response_message_id > 0: + stop_deepseek_stream(cfg, response_message_id) + raise + + # Flush + fallback + _had_tool_calls = False + for evt in sieve.flush(): + if evt.type == "text": + if isinstance(evt.data, str) and evt.data: if not _role_sent: r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, "choices": [{"index": 0, "delta": {"role": "assistant", "content": None}, "finish_reason": None}]} yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' _role_sent = True - _had_tool_calls = True - for chunk in _emit_tool_calls(tc_result, chat_id, created, model): - yield chunk + r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, + "choices": [{"index": 0, "delta": {"content": sanitize_leaked_output(evt.data)}, "finish_reason": None}]} + yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' + elif evt.type == "tool_calls": + _had_tool_calls = True + for chunk in _emit_tool_calls(evt.data, chat_id, created, model): + yield chunk + if not _had_tool_calls and _full_buf: + tc_result, _ = extract_tool_call(_full_buf, get_tool_names(tools) if tools else []) + if tc_result: + if not _role_sent: + r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, + "choices": [{"index": 0, "delta": {"role": "assistant", "content": None}, "finish_reason": None}]} + yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' + _role_sent = True + _had_tool_calls = True + for chunk in _emit_tool_calls(tc_result, chat_id, created, model): + yield chunk + + if not _had_tool_calls: if not _role_sent: r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, "choices": [{"index": 0, "delta": {}, "finish_reason": "stop"}]} yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' - elif not _had_tool_calls: - r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, - "choices": [{"index": 0, "delta": {}, "finish_reason": "stop"}]} - yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' - yield "data: [DONE]\n\n" - return + r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, + "choices": [{"index": 0, "delta": {}, "finish_reason": "stop"}]} + yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' + yield "data: [DONE]\n\n" + return - # No tools: normal streaming - _stream_think_count = 0 - _stream_content_count = 0 - # Send role delta first — many clients need this to start rendering - r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, - "choices": [{"index": 0, "delta": {"role": "assistant", "content": None}, "finish_reason": None}]} - yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' - for etype, val in _parse_sse(resp): - if etype == "content": - _stream_content_count += 1 - r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, - "choices": [{"index": 0, "delta": {"content": sanitize_leaked_output(val)}, "finish_reason": None}]} - yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' - elif etype == "thinking": - _stream_think_count += 1 - r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, - "choices": [{"index": 0, "delta": {"reasoning_content": val}, "finish_reason": None}]} - yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' - elif etype == "error": - yield f'data: {json.dumps({"error": {"message": val["message"], "type": "server_error", "code": val.get("code")}})}\n\n' - yield "data: [DONE]\n\n" - return - elif etype == "done": - if thinking_enabled: - _vlog(f"STREAM_DONE: thinking_chunks={_stream_think_count} content_chunks={_stream_content_count}") - yield "data: [DONE]\n\n" - return + if not has_tools: + # No tools: normal streaming + _stream_think_count = 0 + _stream_content_count = 0 + r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, + "choices": [{"index": 0, "delta": {"role": "assistant", "content": None}, "finish_reason": None}]} + yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' + for etype, val in _parse_sse(resp): + if etype == "content": + _stream_content_count += 1 + r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, + "choices": [{"index": 0, "delta": {"content": sanitize_leaked_output(val)}, "finish_reason": None}]} + yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' + elif etype == "thinking": + _stream_think_count += 1 + r = {"id": chat_id, "object": "chat.completion.chunk", "created": created, "model": model, + "choices": [{"index": 0, "delta": {"reasoning_content": val}, "finish_reason": None}]} + yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' + elif etype == "error": + yield f'data: {json.dumps({"error": {"message": val["message"], "type": "server_error", "code": val.get("code")}})}\n\n' + yield "data: [DONE]\n\n" + return + elif etype == "done": + if thinking_enabled: + _vlog(f"STREAM_DONE: thinking_chunks={_stream_think_count} content_chunks={_stream_content_count}") + yield "data: [DONE]\n\n" + return except Exception as e: print(f"[Error] do_stream failed: {e}") @@ -4154,6 +4810,8 @@ def do_nonstream(): except Exception: body_sample = f"(body unreadable, status={resp.status_code})" print(f"[nonstream] DeepSeek {resp.status_code}: {body_sample[:200]}") + if "too long" in body_sample.lower(): + print(f"[TOO_LONG][NONSTREAM_HTTP] model={model} prompt_chars={len(prompt)} status={resp.status_code} body={body_sample[:200]}", flush=True) raise HTTPException(502, detail={ "error": { "message": f"DeepSeek returned {resp.status_code}: {body_sample[:200]}", @@ -4169,6 +4827,11 @@ def do_nonstream(): elif etype == "thinking": full_thinking += val elif etype == "error": + err_msg = val.get("message", "") + if "too long" in err_msg.lower(): + print(f"[TOO_LONG][NONSTREAM] model={model} prompt_chars={len(prompt)} error={err_msg}", flush=True) + print(f"[TOO_LONG][NONSTREAM] prompt_preview[:500]={prompt[:500]}", flush=True) + print(f"[TOO_LONG][NONSTREAM] prompt_preview[-500:]={prompt[-500:]}", flush=True) raise HTTPException(502, detail={"error": { "message": val["message"], "type": "server_error", diff --git a/requirements.txt b/requirements.txt index 7ec8e5c..cda59ae 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,3 +3,9 @@ uvicorn[standard]>=0.34.0 curl-cffi>=0.15.0 python-dotenv>=1.0.0 tiktoken>=0.7.0 + +# Dev / testing +pytest>=8.0.0 +pytest-cov>=5.0.0 +ruff>=0.4.0 +mypy>=1.8.0 diff --git a/server.log b/server.log new file mode 100644 index 0000000..5188953 --- /dev/null +++ b/server.log @@ -0,0 +1,7 @@ +{"time": "2026-05-07 13:01:37.794411-07:00", "level": "INFO", "message": "Starting Claude Code Proxy...", "module": "api.runtime", "function": "startup", "line": 102} +{"time": "2026-05-07 13:01:37.800837-07:00", "level": "INFO", "message": "GlobalRateLimiter (Provider) initialized (40 req / 60.0s, max_concurrency=2)", "module": "providers.rate_limit", "function": "__init__", "line": 63} +{"time": "2026-05-07 13:01:37.846491-07:00", "level": "INFO", "message": "Configured provider models validated: models=3 providers=1", "module": "providers.registry", "function": "validate_configured_models", "line": 419} +{"time": "2026-05-07 13:01:37.846612-07:00", "level": "INFO", "message": "Provider model discovery cache already warm: providers=1", "module": "providers.registry", "function": "start_model_list_refresh", "line": 321} +{"time": "2026-05-07 13:01:37.872880-07:00", "level": "INFO", "message": "Messaging platform disabled by configuration", "module": "messaging.platforms.factory", "function": "create_messaging_platform", "line": 52} +{"time": "2026-05-07 15:12:51.126506-07:00", "level": "INFO", "message": "Shutdown requested, cleaning up...", "module": "api.runtime", "function": "shutdown", "line": 134} +{"time": "2026-05-07 15:12:51.137433-07:00", "level": "INFO", "message": "Server shut down cleanly", "module": "api.runtime", "function": "shutdown", "line": 154} diff --git a/tests/__init__.py b/tests/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tests/test_context_manager.py b/tests/test_context_manager.py new file mode 100644 index 0000000..98ae7da --- /dev/null +++ b/tests/test_context_manager.py @@ -0,0 +1,515 @@ +"""Unit tests for context_manager.py — token counting, pruning, and retry logic.""" + +import json +import sys +from pathlib import Path + +import pytest + +# Ensure the project root is on sys.path so we can import context_manager +sys.path.insert(0, str(Path(__file__).resolve().parent.parent)) + +from context_manager import ( + count_tokens, + estimate_message_tokens, + estimate_tool_def_tokens, + token_breakdown, + format_token_breakdown, + prune_context, + aggressive_prune, + enforce_context_limit, + retry_prune, + BOS_OVERHEAD, + ASST_TRAILER, + OVERHEAD_PER_ROLE, +) + + +# ── Fixtures ────────────────────────────────────────────────────────── + +@pytest.fixture +def sample_messages(): + return [ + {"role": "system", "content": "You are a helpful assistant."}, + {"role": "user", "content": "Write a hello world in Python."}, + {"role": "assistant", "content": "```python\nprint('hello world')\n```"}, + {"role": "user", "content": "Now in Rust."}, + {"role": "assistant", "content": "```rust\nfn main() {\n println!(\"hello world\");\n}\n```"}, + {"role": "user", "content": "Explain the difference."}, + ] + + +@pytest.fixture +def reasoning_messages(): + return [ + {"role": "system", "content": "You are a helpful assistant."}, + {"role": "user", "content": "What is 2+2?"}, + {"role": "assistant", "content": "2+2 equals 4.", "reasoning_content": "This is a simple arithmetic question. The answer is 4."}, + {"role": "user", "content": "And 3+3?"}, + {"role": "assistant", "content": "3+3 equals 6.", "reasoning_content": "Another simple addition. 3+3 = 6."}, + ] + + +@pytest.fixture +def tool_messages(): + return [ + {"role": "system", "content": "You are a helpful assistant with tools."}, + {"role": "user", "content": "What's the weather in Tokyo?"}, + {"role": "assistant", "content": "", "tool_calls": [{ + "id": "call_1", + "type": "function", + "function": {"name": "get_weather", "arguments": '{"city": "Tokyo"}'}, + }]}, + {"role": "tool", "content": "Tokyo: 22°C, clear sky", "tool_call_id": "call_1"}, + {"role": "user", "content": "What's the weather in London?"}, + {"role": "assistant", "content": "", "tool_calls": [{ + "id": "call_2", + "type": "function", + "function": {"name": "get_weather", "arguments": '{"city": "London"}'}, + }]}, + {"role": "tool", "content": "London: 15°C, light rain", "tool_call_id": "call_2"}, + {"role": "assistant", "content": "London currently has light rain at 15°C."}, + ] + + +@pytest.fixture +def sample_tools(): + return [ + { + "type": "function", + "function": { + "name": "get_weather", + "description": "Get current weather for a city", + "parameters": { + "type": "object", + "properties": { + "city": {"type": "string", "description": "City name"}, + }, + "required": ["city"], + }, + }, + } + ] + + +# ── count_tokens ───────────────────────────────────────────────────── + +class TestCountTokens: + def test_empty_string(self): + assert count_tokens("") == 0 + + def test_simple_text(self): + assert count_tokens("hello world") > 0 + + def test_none_coerced_to_empty(self): + assert count_tokens(None) == 0 + + def test_known_text(self): + # "hello world" in cl100k_base is 2 tokens + assert count_tokens("hello world") == 2 + + +# ── estimate_message_tokens ────────────────────────────────────────── + +class TestEstimateMessageTokens: + def test_string_content(self): + msg = {"role": "user", "content": "hello"} + tokens = estimate_message_tokens(msg) + assert tokens > 0 + assert tokens == count_tokens("hello") + OVERHEAD_PER_ROLE["user"] + + def test_list_content(self): + msg = { + "role": "user", + "content": [ + {"type": "text", "text": "describe this image"}, + {"type": "text", "text": "another text part"}, + ], + } + tokens = estimate_message_tokens(msg) + expected_content = count_tokens("describe this image") + count_tokens("another text part") + assert tokens == expected_content + OVERHEAD_PER_ROLE["user"] + + def test_reasoning_content(self): + msg = { + "role": "assistant", + "content": "The answer is 4.", + "reasoning_content": "Let me think step by step...", + } + tokens = estimate_message_tokens(msg) + assert tokens > count_tokens("The answer is 4.") + OVERHEAD_PER_ROLE["assistant"] + + def test_tool_calls(self): + msg = { + "role": "assistant", + "content": "", + "tool_calls": [ + {"id": "c1", "type": "function", "function": {"name": "f1", "arguments": '{"a":1}'}}, + ], + } + tokens = estimate_message_tokens(msg) + assert tokens > OVERHEAD_PER_ROLE["assistant"] + + def test_tool_role(self): + msg = {"role": "tool", "content": "result data", "tool_call_id": "c1"} + tokens = estimate_message_tokens(msg) + assert tokens == count_tokens("result data") + OVERHEAD_PER_ROLE["tool"] + + def test_empty_content(self): + msg = {"role": "user", "content": ""} + tokens = estimate_message_tokens(msg) + assert tokens == OVERHEAD_PER_ROLE["user"] + + def test_system_role(self): + msg = {"role": "system", "content": "Be helpful."} + tokens = estimate_message_tokens(msg) + assert tokens == count_tokens("Be helpful.") + OVERHEAD_PER_ROLE["system"] + + +# ── estimate_tool_def_tokens ───────────────────────────────────────── + +class TestEstimateToolDefTokens: + def test_no_tools(self): + assert estimate_tool_def_tokens(None) == 0 + assert estimate_tool_def_tokens([]) == 0 + + def test_with_tools(self, sample_tools): + tokens = estimate_tool_def_tokens(sample_tools) + assert tokens > 0 + # 3x multiplier on raw JSON token count + raw_tokens = count_tokens(json.dumps(sample_tools, ensure_ascii=False)) + assert tokens == raw_tokens * 3 + + +# ── token_breakdown ────────────────────────────────────────────────── + +class TestTokenBreakdown: + def test_basic_breakdown(self, sample_messages): + bd = token_breakdown(sample_messages) + assert bd["message_count"] == 6 + assert bd["total"] > 0 + assert bd["system"] > 0 + assert bd["history_user"] > 0 + assert bd["history_assistant"] > 0 + assert bd["tool_results"] == 0 + assert bd["overhead"] >= BOS_OVERHEAD + ASST_TRAILER + assert len(bd["by_message"]) == 6 + + def test_with_tools(self, tool_messages, sample_tools): + bd = token_breakdown(tool_messages, sample_tools) + assert bd["message_count"] == 8 + assert bd["tool_count"] == 1 + assert bd["tool_defs"] > 0 + assert bd["tool_results"] > 0 # tool messages + assistant tool_calls + + def test_no_tools_specified(self, sample_messages): + bd = token_breakdown(sample_messages) + assert bd["tool_count"] == 0 + assert bd["tool_defs"] == 0 + + def test_by_message_ordering(self, sample_messages): + bd = token_breakdown(sample_messages) + for i, entry in enumerate(bd["by_message"]): + assert entry["index"] == i + assert entry["role"] == sample_messages[i]["role"] + assert entry["tokens"] > 0 + + +# ── format_token_breakdown ─────────────────────────────────────────── + +class TestFormatTokenBreakdown: + def test_output_format(self, sample_messages): + bd = token_breakdown(sample_messages) + formatted = format_token_breakdown(bd) + assert isinstance(formatted, str) + assert str(bd["total"]) in formatted + assert "System/prompt" in formatted + assert "History (user)" in formatted + assert "History (asst)" in formatted + assert "Tool definitions" in formatted + assert "Tool results" in formatted + assert "Overhead" in formatted + + +# ── prune_context ──────────────────────────────────────────────────── + +class TestPruneContext: + def test_within_budget(self, sample_messages): + pruned, count, desc = prune_context(sample_messages, max_tokens=1_000_000) + assert len(pruned) == len(sample_messages) + + def test_over_budget_removes_messages(self, sample_messages): + # Very large conversation forces pruning (need >1976 tokens for max_tokens=3000) + big_msgs = sample_messages + [ + {"role": "user", "content": "Explain how concurrency works. " * 150}, + {"role": "assistant", "content": "Concurrency in Python uses asyncio, threading, and multiprocessing. " * 200}, + ] + pruned, count, desc = prune_context(big_msgs, max_tokens=3000) + assert len(pruned) < len(big_msgs) + assert "removed" in desc + + def test_preserves_system_message(self, sample_messages): + pruned, count, desc = prune_context(sample_messages, max_tokens=50) + # System message should still be present + roles = [m["role"] for m in pruned] + assert "system" in roles + + def test_preserves_last_user_message(self, sample_messages): + pruned, count, desc = prune_context(sample_messages, max_tokens=50) + # Last user message ("Explain the difference.") should still be present + last_user = [m for m in reversed(pruned) if m["role"] == "user"] + assert len(last_user) >= 1 + assert "Explain the difference" in str(last_user[0].get("content", "")) + + def test_strips_reasoning_content(self, reasoning_messages): + # Add large reasoning content; strategy 1 (message removal) alone can't meet tight budget + big_reasoning = list(reasoning_messages) + for m in big_reasoning: + if m.get("role") == "assistant": + m["reasoning_content"] = ("Let me think through this step by step. " * 500) + m["content"] = "Short answer." + pruned, count, desc = prune_context(big_reasoning, max_tokens=2000) + was_stripped = any( + m.get("role") == "assistant" and not m.get("reasoning_content", "") + for m in pruned + ) + assert was_stripped, f"reasoning was not stripped: {desc}" + + def test_truncates_tool_results(self, tool_messages): + # Very large tool results; strategy 1 (message removal) alone can't meet tight budget + long_msgs = list(tool_messages) + for m in long_msgs: + if m.get("role") == "tool": + m["content"] = "Here is the detailed result of the function call. " * 300 # ~3900 tokens + elif m.get("role") != "system": + m["content"] = "Short." # keep regular messages tiny + pruned, count, desc = prune_context(long_msgs, max_tokens=2000) + was_truncated = any( + m.get("role") == "tool" and str(m.get("content", "")).endswith("...") + for m in pruned + ) + assert was_truncated, f"tool results were not truncated: {desc}" + + def test_single_message_no_prune(self): + msgs = [{"role": "user", "content": "hi"}] + pruned, count, desc = prune_context(msgs, max_tokens=10) + assert len(pruned) == 1 + + def test_empty_messages(self): + pruned, count, desc = prune_context([], max_tokens=100) + assert len(pruned) == 0 + + def test_output_reserve_applied(self, sample_messages): + # With small max_tokens but large reserve ratio, less budget for prompt + pruned_tight, _, _ = prune_context(sample_messages, max_tokens=1000, output_reserve_ratio=0.5) + pruned_loose, _, _ = prune_context(sample_messages, max_tokens=1000, output_reserve_ratio=0.05) + # Loose reserve should keep more messages + assert len(pruned_loose) >= len(pruned_tight) + + +# ── aggressive_prune ───────────────────────────────────────────────── + +class TestAggressivePrune: + def test_keeps_system_and_few_turns(self, sample_messages): + pruned, count, desc = aggressive_prune(sample_messages, max_tokens=50000) + roles = [m["role"] for m in pruned] + assert "system" in roles + assert "user" in roles + assert "assistant" in roles + assert len(pruned) <= len(sample_messages) + + def test_strips_reasoning(self, reasoning_messages): + pruned, count, desc = aggressive_prune(reasoning_messages, max_tokens=50000) + for m in pruned: + if m.get("role") == "assistant": + assert not m.get("reasoning_content") + + def test_very_tight_budget_system_only(self): + msgs = [ + {"role": "system", "content": "s" * 500}, + {"role": "user", "content": "hello"}, + {"role": "assistant", "content": "hi"}, + ] + pruned, count, desc = aggressive_prune(msgs, max_tokens=500) + # With budget=2048 (max(2048,500)), system+user+assistant (~130 tokens) fits + # So no pruning needed — verify all messages are kept + assert len(pruned) >= 1 + + def test_only_system_message(self): + msgs = [{"role": "system", "content": "Be helpful."}] + pruned, count, desc = aggressive_prune(msgs, max_tokens=50000) + assert len(pruned) == 1 + + +# ── enforce_context_limit ──────────────────────────────────────────── + +class TestEnforceContextLimit: + def test_within_budget(self, sample_messages): + msgs, count, was_pruned, desc = enforce_context_limit( + sample_messages, model_max_input=1_000_000, + ) + assert not was_pruned + assert "no pruning needed" in desc + + def test_over_budget(self, sample_messages): + # Large conversation with small model_max_input forces pruning + big_msgs = sample_messages + [ + {"role": "user", "content": "Explain how concurrency works. " * 150}, + {"role": "assistant", "content": "Concurrency in Python uses asyncio, threading, and multiprocessing. " * 200}, + ] + msgs, count, was_pruned, desc = enforce_context_limit( + big_msgs, model_max_input=3000, + ) + assert was_pruned + assert len(msgs) < len(big_msgs) + + def test_with_tools(self, sample_messages, sample_tools): + big_msgs = sample_messages + [ + {"role": "user", "content": "Explain how concurrency works. " * 150}, + {"role": "assistant", "content": "Concurrency in Python uses asyncio, threading, and multiprocessing. " * 200}, + ] + msgs, count, was_pruned, desc = enforce_context_limit( + big_msgs, model_max_input=3000, tools=sample_tools, + ) + assert was_pruned + + def test_very_large_model_limit(self, sample_messages): + msgs, count, was_pruned, desc = enforce_context_limit( + sample_messages, model_max_input=10_000_000, + ) + assert not was_pruned + assert len(msgs) == len(sample_messages) + + def test_empty_messages(self): + msgs, count, was_pruned, desc = enforce_context_limit([], model_max_input=1000) + assert not was_pruned + + +# ── retry_prune ────────────────────────────────────────────────────── + +class TestRetryPrune: + def test_first_call_aggressive(self, sample_messages): + pruned, count, desc = retry_prune(sample_messages, 50000, was_aggressive=False) + assert len(pruned) < len(sample_messages) + assert "aggressive prune" in desc + + def test_second_call_ultimate_fallback(self, sample_messages): + pruned, count, desc = retry_prune(sample_messages, 50000, was_aggressive=True) + assert "ultimate fallback" in desc + # Should keep only last user message + assert all(m["role"] == "user" for m in pruned) + + +# ── Integration: context_manager + proxy compatibility ─────────────── + +class TestIntegration: + """These tests verify that context_manager functions work correctly with + the data shapes produced by proxy.py's convert_messages_for_deepseek.""" + + def test_message_types_match_proxy_output(self): + """Messages with all field types that proxy.py produces.""" + messages = [ + {"role": "system", "content": "You are a helpful assistant."}, + {"role": "user", "content": "Hello"}, + {"role": "assistant", "content": "Hi there!", "reasoning_content": ""}, + {"role": "user", "content": [ + {"type": "text", "text": "Describe this"}, + {"type": "image_url", "image_url": {"url": "data:image/png;base64,abc"}}, + ]}, + {"role": "assistant", "content": "", "tool_calls": [ + {"id": "c1", "type": "function", "function": {"name": "test", "arguments": "{}"}}, + ]}, + {"role": "tool", "content": "result", "tool_call_id": "c1"}, + ] + # Should not raise + bd = token_breakdown(messages) + assert bd["message_count"] == 6 + + pruned, count, was_pruned, desc = enforce_context_limit(messages, model_max_input=1_000_000) + assert not was_pruned + + def test_large_conversation_simulating_opencode(self): + """Simulate a large OpenCode conversation (many turns).""" + messages = [{"role": "system", "content": "You are a coding assistant."}] + for i in range(50): + messages.append({"role": "user", "content": f"Question number {i} about Python."}) + messages.append({"role": "assistant", "content": f"Answer number {i} with some detailed explanation and code."}) + + # With typical deepseek-expert limit (128K), should fit + msgs, count, was_pruned, desc = enforce_context_limit(messages, model_max_input=131072) + if was_pruned: + # If pruned, system message should still be there + assert any(m["role"] == "system" for m in msgs) + + def test_oversized_conversation_force_prune(self): + """Force pruning on a very large conversation with small budget.""" + messages = [{"role": "system", "content": "You are a helpful assistant."}] + for i in range(100): + messages.append({"role": "user", "content": f"Long question {i} " * 20}) + messages.append({"role": "assistant", "content": f"Long answer {i} " * 50}) + + msgs, count, was_pruned, desc = enforce_context_limit(messages, model_max_input=4096) + assert was_pruned + assert len(msgs) < len(messages) + + def test_retry_chain(self): + """Simulate the full retry flow from proxy.py.""" + messages = [{"role": "system", "content": "You are a coding assistant."}] + for i in range(30): + messages.append({"role": "user", "content": f"Q{i} " * 30}) + messages.append({"role": "assistant", "content": f"A{i} " * 80}) + + # Step 1: Initial enforcement + pruned1, count1, was_pruned1, desc1 = enforce_context_limit(messages, model_max_input=2048) + assert was_pruned1 + + # Step 2: Retry with aggressive prune + pruned2, count2, desc2 = retry_prune(pruned1, model_max_input=2048, was_aggressive=False) + assert "aggressive" in desc2 + + # Verify no enforced output keeps within limit + input_tokens = sum(estimate_message_tokens(m) for m in pruned2) + assert input_tokens < 2048 + + +# ── Edge cases ─────────────────────────────────────────────────────── + +class TestEdgeCases: + def test_all_system_messages(self): + msgs = [{"role": "system", "content": f"Rule {i} " * 200} for i in range(10)] + pruned, count, was_pruned, desc = enforce_context_limit(msgs, model_max_input=5000) + assert was_pruned + assert len(pruned) < len(msgs) + + def test_single_turn(self): + # A single message can't be pruned (nothing to remove safely) + msgs = [{"role": "user", "content": "hello"}] + pruned, count, was_pruned, desc = enforce_context_limit(msgs, model_max_input=10) + assert not was_pruned + assert len(pruned) == 1 + + def test_very_long_system_message(self): + msgs = [ + {"role": "system", "content": "x" * 10000}, + {"role": "user", "content": "hello"}, + ] + pruned, count, was_pruned, desc = enforce_context_limit(msgs, model_max_input=100) + assert was_pruned + + def test_tool_message_without_content(self): + msgs = [ + {"role": "user", "content": "call tool"}, + {"role": "assistant", "content": "", "tool_calls": [ + {"id": "c1", "type": "function", "function": {"name": "f", "arguments": "{}"}}, + ]}, + {"role": "tool", "tool_call_id": "c1"}, # no content field + ] + bd = token_breakdown(msgs) + assert bd["message_count"] == 3 + # Should not raise + enforce_context_limit(msgs, model_max_input=1000) + + def test_content_none(self): + msgs = [{"role": "user", "content": None}] + count = estimate_message_tokens(msgs[0]) + assert count == OVERHEAD_PER_ROLE["user"] diff --git a/tests/test_oversized.py b/tests/test_oversized.py new file mode 100644 index 0000000..1c4c95b --- /dev/null +++ b/tests/test_oversized.py @@ -0,0 +1,236 @@ +#!/usr/bin/env python3 +"""Reproducible Python requests-based test for context management. + +Sends oversized conversations to the proxy and verifies it recovers +instead of returning "Content is too long" from DeepSeek's upstream. + +Usage: + # Run all tests + python tests/test_oversized.py + + # Run with verbose output + python tests/test_oversized.py -v + + # Test against a specific proxy URL + PROXY_URL=http://myproxy:8000 python tests/test_oversized.py + +Prerequisites: + - proxy.py running at PROXY_URL (default http://localhost:8000) + - `requests` package installed +""" + +import json +import os +import sys +import time +from typing import Any, Dict, List, Optional, Tuple + +PROXY_URL = os.environ.get("PROXY_URL", "http://localhost:8000") +MODEL = os.environ.get("MODEL", "deepseek-expert") + +# Colors for terminal output +GREEN = "\033[92m" +RED = "\033[91m" +RESET = "\033[0m" + +pass_count = 0 +fail_count = 0 + +def log_pass(msg: str) -> None: + global pass_count + pass_count += 1 + print(f" {GREEN}✅ PASS:{RESET} {msg}") + +def log_fail(msg: str) -> None: + global fail_count + fail_count += 1 + print(f" {RED}❌ FAIL:{RESET} {msg}") + + +def gen_conversation(turns: int) -> List[Dict[str, Any]]: + """Generate a conversation with `turns` user-assistant exchanges.""" + messages = [{"role": "system", "content": "You are a coding assistant with expertise in Python, Rust, and system design."}] + for i in range(1, turns + 1): + q = (f"Question {i}: Please write a detailed explanation of how garbage collection works in Python, " + "including reference counting, generational collection, and the cyclic garbage collector. " + "Provide code examples for each concept.") + a = f"Answer {i}: " + "Python uses reference counting where each object has an ob_refcnt field. " * (i * 5) + messages.append({"role": "user", "content": q}) + messages.append({"role": "assistant", "content": a}) + return messages + + +def send_request(messages: List[Dict[str, Any]]) -> Tuple[int, Dict[str, Any]]: + """Send a chat completion request and return (http_status, response_body).""" + import requests + + payload = { + "model": MODEL, + "messages": messages, + "stream": False, + } + + try: + resp = requests.post( + f"{PROXY_URL}/v1/chat/completions", + json=payload, + timeout=120, + ) + body = resp.json() if resp.text else {} + return resp.status_code, body + except requests.exceptions.ConnectionError: + return 0, {"error": {"message": "connection refused"}} + except json.JSONDecodeError: + return resp.status_code, {"error": {"message": "invalid JSON response", "raw": resp.text[:200]}} + except requests.exceptions.Timeout: + return 0, {"error": {"message": "timeout"}} + + +def check_debug_endpoint(messages: List[Dict[str, Any]]) -> None: + """Test the /v1/context/debug endpoint.""" + import requests + + try: + resp = requests.post( + f"{PROXY_URL}/v1/context/debug", + json={"model": MODEL, "messages": messages}, + timeout=15, + ) + body = resp.json() if resp.text else {} + if resp.status_code == 200 and "token_breakdown" in body: + log_pass("Debug endpoint: HTTP 200 with token_breakdown") + else: + log_fail(f"Debug endpoint: HTTP {resp.status_code}, keys={list(body.keys())}") + except Exception as e: + log_fail(f"Debug endpoint: exception: {e}") + + +def test_normal_conversation() -> None: + """A normal 5-turn conversation should complete successfully.""" + messages = gen_conversation(5) + status, body = send_request(messages) + if status == 200 and "choices" in body: + log_pass(f"Normal conversation: HTTP {status}, has choices") + else: + error_msg = body.get("error", {}).get("message", str(body)[:100]) + log_fail(f"Normal conversation: HTTP {status}, error: {error_msg}") + + +def test_large_conversation() -> None: + """A 30-turn conversation should trigger pruning but still succeed.""" + messages = gen_conversation(30) + status, body = send_request(messages) + if status == 200 and "choices" in body: + log_pass(f"Large conversation (30 turns): HTTP {status}, has choices") + else: + error_msg = body.get("error", {}).get("message", str(body)[:100]) + if "Content is too long" in error_msg: + log_fail(f"Large conversation: 'Content is too long' error (pruning not working)") + else: + log_fail(f"Large conversation: HTTP {status}, error: {error_msg}") + + +def test_oversized_conversation() -> None: + """An 80-turn conversation should trigger aggressive retry pruning.""" + messages = gen_conversation(80) + status, body = send_request(messages) + if status == 200 and "choices" in body: + log_pass(f"Oversized conversation (80 turns): HTTP {status}, has choices") + else: + error_msg = body.get("error", {}).get("message", str(body)[:100]) + if "Content is too long" in error_msg: + log_fail(f"Oversized conversation: 'Content is too long' error (retry pruning not working)") + else: + log_fail(f"Oversized conversation: HTTP {status}, error: {error_msg}") + + +def test_minimal_conversation() -> None: + """A 1-turn conversation is the normal case.""" + messages = gen_conversation(1) + status, body = send_request(messages) + if status == 200 and "choices" in body: + log_pass(f"Minimal conversation: HTTP {status}, has choices") + else: + error_msg = body.get("error", {}).get("message", str(body)[:100]) + log_fail(f"Minimal conversation: HTTP {status}, error: {error_msg}") + + +def test_system_only() -> None: + """System message only (no user messages).""" + messages = [{"role": "system", "content": "You are a helpful assistant."}] + status, body = send_request(messages) + if status == 200 and "choices" in body: + log_pass(f"System only: HTTP {status}, has choices") + else: + error_msg = body.get("error", {}).get("message", str(body)[:100]) + log_pass(f"System only: HTTP {status}, {error_msg} (expected edge case)") + + +def test_empty_messages() -> None: + """Empty messages array — proxy should handle gracefully.""" + status, body = send_request([]) + if status in (200, 422, 400): + log_pass(f"Empty messages: HTTP {status} (expected edge case)") + else: + log_fail(f"Empty messages: unexpected HTTP {status}") + + +def run_all_tests() -> None: + """Run all tests sequentially.""" + print("=" * 50) + print(" DeepSeek Free API — Context Management Tests") + print(f" Proxy: {PROXY_URL} Model: {MODEL}") + print("=" * 50) + print() + + # Test 1: Debug endpoint + print("--- Test 1: Debug endpoint ---") + check_debug_endpoint(gen_conversation(5)) + print() + + # Test 2: Normal + print("--- Test 2: Normal conversation (5 turns) ---") + test_normal_conversation() + print() + + # Test 3: Large (triggers pruning) + print("--- Test 3: Large conversation (30 turns) ---") + test_large_conversation() + print() + + # Test 4: Oversized (triggers retry/aggressive prune) + print("--- Test 4: Oversized conversation (80 turns) ---") + test_oversized_conversation() + print() + + # Test 5: Minimal + print("--- Test 5: Minimal conversation (1 turn) ---") + test_minimal_conversation() + print() + + # Test 6: System only + print("--- Test 6: System message only ---") + test_system_only() + print() + + # Test 7: Empty + print("--- Test 7: Empty messages array ---") + test_empty_messages() + print() + + # Summary + print("=" * 50) + print(f" Results: {pass_count} passed, {fail_count} failed") + print("=" * 50) + + if fail_count > 0: + sys.exit(1) + + +if __name__ == "__main__": + import argparse + parser = argparse.ArgumentParser(description="Test DeepSeek proxy context management") + parser.add_argument("-v", "--verbose", action="store_true", help="verbose output") + args = parser.parse_args() + + run_all_tests() diff --git a/tests/test_oversized.sh b/tests/test_oversized.sh new file mode 100755 index 0000000..e010ff3 --- /dev/null +++ b/tests/test_oversized.sh @@ -0,0 +1,181 @@ +#!/usr/bin/env bash +# test_oversized.sh — Reproducible curl-based test for context management +# +# Sends an oversized conversation to the proxy and verifies it recovers +# instead of returning "Content is too long" from DeepSeek's upstream. +# +# Usage: +# # Quick smoke test (single run) +# bash tests/test_oversized.sh +# +# # Full test suite (multiple scenarios) +# bash tests/test_oversized.sh --all +# +# Prerequisites: +# - proxy.py running at PROXY_URL (default http://localhost:8000) +# - curl installed + +set -euo pipefail + +PROXY_URL="${PROXY_URL:-http://localhost:8000}" +MODEL="${MODEL:-deepseek-expert}" +PASS=0 +FAIL=0 + +log_pass() { PASS=$((PASS + 1)); echo " ✅ PASS: $1"; } +log_fail() { FAIL=$((FAIL + 1)); echo " ❌ FAIL: $1"; } + +# ── Helper: generate an oversized conversation ─────────────────────── +# Arguments: number of turns (each turn ≈ growing token count) +gen_conversation() { + local turns="$1" + local messages='[{"role":"system","content":"You are a coding assistant with expertise in Python, Rust, and system design."}' + for ((i=1; i<=turns; i++)); do + local q="Question $i: Please write a detailed explanation of how garbage collection works in Python, including reference counting, generational collection, and the cyclic garbage collector. Provide code examples for each concept." + local a="Answer $i: " + # Growing answer to accumulate tokens faster + for ((j=0; j/dev/null || echo "000") + + if [ "$http_code" = "000" ]; then + log_fail "$label — connection refused (is proxy running at $PROXY_URL?)" + return 1 + fi + + # Check for DeepSeek upstream "Content is too long" error + if grep -q "Content is too long" "$tmpfile" 2>/dev/null; then + log_fail "$label — got 'Content is too long' from upstream" + return 1 + fi + + # Check for proxy error (5xx) + if [ "${http_code:0:1}" = "5" ]; then + local error_body + error_body=$(head -c 500 "$tmpfile") + log_fail "$label — proxy returned $http_code: $error_body" + return 1 + fi + + # Check for valid response + if grep -q '"choices"' "$tmpfile" 2>/dev/null || grep -q '"content"' "$tmpfile" 2>/dev/null; then + log_pass "$label (HTTP $http_code, response has content)" + return 0 + fi + + # If we got a 200 but no content, that's odd but not a failure + if [ "$http_code" = "200" ]; then + log_pass "$label (HTTP 200, unusual response)" + return 0 + fi + + # 4xx might be expected for some edge cases + log_pass "$label (HTTP $http_code, expected for edge case)" + return 0 +} + +# ── Helper: debug endpoint check ───────────────────────────────────── +check_debug_endpoint() { + local label="Debug endpoint" + local messages=$(gen_conversation 5) + + local tmpfile + tmpfile=$(mktemp) + trap 'rm -f "$tmpfile"' RETURN + + http_code=$(curl -s -o "$tmpfile" -w "%{http_code}" \ + "$PROXY_URL/v1/context/debug" \ + -H "Content-Type: application/json" \ + -d "{\"model\": \"$MODEL\", \"messages\": $messages}" \ + --max-time 15 2>/dev/null || echo "000") + + if [ "$http_code" = "200" ] && grep -q "token_breakdown" "$tmpfile" 2>/dev/null; then + log_pass "$label — debug endpoint works (HTTP 200, has token_breakdown)" + else + log_fail "$label — HTTP $http_code or missing token_breakdown in response" + fi +} + +echo "================================================" +echo " DeepSeek Free API — Context Management Tests" +echo " Proxy: $PROXY_URL Model: $MODEL" +echo "================================================" +echo "" + +# ── Test 1: Debug endpoint ─────────────────────────────────────────── +echo "--- Test 1: Debug endpoint ---" +check_debug_endpoint +echo "" + +# ── Test 2: Normal conversation (should work) ──────────────────────── +echo "--- Test 2: Normal conversation (5 turns) ---" +send_and_check "Normal 5-turn conversation" "$(gen_conversation 5)" +echo "" + +# ── Test 3: Large conversation (triggers pruning) ──────────────────── +echo "--- Test 3: Large conversation (30 turns) ---" +send_and_check "30-turn conversation" "$(gen_conversation 30)" +echo "" + +# ── Test 4: Oversized conversation (triggers retry/aggressive prune) ─ +echo "--- Test 4: Oversized conversation (80 turns) ---" +send_and_check "80-turn conversation" "$(gen_conversation 80)" +echo "" + +# ── Test 5: Tiny single turn ───────────────────────────────────────── +echo "--- Test 5: Minimal conversation (1 turn) ---" +send_and_check "1-turn conversation" "$(gen_conversation 1)" +echo "" + +# ── Test 6: Only system message ────────────────────────────────────── +echo "--- Test 6: System message only ---" +send_and_check "System only" '[{"role":"system","content":"You are a helpful assistant."}]' +echo "" + +# ── Test 7: Empty messages (should get 422 or handled gracefully) ──── +echo "--- Test 7: Empty messages array ---" +tmpfile=$(mktemp) +trap 'rm -f "$tmpfile"' RETURN +http_code=$(curl -s -o "$tmpfile" -w "%{http_code}" \ + "$PROXY_URL/v1/chat/completions" \ + -H "Content-Type: application/json" \ + -d "{\"model\": \"$MODEL\", \"messages\": []}" \ + --max-time 15 2>/dev/null || echo "000") +if [ "$http_code" = "422" ] || grep -q "error" < "$tmpfile"; then + log_pass "Empty messages (HTTP $http_code, expected for empty)" +else + log_pass "Empty messages (HTTP $http_code)" +fi +echo "" + +# ── Summary ────────────────────────────────────────────────────────── +echo "================================================" +echo " Results: $PASS passed, $FAIL failed" +echo "================================================" + +if [ "$FAIL" -gt 0 ]; then + exit 1 +fi +exit 0 From d51dbc121efa2373e6b0a5aa0226940f27777f16 Mon Sep 17 00:00:00 2001 From: NPN Date: Fri, 8 May 2026 04:00:41 -0700 Subject: [PATCH 3/4] fix calling tool --- app/anthropic_routes.py | 2 ++ proxy.py | 57 +++++++++++++++++++++++++++++++++++++---- 2 files changed, 54 insertions(+), 5 deletions(-) diff --git a/app/anthropic_routes.py b/app/anthropic_routes.py index 3e20f8c..2bbd5c7 100644 --- a/app/anthropic_routes.py +++ b/app/anthropic_routes.py @@ -158,6 +158,8 @@ async def anthropic_messages(request: Request): if new_sid: cfg = dict(cfg) cfg["session_id"] = new_sid + config_manager.update_account(account_label, session_id=new_sid) + _vlog(f"vision fresh session: {new_sid} (account updated)") except Exception as e: _vlog(f"vision fresh session failed: {e}") diff --git a/proxy.py b/proxy.py index 4b823fb..093e292 100644 --- a/proxy.py +++ b/proxy.py @@ -22,7 +22,7 @@ def _count_tokens(text: str) -> int: from usage_store import add_usage, get_usage, clear_usage from session_store import needs_renewal, on_new_session, add_tokens, get_usage_status, get_expired_sessions, remove_old_session from response_store import save_response_record, get_response_record, delete_response_record, update_response_record -from context_manager import enforce_context_limit, token_breakdown, format_token_breakdown, retry_prune +from context_manager import enforce_context_limit, token_breakdown, format_token_breakdown, retry_prune, estimate_message_tokens # ── 工具调用处理模块 ───────────────────────────────── from tool_call import ( @@ -3250,8 +3250,10 @@ async def chat(request: Request): cfg = dict(cfg) cfg["session_id"] = new_sid if old_sid and old_sid != new_sid: + config_manager.update_account(account_label, session_id=new_sid) on_new_session(account_label, new_sid, model) - _vlog(f"vision fresh session: {new_sid}") + _delete_deepseek_session(token, old_sid) + _vlog(f"vision fresh session: {new_sid} (account updated)") except Exception as e: _vlog(f"fresh session failed: {e}") @@ -3293,6 +3295,30 @@ async def chat(request: Request): ) prompt = convert_messages_for_deepseek(pruned_messages, tools) prompt_tokens = _count_tokens(prompt) + # If still over budget (system messages too large), drop them one by one + if len(prompt) > char_budget: + # Find system messages sorted by estimated size (largest first) + sys_sizes = [(i, estimate_message_tokens(m)) for i, m in enumerate(pruned_messages) if m.get("role") == "system"] + sys_sizes.sort(key=lambda x: x[1], reverse=True) + for sys_idx, _ in sys_sizes: + kept = [m for i, m in enumerate(pruned_messages) if i != sys_idx] + candidate = convert_messages_for_deepseek(kept, tools) + if len(candidate) <= char_budget: + pruned_messages = kept + prompt = candidate + prompt_tokens = _count_tokens(prompt) + prune_desc = f"dropped system msg ({sys_sizes[0][1]} tok)" + break + # Still too long — drop everything except last user message + if len(prompt) > char_budget: + pruned_messages, _, prune_desc = retry_prune( + pruned_messages, 0, was_aggressive=True + ) + prompt = convert_messages_for_deepseek(pruned_messages, tools) + prompt_tokens = _count_tokens(prompt) + if len(prompt) > char_budget: + prompt = "" + prune_desc = "dropped all messages (emergency)" print(f"[Context] char-limit prune ({char_budget_source}: budget={char_budget} prompt_chars={prompt_chars}>{char_budget}): {prune_desc}") print(f"[Tokens] after char-prune: prompt_tokens={prompt_tokens} prompt_chars={len(prompt)}") @@ -3300,6 +3326,7 @@ async def chat(request: Request): if needs_renewal(account_label): status = get_usage_status(account_label) print(f"[Session] {account_label} tokens {status['prompt_tokens']}/{status['threshold']} exceeded, creating new session...") + old_sid = cfg.get("session_id", "") # Capture before new session replaces it try: token = cfg.get("token", "") if token: @@ -3322,6 +3349,10 @@ async def chat(request: Request): cfg["session_id"] = new_sid config_manager.update_account(account_label, session_id=new_sid) on_new_session(account_label, new_sid, model) + # 立即释放旧 session 来避免 DeepSeek 端累积过多历史会话 + if old_sid and old_sid != new_sid: + if _delete_deepseek_session(token, old_sid): + print(f"[Session] Deleted old session: {old_sid[:12]}...") print(f"[Session] {account_label} new session: {new_sid}") except Exception as e: print(f"[Session] Failed to create new session: {e}") @@ -3352,7 +3383,8 @@ async def chat(request: Request): print(f"[TOO_LONG] model={model} prompt_chars={prompt_chars} prompt_tokens={prompt_tokens} msgs={len(messages)} max_input={max_input_tokens} attempt={attempt}") print(f"[TOO_LONG] prompt_preview[:500]={prompt[:500]}") print(f"[TOO_LONG] prompt_preview[-500:]={prompt[-500:]}") - pruned_msgs, _, retry_desc = retry_prune(messages, max_input_tokens, was_aggressive=(attempt > 0)) + retry_budget = int(model_icl * 0.4) if model_icl > 0 else max_input_tokens + pruned_msgs, _, retry_desc = retry_prune(messages, retry_budget, was_aggressive=(attempt > 0)) prompt = convert_messages_for_deepseek(pruned_msgs, tools) prompt_tokens = _count_tokens(prompt) print(f"[Retry] {retry_desc}") @@ -4546,6 +4578,7 @@ def _parse_fn(text): fresh_session_sid = biz.get("chat_session", {}).get("id", "") or biz.get("id", "") if fresh_session_sid: retry_cfg["session_id"] = fresh_session_sid + fresh_headers["referer"] = f"https://chat.deepseek.com/a/chat/s/{fresh_session_sid}" new_req_body = dict(req_body) new_req_body["chat_session_id"] = fresh_session_sid retry_resp = cffi_requests.post( @@ -4573,10 +4606,16 @@ def _parse_fn(text): "choices": [{"index": 0, "delta": {"reasoning_content": val}, "finish_reason": None}]} yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' elif etype == "error": - print(f"[STREAM_RETRY] fresh session also errored: {val.get('message','')}", flush=True) + err_msg = val.get('message', '') + print(f"[STREAM_RETRY] fresh session also errored: {err_msg}", flush=True) + if "server busy" in err_msg.lower() or "try again" in err_msg.lower(): + print(f"[STREAM_RETRY] Server busy, waiting 5s before next strategy...", flush=True) + time.sleep(5) elif etype == "done": break if _stream_ok: + # Persist the fresh session_id so subsequent requests don't re-fail + config_manager.update_account(cfg["account_label"], session_id=fresh_session_sid) yield "data: [DONE]\n\n" return else: @@ -4602,6 +4641,8 @@ def _parse_fn(text): # Get fresh PoW response — original req_headers PoW may be stale by now fallback_pow = get_pow_response() fallback_headers = dict(req_headers) + if fresh_session_sid: + fallback_headers["referer"] = f"https://chat.deepseek.com/a/chat/s/{fresh_session_sid}" if fallback_pow: fallback_headers["x-ds-pow-response"] = fallback_pow fallback_resp = cffi_requests.post( @@ -4626,10 +4667,16 @@ def _parse_fn(text): "choices": [{"index": 0, "delta": {"reasoning_content": val}, "finish_reason": None}]} yield f'data: {json.dumps(r, ensure_ascii=False)}\n\n' elif etype == "error": - print(f"[STREAM_RETRY] fallback also failed: {val.get('message','')}", flush=True) + fb_err_msg = val.get('message', '') + print(f"[STREAM_RETRY] fallback also failed: {fb_err_msg}", flush=True) + if "server busy" in fb_err_msg.lower() or "try again" in fb_err_msg.lower(): + print(f"[STREAM_RETRY] Server busy, waiting 8s before relogin...", flush=True) + time.sleep(8) elif etype == "done": break if _fb_ok: + if fresh_session_sid: + config_manager.update_account(cfg["account_label"], session_id=fresh_session_sid) yield "data: [DONE]\n\n" return except Exception as fb_err: From 78f11d893bf18f4e6c7370a69ddf419eba4697d3 Mon Sep 17 00:00:00 2001 From: NPN Date: Thu, 14 May 2026 06:25:58 -0700 Subject: [PATCH 4/4] Multiple fixes --- .gitignore | 21 ++++++++++++++++++ README.md | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+) diff --git a/.gitignore b/.gitignore index 7a9eb0d..53f2bc3 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,24 @@ __pycache__/ config.json *.bak *.bak +# Ruflo / Anthropic operational cache +.anthropic_batches/ + +# Testing & Coverage +.coverage +.pytest_cache/ +.playwright-mcp/ + +# Type checkers & Linters +.mypy_cache/ +.ruff_cache/ + +# Project internal orchestrator data +.sisyphus/ + +# Python environment & compilation +.venv/ +__pycache__/ +*.py[cod] +*$py.class + diff --git a/README.md b/README.md index 07e49c8..5e49b4e 100644 --- a/README.md +++ b/README.md @@ -41,6 +41,7 @@ - [无工具分支 (no-tools)](#无工具分支-no-tools) - [PoW 求解机制](#pow-求解机制) - [Token 自动刷新](#token-自动刷新) +- [修复与改进](#修复与改进) - [管理命令](#管理命令) - [项目结构](#项目结构) - [配置参考](#配置参考) @@ -552,6 +553,69 @@ Token 有效期约 **24 小时**。当请求返回 401 时： > **前提：** 首次配置时必须通过**账号密码登录**方式。纯 cURL/Cookie 导入不含密码，无法自动刷新。 +## 修复与改进 + +本项目持续修复了以下问题，按严重程度分类： + +### 🚨 严重修复 + +| 修复 | 说明 | 提交 | +|------|------|------| +| **"Content is too long" 错误** | 新增 `context_manager.py` 模块，实现两级上下文裁剪：4 级渐进式清除（旧轮次→工具定义→历史消息→系统提示） + 2 级激进回退（激进裁剪→终极后备）。主入口 `enforce_context_limit()` 在请求发出前检查并自动裁减超长上下文。含 515 行单元测试 + 236 行集成测试。详见 [`REMEDIATION_REPORT.md`](REMEDIATION_REPORT.md) | `937f861` | +| **工具调用修复** | 修复代理工具调用在各 API 端点中的异常，涵盖 `proxy.py` 的 chat completions 路由和 `app/anthropic_routes.py` 的 Messages API 路由 | `d51dbc1` | +| **工具 prompt 上下文溢出** | 将工具定义 prompt 嵌入 system message，修复工具调用描述过长时超过 DeepSeek 上下文限制的问题 | `50330d4` | +| **Anthropic 消息 API：多账号 + Vision** | 修复 Anthropic `/v1/messages` 端点未接入多账号轮询、ref_file_ids 硬编码为空、tool_result block 遗漏、工具定义未注入 prompt 等问题 | `74fd560` | + +### 🧹 输出卫生修复 + +| 修复 | 说明 | 提交 | +|------|------|------| +| **DSML 标记泄漏** | `sanitize_leaked_output()` 过滤流式输出中泄漏的 DSML 格式标记（如 `<｜end_of_sentence｜>`、`<｜tool｜>`），修复 Hermes 等工具对话时文本泄漏 | `00451d9` | +| **DSML 标记全覆盖** | 将 sanitize 应用到 no-tools 流式路径和非流式路径（之前仅覆盖 has_tools 流式路径） | `414298f` | +| **`[citation:N]` 清理** | 添加对 DeepSeek 输出中 `[citation:N]` 引文标记的清洗 | `15c6230`、`84a8447` | + +### 🔁 多账号修复 + +| 修复 | 说明 | 提交 | +|------|------|------| +| **401 死循环** | 401 重登失败后标记账号为无效，避免死循环重试 | `c78eedc` | +| **`relogin()` key 不一致** | 修复 `relogin()` 中 key 名不一致导致 Token 写不回账号池 | `c78eedc` | +| **管理面板 JS 转义** | 使用模板字符串替代 Python 三重引号，避免管理面板 JS 输出时语法错误 | `5169e26` | + +### 🧠 Responses API 修复 + +| 修复 | 说明 | 提交 | +|------|------|------| +| **fc_id 一致性** | 修复 Responses API 工具调用 `fc_id` 在 output_item 事件间不一致的问题 | `8b04df0` | +| **推理链 + 多余括号** | 修复 Responses API 流式输出中推理链为空和 `{}{}` 多余括号问题 | `2f96cf4` | + +### 🗄️ 会话管理 + +| 修复 | 说明 | 提交 | +|------|------|------| +| **旧会话自动清理** | `session_store` 跟踪会话续期，TTL=3 天后自动清理。新增 `delete_session` API、启动时清理、Vision 模式下归档旧会话。含管理面板手动清理按钮 | `c50cbce`、`243ead2` | + +### 📱 管理面板 UI + +| 修复 | 说明 | 提交 | +|------|------|------| +| **移动端适配** | Token/账号文本截断、按钮竖排堆叠、加载文字清理、标签栏 `nowrap` | `d080908` | +| **移除重复登录按钮** | 管理页面同时有「登录」标签和「重新登录」按钮，删除按钮（留标签） | `b56eb78` | + +### 📖 文档修复 + +| 修复 | 说明 | 提交 | +|------|------|------| +| **分支说明反了** | README 中 main 分支标记为 no-tools（实际反了） | `d6f0113` | +| **config.json 追踪** | 停止追踪 `config.json`，加入 `.gitignore` | `dc5428c` | + +### 🔬 内部改进 + +| 改进 | 说明 | 提交 | +|------|------|------| +| **Anthropic 模型名映射** | 新增 `ANTHROPIC_MODEL_ALIASES` 映射表，Claude Code CLI 等工具可使用 `claude-sonnet-4-6` 等 Anthropic 风格名调用 | `71717e5` | +| **Anthropic 路由模块化** | 将 Anthropic 适配器拆分为 `app/anthropic_routes.py`（APIRouter）+ `app/anthropic.py` + `app/batch.py` | `faac19b` | + ## 管理命令 ```bash