seewe/sub2api
1
0
Fork 0
mirror of https://github.com/Wei-Shaw/sub2api.git synced 2026-10-14 12:02:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,695 Commits 43 Branches 62 Tags
1923d1c27d411beb5ad8c1fb875900e06c8ec11c
Commit Graph
6695 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wesley Liddick 1923d1c27d Merge pull request #6814 from feeeei/fix/go-redis-pool-nil-ctx-panic 
fix(redis): 升级 go-redis 至 v9.22.0，修复连接池 nil-ctx panic 竞态
 2026-09-08 20:09:59 +08:00
Wesley Liddick b638445234 Merge pull request #6754 from ccemoji/codex/minimal-upstream-fix 
fix: cancel streaming upstream before closing body
 2026-09-08 20:09:37 +08:00
Wesley Liddick 9bcf8a5b80 Merge pull request #6760 from wucm667/feat/issue-6752-weekly-cost-estimate 
feat(accounts): show estimated weekly account cost
 2026-09-08 20:09:25 +08:00
Wesley Liddick 979fe247f9 Merge pull request #6821 from 22zyfeng-collab/fix/antigravity-oauth-plan-type 
fix(antigravity): preserve OAuth plan_type when saving accounts
 2026-09-08 20:09:12 +08:00
Wesley Liddick 6378fb0cba Merge pull request #6798 from savvym/codex/fix-account-menu-overflow 
fix(frontend): 修复账号操作菜单在视口底部被截断
 2026-09-08 20:08:53 +08:00
Wesley Liddick 3ee92b40c5 Merge pull request #6659 from ouchihao/codex/issue-77-remove-inactive-groups 
fix(accounts): allow removing inactive group assignments
 2026-09-08 20:08:40 +08:00
Wesley Liddick 4892b8f17e Merge pull request #6810 from Pluviobyte/codex/fix-announcement-proxy-date-range 
fix: validate announcement and proxy date ranges
 2026-09-08 20:08:24 +08:00
Wesley Liddick 28b807a735 Merge pull request #6816 from Pluviobyte/codex/fix-repeated-proxy-fallback 
fix(proxies): allow repeated expiry fallback and preserve origin
 2026-09-08 20:07:08 +08:00
Wesley Liddick dbe92a1c24 Merge pull request #6758 from DuskLin/feat/minimax-platform 
feat(minimax): 增加 MiniMax 平台支持
 2026-09-08 18:50:06 +08:00
刘佳林 10940ecf39 fix(minimax): gofmt MiniMax allowlist comments 
golangci-lint gofmt failed on aligned comments in the default upstream host list.
 2026-09-08 17:49:11 +08:00
刘佳林 3495635a52 fix(minimax): 补齐阈值停调与额度监控接线 
调度阈值评估和渠道监控 quota 取数补上 MiniMax 分支；GetCodingPlanProvider 改为只认官方域名，避免把中转 Key 发到厂商额度端点。composite /v1/models 与 Codex 目录纳入 MiniMax；迁移改名为 237；allowlist 去掉未使用的 www.* / api.minimax.cn，abab 前缀收窄到 5/6/7。
 2026-09-08 17:41:29 +08:00
22zyfeng-collab b6ee9f0a32 fix(antigravity): preserve OAuth subscription plan across account creation 2026-09-08 15:02:32 +08:00
Rain 859de4c8fd fix(proxies): allow repeated expiry fallback and preserve origin 2026-09-08 13:56:20 +08:00
feeeei 99eba19ffc fix: 升级 go-redis 至 v9.22.0 修复连接池 nil-ctx panic 
上游竞态：调用方超时后 wantConn.ctx 被置 nil，拨号 goroutine 用 nil ctx
创建超时上下文触发 panic（go-redis#3630，v9.18.0 起修复）。
生产环境在连接池饥饿 + 请求超时风暴下每秒触发上万次。

同步将 ZRangeByScore 迁移至 ZRangeArgs：v9.22.0 将其标记为 deprecated，
golangci-lint staticcheck 拦截（SA1019）。ZRangeArgs{ByScore: true} 与原
调用发出的 Redis 命令参数完全等价（LIMIT 编码逻辑相同）。
 2026-09-08 13:46:59 +08:00
Rain efc6e4a816 fix: validate announcement and proxy date ranges 2026-09-08 13:37:52 +08:00
savvym df64b5f368 fix(frontend): keep account action menu within viewport 2026-09-08 10:46:56 +08:00
github-actions[bot] 772a0382f0 chore: sync VERSION to 0.2.3 [skip ci] 2026-09-08 02:35:11 +00:00
Wesley Liddick 8fa67d477d Merge pull request #6791 from Wei-Shaw/fix/group-model-allowlist-schema-repair 
fix(db): 升级自愈 groups.model_allowlist 列，修复 API 密钥/订阅列表加载失败
v0.2.3 		2026-09-08 10:03:23 +08:00
shaw 4a7739acdf fix(db): converge groups.model_allowlist on upgrade 
235 只在「models_list_config 存在且 model_allowlist 不存在」时重命名，而迁移一旦
写入 schema_migrations 就会按「文件名 + checksum」整份跳过，不再重跑。因此只要数据库
在 235 之后回到旧结构（为回滚旧版本镜像手工改回列名、或按旧结构做了部分恢复），
应用依旧能正常启动，但每个关联 groups 的查询都会失败：

    pq: column groups.model_allowlist does not exist

