github/sub2api
4
0 Fork 0
mirror of https://github.com/Wei-Shaw/sub2api.git synced 2026-11-05 16:47:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,414 Commits 49 Branches 65 Tags
f218c8d40a490a64f2def839b55aa7d450479d43
Commit Graph
3532 Commits
Author SHA1 Message Date
Wesley Liddick f218c8d40a Merge pull request #6394 from qiujun8023/fix/account-stats-deepseek-peak 
fix(billing): apply model pricing policies to account stats cost
 2026-09-01 08:58:49 +08:00
Wesley Liddick 1cce2b38ee Merge pull request #6417 from fengshao1227/fix/ws-ingress-capacity-shed-client-code 
fix(openai): ctx_pool WS ingress 下发前改写上游容量降载错误码（Codex 会话被硬终止）
 2026-09-01 08:54:00 +08:00
Wesley Liddick 064d9b74e8 Merge pull request #6432 from okbexx/fix/codex-disabled-account-capabilities 
fix(codex): ignore persistently disabled catalog accounts
 2026-09-01 08:46:42 +08:00
Wesley Liddick e87c47c957 Merge pull request #6435 from wucm667/fix/issue-6420-apikey-responses-instructions 
fix(openai): avoid synthesized instructions for API keys
 2026-09-01 08:45:58 +08:00
Wesley Liddick bdedd6c544 Merge pull request #6433 from swjturay/codex/upstream-stale-ws-recycle 
fix(openai-ws): recycle stale idle pool connections without reader liveness
 2026-09-01 08:45:30 +08:00
Brisbanehuang e2624fb65c fix(codex): preserve known image input capabilities 2026-08-31 09:42:58 -04:00
Ray 6d5f027848 fix(openai-ws): recycle stale idle pool connections 2026-08-31 21:04:29 +08:00
wucm667 e21b849a92 fix(openai): avoid synthesized instructions for API keys 2026-08-31 20:58:49 +08:00
Jarl ba345f1052 fix(codex): ignore persistently disabled catalog accounts 2026-08-31 20:26:29 +08:00
li 1dc0a09009 fix(openai): ctx_pool WS ingress 下发前改写上游容量降载错误码 
上游容量降载（server_is_overloaded / slow_down）被 ctx_pool 的 ingress 直写路径
原样转发给客户端。Codex CLI 按闭集判定，这两个码属致命集，客户端打印
"Selected model is at capacity" 并直接终止会话，不退避重试。

仓库已有 sanitizeOpenAICapacityShedErrorCodeForClient 处理这件事，且注释写明了
Codex 的闭集判定与"账号状态判定使用改写前原始 payload"的前提。它此前只在
HTTP/SSE（openai_gateway_response_handling.go）与 http_bridge
（openai_ws_http_bridge.go）两条路径被调用，ctx_pool ingress 直写路径是唯一漏掉
的一条——同一账号同一时刻切到 http_bridge 就能正常退避重试。

改写结果写入独立的 clientMessage，不动 upstreamMessage：写出点之后的
markOpenAIWSClientVisibleFailure 与 handleOpenAIWSTerminalTransientFailure
仍按原始 payload 判定账号状态，与 http_bridge 的写法一致。

新增用例覆盖改写生效与改写范围两侧（非容量类错误码必须原样下发）。
 2026-08-31 16:53:57 +08:00
shaw 0fcec63b68 test(openai): isolate visible TTFT fixture 2026-08-31 15:15:44 +08:00
shaw c66e700f05 fix(openai): move TTFT metric mode to admin settings 2026-08-31 14:52:07 +08:00
Wesley Liddick fdf9751c12 Merge pull request #6378 from Ritel-T/fix/codex-oauth-service-tier-billing 
fix(openai): preserve Codex OAuth Fast billing tier
 2026-08-31 13:56:00 +08:00
qiujunandClaude Opus 5 e7c029875c test(billing): 图片输出按 output 子集计价 
上一条改用统一定价管线后，TestTryModelFilePricing_WithImageOutput 挂在 0.3 vs
0.28：原算式把 ImageOutputTokens 当 OutputTokens 之外的额外量叠加，等于按文本
output 价和图片价各收一次，测试固化了这个重复计费。

