sync: cherry-pick low-risk upstream fixes (kimi temp #5390, deleted-user filter #5464) - #156
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
概述
从上游 QuantumNous/new-api 摘取两个无风险的提交。经评估其余上游改动(审计日志、图片流式、数据表重构、Codex 渠道改写)集成面更大或会撞我们的定制,另行排期处理,不纳入本 PR。
包含的提交
relay/channel/moonshot/adaptor.go+ 测试model/user.go、users 前端 columns/constants/route冲突处理
#5464的users-table.tsx撞到上游数据表重构引入的新分页 API(totalCount/manualFiltering)——本 PR 不引入该重构,保留我们 fork 现有分页写法(pageCount+ 自有ensurePageInRange),只取真正的状态筛选功能。验证
go build+go vet(moonshot/model 包)通过go test ./relay/channel/moonshot/通过(fix: normalize kimi k2.6 temperature QuantumNous/new-api#5390 自带测试)Deletedi18n key 在全部 8 个语言文件均存在User模型含DeletedAt gorm.DeletedAt,deleted_at子句安全,正常 status 查询行为不变;无 schema 变更/跨 DB 迁移🤖 Generated with Claude Code