表现为「API 密钥」「我的订阅」「管理端订阅列表」等页面加载失败。

新增可重放的收敛迁移 236，升级即自愈：只有旧列则重命名（数据原样保留）；两列并存
则在新列仍为默认空值时回填旧列配置；两列都没有则按默认值补建。收尾统一把
model_allowlist 归一成 NOT NULL DEFAULT '{}'，与 ent schema 对齐。

判定列是否存在改用 attrelid = 'groups'::regclass（跟随 search_path），
不再写死 table_schema = 'public'，避免与 ALTER TABLE 的解析路径分叉。

Fixes #6780
 2026-09-08 09:15:23 +08:00
Wesley Liddick 14e0a49e17 Merge pull request #6767 from alfadb/fix/ollama-cloud-max-tokens-all-platforms 
fix(ollama): 修复 DeepSeek 多协议输出上限并自动选择 Bearer 鉴权
 2026-09-08 08:26:51 +08:00
Wesley Liddick b439dddfda Merge pull request #6772 from ZeroClover/fix/account-test-model-names 
fix(accounts): populate display names for live test models
 2026-09-08 08:25:54 +08:00
Zero Clover e094a3f40b fix(accounts): populate display names for live test models 2026-09-07 21:59:35 +08:00
alfadb 57387445f3 fix(ollama): select Bearer auth for Anthropic endpoints automatically 2026-09-07 21:54:22 +08:00
alfadb 2fc24d8879 fix(ollama): normalize Messages base URLs before token clamping 2026-09-07 21:54:22 +08:00
alfadb cc91155fe4 fix(ollama): clamp DeepSeek output limits across API protocols 2026-09-07 21:54:21 +08:00
github-actions[bot] b7dba62678 chore: sync VERSION to 0.2.2 [skip ci] 2026-09-07 13:01:57 +00:00
Wesley Liddick 5485f368b2 Merge pull request #6690 from alfadb/fix/astra-pro-mode 
fix(openai): 保留 Codex OAuth 请求中的 Astra reasoning.mode
v0.2.2 		2026-09-07 20:42:37 +08:00
Wesley Liddick f8351e9e33 Merge pull request #6658 from ZeroClover/feat/group-model-allowlist 
feat(groups)!: enforce model allowlists across gateway endpoints
 2026-09-07 20:25:57 +08:00
chihao.ou 941a0487ab fix(accounts): allow removing inactive group assignments 2026-09-07 20:05:08 +08:00
shaw 2031c1d5ad fix(groups): merge main and resolve model allowlist conflicts 
Resolve three conflicts from main's #6680 (supplementUnmappedOpenAIModels):

1. gateway_handler.go — keep PR's allowlist refactoring (ModelAllowlistEnabled,
   writeAllowlistedModelsList, modelListingSource); main's OpenAI branch in
   writeModelsList was auto-merged.
2. group_models_list.go (modify/delete) — delete file per PR intent; relocate
   supplementUnmappedOpenAIModels to group_model_allowlist.go where gateway_service
   and openai_codex_models_service can still call it.
3. openai_codex_models_service.go — combine main's supplementUnmappedOpenAIModels
   wrapping with PR's ModelAllowlistEnabled() guard.

Also fix two auto-merged test files that still referenced the old
GroupModelsListConfig / ModelsListConfig types.
 2026-09-07 19:44:03 +08:00
刘佳林and刘佳林 6f2295bfc7 test(minimax): 按平台注册表推导调度器 snapshot 期望数量 
新增 MiniMax 后 canonical token / 账号查询数增加，硬编码期望值过期。
改为从 schedulerSnapshotPlatforms 派生 bucket 与 query 数量，避免下次加平台再踩坑。
账号查询计数辅助函数仅用于单测，放在 unit test 文件以免 unused。

Co-authored-by: 刘佳林 <DuskLin@users.noreply.github.com>
 2026-09-07 11:40:11 +00:00
Wesley Liddick 8193b80a59 Merge pull request #6743 from MarushiruDonato/fix/gpt6-astra-instructions 
fix(openai): 修正 GPT-6 Astra 提示词选择
 2026-09-07 19:22:43 +08:00
shaw f6d580200a fix: update #6688 test assertions for #6678 image modality and #6718 ultra level 
- TestCodexAliasFailoverMappingHonorsModelRouting/no_routing_rule: expect
  ["text","image"] instead of ["text"] — image input is resolved per-account
  via isOpenAICodexImageInputModel, independent of routing rules