ImageOutputTokens 本就是 OutputTokens 的子集（Gemini 取自 candidatesTokensDetails
的 IMAGE 档，OpenAI 取自 output_tokens_details），统一管线先扣除再按图片单价计，
未配图片价时回退到 output 价、总额不变，正是这个语义。期望改为 0.28。

影响：涉及图片输出的模型，账号统计成本会降低"图片 token × 文本 output 单价"。

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
 2026-08-31 12:33:06 +08:00
Wesley Liddick 0678b24d58 Merge pull request #6283 from okbexx/feat/usage-compaction-kind 
feat(usage): track native compaction requests
 2026-08-31 11:19:37 +08:00
Wesley Liddick f34735f462 Merge pull request #6388 from alfadb/feature/ollama-usage-cn-platforms 
feat(ollama): 用量窗口支持挂在国产三家平台下的 Ollama Cloud 账号
 2026-08-31 11:16:25 +08:00
Wesley Liddick a2d7d41185 Merge pull request #6325 from 251392463/fix/grok-responses-vision-tool-output 
fix(grok): preserve Responses vision tool output images
 2026-08-31 11:15:33 +08:00
Wesley Liddick 03ab687686 Merge pull request #5866 from wucm667/fix/issue-5863-scope-monitor-groups 
fix: scope channel monitor groups by user access
 2026-08-31 11:15:13 +08:00
Wesley Liddick fbc69322af Merge pull request #6254 from wucm667/fix/issue-6249-configurable-image-cooldown 
feat(openai): configure image tool cooldown
 2026-08-31 11:13:52 +08:00
Wesley Liddick 414489d152 Merge pull request #5469 from wucm667/fix/issue-5467-passthrough-http-bridge 
fix(openai-ws): bridge oversized passthrough requests
 2026-08-31 11:13:35 +08:00
Wesley Liddick 50a9dd7a64 Merge pull request #6386 from wucm667/fix/issue-6383-isolate-passthrough-ws 
fix(openai): isolate passthrough websocket sessions
 2026-08-31 11:13:16 +08:00
Wesley Liddick a4156eea10 Merge pull request #6385 from wucm667/fix/issue-6381-preserve-quota-limits 
fix(admin): preserve quota limits on partial group updates
 2026-08-31 11:12:56 +08:00
wucm667 897faea333 fix(account): reset quota cooldown atomically 2026-08-31 09:12:09 +08:00
qiujunandClaude Opus 5 9eabd2a5b7 fix(billing): apply model pricing policies to account stats cost 
resolveAccountStatsCost 的优先级 3 维护了第二份"单价 × token 数"实现，每加一个
定价特性都要手工镜像：service tier 与长上下文分别由 9261dd77、25e6688a 补齐，
而 b5827cfd 引入的 DeepSeek 官方峰谷一直没有生效，高峰时段账号成本最多低估一半。

改为复用 CalculateCostWithServiceTier。channelPricing 仍为 nil，优先级 3 的语义
不变：只取模型定价文件、不引入渠道自定义定价；低谷时段结果与原算式完全一致。

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
 2026-08-30 22:57:53 +08:00
wucm667 d5a0124637 fix(openai): isolate passthrough websocket sessions 2026-08-30 16:49:01 +08:00
alfadb 30b29e51e8 feat(ollama): 用量窗口支持挂在国产三家平台下的 Ollama Cloud 账号 
Ollama Cloud 用量窗口（浏览器会话、5h/7d 快照、自动刷新、同 key 组共享）此前
只认 platform ∈ {openai, anthropic} 的 apikey 账号。但网关对 kimi/zhipu/deepseek
的 apikey 账号同样按 credentials.base_url 转发，用户把 Ollama Cloud 的 key 挂在
这三个平台下跑 Ollama Cloud 托管的 glm/kimi/deepseek 模型时，请求转发正常，用量
窗口却完全不可用。

- 平台白名单放开到 {openai, anthropic, kimi, zhipu, deepseek}；type='apikey'
  与官方 ollama.com base_url 的限制不变
- Go 侧收敛为 isOllamaCloudUsagePlatform，SQL 侧收敛为
  ollamaCloudUsagePlatformsSQL，6 处白名单只引用单一来源，并补两侧互为镜像的
  漂移守卫测试
