Skip to content

feat: Optimize add key support for more strings#347

Merged
tbphp merged 1 commit intomainfrom
feat-opz-add-key
Nov 23, 2025
Merged

feat: Optimize add key support for more strings#347
tbphp merged 1 commit intomainfrom
feat-opz-add-key

Conversation

@tbphp
Copy link
Owner

@tbphp tbphp commented Nov 23, 2025

关联 Issue / Related Issue

Closes #341, closes #345

变更内容 / Change Content

  • Bug 修复 / Bug fix
  • 新功能 / New feature
  • 其他改动 / Other changes

自查清单 / Checklist

  • 我已在本地测试过我的变更。 / I have tested my changes locally.
  • 我已更新了必要的文档。 / I have updated the necessary documentation.

@tbphp tbphp self-assigned this Nov 23, 2025
@tbphp tbphp added the enhancement New feature or request label Nov 23, 2025
@tbphp tbphp added this to the v1.4.1 milestone Nov 23, 2025
Copy link
Owner Author

@tbphp tbphp left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code reviewed.

@tbphp tbphp merged commit fd24d7a into main Nov 23, 2025
5 checks passed
@tbphp tbphp deleted the feat-opz-add-key branch November 23, 2025 11:10
AAEE86 added a commit to AAEE86/gpt-load that referenced this pull request Nov 24, 2025
Co-authored-by: tbphp <tangb7420@gmail.com>
xunxun1982 added a commit to xunxun1982/gpt-load that referenced this pull request Nov 27, 2025
变更说明:
(1)对齐上游 tbphp 提交 feat: Optimize add key support for more strings (tbphp#347),同步调整批量添加、恢复、删除 key 时使用的解析与校验行为。
(2)更新 utils.DelimitersPattern,移除 '|' 作为分隔符,避免包含管道符的 key 被错误拆分,提升对更丰富字符串格式的兼容性。
(3)放宽 KeyService.isValidKeyFormat 校验逻辑,仅要求去除空白后非空,不再限制具体字符集,从而支持更多样的 key 字符串形式。
xunxun1982 added a commit to xunxun1982/gpt-load that referenced this pull request Nov 27, 2025
变更说明:
(1)发布流程:在 Linux / macOS / Windows 三个 release 工作流中,通过 GO_VERSION 环境变量集中管理 Go 版本,统一为 1.25.x,并与 go.mod 中的 go 1.25.4 保持一致,减少后续升级时各平台配置漂移的风险。
(2)key 解析逻辑:对齐上游 tbphp 提交 feat: Optimize add key support for more strings (tbphp#347),放宽 KeyService.isValidKeyFormat 的校验规则,只要求去除空白后非空,从而支持更宽松的上游 key 字符串格式;同时保留统一校验入口,并在函数上增加英文注释说明这一行为是有意为之,避免未来新调用点产生语义歧义。
(3)key 分隔符处理:更新 utils.DelimitersPattern 的注释,使其与当前正则实现一致,明确仅使用空白(含换行、回车、制表符)、逗号和分号作为分隔符,允许 '|' 作为 key 内容的一部分,保证在多数据库场景下批量解析文本 key 时行为稳定且无额外性能开销。
rebecca554owen added a commit to rebecca554owen/gpt-load that referenced this pull request Feb 16, 2026
Merge upstream changes including:
- Model redirect feature (tbphp#334, tbphp#335)
- Key optimization (tbphp#371, tbphp#347)
- Add openai-response channel type support (tbphp#387)
- Upgrade dependencies and Go 1.24 documentation (tbphp#388)
- Fix key last_used_at accuracy (tbphp#383)
- Various bug fixes

Conflicts to resolve:
- models/types.go: Keep dev's LastUsedAt, ModelMappingList, Token fields
- services/subgroup_manager.go: Use dev's enhanced version
- proxy/server.go: Use dev's version (includes main's features)
- go.mod: Keep dev's dependency versions (Go 1.26)
rebecca554owen added a commit to rebecca554owen/gpt-load that referenced this pull request Feb 16, 2026
Merge upstream changes including:
- Model redirect feature (tbphp#334, tbphp#335)
- Key optimization (tbphp#371, tbphp#347)
- Add openai-response channel type support (tbphp#387)
- Upgrade dependencies and Go 1.24 documentation (tbphp#388)
- Fix key last_used_at accuracy (tbphp#383)
- Various bug fixes

Conflicts resolved:
- models/types.go: Keep dev's LastUsedAt, ModelMappingList, Token fields
- services/subgroup_manager.go: Use dev's enhanced version
- proxy/server.go: Use dev's version (includes main's features)
- go.mod: Keep dev's dependency versions (Go 1.26)
- channel: Use upstream's openai-response naming convention for compatibility
rebecca554owen added a commit to rebecca554owen/gpt-load that referenced this pull request Feb 16, 2026
Merge upstream changes including:
- Model redirect feature (tbphp#334, tbphp#335)
- Key optimization (tbphp#371, tbphp#347)
- Add openai-response channel type support (tbphp#387)
- Upgrade dependencies and Go 1.24 documentation (tbphp#388)
- Fix key last_used_at accuracy (tbphp#383)
- Various bug fixes

Conflicts resolved:
- models/types.go: Keep dev's LastUsedAt, ModelMappingList, Token fields
- services/subgroup_manager.go: Use dev's enhanced version
- proxy/server.go: Use dev's version (includes main's features)
- go.mod: Keep dev's dependency versions (Go 1.26)
- channel: Use upstream's openai-response naming convention for compatibility
rebecca554owen added a commit to rebecca554owen/gpt-load that referenced this pull request Feb 16, 2026
Merge upstream changes including:
- Model redirect feature (tbphp#334, tbphp#335)
- Key optimization (tbphp#371, tbphp#347)
- Add openai-response channel type support (tbphp#387)
- Upgrade dependencies and Go 1.24 documentation (tbphp#388)
- Fix key last_used_at accuracy (tbphp#383)
- Various bug fixes

Conflicts resolved:
- models/types.go: Keep dev's LastUsedAt, ModelMappingList, Token fields
- services/subgroup_manager.go: Use dev's enhanced version
- proxy/server.go: Use dev's version (includes main's features)
- go.mod: Keep dev's dependency versions (Go 1.26)
- channel: Use upstream's openai-response naming convention for compatibility
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

请求去掉添加密钥时对'|'和'+'之类的符号的特殊处理 添加密钥这块增加更多格式

1 participant