- TestCodexAliasFailoverMappingHonorsModelRouting/routing_rule: expect
  effort levels to include "ultra" (added by #6718)
 2026-09-07 19:13:01 +08:00
shaw b491c3271b fix: rename redeemMaxErrorsPerHour to redeemMaxFailedAttempts in tests 
#6669 renamed the constant from redeemMaxErrorsPerHour to
redeemMaxFailedAttempts (fixed 10-minute window), but #6670's tests
still referenced the old name, breaking compilation on main.
 2026-09-07 19:00:04 +08:00
shaw d106b3b5a0 fix: resolve merge conflict with main and fix #6718 missing group parameter 
- Resolve conflict in openai_codex_models_service_test.go: keep both
  GPT-6 Astra instructions template assertion (from this PR) and ultra
  reasoning level + multi_agent fields (from #6718 on main)
- Fix compilation error on main: add missing `group *Group` parameter
  to buildCodexModelsManifestForAccounts calls in
  openai_codex_model_metadata_test.go (lines 24, 32) — caused by #6688
  changing the function signature while #6718 added new callers with
  the old signature
 2026-09-07 18:58:00 +08:00
Wesley Liddick 10fe591e54 Merge pull request #6660 from ouchihao/codex/issue-312-onboarding-button-shadow 
fix(onboarding): remove button text shadows
 2026-09-07 18:51:44 +08:00
Wesley Liddick 66cd8a72bc Merge pull request #6738 from Milesians/codex/fix-interval-multiplier-display 
fix: 修正区间倍率展示并补齐模型广场 1h 缓存价格
 2026-09-07 18:51:00 +08:00
Wesley Liddick dc46daa690 Merge pull request #6726 from DuskLin/feat/openai-reasoning-effort-mapping-deny 
feat(groups): 推理强度映射转发值支持拒绝
 2026-09-07 18:50:41 +08:00
Wesley Liddick 65246e69d7 Merge pull request #6643 from MarushiruDonato/fix/codex-manifest-reactive-vmodel 
fix(frontend): 修复 Codex Manifest 编辑状态丢失
 2026-09-07 18:50:27 +08:00
Wesley Liddick de69bf1e03 Merge pull request #6655 from ouchihao/codex/issue-275-account-expiry-presets 
feat(accounts): add month and year expiry presets
 2026-09-07 18:50:13 +08:00
Wesley Liddick eba85dc478 Merge pull request #6680 from cyhhao/fix/openai-mixed-account-model-list 
fix(openai): retain default models in mixed account catalogs
 2026-09-07 18:50:03 +08:00
Wesley Liddick abf70750fd Merge pull request #6669 from ssharkkky/fix/redeem-fixed-failure-window 
fix(redeem): use a fixed 10-minute failure window
 2026-09-07 18:49:51 +08:00
Wesley Liddick 88b697d5df Merge pull request #6673 from ssharkkky/fix/backup-migrations-advisory-lock 
fix(backup): serialize pg_dump/psql with the migrations advisory lock
 2026-09-07 18:49:34 +08:00
Wesley Liddick 3eb5a84ea1 Merge pull request #6700 from qiu121/codex/fix/deepseek-account-cost-peak 
fix(billing): 修复 DeepSeek 高峰账号成本少计
 2026-09-07 18:49:19 +08:00
Wesley Liddick 71e5a4baf7 Merge pull request #6486 from aofee/codex/fix-grok-media-inconclusive-eligibility 
fix(grok): do not reject media accounts on incomplete billing
 2026-09-07 18:48:39 +08:00
Wesley Liddick 4bfcbd0c78 Merge pull request #6498 from aofee/codex/fix-ws-pending-turn-terminal 
fix(openai-ws): track pending passthrough turns
 2026-09-07 18:48:04 +08:00
Wesley Liddick 2b1e5e7f5c Merge pull request #6429 from spin6lock/fix/billing-glm-5.3-flash-fallback-pricing 
fix(billing): 补上 glm-5.3 / glm-5.3-flash 兜底价，避免被 glm-5 子串匹配抢走
 2026-09-07 18:47:46 +08:00
Wesley Liddick cbb4b7e53e Merge pull request #6678 from gebdalaoli-arch/codex/stale-astra-input-modalities-v021 
[codex] Fix stale official Astra input modalities
 2026-09-07 18:47:31 +08:00
Wesley Liddick 81c0f11d7a Merge pull request #6736 from qiu121/codex/fix/openai-stream-failure-observability 
fix(openai): 记录流式失败的上游诊断信息
 2026-09-07 18:46:58 +08:00
Wesley Liddick 561fc1c3e4 Merge pull request #6718 from lyy0709/codex/astra-ultra-catalog 
fix(codex): preserve Astra Ultra workflow metadata
 2026-09-07 18:46:11 +08:00