- CN 周期余额/额度探测跳过 ollama 用量账号：其探测端点由 base_url 衍生，对
  ollama.com 会被出站 URL 白名单拒绝，每轮都白跑并产生噪声
- 前端账号列表 CN 分支在 eligible 时改渲染 Ollama 用量窗口，并跳过 CN 额度/
  余额子单元格（同上，渲染出来只会是一行探测报错）
 2026-08-30 16:38:11 +08:00
wucm667 9f1effd71c fix(admin): preserve quota limits on partial group updates 2026-08-30 16:36:13 +08:00
Ritel-T 82105f260a fix(billing): resolve shadow credential tier contract 2026-08-30 13:40:37 +09:00
Ritel-T 50ad6e2e50 fix(billing): narrow Codex OAuth default exception 2026-08-30 13:40:19 +09:00
Ritel-T f323d84644 test(billing): cover Codex OAuth usage pricing 2026-08-30 13:07:33 +09:00
Ritel-T 3a9070359b fix(billing): scope Codex OAuth tier trust 2026-08-30 13:07:21 +09:00
Ritel-T d39fc491ec test(openai): cover websocket tier separation 2026-08-30 13:07:07 +09:00
Ritel-T 2b8cb628b6 fix(openai): preserve tiers in messages chat fallback 2026-08-30 13:06:45 +09:00
Ritel-T 8b4b3f4a94 fix(openai): preserve tiers in responses chat fallback 2026-08-30 13:06:32 +09:00
Ritel-T 624e4eef64 fix(openai): separate outbound and observed tiers 2026-08-30 13:06:11 +09:00
wucm667 a3bbf33c05 fix(monitor): scope groups by user access 2026-08-30 09:28:40 +08:00
wucm667 7c616db07a fix(openai-ws): bridge oversized passthrough requests 2026-08-30 08:41:08 +08:00
alfadb b5827cfd54 fix(pricing): align DeepSeek billing with official peak/off-peak rates 
同步 DeepSeek 官方峰谷价格与模型定价。
 2026-08-29 17:30:23 +08:00
m11y ea4291a92c fix(anthropic): scope Fable scheduling threshold to Fable models 
让 Fable 7d_oi 调度阈值仅限制 Fable 模型族，不暂停整个 Anthropic 账号。
 2026-08-29 17:30:18 +08:00
101Harry 32ac921f24 fix(anthropic): avoid Fable OAuth system prompt refusal 
修复 Fable OAuth 请求因系统提示词形态导致空响应的问题。
 2026-08-29 17:29:30 +08:00
Ryan Chou eb4237a2b0 fix(billing): 渠道定价对带后缀的模型名不再被官方兜底价覆盖 
修复带后缀模型无法命中渠道自定义定价的问题。
 2026-08-29 17:29:21 +08:00
shaw 804679d996 fix(openai): preserve model scope on stream failover 2026-08-29 15:25:10 +08:00
shaw 571d1e1d9b fix(openai): isolate websocket semantic rate limits 2026-08-29 11:14:54 +08:00
shaw 3c22e78af0 fix(openai): preserve Spark quota reset semantics 2026-08-29 11:08:01 +08:00
shaw 5d9c7abed5 fix(openai): scope Spark quota 429 to model 2026-08-29 09:57:08 +08:00
Wesley Liddick ac18c588c8 Merge PR #6165 
修复上游倍率探测导致账号列表整页刷新的问题
 2026-08-29 09:12:05 +08:00
Wesley Liddick b83284071a Merge PR #5348 
fix(subscription): 周/月窗口展示的重置时间与实际推进锚点对齐
 2026-08-29 09:10:07 +08:00
Wesley Liddick fd13c72e95 Merge PR #6330 
feat(zhipu): support team GLM Coding Plan usage query
 2026-08-29 09:08:42 +08:00
Wesley Liddick 3c2e9a43b9 Merge PR #5860 
fix(antigravity): preserve mixed built-in chat tools
 2026-08-29 09:07:27 +08:00
Wesley Liddick ca319d09f2 Merge PR #6280 
fix(update): strip hyphenated pre-release/custom suffix in version comparison
 2026-08-29 09:06:10 +08:00