mirror of
https://github.com/zyycn/codex-proxy-rs.git
synced 2026-11-21 16:01:32 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d1be306f03 | ||
|
|
aa34d5291d | ||
|
|
56d3078ee8 | ||
|
|
8b69fa4882 | ||
|
|
d05d38718e | ||
|
|
a1954c4746 | ||
|
|
636a3d2a26 | ||
|
|
e9627168a7 | ||
|
|
5a4f49036b | ||
|
|
8041ddab65 | ||
|
|
e645d6d4c9 | ||
|
|
5079700190 | ||
|
|
4db65d8e12 | ||
|
|
da866de2c7 | ||
|
|
a770419818 | ||
|
|
5b37b574e6 | ||
|
|
0df6c40091 | ||
|
|
4b5443d2f2 | ||
|
|
b02f13c9cc | ||
|
|
878d2858e8 | ||
|
|
369f17d654 | ||
|
|
3709ed2484 | ||
|
|
48a5c9d690 | ||
|
|
6fc6283f3a | ||
|
|
605b60e58f | ||
|
|
1bf948a24f | ||
|
|
d90b9d129e | ||
|
|
4b1cae89b2 | ||
|
|
6cfe7ce2fc | ||
|
|
1427dfc64a | ||
|
|
9996fae5b6 | ||
|
|
6420d86aa6 | ||
|
|
f8fa386a7e | ||
|
|
7c2c532b44 | ||
|
|
188a6817d1 | ||
|
|
d44bc64d1a | ||
|
|
6006cc8394 | ||
|
|
e7f8b5a354 | ||
|
|
d62868b692 | ||
|
|
0922f3486c | ||
|
|
f4058c1d2e | ||
|
|
8253fbc497 | ||
|
|
193e83f9f3 | ||
|
|
a9e8fa8a44 | ||
|
|
437322ee4b | ||
|
|
843e1367bd | ||
|
|
ab1bf4372c | ||
|
|
dca9806961 | ||
|
|
15ed54d452 | ||
|
|
050214860e | ||
|
|
d917f948cf | ||
|
|
3d834c9e93 | ||
|
|
8d282dcdf9 | ||
|
|
38446e8a0c | ||
|
|
1173f6263d | ||
|
|
f4bed2077f | ||
|
|
4a8b839780 | ||
|
|
f02bc80f15 | ||
|
|
32a95a9702 | ||
|
|
cc80401d5e | ||
|
|
8cc6b50d85 | ||
|
|
83521e82f5 | ||
|
|
ba8745a714 | ||
|
|
84bcd0e1c0 | ||
|
|
7459c16a3a | ||
|
|
3b4fb390c7 | ||
|
|
bb440a3cbb | ||
|
|
89b6d2256f | ||
|
|
ba2afe67d0 | ||
|
|
976359ad26 | ||
|
|
832858dade | ||
|
|
4d4c1e48ce | ||
|
|
9f873f5ac2 | ||
|
|
4bc59f32a1 | ||
|
|
4c5d2bc97e | ||
|
|
5033d9f19a | ||
|
|
68b297fc88 | ||
|
|
1b96c775b2 | ||
|
|
b9ccc0b702 | ||
|
|
f9e364860a | ||
|
|
ceeb68ba82 | ||
|
|
2abbfb1fac | ||
|
|
5b7f307bb2 | ||
|
|
e64fb2d955 | ||
|
|
7ee9ea8b63 | ||
|
|
ce12ba3f43 | ||
|
|
ac4ea71cd2 | ||
|
|
77de86e0b6 | ||
|
|
644296bf66 | ||
|
|
367a62bd7d | ||
|
|
62f321c82b | ||
|
|
c40e2f524e | ||
|
|
0f5bf03e13 | ||
|
|
28c8c536c5 | ||
|
|
4ee9abf9d2 | ||
|
|
779ccf4e6c | ||
|
|
d13a4a2138 | ||
|
|
a0e7f38f7f | ||
|
|
41f97ac836 | ||
|
|
975b73b33b | ||
|
|
d787195f4e | ||
|
|
8681d6851e | ||
|
|
d99ecf9aaf | ||
|
|
8f40bfda7c | ||
|
|
72215fe62a | ||
|
|
f61995e61d | ||
|
|
f85d80d756 | ||
|
|
e1f84c210b | ||
|
|
0e02a056b5 | ||
|
|
1eac929e9d | ||
|
|
9b4a042be5 | ||
|
|
3bd042181e | ||
|
|
2cae28d7f4 | ||
|
|
bab781cbe0 | ||
|
|
28ad8fb1c4 | ||
|
|
4888681a04 | ||
|
|
9739bb08be | ||
|
|
fac37ec563 | ||
|
|
9f0d712671 | ||
|
|
75be1287ef | ||
|
|
dad91fe9f7 | ||
|
|
b22b0cfa41 | ||
|
|
bd69329a37 | ||
|
|
151a3c6bfd | ||
|
|
e2f194875f | ||
|
|
07b61bdc83 | ||
|
|
c0fdc1bbff | ||
|
|
343c579017 | ||
|
|
914c00785c | ||
|
|
b3de0d637d | ||
|
|
1271fa0186 | ||
|
|
055da40476 | ||
|
|
36ba79ca5e | ||
|
|
1b24029a97 | ||
|
|
431992a7a4 | ||
|
|
d3143406dc | ||
|
|
478f2d1f21 |
@@ -1,6 +1,6 @@
|
|||||||
---
|
---
|
||||||
name: cpr-dev-guide
|
name: cpr-dev-guide
|
||||||
description: Codex Proxy RS 开发、修复、排障、代码审查和文档修改入口;页面、样式、文案、接口、调度、数据库及宿主 SDK、Runtime、插件接入均适用;PR、Issue、独立网关插件与发版叠加对应技能
|
description: Codex Proxy RS 的需求评估、排障、开发、代码审查与文档维护入口
|
||||||
---
|
---
|
||||||
|
|
||||||
# 开发指南
|
# 开发指南
|
||||||
@@ -12,39 +12,37 @@ description: Codex Proxy RS 开发、修复、排障、代码审查和文档修
|
|||||||
- 先写读者需要知道的事实或动作。删掉一句不影响理解、判断或操作,就删;标题、正文和通知不重复同一信息
|
- 先写读者需要知道的事实或动作。删掉一句不影响理解、判断或操作,就删;标题、正文和通知不重复同一信息
|
||||||
- 保留会改变决定的条件、权限、后果和恢复步骤。错误通知只说已知问题,有明确办法才补一句;后端返回的提示在后端改,前端不重复解释。上游原文、用户内容和诊断事实保持原样
|
- 保留会改变决定的条件、权限、后果和恢复步骤。错误通知只说已知问题,有明确办法才补一句;后端返回的提示在后端改,前端不重复解释。上游原文、用户内容和诊断事实保持原样
|
||||||
|
|
||||||
|
## 核实问题根因与宿主职责
|
||||||
|
|
||||||
|
评估功能建议、排障、开发和审查时,先按[问题与方案依据](../../../CONTRIBUTING.md#问题与方案依据)核实使用者要完成什么、当前行为造成了什么影响。反馈直接给出改法时,先弄清提出这个改法的原因
|
||||||
|
|
||||||
|
排查故障时,从症状沿实际调用链回溯,定位行为最早偏离预期的环节,用源码、诊断或对照复现说明触发条件如何导致结果。原因尚未确定时,区分已知事实与假设,指出哪项证据能区分可能原因。确认根因后,在负责该行为的模块修复,用原触发场景验证
|
||||||
|
|
||||||
|
涉及 Codex 时,以对应版本的官方源码核实客户端行为,默认透明转发,只做必要适配。建议宿主接管已有决定时,指出需要它介入的网关职责或实际约束。若只是个别部署希望采用不同策略,说明不建议内置的原因。实现可行性不能证明宿主应当承担这项需求
|
||||||
|
|
||||||
## 先确定领域与必读规范
|
## 先确定领域与必读规范
|
||||||
|
|
||||||
按用户意图、受影响行为与对象初判,定位后按实际文件复核,不要求用户说出“前端”“后端”或技能名。**所有命中行共同构成本次必读规范,先读完再确定方案、修改或给出审查结论**;跨领域叠加,不能只选最像当前步骤的一行
|
按受影响行为和实际文件执行下表所有命中项。流程引用首次完整读取,长文档按标题定位指定章节
|
||||||
|
|
||||||
职责边界决定问题由谁修复;即使代码位于账号、调度或 API 模块,只要影响插件接入或为插件增加处理,也命中插件边界。确定方案时说明相关业务事实的归属及已有实现的复用依据,不能以功能恢复或测试通过替代职责判断
|
|
||||||
|
|
||||||
| 领域或操作,行为影响与文件路径满足其一即可 | 确定方案前读取与执行 |
|
| 领域或操作,行为影响与文件路径满足其一即可 | 确定方案前读取与执行 |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| 调整页面、弹窗、表单、按钮、文案、样式或交互;目标在 `frontend/`、`modules/ui/`、插件前端,或是 `.vue` 文件 | [前端流程](references/frontend.md),局部修改同样按影响范围检查组件复用、文案、Token、样式、视觉状态和运行证据 |
|
| 调整页面、弹窗、表单、按钮、文案、样式或交互;目标在 `frontend/`、`modules/ui/`、插件前端,或是 `.vue` 文件 | [前端流程](references/frontend.md),局部修改同样按影响范围检查组件复用、文案、Token、样式、视觉状态和运行证据 |
|
||||||
| 开发、排查或审查插件接入、宿主 SDK、Runtime、扩展接口或独立网关插件;目标在 `backend/crates/gateway-plugin/`、`modules/plugins/` | 完整读取[插件职责边界](references/plugin-boundaries.md)及所用 [SDK](../../../backend/crates/gateway-plugin/sdk/README.md) 类型与能力合同;宿主维护自身合同、资源与稳定性,插件业务错误在插件侧修复,不在宿主、SDK 或 Runtime 中补偿;独立插件开发、排查、审查另用 [cpr-plugin-dev](../cpr-plugin-dev/SKILL.md) |
|
| 插件接入、SDK、Runtime、扩展接口或独立网关插件,含账号、调度或 API 中为插件新增的处理;目标在 `backend/crates/gateway-plugin/`、`modules/plugins/` | [插件职责边界](references/plugin-boundaries.md)及所用 [SDK](../../../backend/crates/gateway-plugin/sdk/README.md) 类型与能力合同;独立插件开发、排查或审查同时执行 [cpr-plugin-dev](../cpr-plugin-dev/SKILL.md) |
|
||||||
| 开发、排查或审查服务端接口、路由、调度、账号与用量规则、持久化、后台任务或协议行为;目标是 `backend/` 中的实现、配置、迁移,或 Rust 源码 | [Workspace 边界](../../../docs/architecture.md#3-workspace-边界)的模块与依赖规则、所属模块及[后端自审](../../../docs/architecture.md#后端自审);Rust 使用 `$rust-best-practices` 和下方后端注释要求,宿主 Rust 同时读取 [Rust 模块组织约定](../../../docs/architecture.md#32-rust-模块组织约定) |
|
| 开发、排查或审查服务端接口、路由、调度、账号与用量规则、持久化、后台任务或协议行为;目标是 `backend/` 中的实现、配置、迁移,或 Rust 源码 | [Workspace 边界](../../../docs/architecture.md#3-workspace-边界)的模块与依赖规则、所属模块及[后端自审](../../../docs/architecture.md#后端自审);Rust 使用 `$rust-best-practices` 和下方后端注释要求,宿主 Rust 同时读取 [Rust 模块组织约定](../../../docs/architecture.md#32-rust-模块组织约定) |
|
||||||
| 修改页面接口调用,或开发、排查、审查面向管理端或模型客户端的 HTTP/WS API 合同 | [API](../../../docs/api.md)对应章节;优先复用已有接口,核对调用方 → 服务端解析 → 实际查询或执行,不能只凭前端类型认定参数生效;按实际改动叠加前后端规范 |
|
| 修改页面接口调用,或开发、排查、审查面向管理端或模型客户端的 HTTP/WS API 合同 | [API](../../../docs/api.md)对应章节;优先复用已有接口,核对调用方 → 服务端解析 → 实际查询或执行,不能只凭前端类型认定参数生效;按实际改动叠加前后端规范 |
|
||||||
| 新增、修改或审查客户端可见错误、失败提示、后台任务状态文案 | 下方[错误文案](#错误文案),并按实际出口核对[错误与诊断三层边界](../../../docs/architecture.md#错误与诊断三层边界) |
|
| 新增、修改或审查客户端可见错误、失败提示、后台任务状态文案 | 下方[错误文案](#错误文案),并按实际出口核对[错误与诊断三层边界](../../../docs/architecture.md#错误与诊断三层边界) |
|
||||||
| 模块或调用链变更 | [Workspace 边界](../../../docs/architecture.md#3-workspace-边界)及所属模块章节,不通读整份架构 |
|
| 模块或调用链变更 | [Workspace 边界](../../../docs/architecture.md#3-workspace-边界)及所属模块章节,不通读整份架构 |
|
||||||
| 新增、调整、清理或审查测试 | 下方[测试维护](#测试维护),按当前行为、职责归属与已有覆盖判断保留、合并或删除 |
|
| 新增、调整、清理或审查测试 | 下方[测试维护](#测试维护),按当前行为、职责归属与已有覆盖判断保留、合并或删除 |
|
||||||
| 修改部署行为、`deploy/` 配置或数据库迁移 | 按范围读取[部署](../../../deploy/README.md)、[迁移](../../../backend/migrations/README.md)对应章节 |
|
| 修改部署行为、`deploy/` 配置或数据库迁移 | 按范围读取[部署](../../../deploy/README.md)、[迁移](../../../backend/migrations/README.md)对应章节 |
|
||||||
| 修改或审查文档;实现或审查用法、公开合同、职责、约束或运维操作的变化 | [文档检查](references/documentation.md)及相关章节,尚无文档差异时也检查是否漏更;纯文档任务不默认读取代码开发、页面验收或发布流程 |
|
| 修改或审查文档;实现或审查用法、公开合同、职责、约束或运维操作的变化 | [文档检查](references/documentation.md),按最终行为核对是否漏更;纯文档任务只补读核实所述事实需要的领域条款 |
|
||||||
| 代码审查,包括 PR 审查 | [审查标准](../../../CONTRIBUTING.md#审查标准),叠加被审查行为所属领域的规范;审查默认只读 |
|
| 代码审查,包括 PR 审查 | [审查标准](../../../CONTRIBUTING.md#审查标准),叠加被审查行为所属领域的规范;审查默认只读 |
|
||||||
| PR / Issue / 发版 | 按当前意图选 [PR](../cpr-github-pr/SKILL.md)、[Issue](../cpr-github-issue/SKILL.md)或[发版](../cpr-release/SKILL.md),普通提交不创建 PR |
|
| PR / Issue / 发版 | 按当前意图选 [PR](../cpr-github-pr/SKILL.md)、[Issue](../cpr-github-issue/SKILL.md)或[发版](../cpr-release/SKILL.md),普通提交不创建 PR |
|
||||||
|
|
||||||
纯文档任务按文档分支执行;核实文中的合同与职责时读对应领域条款,不因提及代码路径或语言加载实现、构建与页面验收流程
|
|
||||||
|
|
||||||
首次命中的流程引用完整读取,并落实其中指定的必读章节;长文档先用 `rg -n '^#{1,4} ' 文件` 定位,分段读取指定章节,避免输出截断。`#章节` 不会自动截取,“按需”仅用于未命中的领域和后续操作资料,不能省略必读规范;读取记录与验证证据的复用按 [任务延续与收尾](../../../AGENTS.md#任务延续与收尾) 执行
|
|
||||||
|
|
||||||
## 参考仓库的优先级
|
|
||||||
|
|
||||||
开发、排障和代码审查先按[问题与方案依据](../../../CONTRIBUTING.md#问题与方案依据)核实问题与方案。涉及 Codex 行为时执行其中的官方行为优先约束:对应版本的官方源码优先,以透明转发和最小必要适配为默认方案,先判断偏离是否必要再评价实现
|
|
||||||
|
|
||||||
## 执行与收尾
|
## 执行与收尾
|
||||||
|
|
||||||
1. 遵守已提供的 [AGENTS.md](../../../AGENTS.md),按其 CodeGraph 约定定位代码;确认工作区、任务范围与已有改动,找到事实归属、同类实现和调用链,补齐上表命中规范及[项目约定](../../../CONTRIBUTING.md#项目约定)对应条目后再修改
|
1. 遵守已提供的 [AGENTS.md](../../../AGENTS.md),按其 CodeGraph 约定定位代码;确认工作区、任务范围与已有改动,找到事实归属、同类实现和调用链,补齐上表命中规范及[项目约定](../../../CONTRIBUTING.md#项目约定)对应条目后再修改
|
||||||
2. 以最终差异重新匹配上表,补齐新增领域的规范并检查实际实现,再处理本次引入的职责越界、重复规则、冗余状态与无依据分支;删除或替换功能时一并清理失效的配置、类型、调用、测试与文档,已部署数据和公开合同仍遵守所属迁移及兼容规则;仅审查时报告,不自行修复
|
2. 以最终差异重新匹配上表,补齐新增领域的规范并检查实际实现,再处理本次引入的职责越界、重复规则、冗余状态与无依据分支;删除或替换功能时一并清理失效的配置、类型、调用、测试与文档,已部署数据和公开合同仍遵守所属迁移及兼容规则;仅审查时报告,不自行修复
|
||||||
3. 按最终行为执行[文档检查](references/documentation.md),核对所属正文及相关概述、示例和引用,在本任务内完成必要同步;不以尚无文档差异跳过检查。内部重构等未改变文档所述事实时无需改文档;常规文档只写当前状态,普通开发不自动修改 `release/notes.md`
|
3. 在本任务内同步受影响的文档、示例和引用
|
||||||
4. 按变更范围执行[验证](../../../CONTRIBUTING.md#验证)及其停止条件,后端命令见[验证命令](../../../docs/architecture.md#验证命令);复用仍适用的验证证据与用户已确定的验收分工,区分通过、失败、跳过与未执行
|
4. 按变更范围执行[验证](../../../CONTRIBUTING.md#验证)及其停止条件,后端命令见[验证命令](../../../docs/architecture.md#验证命令);复用仍适用的验证证据与用户已确定的验收分工,区分通过、失败、跳过与未执行
|
||||||
5. 交付前按[首要写作要求](#首要写作要求言简意赅)通读本次新增或修改的文字。交代实际结果与验证缺口;前端按[前端流程](references/frontend.md)核对运行证据,后端按上表检查生命周期,不把构建通过当作行为验收
|
5. 交付前按[首要写作要求](#首要写作要求言简意赅)通读本次新增或修改的文字。交代实际结果与验证缺口;前端按[前端流程](references/frontend.md)核对运行证据,后端按上表检查生命周期,不把构建通过当作行为验收
|
||||||
6. 按授权完成提交与交付;提交前按[提交约定](../../../CONTRIBUTING.md#项目约定)准备提交信息与实际共同作者署名,提交后核对实际提交消息,PR 的 AI 披露不能替代提交署名
|
6. 按授权完成提交与交付;提交前按[提交约定](../../../CONTRIBUTING.md#项目约定)准备提交信息与实际共同作者署名,提交后核对实际提交消息,PR 的 AI 披露不能替代提交署名
|
||||||
|
|||||||
@@ -7,32 +7,11 @@
|
|||||||
- 以当前目标分支及任务内工作区的实现、配置和有效运行证据核实行为;提交记录用于发现待核实的主题,不能直接当作现行事实或按提交顺序组织正文。按 [CodeGraph 约定](../../../../AGENTS.md#codegraph)同步索引后定位,证据不足时报告缺口,不把计划或推测写成已支持能力
|
- 以当前目标分支及任务内工作区的实现、配置和有效运行证据核实行为;提交记录用于发现待核实的主题,不能直接当作现行事实或按提交顺序组织正文。按 [CodeGraph 约定](../../../../AGENTS.md#codegraph)同步索引后定位,证据不足时报告缺口,不把计划或推测写成已支持能力
|
||||||
- 开发任务按最终行为检查哪些用法、合同、职责、约束或运维操作需要同步,即使尚无 Markdown 差异也要检查;独立文档更新按用户范围核对现行说明,不等到发版时再补普通开发所需的文档
|
- 开发任务按最终行为检查哪些用法、合同、职责、约束或运维操作需要同步,即使尚无 Markdown 差异也要检查;独立文档更新按用户范围核对现行说明,不等到发版时再补普通开发所需的文档
|
||||||
- 沿同一事实查找所属正文及相关概述、示例和引用,重点核对“支持/不支持”等能力声明、默认值、配置模板和命令。概述保留必要摘要并链接详细合同;不能只更新详细章节,留下 README 或示例中的矛盾说明,也不扩展为无关全仓改写
|
- 沿同一事实查找所属正文及相关概述、示例和引用,重点核对“支持/不支持”等能力声明、默认值、配置模板和命令。概述保留必要摘要并链接详细合同;不能只更新详细章节,留下 README 或示例中的矛盾说明,也不扩展为无关全仓改写
|
||||||
|
- 涉及合同或职责时核对所属架构、API 或 SDK 条款,在所属章节就地修订。审计记录、旧数据兼容和回滚仍是现行能力时,保留读者需要的说明
|
||||||
## 写之前
|
|
||||||
|
|
||||||
先确定读者、必须说明的当前事实与所属章节,再决定是否需要修改及详略;文档职责与更新条件按上节核对。涉及合同或职责说明时,补读所属架构、API 或 SDK 的对应条款,核实事实;不因文档提及实现而执行无关的开发与构建流程
|
|
||||||
|
|
||||||
在所属章节就地替换失效说明,先组织读者现在需要的操作、结果和限制,不从变更摘要改写正文。仅介绍被替代实现、修复动机或修改经过的段落直接删除;删掉“新增”“此前”“不再”等词后仍在回答变更经过的内容,也不保留
|
|
||||||
|
|
||||||
## 逐段验收
|
|
||||||
|
|
||||||
检查工作区和暂存区中本任务的最终文档差异,并连同受影响章节及相关概述、示例通读,按内容用途处理,不只搜索关键词:
|
|
||||||
|
|
||||||
| 段落回答的问题 | 处理 |
|
|
||||||
| --- | --- |
|
|
||||||
| 现在如何使用、配置或理解结果 | 保留当前事实与必要边界,放回所属章节 |
|
|
||||||
| 谁负责状态、事务、资源和失败处理 | 放入所属架构章节,避免在 API 或部署文档复述实现 |
|
|
||||||
| 这次做了什么、以前怎样、为什么这样修、跑过哪些测试 | 移入 PR、Issue 或任务报告,不以换成现在时的方式留在常规文档 |
|
|
||||||
| 特定配置或数据状态下如何升级、恢复 | 写明适用条件、操作及限制,删除演变过程 |
|
|
||||||
| 别处已完整说明的事实 | 合并或改为必要摘要与链接 |
|
|
||||||
|
|
||||||
脱离提交日期、Issue 和本次任务背景后,读者仍应能独立理解正文
|
|
||||||
|
|
||||||
业务中的请求历史、审计记录、旧数据兼容与回滚操作是当前功能,不能因含“历史”“旧”等词而删除
|
|
||||||
|
|
||||||
## 交付检查
|
## 交付检查
|
||||||
|
|
||||||
- 完成上述逐段验收及[行文检查](../../../../CONTRIBUTING.md#层次与行文),发现问题先处理,未完成内容审查不能称文档已检查
|
- 通读工作区与暂存区中本任务的最终差异、受影响章节及相关概述和示例,按[层次与行文](../../../../CONTRIBUTING.md#层次与行文)逐段验收
|
||||||
- 检查相对链接、章节锚点、表格与命令示例,`git diff --check` 或构建通过不能代替内容审查
|
- 检查相对链接、章节锚点、表格与命令示例,`git diff --check` 或构建通过不能代替内容审查
|
||||||
- 交付时简述已同步的文档范围;涉及更新条件却未改文档时,说明现有内容为何仍准确或还有什么缺口。仅报告实际核对范围,不把链接检查通过称为事实核实,也不把检查记录写进常规文档
|
- 交付时简述已同步的文档范围;涉及更新条件却未改文档时,说明现有内容为何仍准确或还有什么缺口。仅报告实际核对范围,不把链接检查通过称为事实核实,也不把检查记录写进常规文档
|
||||||
|
|
||||||
|
|||||||
@@ -32,7 +32,8 @@
|
|||||||
对照最终差异和实际页面核对适用项,不以读取过规范代替检查:
|
对照最终差异和实际页面核对适用项,不以读取过规范代替检查:
|
||||||
|
|
||||||
- **复用与范围**:是否沿用参考页面和基础组件,已有组件能承载时不手写替代控件;共用缺陷按职责修复,修复后清理本次已失效的页面补丁,不顺带重排无关区域或新增重复入口
|
- **复用与范围**:是否沿用参考页面和基础组件,已有组件能承载时不手写替代控件;共用缺陷按职责修复,修复后清理本次已失效的页面补丁,不顺带重排无关区域或新增重复入口
|
||||||
- **文案与层级**:标点是否合规,标题、状态和帮助是否重复,详细说明与当前决策必需提示的位置是否合适
|
- **核对位置与对齐**时,结合周围内容查看实际页面或 PR 截图,确认操作归属一眼可辨,对照相邻行列检查边缘、文字基线和组间留白。发现错位时指出具体控件、对齐参照和受影响的状态
|
||||||
|
- **精简文案**,删去重复说明,压短必要提示,检查自写文案中的句号和分号
|
||||||
- **样式与状态**:是否使用对应 Token 与 utility,局部样式是否符合适用边界,受影响的主题、窄屏及交互状态是否正确
|
- **样式与状态**:是否使用对应 Token 与 utility,局部样式是否符合适用边界,受影响的主题、窄屏及交互状态是否正确
|
||||||
- **查询与动作**:区分首次加载、刷新、分页、单行与批量操作,核对 loading、禁用状态的影响范围;沿用请求层错误处理,不在页面叠加同一错误的提示
|
- **查询与动作**:区分首次加载、刷新、分页、单行与批量操作,核对 loading、禁用状态的影响范围;沿用请求层错误处理,不在页面叠加同一错误的提示
|
||||||
- **运行证据**:按界面验证核对截图与实际交互,证据对应当前实现;页面 PR 的可访问图片和 Draft 条件按该节执行
|
- **运行证据**:按界面验证核对截图与实际交互,证据对应当前实现;页面 PR 的可访问图片和 Draft 条件按该节执行
|
||||||
|
|||||||
@@ -11,20 +11,18 @@ description: 草拟、创建、补充或回复 GitHub Issue,包括缺陷、功
|
|||||||
|
|
||||||
草拟只准备正文,明确创建或提交才发布;已有授权直接执行,自动命中技能本身不授权远程写入
|
草拟只准备正文,明确创建或提交才发布;已有授权直接执行,自动命中技能本身不授权远程写入
|
||||||
|
|
||||||
补充已有 Issue 先读原帖和讨论,按授权更新或追加,不重复新建;无法推断的目标或关键事实才向用户补齐
|
补充已有 Issue 按授权更新原帖或追加评论
|
||||||
|
|
||||||
## 按动作读取与核实
|
## 按动作读取与核实
|
||||||
|
|
||||||
目标、授权、事实与脱敏要求适用于草拟、提交和回复;按下列动作读取必需规则与证据,再组织正文。症状反馈可保留未知根因,进入技术排查或方案判断时补齐对应规范
|
|
||||||
|
|
||||||
- 新建 Issue 时,读取本仓库的[提交 Issue](../../../CONTRIBUTING.md#提交-issue)及本次匹配的一张表单:[接口问题](../../../.github/ISSUE_TEMPLATE/api-bug-report.yml)、[常规问题](../../../.github/ISSUE_TEMPLATE/general-bug-report.yml)或[功能建议](../../../.github/ISSUE_TEMPLATE/feature-request.yml);协作规则提案可用普通 Issue
|
- 新建 Issue 时,读取本仓库的[提交 Issue](../../../CONTRIBUTING.md#提交-issue)及本次匹配的一张表单:[接口问题](../../../.github/ISSUE_TEMPLATE/api-bug-report.yml)、[常规问题](../../../.github/ISSUE_TEMPLATE/general-bug-report.yml)或[功能建议](../../../.github/ISSUE_TEMPLATE/feature-request.yml);协作规则提案可用普通 Issue
|
||||||
- 回复时读取原帖、相关讨论与支撑答复的证据,按下方回复口吻组织内容,不套用新建 Issue 的表单
|
- 补充或回复时先读原帖和讨论,按 [GitHub 回复口吻](../../../CONTRIBUTING.md#github-回复口吻)决定答复内容和是否追问
|
||||||
- 其他仓库读取它自己的相关规则与实际模板,长文档先定位标题再截取,不预读全部模板或 CONTRIBUTING
|
- 其他仓库读取它自己的相关规则与实际模板,长文档先定位标题再截取,不预读全部模板或 CONTRIBUTING
|
||||||
- 搜索同场景 open/closed Issues、相关 PR 和发布记录,区分主分支修复与已发布修复,不凭标题判断重复;没有新证据时返回已有链接,用户仍要求新建则按其要求处理
|
- 新建或判断重复时查找同场景的 open/closed Issues 和相关 PR,按实际场景核对。已有相同反馈且无新证据时返回原链接,用户仍要求新建则按其要求处理。答复修复状态时核对发布记录,区分已合入和已发布
|
||||||
- 需要技术排查、判断实现方案或修改时执行 [cpr-dev-guide](../cpr-dev-guide/SKILL.md)的领域必读,不能仅凭症状建议跨职责补偿;提交症状反馈不以找到根因为前提
|
- 需要技术排查、判断实现方案或修改时执行 [cpr-dev-guide](../cpr-dev-guide/SKILL.md)的领域必读,不能仅凭症状建议跨职责补偿;提交症状反馈不以找到根因为前提
|
||||||
- 引用上游行为或提出方案时执行[问题与方案依据](../../../CONTRIBUTING.md#问题与方案依据),注明适用版本、来源与缺口
|
- 引用上游行为或提出方案时执行[问题与方案依据](../../../CONTRIBUTING.md#问题与方案依据),注明适用版本、来源与缺口
|
||||||
|
|
||||||
## 正文与证据
|
## 新建 Issue 的正文
|
||||||
|
|
||||||
标题说明症状或期望行为,区分发生问题的部署版本、实测结果、预期结果与根因假设
|
标题说明症状或期望行为,区分发生问题的部署版本、实测结果、预期结果与根因假设
|
||||||
|
|
||||||
@@ -34,22 +32,14 @@ YAML 表单按 `attributes.label` 和字段顺序组织正文,手工核对必
|
|||||||
|
|
||||||
未知信息如实标明,影响理解或复现的关键事实先补齐,不提交原始 YAML、占位答案或未确认的勾选项
|
未知信息如实标明,影响理解或复现的关键事实先补齐,不提交原始 YAML、占位答案或未确认的勾选项
|
||||||
|
|
||||||
日志和附件仅含定位所需的脱敏片段,不公开凭据、完整配置或请求转储,不擅自修改代理、TUN、证书环境取证
|
labels 和 assignees 仅按模板或用户要求设置,并确认实际存在
|
||||||
|
|
||||||
附件须获授权且可访问,本机路径不算附件;labels 和 assignees 仅按模板或用户要求设置,并确认实际存在
|
|
||||||
|
|
||||||
Issue 可记录复现、排查和变更经过;涉及常规文档修改时执行[文档检查](../cpr-dev-guide/references/documentation.md)
|
Issue 可记录复现、排查和变更经过;涉及常规文档修改时执行[文档检查](../cpr-dev-guide/references/documentation.md)
|
||||||
|
|
||||||
## 回复口吻
|
|
||||||
|
|
||||||
草拟、发布或修改 Issue 回复时,按 [GitHub 回复口吻](../../../CONTRIBUTING.md#github-回复口吻)将核实结果写成面向提问者的交流答复,具体口吻规则集中维护在该节
|
|
||||||
|
|
||||||
按平常回帖的口吻写,语气自然、委婉,说清判断和原因,少用铺垫、转折和自我说明;暂不采纳或提出不同意见时说明具体原因
|
|
||||||
|
|
||||||
发送或更新前从提问者视角通读:判断和原因是否清楚,建议是否便于尝试,补充材料的用途是否明确。删去不影响理解的客套、重复解释和过程说明;发现生硬时调整整句,不能仅加缓和词,保留已核实的结论
|
|
||||||
|
|
||||||
## 发布与收尾
|
## 发布与收尾
|
||||||
|
|
||||||
|
日志和附件只含定位所需的脱敏片段,不公开凭据、完整配置或请求转储,不擅自修改代理、TUN、证书环境取证。附件须获授权且可访问,本机路径不算附件
|
||||||
|
|
||||||
使用可用连接器或 `gh`,不为提交反馈安装工具、修改仓库配置或启用服务
|
使用可用连接器或 `gh`,不为提交反馈安装工具、修改仓库配置或启用服务
|
||||||
|
|
||||||
多行正文通过结构化字段或 UTF-8 文件传递,以下变量须先从已确认的目标与正文赋值:
|
多行正文通过结构化字段或 UTF-8 文件传递,以下变量须先从已确认的目标与正文赋值:
|
||||||
@@ -58,6 +48,6 @@ Issue 可记录复现、排查和变更经过;涉及常规文档修改时执
|
|||||||
gh issue create --repo "$issue_repo" --title "$issue_title" --body-file "$issue_body_file"
|
gh issue create --repo "$issue_repo" --title "$issue_title" --body-file "$issue_body_file"
|
||||||
```
|
```
|
||||||
|
|
||||||
发布前核对目标、必填内容、脱敏与重复记录,更新时保留无关原文;不擅自评论、重开或关闭重复 Issue
|
发布前核对目标和脱敏内容,新建时确认必填项,更新时保留无关原文;不擅自评论、重开或关闭重复 Issue
|
||||||
|
|
||||||
超时或结果不明确时先查询远端再重试,发布后回读确认并返回链接;仅草拟或发布失败时提供正文并注明未提交
|
超时或结果不明确时先查询远端再重试,发布后回读确认并返回链接;仅草拟或发布失败时提供正文并注明未提交
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
interface:
|
interface:
|
||||||
display_name: "cpr-github-issue"
|
display_name: "cpr-github-issue"
|
||||||
short_description: "整理、提交或补充 Issue,核对复现、重复反馈与发布范围"
|
short_description: "草拟、提交或回复 GitHub Issue,处理缺陷反馈和功能建议"
|
||||||
default_prompt: "使用 $cpr-github-issue 按当前请求整理、提交或补充 Issue,核对目标、复现证据、重复记录和脱敏,不将草拟自动变成发布。"
|
default_prompt: "使用 $cpr-github-issue 按当前请求整理反馈或回复已有 Issue"
|
||||||
policy:
|
policy:
|
||||||
allow_implicit_invocation: true
|
allow_implicit_invocation: true
|
||||||
|
|||||||
@@ -17,8 +17,6 @@ description: 准备、创建、更新或审查 GitHub PR,含回复讨论与处
|
|||||||
|
|
||||||
为本仓库拟写或更新 PR 标题时,完整标题使用英文,沿用提交信息的 Conventional Commits 格式,例如 `fix(store): preserve client key ledgers after deletion`
|
为本仓库拟写或更新 PR 标题时,完整标题使用英文,沿用提交信息的 Conventional Commits 格式,例如 `fix(store): preserve client key ledgers after deletion`
|
||||||
|
|
||||||
涉及上游行为的判断按[问题与方案依据](../../../CONTRIBUTING.md#问题与方案依据)执行
|
|
||||||
|
|
||||||
## 按模式读取
|
## 按模式读取
|
||||||
|
|
||||||
先完成上述范围判断,再按当前动作与差异涉及的领域叠加下表。命中的流程引用完整读取,长文档读取指定章节;只复用已实际读取且仍适用的内容,单纯整理正文或回复不扩展为完整实现审查
|
先完成上述范围判断,再按当前动作与差异涉及的领域叠加下表。命中的流程引用完整读取,长文档读取指定章节;只复用已实际读取且仍适用的内容,单纯整理正文或回复不扩展为完整实现审查
|
||||||
@@ -28,22 +26,17 @@ description: 准备、创建、更新或审查 GitHub PR,含回复讨论与处
|
|||||||
| 只整理标题或描述 | 当前 PR、最终 diff、实际模板、[AI 披露](../../../CONTRIBUTING.md#ai-使用披露),在授权范围内改文案,不自行修改实现;不读取推送或审查流程 |
|
| 只整理标题或描述 | 当前 PR、最终 diff、实际模板、[AI 披露](../../../CONTRIBUTING.md#ai-使用披露),在授权范围内改文案,不自行修改实现;不读取推送或审查流程 |
|
||||||
| 创建或更新 PR | [创建流程](references/create.md)、[PR 流程](../../../CONTRIBUTING.md#pr-流程)与[规则文件保护](../../../CONTRIBUTING.md#规则文件保护) |
|
| 创建或更新 PR | [创建流程](references/create.md)、[PR 流程](../../../CONTRIBUTING.md#pr-流程)与[规则文件保护](../../../CONTRIBUTING.md#规则文件保护) |
|
||||||
| 审查 PR | [审查流程](references/review.md)、[审查标准](../../../CONTRIBUTING.md#审查标准) |
|
| 审查 PR | [审查流程](references/review.md)、[审查标准](../../../CONTRIBUTING.md#审查标准) |
|
||||||
| 回复讨论或审查意见 | 目标评论、相关上下文与实际处理结果,按下方回复口吻答复;仅回复不加载创建或完整审查流程 |
|
| 回复讨论或审查意见 | 读取目标评论和相关上下文,按[GitHub 回复口吻](../../../CONTRIBUTING.md#github-回复口吻)答复实际处理结果 |
|
||||||
| 实现自审、审查或修改代码与文档 | 执行 [cpr-dev-guide](../cpr-dev-guide/SKILL.md)的领域必读与对应检查,包括后端、插件、测试和 API 等命中项;只读审查同样执行,不能仅核对 PR 正文与 CI |
|
| 实现自审、审查或修改代码与文档 | 执行 [cpr-dev-guide](../cpr-dev-guide/SKILL.md)的领域必读与对应检查,包括后端、插件、测试和 API 等命中项;只读审查同样执行,不能仅核对 PR 正文与 CI |
|
||||||
| 含前端改动 | [前端流程](../cpr-dev-guide/references/frontend.md),核对适用规范与当前实现的运行证据 |
|
| 含前端改动 | [前端流程](../cpr-dev-guide/references/frontend.md),核对适用规范与当前实现的运行证据 |
|
||||||
| 含文档改动 | [文档检查](../cpr-dev-guide/references/documentation.md) |
|
| 含文档改动 | [文档检查](../cpr-dev-guide/references/documentation.md) |
|
||||||
|
|
||||||
## 回复口吻
|
|
||||||
|
|
||||||
草拟和发布 PR 讨论、审查意见的回复时,执行 [GitHub 回复口吻](../../../CONTRIBUTING.md#github-回复口吻)
|
|
||||||
|
|
||||||
## 创建与审查的公共核对
|
## 创建与审查的公共核对
|
||||||
|
|
||||||
- 按[问题与方案依据](../../../CONTRIBUTING.md#问题与方案依据)核实触发条件、发生版本与目标分支现状,分别判断问题是否成立、是否属于目标项目职责及方案是否必要
|
- 按[问题与方案依据](../../../CONTRIBUTING.md#问题与方案依据)核实触发条件、发生版本与目标分支现状,分别判断问题是否成立、是否属于目标项目职责及方案是否必要
|
||||||
- 核对最新目标分支及同场景 open/closed PR、Issue,按实际行为和测试判断重复,不凭标题下结论,也不擅自关闭他人 PR
|
- 核对最新目标分支及同场景 open/closed PR、Issue,按实际行为和测试判断重复,不凭标题下结论,也不擅自关闭他人 PR
|
||||||
- 自审或审查覆盖完整差异与调用链,前端与文档按模式表检查
|
- 自审或审查覆盖完整差异和调用链,按[验证](../../../CONTRIBUTING.md#验证)执行适用检查,确认结果对应当前 head
|
||||||
- 核对[AI 使用披露](../../../CONTRIBUTING.md#ai-使用披露),填写实际工具与模型,不猜型号;必需截图或型号待补时保留 Draft
|
- 核对[界面验证](../../../CONTRIBUTING.md#界面验证)要求的截图和 [AI 使用披露](../../../CONTRIBUTING.md#ai-使用披露),必需材料待补时保留 Draft
|
||||||
- 验证结果对应实际 head,区分通过、失败、跳过与未执行;无文档改动时只核对现有说明是否失真
|
|
||||||
|
|
||||||
远程操作优先使用可用连接器,`gh` 显式指定 `--repo`,多行正文使用结构化字段或 `--body-file`
|
远程操作优先使用可用连接器,`gh` 显式指定 `--repo`,多行正文使用结构化字段或 `--body-file`
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
interface:
|
interface:
|
||||||
display_name: "cpr-github-pr"
|
display_name: "cpr-github-pr"
|
||||||
short_description: "提交、更新与审查 PR,核对问题、自审、页面截图和 AI 模型披露"
|
short_description: "准备、更新或审查 GitHub PR,回复讨论和审查意见"
|
||||||
default_prompt: "使用 $cpr-github-pr 按当前请求准备、提交、更新或审查 PR,实现自审与审查叠加开发指南的领域规范,核实问题、方案、验证、页面截图和 AI 模型披露。"
|
default_prompt: "使用 $cpr-github-pr 按当前请求准备、更新、审查 PR 或回复讨论"
|
||||||
policy:
|
policy:
|
||||||
allow_implicit_invocation: true
|
allow_implicit_invocation: true
|
||||||
|
|||||||
@@ -6,16 +6,12 @@
|
|||||||
不用提交日志拼接正文,也不假定仓库一定有模板。
|
不用提交日志拼接正文,也不假定仓库一定有模板。
|
||||||
2. 更新并确认 base/head,查看相对 merge-base 的完整差异和待提交内容;核对仓库的受保护文件与准入规则。
|
2. 更新并确认 base/head,查看相对 merge-base 的完整差异和待提交内容;核对仓库的受保护文件与准入规则。
|
||||||
只纳入任务范围的文件和提交;需要整理时用独立功能分支,保留用户其他改动,不擅自改写已发布历史。
|
只纳入任务范围的文件和提交;需要整理时用独立功能分支,保留用户其他改动,不擅自改写已发布历史。
|
||||||
3. 已完成的改动也须按入口公共核对复核问题与方案。原问题不成立时不包装成已修复的缺陷,证据不足时保留结论。
|
3. 查找同一来源仓库、head 和 base 的现有 PR;已存在则复用其链接,不重复创建。
|
||||||
实现与自审按 [cpr-dev-guide](../../cpr-dev-guide/SKILL.md)执行,包括适用的后端生命周期和前端检查;需要修正时只修改已授权范围。
|
|
||||||
4. 查找同一来源仓库、head 和 base 的现有 PR;已存在则复用其链接,不重复创建。
|
|
||||||
更新现有标题或正文须在本次整理/更新请求范围内。
|
更新现有标题或正文须在本次整理/更新请求范围内。
|
||||||
5. 按[验证](../../../../CONTRIBUTING.md#验证)执行适用检查,记录对应提交或工作区状态;文档、页面证据与模型披露按入口核对。
|
4. 将任务范围内的提交推送到正确远端,核对远端 head。按实际模板写明问题依据、最终行为、自审与验证结果,附上适用的审阅材料
|
||||||
6. 将任务范围内的提交推送到正确远端,核对远端 head。标题遵循项目约定,正文先说明问题成立的依据和最终行为,
|
5. 明确要求草稿或仍有阻塞项时创建或保持 Draft PR,并说明原因;具备审查条件且未要求草稿时创建普通 PR。
|
||||||
再给必要的设计取舍、自审结论、验证与遗留事项,按模板附页面截图和 AI 使用情况。涉及上游行为时,按[问题与方案依据](../../../../CONTRIBUTING.md#问题与方案依据)写明官方源码位置、版本、处理方式及本次方案关系。按规模压缩,不强填无关章节。
|
|
||||||
7. 明确要求草稿或仍有阻塞项时创建或保持 Draft PR,并解释原因;必需截图或 AI 模型披露待补时也不标为可审阅。具备审查条件且未要求草稿时创建普通 PR。
|
|
||||||
GitHub Draft 状态与“只写本地草稿正文”不同,后者不创建远程对象。
|
GitHub Draft 状态与“只写本地草稿正文”不同,后者不创建远程对象。
|
||||||
8. 创建或更新后回读正文与附件,核对链接、base、head、草稿状态、模型披露和最新检查结果。网络超时或结果不确定时先查询远端,再决定是否重试。
|
6. 创建或更新后回读正文与附件,核对链接、base、head、草稿状态、模型披露和最新检查结果。网络超时或结果不确定时先查询远端,再决定是否重试。
|
||||||
|
|
||||||
CLI 示例中的变量必须先根据上述检查赋值;`pr_body_file` 是精确写入 UTF-8 正文的临时文件:
|
CLI 示例中的变量必须先根据上述检查赋值;`pr_body_file` 是精确写入 UTF-8 正文的临时文件:
|
||||||
|
|
||||||
|
|||||||
@@ -4,20 +4,10 @@
|
|||||||
|
|
||||||
1. 获取 PR 的 base/head SHA、描述、文件差异、已有讨论及 CI 状态。记录实际审查的 head,使用 merge-base 差异。
|
1. 获取 PR 的 base/head SHA、描述、文件差异、已有讨论及 CI 状态。记录实际审查的 head,使用 merge-base 差异。
|
||||||
需要源码上下文时先遵守目标仓库的定位规则;需检出时使用隔离工作区,保留用户当前分支和运行环境。
|
需要源码上下文时先遵守目标仓库的定位规则;需检出时使用隔离工作区,保留用户当前分支和运行环境。
|
||||||
按实际行为与文件执行 [cpr-dev-guide](../../cpr-dev-guide/SKILL.md)的领域必读,再判断方案与实现;只读审查也核对职责边界与生命周期。
|
2. 对照目标分支区分原有问题、环境差异和本次引入或加重的问题。修改既有特殊分支时,查清它原先服务的场景
|
||||||
2. 按入口公共核对在目标分支基线核实问题,区分原有问题、环境或配置差异与 PR 新引入的问题,说明主分支已覆盖的部分。
|
3. 根据风险补充必要验证。浏览器可用时实测受影响的交互,避免触发无关部署或真实账号业务请求
|
||||||
3. 按[问题与方案依据](../../../../CONTRIBUTING.md#问题与方案依据)评估解决方向,涉及上游时说明官方处理方式及本次方案关系;缺少必要性依据的偏离明确指出,不因测试通过就认定方案合理。
|
4. 用中文说明问题是否成立、方案是否合理,再报告可定位的实现问题与验证缺口。建议复用时指出已有实现;未发现问题时交代实际覆盖范围
|
||||||
4. 按[审查标准](../../../../CONTRIBUTING.md#审查标准)追踪完整调用链,找到共享业务事实、同类实现及已有验证。
|
5. 结束前复核 head。发生变化时检查新增差异并更新结论,或明确结论只适用于原 SHA
|
||||||
对既有特殊分支查清服务的场景,再判断本次改动是否引入或加重问题。
|
|
||||||
主动检查本次变更新引入或加重的冗余与代码异味,说明具体位置、维护成本或行为影响及最小修复方向;
|
|
||||||
不能仅因功能可用、CI 通过而略过,也不把个人写法偏好判为缺陷。
|
|
||||||
5. 前端改动执行[前端流程](../../cpr-dev-guide/references/frontend.md),浏览器可用时检查相关交互;缺少必需截图时要求补齐并列为未具备审阅条件。
|
|
||||||
6. 核对 CI 与本地证据是否覆盖当前 head;根据风险补充必要验证,不触发无关部署或真实账号业务请求。
|
|
||||||
文档差异按[文档检查](../../cpr-dev-guide/references/documentation.md)核对最终 diff。
|
|
||||||
核对 AI 使用与模型披露,缺项明确指出。工具不可用、集成测试跳过或环境不足时具体说明影响范围。
|
|
||||||
7. 按审查标准用中文输出问题是否成立、方案是否合理及对应依据,再列实现问题与验证缺口;复用建议指出具体已有实现。
|
|
||||||
没有问题的类别可省略,未发现问题时直接说明并交代覆盖范围。
|
|
||||||
8. 结束前核对 head 是否变化。发生变化时检查新增差异并更新结论,或明确结论只适用于原 SHA。
|
|
||||||
|
|
||||||
审查本身不修改源码、不发表评论、不提交 GitHub 的批准或请求修改状态。
|
审查本身不修改源码、不发表评论、不提交 GitHub 的批准或请求修改状态。
|
||||||
用户明确要求发布时,先复核当前 head 和重复评论,再通过结构化字段或 `--body-file` 发布对应内容;
|
用户明确要求发布时,先复核当前 head 和重复评论,再通过结构化字段或 `--body-file` 发布对应内容;
|
||||||
|
|||||||
@@ -1,17 +1,13 @@
|
|||||||
---
|
---
|
||||||
name: cpr-plugin-dev
|
name: cpr-plugin-dev
|
||||||
description: 开发、修复、排查、审查或打包 Codex Proxy RS 独立网关插件,含处理器、清单与插件页面;仅改宿主能力时使用 cpr-dev-guide 的插件边界,不适用于 Codex 插件或 Vue 插件
|
description: Codex Proxy RS 独立网关插件的开发、排障、审查与打包
|
||||||
---
|
---
|
||||||
|
|
||||||
# 网关插件开发
|
# 网关插件开发
|
||||||
|
|
||||||
## 先读职责边界
|
## 先读职责边界
|
||||||
|
|
||||||
插件在独立项目中通过公开 SDK 实现业务,插件业务错误在插件侧修复;宿主维护自身合同、资源与稳定性,不猜测插件意图、不补造业务数据,不在宿主、SDK 或 Runtime 中增加插件专属补偿
|
开发、排查或审查独立插件时,执行 [cpr-dev-guide](../cpr-dev-guide/SKILL.md) 并先读[插件职责边界](../cpr-dev-guide/references/plugin-boundaries.md),包括修改已有处理器或页面。仅构建、打包或分发已有插件时,按下表读取对应步骤
|
||||||
|
|
||||||
开发、排查和审查先完整读取[插件职责边界](../cpr-dev-guide/references/plugin-boundaries.md),再选择实现步骤;已有处理器修复和页面改动也执行,不以是否新增能力为条件。需要新增宿主能力时,先界定可独立使用的基础接口及其职责;必要的协议保护与资源回收仍由宿主负责
|
|
||||||
|
|
||||||
同时执行 [cpr-dev-guide](../cpr-dev-guide/SKILL.md)的领域必读与收尾要求;已实际读取且仍适用的内容复用,不递归重读入口。仅构建、打包或分发已有插件时按对应操作读取,若需诊断或修改行为,再补齐开发分支
|
|
||||||
|
|
||||||
## 范围与合同
|
## 范围与合同
|
||||||
|
|
||||||
|
|||||||
@@ -61,6 +61,6 @@ release/publish "$release_version"
|
|||||||
工作流附加的安装说明和自动提交列表按其当前配置处理,不用它们替代手写的中文变更说明。
|
工作流附加的安装说明和自动提交列表按其当前配置处理,不用它们替代手写的中文变更说明。
|
||||||
- 回读 `main:release/version.yaml` 的 `published`。正式版参与同一大版本四个普通通道的比较;RC 参与 RC、Beta、Alpha,Beta 参与 Beta、Alpha,Alpha 只参与自身。实验版只推进 `exp["X.Y.Z"]`。有通道推进时应有 `chore(release): update release channels to <version>` 提交;重复执行或较旧版本未推进任何通道时无提交
|
- 回读 `main:release/version.yaml` 的 `published`。正式版参与同一大版本四个普通通道的比较;RC 参与 RC、Beta、Alpha,Beta 参与 Beta、Alpha,Alpha 只参与自身。实验版只推进 `exp["X.Y.Z"]`。有通道推进时应有 `chore(release): update release channels to <version>` 提交;重复执行或较旧版本未推进任何通道时无提交
|
||||||
- 通道表写入失败时,确认该版本已公开、工作流能写入 `main`,再按已有授权执行 `gh workflow run release.yml --ref main -f tag="v$release_version" -f index_only=true`。恢复任务重新校验公开附件、读取并合并当前清单,不重新打包或改 tag
|
- 通道表写入失败时,确认该版本已公开、工作流能写入 `main`,再按已有授权执行 `gh workflow run release.yml --ref main -f tag="v$release_version" -f index_only=true`。恢复任务重新校验公开附件、读取并合并当前清单,不重新打包或改 tag
|
||||||
- v3.42.0 在线升级:首个包含新更新器的 3.x 正式版公开并通过校验后,从该次通道提交取出 `release/version.yaml`,将顶层 `version` 设为该正式版,作为同名附件上传到该 Release。回读附件,确认 3.x 稳定通道指向该版本且安装包可用,再手动将已有 `update-index` 正文改为 `{"current":"<该正式版>"}`。此后保留该页与附件,无需再编辑
|
- 保留 v3.42.0 在线升级使用的 `update-index` 页面和 v3.42.1 的 `version.yaml` 附件
|
||||||
- 返回版本、tag 对应提交、Release/工作流链接及实际结果。失败、仍在构建或缺失产物时明确说明,不能称为发布成功;
|
- 返回版本、tag 对应提交、Release/工作流链接及实际结果。失败、仍在构建或缺失产物时明确说明,不能称为发布成功;
|
||||||
Release 和镜像已生成也不表示用户的运行实例已经升级。
|
Release 和镜像已生成也不表示用户的运行实例已经升级。
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ jobs:
|
|||||||
CPR_TEST_REDIS_URL: redis://127.0.0.1:6379
|
CPR_TEST_REDIS_URL: redis://127.0.0.1:6379
|
||||||
services:
|
services:
|
||||||
postgres:
|
postgres:
|
||||||
image: postgres:18-bookworm@sha256:bbf83594798e144bff365a9c191c5d779f181fb3135902064ab8ff11918020fc
|
image: postgres:18-bookworm@sha256:194e55feb2597b1465dbee81cc9fd8d204566cd2eb42c8d22fd6c931a38781b1
|
||||||
env:
|
env:
|
||||||
POSTGRES_DB: codex_proxy
|
POSTGRES_DB: codex_proxy
|
||||||
POSTGRES_USER: codex_proxy
|
POSTGRES_USER: codex_proxy
|
||||||
@@ -49,7 +49,7 @@ jobs:
|
|||||||
--health-timeout 5s
|
--health-timeout 5s
|
||||||
--health-retries 10
|
--health-retries 10
|
||||||
redis:
|
redis:
|
||||||
image: redis:8-alpine@sha256:0bf6577d7774e592b29d093e3ac9390eb91e13d72c21e506afce736de5e0eeb0
|
image: redis:8-alpine@sha256:7958cfbb9d152f87dadfbc89f1b0b15938f0b81ff8982feb327476f4911935c3
|
||||||
ports:
|
ports:
|
||||||
- 6379:6379
|
- 6379:6379
|
||||||
options: >-
|
options: >-
|
||||||
@@ -125,7 +125,7 @@ jobs:
|
|||||||
run: cargo clippy --all-targets --all-features --locked -- -D warnings
|
run: cargo clippy --all-targets --all-features --locked -- -D warnings
|
||||||
|
|
||||||
- name: Setup nextest
|
- name: Setup nextest
|
||||||
uses: taiki-e/install-action@3a3daafd3b7f23b8f65d9f5ba2db203fb59b79e2 # v2.90.2
|
uses: taiki-e/install-action@cfdb7ed4ccc7c7dce37759eae89dc5674b469b39 # v2.90.3
|
||||||
with:
|
with:
|
||||||
tool: cargo-nextest@0.9.143
|
tool: cargo-nextest@0.9.143
|
||||||
fallback: none
|
fallback: none
|
||||||
|
|||||||
@@ -115,7 +115,7 @@ jobs:
|
|||||||
cache-bin: false
|
cache-bin: false
|
||||||
save-if: ${{ github.event_name != 'pull_request' }}
|
save-if: ${{ github.event_name != 'pull_request' }}
|
||||||
- name: Setup nextest
|
- name: Setup nextest
|
||||||
uses: taiki-e/install-action@3a3daafd3b7f23b8f65d9f5ba2db203fb59b79e2 # v2.90.2
|
uses: taiki-e/install-action@cfdb7ed4ccc7c7dce37759eae89dc5674b469b39 # v2.90.3
|
||||||
with:
|
with:
|
||||||
tool: cargo-nextest@0.9.143
|
tool: cargo-nextest@0.9.143
|
||||||
fallback: none
|
fallback: none
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ jobs:
|
|||||||
ref: ${{ inputs.ref || github.event.pull_request.head.sha || github.sha }}
|
ref: ${{ inputs.ref || github.event.pull_request.head.sha || github.sha }}
|
||||||
|
|
||||||
- name: Install cargo-audit
|
- name: Install cargo-audit
|
||||||
uses: taiki-e/install-action@3a3daafd3b7f23b8f65d9f5ba2db203fb59b79e2 # v2.90.2
|
uses: taiki-e/install-action@cfdb7ed4ccc7c7dce37759eae89dc5674b469b39 # v2.90.3
|
||||||
with:
|
with:
|
||||||
tool: cargo-audit@0.22.2
|
tool: cargo-audit@0.22.2
|
||||||
fallback: none
|
fallback: none
|
||||||
|
|||||||
@@ -25,6 +25,7 @@
|
|||||||
.env
|
.env
|
||||||
.env.*
|
.env.*
|
||||||
!.env.example
|
!.env.example
|
||||||
|
!/frontend/.env
|
||||||
|
|
||||||
# Editors and operating systems
|
# Editors and operating systems
|
||||||
/.idea/
|
/.idea/
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
| 任务意图与常见说法 | 必用技能 |
|
| 任务意图与常见说法 | 必用技能 |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| 开发、修复、排障、代码审查、改文档;包括“改弹窗/样式/文案”“修接口/调度/数据库”等省略请求 | [cpr-dev-guide](.agents/skills/cpr-dev-guide/SKILL.md),按实际操作和文件匹配规范,跨前后端同时执行 |
|
| 需求评估、排障、开发、修复、代码审查、改文档,包括“看下这个 Issue”“改弹窗/样式/文案”“修接口/调度/数据库” | [cpr-dev-guide](.agents/skills/cpr-dev-guide/SKILL.md),按实际操作和文件匹配规范,跨前后端同时执行 |
|
||||||
| 提交/提个 PR、准备或更新 PR、看下 PR、回复 PR 讨论、处理 PR 审查意见 | [cpr-github-pr](.agents/skills/cpr-github-pr/SKILL.md);实现自审、审查或修改同时执行 cpr-dev-guide |
|
| 提交/提个 PR、准备或更新 PR、看下 PR、回复 PR 讨论、处理 PR 审查意见 | [cpr-github-pr](.agents/skills/cpr-github-pr/SKILL.md);实现自审、审查或修改同时执行 cpr-dev-guide |
|
||||||
| 提 Issue、反馈到仓库、把问题或建议整理成 Issue、补充或回复 Issue | [cpr-github-issue](.agents/skills/cpr-github-issue/SKILL.md) |
|
| 提 Issue、反馈到仓库、把问题或建议整理成 Issue、补充或回复 Issue | [cpr-github-issue](.agents/skills/cpr-github-issue/SKILL.md) |
|
||||||
| 写、修或审查独立网关插件,排查插件接入、打包插件 | [cpr-plugin-dev](.agents/skills/cpr-plugin-dev/SKILL.md),同时执行 cpr-dev-guide;仅改宿主能力时由 cpr-dev-guide 加载插件边界 |
|
| 写、修或审查独立网关插件,排查插件接入、打包插件 | [cpr-plugin-dev](.agents/skills/cpr-plugin-dev/SKILL.md),同时执行 cpr-dev-guide;仅改宿主能力时由 cpr-dev-guide 加载插件边界 |
|
||||||
|
|||||||
+4
-10
@@ -21,17 +21,11 @@
|
|||||||
|
|
||||||
### GitHub 回复口吻
|
### GitHub 回复口吻
|
||||||
|
|
||||||
AI 草拟、发布或修改 Issue、PR 讨论及审查意见的回复时,以一起排查问题、讨论方案的口吻交流:
|
Issue 和 PR 回帖直接回应对方遇到的问题,有不同意见时结合具体场景说明理由。语气自然、委婉,用短句,少用句号。说明个人判断或行动时用“我”,确需提问时称呼一次“佬”
|
||||||
|
|
||||||
- 围绕问题、事实和结论展开,能自然省略主语时省略;需要说明个人判断或行动归属时用“我”,避免反复以“我”起句或强调自己,不用“我们”“本助手”代称自己
|
- 用法问题给出操作入口,功能取舍或关闭 Issue 说明与该场景相关的原因,有可行替代办法时再提。问题已答清即可结束
|
||||||
- 普通回复直接回应问题,不加问候语或称呼;向对方提问时称呼“佬”,同一条回复不重复称呼
|
- 排障先看原帖、已有材料和自己能核实的实现或发布记录。回复只附有助于理解结论或采取行动的排查信息,如相关版本、复现结果或脱敏片段。区分推测和实测
|
||||||
- 先接住对方想完成的事和遇到的困难,再给出核实结果与建议;回复让对方感到问题被理解、有下一步可做,避免一上来归类、纠正或划定责任
|
- 只有缺失信息会改变判断或处理方式,且只能由对方提供时才追问。说清需要哪一项、用来区分什么情况
|
||||||
- 给出操作建议时说明它能帮助判断什么,措辞自然、委婉,不靠堆叠缓和词修饰命令
|
|
||||||
- 回应已有能力、暂不支持或未采纳的建议时,结合场景说明可用入口或具体原因,有可行替代办法时一并说明,再交代必要边界;避免只回复“已有功能”“重复问题”“不在范围内”等结论
|
|
||||||
- 需要补充材料或配合操作时,先利用已有信息,只询问仍缺少的部分,说明用途和最小范围;例如“佬,方便再观察几次吗?如果还出现,可以附一下对应请求的诊断包,便于对照终态用量”
|
|
||||||
- 澄清误解或提出不同意见时,从观察和依据说起,照顾对方的使用环境与理解路径,避免责备、反问或居高临下的判断;已确认的事实保持明确,尚未确认的原因保留余地
|
|
||||||
- 使用自然短句,简单回复用短段,并列信息较多时再分点;少用句号,避免客服套话、机械模板和空泛保证
|
|
||||||
- 排查、复现、修改和验证的完成状态与实际一致;未采纳的意见说明依据,未确认、待处理或未验证的内容如实交代,说清结论、限制和下一步
|
|
||||||
|
|
||||||
## 问题与方案依据
|
## 问题与方案依据
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@
|
|||||||
[](https://github.com/zyycn/codex-proxy-rs/pkgs/container/codex-proxy-rs)
|
[](https://github.com/zyycn/codex-proxy-rs/pkgs/container/codex-proxy-rs)
|
||||||
[](LICENSE)
|
[](LICENSE)
|
||||||
|
|
||||||
[快速预览](#快速预览) · [快速开始](#快速开始) · [客户端接入](#客户端接入) · [文档](#文档) · [社区](#社区) · [许可证](#许可证)
|
[快速预览](#快速预览) · [快速开始](#快速开始) · [文档](#文档) · [社区](#社区) · [贡献者](#贡献者) · [Star History](#star-history) · [支持项目](#支持项目) · [许可证](#许可证)
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
@@ -21,105 +21,28 @@
|
|||||||
|
|
||||||
## 快速预览
|
## 快速预览
|
||||||
|
|
||||||
无需部署即可体验管理端的系统概览、账号分组、代理管理与用量统计:
|
|
||||||
|
|
||||||
| 登录信息 | 默认值 |
|
| 登录信息 | 默认值 |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| 地址 | <https://codex-proxy-rs.ainz.cc> |
|
| 地址 | <https://codex-proxy-rs.ainz.cc> |
|
||||||
| 登录身份 | 管理员 |
|
|
||||||
| 账号 | `admin@cpr.local` |
|
| 账号 | `admin@cpr.local` |
|
||||||
| 密码 | `039c18de2aeac46d23ead7766bb07bbbe3747233c66a128e` |
|
| 密码 | `039c18de2aeac46d23ead7766bb07bbbe3747233c66a128e` |
|
||||||
|
|
||||||
预览服务运行已发布版本,展示的账号、代理与使用记录均为模拟数据,每天北京时间 `00:00` 自动生成当天数据
|
|
||||||
|
|
||||||
这是公开共享的功能预览环境,不提供真实模型调用;请勿导入真实账号、密钥或其他敏感信息
|
|
||||||
|
|
||||||
## 快速开始
|
## 快速开始
|
||||||
|
|
||||||
使用 Docker Compose 部署版本固定的发布镜像,同时启动 PostgreSQL 和 Redis
|
在已安装 Docker Engine、Docker Compose Plugin、curl 和 OpenSSL 的 Linux amd64/arm64 主机上运行
|
||||||
|
|
||||||
以下命令适用于 Linux amd64/arm64,需要 Docker Engine、Docker Compose Plugin、curl 和 OpenSSL
|
|
||||||
|
|
||||||
macOS 从[发行页](https://github.com/zyycn/codex-proxy-rs/releases)下载对应的归档:Intel 机型选 `darwin_amd64`,Apple Silicon 机型选 `darwin_arm64`。
|
|
||||||
Windows x64 / ARM64 的安装步骤见 [Windows 二进制部署](deploy/README.md#windows-二进制部署)
|
|
||||||
|
|
||||||
已有部署请先看 [升级说明](deploy/README.md#镜像升级与源码构建),不要覆盖原配置
|
|
||||||
|
|
||||||
### 一键安装
|
|
||||||
|
|
||||||
请确保当前用户能访问 Docker,并可通过 `sudo` 或 root 设置目录权限
|
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
curl -fsSL https://raw.githubusercontent.com/zyycn/codex-proxy-rs/main/deploy/install.sh -o install.sh && bash install.sh
|
curl -fsSL https://raw.githubusercontent.com/zyycn/codex-proxy-rs/main/deploy/install.sh -o install.sh && bash install.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
[安装脚本](deploy/install.sh) 默认安装到当前目录下的 `codex-proxy-rs/`,下载同一正式 Release 的部署文件,
|
[安装脚本选项](deploy/README.md#安装脚本选项) · [macOS 发行包](https://github.com/zyycn/codex-proxy-rs/releases) · [Windows 安装](deploy/README.md#windows-二进制部署) · [已有部署升级](deploy/README.md#镜像升级与源码构建)
|
||||||
自动生成密码、设置目录权限并启动服务
|
|
||||||
|
|
||||||
完成后保存显示的访问地址和管理员密码,再[登录管理端](#登录管理端)并[添加账号与客户端密钥](#添加账号与客户端密钥)
|
|
||||||
|
|
||||||
可在执行 `bash install.sh` 时传入环境变量:
|
|
||||||
|
|
||||||
| 变量 | 用途 | 默认值 |
|
|
||||||
| --- | --- | --- |
|
|
||||||
| `INSTALL_DIR` | 安装目录,建议使用绝对路径 | 当前目录下的 `codex-proxy-rs/` |
|
|
||||||
| `CPR_RELEASE_TAG` | 指定发布标签 | 最新正式版本 |
|
|
||||||
| `ADMIN_PASSWORD` | 管理员初始密码,至少 12 位,不能包含 `$`,不能使用常见弱口令 | 随机生成 |
|
|
||||||
|
|
||||||
例如,自定义安装目录:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
INSTALL_DIR="$HOME/services/codex-proxy-rs" bash install.sh
|
|
||||||
```
|
|
||||||
|
|
||||||
重复运行时请使用同一安装目录,检测到 `deploy/config.yaml` 后,脚本保留现有配置和部署文件,
|
|
||||||
忽略传入的管理员密码,也不执行版本升级
|
|
||||||
|
|
||||||
### 手动安装
|
|
||||||
|
|
||||||
自行下载部署文件、配置密码和启动服务的完整步骤见 [部署文档](deploy/README.md#手动安装)
|
|
||||||
|
|
||||||
### 登录管理端
|
|
||||||
|
|
||||||
部署完成后,打开 `http://127.0.0.1:8080`,使用 `admin@cpr.local` 和管理员密码登录
|
|
||||||
|
|
||||||
API Key 持有者可在登录页切换身份,查看自己的用量与额度,并通过「密钥配置」复制 Codex 配置或导入 CC Switch
|
|
||||||
|
|
||||||
默认地址只能在服务器本机访问,从其他设备使用时,需要配置
|
|
||||||
[HTTPS 反向代理](deploy/README.md#公网访问)
|
|
||||||
|
|
||||||
### 添加账号与客户端密钥
|
|
||||||
|
|
||||||
1. 在「账号」中添加账号,完成授权或导入
|
|
||||||
2. 按需建立账号分组,再创建客户端密钥并选择可用分组,**不选分组表示可使用全部账号**
|
|
||||||
3. [连接客户端](#客户端接入)
|
|
||||||
|
|
||||||
## 客户端接入
|
|
||||||
|
|
||||||
**Codex CLI / 桌面端**:在「使用密钥」中按操作系统复制配置,合并配置后重启 Codex;也可通过「导入到」把服务连接与密钥添加到 CC Switch
|
|
||||||
|
|
||||||
完整步骤、生图配置与排障见[客户端配置](deploy/README.md#客户端配置)
|
|
||||||
|
|
||||||
**其他 API 客户端**:API Key 填写管理端创建的客户端密钥。按客户端自动追加的请求路径填写 Base URL;远程接入时将本机地址换成服务器的 HTTPS 地址
|
|
||||||
|
|
||||||
| 客户端自动追加的路径 | Base URL(本机部署) |
|
|
||||||
| --- | --- |
|
|
||||||
| OpenAI Responses:`/responses`;Chat Completions:`/chat/completions` | `http://127.0.0.1:8080/v1` |
|
|
||||||
| Anthropic Messages:`/v1/messages` | `http://127.0.0.1:8080` |
|
|
||||||
|
|
||||||
查询该密钥可见的模型目录:
|
|
||||||
|
|
||||||
```bash
|
|
||||||
curl http://127.0.0.1:8080/v1/models \
|
|
||||||
-H 'Authorization: Bearer <client-api-key>'
|
|
||||||
```
|
|
||||||
|
|
||||||
## 文档
|
## 文档
|
||||||
|
|
||||||
| 任务 | 文档 |
|
| 主题 | 文档 |
|
||||||
| --- | --- |
|
| --- | --- |
|
||||||
| 部署与使用 | [部署、备份与恢复](deploy/README.md) · [客户端接入与生图](deploy/README.md#客户端配置) |
|
| 部署与使用 | [部署、备份与恢复](deploy/README.md) · [客户端接入](deploy/README.md#客户端配置) |
|
||||||
| 接口集成 | [API 参考](docs/api.md) · [模型定价](docs/api.md#模型定价) |
|
| 接口集成 | [API 参考](docs/api.md) · [模型目录](docs/api.md#模型目录) · [模型定价](docs/api.md#模型定价) |
|
||||||
| 使用插件 | [安装、配置与使用](docs/plugins.md) |
|
| 使用插件 | [安装、配置与使用](docs/plugins.md) |
|
||||||
| 开发插件 | [SDK 与合同](backend/crates/gateway-plugin/sdk/README.md) · [打包工具](backend/apps/plugin-cli/README.md) · [官方示例](https://github.com/zyycn/codex-proxy-plugins/blob/main/README.md) |
|
| 开发插件 | [SDK 与合同](backend/crates/gateway-plugin/sdk/README.md) · [打包工具](backend/apps/plugin-cli/README.md) · [官方示例](https://github.com/zyycn/codex-proxy-plugins/blob/main/README.md) |
|
||||||
| 开发共用组件 | [组件库说明](https://github.com/zyycn/codex-proxy-ui/blob/main/README.md) · [组件参考](https://github.com/zyycn/codex-proxy-ui/blob/main/playground/components/index.md) · [Playground](https://zyycn.github.io/codex-proxy-ui/) |
|
| 开发共用组件 | [组件库说明](https://github.com/zyycn/codex-proxy-ui/blob/main/README.md) · [组件参考](https://github.com/zyycn/codex-proxy-ui/blob/main/playground/components/index.md) · [Playground](https://zyycn.github.io/codex-proxy-ui/) |
|
||||||
@@ -132,6 +55,28 @@ curl http://127.0.0.1:8080/v1/models \
|
|||||||
|
|
||||||
感谢 [LINUX DO](https://linux.do) 社区提供开放、友善的技术交流平台
|
感谢 [LINUX DO](https://linux.do) 社区提供开放、友善的技术交流平台
|
||||||
|
|
||||||
|
## 贡献者
|
||||||
|
|
||||||
|
[<img src="https://contrib.rocks/image?repo=zyycn/codex-proxy-rs&columns=10" alt="查看 GitHub 贡献者列表" width="480">](https://github.com/zyycn/codex-proxy-rs/graphs/contributors)
|
||||||
|
|
||||||
|
## Star History
|
||||||
|
|
||||||
|
<a href="https://simrepo.dera.page/#zyycn/codex-proxy-rs&Date">
|
||||||
|
<picture>
|
||||||
|
<source media="(prefers-color-scheme: dark)" srcset="https://simrepo.dera.page/svg?repos=zyycn/codex-proxy-rs&type=Date&theme=dark">
|
||||||
|
<img src="https://simrepo.dera.page/svg?repos=zyycn/codex-proxy-rs&type=Date" alt="Codex Proxy RS 的 GitHub Star 增长趋势" width="560">
|
||||||
|
</picture>
|
||||||
|
</a>
|
||||||
|
|
||||||
|
## 支持项目
|
||||||
|
|
||||||
|
如果 Codex Proxy RS 帮助到你了,欢迎请我喝杯咖啡 ☕
|
||||||
|
|
||||||
|
[](https://ko-fi.com/zyycn)
|
||||||
|
|
||||||
|
[<img src="docs/donations/wechat-tips.png" alt="WeChat appreciation code" width="138">](docs/donations/wechat-tips.png)
|
||||||
|
[<img src="docs/donations/alipay.png" alt="Alipay QR code" width="138">](docs/donations/alipay.png)
|
||||||
|
|
||||||
## 许可证
|
## 许可证
|
||||||
|
|
||||||
本项目基于 [Apache License 2.0](LICENSE) 开源
|
本项目基于 [Apache License 2.0](LICENSE) 开源
|
||||||
|
|||||||
Generated
+112
-66
@@ -204,7 +204,7 @@ checksum = "82f6aeea286b8eb4dd3431a1be1b59d290ace00f5bfd8e2a159bc2a05e2c1667"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 3.0.9",
|
"syn 3.0.10",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -266,9 +266,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aws-runtime"
|
name = "aws-runtime"
|
||||||
version = "1.10.2"
|
version = "1.10.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9a0cc2144962cc5e358467b16e3d82981b1d424a7c3d34602be0036103814a1a"
|
checksum = "de8930c11353c72ae54aa24dc94d692df74d59814839cbaf8069d63dbcb4c519"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aws-credential-types",
|
"aws-credential-types",
|
||||||
"aws-sigv4",
|
"aws-sigv4",
|
||||||
@@ -292,9 +292,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aws-sdk-s3"
|
name = "aws-sdk-s3"
|
||||||
version = "1.157.0"
|
version = "1.159.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6ea9794c741520d8baec9462bcd0ad12164d4f5f78d008a8da9d6a0b7222caa8"
|
checksum = "8d5c431c5db2f1f6f536c2a19425575e28273859c6ab399d9ac957f73678c7db"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arc-swap",
|
"arc-swap",
|
||||||
"aws-credential-types",
|
"aws-credential-types",
|
||||||
@@ -318,7 +318,7 @@ dependencies = [
|
|||||||
"hmac",
|
"hmac",
|
||||||
"http",
|
"http",
|
||||||
"http-body",
|
"http-body",
|
||||||
"lru",
|
"lru 0.18.5",
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
"regex-lite",
|
"regex-lite",
|
||||||
"sha2",
|
"sha2",
|
||||||
@@ -328,9 +328,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aws-sigv4"
|
name = "aws-sigv4"
|
||||||
version = "1.6.4"
|
version = "1.6.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f385da9b7757ed4c8214797ad663ff534fb622006143530aa80e21f8e06ff85c"
|
checksum = "57a4393e6addc3380632887b0998d06ad5f099ab5c478be0a3eeedecf8604161"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aws-credential-types",
|
"aws-credential-types",
|
||||||
"aws-smithy-eventstream",
|
"aws-smithy-eventstream",
|
||||||
@@ -361,9 +361,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aws-smithy-checksums"
|
name = "aws-smithy-checksums"
|
||||||
version = "0.65.0"
|
version = "0.65.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b67ecd999972b58e67cab052f5129906c08c25883bd0788ceefc55ef97d61307"
|
checksum = "ab2f2d12a431aab3703d55277278bad45f02208569b11506220b95fdc1ef0507"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aws-smithy-http",
|
"aws-smithy-http",
|
||||||
"aws-smithy-types",
|
"aws-smithy-types",
|
||||||
@@ -449,18 +449,20 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aws-smithy-observability"
|
name = "aws-smithy-observability"
|
||||||
version = "0.3.0"
|
version = "0.3.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8e86338c869539a581bf161247762a6e87f92c5c075060057b5ed6d06632ed0c"
|
checksum = "a416257d7b1b0f32a517a470a8c1dd354d8c4aa697ccab81a11a1e6cfb7418e3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aws-smithy-runtime-api",
|
"aws-smithy-runtime-api",
|
||||||
|
"aws-smithy-types",
|
||||||
|
"tracing",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aws-smithy-runtime"
|
name = "aws-smithy-runtime"
|
||||||
version = "1.16.2"
|
version = "1.16.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4cb80fb19c084da5fca9d797845735e184445e5b958599440d67529bf6ef1b64"
|
checksum = "5bc688673e282f42d3152dcd9cacc1a9a75734d7cd39d02e58989276fc750f3c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aws-smithy-async",
|
"aws-smithy-async",
|
||||||
"aws-smithy-http",
|
"aws-smithy-http",
|
||||||
@@ -481,9 +483,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aws-smithy-runtime-api"
|
name = "aws-smithy-runtime-api"
|
||||||
version = "1.19.2"
|
version = "1.21.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8c4e85cffe9944b10d576b075432bd8f98dbc081e8681cb37d5b2d87dc27bc84"
|
checksum = "0467a2414e84b1b01e37452896fb3562b93926e81c619eba6ecf27ce9e682a0e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aws-smithy-async",
|
"aws-smithy-async",
|
||||||
"aws-smithy-runtime-api-macros",
|
"aws-smithy-runtime-api-macros",
|
||||||
@@ -509,9 +511,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aws-smithy-schema"
|
name = "aws-smithy-schema"
|
||||||
version = "1.1.2"
|
version = "1.2.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9543fc722ed4865ab29fb66bd7ed0bef7b029d265ba8c587144511e30006d431"
|
checksum = "f7ef30d39e131651359b60a1c560de9a9502a4c3754172ab2d6e8734fe21bcba"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aws-smithy-runtime-api",
|
"aws-smithy-runtime-api",
|
||||||
"aws-smithy-types",
|
"aws-smithy-types",
|
||||||
@@ -520,9 +522,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "aws-smithy-types"
|
name = "aws-smithy-types"
|
||||||
version = "1.9.1"
|
version = "1.9.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cf183d70774ea2cfcc101ca74a8884e4c76be8b9df65cd303f6a1175c88e8f80"
|
checksum = "aff4bf014c512840b2bba80a20417b723cbd6a0a65c02e2d81f50b4268aedfc7"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64-simd",
|
"base64-simd",
|
||||||
"bytes",
|
"bytes",
|
||||||
@@ -532,7 +534,6 @@ dependencies = [
|
|||||||
"http-body",
|
"http-body",
|
||||||
"http-body-util",
|
"http-body-util",
|
||||||
"itoa",
|
"itoa",
|
||||||
"num-integer",
|
|
||||||
"pin-project-lite",
|
"pin-project-lite",
|
||||||
"ryu",
|
"ryu",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -870,7 +871,7 @@ dependencies = [
|
|||||||
"heck",
|
"heck",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 3.0.9",
|
"syn 3.0.10",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -924,7 +925,7 @@ dependencies = [
|
|||||||
"provider-xai",
|
"provider-xai",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"syn 3.0.9",
|
"syn 3.0.10",
|
||||||
"tempfile",
|
"tempfile",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"tokio",
|
"tokio",
|
||||||
@@ -992,6 +993,15 @@ version = "0.10.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
|
checksum = "a6ef517f0926dd24a1582492c791b6a4818a4d94e789a334894aa15b0d12f55c"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "constant_time_eq"
|
||||||
|
version = "0.6.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9eb6feb175df65d0a3ccd3e73484e940d0ac664e8034f0519fd49a93db3071d9"
|
||||||
|
dependencies = [
|
||||||
|
"rustversion",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cookie"
|
name = "cookie"
|
||||||
version = "0.18.2"
|
version = "0.18.2"
|
||||||
@@ -1098,9 +1108,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "crc32fast"
|
name = "crc32fast"
|
||||||
version = "1.5.4"
|
version = "1.5.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5f97d3416d5337d15c4b0d78c8c91df922ca143f57ec20e2d1c188333047ef04"
|
checksum = "2b929dd2a135771f40afabd1073f85eed59c800b7c61901e5c254270497dad64"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
]
|
]
|
||||||
@@ -1468,6 +1478,17 @@ dependencies = [
|
|||||||
"regex-syntax",
|
"regex-syntax",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "fancy-regex"
|
||||||
|
version = "0.20.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0a2e16b9a584b602f1e0e5e22c30ca0906786088c27500653e432d086def8b53"
|
||||||
|
dependencies = [
|
||||||
|
"bit-set",
|
||||||
|
"regex-automata",
|
||||||
|
"regex-syntax",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "fastrand"
|
name = "fastrand"
|
||||||
version = "2.4.1"
|
version = "2.4.1"
|
||||||
@@ -1511,9 +1532,9 @@ checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "flate2"
|
name = "flate2"
|
||||||
version = "1.1.10"
|
version = "1.1.11"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "6e634e2e0ebac1ee034020da1ca582e17ffe4e0f5e985823721e168928136dcb"
|
checksum = "626d4928326b646e70f65ed36fc7cf9f206bdb68a0019ee7c6b4709da4e084c4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"crc32fast",
|
"crc32fast",
|
||||||
"miniz_oxide 0.9.1",
|
"miniz_oxide 0.9.1",
|
||||||
@@ -1671,7 +1692,7 @@ checksum = "9fb9654ba8355388abeb8dcb4fc62f511300867002afc858860463bdd9fe0c44"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 3.0.9",
|
"syn 3.0.10",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1735,7 +1756,7 @@ dependencies = [
|
|||||||
"serde_json",
|
"serde_json",
|
||||||
"sha2",
|
"sha2",
|
||||||
"subtle",
|
"subtle",
|
||||||
"syn 3.0.9",
|
"syn 3.0.10",
|
||||||
"tempfile",
|
"tempfile",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
"tokio",
|
"tokio",
|
||||||
@@ -1807,6 +1828,17 @@ dependencies = [
|
|||||||
"uuid",
|
"uuid",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "gateway-egress"
|
||||||
|
version = "0.0.0"
|
||||||
|
dependencies = [
|
||||||
|
"gateway-core",
|
||||||
|
"http",
|
||||||
|
"hyper-util",
|
||||||
|
"reqwest",
|
||||||
|
"url",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "gateway-host"
|
name = "gateway-host"
|
||||||
version = "0.0.0"
|
version = "0.0.0"
|
||||||
@@ -1822,6 +1854,7 @@ dependencies = [
|
|||||||
"futures",
|
"futures",
|
||||||
"gateway-admin",
|
"gateway-admin",
|
||||||
"gateway-core",
|
"gateway-core",
|
||||||
|
"gateway-egress",
|
||||||
"gateway-protocol",
|
"gateway-protocol",
|
||||||
"hex",
|
"hex",
|
||||||
"http",
|
"http",
|
||||||
@@ -2514,15 +2547,15 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "jsonschema"
|
name = "jsonschema"
|
||||||
version = "0.60.2"
|
version = "0.61.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a42a11b47492e6a2cc76e9c7bcc8077776cb31dac444e0795d7f61bcc6441c08"
|
checksum = "0e37f27df77c7887edbc5f5a59ecd8e5ec4a669319266ec1b61068667a603183"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash",
|
"ahash",
|
||||||
"bytecount",
|
"bytecount",
|
||||||
"data-encoding",
|
"data-encoding",
|
||||||
"email_address",
|
"email_address",
|
||||||
"fancy-regex",
|
"fancy-regex 0.20.2",
|
||||||
"fraction",
|
"fraction",
|
||||||
"getrandom 0.3.4",
|
"getrandom 0.3.4",
|
||||||
"itoa",
|
"itoa",
|
||||||
@@ -2542,18 +2575,18 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "jsonschema-regex"
|
name = "jsonschema-regex"
|
||||||
version = "0.60.2"
|
version = "0.61.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "107aeb6ff14b8deb5610096a8ce5c554ec89806b521147eaeb3cae05b07edb7a"
|
checksum = "7e41151614b6c927e21982be8bef5a26741ae5a0ae6a781eedee2aa930a980e6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"regex-syntax",
|
"regex-syntax",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "jsonschema-value"
|
name = "jsonschema-value"
|
||||||
version = "0.60.2"
|
version = "0.61.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e281d6b177bb4834f2ffd6f92aa0443cffe29c996b251c8d94eb6f456186feba"
|
checksum = "1515b9a91134ef67d7bac95c2d76fbc7e383c4c55ee544204ceec8088f881fef"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash",
|
"ahash",
|
||||||
"bytecount",
|
"bytecount",
|
||||||
@@ -2648,9 +2681,18 @@ checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lru"
|
name = "lru"
|
||||||
version = "0.18.3"
|
version = "0.18.5"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0d317b4b9eb398e6acce275758ec6125535505e7a146fb1a9b8bda2451b0ff4c"
|
checksum = "ef9ac18847474e638e3702b76c65d4eb93428471a74778ef0f1be711717f89b5"
|
||||||
|
dependencies = [
|
||||||
|
"hashbrown 0.17.1",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "lru"
|
||||||
|
version = "0.19.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4a9f71e3591c7ec44d3e563e87bf14ddc2bada8519dca046e5b0e560cd004e2d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"hashbrown 0.17.1",
|
"hashbrown 0.17.1",
|
||||||
]
|
]
|
||||||
@@ -2964,9 +3006,9 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "openssl"
|
name = "openssl"
|
||||||
version = "0.10.80"
|
version = "0.10.82"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967"
|
checksum = "4de8111e94a56adca7ebfe6c365b6d42f99deb69b74b6becacd4204e2f193aa2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"cfg-if",
|
"cfg-if",
|
||||||
@@ -3010,9 +3052,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "openssl-sys"
|
name = "openssl-sys"
|
||||||
version = "0.9.116"
|
version = "0.9.118"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4"
|
checksum = "19c413d6ec9ebaf5e1c829d355cb3e9f783778d700f135be0921d52fce3c60ae"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cc",
|
"cc",
|
||||||
"libc",
|
"libc",
|
||||||
@@ -3296,7 +3338,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "2bfe0f4c752e450fc2faf62654f1c134747922825d5b04ca717b8874f41a40c0"
|
checksum = "2bfe0f4c752e450fc2faf62654f1c134747922825d5b04ca717b8874f41a40c0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"syn 3.0.9",
|
"syn 3.0.10",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -3353,6 +3395,7 @@ dependencies = [
|
|||||||
"futures",
|
"futures",
|
||||||
"gateway-admin",
|
"gateway-admin",
|
||||||
"gateway-core",
|
"gateway-core",
|
||||||
|
"gateway-egress",
|
||||||
"gateway-host",
|
"gateway-host",
|
||||||
"gateway-protocol",
|
"gateway-protocol",
|
||||||
"getrandom 0.4.3",
|
"getrandom 0.4.3",
|
||||||
@@ -3361,7 +3404,7 @@ dependencies = [
|
|||||||
"hyper",
|
"hyper",
|
||||||
"hyper-rustls",
|
"hyper-rustls",
|
||||||
"hyper-util",
|
"hyper-util",
|
||||||
"lru",
|
"lru 0.19.0",
|
||||||
"native-tls",
|
"native-tls",
|
||||||
"openssl",
|
"openssl",
|
||||||
"openssl-sys",
|
"openssl-sys",
|
||||||
@@ -3410,6 +3453,7 @@ dependencies = [
|
|||||||
"futures",
|
"futures",
|
||||||
"gateway-admin",
|
"gateway-admin",
|
||||||
"gateway-core",
|
"gateway-core",
|
||||||
|
"gateway-egress",
|
||||||
"gateway-protocol",
|
"gateway-protocol",
|
||||||
"getrandom 0.4.3",
|
"getrandom 0.4.3",
|
||||||
"jsonwebtoken",
|
"jsonwebtoken",
|
||||||
@@ -3478,9 +3522,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quinn-proto"
|
name = "quinn-proto"
|
||||||
version = "0.11.18"
|
version = "0.11.19"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a9746dbde176634f4f2f1faf2404e30a31b2bc1e9cafb5329c95d8177a18c9fc"
|
checksum = "0e750cca55fe4f0439a15d0bb529da9651e79993e8e72c61a899a36d462befbe"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"getrandom 0.4.3",
|
"getrandom 0.4.3",
|
||||||
@@ -3500,9 +3544,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quinn-udp"
|
name = "quinn-udp"
|
||||||
version = "0.5.15"
|
version = "0.5.16"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "35a133f956daabe89a61a685c2649f13d82d5aa4bd5d12d1277e1072a21c0694"
|
checksum = "af66907df18639dcf4db56ca65490cabc4b27a97dbadd96f2926cca73298f016"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg_aliases",
|
"cfg_aliases",
|
||||||
"libc",
|
"libc",
|
||||||
@@ -3659,14 +3703,14 @@ checksum = "92ecd8964f8453721699a1ed72037b0db49ce2f5a5138486ee89bed6f67cdf3a"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 3.0.9",
|
"syn 3.0.10",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "referencing"
|
name = "referencing"
|
||||||
version = "0.60.2"
|
version = "0.61.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f42818036d3b37cda6bd4c494543158a36e431cb717015ef7c93acc6ba214d3b"
|
checksum = "a028057ef852c58a42d75e09da87b5e733f4030f4c7411728955e4f87203a577"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ahash",
|
"ahash",
|
||||||
"fluent-uri",
|
"fluent-uri",
|
||||||
@@ -3813,9 +3857,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rustix"
|
name = "rustix"
|
||||||
version = "1.1.4"
|
version = "1.1.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190"
|
checksum = "e5e76742e5294153d4dde1207dbec5bdd81eef6fabdc0d2118babadabfd858aa"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"errno",
|
"errno",
|
||||||
@@ -4029,7 +4073,7 @@ checksum = "e7a5d71263a5a7d47b41f6b3f06ba276f10cc18b0931f1799f710578e2309348"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 3.0.9",
|
"syn 3.0.10",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4511,9 +4555,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "3.0.9"
|
version = "3.0.10"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d78c8dee4c7bf0e14673097256fed6142ce9d3b85a408189d07482442145823b"
|
checksum = "4ae9ccbea3a7b0b09443036490c8f34a8b1b760fd345e5c0dae0aac718faea79"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@@ -4611,7 +4655,7 @@ checksum = "fe5197923287db20a58125f0bc85c062f7f2c892de97b18c356f9efb14b28524"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 3.0.9",
|
"syn 3.0.10",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4632,7 +4676,7 @@ dependencies = [
|
|||||||
"anyhow",
|
"anyhow",
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"bstr",
|
"bstr",
|
||||||
"fancy-regex",
|
"fancy-regex 0.19.2",
|
||||||
"regex",
|
"regex",
|
||||||
"rustc-hash",
|
"rustc-hash",
|
||||||
]
|
]
|
||||||
@@ -4753,7 +4797,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio-tungstenite"
|
name = "tokio-tungstenite"
|
||||||
version = "0.28.0"
|
version = "0.28.0"
|
||||||
source = "git+https://github.com/openai-oss-forks/tokio-tungstenite?rev=0e5b2d73aa18dd9f0a50ee9ff199d5aef7594186#0e5b2d73aa18dd9f0a50ee9ff199d5aef7594186"
|
source = "git+https://github.com/openai-oss-forks/tokio-tungstenite?rev=7447c427513cfe685f236e1ac0513c4ea3dd9c0b#7447c427513cfe685f236e1ac0513c4ea3dd9c0b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"log",
|
"log",
|
||||||
@@ -4962,7 +5006,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "tungstenite"
|
name = "tungstenite"
|
||||||
version = "0.27.0"
|
version = "0.27.0"
|
||||||
source = "git+https://github.com/openai-oss-forks/tungstenite-rs?rev=4fffad30fe373adbdcffab9545e9e9bf4f2fc19f#4fffad30fe373adbdcffab9545e9e9bf4f2fc19f"
|
source = "git+https://github.com/openai-oss-forks/tungstenite-rs?rev=bc589d684755a8c02da0fc7e58d0861cbfc306f1#bc589d684755a8c02da0fc7e58d0861cbfc306f1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"data-encoding",
|
"data-encoding",
|
||||||
@@ -5096,9 +5140,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "uuid"
|
name = "uuid"
|
||||||
version = "1.29.0"
|
version = "1.29.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4a0e2d11620c50695fe12bbbfde96b3477fe606e7284c22d505c12ce51214514"
|
checksum = "bed99139f7dac9b5cfe5f17be4d66dc7079a34dee1d74bcc77217119240e267c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"getrandom 0.4.3",
|
"getrandom 0.4.3",
|
||||||
"js-sys",
|
"js-sys",
|
||||||
@@ -5701,10 +5745,11 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zip"
|
name = "zip"
|
||||||
version = "9.4.0"
|
version = "9.5.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3cec733c9820347a592f6375c3c0089b479ba0a0b1cbf3dd1958b02959b7c033"
|
checksum = "e3476fd497ac8af5b1ec7b51acab7bef380f7e8dd8e0487595bafd839417a302"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
|
"constant_time_eq",
|
||||||
"crc32fast",
|
"crc32fast",
|
||||||
"flate2",
|
"flate2",
|
||||||
"getrandom 0.4.3",
|
"getrandom 0.4.3",
|
||||||
@@ -5714,13 +5759,14 @@ dependencies = [
|
|||||||
"nix",
|
"nix",
|
||||||
"typed-path",
|
"typed-path",
|
||||||
"windows-sys 0.61.2",
|
"windows-sys 0.61.2",
|
||||||
|
"zeroize",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zlib-rs"
|
name = "zlib-rs"
|
||||||
version = "0.6.6"
|
version = "0.6.8"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b142a20ec14a91d5bc708c1dc21b080c550113d8aa77afa29635673a65dd02c5"
|
checksum = "b268e58e7c693d7c271f93ffc4ba3b380412554231c85bf61ca7af91042a4112"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zmij"
|
name = "zmij"
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ members = [
|
|||||||
"crates/gateway-admin",
|
"crates/gateway-admin",
|
||||||
"crates/gateway-api",
|
"crates/gateway-api",
|
||||||
"crates/gateway-core",
|
"crates/gateway-core",
|
||||||
|
"crates/gateway-egress",
|
||||||
"crates/gateway-host",
|
"crates/gateway-host",
|
||||||
"crates/gateway-plugin/runtime",
|
"crates/gateway-plugin/runtime",
|
||||||
"crates/gateway-plugin/sdk",
|
"crates/gateway-plugin/sdk",
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ pub(super) const WORKSPACE_MEMBERS: &[&str] = &[
|
|||||||
"crates/gateway-admin",
|
"crates/gateway-admin",
|
||||||
"crates/gateway-api",
|
"crates/gateway-api",
|
||||||
"crates/gateway-core",
|
"crates/gateway-core",
|
||||||
|
"crates/gateway-egress",
|
||||||
"crates/gateway-host",
|
"crates/gateway-host",
|
||||||
"crates/gateway-plugin/runtime",
|
"crates/gateway-plugin/runtime",
|
||||||
"crates/gateway-plugin/sdk",
|
"crates/gateway-plugin/sdk",
|
||||||
@@ -80,6 +81,7 @@ fn core_value_owners_do_not_depend_on_execution_or_routing() {
|
|||||||
"account/selection.rs" => Some(&["account", "concurrency", "identity", "validation"]),
|
"account/selection.rs" => Some(&["account", "concurrency", "identity", "validation"]),
|
||||||
"concurrency.rs" => Some(&["error"]),
|
"concurrency.rs" => Some(&["error"]),
|
||||||
"account/store.rs" => Some(&["account", "error", "identity", "validation"]),
|
"account/store.rs" => Some(&["account", "error", "identity", "validation"]),
|
||||||
|
"account/proxy.rs" => Some(&["upstream"]),
|
||||||
path if path.starts_with("policy/") => {
|
path if path.starts_with("policy/") => {
|
||||||
Some(&["account", "identity", "policy", "validation"])
|
Some(&["account", "identity", "policy", "validation"])
|
||||||
}
|
}
|
||||||
@@ -447,6 +449,7 @@ const PACKAGE_TO_MEMBER: &[(&str, &str)] = &[
|
|||||||
("gateway-admin", "crates/gateway-admin"),
|
("gateway-admin", "crates/gateway-admin"),
|
||||||
("gateway-api", "crates/gateway-api"),
|
("gateway-api", "crates/gateway-api"),
|
||||||
("gateway-core", "crates/gateway-core"),
|
("gateway-core", "crates/gateway-core"),
|
||||||
|
("gateway-egress", "crates/gateway-egress"),
|
||||||
("gateway-host", "crates/gateway-host"),
|
("gateway-host", "crates/gateway-host"),
|
||||||
("gateway-plugin-runtime", "crates/gateway-plugin/runtime"),
|
("gateway-plugin-runtime", "crates/gateway-plugin/runtime"),
|
||||||
("gateway-plugin-sdk", "crates/gateway-plugin/sdk"),
|
("gateway-plugin-sdk", "crates/gateway-plugin/sdk"),
|
||||||
@@ -510,8 +513,10 @@ const ALLOWED_INTERNAL_EDGES: &[(&str, &str)] = &[
|
|||||||
("gateway-api", "gateway-core"),
|
("gateway-api", "gateway-core"),
|
||||||
("gateway-api", "gateway-protocol"),
|
("gateway-api", "gateway-protocol"),
|
||||||
("gateway-core", "gateway-protocol"),
|
("gateway-core", "gateway-protocol"),
|
||||||
|
("gateway-egress", "gateway-core"),
|
||||||
("gateway-host", "gateway-admin"),
|
("gateway-host", "gateway-admin"),
|
||||||
("gateway-host", "gateway-core"),
|
("gateway-host", "gateway-core"),
|
||||||
|
("gateway-host", "gateway-egress"),
|
||||||
("gateway-host", "gateway-protocol"),
|
("gateway-host", "gateway-protocol"),
|
||||||
("gateway-plugin-runtime", "gateway-host"),
|
("gateway-plugin-runtime", "gateway-host"),
|
||||||
("gateway-plugin-runtime", "gateway-core"),
|
("gateway-plugin-runtime", "gateway-core"),
|
||||||
@@ -522,9 +527,11 @@ const ALLOWED_INTERNAL_EDGES: &[(&str, &str)] = &[
|
|||||||
("gateway-store", "gateway-core"),
|
("gateway-store", "gateway-core"),
|
||||||
("provider-openai", "gateway-admin"),
|
("provider-openai", "gateway-admin"),
|
||||||
("provider-openai", "gateway-core"),
|
("provider-openai", "gateway-core"),
|
||||||
|
("provider-openai", "gateway-egress"),
|
||||||
("provider-openai", "gateway-protocol"),
|
("provider-openai", "gateway-protocol"),
|
||||||
("provider-xai", "gateway-admin"),
|
("provider-xai", "gateway-admin"),
|
||||||
("provider-xai", "gateway-core"),
|
("provider-xai", "gateway-core"),
|
||||||
|
("provider-xai", "gateway-egress"),
|
||||||
("provider-xai", "gateway-protocol"),
|
("provider-xai", "gateway-protocol"),
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -78,7 +78,12 @@ async fn proxy_probe_should_use_provider_custom_ca_for_https_proxies() {
|
|||||||
});
|
});
|
||||||
let probe = HttpProxyProbe::new("http://unresolvable.invalid/ip")
|
let probe = HttpProxyProbe::new("http://unresolvable.invalid/ip")
|
||||||
.with_client_builder(provider_openai::build_reqwest_client_with_custom_ca);
|
.with_client_builder(provider_openai::build_reqwest_client_with_custom_ca);
|
||||||
let result = probe.test(Some(&proxy), false).await;
|
let result = probe
|
||||||
|
.test(
|
||||||
|
gateway_admin::ports::proxy::ProbeRoute::Proxy(&proxy),
|
||||||
|
false,
|
||||||
|
)
|
||||||
|
.await;
|
||||||
assert!(result.success, "{}", result.message);
|
assert!(result.success, "{}", result.message);
|
||||||
assert_eq!(result.exit_ip.unwrap().to_string(), "203.0.113.8");
|
assert_eq!(result.exit_ip.unwrap().to_string(), "203.0.113.8");
|
||||||
tokio::time::timeout(Duration::from_secs(5), server)
|
tokio::time::timeout(Duration::from_secs(5), server)
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
# Codex Proxy Plugin CLI
|
# Codex Proxy Plugin CLI
|
||||||
|
|
||||||
`cpr-plugin` 校验并规范化作者清单、收集声明的资源,生成可安装归档及 SHA-256 校验文件。
|
`cpr-plugin` 按 [SDK 合同](../../crates/gateway-plugin/sdk/README.md)校验清单,将插件可执行文件与声明的资源打包,并输出 SHA-256 校验文件
|
||||||
输出合同与 [SDK 版本](../../crates/gateway-plugin/sdk/README.md)一致
|
|
||||||
|
|
||||||
## 安装
|
## 安装
|
||||||
|
|
||||||
@@ -11,7 +10,7 @@
|
|||||||
cargo +1.99.1 install --locked --path backend/apps/plugin-cli --root /path/to/local-tools
|
cargo +1.99.1 install --locked --path backend/apps/plugin-cli --root /path/to/local-tools
|
||||||
```
|
```
|
||||||
|
|
||||||
将 `/path/to/local-tools/bin` 加入 `PATH`,或使用可执行文件的完整路径;工具链与宿主 [验证命令](../../../docs/architecture.md#验证命令)一致
|
将 `/path/to/local-tools/bin` 加入 `PATH`,或使用可执行文件的完整路径
|
||||||
|
|
||||||
## 打包
|
## 打包
|
||||||
|
|
||||||
@@ -26,24 +25,20 @@ cpr-plugin package \
|
|||||||
--output-dir /path/to/output
|
--output-dir /path/to/output
|
||||||
```
|
```
|
||||||
|
|
||||||
`--resource-map web=web/dist` 将包内 `web/` 前缀映射到作者清单所在目录下的 `web/dist/`。
|
资源文件须在 `resources` 中声明,默认从清单所在目录按相对路径读取。
|
||||||
可重复传入不同前缀,源目录必须位于项目内;没有对应资源时省略该参数,未使用的映射会被拒绝。
|
`--resource-map web=web/dist` 从项目内的 `web/dist/` 读取包内 `web/` 资源。可为不同前缀重复传参,未匹配任何资源的映射会报错
|
||||||
未映射的资源按清单中的相对路径读取,只收集 `resources` 声明的文件
|
|
||||||
|
|
||||||
输出为 `<插件 ID>-<版本>-<目标 triple>.tar.gz` 及同名 `.tar.gz.sha256`;归档根目录直接包含 `plugin.json`、可执行文件和声明资源。
|
输出为 `<插件 ID>-<版本>-<目标 triple>.tar.gz` 及对应的 `.tar.gz.sha256`。归档根目录包含 `plugin.json`、可执行文件和声明资源。
|
||||||
输入清单及生成后的清单均不得超过 64 KiB,压缩包上限为 32 MiB,展开归档上限为 128 MiB
|
输入清单及生成后的清单均不得超过 64 KiB,压缩包上限为 32 MiB,展开归档上限为 128 MiB
|
||||||
|
|
||||||
作者清单不填写 `package`;字段省略规则、能力版本和挂载阶段见 [SDK 扩展项声明](../../crates/gateway-plugin/sdk/docs/manifest.md#扩展项简写)。
|
作者清单须省略 `package`。CLI 将协议版本、目标平台和文件摘要写入 `plugin.json`。可省略的声明字段见 [SDK 扩展项声明](../../crates/gateway-plugin/sdk/docs/manifest.md#扩展项简写)
|
||||||
CLI 生成规范化后的 `plugin.json`,补入协议版本、目标平台和文件摘要。打包成功只证明输入符合包合同,实际启动与能力仍需在目标宿主验证
|
|
||||||
|
|
||||||
支持 `x86_64-unknown-linux-gnu`、`aarch64-unknown-linux-gnu` 和 `aarch64-apple-darwin`。
|
支持 `x86_64-unknown-linux-gnu`、`aarch64-unknown-linux-gnu` 和 `aarch64-apple-darwin`。
|
||||||
完整开发示例在独立仓库 `codex-proxy-plugins` 的 `examples/workbench`,可通过[子模块](../../../docs/development.md#源码联调)检出;本工具不负责源码构建、上传或启用插件
|
打包后在目标宿主验证启动和插件功能。完整示例见插件[子模块](../../../docs/development.md#源码联调)的 `examples/workbench`
|
||||||
|
|
||||||
### 图标资源
|
### 图标资源
|
||||||
|
|
||||||
在作者清单的 `icon` 中指定图标,并在 `resources` 中登记对应路径与 MIME 类型,配置方式见
|
按 [SDK 插件图标](../../crates/gateway-plugin/sdk/docs/manifest.md#插件图标)填写 `icon` 和 `resources`。CLI 自动打包原文件并计算摘要,宿主在安装时校验
|
||||||
[SDK 插件图标](../../crates/gateway-plugin/sdk/docs/manifest.md#插件图标)。图标与其他声明资源一样参与打包和摘要计算,
|
|
||||||
无需额外命令参数;工具保留文件原始内容,宿主安装时验证图标内容与资源限制
|
|
||||||
|
|
||||||
## 开发
|
## 开发
|
||||||
|
|
||||||
|
|||||||
@@ -183,7 +183,7 @@ async fn initialize_inner(
|
|||||||
PluginDistributionPorts::new(plugin_distribution, store.proxies()),
|
PluginDistributionPorts::new(plugin_distribution, store.proxies()),
|
||||||
snapshot.clone(),
|
snapshot.clone(),
|
||||||
plugin_preparation,
|
plugin_preparation,
|
||||||
published_snapshot,
|
published_snapshot.clone(),
|
||||||
store.plugin_state(),
|
store.plugin_state(),
|
||||||
)),
|
)),
|
||||||
key_usage,
|
key_usage,
|
||||||
@@ -201,6 +201,7 @@ async fn initialize_inner(
|
|||||||
store.account_groups(),
|
store.account_groups(),
|
||||||
store.account_runtime(),
|
store.account_runtime(),
|
||||||
snapshot.clone(),
|
snapshot.clone(),
|
||||||
|
published_snapshot,
|
||||||
)),
|
)),
|
||||||
client_keys: Arc::new(DefaultClientKeyService::new(
|
client_keys: Arc::new(DefaultClientKeyService::new(
|
||||||
store.client_keys(),
|
store.client_keys(),
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ use std::collections::BTreeMap;
|
|||||||
|
|
||||||
use chrono::{DateTime, Utc};
|
use chrono::{DateTime, Utc};
|
||||||
use gateway_core::{
|
use gateway_core::{
|
||||||
account::{AccountStatusFacts, FastMode},
|
account::{AccountModelAccess, AccountStatusFacts, FastMode},
|
||||||
routing::AccountGroupId,
|
routing::AccountGroupId,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -14,15 +14,25 @@ use super::{PageSize, Revision, observability::DecimalAmount};
|
|||||||
pub fn validate_group_fields(
|
pub fn validate_group_fields(
|
||||||
name: &str,
|
name: &str,
|
||||||
description: Option<&str>,
|
description: Option<&str>,
|
||||||
) -> Result<(), super::AdminModelError> {
|
) -> Result<(), super::AdminError> {
|
||||||
if name.trim() != name
|
if name.trim().is_empty() {
|
||||||
|| name.is_empty()
|
return Err(super::AdminError::invalid("请输入账号组名称"));
|
||||||
|| name.chars().count() > 100
|
}
|
||||||
|| name.chars().any(char::is_control)
|
if name.chars().count() > 100 {
|
||||||
|| description
|
return Err(super::AdminError::invalid("账号组名称最多 100 个字符"));
|
||||||
.is_some_and(|value| value.len() > 4096 || value.chars().any(char::is_control))
|
}
|
||||||
{
|
if name.trim() != name || name.chars().any(char::is_control) {
|
||||||
return Err(super::AdminModelError::InvalidAccountGroupFields);
|
return Err(super::AdminError::invalid(
|
||||||
|
"账号组名称不能包含首尾空白或控制字符",
|
||||||
|
));
|
||||||
|
}
|
||||||
|
if let Some(description) = description {
|
||||||
|
if description.len() > 4096 {
|
||||||
|
return Err(super::AdminError::invalid("账号组描述最多 4096 字节"));
|
||||||
|
}
|
||||||
|
if description.chars().any(char::is_control) {
|
||||||
|
return Err(super::AdminError::invalid("账号组描述不能包含控制字符"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -102,6 +112,8 @@ pub struct AccountGroupListQuery {
|
|||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub struct AccountGroupRecord {
|
pub struct AccountGroupRecord {
|
||||||
pub allow_image_generation: bool,
|
pub allow_image_generation: bool,
|
||||||
|
pub allow_subagents: bool,
|
||||||
|
pub model_access: AccountModelAccess,
|
||||||
pub fast_mode: FastMode,
|
pub fast_mode: FastMode,
|
||||||
pub id: AccountGroupId,
|
pub id: AccountGroupId,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
@@ -142,6 +154,8 @@ pub struct AccountGroupOptionsPage {
|
|||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub struct CreateAccountGroup {
|
pub struct CreateAccountGroup {
|
||||||
pub allow_image_generation: bool,
|
pub allow_image_generation: bool,
|
||||||
|
pub allow_subagents: bool,
|
||||||
|
pub model_access: AccountModelAccess,
|
||||||
pub fast_mode: FastMode,
|
pub fast_mode: FastMode,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
pub description: Option<String>,
|
pub description: Option<String>,
|
||||||
@@ -152,6 +166,8 @@ pub struct CreateAccountGroup {
|
|||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub struct NewAccountGroup {
|
pub struct NewAccountGroup {
|
||||||
pub allow_image_generation: bool,
|
pub allow_image_generation: bool,
|
||||||
|
pub allow_subagents: bool,
|
||||||
|
pub model_access: AccountModelAccess,
|
||||||
pub fast_mode: FastMode,
|
pub fast_mode: FastMode,
|
||||||
pub id: AccountGroupId,
|
pub id: AccountGroupId,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
@@ -163,6 +179,8 @@ pub struct NewAccountGroup {
|
|||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub struct UpdateAccountGroup {
|
pub struct UpdateAccountGroup {
|
||||||
pub allow_image_generation: Option<bool>,
|
pub allow_image_generation: Option<bool>,
|
||||||
|
pub allow_subagents: Option<bool>,
|
||||||
|
pub model_access: Option<AccountModelAccess>,
|
||||||
pub fast_mode: Option<FastMode>,
|
pub fast_mode: Option<FastMode>,
|
||||||
pub id: AccountGroupId,
|
pub id: AccountGroupId,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ pub use gateway_core::account::{
|
|||||||
/// 账号可用的管理操作
|
/// 账号可用的管理操作
|
||||||
#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
|
#[derive(Debug, Default, Clone, Copy, PartialEq, Eq)]
|
||||||
pub struct ProviderAccountCapabilities {
|
pub struct ProviderAccountCapabilities {
|
||||||
pub quota_limits_supported: bool,
|
pub quota_settings_supported: bool,
|
||||||
pub quota_credits: bool,
|
pub quota_credits: bool,
|
||||||
pub quota: bool,
|
pub quota: bool,
|
||||||
pub quota_refresh: bool,
|
pub quota_refresh: bool,
|
||||||
@@ -113,7 +113,7 @@ pub enum AccountGroupFilter {
|
|||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub struct AccountRecord {
|
pub struct AccountRecord {
|
||||||
pub quota_paused: bool,
|
pub quota_paused: bool,
|
||||||
pub quota_limits: gateway_core::account::AccountQuotaLimits,
|
pub quota_settings: gateway_core::account::AccountQuotaSettings,
|
||||||
pub auto_use_quota_credits: bool,
|
pub auto_use_quota_credits: bool,
|
||||||
pub id: String,
|
pub id: String,
|
||||||
pub provider_kind: ProviderKind,
|
pub provider_kind: ProviderKind,
|
||||||
@@ -146,7 +146,7 @@ pub struct AccountRecord {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl AccountRecord {
|
impl AccountRecord {
|
||||||
/// 配置保留绑定,执行请求时禁用代理按直连处理
|
/// 配置保留绑定,执行请求时禁用代理使用部署默认出口
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn effective_outbound_proxy(&self) -> Option<&gateway_core::account::OutboundProxy> {
|
pub fn effective_outbound_proxy(&self) -> Option<&gateway_core::account::OutboundProxy> {
|
||||||
self.outbound_proxy
|
self.outbound_proxy
|
||||||
@@ -254,7 +254,7 @@ pub struct AccountUpdateResult {
|
|||||||
/// 仅修改显式字段的批量账号设置命令
|
/// 仅修改显式字段的批量账号设置命令
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub struct BatchUpdateAccounts {
|
pub struct BatchUpdateAccounts {
|
||||||
pub quota_limits: Option<gateway_core::account::AccountQuotaLimits>,
|
pub quota_settings: Option<gateway_core::account::AccountQuotaSettings>,
|
||||||
pub auto_use_quota_credits: Option<bool>,
|
pub auto_use_quota_credits: Option<bool>,
|
||||||
pub account_ids: Vec<String>,
|
pub account_ids: Vec<String>,
|
||||||
pub enabled: Option<bool>,
|
pub enabled: Option<bool>,
|
||||||
@@ -268,6 +268,8 @@ pub struct BatchUpdateAccounts {
|
|||||||
/// 已按拟提交策略重算的账号暂停结果,以快照版本防止旧判断覆盖新观测
|
/// 已按拟提交策略重算的账号暂停结果,以快照版本防止旧判断覆盖新观测
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub struct PreparedQuotaPause {
|
pub struct PreparedQuotaPause {
|
||||||
|
pub settings: gateway_core::account::AccountQuotaSettings,
|
||||||
|
pub previous_settings: gateway_core::account::AccountQuotaSettings,
|
||||||
pub observed_at: Option<DateTime<Utc>>,
|
pub observed_at: Option<DateTime<Utc>>,
|
||||||
pub revision: Revision,
|
pub revision: Revision,
|
||||||
pub paused: bool,
|
pub paused: bool,
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ pub enum MutationAuditOperation {
|
|||||||
PluginSourceCredentialCreate,
|
PluginSourceCredentialCreate,
|
||||||
PluginSourceCredentialDelete,
|
PluginSourceCredentialDelete,
|
||||||
ClientApiKeyUpdateBudgetLimits,
|
ClientApiKeyUpdateBudgetLimits,
|
||||||
|
ClientApiKeyBatchUpdate,
|
||||||
ClientApiKeyCreate,
|
ClientApiKeyCreate,
|
||||||
ClientApiKeyUpdate,
|
ClientApiKeyUpdate,
|
||||||
ClientApiKeyEnabled { enabled: bool },
|
ClientApiKeyEnabled { enabled: bool },
|
||||||
@@ -97,6 +98,7 @@ impl MutationAuditOperation {
|
|||||||
Self::PluginSourceCredentialCreate => ("create", "plugin_source_credential"),
|
Self::PluginSourceCredentialCreate => ("create", "plugin_source_credential"),
|
||||||
Self::PluginSourceCredentialDelete => ("delete", "plugin_source_credential"),
|
Self::PluginSourceCredentialDelete => ("delete", "plugin_source_credential"),
|
||||||
Self::ClientApiKeyUpdateBudgetLimits => ("update_budget_limits", "client_api_key"),
|
Self::ClientApiKeyUpdateBudgetLimits => ("update_budget_limits", "client_api_key"),
|
||||||
|
Self::ClientApiKeyBatchUpdate => ("batch_update", "client_api_key"),
|
||||||
Self::ClientApiKeyCreate => ("create", "client_api_key"),
|
Self::ClientApiKeyCreate => ("create", "client_api_key"),
|
||||||
Self::ClientApiKeyUpdate => ("update", "client_api_key"),
|
Self::ClientApiKeyUpdate => ("update", "client_api_key"),
|
||||||
Self::ClientApiKeyEnabled { enabled } => {
|
Self::ClientApiKeyEnabled { enabled } => {
|
||||||
|
|||||||
@@ -218,6 +218,66 @@ pub struct UpdateClientKey {
|
|||||||
pub weekly_limit_usd: Option<gateway_core::metering::Decimal>,
|
pub weekly_limit_usd: Option<gateway_core::metering::Decimal>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 批量编辑只覆盖明确选择的互联选项
|
||||||
|
#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, serde::Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
|
pub struct ClientPeerSharingPatch {
|
||||||
|
pub enabled: Option<bool>,
|
||||||
|
pub share_pool: Option<bool>,
|
||||||
|
pub share_quota: Option<bool>,
|
||||||
|
pub share_plans: Option<bool>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ClientPeerSharingPatch {
|
||||||
|
#[must_use]
|
||||||
|
pub fn is_empty(self) -> bool {
|
||||||
|
self == Self::default()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[must_use]
|
||||||
|
pub fn apply(
|
||||||
|
self,
|
||||||
|
current: gateway_core::policy::ClientPeerSharing,
|
||||||
|
) -> gateway_core::policy::ClientPeerSharing {
|
||||||
|
gateway_core::policy::ClientPeerSharing {
|
||||||
|
enabled: self.enabled.unwrap_or(current.enabled),
|
||||||
|
share_pool: self.share_pool.unwrap_or(current.share_pool),
|
||||||
|
share_quota: self.share_quota.unwrap_or(current.share_quota),
|
||||||
|
share_plans: self.share_plans.unwrap_or(current.share_plans),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 对各个密钥独立应用同一份局部设置
|
||||||
|
#[derive(Debug, Clone, Default, PartialEq, Eq)]
|
||||||
|
pub struct BatchUpdateClientKeys {
|
||||||
|
pub ids: Vec<ClientApiKeyId>,
|
||||||
|
pub group_ids: Option<Vec<AccountGroupId>>,
|
||||||
|
pub enabled: Option<bool>,
|
||||||
|
pub max_concurrency: Option<u64>,
|
||||||
|
pub requests_per_minute: Option<u64>,
|
||||||
|
pub daily_limit_usd: Option<gateway_core::metering::Decimal>,
|
||||||
|
pub weekly_limit_usd: Option<gateway_core::metering::Decimal>,
|
||||||
|
pub peer_sharing: ClientPeerSharingPatch,
|
||||||
|
pub request_profile_override_updates: ProviderRequestProfileOverrideUpdates,
|
||||||
|
pub installation_seed: Option<uuid::Uuid>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl BatchUpdateClientKeys {
|
||||||
|
#[must_use]
|
||||||
|
pub fn has_changes(&self) -> bool {
|
||||||
|
self.group_ids.is_some()
|
||||||
|
|| self.enabled.is_some()
|
||||||
|
|| self.max_concurrency.is_some()
|
||||||
|
|| self.requests_per_minute.is_some()
|
||||||
|
|| self.daily_limit_usd.is_some()
|
||||||
|
|| self.weekly_limit_usd.is_some()
|
||||||
|
|| !self.peer_sharing.is_empty()
|
||||||
|
|| !self.request_profile_override_updates.is_empty()
|
||||||
|
|| self.installation_seed.is_some()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// 修改 Client Key 启用状态
|
/// 修改 Client Key 启用状态
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub struct SetClientKeyEnabled {
|
pub struct SetClientKeyEnabled {
|
||||||
@@ -257,9 +317,69 @@ impl ClientKeyBudgetWindowPeriod {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 手动对齐只需要账号身份,列表不读取凭据、额度或用量
|
||||||
|
#[derive(serde::Serialize, Debug)]
|
||||||
|
pub struct BudgetReferenceAccount {
|
||||||
|
pub id: String,
|
||||||
|
pub name: String,
|
||||||
|
pub email: Option<String>,
|
||||||
|
pub provider: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(serde::Serialize, Debug)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct BudgetReferenceAccountPage {
|
||||||
|
pub items: Vec<BudgetReferenceAccount>,
|
||||||
|
pub next_cursor: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 管理员可预览的账号窗口保留 Provider 的稳定标识
|
||||||
|
pub struct ClientKeyBudgetReference {
|
||||||
|
pub key: String,
|
||||||
|
pub label: String,
|
||||||
|
pub period: ClientKeyBudgetWindowPeriod,
|
||||||
|
pub bounds: ExplicitClientKeyBudgetWindow,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ClientKeyBudgetReference {
|
||||||
|
/// 只取整账号当前的日/周窗口,对齐结束后恢复密钥自身周期
|
||||||
|
pub fn from_current_window(
|
||||||
|
window: super::provider_credentials::ProviderQuotaWindow,
|
||||||
|
now: DateTime<Utc>,
|
||||||
|
) -> Option<Self> {
|
||||||
|
use super::provider_credentials::QuotaLocalUsageAttribution;
|
||||||
|
if window.local_usage_attribution != QuotaLocalUsageAttribution::AccountWide
|
||||||
|
|| window
|
||||||
|
.upstream
|
||||||
|
.as_ref()
|
||||||
|
.is_some_and(|upstream| upstream.stale)
|
||||||
|
{
|
||||||
|
return None;
|
||||||
|
}
|
||||||
|
let period = match window.window_seconds? {
|
||||||
|
86_400 => ClientKeyBudgetWindowPeriod::Daily,
|
||||||
|
604_800 => ClientKeyBudgetWindowPeriod::Weekly,
|
||||||
|
_ => return None,
|
||||||
|
};
|
||||||
|
let (starts_at, ends_at) = window.observed_bounds()?;
|
||||||
|
(starts_at..ends_at).contains(&now).then_some(Self {
|
||||||
|
key: window.key,
|
||||||
|
label: window.label,
|
||||||
|
period,
|
||||||
|
bounds: ExplicitClientKeyBudgetWindow {
|
||||||
|
starts_at,
|
||||||
|
ends_at,
|
||||||
|
resume_calendar: true,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// 按请求完成时间归属的左闭右开预算窗口
|
/// 按请求完成时间归属的左闭右开预算窗口
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
pub struct ExplicitClientKeyBudgetWindow {
|
pub struct ExplicitClientKeyBudgetWindow {
|
||||||
|
/// 一次性对齐的窗口到期后恢复原生滚动
|
||||||
|
pub resume_calendar: bool,
|
||||||
pub starts_at: DateTime<Utc>,
|
pub starts_at: DateTime<Utc>,
|
||||||
pub ends_at: DateTime<Utc>,
|
pub ends_at: DateTime<Utc>,
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -23,6 +23,7 @@ pub mod provider_credentials;
|
|||||||
pub mod proxies;
|
pub mod proxies;
|
||||||
pub mod quota_forecast;
|
pub mod quota_forecast;
|
||||||
pub mod quota_forecast_sampling;
|
pub mod quota_forecast_sampling;
|
||||||
|
pub mod quota_history;
|
||||||
pub mod reset_credit_automation;
|
pub mod reset_credit_automation;
|
||||||
pub mod retention;
|
pub mod retention;
|
||||||
pub mod settings;
|
pub mod settings;
|
||||||
@@ -235,8 +236,6 @@ pub enum AdminModelError {
|
|||||||
InvalidPageSize(u16),
|
InvalidPageSize(u16),
|
||||||
#[error("observability page size {0} is outside 1..=100")]
|
#[error("observability page size {0} is outside 1..=100")]
|
||||||
InvalidObservabilityPageSize(u16),
|
InvalidObservabilityPageSize(u16),
|
||||||
#[error("account group name or description is invalid")]
|
|
||||||
InvalidAccountGroupFields,
|
|
||||||
#[error("client key group IDs are duplicated or exceed 1000 entries")]
|
#[error("client key group IDs are duplicated or exceed 1000 entries")]
|
||||||
InvalidClientKeyGroups,
|
InvalidClientKeyGroups,
|
||||||
#[error("client key page size must be inside 1..=65535")]
|
#[error("client key page size must be inside 1..=65535")]
|
||||||
|
|||||||
@@ -158,7 +158,7 @@ impl OtherRequestOutcome {
|
|||||||
#[derive(Debug, Clone, Default, PartialEq, Eq, Hash)]
|
#[derive(Debug, Clone, Default, PartialEq, Eq, Hash)]
|
||||||
pub struct UsageFilter {
|
pub struct UsageFilter {
|
||||||
pub client_api_key_name: Option<String>,
|
pub client_api_key_name: Option<String>,
|
||||||
pub provider_account_name: Option<String>,
|
pub provider_account_search: Option<String>,
|
||||||
pub client_api_key_ref: Option<String>,
|
pub client_api_key_ref: Option<String>,
|
||||||
pub request_id: Option<String>,
|
pub request_id: Option<String>,
|
||||||
pub provider_account_ref: Option<String>,
|
pub provider_account_ref: Option<String>,
|
||||||
@@ -180,7 +180,7 @@ pub struct UsageFilter {
|
|||||||
pub enum UsageRecordStatus {
|
pub enum UsageRecordStatus {
|
||||||
#[default]
|
#[default]
|
||||||
Success,
|
Success,
|
||||||
Error,
|
Error(Option<UsageErrorOrigin>),
|
||||||
All,
|
All,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -648,6 +648,56 @@ pub struct AttemptMetrics {
|
|||||||
pub costs: Vec<CurrencyCost>,
|
pub costs: Vec<CurrencyCost>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 管理员按当前指标排列模型与趋势,值只来自固定的聚合列
|
||||||
|
#[derive(Debug, Clone, Copy, Default, serde::Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub enum KeyUsageMetric {
|
||||||
|
#[default]
|
||||||
|
CostUsd,
|
||||||
|
Tokens,
|
||||||
|
Requests,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, serde::Serialize, serde::Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct KeyUsageTotals {
|
||||||
|
pub requests: u64,
|
||||||
|
pub tokens: Option<u64>,
|
||||||
|
pub cost_usd: Option<String>,
|
||||||
|
pub has_missing_cost: bool,
|
||||||
|
pub has_estimated_cost: bool,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub struct KeyModelRow {
|
||||||
|
pub model: String,
|
||||||
|
pub totals: KeyUsageTotals,
|
||||||
|
pub peak_requests: u64,
|
||||||
|
pub active_days: u32,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
|
||||||
|
pub struct KeyTrendPoint {
|
||||||
|
pub date: chrono::NaiveDate,
|
||||||
|
pub value: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
|
||||||
|
pub struct KeyTrendSeries {
|
||||||
|
/// 空字符串表示未记录模型,None 表示合并的其他模型
|
||||||
|
pub model: Option<String>,
|
||||||
|
pub points: Vec<KeyTrendPoint>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Default, serde::Serialize, serde::Deserialize)]
|
||||||
|
pub struct KeyStatisticsOverview {
|
||||||
|
pub totals: KeyUsageTotals,
|
||||||
|
pub series: Vec<KeyTrendSeries>,
|
||||||
|
#[serde(rename = "modelCount")]
|
||||||
|
pub model_count: u64,
|
||||||
|
}
|
||||||
|
|
||||||
/// 时间序列粒度
|
/// 时间序列粒度
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
|
||||||
pub enum Granularity {
|
pub enum Granularity {
|
||||||
@@ -814,6 +864,17 @@ pub enum UsageErrorOrigin {
|
|||||||
Unknown,
|
Unknown,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 来源规则所依赖的已保存事实,供内存投影与持久层分页查询共同解释
|
||||||
|
#[derive(Clone, Copy)]
|
||||||
|
pub enum UsageErrorEvidence {
|
||||||
|
ProviderErrorCode,
|
||||||
|
UpstreamStatusAtLeast(u16),
|
||||||
|
SavedUpstreamErrorOrClose,
|
||||||
|
ErrorKind(&'static [&'static str]),
|
||||||
|
Continuation(&'static [&'static str]),
|
||||||
|
ConnectionExit(&'static [&'static str]),
|
||||||
|
}
|
||||||
|
|
||||||
impl UsageErrorOrigin {
|
impl UsageErrorOrigin {
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub const fn as_str(self) -> &'static str {
|
pub const fn as_str(self) -> &'static str {
|
||||||
|
|||||||
@@ -700,6 +700,7 @@ pub struct PreparedCredentialRotationFacts {
|
|||||||
pub preserve_profile: bool,
|
pub preserve_profile: bool,
|
||||||
/// 连接配置变更保留当前凭据健康状态与错误事实
|
/// 连接配置变更保留当前凭据健康状态与错误事实
|
||||||
pub preserve_credential_state: bool,
|
pub preserve_credential_state: bool,
|
||||||
|
pub preserve_access_token_expiry: bool,
|
||||||
pub provider_material: ProviderDocument,
|
pub provider_material: ProviderDocument,
|
||||||
pub has_refresh_token: bool,
|
pub has_refresh_token: bool,
|
||||||
pub access_token_expires_at: Option<DateTime<Utc>>,
|
pub access_token_expires_at: Option<DateTime<Utc>>,
|
||||||
@@ -819,6 +820,14 @@ pub struct ProviderQuotaWindow {
|
|||||||
pub provider_data: Option<ProviderDocument>,
|
pub provider_data: Option<ProviderDocument>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl ProviderQuotaWindow {
|
||||||
|
pub(crate) fn observed_bounds(&self) -> Option<(DateTime<Utc>, DateTime<Utc>)> {
|
||||||
|
let ends_at = self.reset_at?;
|
||||||
|
let duration = chrono::Duration::try_seconds(i64::try_from(self.window_seconds?).ok()?)?;
|
||||||
|
Some((ends_at.checked_sub_signed(duration)?, ends_at))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// 账号用量统计周期,完整周/月额度优先,随后使用 Provider 提供的本地滚动日统计
|
/// 账号用量统计周期,完整周/月额度优先,随后使用 Provider 提供的本地滚动日统计
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord)]
|
||||||
pub enum AccountUsagePeriod {
|
pub enum AccountUsagePeriod {
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ use super::{PageSize, Revision, account_groups::AccountGroupRef};
|
|||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
||||||
pub enum AccountProxySelection {
|
pub enum AccountProxySelection {
|
||||||
Direct,
|
Direct,
|
||||||
Url(OutboundProxy),
|
|
||||||
Saved(String),
|
Saved(String),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ use super::provider_credentials::ProviderDocument;
|
|||||||
pub const MAX_FORECAST_HISTORY_POINTS: usize = 128;
|
pub const MAX_FORECAST_HISTORY_POINTS: usize = 128;
|
||||||
const MIN_BLOCK_PERCENT: f64 = 5.0;
|
const MIN_BLOCK_PERCENT: f64 = 5.0;
|
||||||
const RECENT_BLOCKS: usize = 3;
|
const RECENT_BLOCKS: usize = 3;
|
||||||
|
const MAX_PERCENT_REVERSAL: f64 = 1.0;
|
||||||
|
|
||||||
#[derive(Debug, Clone, Default, PartialEq)]
|
#[derive(Debug, Clone, Default, PartialEq)]
|
||||||
pub struct QuotaForecastUsage {
|
pub struct QuotaForecastUsage {
|
||||||
@@ -80,11 +81,55 @@ pub struct QuotaForecastObservation {
|
|||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct QuotaForecastPoint {
|
pub struct QuotaForecastPoint {
|
||||||
|
pub started_at: DateTime<Utc>,
|
||||||
pub observed_at: DateTime<Utc>,
|
pub observed_at: DateTime<Utc>,
|
||||||
|
pub reset_at: DateTime<Utc>,
|
||||||
pub used_percent: f64,
|
pub used_percent: f64,
|
||||||
pub usage: QuotaForecastUsage,
|
pub usage: QuotaForecastUsage,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl QuotaForecastPoint {
|
||||||
|
fn follows(&self, previous: &Self) -> bool {
|
||||||
|
previous.observed_at <= self.started_at && previous.observed_at < self.observed_at
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 当前窗口内仍有旧周期记录时,只在旧读数已到期、用量回落且新读数得到印证后重设累计
|
||||||
|
fn cycle_boundary(
|
||||||
|
history: &[QuotaForecastPoint],
|
||||||
|
current: &QuotaForecastPoint,
|
||||||
|
) -> (Option<usize>, bool) {
|
||||||
|
let mut boundary = None;
|
||||||
|
let mut awaiting_confirmation = false;
|
||||||
|
for (index, pair) in history.windows(2).enumerate() {
|
||||||
|
let (older, previous) = (&pair[0], &pair[1]);
|
||||||
|
let first_index = index + 2;
|
||||||
|
let first = history.get(first_index).unwrap_or(current);
|
||||||
|
let before_reset = older.used_percent.min(previous.used_percent);
|
||||||
|
if !previous.follows(older)
|
||||||
|
|| !first.follows(previous)
|
||||||
|
|| older.reset_at <= previous.observed_at
|
||||||
|
|| older.reset_at > first.started_at
|
||||||
|
|| previous.reset_at > first.started_at
|
||||||
|
|| before_reset - first.used_percent <= MAX_PERCENT_REVERSAL
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// 快照可能复用请求读数;只有另一条在新窗口内独立完成的请求能确认换段
|
||||||
|
let confirmation = history
|
||||||
|
.get(first_index + 1..)
|
||||||
|
.and_then(|later| later.iter().find(|next| next.follows(first)));
|
||||||
|
awaiting_confirmation = confirmation.is_none();
|
||||||
|
if confirmation.is_some_and(|next| {
|
||||||
|
next.observed_at < first.reset_at
|
||||||
|
&& before_reset - next.used_percent > MAX_PERCENT_REVERSAL
|
||||||
|
}) {
|
||||||
|
boundary = Some(first_index);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
(boundary, awaiting_confirmation)
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||||
pub enum QuotaForecastMethod {
|
pub enum QuotaForecastMethod {
|
||||||
Cumulative,
|
Cumulative,
|
||||||
@@ -117,7 +162,7 @@ pub fn select_forecast_sample(
|
|||||||
current: QuotaForecastPoint,
|
current: QuotaForecastPoint,
|
||||||
mut history: Vec<QuotaForecastPoint>,
|
mut history: Vec<QuotaForecastPoint>,
|
||||||
pending_request_count: u64,
|
pending_request_count: u64,
|
||||||
interrupted: bool,
|
plan_changed: bool,
|
||||||
) -> QuotaForecastSample {
|
) -> QuotaForecastSample {
|
||||||
history.retain(|point| {
|
history.retain(|point| {
|
||||||
start_at <= point.observed_at
|
start_at <= point.observed_at
|
||||||
@@ -126,6 +171,9 @@ pub fn select_forecast_sample(
|
|||||||
&& (0.0..=100.0).contains(&point.used_percent)
|
&& (0.0..=100.0).contains(&point.used_percent)
|
||||||
});
|
});
|
||||||
history.sort_by_key(|point| point.observed_at);
|
history.sort_by_key(|point| point.observed_at);
|
||||||
|
let (boundary, awaiting_confirmation) = cycle_boundary(&history, ¤t);
|
||||||
|
let history = &history[boundary.unwrap_or(0)..];
|
||||||
|
let interrupted = plan_changed || boundary.is_some();
|
||||||
let mut sample = QuotaForecastSample {
|
let mut sample = QuotaForecastSample {
|
||||||
key,
|
key,
|
||||||
method: QuotaForecastMethod::Cumulative,
|
method: QuotaForecastMethod::Cumulative,
|
||||||
@@ -136,23 +184,35 @@ pub fn select_forecast_sample(
|
|||||||
block_count: 0,
|
block_count: 0,
|
||||||
observation_count: history.len(),
|
observation_count: history.len(),
|
||||||
pending_request_count,
|
pending_request_count,
|
||||||
discontinuous: interrupted,
|
discontinuous: interrupted || awaiting_confirmation,
|
||||||
cycle_usage: current.usage.clone(),
|
cycle_usage: current.usage.clone(),
|
||||||
usage: current.usage.clone(),
|
usage: current.usage.clone(),
|
||||||
};
|
};
|
||||||
history.push(current);
|
if interrupted {
|
||||||
// 重置边界不在查询起点时,从首个新观测重新计数,避免把旧周期累计带入总量
|
let baseline = history.first().unwrap_or(¤t);
|
||||||
let cycle_baseline = interrupted.then(|| &history[0]);
|
let Some(usage) = current.usage.difference(&baseline.usage) else {
|
||||||
|
return sample;
|
||||||
|
};
|
||||||
|
sample.cycle_usage = usage;
|
||||||
|
}
|
||||||
|
if awaiting_confirmation {
|
||||||
|
return sample;
|
||||||
|
}
|
||||||
let mut anchors: Vec<&QuotaForecastPoint> = Vec::new();
|
let mut anchors: Vec<&QuotaForecastPoint> = Vec::new();
|
||||||
let mut high_water: Option<&QuotaForecastPoint> = None;
|
let mut high_water: Option<&QuotaForecastPoint> = None;
|
||||||
for point in &history {
|
for point in history.iter().chain(std::iter::once(¤t)) {
|
||||||
|
// 截至快照已过期的读数不能用于预测剩余量,窗口累计仍由上面的周期证据决定
|
||||||
|
if point.reset_at <= current.observed_at {
|
||||||
|
sample.discontinuous = true;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if let Some(previous) = high_water {
|
if let Some(previous) = high_water {
|
||||||
if point.observed_at <= previous.observed_at {
|
if point.observed_at <= previous.observed_at {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
if point.used_percent < previous.used_percent {
|
if point.used_percent < previous.used_percent {
|
||||||
// 一个百分点内的回落可能是量化/并发乱序;更大的回落不能跨越
|
// 一个百分点内的回落可能是量化/并发乱序;更大的回落不能跨越
|
||||||
if previous.used_percent - point.used_percent <= 1.0 {
|
if previous.used_percent - point.used_percent <= MAX_PERCENT_REVERSAL {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
// 同窗口回落不能证明周期重置,只重建采样并保留已记录累计
|
// 同窗口回落不能证明周期重置,只重建采样并保留已记录累计
|
||||||
@@ -168,16 +228,6 @@ pub fn select_forecast_sample(
|
|||||||
anchors.push(point);
|
anchors.push(point);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let Some(current) = history.last() else {
|
|
||||||
return sample;
|
|
||||||
};
|
|
||||||
if let Some(baseline) = cycle_baseline {
|
|
||||||
let Some(usage) = current.usage.difference(&baseline.usage) else {
|
|
||||||
sample.discontinuous = true;
|
|
||||||
return sample;
|
|
||||||
};
|
|
||||||
sample.cycle_usage = usage;
|
|
||||||
}
|
|
||||||
if anchors.len() < 2 {
|
if anchors.len() < 2 {
|
||||||
return sample;
|
return sample;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,87 @@
|
|||||||
|
//! 单个额度桶的历史观测;原始文档只在宿主内交给 Provider 解释
|
||||||
|
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use super::{observability::TimeRange, provider_credentials::ProviderDocument};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone)]
|
||||||
|
pub struct QuotaHistoryQuery {
|
||||||
|
pub window_key: String,
|
||||||
|
pub range: TimeRange,
|
||||||
|
pub cursor: Option<QuotaHistoryCursor>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl QuotaHistoryQuery {
|
||||||
|
/// 起点基线最多回看一个查询区间
|
||||||
|
pub fn scan_start(&self) -> DateTime<Utc> {
|
||||||
|
self.range
|
||||||
|
.start
|
||||||
|
.checked_sub_signed(self.range.end - self.range.start)
|
||||||
|
.unwrap_or(DateTime::<Utc>::MIN_UTC)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 完成时间可能相同,继续读取时保留数据库精度和请求 ID
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
pub struct QuotaHistoryCursor {
|
||||||
|
pub completed_at: DateTime<Utc>,
|
||||||
|
pub id: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct QuotaDocumentPage {
|
||||||
|
pub documents: Vec<(DateTime<Utc>, ProviderDocument)>,
|
||||||
|
pub next_cursor: Option<QuotaHistoryCursor>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq)]
|
||||||
|
pub struct QuotaReading {
|
||||||
|
pub plan_type: Option<String>,
|
||||||
|
pub used_percent: f64,
|
||||||
|
pub reset_at: Option<DateTime<Utc>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub type QuotaHistoryParser = fn(&ProviderDocument, &str) -> Option<QuotaReading>;
|
||||||
|
|
||||||
|
pub struct QuotaHistoryPoint {
|
||||||
|
pub observed_at: DateTime<Utc>,
|
||||||
|
pub reading: QuotaReading,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Default)]
|
||||||
|
pub struct QuotaHistoryPage {
|
||||||
|
pub samples: Vec<QuotaHistoryPoint>,
|
||||||
|
pub baseline: Option<QuotaHistoryPoint>,
|
||||||
|
pub next_cursor: Option<QuotaHistoryCursor>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl QuotaHistoryPage {
|
||||||
|
pub fn from_documents(
|
||||||
|
page: QuotaDocumentPage,
|
||||||
|
query: &QuotaHistoryQuery,
|
||||||
|
parse: QuotaHistoryParser,
|
||||||
|
) -> Self {
|
||||||
|
let mut result = Self {
|
||||||
|
next_cursor: page.next_cursor,
|
||||||
|
..Self::default()
|
||||||
|
};
|
||||||
|
for (observed_at, document) in page.documents {
|
||||||
|
let Some(reading) = parse(&document, &query.window_key) else {
|
||||||
|
continue;
|
||||||
|
};
|
||||||
|
let point = QuotaHistoryPoint {
|
||||||
|
observed_at,
|
||||||
|
reading,
|
||||||
|
};
|
||||||
|
if observed_at < query.range.start {
|
||||||
|
// 倒序扫描遇到的第一个同桶读数就是最近基线,无需再向前翻页
|
||||||
|
result.baseline = Some(point);
|
||||||
|
result.next_cursor = None;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
result.samples.push(point);
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -24,7 +24,7 @@ impl RetentionPolicy {
|
|||||||
audit_days: u32,
|
audit_days: u32,
|
||||||
) -> Result<(), &'static str> {
|
) -> Result<(), &'static str> {
|
||||||
for (valid, field) in [
|
for (valid, field) in [
|
||||||
((1..=31).contains(&usage_days), "usage_retention_days"),
|
(usage_days > 0, "usage_retention_days"),
|
||||||
(ops_days > 0, "ops_event_retention_days"),
|
(ops_days > 0, "ops_event_retention_days"),
|
||||||
(audit_days > 0, "audit_retention_days"),
|
(audit_days > 0, "audit_retention_days"),
|
||||||
] {
|
] {
|
||||||
@@ -38,7 +38,7 @@ impl RetentionPolicy {
|
|||||||
pub fn try_new(usage_days: u32, ops_days: u32, audit_days: u32) -> Result<Self, AdminError> {
|
pub fn try_new(usage_days: u32, ops_days: u32, audit_days: u32) -> Result<Self, AdminError> {
|
||||||
if Self::validate_values(usage_days, ops_days, audit_days).is_err() {
|
if Self::validate_values(usage_days, ops_days, audit_days).is_err() {
|
||||||
return Err(AdminError::invalid(
|
return Err(AdminError::invalid(
|
||||||
"请求保留期必须为 1~31 天,事件与审计保留期必须为正数",
|
"请求、事件与审计保留期必须为正整数天数",
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
Ok(Self {
|
Ok(Self {
|
||||||
|
|||||||
@@ -45,6 +45,8 @@ pub use gateway_core::account::RotationStrategy;
|
|||||||
/// 运行设置的共同值;版本、Provider 画像更新和数据库秘密由外层类型拥有
|
/// 运行设置的共同值;版本、Provider 画像更新和数据库秘密由外层类型拥有
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
|
#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
|
||||||
pub struct RuntimeSettingsValues {
|
pub struct RuntimeSettingsValues {
|
||||||
|
pub openai_oauth_guardian_review_model: bool,
|
||||||
|
pub openai_request_country: gateway_core::account::OpenAiRequestCountry,
|
||||||
pub codex_privacy_policy: gateway_core::settings::privacy::CodexPrivacyPolicy,
|
pub codex_privacy_policy: gateway_core::settings::privacy::CodexPrivacyPolicy,
|
||||||
pub request_location_enabled: bool,
|
pub request_location_enabled: bool,
|
||||||
pub request_location: gateway_core::account::RequestLocation,
|
pub request_location: gateway_core::account::RequestLocation,
|
||||||
@@ -63,6 +65,7 @@ pub struct RuntimeSettingsValues {
|
|||||||
pub openai_session_affinity_ttl_hours: u32,
|
pub openai_session_affinity_ttl_hours: u32,
|
||||||
pub responses_max_decompressed_body_bytes: u64,
|
pub responses_max_decompressed_body_bytes: u64,
|
||||||
pub smart_scheduling: gateway_core::account::SmartSchedulingConfig,
|
pub smart_scheduling: gateway_core::account::SmartSchedulingConfig,
|
||||||
|
pub quota_reset_window_weights: gateway_core::account::ResetWindowWeights,
|
||||||
pub min_codex_desktop_version: Option<String>,
|
pub min_codex_desktop_version: Option<String>,
|
||||||
pub min_codex_cli_version: Option<String>,
|
pub min_codex_cli_version: Option<String>,
|
||||||
pub usage_retention_days: u32,
|
pub usage_retention_days: u32,
|
||||||
@@ -72,7 +75,6 @@ pub struct RuntimeSettingsValues {
|
|||||||
pub account_warmup_enabled: bool,
|
pub account_warmup_enabled: bool,
|
||||||
pub account_warmup_cron: String,
|
pub account_warmup_cron: String,
|
||||||
pub account_warmup_model: Option<String>,
|
pub account_warmup_model: Option<String>,
|
||||||
#[serde(default)]
|
|
||||||
pub reset_credit_on_low_weekly_quota: bool,
|
pub reset_credit_on_low_weekly_quota: bool,
|
||||||
pub reset_credit_lead_minutes: u32,
|
pub reset_credit_lead_minutes: u32,
|
||||||
pub reset_credit_max_weekly_remaining_percent: Option<u32>,
|
pub reset_credit_max_weekly_remaining_percent: Option<u32>,
|
||||||
@@ -199,6 +201,9 @@ impl RuntimeSettingsValues {
|
|||||||
{
|
{
|
||||||
return Err("reset_credit_max_weekly_remaining_percent");
|
return Err("reset_credit_max_weekly_remaining_percent");
|
||||||
}
|
}
|
||||||
|
self.openai_request_country
|
||||||
|
.validate()
|
||||||
|
.map_err(|_| "openai_request_country")?;
|
||||||
self.request_location
|
self.request_location
|
||||||
.validate()
|
.validate()
|
||||||
.map_err(|_| "request_location")?;
|
.map_err(|_| "request_location")?;
|
||||||
|
|||||||
@@ -34,6 +34,12 @@ pub trait PluginAccountAccess: Send + Sync {
|
|||||||
Err(AdminError::unavailable("插件额度事实查询暂不可用"))
|
Err(AdminError::unavailable("插件额度事实查询暂不可用"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn quota_history(
|
||||||
|
&self,
|
||||||
|
account: &ProviderAccountId,
|
||||||
|
query: crate::model::quota_history::QuotaHistoryQuery,
|
||||||
|
) -> Result<crate::model::quota_history::QuotaHistoryPage, AdminError>;
|
||||||
|
|
||||||
/// 通过 Provider 原生管理路径刷新额度;不向插件暴露凭据或执行额度重置
|
/// 通过 Provider 原生管理路径刷新额度;不向插件暴露凭据或执行额度重置
|
||||||
async fn refresh_quota(
|
async fn refresh_quota(
|
||||||
&self,
|
&self,
|
||||||
|
|||||||
@@ -231,6 +231,19 @@ pub trait ProviderAdmin: Send + Sync {
|
|||||||
self.preview_client_profile(key)
|
self.preview_client_profile(key)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 在批量更新中合并本地身份;缺省、清除和替换分别保留各自语义,不能执行 I/O
|
||||||
|
fn merge_batch_key_profile(
|
||||||
|
&self,
|
||||||
|
current: Option<&gateway_core::account::OpaqueProviderData>,
|
||||||
|
update: Option<&Option<gateway_core::account::OpaqueProviderData>>,
|
||||||
|
installation_seed: Option<uuid::Uuid>,
|
||||||
|
) -> Result<Option<gateway_core::account::OpaqueProviderData>, ProviderAdminError> {
|
||||||
|
if installation_seed.is_some() {
|
||||||
|
return Err(ProviderAdminError::new(ProviderAdminErrorKind::Unsupported));
|
||||||
|
}
|
||||||
|
Ok(update.map_or_else(|| current.cloned(), Clone::clone))
|
||||||
|
}
|
||||||
|
|
||||||
/// 提供最终套餐展示名称;未覆盖时采用通用的大驼峰格式
|
/// 提供最终套餐展示名称;未覆盖时采用通用的大驼峰格式
|
||||||
fn plan_type_display(&self, plan_type: &str) -> String {
|
fn plan_type_display(&self, plan_type: &str) -> String {
|
||||||
default_plan_type_display(plan_type)
|
default_plan_type_display(plan_type)
|
||||||
@@ -349,6 +362,11 @@ pub trait ProviderAdmin: Send + Sync {
|
|||||||
Ok(None)
|
Ok(None)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// 历史文档由 Provider 按稳定窗口键解释,不支持的 Provider 不扫描请求记录
|
||||||
|
fn quota_history_parser(&self) -> Option<crate::model::quota_history::QuotaHistoryParser> {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
|
||||||
/// 历史观测的协议字段仅由具体 Provider 解释;不支持时保留累计估算
|
/// 历史观测的协议字段仅由具体 Provider 解释;不支持时保留累计估算
|
||||||
fn quota_forecast_observation(
|
fn quota_forecast_observation(
|
||||||
&self,
|
&self,
|
||||||
|
|||||||
@@ -69,8 +69,14 @@ pub struct ProxyImportReservation {
|
|||||||
pub guard: Box<dyn ProxyImportGuard>,
|
pub guard: Box<dyn ProxyImportGuard>,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Copy)]
|
||||||
|
pub enum ProbeRoute<'a> {
|
||||||
|
Direct,
|
||||||
|
Deployment,
|
||||||
|
Proxy(&'a OutboundProxy),
|
||||||
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
pub trait ProxyProbe: Send + Sync {
|
pub trait ProxyProbe: Send + Sync {
|
||||||
/// 未指定代理时探测服务器直连出口,不继承进程代理环境变量
|
async fn test(&self, proxy: ProbeRoute<'_>, detect_location: bool) -> ProxyTestResult;
|
||||||
async fn test(&self, proxy: Option<&OutboundProxy>, detect_location: bool) -> ProxyTestResult;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,10 +22,11 @@ use crate::model::{
|
|||||||
},
|
},
|
||||||
auth::{AdminAuditEvent, AuthSession},
|
auth::{AdminAuditEvent, AuthSession},
|
||||||
client_keys::{
|
client_keys::{
|
||||||
ClientKeyBudgetMutationOrigin, ClientKeyBudgetWindow, ClientKeyBudgetWindowPeriod,
|
BatchUpdateClientKeys, BudgetReferenceAccountPage, ClientKeyBudgetMutationOrigin,
|
||||||
ClientKeyListQuery, ClientKeyPage, ClientKeyRecord, ClientKeySecret, DeleteClientKey,
|
ClientKeyBudgetWindow, ClientKeyBudgetWindowPeriod, ClientKeyListQuery, ClientKeyPage,
|
||||||
NewClientKey, ResetClientKeyBudget, SetClientKeyBudgetWindow, SetClientKeyEnabled,
|
ClientKeyRecord, ClientKeySecret, DeleteClientKey, NewClientKey, ResetClientKeyBudget,
|
||||||
UpdateClientKey, UpdateClientKeyBudgetLimits,
|
SetClientKeyBudgetWindow, SetClientKeyEnabled, UpdateClientKey,
|
||||||
|
UpdateClientKeyBudgetLimits,
|
||||||
},
|
},
|
||||||
observability::{
|
observability::{
|
||||||
DashboardObservation, DashboardQuery, DiagnosticDimension, DiagnosticsObservation,
|
DashboardObservation, DashboardQuery, DiagnosticDimension, DiagnosticsObservation,
|
||||||
@@ -109,6 +110,13 @@ impl AdminStoreError {
|
|||||||
|
|
||||||
pub type AdminStoreResult<T> = Result<T, AdminStoreError>;
|
pub type AdminStoreResult<T> = Result<T, AdminStoreError>;
|
||||||
|
|
||||||
|
/// 在持有密钥行锁时用 Provider 准备好的纯合并操作更新原有画像
|
||||||
|
pub type BatchClientKeyProfileMerger = Box<
|
||||||
|
dyn Fn(&mut crate::model::client_keys::ProviderRequestProfileOverrides) -> AdminStoreResult<()>
|
||||||
|
+ Send
|
||||||
|
+ Sync,
|
||||||
|
>;
|
||||||
|
|
||||||
/// 账号目录与公共账号写操作
|
/// 账号目录与公共账号写操作
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
pub trait AccountStore:
|
pub trait AccountStore:
|
||||||
@@ -180,6 +188,16 @@ pub trait AccountStore:
|
|||||||
windows: &[AccountUsageWindowQuery],
|
windows: &[AccountUsageWindowQuery],
|
||||||
) -> AdminStoreResult<Vec<AccountUsageWindowResult>>;
|
) -> AdminStoreResult<Vec<AccountUsageWindowResult>>;
|
||||||
|
|
||||||
|
/// 按完成时间倒序读取一页保留的请求观测,不按本地计费结果筛选
|
||||||
|
async fn quota_documents(
|
||||||
|
&self,
|
||||||
|
account: &gateway_core::account::ProviderAccountId,
|
||||||
|
provider: &gateway_core::routing::ProviderKind,
|
||||||
|
created_at: DateTime<Utc>,
|
||||||
|
range: TimeRange,
|
||||||
|
before: Option<&crate::model::quota_history::QuotaHistoryCursor>,
|
||||||
|
) -> AdminStoreResult<crate::model::quota_history::QuotaDocumentPage>;
|
||||||
|
|
||||||
/// 从同一数据库语句取得截止快照的累计用量和有界历史观测
|
/// 从同一数据库语句取得截止快照的累计用量和有界历史观测
|
||||||
async fn load_quota_forecast_history(
|
async fn load_quota_forecast_history(
|
||||||
&self,
|
&self,
|
||||||
@@ -367,6 +385,18 @@ pub trait AuthStore: Send + Sync {
|
|||||||
/// Client API Key 资料读取与管理写入
|
/// Client API Key 资料读取与管理写入
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
pub trait ClientKeyStore: Send + Sync {
|
pub trait ClientKeyStore: Send + Sync {
|
||||||
|
async fn client_key_budget(
|
||||||
|
&self,
|
||||||
|
id: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
) -> AdminStoreResult<Option<gateway_core::engine::budget::ClientBudgetStatus>>;
|
||||||
|
|
||||||
|
async fn budget_reference_accounts(
|
||||||
|
&self,
|
||||||
|
id: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
search: &str,
|
||||||
|
after: &str,
|
||||||
|
) -> AdminStoreResult<BudgetReferenceAccountPage>;
|
||||||
|
|
||||||
async fn client_key_budget_window(
|
async fn client_key_budget_window(
|
||||||
&self,
|
&self,
|
||||||
id: &gateway_core::policy::ClientApiKeyId,
|
id: &gateway_core::policy::ClientApiKeyId,
|
||||||
@@ -405,6 +435,13 @@ pub trait ClientKeyStore: Send + Sync {
|
|||||||
context: &MutationContext,
|
context: &MutationContext,
|
||||||
) -> AdminStoreResult<(Revision, ClientKeyRecord)>;
|
) -> AdminStoreResult<(Revision, ClientKeyRecord)>;
|
||||||
|
|
||||||
|
async fn batch_update_client_keys(
|
||||||
|
&self,
|
||||||
|
command: BatchUpdateClientKeys,
|
||||||
|
merge_profiles: BatchClientKeyProfileMerger,
|
||||||
|
context: &MutationContext,
|
||||||
|
) -> AdminStoreResult<Revision>;
|
||||||
|
|
||||||
async fn set_client_key_enabled(
|
async fn set_client_key_enabled(
|
||||||
&self,
|
&self,
|
||||||
command: SetClientKeyEnabled,
|
command: SetClientKeyEnabled,
|
||||||
@@ -470,6 +507,7 @@ pub trait AccountGroupStore: Send + Sync {
|
|||||||
context: &MutationContext,
|
context: &MutationContext,
|
||||||
) -> AdminStoreResult<AccountGroupMutation>;
|
) -> AdminStoreResult<AccountGroupMutation>;
|
||||||
|
|
||||||
|
/// 仍有 API Key 引用分组时返回 Conflict
|
||||||
async fn delete_account_group(
|
async fn delete_account_group(
|
||||||
&self,
|
&self,
|
||||||
command: DeleteAccountGroup,
|
command: DeleteAccountGroup,
|
||||||
@@ -507,6 +545,19 @@ pub trait ObservabilityStore: Send + Sync {
|
|||||||
granularity: Granularity,
|
granularity: Granularity,
|
||||||
) -> AdminStoreResult<Vec<RequestMetricPoint>>;
|
) -> AdminStoreResult<Vec<RequestMetricPoint>>;
|
||||||
|
|
||||||
|
async fn client_key_statistics(
|
||||||
|
&self,
|
||||||
|
range: TimeRange,
|
||||||
|
id: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
query: crate::model::observability::KeyUsageMetric,
|
||||||
|
) -> AdminStoreResult<crate::model::observability::KeyStatisticsOverview>;
|
||||||
|
|
||||||
|
async fn client_key_models(
|
||||||
|
&self,
|
||||||
|
range: TimeRange,
|
||||||
|
id: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
) -> AdminStoreResult<Vec<crate::model::observability::KeyModelRow>>;
|
||||||
|
|
||||||
async fn usage_trend(
|
async fn usage_trend(
|
||||||
&self,
|
&self,
|
||||||
range: TimeRange,
|
range: TimeRange,
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ use std::{
|
|||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use gateway_core::{
|
use gateway_core::{
|
||||||
account::{AccountStatus, resolve_account_status},
|
account::{AccountStatus, resolve_account_status},
|
||||||
routing::AccountGroupId,
|
routing::{AccountGroupId, UpstreamModelId},
|
||||||
runtime::SnapshotControl,
|
runtime::{RuntimeSnapshotHandle, SnapshotControl},
|
||||||
};
|
};
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
|
|
||||||
@@ -24,7 +24,7 @@ use crate::{
|
|||||||
NewAccountGroup, SetAccountGroupEnabled, UpdateAccountGroup,
|
NewAccountGroup, SetAccountGroupEnabled, UpdateAccountGroup,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
ports::store::{AccountGroupStore, AccountRuntimeStore},
|
ports::store::{AccountGroupStore, AccountRuntimeStore, AdminStoreErrorKind},
|
||||||
};
|
};
|
||||||
|
|
||||||
use super::{map_store_error, publish_committed};
|
use super::{map_store_error, publish_committed};
|
||||||
@@ -32,6 +32,7 @@ use super::{map_store_error, publish_committed};
|
|||||||
/// 面向 API 的账号分组管理服务
|
/// 面向 API 的账号分组管理服务
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
pub trait AccountGroupService: Send + Sync {
|
pub trait AccountGroupService: Send + Sync {
|
||||||
|
fn models(&self, group: &AccountGroupId) -> Result<Vec<UpstreamModelId>, AdminError>;
|
||||||
async fn list(&self, query: AccountGroupListQuery) -> Result<AccountGroupPage, AdminError>;
|
async fn list(&self, query: AccountGroupListQuery) -> Result<AccountGroupPage, AdminError>;
|
||||||
async fn list_options(
|
async fn list_options(
|
||||||
&self,
|
&self,
|
||||||
@@ -64,6 +65,7 @@ pub(crate) struct DefaultAccountGroupService {
|
|||||||
store: Arc<dyn AccountGroupStore>,
|
store: Arc<dyn AccountGroupStore>,
|
||||||
runtime: Arc<dyn AccountRuntimeStore>,
|
runtime: Arc<dyn AccountRuntimeStore>,
|
||||||
snapshot: Arc<dyn SnapshotControl>,
|
snapshot: Arc<dyn SnapshotControl>,
|
||||||
|
published_snapshot: RuntimeSnapshotHandle,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl DefaultAccountGroupService {
|
impl DefaultAccountGroupService {
|
||||||
@@ -73,12 +75,14 @@ impl DefaultAccountGroupService {
|
|||||||
store: Arc<dyn AccountGroupStore>,
|
store: Arc<dyn AccountGroupStore>,
|
||||||
runtime: Arc<dyn AccountRuntimeStore>,
|
runtime: Arc<dyn AccountRuntimeStore>,
|
||||||
snapshot: Arc<dyn SnapshotControl>,
|
snapshot: Arc<dyn SnapshotControl>,
|
||||||
|
published_snapshot: RuntimeSnapshotHandle,
|
||||||
) -> Self {
|
) -> Self {
|
||||||
Self {
|
Self {
|
||||||
upstream_info,
|
upstream_info,
|
||||||
store,
|
store,
|
||||||
runtime,
|
runtime,
|
||||||
snapshot,
|
snapshot,
|
||||||
|
published_snapshot,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -131,6 +135,14 @@ impl DefaultAccountGroupService {
|
|||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl AccountGroupService for DefaultAccountGroupService {
|
impl AccountGroupService for DefaultAccountGroupService {
|
||||||
|
fn models(&self, group: &AccountGroupId) -> Result<Vec<UpstreamModelId>, AdminError> {
|
||||||
|
let snapshot = self
|
||||||
|
.published_snapshot
|
||||||
|
.acquire()
|
||||||
|
.map_err(|_| AdminError::unavailable("模型目录尚未就绪"))?;
|
||||||
|
Ok(snapshot.upstream_models_for_group(group))
|
||||||
|
}
|
||||||
|
|
||||||
async fn list(&self, query: AccountGroupListQuery) -> Result<AccountGroupPage, AdminError> {
|
async fn list(&self, query: AccountGroupListQuery) -> Result<AccountGroupPage, AdminError> {
|
||||||
let mut page = self
|
let mut page = self
|
||||||
.store
|
.store
|
||||||
@@ -159,8 +171,7 @@ impl AccountGroupService for DefaultAccountGroupService {
|
|||||||
crate::model::account_groups::validate_group_fields(
|
crate::model::account_groups::validate_group_fields(
|
||||||
&command.name,
|
&command.name,
|
||||||
command.description.as_deref(),
|
command.description.as_deref(),
|
||||||
)
|
)?;
|
||||||
.map_err(|_| AdminError::invalid("账号组请求不合法"))?;
|
|
||||||
let id = AccountGroupId::new(format!("grp_{}", Uuid::now_v7().simple()))
|
let id = AccountGroupId::new(format!("grp_{}", Uuid::now_v7().simple()))
|
||||||
.map_err(|_| AdminError::internal("创建账号组 ID 失败"))?;
|
.map_err(|_| AdminError::internal("创建账号组 ID 失败"))?;
|
||||||
self.publish(
|
self.publish(
|
||||||
@@ -168,6 +179,8 @@ impl AccountGroupService for DefaultAccountGroupService {
|
|||||||
.create_account_group(
|
.create_account_group(
|
||||||
NewAccountGroup {
|
NewAccountGroup {
|
||||||
allow_image_generation: command.allow_image_generation,
|
allow_image_generation: command.allow_image_generation,
|
||||||
|
allow_subagents: command.allow_subagents,
|
||||||
|
model_access: command.model_access,
|
||||||
id,
|
id,
|
||||||
name: command.name,
|
name: command.name,
|
||||||
description: command.description,
|
description: command.description,
|
||||||
@@ -189,8 +202,7 @@ impl AccountGroupService for DefaultAccountGroupService {
|
|||||||
crate::model::account_groups::validate_group_fields(
|
crate::model::account_groups::validate_group_fields(
|
||||||
&command.name,
|
&command.name,
|
||||||
command.description.as_deref(),
|
command.description.as_deref(),
|
||||||
)
|
)?;
|
||||||
.map_err(|_| AdminError::invalid("账号组请求不合法"))?;
|
|
||||||
self.publish(self.store.update_account_group(command, context).await)
|
self.publish(self.store.update_account_group(command, context).await)
|
||||||
.await
|
.await
|
||||||
}
|
}
|
||||||
@@ -209,8 +221,12 @@ impl AccountGroupService for DefaultAccountGroupService {
|
|||||||
context: &MutationContext,
|
context: &MutationContext,
|
||||||
command: DeleteAccountGroup,
|
command: DeleteAccountGroup,
|
||||||
) -> Result<AccountGroupMutation, AdminError> {
|
) -> Result<AccountGroupMutation, AdminError> {
|
||||||
self.publish(self.store.delete_account_group(command, context).await)
|
match self.store.delete_account_group(command, context).await {
|
||||||
.await
|
Err(error) if error.kind() == AdminStoreErrorKind::Conflict => {
|
||||||
|
Err(AdminError::conflict("分组仍绑定 API Key,请先解除绑定").with_source(error))
|
||||||
|
}
|
||||||
|
result => self.publish(result).await,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,11 +20,13 @@ use gateway_core::{
|
|||||||
use crate::{
|
use crate::{
|
||||||
model::{
|
model::{
|
||||||
AdminError, MutationContext,
|
AdminError, MutationContext,
|
||||||
|
account_groups::AccountGroupRef,
|
||||||
accounts::{
|
accounts::{
|
||||||
AccountConnectionTestEvent, AccountConnectionTestEventStream, AccountListQuery,
|
AccountConnectionTestEvent, AccountConnectionTestEventStream, AccountListQuery,
|
||||||
AccountPageItem, AccountUpdateResult, AccountUsage, AccountUsageWindowQuery,
|
AccountPageItem, AccountUpdateResult, AccountUsage, AccountUsageWindowQuery,
|
||||||
AccountsUpdateResult, BatchUpdateAccounts, UpdateAccount,
|
AccountsUpdateResult, BatchUpdateAccounts, UpdateAccount,
|
||||||
},
|
},
|
||||||
|
client_keys::ClientKeyBudgetReference,
|
||||||
observability::TimeRange,
|
observability::TimeRange,
|
||||||
provider_credentials::{
|
provider_credentials::{
|
||||||
AccountDirectoryItem, AccountDirectoryPage, AccountExportBundle, AccountPersonalInfo,
|
AccountDirectoryItem, AccountDirectoryPage, AccountExportBundle, AccountPersonalInfo,
|
||||||
@@ -107,6 +109,12 @@ pub trait AccountsService: Send + Sync {
|
|||||||
refresh: bool,
|
refresh: bool,
|
||||||
) -> Result<AccountDirectoryItem, AdminError>;
|
) -> Result<AccountDirectoryItem, AdminError>;
|
||||||
|
|
||||||
|
async fn key_budget_references(
|
||||||
|
&self,
|
||||||
|
account_id: &ProviderAccountId,
|
||||||
|
key_groups: &[AccountGroupRef],
|
||||||
|
) -> Result<Vec<ClientKeyBudgetReference>, AdminError>;
|
||||||
|
|
||||||
async fn quota_forecast(
|
async fn quota_forecast(
|
||||||
&self,
|
&self,
|
||||||
account_id: &ProviderAccountId,
|
account_id: &ProviderAccountId,
|
||||||
@@ -759,7 +767,7 @@ impl AccountsService for DefaultAccountsService {
|
|||||||
self.accounts
|
self.accounts
|
||||||
.batch_update_accounts(
|
.batch_update_accounts(
|
||||||
BatchUpdateAccounts {
|
BatchUpdateAccounts {
|
||||||
quota_limits: None,
|
quota_settings: None,
|
||||||
auto_use_quota_credits: None,
|
auto_use_quota_credits: None,
|
||||||
account_ids: vec![account_id.to_string()],
|
account_ids: vec![account_id.to_string()],
|
||||||
enabled: Some(true),
|
enabled: Some(true),
|
||||||
@@ -846,20 +854,19 @@ impl AccountsService for DefaultAccountsService {
|
|||||||
let mut pauses = BTreeMap::new();
|
let mut pauses = BTreeMap::new();
|
||||||
for account_id in &account_ids {
|
for account_id in &account_ids {
|
||||||
let (mut item, provider) = self.provider_for_account(account_id).await?;
|
let (mut item, provider) = self.provider_for_account(account_id).await?;
|
||||||
if let Some(limits) = &command.quota_limits {
|
if let Some(settings) = &command.quota_settings {
|
||||||
if !provider
|
if !provider
|
||||||
.account_capabilities(account_id, &item.account.authentication_kind)
|
.account_capabilities(account_id, &item.account.authentication_kind)
|
||||||
.quota_limits_supported
|
.quota_settings_supported
|
||||||
{
|
{
|
||||||
return Err(AdminError::invalid("该账号不支持通用额度窗口上限"));
|
return Err(AdminError::invalid("该账号不支持额度桶设置"));
|
||||||
}
|
}
|
||||||
let new_keys = limits
|
let previous_settings = item.account.quota_settings.clone();
|
||||||
.keys()
|
let settings = settings.clone();
|
||||||
.filter(|key| !item.account.quota_limits.contains(key))
|
let mut observed_at = None;
|
||||||
.map(str::to_owned)
|
let mut paused = false;
|
||||||
.collect::<Vec<_>>();
|
if !settings.is_empty() {
|
||||||
if !limits.is_empty() {
|
item.account.quota_settings = settings.clone();
|
||||||
item.account.quota_limits = limits.clone();
|
|
||||||
let quota = provider
|
let quota = provider
|
||||||
.read_quotas(&[ProviderQuotaReadRequest {
|
.read_quotas(&[ProviderQuotaReadRequest {
|
||||||
account: &item.account,
|
account: &item.account,
|
||||||
@@ -870,24 +877,31 @@ impl AccountsService for DefaultAccountsService {
|
|||||||
.next()
|
.next()
|
||||||
.ok_or_else(|| AdminError::invalid("缺少账号额度观测结果"))?
|
.ok_or_else(|| AdminError::invalid("缺少账号额度观测结果"))?
|
||||||
.map_err(|error| map_provider_error(error, "provider quota"))?;
|
.map_err(|error| map_provider_error(error, "provider quota"))?;
|
||||||
if new_keys.iter().any(|key| {
|
for key in settings.keys() {
|
||||||
!quota.windows.iter().any(|window| {
|
let window = quota.windows.iter().find(|window| window.key == key);
|
||||||
window.key == *key
|
if window.is_none() && !previous_settings.contains(key) {
|
||||||
&& window.local_usage_attribution
|
return Err(AdminError::invalid("只能设置已观测的额度桶"));
|
||||||
== QuotaLocalUsageAttribution::AccountWide
|
}
|
||||||
})
|
if window.is_some_and(|window| {
|
||||||
}) {
|
window.local_usage_attribution
|
||||||
return Err(AdminError::invalid("只能设置已观测的通用额度窗口"));
|
!= QuotaLocalUsageAttribution::AccountWide
|
||||||
|
}) {
|
||||||
|
return Err(AdminError::invalid("只能设置通用额度桶"));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
pauses.insert(
|
observed_at = quota.observed_at;
|
||||||
item.account.id.clone(),
|
paused = !quota.paused_windows.is_empty();
|
||||||
crate::model::accounts::PreparedQuotaPause {
|
|
||||||
revision: item.account.credential_revision,
|
|
||||||
observed_at: quota.observed_at,
|
|
||||||
paused: !quota.paused_windows.is_empty(),
|
|
||||||
},
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
pauses.insert(
|
||||||
|
item.account.id.clone(),
|
||||||
|
crate::model::accounts::PreparedQuotaPause {
|
||||||
|
settings,
|
||||||
|
previous_settings,
|
||||||
|
revision: item.account.credential_revision,
|
||||||
|
observed_at,
|
||||||
|
paused,
|
||||||
|
},
|
||||||
|
);
|
||||||
}
|
}
|
||||||
if command.auto_use_quota_credits.is_some()
|
if command.auto_use_quota_credits.is_some()
|
||||||
&& !provider
|
&& !provider
|
||||||
@@ -966,6 +980,48 @@ impl AccountsService for DefaultAccountsService {
|
|||||||
self.load_directory_item(account_id, refresh).await
|
self.load_directory_item(account_id, refresh).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn key_budget_references(
|
||||||
|
&self,
|
||||||
|
account_id: &ProviderAccountId,
|
||||||
|
key_groups: &[AccountGroupRef],
|
||||||
|
) -> Result<Vec<ClientKeyBudgetReference>, AdminError> {
|
||||||
|
let (stored, provider) = self.provider_for_account(account_id).await?;
|
||||||
|
if !key_groups.is_empty()
|
||||||
|
&& !stored.account.groups.iter().any(|account_group| {
|
||||||
|
account_group.enabled && key_groups.iter().any(|group| group.id == account_group.id)
|
||||||
|
})
|
||||||
|
{
|
||||||
|
return Err(AdminError::bad_request("参考账号不在此密钥的账号范围内"));
|
||||||
|
}
|
||||||
|
// 只取已观测的额度边界,预览与确认都不触发上游刷新或账号用量聚合
|
||||||
|
let quota = match super::peer_link::upstream::read_quota(
|
||||||
|
self.upstream_info.as_deref(),
|
||||||
|
provider.as_ref(),
|
||||||
|
&stored.account,
|
||||||
|
ProviderQuotaRequest {
|
||||||
|
account_id: account_id.clone(),
|
||||||
|
refresh: false,
|
||||||
|
rolling_usage: None,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
{
|
||||||
|
Ok(quota) => quota,
|
||||||
|
Err(error)
|
||||||
|
if error.kind() == crate::ports::provider::ProviderAdminErrorKind::Unsupported =>
|
||||||
|
{
|
||||||
|
return Ok(Vec::new());
|
||||||
|
}
|
||||||
|
Err(error) => return Err(map_provider_error(error, "provider quota")),
|
||||||
|
};
|
||||||
|
let now = Utc::now();
|
||||||
|
Ok(quota
|
||||||
|
.windows
|
||||||
|
.into_iter()
|
||||||
|
.filter_map(|window| ClientKeyBudgetReference::from_current_window(window, now))
|
||||||
|
.collect())
|
||||||
|
}
|
||||||
|
|
||||||
async fn quota_forecast(
|
async fn quota_forecast(
|
||||||
&self,
|
&self,
|
||||||
account_id: &ProviderAccountId,
|
account_id: &ProviderAccountId,
|
||||||
@@ -1001,6 +1057,8 @@ impl AccountsService for DefaultAccountsService {
|
|||||||
) else {
|
) else {
|
||||||
continue;
|
continue;
|
||||||
};
|
};
|
||||||
|
let reset_at = query.range.end;
|
||||||
|
let window_duration = reset_at - query.range.start;
|
||||||
query.range.start = query.range.start.max(stored.account.created_at);
|
query.range.start = query.range.start.max(stored.account.created_at);
|
||||||
if query.range.start >= observed
|
if query.range.start >= observed
|
||||||
|| observed > now
|
|| observed > now
|
||||||
@@ -1010,7 +1068,6 @@ impl AccountsService for DefaultAccountsService {
|
|||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
let reset_at = query.range.end;
|
|
||||||
query.range.end = observed;
|
query.range.end = observed;
|
||||||
let history = self
|
let history = self
|
||||||
.accounts
|
.accounts
|
||||||
@@ -1018,27 +1075,37 @@ impl AccountsService for DefaultAccountsService {
|
|||||||
.await
|
.await
|
||||||
.map_err(|error| map_store_error(error, "forecast paired usage"))?;
|
.map_err(|error| map_store_error(error, "forecast paired usage"))?;
|
||||||
let mut points = Vec::new();
|
let mut points = Vec::new();
|
||||||
let mut interrupted = false;
|
let mut plan_changed = false;
|
||||||
for point in history.points {
|
for point in history.points {
|
||||||
let Some(fact) =
|
let Some(fact) =
|
||||||
provider.quota_forecast_observation(&point.provider_observation, window)
|
provider.quota_forecast_observation(&point.provider_observation, window)
|
||||||
else {
|
else {
|
||||||
continue;
|
continue;
|
||||||
};
|
};
|
||||||
let same_plan = quota
|
let (Some(current_plan), Some(previous_plan)) =
|
||||||
.plan_type
|
(quota.plan_type.as_deref(), fact.plan_type.as_deref())
|
||||||
.as_deref()
|
else {
|
||||||
.zip(fact.plan_type.as_deref())
|
continue;
|
||||||
.is_some_and(|(current, previous)| current.eq_ignore_ascii_case(previous));
|
};
|
||||||
// 仅容纳已观测到的秒级量化抖动,不用宽时间容差合并实际重置
|
let Some(start) = fact.reset_at.checked_sub_signed(window_duration) else {
|
||||||
// 不匹配的段截断基线;之后的有效观测可以重新积累
|
continue;
|
||||||
if !same_plan || (fact.reset_at - reset_at).abs() > Duration::seconds(2) {
|
};
|
||||||
|
if point.completed_at >= observed
|
||||||
|
|| point.started_at < query.range.start
|
||||||
|
|| point.completed_at < start
|
||||||
|
|| point.completed_at >= fact.reset_at
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if !current_plan.eq_ignore_ascii_case(previous_plan) {
|
||||||
points.clear();
|
points.clear();
|
||||||
interrupted = true;
|
plan_changed = true;
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
points.push(QuotaForecastPoint {
|
points.push(QuotaForecastPoint {
|
||||||
|
started_at: point.started_at,
|
||||||
observed_at: point.completed_at,
|
observed_at: point.completed_at,
|
||||||
|
reset_at: fact.reset_at,
|
||||||
used_percent: fact.used_percent,
|
used_percent: fact.used_percent,
|
||||||
usage: point.usage,
|
usage: point.usage,
|
||||||
});
|
});
|
||||||
@@ -1047,13 +1114,15 @@ impl AccountsService for DefaultAccountsService {
|
|||||||
window.key.clone(),
|
window.key.clone(),
|
||||||
query.range.start,
|
query.range.start,
|
||||||
QuotaForecastPoint {
|
QuotaForecastPoint {
|
||||||
|
started_at: observed,
|
||||||
observed_at: observed,
|
observed_at: observed,
|
||||||
|
reset_at,
|
||||||
used_percent: percent,
|
used_percent: percent,
|
||||||
usage: history.usage,
|
usage: history.usage,
|
||||||
},
|
},
|
||||||
points,
|
points,
|
||||||
history.pending_request_count,
|
history.pending_request_count,
|
||||||
interrupted,
|
plan_changed,
|
||||||
);
|
);
|
||||||
samples.push(sample);
|
samples.push(sample);
|
||||||
}
|
}
|
||||||
@@ -1298,9 +1367,7 @@ fn quota_usage_window(
|
|||||||
if window.local_usage_attribution != QuotaLocalUsageAttribution::AccountWide {
|
if window.local_usage_attribution != QuotaLocalUsageAttribution::AccountWide {
|
||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
let reset_at = window.reset_at?;
|
let (start, reset_at) = window.observed_bounds()?;
|
||||||
let seconds = i64::try_from(window.window_seconds?).ok()?;
|
|
||||||
let start = reset_at.checked_sub_signed(Duration::try_seconds(seconds)?)?;
|
|
||||||
let range = TimeRange::new(start, reset_at).ok()?;
|
let range = TimeRange::new(start, reset_at).ok()?;
|
||||||
// 上游百分比以该 reset 边界定义;以当前时间回推会让本地 Token 属于另一窗口
|
// 上游百分比以该 reset 边界定义;以当前时间回推会让本地 Token 属于另一窗口
|
||||||
Some(AccountUsageWindowQuery {
|
Some(AccountUsageWindowQuery {
|
||||||
|
|||||||
@@ -1,11 +1,12 @@
|
|||||||
//! Client API Key 管理用例
|
//! Client API Key 管理用例
|
||||||
|
|
||||||
use std::sync::Arc;
|
use std::{collections::BTreeSet, sync::Arc};
|
||||||
|
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use base64::{Engine as _, engine::general_purpose::URL_SAFE_NO_PAD};
|
use base64::{Engine as _, engine::general_purpose::URL_SAFE_NO_PAD};
|
||||||
use gateway_core::{
|
use gateway_core::{
|
||||||
engine::budget::ClientBudgetStatus, policy::ClientApiKeyId, runtime::SnapshotControl,
|
account::OpaqueProviderData, engine::budget::ClientBudgetStatus, policy::ClientApiKeyId,
|
||||||
|
routing::ProviderKind, runtime::SnapshotControl,
|
||||||
};
|
};
|
||||||
use rand_core::{OsRng, RngCore as _};
|
use rand_core::{OsRng, RngCore as _};
|
||||||
use uuid::Uuid;
|
use uuid::Uuid;
|
||||||
@@ -14,15 +15,17 @@ use crate::{
|
|||||||
model::{
|
model::{
|
||||||
AdminError, MutationContext,
|
AdminError, MutationContext,
|
||||||
client_keys::{
|
client_keys::{
|
||||||
ClientKeyBudgetMutationOrigin, ClientKeyBudgetWindow, ClientKeyBudgetWindowPeriod,
|
BatchUpdateClientKeys, BudgetReferenceAccountPage, ClientKeyBudgetMutationOrigin,
|
||||||
ClientKeyCursorValue, ClientKeyListQuery, ClientKeyMutation, ClientKeyPage,
|
ClientKeyBudgetWindow, ClientKeyBudgetWindowPeriod, ClientKeyCursorValue,
|
||||||
ClientKeyRecord, ClientKeySecret, ClientKeySortField, CreateClientKey,
|
ClientKeyListQuery, ClientKeyMutation, ClientKeyPage, ClientKeyRecord, ClientKeySecret,
|
||||||
CreatedClientKey, DeleteClientKey, NewClientKey, ResetClientKeyBudget,
|
ClientKeySortField, CreateClientKey, CreatedClientKey, DeleteClientKey, NewClientKey,
|
||||||
SetClientKeyBudgetWindow, SetClientKeyEnabled, UpdateClientKey,
|
ResetClientKeyBudget, SetClientKeyBudgetWindow, SetClientKeyEnabled, UpdateClientKey,
|
||||||
UpdateClientKeyBudgetLimits,
|
UpdateClientKeyBudgetLimits,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
ports::store::{AdminStoreError, AdminStoreErrorKind, ClientKeyStore},
|
ports::store::{
|
||||||
|
AdminStoreError, AdminStoreErrorKind, BatchClientKeyProfileMerger, ClientKeyStore,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
use super::{map_store_error, publish_committed};
|
use super::{map_store_error, publish_committed};
|
||||||
@@ -30,6 +33,13 @@ use super::{map_store_error, publish_committed};
|
|||||||
/// API 消费的 Client Key 管理服务
|
/// API 消费的 Client Key 管理服务
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
pub trait ClientKeyService: Send + Sync {
|
pub trait ClientKeyService: Send + Sync {
|
||||||
|
async fn budget_reference_accounts(
|
||||||
|
&self,
|
||||||
|
id: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
search: &str,
|
||||||
|
after: &str,
|
||||||
|
) -> Result<BudgetReferenceAccountPage, AdminError>;
|
||||||
|
|
||||||
async fn budget_window(
|
async fn budget_window(
|
||||||
&self,
|
&self,
|
||||||
id: &ClientApiKeyId,
|
id: &ClientApiKeyId,
|
||||||
@@ -55,6 +65,11 @@ pub trait ClientKeyService: Send + Sync {
|
|||||||
context: &MutationContext,
|
context: &MutationContext,
|
||||||
command: UpdateClientKey,
|
command: UpdateClientKey,
|
||||||
) -> Result<ClientKeyMutation, AdminError>;
|
) -> Result<ClientKeyMutation, AdminError>;
|
||||||
|
async fn batch_update(
|
||||||
|
&self,
|
||||||
|
context: &MutationContext,
|
||||||
|
command: BatchUpdateClientKeys,
|
||||||
|
) -> Result<crate::model::Revision, AdminError>;
|
||||||
async fn set_enabled(
|
async fn set_enabled(
|
||||||
&self,
|
&self,
|
||||||
context: &MutationContext,
|
context: &MutationContext,
|
||||||
@@ -99,10 +114,123 @@ impl DefaultClientKeyService {
|
|||||||
providers,
|
providers,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn validate_profile(
|
||||||
|
&self,
|
||||||
|
kind: &ProviderKind,
|
||||||
|
profile: &OpaqueProviderData,
|
||||||
|
) -> Result<(), AdminError> {
|
||||||
|
self.providers
|
||||||
|
.require(kind)
|
||||||
|
.and_then(|provider| provider.preview_key_client_profile(profile, None))
|
||||||
|
.map(|_| ())
|
||||||
|
.map_err(|error| super::map_provider_error(error, "client profile"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn batch_profile_merger(
|
||||||
|
&self,
|
||||||
|
command: &BatchUpdateClientKeys,
|
||||||
|
) -> Result<BatchClientKeyProfileMerger, AdminError> {
|
||||||
|
let mut kinds = command
|
||||||
|
.request_profile_override_updates
|
||||||
|
.keys()
|
||||||
|
.cloned()
|
||||||
|
.collect::<BTreeSet<_>>();
|
||||||
|
let seed_kind = ProviderKind::new("openai").expect("static Provider kind is valid");
|
||||||
|
if command.installation_seed.is_some() {
|
||||||
|
kinds.insert(seed_kind.clone());
|
||||||
|
}
|
||||||
|
let mut changes = Vec::with_capacity(kinds.len());
|
||||||
|
for kind in kinds {
|
||||||
|
let provider = self
|
||||||
|
.providers
|
||||||
|
.require(&kind)
|
||||||
|
.map_err(|error| super::map_provider_error(error, "client profile"))?;
|
||||||
|
let update = command.request_profile_override_updates.get(&kind).cloned();
|
||||||
|
let seed = if kind == seed_kind {
|
||||||
|
command.installation_seed
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
// 先校验输入,行锁内只依据各把密钥的现值完成合并
|
||||||
|
if let Some(Some(profile)) = update.as_ref() {
|
||||||
|
provider
|
||||||
|
.merge_batch_key_profile(None, update.as_ref(), seed)
|
||||||
|
.and_then(|_| provider.preview_key_client_profile(profile, None))
|
||||||
|
.map_err(|error| super::map_provider_error(error, "client profile"))?;
|
||||||
|
}
|
||||||
|
changes.push((kind, provider, update, seed));
|
||||||
|
}
|
||||||
|
Ok(Box::new(move |profiles| {
|
||||||
|
for (kind, provider, update, seed) in &changes {
|
||||||
|
let next = provider
|
||||||
|
.merge_batch_key_profile(profiles.get(kind), update.as_ref(), *seed)
|
||||||
|
.map_err(|error| {
|
||||||
|
AdminStoreError::new(
|
||||||
|
AdminStoreErrorKind::Invalid,
|
||||||
|
"client profile",
|
||||||
|
"invalid stored client profile",
|
||||||
|
)
|
||||||
|
.with_source(error)
|
||||||
|
})?;
|
||||||
|
if let Some(profile) = next {
|
||||||
|
profiles.insert(kind.clone(), profile);
|
||||||
|
} else {
|
||||||
|
profiles.remove(kind);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl ClientKeyService for DefaultClientKeyService {
|
impl ClientKeyService for DefaultClientKeyService {
|
||||||
|
async fn batch_update(
|
||||||
|
&self,
|
||||||
|
context: &MutationContext,
|
||||||
|
command: BatchUpdateClientKeys,
|
||||||
|
) -> Result<crate::model::Revision, AdminError> {
|
||||||
|
if command.ids.is_empty()
|
||||||
|
|| command.ids.len() > 1000
|
||||||
|
|| command
|
||||||
|
.ids
|
||||||
|
.iter()
|
||||||
|
.collect::<std::collections::BTreeSet<_>>()
|
||||||
|
.len()
|
||||||
|
!= command.ids.len()
|
||||||
|
{
|
||||||
|
return Err(AdminError::invalid("请选择 1 至 1000 个不同的 API Key"));
|
||||||
|
}
|
||||||
|
if !command.has_changes() {
|
||||||
|
return Err(AdminError::invalid("请至少选择一项要修改的密钥设置"));
|
||||||
|
}
|
||||||
|
if let Some(groups) = &command.group_ids {
|
||||||
|
crate::model::client_keys::validate_group_ids(groups)
|
||||||
|
.map_err(|_| AdminError::invalid("API Key 分组不合法"))?;
|
||||||
|
}
|
||||||
|
let merge_profiles = self.batch_profile_merger(&command)?;
|
||||||
|
let revision = self
|
||||||
|
.store
|
||||||
|
.batch_update_client_keys(command, merge_profiles, context)
|
||||||
|
.await
|
||||||
|
.map_err(|error| map_store_error(error, "client API key"))?;
|
||||||
|
publish_committed(self.snapshot.as_ref(), revision).await?;
|
||||||
|
Ok(revision)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn budget_reference_accounts(
|
||||||
|
&self,
|
||||||
|
id: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
search: &str,
|
||||||
|
after: &str,
|
||||||
|
) -> Result<BudgetReferenceAccountPage, AdminError> {
|
||||||
|
self.store
|
||||||
|
.budget_reference_accounts(id, search.trim(), after)
|
||||||
|
.await
|
||||||
|
.map_err(|error| map_store_error(error, "client API key"))
|
||||||
|
}
|
||||||
|
|
||||||
async fn budget_window(
|
async fn budget_window(
|
||||||
&self,
|
&self,
|
||||||
id: &ClientApiKeyId,
|
id: &ClientApiKeyId,
|
||||||
@@ -141,7 +269,11 @@ impl ClientKeyService for DefaultClientKeyService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn budget(&self, id: &ClientApiKeyId) -> Result<ClientBudgetStatus, AdminError> {
|
async fn budget(&self, id: &ClientApiKeyId) -> Result<ClientBudgetStatus, AdminError> {
|
||||||
self.get(id).await.map(|key| key.budget)
|
self.store
|
||||||
|
.client_key_budget(id)
|
||||||
|
.await
|
||||||
|
.map_err(|error| map_store_error(error, "client API key"))?
|
||||||
|
.ok_or_else(|| AdminError::not_found("API Key 不存在"))
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn update_budget_limits(
|
async fn update_budget_limits(
|
||||||
@@ -203,10 +335,7 @@ impl ClientKeyService for DefaultClientKeyService {
|
|||||||
crate::model::client_keys::validate_group_ids(&command.group_ids)
|
crate::model::client_keys::validate_group_ids(&command.group_ids)
|
||||||
.map_err(|_| AdminError::invalid("API Key 分组不合法"))?;
|
.map_err(|_| AdminError::invalid("API Key 分组不合法"))?;
|
||||||
for (provider, profile) in &command.request_profile_overrides {
|
for (provider, profile) in &command.request_profile_overrides {
|
||||||
self.providers
|
self.validate_profile(provider, profile)?;
|
||||||
.require(provider)
|
|
||||||
.and_then(|provider| provider.preview_key_client_profile(profile, None))
|
|
||||||
.map_err(|error| super::map_provider_error(error, "client profile"))?;
|
|
||||||
}
|
}
|
||||||
validate_peer_sharing(command.peer_sharing, &command.group_ids)?;
|
validate_peer_sharing(command.peer_sharing, &command.group_ids)?;
|
||||||
let id = ClientApiKeyId::new(format!("key_{}", Uuid::now_v7().simple()))
|
let id = ClientApiKeyId::new(format!("key_{}", Uuid::now_v7().simple()))
|
||||||
@@ -250,10 +379,7 @@ impl ClientKeyService for DefaultClientKeyService {
|
|||||||
.map_err(|_| AdminError::invalid("API Key 分组不合法"))?;
|
.map_err(|_| AdminError::invalid("API Key 分组不合法"))?;
|
||||||
for (provider, profile) in &command.request_profile_override_updates {
|
for (provider, profile) in &command.request_profile_override_updates {
|
||||||
if let Some(profile) = profile {
|
if let Some(profile) = profile {
|
||||||
self.providers
|
self.validate_profile(provider, profile)?;
|
||||||
.require(provider)
|
|
||||||
.and_then(|provider| provider.preview_key_client_profile(profile, None))
|
|
||||||
.map_err(|error| super::map_provider_error(error, "client profile"))?;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if let Some(sharing) = command.peer_sharing {
|
if let Some(sharing) = command.peer_sharing {
|
||||||
@@ -314,7 +440,6 @@ impl ClientKeyService for DefaultClientKeyService {
|
|||||||
|
|
||||||
fn map_client_key_write_error(error: AdminStoreError) -> AdminError {
|
fn map_client_key_write_error(error: AdminStoreError) -> AdminError {
|
||||||
match error.kind() {
|
match error.kind() {
|
||||||
AdminStoreErrorKind::DuplicateName => AdminError::conflict("名称已存在"),
|
|
||||||
AdminStoreErrorKind::Conflict => AdminError::conflict("API Key 已存在,请使用其他密钥"),
|
AdminStoreErrorKind::Conflict => AdminError::conflict("API Key 已存在,请使用其他密钥"),
|
||||||
_ => map_store_error(error, "client API key"),
|
_ => map_store_error(error, "client API key"),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -150,7 +150,6 @@ pub(super) async fn pending_authorization(
|
|||||||
None => {
|
None => {
|
||||||
use crate::model::proxies::AccountProxySelection;
|
use crate::model::proxies::AccountProxySelection;
|
||||||
proxy = match &command.outbound_proxy {
|
proxy = match &command.outbound_proxy {
|
||||||
Some(AccountProxySelection::Url(value)) => Some(value.clone()),
|
|
||||||
Some(AccountProxySelection::Saved(id)) => {
|
Some(AccountProxySelection::Saved(id)) => {
|
||||||
let record = proxies
|
let record = proxies
|
||||||
.get(id)
|
.get(id)
|
||||||
|
|||||||
@@ -4,20 +4,15 @@ use crate::model::{AdminError, AdminErrorKind};
|
|||||||
use crate::ports::store::{AdminStoreError, AdminStoreErrorKind};
|
use crate::ports::store::{AdminStoreError, AdminStoreErrorKind};
|
||||||
|
|
||||||
pub(super) fn map_store_error(error: AdminStoreError, resource: &'static str) -> AdminError {
|
pub(super) fn map_store_error(error: AdminStoreError, resource: &'static str) -> AdminError {
|
||||||
let kind = match error.kind() {
|
let (kind, message) = match error.kind() {
|
||||||
AdminStoreErrorKind::Invalid => AdminErrorKind::Invalid,
|
AdminStoreErrorKind::Invalid => (AdminErrorKind::Invalid, "请求参数不合法"),
|
||||||
AdminStoreErrorKind::NotFound => AdminErrorKind::NotFound,
|
AdminStoreErrorKind::NotFound => (AdminErrorKind::NotFound, "请求的资源不存在"),
|
||||||
AdminStoreErrorKind::StaleRevision
|
AdminStoreErrorKind::StaleRevision => {
|
||||||
| AdminStoreErrorKind::DuplicateName
|
(AdminErrorKind::Conflict, "数据已更新,请刷新后再操作")
|
||||||
| AdminStoreErrorKind::Conflict => AdminErrorKind::Conflict,
|
}
|
||||||
AdminStoreErrorKind::Unavailable => AdminErrorKind::Unavailable,
|
AdminStoreErrorKind::DuplicateName => (AdminErrorKind::Conflict, "名称已存在"),
|
||||||
};
|
AdminStoreErrorKind::Conflict => (AdminErrorKind::Conflict, "当前资源状态不允许此操作"),
|
||||||
let message = match kind {
|
AdminStoreErrorKind::Unavailable => (AdminErrorKind::Unavailable, "存储服务暂不可用"),
|
||||||
AdminErrorKind::Invalid => "请求参数不合法",
|
|
||||||
AdminErrorKind::NotFound => "请求的资源不存在",
|
|
||||||
AdminErrorKind::Conflict => "当前资源状态冲突,请刷新后重试",
|
|
||||||
AdminErrorKind::Unavailable => "依赖服务暂不可用",
|
|
||||||
_ => "服务内部错误",
|
|
||||||
};
|
};
|
||||||
AdminError::new(kind, message).with_source(OperationFailure {
|
AdminError::new(kind, message).with_source(OperationFailure {
|
||||||
operation: resource,
|
operation: resource,
|
||||||
@@ -49,9 +44,8 @@ pub(super) fn map_provider_error(
|
|||||||
ProviderAdminErrorKind::Conflict => "服务商资源状态冲突,请刷新后重试",
|
ProviderAdminErrorKind::Conflict => "服务商资源状态冲突,请刷新后重试",
|
||||||
ProviderAdminErrorKind::BadGateway => "上游服务请求失败",
|
ProviderAdminErrorKind::BadGateway => "上游服务请求失败",
|
||||||
ProviderAdminErrorKind::Ambiguous => "上游执行结果未知,请刷新状态后再决定是否重试",
|
ProviderAdminErrorKind::Ambiguous => "上游执行结果未知,请刷新状态后再决定是否重试",
|
||||||
ProviderAdminErrorKind::Unavailable | ProviderAdminErrorKind::CredentialRefreshRequired => {
|
ProviderAdminErrorKind::Unavailable => "服务商暂不可用",
|
||||||
"服务商暂不可用"
|
ProviderAdminErrorKind::CredentialRefreshRequired => "账号凭据需要刷新",
|
||||||
}
|
|
||||||
ProviderAdminErrorKind::Internal => "服务内部错误",
|
ProviderAdminErrorKind::Internal => "服务内部错误",
|
||||||
};
|
};
|
||||||
AdminError::new(kind, error.public_message().unwrap_or(message)).with_source(OperationFailure {
|
AdminError::new(kind, error.public_message().unwrap_or(message)).with_source(OperationFailure {
|
||||||
|
|||||||
@@ -225,7 +225,7 @@ impl KeyUsageService for DefaultKeyUsageService {
|
|||||||
.list_usage_records(UsageQuery {
|
.list_usage_records(UsageQuery {
|
||||||
status: match query.kind {
|
status: match query.kind {
|
||||||
KeyUsageRecordKind::Success => UsageRecordStatus::Success,
|
KeyUsageRecordKind::Success => UsageRecordStatus::Success,
|
||||||
KeyUsageRecordKind::Error => UsageRecordStatus::Error,
|
KeyUsageRecordKind::Error => UsageRecordStatus::Error(None),
|
||||||
KeyUsageRecordKind::All => UsageRecordStatus::All,
|
KeyUsageRecordKind::All => UsageRecordStatus::All,
|
||||||
},
|
},
|
||||||
range: query.usage.range,
|
range: query.usage.range,
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
//! 从已保存的错误事实投影管理端来源,不参与执行错误分类或重试
|
//! 从已保存的错误事实投影管理端来源,不参与执行错误分类或重试
|
||||||
|
|
||||||
use crate::model::observability::{UsageErrorOrigin, UsageListRecord, UsageRecord};
|
use crate::model::observability::{
|
||||||
|
UsageErrorEvidence, UsageErrorOrigin, UsageListRecord, UsageRecord,
|
||||||
|
};
|
||||||
|
|
||||||
impl UsageListRecord {
|
impl UsageListRecord {
|
||||||
#[must_use]
|
#[must_use]
|
||||||
@@ -47,107 +49,124 @@ fn error_origin(
|
|||||||
continuation_reason: Option<&str>,
|
continuation_reason: Option<&str>,
|
||||||
connection_exit_reason: Option<&str>,
|
connection_exit_reason: Option<&str>,
|
||||||
) -> UsageErrorOrigin {
|
) -> UsageErrorOrigin {
|
||||||
if has_upstream_error
|
use UsageErrorEvidence::*;
|
||||||
|| upstream_code.is_some_and(|code| !code.is_empty())
|
UsageErrorOrigin::RULES
|
||||||
|| websocket_close_code.is_some()
|
.iter()
|
||||||
|| upstream_status_code.is_some_and(|status| status >= 400)
|
.find(|(evidence, _)| match evidence {
|
||||||
|| matches!(
|
ProviderErrorCode => upstream_code.is_some_and(|code| !code.is_empty()),
|
||||||
continuation_reason,
|
UpstreamStatusAtLeast(min) => upstream_status_code.is_some_and(|status| status >= *min),
|
||||||
Some("upstream_rejected" | "quota_exhausted")
|
SavedUpstreamErrorOrClose => has_upstream_error || websocket_close_code.is_some(),
|
||||||
)
|
ErrorKind(values) => error_kind.is_some_and(|value| values.contains(&value)),
|
||||||
|| matches!(
|
Continuation(values) => {
|
||||||
error_kind,
|
continuation_reason.is_some_and(|value| values.contains(&value))
|
||||||
// 这里匹配内部 errorKind;message_too_big 只由收到的上游 close 1009 产生
|
}
|
||||||
Some("permission_denied" | "message_too_big" | "upstream_capacity_unavailable")
|
ConnectionExit(values) => {
|
||||||
)
|
connection_exit_reason.is_some_and(|value| values.contains(&value))
|
||||||
{
|
}
|
||||||
return UsageErrorOrigin::Upstream;
|
})
|
||||||
}
|
.map_or(UsageErrorOrigin::Unknown, |(_, origin)| *origin)
|
||||||
if matches!(
|
}
|
||||||
continuation_reason,
|
|
||||||
Some(
|
impl UsageErrorOrigin {
|
||||||
"scope_unavailable"
|
/// 第一条命中的规则决定来源;含义不唯一的分类在缺少其他证据时保留 unknown
|
||||||
| "pool_unavailable"
|
pub const RULES: &'static [(UsageErrorEvidence, Self)] = {
|
||||||
| "fresh_connection_required"
|
use UsageErrorEvidence::*;
|
||||||
| "connection_busy"
|
&[
|
||||||
| "latest_response_mismatch"
|
(ProviderErrorCode, Self::Upstream),
|
||||||
| "reused_connection_lost"
|
(UpstreamStatusAtLeast(400), Self::Upstream),
|
||||||
| "transport_payload_too_large"
|
(
|
||||||
)
|
Continuation(&["upstream_rejected", "quota_exhausted"]),
|
||||||
) || matches!(
|
Self::Upstream,
|
||||||
error_kind,
|
),
|
||||||
Some(
|
// message_too_big 只由收到的上游 close 1009 产生
|
||||||
"process_interrupted"
|
(
|
||||||
| "process_terminated"
|
ErrorKind(&[
|
||||||
| "internal_error"
|
"permission_denied",
|
||||||
| "model_not_found"
|
"message_too_big",
|
||||||
| "no_available_provider"
|
"upstream_capacity_unavailable",
|
||||||
| "no_eligible_account"
|
]),
|
||||||
| "account_capacity_unavailable"
|
Self::Upstream,
|
||||||
| "middleware_capacity_unavailable"
|
),
|
||||||
| "concurrency_queue_full"
|
(SavedUpstreamErrorOrClose, Self::Upstream),
|
||||||
| "concurrency_queue_timeout"
|
(
|
||||||
| "provider_infrastructure_unavailable"
|
Continuation(&[
|
||||||
| "session_policy_restricted"
|
"scope_unavailable",
|
||||||
| "request_policy_denied"
|
"pool_unavailable",
|
||||||
| "policy_denied"
|
"fresh_connection_required",
|
||||||
| "budget_exhausted"
|
"connection_busy",
|
||||||
)
|
"latest_response_mismatch",
|
||||||
) || matches!(
|
"reused_connection_lost",
|
||||||
connection_exit_reason,
|
"transport_payload_too_large",
|
||||||
Some(
|
]),
|
||||||
"command_channel_closed"
|
Self::Proxy,
|
||||||
| "local_close"
|
),
|
||||||
| "message_receiver_closed"
|
(
|
||||||
| "client_cancelled"
|
ErrorKind(&[
|
||||||
| "downstream_send_failed"
|
"process_interrupted",
|
||||||
| "downstream_connection_closed"
|
"process_terminated",
|
||||||
| "downstream_rebound"
|
"internal_error",
|
||||||
| "pool_shutdown"
|
"model_not_found",
|
||||||
| "max_age_expired"
|
"no_available_provider",
|
||||||
| "idle_timeout_expired"
|
"no_eligible_account",
|
||||||
| "proxy_capacity_evicted"
|
"account_capacity_unavailable",
|
||||||
| "search_activation_required"
|
"middleware_capacity_unavailable",
|
||||||
)
|
"concurrency_queue_full",
|
||||||
) {
|
"concurrency_queue_timeout",
|
||||||
return UsageErrorOrigin::Proxy;
|
"provider_infrastructure_unavailable",
|
||||||
}
|
"session_policy_restricted",
|
||||||
if matches!(
|
"request_policy_denied",
|
||||||
connection_exit_reason,
|
"policy_denied",
|
||||||
Some(
|
"budget_exhausted",
|
||||||
"upstream_close"
|
]),
|
||||||
| "normal_close"
|
Self::Proxy,
|
||||||
| "unexpected_binary_event"
|
),
|
||||||
| "incomplete_response"
|
(
|
||||||
| "failed_response"
|
ConnectionExit(&[
|
||||||
)
|
"command_channel_closed",
|
||||||
) {
|
"local_close",
|
||||||
return UsageErrorOrigin::Upstream;
|
"message_receiver_closed",
|
||||||
}
|
"client_cancelled",
|
||||||
if error_kind == Some("transport")
|
"downstream_send_failed",
|
||||||
|| matches!(
|
"downstream_connection_closed",
|
||||||
connection_exit_reason,
|
"downstream_rebound",
|
||||||
Some(
|
"pool_shutdown",
|
||||||
"eof"
|
"max_age_expired",
|
||||||
| "unexpected_eof"
|
"idle_timeout_expired",
|
||||||
| "transport_error"
|
"proxy_capacity_evicted",
|
||||||
| "connection_reset"
|
"search_activation_required",
|
||||||
| "connection_aborted"
|
]),
|
||||||
| "broken_pipe"
|
Self::Proxy,
|
||||||
| "tcp_reset"
|
),
|
||||||
| "reset_without_closing_handshake"
|
(
|
||||||
| "transport_timeout"
|
ConnectionExit(&[
|
||||||
| "outbound_transport_error"
|
"upstream_close",
|
||||||
| "receive_idle_timeout"
|
"normal_close",
|
||||||
| "pong_timeout"
|
"unexpected_binary_event",
|
||||||
| "ping_write_timeout"
|
"incomplete_response",
|
||||||
| "pong_write_timeout"
|
"failed_response",
|
||||||
)
|
]),
|
||||||
)
|
Self::Upstream,
|
||||||
{
|
),
|
||||||
return UsageErrorOrigin::Connection;
|
(ErrorKind(&["transport"]), Self::Connection),
|
||||||
}
|
(
|
||||||
// invalid_request、protocol、rate_limited 等分类同时用于本地和上游失败
|
ConnectionExit(&[
|
||||||
// 发送状态与笼统的连接退出摘要也不能替代缺失的来源事实
|
"eof",
|
||||||
UsageErrorOrigin::Unknown
|
"unexpected_eof",
|
||||||
|
"transport_error",
|
||||||
|
"connection_reset",
|
||||||
|
"connection_aborted",
|
||||||
|
"broken_pipe",
|
||||||
|
"tcp_reset",
|
||||||
|
"reset_without_closing_handshake",
|
||||||
|
"transport_timeout",
|
||||||
|
"outbound_transport_error",
|
||||||
|
"receive_idle_timeout",
|
||||||
|
"pong_timeout",
|
||||||
|
"ping_write_timeout",
|
||||||
|
"pong_write_timeout",
|
||||||
|
]),
|
||||||
|
Self::Connection,
|
||||||
|
),
|
||||||
|
]
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,6 +60,19 @@ pub trait ObservabilityService: Send + Sync {
|
|||||||
-> Result<Trend, AdminError>;
|
-> Result<Trend, AdminError>;
|
||||||
async fn usage_records(&self, query: UsageQuery) -> Result<UsagePage, AdminError>;
|
async fn usage_records(&self, query: UsageQuery) -> Result<UsagePage, AdminError>;
|
||||||
async fn usage_record_detail(&self, request_id: &str) -> Result<UsageDetail, AdminError>;
|
async fn usage_record_detail(&self, request_id: &str) -> Result<UsageDetail, AdminError>;
|
||||||
|
async fn client_key_statistics(
|
||||||
|
&self,
|
||||||
|
range: TimeRange,
|
||||||
|
id: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
query: crate::model::observability::KeyUsageMetric,
|
||||||
|
) -> Result<crate::model::observability::KeyStatisticsOverview, AdminError>;
|
||||||
|
|
||||||
|
async fn client_key_models(
|
||||||
|
&self,
|
||||||
|
range: TimeRange,
|
||||||
|
id: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
) -> Result<Vec<crate::model::observability::KeyModelRow>, AdminError>;
|
||||||
|
|
||||||
async fn usage_summary(
|
async fn usage_summary(
|
||||||
&self,
|
&self,
|
||||||
range: TimeRange,
|
range: TimeRange,
|
||||||
@@ -287,6 +300,29 @@ impl ObservabilityService for DefaultObservabilityService {
|
|||||||
Ok(detail)
|
Ok(detail)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn client_key_statistics(
|
||||||
|
&self,
|
||||||
|
range: TimeRange,
|
||||||
|
id: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
query: crate::model::observability::KeyUsageMetric,
|
||||||
|
) -> Result<crate::model::observability::KeyStatisticsOverview, AdminError> {
|
||||||
|
self.store
|
||||||
|
.client_key_statistics(range, id, query)
|
||||||
|
.await
|
||||||
|
.map_err(|error| map_store_error(error, "client key statistics"))
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn client_key_models(
|
||||||
|
&self,
|
||||||
|
range: TimeRange,
|
||||||
|
id: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
) -> Result<Vec<crate::model::observability::KeyModelRow>, AdminError> {
|
||||||
|
self.store
|
||||||
|
.client_key_models(range, id)
|
||||||
|
.await
|
||||||
|
.map_err(|error| map_store_error(error, "client key statistics"))
|
||||||
|
}
|
||||||
|
|
||||||
async fn usage_summary(
|
async fn usage_summary(
|
||||||
&self,
|
&self,
|
||||||
range: TimeRange,
|
range: TimeRange,
|
||||||
|
|||||||
@@ -226,6 +226,23 @@ impl ObservabilityStore for CachedObservabilityStore {
|
|||||||
) -> AdminStoreResult<Vec<RequestMetricPoint>> {
|
) -> AdminStoreResult<Vec<RequestMetricPoint>> {
|
||||||
self.inner.dashboard_trend(range, granularity).await
|
self.inner.dashboard_trend(range, granularity).await
|
||||||
}
|
}
|
||||||
|
async fn client_key_statistics(
|
||||||
|
&self,
|
||||||
|
range: TimeRange,
|
||||||
|
id: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
query: crate::model::observability::KeyUsageMetric,
|
||||||
|
) -> AdminStoreResult<crate::model::observability::KeyStatisticsOverview> {
|
||||||
|
self.inner.client_key_statistics(range, id, query).await
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn client_key_models(
|
||||||
|
&self,
|
||||||
|
range: TimeRange,
|
||||||
|
id: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
) -> AdminStoreResult<Vec<crate::model::observability::KeyModelRow>> {
|
||||||
|
self.inner.client_key_models(range, id).await
|
||||||
|
}
|
||||||
|
|
||||||
async fn usage_trend(
|
async fn usage_trend(
|
||||||
&self,
|
&self,
|
||||||
range: TimeRange,
|
range: TimeRange,
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ impl PeerInfoService {
|
|||||||
});
|
});
|
||||||
let limits = peer.and_then(|peer| peer.key_limits);
|
let limits = peer.and_then(|peer| peer.key_limits);
|
||||||
let info = ProviderUpstreamInfo {
|
let info = ProviderUpstreamInfo {
|
||||||
discovered: peer.is_some() || stored_failure == Some(UpstreamInfoFailure::Unauthorized),
|
discovered: snapshot::is_discovered(peer, stored_failure),
|
||||||
observed_at,
|
observed_at,
|
||||||
stale,
|
stale,
|
||||||
connection_revision: connection.revision.clone(),
|
connection_revision: connection.revision.clone(),
|
||||||
|
|||||||
@@ -282,6 +282,21 @@ impl PeerInfoService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl UpstreamInfoSource for PeerInfoService {
|
impl UpstreamInfoSource for PeerInfoService {
|
||||||
|
fn is_peer(&self, account: &ProviderAccount) -> bool {
|
||||||
|
if !self.supported(account) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
let connection = UpstreamConnection::for_account(account);
|
||||||
|
self.observations
|
||||||
|
.read()
|
||||||
|
.unwrap_or_else(std::sync::PoisonError::into_inner)
|
||||||
|
.get(account.id())
|
||||||
|
.is_some_and(|cached| {
|
||||||
|
cached.connection == connection
|
||||||
|
&& snapshot::is_discovered(cached.summary.as_deref(), cached.stored_failure)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
fn signal(
|
fn signal(
|
||||||
&self,
|
&self,
|
||||||
account: &ProviderAccount,
|
account: &ProviderAccount,
|
||||||
|
|||||||
@@ -16,6 +16,10 @@ use serde::Deserialize as _;
|
|||||||
pub(super) const MAX_AGE: Duration = Duration::from_secs(30 * 60);
|
pub(super) const MAX_AGE: Duration = Duration::from_secs(30 * 60);
|
||||||
pub(super) const FRESH_FOR: Duration = Duration::from_secs(5 * 60);
|
pub(super) const FRESH_FOR: Duration = Duration::from_secs(5 * 60);
|
||||||
|
|
||||||
|
pub(super) fn is_discovered(peer: Option<&PeerLink>, failure: Option<UpstreamInfoFailure>) -> bool {
|
||||||
|
peer.is_some() || failure == Some(UpstreamInfoFailure::Unauthorized)
|
||||||
|
}
|
||||||
|
|
||||||
// 不支持协议是连接的识别结果,复用观测存储与版本保护,不伪造上游额度快照
|
// 不支持协议是连接的识别结果,复用观测存储与版本保护,不伪造上游额度快照
|
||||||
pub(super) fn unsupported(connection: &UpstreamConnection) -> OpaqueProviderData {
|
pub(super) fn unsupported(connection: &UpstreamConnection) -> OpaqueProviderData {
|
||||||
OpaqueProviderData::new(serde_json::Map::from_iter([
|
OpaqueProviderData::new(serde_json::Map::from_iter([
|
||||||
|
|||||||
@@ -126,6 +126,46 @@ impl PluginAccountAccess for DefaultPluginAccountAccess {
|
|||||||
self.quota(account_id, false).await
|
self.quota(account_id, false).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn quota_history(
|
||||||
|
&self,
|
||||||
|
account_id: &ProviderAccountId,
|
||||||
|
query: crate::model::quota_history::QuotaHistoryQuery,
|
||||||
|
) -> Result<crate::model::quota_history::QuotaHistoryPage, AdminError> {
|
||||||
|
use crate::model::{observability::TimeRange, quota_history::QuotaHistoryPage};
|
||||||
|
|
||||||
|
let account = self
|
||||||
|
.accounts
|
||||||
|
.load_account_record(account_id)
|
||||||
|
.await
|
||||||
|
.map_err(|error| map_store_error(error, "plugin quota history"))?
|
||||||
|
.ok_or_else(|| AdminError::not_found("账号不存在"))?;
|
||||||
|
let Some(parse) = self
|
||||||
|
.provider(&account.provider_kind)?
|
||||||
|
.quota_history_parser()
|
||||||
|
else {
|
||||||
|
return Ok(QuotaHistoryPage::default());
|
||||||
|
};
|
||||||
|
let start = query.scan_start().max(account.created_at);
|
||||||
|
if start >= query.range.end {
|
||||||
|
return Ok(QuotaHistoryPage::default());
|
||||||
|
}
|
||||||
|
let page = self
|
||||||
|
.accounts
|
||||||
|
.quota_documents(
|
||||||
|
account_id,
|
||||||
|
&account.provider_kind,
|
||||||
|
account.created_at,
|
||||||
|
TimeRange {
|
||||||
|
start,
|
||||||
|
end: query.range.end,
|
||||||
|
},
|
||||||
|
query.cursor.as_ref(),
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.map_err(|error| map_store_error(error, "plugin quota history"))?;
|
||||||
|
Ok(QuotaHistoryPage::from_documents(page, &query, parse))
|
||||||
|
}
|
||||||
|
|
||||||
async fn refresh_quota(
|
async fn refresh_quota(
|
||||||
&self,
|
&self,
|
||||||
account_id: &ProviderAccountId,
|
account_id: &ProviderAccountId,
|
||||||
|
|||||||
@@ -53,6 +53,8 @@ impl PluginResourceAccess for DefaultPluginResourceAccess {
|
|||||||
resource_key,
|
resource_key,
|
||||||
NewAccountGroup {
|
NewAccountGroup {
|
||||||
allow_image_generation: command.allow_image_generation,
|
allow_image_generation: command.allow_image_generation,
|
||||||
|
allow_subagents: command.allow_subagents,
|
||||||
|
model_access: command.model_access,
|
||||||
id,
|
id,
|
||||||
name: command.name,
|
name: command.name,
|
||||||
description: command.description,
|
description: command.description,
|
||||||
|
|||||||
@@ -306,7 +306,9 @@ impl PluginsService {
|
|||||||
.await
|
.await
|
||||||
.map_err(|error| map_store_error(error, "proxy"))?;
|
.map_err(|error| map_store_error(error, "proxy"))?;
|
||||||
if !record.enabled {
|
if !record.enabled {
|
||||||
return Err(AdminError::invalid("下载代理已禁用,请启用或改为直连"));
|
return Err(AdminError::invalid(
|
||||||
|
"下载代理已禁用,请启用或改用部署默认出口",
|
||||||
|
));
|
||||||
}
|
}
|
||||||
Ok(Some(PluginDistributionEgress::new(
|
Ok(Some(PluginDistributionEgress::new(
|
||||||
record.id,
|
record.id,
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ use crate::{
|
|||||||
},
|
},
|
||||||
ports::{
|
ports::{
|
||||||
provider::ProviderAdminRegistry,
|
provider::ProviderAdminRegistry,
|
||||||
proxy::{PluginProxyAccess, ProxyProbe, ProxyStore},
|
proxy::{PluginProxyAccess, ProbeRoute, ProxyProbe, ProxyStore},
|
||||||
store::AdminStoreErrorKind,
|
store::AdminStoreErrorKind,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -47,7 +47,7 @@ impl PluginProxyAccess for DefaultPluginProxyAccess {
|
|||||||
.get(id)
|
.get(id)
|
||||||
.await
|
.await
|
||||||
.map_err(|error| map_store_error(error, "proxy"))?;
|
.map_err(|error| map_store_error(error, "proxy"))?;
|
||||||
// 显式选择代理时必须有可用配置,不能沿用账号停用代理后直连的语义
|
// 显式选择代理时必须有可用配置,不能沿用账号停用代理后使用部署默认出口的语义
|
||||||
if !record.enabled {
|
if !record.enabled {
|
||||||
return Err(AdminError::invalid("代理已禁用,请启用后再选择"));
|
return Err(AdminError::invalid("代理已禁用,请启用后再选择"));
|
||||||
}
|
}
|
||||||
@@ -114,10 +114,10 @@ pub trait ProxiesService: Send + Sync {
|
|||||||
detect_location: bool,
|
detect_location: bool,
|
||||||
context: &MutationContext,
|
context: &MutationContext,
|
||||||
) -> Result<ProxyRecord, AdminError>;
|
) -> Result<ProxyRecord, AdminError>;
|
||||||
/// 探测未保存的连接地址或服务器直连出口,不写入配置或修改账号绑定
|
/// 探测未保存的连接地址、部署默认出口或服务器直连出口,不写入配置或修改账号绑定
|
||||||
async fn probe(
|
async fn probe(
|
||||||
&self,
|
&self,
|
||||||
proxy: Option<&OutboundProxy>,
|
proxy: ProbeRoute<'_>,
|
||||||
detect_location: bool,
|
detect_location: bool,
|
||||||
) -> Result<ProxyTestResult, AdminError>;
|
) -> Result<ProxyTestResult, AdminError>;
|
||||||
}
|
}
|
||||||
@@ -323,7 +323,7 @@ impl ProxiesService for DefaultProxiesService {
|
|||||||
.transpose()
|
.transpose()
|
||||||
.map_err(|_| AdminError::invalid("代理位置不合法"))?;
|
.map_err(|_| AdminError::invalid("代理位置不合法"))?;
|
||||||
command.test = if command.auto_location {
|
command.test = if command.auto_location {
|
||||||
Some(self.probe(Some(&command.proxy), true).await?)
|
Some(self.probe(ProbeRoute::Proxy(&command.proxy), true).await?)
|
||||||
} else {
|
} else {
|
||||||
None
|
None
|
||||||
};
|
};
|
||||||
@@ -362,7 +362,7 @@ impl ProxiesService for DefaultProxiesService {
|
|||||||
if command.auto_location.unwrap_or(current.auto_location)
|
if command.auto_location.unwrap_or(current.auto_location)
|
||||||
&& (!current.auto_location || proxy != ¤t.proxy)
|
&& (!current.auto_location || proxy != ¤t.proxy)
|
||||||
{
|
{
|
||||||
command.test = Some(self.probe(Some(proxy), true).await?);
|
command.test = Some(self.probe(ProbeRoute::Proxy(proxy), true).await?);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
let result = self
|
let result = self
|
||||||
@@ -391,7 +391,7 @@ impl ProxiesService for DefaultProxiesService {
|
|||||||
|
|
||||||
async fn probe(
|
async fn probe(
|
||||||
&self,
|
&self,
|
||||||
proxy: Option<&OutboundProxy>,
|
proxy: ProbeRoute<'_>,
|
||||||
detect_location: bool,
|
detect_location: bool,
|
||||||
) -> Result<ProxyTestResult, AdminError> {
|
) -> Result<ProxyTestResult, AdminError> {
|
||||||
let _permit = self
|
let _permit = self
|
||||||
@@ -423,7 +423,10 @@ impl ProxiesService for DefaultProxiesService {
|
|||||||
// 手动解析只为本次测试请求位置,不改变自动跟随的持久配置
|
// 手动解析只为本次测试请求位置,不改变自动跟随的持久配置
|
||||||
let result = self
|
let result = self
|
||||||
.probe
|
.probe
|
||||||
.test(Some(&record.proxy), record.auto_location || detect_location)
|
.test(
|
||||||
|
ProbeRoute::Proxy(&record.proxy),
|
||||||
|
record.auto_location || detect_location,
|
||||||
|
)
|
||||||
.await;
|
.await;
|
||||||
let mutation = self
|
let mutation = self
|
||||||
.store
|
.store
|
||||||
|
|||||||
@@ -116,10 +116,10 @@ fn validate_settings(command: &ReplaceRuntimeSettings) -> Result<(), AdminError>
|
|||||||
.map(|(requested, upstream)| (requested.as_str(), upstream.as_str())),
|
.map(|(requested, upstream)| (requested.as_str(), upstream.as_str())),
|
||||||
)
|
)
|
||||||
.map_err(|_| AdminError::invalid("运行时设置不满足约束"))?;
|
.map_err(|_| AdminError::invalid("运行时设置不满足约束"))?;
|
||||||
command
|
command.values.validate().map_err(|field| match field {
|
||||||
.values
|
"openai_request_country" => AdminError::invalid("请求国家必须是两位大写 ASCII 字母"),
|
||||||
.validate()
|
_ => AdminError::invalid("运行时设置不满足约束"),
|
||||||
.map_err(|_| AdminError::invalid("运行时设置不满足约束"))
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
@@ -267,7 +267,7 @@ impl SettingsService for DefaultSettingsService {
|
|||||||
)
|
)
|
||||||
})
|
})
|
||||||
{
|
{
|
||||||
return Err(AdminError::invalid("xAI 不支持此价格档位"));
|
return Err(AdminError::invalid("当前平台不支持此价格档位"));
|
||||||
}
|
}
|
||||||
if !pricing.bands.contains_key("standard")
|
if !pricing.bands.contains_key("standard")
|
||||||
&& command
|
&& command
|
||||||
|
|||||||
@@ -335,3 +335,42 @@ fn pending_mutation_v1_should_keep_existing_storage_fields_and_reject_invalid_do
|
|||||||
document["schema_version"] = json!(2);
|
document["schema_version"] = json!(2);
|
||||||
assert!(PendingAuthorizationMutation::from_storage_v1(document).is_err());
|
assert!(PendingAuthorizationMutation::from_storage_v1(document).is_err());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn manual_key_alignment_only_accepts_the_current_account_wide_day_or_week() {
|
||||||
|
use chrono::{Duration, Utc};
|
||||||
|
use gateway_admin::model::{
|
||||||
|
client_keys::{ClientKeyBudgetReference, ClientKeyBudgetWindowPeriod},
|
||||||
|
upstream_info::UpstreamQuotaWindow,
|
||||||
|
};
|
||||||
|
let now = Utc::now();
|
||||||
|
for (seconds, period) in [
|
||||||
|
(86_400, ClientKeyBudgetWindowPeriod::Daily),
|
||||||
|
(604_800, ClientKeyBudgetWindowPeriod::Weekly),
|
||||||
|
] {
|
||||||
|
let mut window = usage_window("account", "quota", seconds);
|
||||||
|
let end = now + Duration::hours(2);
|
||||||
|
window.reset_at = Some(end);
|
||||||
|
let reference = ClientKeyBudgetReference::from_current_window(window.clone(), now).unwrap();
|
||||||
|
let selected = reference.period;
|
||||||
|
let bounds = reference.bounds;
|
||||||
|
assert_eq!(selected, period);
|
||||||
|
assert_eq!(bounds.starts_at, end - Duration::seconds(seconds as i64));
|
||||||
|
assert_eq!(bounds.ends_at, end);
|
||||||
|
assert!(bounds.resume_calendar);
|
||||||
|
assert!(ClientKeyBudgetReference::from_current_window(window.clone(), end).is_none());
|
||||||
|
window.upstream = Some(UpstreamQuotaWindow {
|
||||||
|
account_id: None,
|
||||||
|
observed_at: Some(now),
|
||||||
|
stale: true,
|
||||||
|
amount: None,
|
||||||
|
});
|
||||||
|
assert!(ClientKeyBudgetReference::from_current_window(window.clone(), now).is_none());
|
||||||
|
window.upstream = None;
|
||||||
|
window.local_usage_attribution = QuotaLocalUsageAttribution::Unavailable;
|
||||||
|
assert!(ClientKeyBudgetReference::from_current_window(window.clone(), now).is_none());
|
||||||
|
}
|
||||||
|
let mut short = usage_window("primary", "short", 18_000);
|
||||||
|
short.reset_at = Some(now + Duration::hours(1));
|
||||||
|
assert!(ClientKeyBudgetReference::from_current_window(short, now).is_none());
|
||||||
|
}
|
||||||
|
|||||||
@@ -12,7 +12,9 @@ fn time(minutes: i64) -> DateTime<Utc> {
|
|||||||
|
|
||||||
fn point(minute: i64, percent: f64, tokens: u64) -> QuotaForecastPoint {
|
fn point(minute: i64, percent: f64, tokens: u64) -> QuotaForecastPoint {
|
||||||
QuotaForecastPoint {
|
QuotaForecastPoint {
|
||||||
|
started_at: time(minute) - Duration::seconds(1),
|
||||||
observed_at: time(minute),
|
observed_at: time(minute),
|
||||||
|
reset_at: time(7 * 24 * 60),
|
||||||
used_percent: percent,
|
used_percent: percent,
|
||||||
usage: QuotaForecastUsage {
|
usage: QuotaForecastUsage {
|
||||||
request_count: minute as u64,
|
request_count: minute as u64,
|
||||||
@@ -188,7 +190,41 @@ fn repeated_same_window_recoveries_preserve_recorded_cycle_usage() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn changed_window_restarts_cycle_totals_at_first_matching_observation() {
|
fn an_expired_deadline_alone_cannot_cut_totals_or_anchor_remaining_usage() {
|
||||||
|
let mut older = point(1, 15.0, 100);
|
||||||
|
older.reset_at = time(3);
|
||||||
|
let mut previous = point(2, 20.0, 200);
|
||||||
|
previous.reset_at = time(3) + Duration::seconds(4);
|
||||||
|
let first = point(4, 25.0, 700);
|
||||||
|
let sample = select(vec![older, previous, first], point(6, 35.0, 900));
|
||||||
|
assert_eq!(sample.cycle_usage.tokens, 900);
|
||||||
|
assert_eq!(sample.baseline_percent, 25.0);
|
||||||
|
assert_eq!(sample.usage.tokens, 200);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn copied_concurrent_or_contradictory_readings_cannot_confirm_a_recovery() {
|
||||||
|
let mut older = point(1, 75.0, 100);
|
||||||
|
older.reset_at = time(3);
|
||||||
|
let mut previous = point(2, 85.0, 200);
|
||||||
|
previous.reset_at = time(3);
|
||||||
|
let first = point(4, 5.0, 300);
|
||||||
|
let current = point(6, 40.0, 900);
|
||||||
|
let mut overlapping = point(5, 20.0, 400);
|
||||||
|
overlapping.started_at = first.started_at;
|
||||||
|
for extra in [None, Some(overlapping), Some(current.clone())] {
|
||||||
|
let mut points = vec![older.clone(), previous.clone(), first.clone()];
|
||||||
|
points.extend(extra);
|
||||||
|
let sample = select(points, current.clone());
|
||||||
|
assert_eq!(sample.cycle_usage.tokens, 900);
|
||||||
|
assert!(sample.discontinuous);
|
||||||
|
}
|
||||||
|
let sample = select(vec![older, previous, first, point(5, 86.0, 400)], current);
|
||||||
|
assert_eq!(sample.cycle_usage.tokens, 900);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn changed_plan_restarts_cycle_totals_at_first_matching_observation() {
|
||||||
let sample = select_forecast_sample(
|
let sample = select_forecast_sample(
|
||||||
"week".to_owned(),
|
"week".to_owned(),
|
||||||
time(0),
|
time(0),
|
||||||
|
|||||||
@@ -3,25 +3,15 @@
|
|||||||
use gateway_admin::model::retention::{RetentionPolicy, RetentionTarget};
|
use gateway_admin::model::retention::{RetentionPolicy, RetentionTarget};
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn retention_policy_rejects_invalid_windows_and_preserves_independent_windows() {
|
fn retention_policy_rejects_zero_for_each_target() {
|
||||||
for (usage, ops, audit) in [
|
for (usage, ops, audit) in [(0, 1, 1), (1, 0, 1), (1, 1, 0)] {
|
||||||
(0, 1, 1),
|
|
||||||
(32, 1, 1),
|
|
||||||
(u32::MAX, 1, 1),
|
|
||||||
(1, 0, 1),
|
|
||||||
(1, 1, 0),
|
|
||||||
] {
|
|
||||||
assert!(RetentionPolicy::try_new(usage, ops, audit).is_err());
|
assert!(RetentionPolicy::try_new(usage, ops, audit).is_err());
|
||||||
}
|
}
|
||||||
let policy = RetentionPolicy::try_new(31, 7, 90).unwrap();
|
|
||||||
assert_eq!(policy.days(RetentionTarget::ModelRequests), 31);
|
|
||||||
assert_eq!(policy.days(RetentionTarget::OpsEvents), 7);
|
|
||||||
assert_eq!(policy.days(RetentionTarget::AdminAuditEvents), 90);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn request_retention_accepts_short_windows_without_changing_other_targets() {
|
fn request_retention_accepts_positive_windows_without_changing_other_targets() {
|
||||||
for days in [1, 3, 7, 15, 30, 31] {
|
for days in [1, 31, 32, 365, 3650, u32::MAX] {
|
||||||
let policy = RetentionPolicy::try_new(days, 30, 90).unwrap();
|
let policy = RetentionPolicy::try_new(days, 30, 90).unwrap();
|
||||||
assert_eq!(policy.days(RetentionTarget::ModelRequests), days);
|
assert_eq!(policy.days(RetentionTarget::ModelRequests), days);
|
||||||
assert_eq!(policy.days(RetentionTarget::OpsEvents), 30);
|
assert_eq!(policy.days(RetentionTarget::OpsEvents), 30);
|
||||||
|
|||||||
@@ -344,6 +344,8 @@ fn group_record() -> AccountGroupRecord {
|
|||||||
let now = Utc::now();
|
let now = Utc::now();
|
||||||
AccountGroupRecord {
|
AccountGroupRecord {
|
||||||
allow_image_generation: true,
|
allow_image_generation: true,
|
||||||
|
allow_subagents: true,
|
||||||
|
model_access: Default::default(),
|
||||||
fast_mode: FastMode::Default,
|
fast_mode: FastMode::Default,
|
||||||
id: group_id(),
|
id: group_id(),
|
||||||
name: "Primary".to_owned(),
|
name: "Primary".to_owned(),
|
||||||
@@ -420,6 +422,8 @@ async fn invalid_group_fields_are_rejected_before_store_mutations() {
|
|||||||
&context,
|
&context,
|
||||||
CreateAccountGroup {
|
CreateAccountGroup {
|
||||||
allow_image_generation: true,
|
allow_image_generation: true,
|
||||||
|
allow_subagents: true,
|
||||||
|
model_access: Default::default(),
|
||||||
fast_mode: FastMode::Default,
|
fast_mode: FastMode::Default,
|
||||||
name: " invalid".to_owned(),
|
name: " invalid".to_owned(),
|
||||||
description: None,
|
description: None,
|
||||||
@@ -434,6 +438,8 @@ async fn invalid_group_fields_are_rejected_before_store_mutations() {
|
|||||||
&context,
|
&context,
|
||||||
UpdateAccountGroup {
|
UpdateAccountGroup {
|
||||||
allow_image_generation: None,
|
allow_image_generation: None,
|
||||||
|
allow_subagents: None,
|
||||||
|
model_access: None,
|
||||||
fast_mode: None,
|
fast_mode: None,
|
||||||
id: record.id,
|
id: record.id,
|
||||||
name: "valid".to_owned(),
|
name: "valid".to_owned(),
|
||||||
|
|||||||
@@ -266,6 +266,7 @@ impl FakeProviderAdmin {
|
|||||||
plan_type: account.plan_type.clone(),
|
plan_type: account.plan_type.clone(),
|
||||||
preserve_profile: false,
|
preserve_profile: false,
|
||||||
preserve_credential_state: false,
|
preserve_credential_state: false,
|
||||||
|
preserve_access_token_expiry: false,
|
||||||
provider_material: document(),
|
provider_material: document(),
|
||||||
has_refresh_token: account.has_refresh_token,
|
has_refresh_token: account.has_refresh_token,
|
||||||
access_token_expires_at: account
|
access_token_expires_at: account
|
||||||
@@ -845,6 +846,17 @@ impl AccountStore for FakeAccountStore {
|
|||||||
.clone())
|
.clone())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn quota_documents(
|
||||||
|
&self,
|
||||||
|
_: &gateway_core::account::ProviderAccountId,
|
||||||
|
_: &gateway_core::routing::ProviderKind,
|
||||||
|
_: chrono::DateTime<chrono::Utc>,
|
||||||
|
_: gateway_admin::model::observability::TimeRange,
|
||||||
|
_: Option<&gateway_admin::model::quota_history::QuotaHistoryCursor>,
|
||||||
|
) -> AdminStoreResult<gateway_admin::model::quota_history::QuotaDocumentPage> {
|
||||||
|
unreachable!("测试不读取历史额度文档")
|
||||||
|
}
|
||||||
|
|
||||||
async fn load_quota_forecast_history(
|
async fn load_quota_forecast_history(
|
||||||
&self,
|
&self,
|
||||||
window: &AccountUsageWindowQuery,
|
window: &AccountUsageWindowQuery,
|
||||||
@@ -1162,6 +1174,8 @@ impl SettingsStore for StaticSettingsStore {
|
|||||||
rotation_strategy: RotationStrategy::Smart,
|
rotation_strategy: RotationStrategy::Smart,
|
||||||
updated_at: Utc::now(),
|
updated_at: Utc::now(),
|
||||||
values: gateway_admin::model::settings::RuntimeSettingsValues {
|
values: gateway_admin::model::settings::RuntimeSettingsValues {
|
||||||
|
openai_oauth_guardian_review_model: false,
|
||||||
|
openai_request_country: Default::default(),
|
||||||
codex_privacy_policy: Default::default(),
|
codex_privacy_policy: Default::default(),
|
||||||
request_location_enabled: false,
|
request_location_enabled: false,
|
||||||
request_location: Default::default(),
|
request_location: Default::default(),
|
||||||
@@ -1180,6 +1194,7 @@ impl SettingsStore for StaticSettingsStore {
|
|||||||
openai_session_affinity_ttl_hours: 24,
|
openai_session_affinity_ttl_hours: 24,
|
||||||
responses_max_decompressed_body_bytes: 64 * 1024 * 1024,
|
responses_max_decompressed_body_bytes: 64 * 1024 * 1024,
|
||||||
smart_scheduling: gateway_core::account::SmartSchedulingConfig::default(),
|
smart_scheduling: gateway_core::account::SmartSchedulingConfig::default(),
|
||||||
|
quota_reset_window_weights: gateway_core::account::ResetWindowWeights::default(),
|
||||||
min_codex_desktop_version: None,
|
min_codex_desktop_version: None,
|
||||||
min_codex_cli_version: None,
|
min_codex_cli_version: None,
|
||||||
usage_retention_days: 30,
|
usage_retention_days: 30,
|
||||||
@@ -1913,7 +1928,7 @@ async fn accounts_batch_update_should_commit_once_and_notify_each_provider() {
|
|||||||
.batch_update(
|
.batch_update(
|
||||||
&context("batch-update-request"),
|
&context("batch-update-request"),
|
||||||
BatchUpdateAccounts {
|
BatchUpdateAccounts {
|
||||||
quota_limits: None,
|
quota_settings: None,
|
||||||
auto_use_quota_credits: None,
|
auto_use_quota_credits: None,
|
||||||
model_access: Default::default(),
|
model_access: Default::default(),
|
||||||
outbound_proxy: None,
|
outbound_proxy: None,
|
||||||
@@ -2561,7 +2576,9 @@ async fn quota_forecast_same_window_reversal_keeps_recorded_usage_in_the_report(
|
|||||||
usage: usage(index as u64 + 1, tokens),
|
usage: usage(index as u64 + 1, tokens),
|
||||||
provider_observation: ProviderDocument::new(OpaqueProviderData::new(
|
provider_observation: ProviderDocument::new(OpaqueProviderData::new(
|
||||||
serde_json::json!({
|
serde_json::json!({
|
||||||
"percent": percent, "reset": reset.to_rfc3339(), "plan": "pro",
|
"percent": percent,
|
||||||
|
"reset": (reset + TimeDelta::seconds(17 * index as i64)).to_rfc3339(),
|
||||||
|
"plan": "pro",
|
||||||
})
|
})
|
||||||
.as_object()
|
.as_object()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
@@ -2590,14 +2607,14 @@ async fn quota_forecast_same_window_reversal_keeps_recorded_usage_in_the_report(
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn quota_forecast_mid_cycle_sampling_accepts_small_reset_jitter_but_not_a_changed_bucket() {
|
async fn quota_forecast_keeps_cycle_totals_through_reset_jitter_and_restarts_after_a_reset() {
|
||||||
use gateway_admin::model::quota_forecast_sampling::QuotaForecastHistoryPoint;
|
use gateway_admin::model::quota_forecast_sampling::QuotaForecastHistoryPoint;
|
||||||
let now = Utc::now();
|
let now = Utc::now();
|
||||||
let observed = now - TimeDelta::minutes(1);
|
let observed = now - TimeDelta::minutes(1);
|
||||||
let reset = now + TimeDelta::days(1);
|
let reset = now + TimeDelta::days(1);
|
||||||
let added = now - TimeDelta::hours(5);
|
let added = now - TimeDelta::hours(5);
|
||||||
let provider = FakeProviderAdmin::new("openai", events());
|
let provider = FakeProviderAdmin::new("openai", events());
|
||||||
provider.set_quota(ProviderQuota {
|
let mut quota = ProviderQuota {
|
||||||
upstream: None,
|
upstream: None,
|
||||||
credits: None,
|
credits: None,
|
||||||
plan_type: Some("pro".to_owned()),
|
plan_type: Some("pro".to_owned()),
|
||||||
@@ -2612,67 +2629,102 @@ async fn quota_forecast_mid_cycle_sampling_accepts_small_reset_jitter_but_not_a_
|
|||||||
role: None,
|
role: None,
|
||||||
local_usage_attribution: QuotaLocalUsageAttribution::AccountWide,
|
local_usage_attribution: QuotaLocalUsageAttribution::AccountWide,
|
||||||
window_seconds: Some(604_800),
|
window_seconds: Some(604_800),
|
||||||
used_percent: Some(40.0),
|
used_percent: Some(65.0),
|
||||||
reset_at: Some(reset),
|
reset_at: Some(reset),
|
||||||
limit_reached: false,
|
limit_reached: false,
|
||||||
local_usage: None,
|
local_usage: None,
|
||||||
provider_data: None,
|
provider_data: None,
|
||||||
}],
|
}],
|
||||||
..empty_quota()
|
..empty_quota()
|
||||||
});
|
};
|
||||||
let mut account = account_record("openai");
|
let mut account = account_record("openai");
|
||||||
account.created_at = added;
|
account.created_at = added;
|
||||||
let store = FakeAccountStore::with_account(account, events());
|
let store = FakeAccountStore::with_account(account, events());
|
||||||
let make_point = |hours, percent, tokens, delta| {
|
let usage = |tokens| QuotaForecastUsage {
|
||||||
QuotaForecastHistoryPoint {
|
request_count: tokens / 100,
|
||||||
started_at: now - TimeDelta::hours(hours) - TimeDelta::seconds(10),
|
tokens,
|
||||||
completed_at: now - TimeDelta::hours(hours),
|
known_cost_count: tokens / 100,
|
||||||
usage: QuotaForecastUsage { request_count: tokens / 100, tokens, ..Default::default() },
|
usd: tokens as f64 / 100.0,
|
||||||
provider_observation: ProviderDocument::new(OpaqueProviderData::new(serde_json::json!({
|
..Default::default()
|
||||||
"percent": percent, "reset": (reset + TimeDelta::seconds(delta)).to_rfc3339(), "plan": "pro",
|
|
||||||
}).as_object().unwrap().clone())),
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
let point_with_plan = |hours, percent, tokens, delta, plan: Option<&str>| {
|
||||||
|
let observation = serde_json::json!({
|
||||||
|
"percent": percent,
|
||||||
|
"reset": (reset + TimeDelta::seconds(delta)).to_rfc3339(),
|
||||||
|
"plan": plan,
|
||||||
|
});
|
||||||
|
QuotaForecastHistoryPoint {
|
||||||
|
started_at: now - TimeDelta::hours(hours) - TimeDelta::seconds(10),
|
||||||
|
completed_at: now - TimeDelta::hours(hours),
|
||||||
|
usage: usage(tokens),
|
||||||
|
provider_observation: ProviderDocument::new(OpaqueProviderData::new(
|
||||||
|
observation.as_object().unwrap().clone(),
|
||||||
|
)),
|
||||||
|
}
|
||||||
|
};
|
||||||
|
let make_point =
|
||||||
|
|hours, percent, tokens, delta| point_with_plan(hours, percent, tokens, delta, Some("pro"));
|
||||||
*store.quota_forecast_history.lock().unwrap() = QuotaForecastHistory {
|
*store.quota_forecast_history.lock().unwrap() = QuotaForecastHistory {
|
||||||
points: vec![
|
points: vec![
|
||||||
make_point(3, 20.0, 1_000, 1),
|
make_point(4, 20.0, 20_000, 0),
|
||||||
make_point(2, 30.0, 1_500, -1),
|
make_point(3, 58.0, 62_000, 17),
|
||||||
|
make_point(2, 58.0, 62_500, 0),
|
||||||
],
|
],
|
||||||
usage: QuotaForecastUsage {
|
usage: usage(70_600),
|
||||||
request_count: 20,
|
|
||||||
tokens: 2_000,
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
pending_request_count: 1,
|
pending_request_count: 1,
|
||||||
};
|
};
|
||||||
let services = accounts_service(provider, store.clone()).await;
|
let services = accounts_service(provider.clone(), store.clone()).await;
|
||||||
let result = services
|
let account_id = ProviderAccountId::new("acct_test").unwrap();
|
||||||
.accounts()
|
let read_report = async || {
|
||||||
.quota_forecast(&ProviderAccountId::new("acct_test").unwrap())
|
services
|
||||||
.await
|
.accounts()
|
||||||
.unwrap();
|
.quota_forecast(&account_id)
|
||||||
assert!(result.forecasts[0].unavailable_reason.is_none());
|
.await
|
||||||
assert_eq!(result.forecasts[0].estimated_tokens, Some(5_000));
|
.unwrap()
|
||||||
|
};
|
||||||
|
// 回放 #759 的金额和百分比,历史与快照各自报告的到期时间偏移时仍应保留整段累计
|
||||||
|
for offset in [0, 3, 6, 7, 17, -23] {
|
||||||
|
quota.windows[0].reset_at = Some(reset + TimeDelta::seconds(offset));
|
||||||
|
provider.set_quota(quota.clone());
|
||||||
|
let report = read_report().await;
|
||||||
|
let week = &report.forecasts[0];
|
||||||
|
let source = week.source.as_ref().unwrap();
|
||||||
|
assert_eq!(source.tokens, Some(70_600));
|
||||||
|
assert_eq!(source.usd, Some(706.0));
|
||||||
|
assert_eq!(week.estimated_tokens, Some(109_956));
|
||||||
|
assert!((week.estimated_usd.unwrap() - (706.0 + 506.0 * 35.0 / 45.0)).abs() < 1e-9);
|
||||||
|
assert!(week.unavailable_reason.is_none());
|
||||||
|
}
|
||||||
assert_eq!(store.quota_window_queries()[0].range.start, added);
|
assert_eq!(store.quota_window_queries()[0].range.start, added);
|
||||||
store
|
store
|
||||||
.quota_forecast_history
|
.quota_forecast_history
|
||||||
.lock()
|
.lock()
|
||||||
.unwrap()
|
.unwrap()
|
||||||
.points
|
.points
|
||||||
.push(make_point(1, 35.0, 1_700, 3_600));
|
.push(make_point(1, 62.0, 66_000, 3_600));
|
||||||
let result = services
|
let result = read_report().await;
|
||||||
.accounts()
|
assert_eq!(
|
||||||
.quota_forecast(&ProviderAccountId::new("acct_test").unwrap())
|
result.forecasts[0].source.as_ref().unwrap().tokens,
|
||||||
.await
|
Some(70_600)
|
||||||
.unwrap();
|
|
||||||
assert!(result.forecasts[0].estimated_tokens.is_none());
|
|
||||||
assert!(
|
|
||||||
result.forecasts[0]
|
|
||||||
.unavailable_reason
|
|
||||||
.unwrap()
|
|
||||||
.contains("不连续")
|
|
||||||
);
|
);
|
||||||
// 新额度段已有足够观测后恢复预测,但总量不能带回重置前的累计用量
|
assert!(result.forecasts[0].estimated_tokens.is_some());
|
||||||
|
// 两份旧读数的截止时刻均已过去,新请求开始于旧窗口结束后
|
||||||
|
quota.windows[0].used_percent = Some(40.0);
|
||||||
|
provider.set_quota(quota.clone());
|
||||||
|
*store.quota_forecast_history.lock().unwrap() = QuotaForecastHistory {
|
||||||
|
points: vec![
|
||||||
|
make_point(4, 75.0, 1_000, -90_000),
|
||||||
|
make_point(2, 85.0, 1_500, -90_021),
|
||||||
|
],
|
||||||
|
usage: usage(2_000),
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
let waiting = read_report().await;
|
||||||
|
assert_eq!(
|
||||||
|
waiting.forecasts[0].source.as_ref().unwrap().tokens,
|
||||||
|
Some(2_000)
|
||||||
|
);
|
||||||
|
assert!(waiting.forecasts[0].estimated_tokens.is_none());
|
||||||
let mut first = make_point(1, 5.0, 1_750, 0);
|
let mut first = make_point(1, 5.0, 1_750, 0);
|
||||||
first.completed_at = now - TimeDelta::minutes(45);
|
first.completed_at = now - TimeDelta::minutes(45);
|
||||||
first.started_at = first.completed_at - TimeDelta::seconds(10);
|
first.started_at = first.completed_at - TimeDelta::seconds(10);
|
||||||
@@ -2685,15 +2737,42 @@ async fn quota_forecast_mid_cycle_sampling_accepts_small_reset_jitter_but_not_a_
|
|||||||
.unwrap()
|
.unwrap()
|
||||||
.points
|
.points
|
||||||
.extend([first, next]);
|
.extend([first, next]);
|
||||||
let result = services
|
let result = read_report().await;
|
||||||
.accounts()
|
|
||||||
.quota_forecast(&ProviderAccountId::new("acct_test").unwrap())
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
let cycle = &result.forecasts[0];
|
let cycle = &result.forecasts[0];
|
||||||
assert!(cycle.unavailable_reason.is_none());
|
assert!(cycle.unavailable_reason.is_none());
|
||||||
assert_eq!(cycle.source.as_ref().unwrap().tokens, Some(250));
|
assert_eq!(cycle.source.as_ref().unwrap().tokens, Some(250));
|
||||||
assert_eq!(cycle.estimated_tokens, Some(679));
|
assert_eq!(cycle.estimated_tokens, Some(679));
|
||||||
|
|
||||||
|
for (plan, expected_tokens) in [(None, 2_000), (Some("plus"), 500)] {
|
||||||
|
store.quota_forecast_history.lock().unwrap().points = vec![
|
||||||
|
make_point(4, 20.0, 1_000, 0),
|
||||||
|
point_with_plan(3, 25.0, 1_200, 0, plan),
|
||||||
|
make_point(2, 30.0, 1_500, 0),
|
||||||
|
];
|
||||||
|
let report = read_report().await;
|
||||||
|
assert_eq!(
|
||||||
|
report.forecasts[0].source.as_ref().unwrap().tokens,
|
||||||
|
Some(expected_tokens)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
// 上游提前给出新的七天窗口时,直接从新起点查询,首条配对样本前的用量也留在累计中
|
||||||
|
let new_start = now - TimeDelta::hours(1);
|
||||||
|
quota.windows[0].reset_at = Some(new_start + TimeDelta::days(7));
|
||||||
|
provider.set_quota(quota);
|
||||||
|
*store.quota_forecast_history.lock().unwrap() = QuotaForecastHistory {
|
||||||
|
usage: usage(400),
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
let report = read_report().await;
|
||||||
|
assert_eq!(
|
||||||
|
store.quota_window_queries().last().unwrap().range.start,
|
||||||
|
new_start
|
||||||
|
);
|
||||||
|
assert_eq!(
|
||||||
|
report.forecasts[0].source.as_ref().unwrap().tokens,
|
||||||
|
Some(400)
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
@@ -3412,7 +3491,7 @@ pub(super) fn account_record(kind: &str) -> AccountRecord {
|
|||||||
let now = Utc::now();
|
let now = Utc::now();
|
||||||
AccountRecord {
|
AccountRecord {
|
||||||
quota_paused: false,
|
quota_paused: false,
|
||||||
quota_limits: Default::default(),
|
quota_settings: Default::default(),
|
||||||
auto_use_quota_credits: false,
|
auto_use_quota_credits: false,
|
||||||
outbound_proxy_id: None,
|
outbound_proxy_id: None,
|
||||||
outbound_proxy_enabled: true,
|
outbound_proxy_enabled: true,
|
||||||
@@ -3501,6 +3580,7 @@ fn plugin_rotation_facts(account: &AccountRecord) -> PreparedCredentialRotationF
|
|||||||
plan_type: account.plan_type.clone(),
|
plan_type: account.plan_type.clone(),
|
||||||
preserve_profile: true,
|
preserve_profile: true,
|
||||||
preserve_credential_state: false,
|
preserve_credential_state: false,
|
||||||
|
preserve_access_token_expiry: false,
|
||||||
provider_material: document(),
|
provider_material: document(),
|
||||||
has_refresh_token: account.has_refresh_token,
|
has_refresh_token: account.has_refresh_token,
|
||||||
access_token_expires_at: account.access_token_expires_at,
|
access_token_expires_at: account.access_token_expires_at,
|
||||||
|
|||||||
@@ -35,6 +35,26 @@ struct TestClientKeyStore {
|
|||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl ClientKeyStore for TestClientKeyStore {
|
impl ClientKeyStore for TestClientKeyStore {
|
||||||
|
async fn budget_reference_accounts(
|
||||||
|
&self,
|
||||||
|
_: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
_: &str,
|
||||||
|
_: &str,
|
||||||
|
) -> gateway_admin::ports::store::AdminStoreResult<
|
||||||
|
gateway_admin::model::client_keys::BudgetReferenceAccountPage,
|
||||||
|
> {
|
||||||
|
Err(unused())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn batch_update_client_keys(
|
||||||
|
&self,
|
||||||
|
_: gateway_admin::model::client_keys::BatchUpdateClientKeys,
|
||||||
|
_: gateway_admin::ports::store::BatchClientKeyProfileMerger,
|
||||||
|
_: &MutationContext,
|
||||||
|
) -> AdminStoreResult<Revision> {
|
||||||
|
Err(unused())
|
||||||
|
}
|
||||||
|
|
||||||
async fn client_key_budget_window(
|
async fn client_key_budget_window(
|
||||||
&self,
|
&self,
|
||||||
_: &gateway_core::policy::ClientApiKeyId,
|
_: &gateway_core::policy::ClientApiKeyId,
|
||||||
@@ -80,6 +100,15 @@ impl ClientKeyStore for TestClientKeyStore {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn client_key_budget(
|
||||||
|
&self,
|
||||||
|
id: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
) -> AdminStoreResult<Option<gateway_core::engine::budget::ClientBudgetStatus>> {
|
||||||
|
self.get_client_key(id)
|
||||||
|
.await
|
||||||
|
.map(|key| key.map(|row| row.budget))
|
||||||
|
}
|
||||||
|
|
||||||
async fn get_client_key(
|
async fn get_client_key(
|
||||||
&self,
|
&self,
|
||||||
_: &ClientApiKeyId,
|
_: &ClientApiKeyId,
|
||||||
@@ -172,6 +201,34 @@ impl ClientKeyStore for TestClientKeyStore {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[tokio::test]
|
||||||
|
async fn batch_keys_require_a_change_and_unique_targets() {
|
||||||
|
use gateway_admin::model::client_keys::BatchUpdateClientKeys;
|
||||||
|
let services = super::AdminHarness::new()
|
||||||
|
.client_keys(Arc::new(TestClientKeyStore::default()))
|
||||||
|
.build()
|
||||||
|
.await;
|
||||||
|
let id = ClientApiKeyId::new("key_a").unwrap();
|
||||||
|
for patch in [
|
||||||
|
BatchUpdateClientKeys {
|
||||||
|
ids: vec![id.clone()],
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
BatchUpdateClientKeys {
|
||||||
|
ids: vec![id.clone(), id],
|
||||||
|
enabled: Some(false),
|
||||||
|
..Default::default()
|
||||||
|
},
|
||||||
|
] {
|
||||||
|
let error = services
|
||||||
|
.client_keys()
|
||||||
|
.batch_update(&mutation_context(), patch)
|
||||||
|
.await
|
||||||
|
.unwrap_err();
|
||||||
|
assert_eq!(error.kind(), AdminErrorKind::Invalid);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[tokio::test]
|
#[tokio::test]
|
||||||
async fn reset_budget_forwards_scope_and_returns_only_key_identity() {
|
async fn reset_budget_forwards_scope_and_returns_only_key_identity() {
|
||||||
use gateway_admin::model::client_keys::{ClientKeyBudgetPeriod, ResetClientKeyBudget};
|
use gateway_admin::model::client_keys::{ClientKeyBudgetPeriod, ResetClientKeyBudget};
|
||||||
|
|||||||
@@ -107,8 +107,7 @@ async fn openai_import_should_expose_only_explicit_public_errors_without_committ
|
|||||||
] {
|
] {
|
||||||
let events = events();
|
let events = events();
|
||||||
let provider = FakeProviderAdmin::new("openai", events.clone());
|
let provider = FakeProviderAdmin::new("openai", events.clone());
|
||||||
provider
|
provider.fail_next_with_public_message(provider_kind, "PAT 验证失败,请检查令牌");
|
||||||
.fail_next_with_public_message(provider_kind, "Codex PAT 验证失败,请检查令牌后重试");
|
|
||||||
let store = FakeAccountStore::new("openai", events.clone());
|
let store = FakeAccountStore::new("openai", events.clone());
|
||||||
let services = service(provider, store.clone()).await;
|
let services = service(provider, store.clone()).await;
|
||||||
let error = services
|
let error = services
|
||||||
@@ -124,7 +123,7 @@ async fn openai_import_should_expose_only_explicit_public_errors_without_committ
|
|||||||
.await
|
.await
|
||||||
.expect_err("validation must fail before committing accounts");
|
.expect_err("validation must fail before committing accounts");
|
||||||
assert_eq!(error.kind(), admin_kind);
|
assert_eq!(error.kind(), admin_kind);
|
||||||
assert_eq!(error.to_string(), "Codex PAT 验证失败,请检查令牌后重试");
|
assert_eq!(error.to_string(), "PAT 验证失败,请检查令牌");
|
||||||
assert!(!format!("{error:?}").contains("secret token"));
|
assert!(!format!("{error:?}").contains("secret token"));
|
||||||
assert_eq!(recorded(&events), ["provider.prepare_import"]);
|
assert_eq!(recorded(&events), ["provider.prepare_import"]);
|
||||||
assert!(store.audit_requests().is_empty());
|
assert!(store.audit_requests().is_empty());
|
||||||
|
|||||||
@@ -140,6 +140,10 @@ impl PendingPeer {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl UpstreamInfoSource for PendingPeer {
|
impl UpstreamInfoSource for PendingPeer {
|
||||||
|
fn is_peer(&self, _: &ProviderAccount) -> bool {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
|
||||||
fn signal(
|
fn signal(
|
||||||
&self,
|
&self,
|
||||||
_: &ProviderAccount,
|
_: &ProviderAccount,
|
||||||
|
|||||||
@@ -33,6 +33,8 @@ fn runtime_settings(enabled: bool, probe_enabled: bool) -> RuntimeSettings {
|
|||||||
rotation_strategy: gateway_admin::model::settings::RotationStrategy::Smart,
|
rotation_strategy: gateway_admin::model::settings::RotationStrategy::Smart,
|
||||||
updated_at: Utc::now(),
|
updated_at: Utc::now(),
|
||||||
values: gateway_admin::model::settings::RuntimeSettingsValues {
|
values: gateway_admin::model::settings::RuntimeSettingsValues {
|
||||||
|
openai_oauth_guardian_review_model: false,
|
||||||
|
openai_request_country: Default::default(),
|
||||||
codex_privacy_policy: Default::default(),
|
codex_privacy_policy: Default::default(),
|
||||||
request_location_enabled: false,
|
request_location_enabled: false,
|
||||||
request_location: Default::default(),
|
request_location: Default::default(),
|
||||||
@@ -51,6 +53,7 @@ fn runtime_settings(enabled: bool, probe_enabled: bool) -> RuntimeSettings {
|
|||||||
openai_session_affinity_ttl_hours: 24,
|
openai_session_affinity_ttl_hours: 24,
|
||||||
responses_max_decompressed_body_bytes: 64 * 1024 * 1024,
|
responses_max_decompressed_body_bytes: 64 * 1024 * 1024,
|
||||||
smart_scheduling: gateway_core::account::SmartSchedulingConfig::default(),
|
smart_scheduling: gateway_core::account::SmartSchedulingConfig::default(),
|
||||||
|
quota_reset_window_weights: gateway_core::account::ResetWindowWeights::default(),
|
||||||
min_codex_desktop_version: None,
|
min_codex_desktop_version: None,
|
||||||
min_codex_cli_version: None,
|
min_codex_cli_version: None,
|
||||||
usage_retention_days: 31,
|
usage_retention_days: 31,
|
||||||
|
|||||||
@@ -546,6 +546,17 @@ impl AccountStore for UnavailableStore {
|
|||||||
Err(unavailable("account quota window usage"))
|
Err(unavailable("account quota window usage"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn quota_documents(
|
||||||
|
&self,
|
||||||
|
_: &gateway_core::account::ProviderAccountId,
|
||||||
|
_: &gateway_core::routing::ProviderKind,
|
||||||
|
_: chrono::DateTime<chrono::Utc>,
|
||||||
|
_: gateway_admin::model::observability::TimeRange,
|
||||||
|
_: Option<&gateway_admin::model::quota_history::QuotaHistoryCursor>,
|
||||||
|
) -> AdminStoreResult<gateway_admin::model::quota_history::QuotaDocumentPage> {
|
||||||
|
unreachable!("测试不读取历史额度文档")
|
||||||
|
}
|
||||||
|
|
||||||
async fn load_quota_forecast_history(
|
async fn load_quota_forecast_history(
|
||||||
&self,
|
&self,
|
||||||
_: &AccountUsageWindowQuery,
|
_: &AccountUsageWindowQuery,
|
||||||
@@ -708,6 +719,26 @@ impl AccountRuntimeStore for UnavailableStore {
|
|||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl ClientKeyStore for UnavailableStore {
|
impl ClientKeyStore for UnavailableStore {
|
||||||
|
async fn budget_reference_accounts(
|
||||||
|
&self,
|
||||||
|
_: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
_: &str,
|
||||||
|
_: &str,
|
||||||
|
) -> gateway_admin::ports::store::AdminStoreResult<
|
||||||
|
gateway_admin::model::client_keys::BudgetReferenceAccountPage,
|
||||||
|
> {
|
||||||
|
Err(unavailable("reference accounts"))
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn batch_update_client_keys(
|
||||||
|
&self,
|
||||||
|
_: gateway_admin::model::client_keys::BatchUpdateClientKeys,
|
||||||
|
_: gateway_admin::ports::store::BatchClientKeyProfileMerger,
|
||||||
|
_: &MutationContext,
|
||||||
|
) -> AdminStoreResult<Revision> {
|
||||||
|
Err(unavailable("client key batch update"))
|
||||||
|
}
|
||||||
|
|
||||||
async fn client_key_budget_window(
|
async fn client_key_budget_window(
|
||||||
&self,
|
&self,
|
||||||
_: &gateway_core::policy::ClientApiKeyId,
|
_: &gateway_core::policy::ClientApiKeyId,
|
||||||
@@ -752,6 +783,15 @@ impl ClientKeyStore for UnavailableStore {
|
|||||||
Err(unavailable("client key budget reset"))
|
Err(unavailable("client key budget reset"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn client_key_budget(
|
||||||
|
&self,
|
||||||
|
id: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
) -> AdminStoreResult<Option<gateway_core::engine::budget::ClientBudgetStatus>> {
|
||||||
|
self.get_client_key(id)
|
||||||
|
.await
|
||||||
|
.map(|key| key.map(|row| row.budget))
|
||||||
|
}
|
||||||
|
|
||||||
async fn get_client_key(
|
async fn get_client_key(
|
||||||
&self,
|
&self,
|
||||||
_: &ClientApiKeyId,
|
_: &ClientApiKeyId,
|
||||||
@@ -833,6 +873,23 @@ impl ObservabilityStore for UnavailableStore {
|
|||||||
Err(unavailable("dashboard trend"))
|
Err(unavailable("dashboard trend"))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn client_key_statistics(
|
||||||
|
&self,
|
||||||
|
_: TimeRange,
|
||||||
|
_: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
_: gateway_admin::model::observability::KeyUsageMetric,
|
||||||
|
) -> AdminStoreResult<gateway_admin::model::observability::KeyStatisticsOverview> {
|
||||||
|
Ok(Default::default())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn client_key_models(
|
||||||
|
&self,
|
||||||
|
_: TimeRange,
|
||||||
|
_: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
) -> AdminStoreResult<Vec<gateway_admin::model::observability::KeyModelRow>> {
|
||||||
|
Ok(Default::default())
|
||||||
|
}
|
||||||
|
|
||||||
async fn usage_trend(
|
async fn usage_trend(
|
||||||
&self,
|
&self,
|
||||||
_: TimeRange,
|
_: TimeRange,
|
||||||
|
|||||||
@@ -1266,6 +1266,23 @@ impl ObservabilityStore for FixtureObservabilityStore {
|
|||||||
Ok(self.trend.lock().expect("trend").clone())
|
Ok(self.trend.lock().expect("trend").clone())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
async fn client_key_statistics(
|
||||||
|
&self,
|
||||||
|
_: TimeRange,
|
||||||
|
_: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
_: gateway_admin::model::observability::KeyUsageMetric,
|
||||||
|
) -> AdminStoreResult<gateway_admin::model::observability::KeyStatisticsOverview> {
|
||||||
|
Ok(Default::default())
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn client_key_models(
|
||||||
|
&self,
|
||||||
|
_: TimeRange,
|
||||||
|
_: &gateway_core::policy::ClientApiKeyId,
|
||||||
|
) -> AdminStoreResult<Vec<gateway_admin::model::observability::KeyModelRow>> {
|
||||||
|
Ok(Default::default())
|
||||||
|
}
|
||||||
|
|
||||||
async fn usage_trend(
|
async fn usage_trend(
|
||||||
&self,
|
&self,
|
||||||
_: TimeRange,
|
_: TimeRange,
|
||||||
@@ -1414,6 +1431,8 @@ impl SettingsStore for FixtureSettingsStore {
|
|||||||
rotation_strategy: RotationStrategy::Smart,
|
rotation_strategy: RotationStrategy::Smart,
|
||||||
updated_at: Utc::now(),
|
updated_at: Utc::now(),
|
||||||
values: gateway_admin::model::settings::RuntimeSettingsValues {
|
values: gateway_admin::model::settings::RuntimeSettingsValues {
|
||||||
|
openai_oauth_guardian_review_model: false,
|
||||||
|
openai_request_country: Default::default(),
|
||||||
codex_privacy_policy: Default::default(),
|
codex_privacy_policy: Default::default(),
|
||||||
request_location_enabled: false,
|
request_location_enabled: false,
|
||||||
request_location: Default::default(),
|
request_location: Default::default(),
|
||||||
@@ -1432,6 +1451,7 @@ impl SettingsStore for FixtureSettingsStore {
|
|||||||
openai_session_affinity_ttl_hours: 24,
|
openai_session_affinity_ttl_hours: 24,
|
||||||
responses_max_decompressed_body_bytes: 64 * 1024 * 1024,
|
responses_max_decompressed_body_bytes: 64 * 1024 * 1024,
|
||||||
smart_scheduling: gateway_core::account::SmartSchedulingConfig::default(),
|
smart_scheduling: gateway_core::account::SmartSchedulingConfig::default(),
|
||||||
|
quota_reset_window_weights: gateway_core::account::ResetWindowWeights::default(),
|
||||||
min_codex_desktop_version: None,
|
min_codex_desktop_version: None,
|
||||||
min_codex_cli_version: None,
|
min_codex_cli_version: None,
|
||||||
usage_retention_days: 31,
|
usage_retention_days: 31,
|
||||||
|
|||||||
@@ -239,6 +239,7 @@ async fn discovery_uses_provider_capabilities_and_publishes_neutral_signals() {
|
|||||||
initialize_peer_upstream(accounts.clone(), ®istry, transport.clone()).unwrap();
|
initialize_peer_upstream(accounts.clone(), ®istry, transport.clone()).unwrap();
|
||||||
let initial_accounts = accounts.accounts.lock().unwrap().clone();
|
let initial_accounts = accounts.accounts.lock().unwrap().clone();
|
||||||
let reader = UpstreamInfoReader::default();
|
let reader = UpstreamInfoReader::default();
|
||||||
|
assert!(!reader.is_peer(&initial_accounts[0]));
|
||||||
assert!(
|
assert!(
|
||||||
reader
|
reader
|
||||||
.signal(&initial_accounts[0], Some("model"), SystemTime::now())
|
.signal(&initial_accounts[0], Some("model"), SystemTime::now())
|
||||||
@@ -246,6 +247,7 @@ async fn discovery_uses_provider_capabilities_and_publishes_neutral_signals() {
|
|||||||
);
|
);
|
||||||
let source = bundle.scheduling_source();
|
let source = bundle.scheduling_source();
|
||||||
reader.bind(&source).unwrap();
|
reader.bind(&source).unwrap();
|
||||||
|
assert!(!reader.is_peer(&initial_accounts[0]));
|
||||||
assert!(reader.bind(&source).is_err());
|
assert!(reader.bind(&source).is_err());
|
||||||
drop(source);
|
drop(source);
|
||||||
let WorkerContribution::Registration(worker) = bundle.take_worker_contributions().remove(0)
|
let WorkerContribution::Registration(worker) = bundle.take_worker_contributions().remove(0)
|
||||||
@@ -272,6 +274,10 @@ async fn discovery_uses_provider_capabilities_and_publishes_neutral_signals() {
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
for account in &initial_accounts[..2] {
|
for account in &initial_accounts[..2] {
|
||||||
|
assert_eq!(
|
||||||
|
reader.is_peer(account),
|
||||||
|
Some(account.provider().as_str()) != failed_provider
|
||||||
|
);
|
||||||
if Some(account.provider().as_str()) == failed_provider {
|
if Some(account.provider().as_str()) == failed_provider {
|
||||||
assert!(
|
assert!(
|
||||||
reader
|
reader
|
||||||
@@ -304,6 +310,7 @@ async fn discovery_uses_provider_capabilities_and_publishes_neutral_signals() {
|
|||||||
);
|
);
|
||||||
drop(worker);
|
drop(worker);
|
||||||
drop(bundle);
|
drop(bundle);
|
||||||
|
assert!(!reader.is_peer(&initial_accounts[0]));
|
||||||
assert!(
|
assert!(
|
||||||
reader
|
reader
|
||||||
.signal(&initial_accounts[0], Some("model"), SystemTime::now())
|
.signal(&initial_accounts[0], Some("model"), SystemTime::now())
|
||||||
@@ -340,6 +347,7 @@ async fn account_edits_preserve_observation_and_refresh_budget_until_connection_
|
|||||||
.is_some()
|
.is_some()
|
||||||
);
|
);
|
||||||
let after = service.refresh_quota(edited.id()).await.unwrap();
|
let after = service.refresh_quota(edited.id()).await.unwrap();
|
||||||
|
assert!(bundle.scheduling_source().is_peer(&edited));
|
||||||
assert_eq!(after.upstream, before.upstream);
|
assert_eq!(after.upstream, before.upstream);
|
||||||
assert_eq!(transport.0.lock().unwrap().len(), 1);
|
assert_eq!(transport.0.lock().unwrap().len(), 1);
|
||||||
|
|
||||||
@@ -347,6 +355,7 @@ async fn account_edits_preserve_observation_and_refresh_budget_until_connection_
|
|||||||
OutboundProxy::parse("http://proxy.invalid:8080").unwrap(),
|
OutboundProxy::parse("http://proxy.invalid:8080").unwrap(),
|
||||||
));
|
));
|
||||||
*accounts.accounts.lock().unwrap() = vec![reconnected.clone()];
|
*accounts.accounts.lock().unwrap() = vec![reconnected.clone()];
|
||||||
|
assert!(!bundle.scheduling_source().is_peer(&reconnected));
|
||||||
service.account_changed(reconnected.id()).await.unwrap();
|
service.account_changed(reconnected.id()).await.unwrap();
|
||||||
assert!(
|
assert!(
|
||||||
bundle
|
bundle
|
||||||
@@ -422,6 +431,21 @@ fn loaded(account: &ProviderAccount) -> LoadedCredential {
|
|||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl ProviderAccountStore for TestAccounts {
|
impl ProviderAccountStore for TestAccounts {
|
||||||
|
async fn load_account_catalogs(
|
||||||
|
&self,
|
||||||
|
_: &gateway_core::routing::ProviderKind,
|
||||||
|
) -> Result<Vec<gateway_core::account::StoredAccountCatalog>, gateway_core::error::StoreError>
|
||||||
|
{
|
||||||
|
Ok(Vec::new())
|
||||||
|
}
|
||||||
|
async fn save_account_catalog(
|
||||||
|
&self,
|
||||||
|
_: &gateway_core::account::AccountCatalogObservation,
|
||||||
|
_: &[u8],
|
||||||
|
) -> Result<bool, gateway_core::error::StoreError> {
|
||||||
|
unreachable!("fixture does not discover account catalogs")
|
||||||
|
}
|
||||||
|
|
||||||
async fn create_account(&self, _account: NewProviderAccount) -> Result<(), StoreError> {
|
async fn create_account(&self, _account: NewProviderAccount) -> Result<(), StoreError> {
|
||||||
panic!("unused account operation")
|
panic!("unused account operation")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -215,6 +215,10 @@ async fn known_peer_identity_changes_only_on_definitive_detection() {
|
|||||||
quota.upstream
|
quota.upstream
|
||||||
);
|
);
|
||||||
let account = accounts.accounts.lock().unwrap()[0].clone();
|
let account = accounts.accounts.lock().unwrap()[0].clone();
|
||||||
|
assert_eq!(
|
||||||
|
bundle.scheduling_source().is_peer(&account),
|
||||||
|
!clears_identity
|
||||||
|
);
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
bundle
|
bundle
|
||||||
.scheduling_source()
|
.scheduling_source()
|
||||||
@@ -237,6 +241,7 @@ async fn known_peer_identity_changes_only_on_definitive_detection() {
|
|||||||
drop(bundle);
|
drop(bundle);
|
||||||
let restarted = initialize(accounts, transport);
|
let restarted = initialize(accounts, transport);
|
||||||
let restored = restarted.service().read_quota(&id).await.unwrap().unwrap();
|
let restored = restarted.service().read_quota(&id).await.unwrap().unwrap();
|
||||||
|
assert!(!restarted.scheduling_source().is_peer(&account));
|
||||||
assert_eq!(
|
assert_eq!(
|
||||||
restored.upstream.as_ref().unwrap().discovered,
|
restored.upstream.as_ref().unwrap().discovered,
|
||||||
!clears_identity
|
!clears_identity
|
||||||
@@ -258,6 +263,10 @@ async fn known_peer_identity_changes_only_on_definitive_detection() {
|
|||||||
.upstream,
|
.upstream,
|
||||||
restored.upstream
|
restored.upstream
|
||||||
);
|
);
|
||||||
|
assert_eq!(
|
||||||
|
restarted.scheduling_source().is_peer(&account),
|
||||||
|
!clears_identity
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ use async_trait::async_trait;
|
|||||||
use gateway_admin::{
|
use gateway_admin::{
|
||||||
model::{MutationContext, Revision, proxies::*},
|
model::{MutationContext, Revision, proxies::*},
|
||||||
ports::{
|
ports::{
|
||||||
proxy::{ProxyProbe, ProxyStore},
|
proxy::{ProbeRoute, ProxyProbe, ProxyStore},
|
||||||
store::AdminStoreResult,
|
store::AdminStoreResult,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
@@ -194,7 +194,7 @@ async fn plugin_proxy_resolution_requires_enabled_configuration_without_account_
|
|||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl ProxyProbe for TestProxies {
|
impl ProxyProbe for TestProxies {
|
||||||
async fn test(&self, _: Option<&OutboundProxy>, _: bool) -> ProxyTestResult {
|
async fn test(&self, _: ProbeRoute<'_>, _: bool) -> ProxyTestResult {
|
||||||
panic!("unexpected proxy probe")
|
panic!("unexpected proxy probe")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -456,7 +456,7 @@ impl Drop for ActiveProbe<'_> {
|
|||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl ProxyProbe for GatedProxyProbe {
|
impl ProxyProbe for GatedProxyProbe {
|
||||||
async fn test(&self, _: Option<&OutboundProxy>, _: bool) -> ProxyTestResult {
|
async fn test(&self, _: ProbeRoute<'_>, _: bool) -> ProxyTestResult {
|
||||||
self.active
|
self.active
|
||||||
.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
|
.fetch_add(1, std::sync::atomic::Ordering::Relaxed);
|
||||||
let _active = ActiveProbe(&self.active);
|
let _active = ActiveProbe(&self.active);
|
||||||
@@ -526,8 +526,8 @@ async fn batch_tests_share_capacity_preserve_order_and_release_slots_on_cancella
|
|||||||
_ = async { receiver.recv().await.unwrap(); receiver.recv().await.unwrap(); } => {}
|
_ = async { receiver.recv().await.unwrap(); receiver.recv().await.unwrap(); } => {}
|
||||||
}
|
}
|
||||||
assert_eq!(probe.active.load(Ordering::Relaxed), 2);
|
assert_eq!(probe.active.load(Ordering::Relaxed), 2);
|
||||||
let mut single_a = Box::pin(services.proxies().probe(None, false));
|
let mut single_a = Box::pin(services.proxies().probe(ProbeRoute::Direct, false));
|
||||||
let mut single_b = Box::pin(services.proxies().probe(None, false));
|
let mut single_b = Box::pin(services.proxies().probe(ProbeRoute::Direct, false));
|
||||||
tokio::select! {
|
tokio::select! {
|
||||||
_ = &mut batch => panic!("batch unexpectedly finished"),
|
_ = &mut batch => panic!("batch unexpectedly finished"),
|
||||||
_ = &mut single_a => panic!("single probe unexpectedly finished"),
|
_ = &mut single_a => panic!("single probe unexpectedly finished"),
|
||||||
@@ -538,7 +538,7 @@ async fn batch_tests_share_capacity_preserve_order_and_release_slots_on_cancella
|
|||||||
assert_eq!(
|
assert_eq!(
|
||||||
services
|
services
|
||||||
.proxies()
|
.proxies()
|
||||||
.probe(None, false)
|
.probe(ProbeRoute::Direct, false)
|
||||||
.await
|
.await
|
||||||
.unwrap_err()
|
.unwrap_err()
|
||||||
.kind(),
|
.kind(),
|
||||||
|
|||||||
@@ -100,7 +100,9 @@ fn contract_type(mut item: Item, name: &str) -> Item {
|
|||||||
attrs.retain(|attr| attr.path().is_ident("serde"));
|
attrs.retain(|attr| attr.path().is_ident("serde"));
|
||||||
attrs.insert(
|
attrs.insert(
|
||||||
0,
|
0,
|
||||||
if name == "SmartSchedulingConfig" {
|
if name == "ResetWindowWeights" {
|
||||||
|
parse_quote!(#[derive(Clone, Debug, Default, PartialEq, Serialize, Deserialize)])
|
||||||
|
} else if name == "SmartSchedulingConfig" {
|
||||||
parse_quote!(#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)])
|
parse_quote!(#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)])
|
||||||
} else if comparable {
|
} else if comparable {
|
||||||
parse_quote!(#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)])
|
parse_quote!(#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)])
|
||||||
@@ -252,11 +254,11 @@ fn sdk_settings_contract_matches_host_declarations() {
|
|||||||
),
|
),
|
||||||
(
|
(
|
||||||
"../gateway-core/src/account/location.rs",
|
"../gateway-core/src/account/location.rs",
|
||||||
&["RequestLocation"][..],
|
&["RequestLocation", "OpenAiRequestCountry"][..],
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
"../gateway-core/src/account/smart_scheduling.rs",
|
"../gateway-core/src/account/scheduling.rs",
|
||||||
&["SmartSchedulingValues"][..],
|
&["SmartSchedulingValues", "ResetWindowValues"][..],
|
||||||
),
|
),
|
||||||
(
|
(
|
||||||
"../gateway-core/src/metering/pricing.rs",
|
"../gateway-core/src/metering/pricing.rs",
|
||||||
@@ -324,10 +326,10 @@ fn sdk_settings_contract_matches_host_declarations() {
|
|||||||
}
|
}
|
||||||
types.push(contract_type(
|
types.push(contract_type(
|
||||||
item,
|
item,
|
||||||
if *name == "SmartSchedulingValues" {
|
match *name {
|
||||||
"SmartSchedulingConfig"
|
"SmartSchedulingValues" => "SmartSchedulingConfig",
|
||||||
} else {
|
"ResetWindowValues" => "ResetWindowWeights",
|
||||||
name
|
_ => name,
|
||||||
},
|
},
|
||||||
));
|
));
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -60,7 +60,7 @@ async fn explicit_service_calls_freeze_empty_plan_and_cancel_before_entering_ter
|
|||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
// 内部 pricing 不再单独进入插件链;显式调用只解析一次发布集合
|
// 每次显式调价只解析一次插件发布集合
|
||||||
assert_eq!(resolutions.load(Ordering::SeqCst), expected);
|
assert_eq!(resolutions.load(Ordering::SeqCst), expected);
|
||||||
}
|
}
|
||||||
store.updated.lock().unwrap().take();
|
store.updated.lock().unwrap().take();
|
||||||
@@ -325,6 +325,8 @@ async fn settings_should_reject_zero_refresh_margin_before_store_call() {
|
|||||||
model_mappings: Default::default(),
|
model_mappings: Default::default(),
|
||||||
rotation_strategy: RotationStrategy::Smart,
|
rotation_strategy: RotationStrategy::Smart,
|
||||||
values: gateway_admin::model::settings::RuntimeSettingsValues {
|
values: gateway_admin::model::settings::RuntimeSettingsValues {
|
||||||
|
openai_oauth_guardian_review_model: true,
|
||||||
|
openai_request_country: Default::default(),
|
||||||
codex_privacy_policy: Default::default(),
|
codex_privacy_policy: Default::default(),
|
||||||
request_location_enabled: false,
|
request_location_enabled: false,
|
||||||
request_location: Default::default(),
|
request_location: Default::default(),
|
||||||
@@ -343,6 +345,8 @@ async fn settings_should_reject_zero_refresh_margin_before_store_call() {
|
|||||||
openai_session_affinity_ttl_hours: 24,
|
openai_session_affinity_ttl_hours: 24,
|
||||||
responses_max_decompressed_body_bytes: 64 * 1024 * 1024,
|
responses_max_decompressed_body_bytes: 64 * 1024 * 1024,
|
||||||
smart_scheduling: gateway_core::account::SmartSchedulingConfig::default(),
|
smart_scheduling: gateway_core::account::SmartSchedulingConfig::default(),
|
||||||
|
quota_reset_window_weights: gateway_core::account::ResetWindowWeights::default(
|
||||||
|
),
|
||||||
min_codex_desktop_version: None,
|
min_codex_desktop_version: None,
|
||||||
min_codex_cli_version: None,
|
min_codex_cli_version: None,
|
||||||
usage_retention_days: 31,
|
usage_retention_days: 31,
|
||||||
|
|||||||
@@ -21,12 +21,15 @@ use gateway_admin::model::{
|
|||||||
UpdateAccountGroup,
|
UpdateAccountGroup,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
use gateway_core::{account::FastMode, routing::AccountGroupId};
|
use gateway_core::{
|
||||||
|
account::{AccountModelAccess, FastMode},
|
||||||
|
routing::AccountGroupId,
|
||||||
|
};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
use super::{
|
use super::{
|
||||||
AdminAuth, AdminEnvelope, AdminError, AdminJson, AdminQuery, AdminResponse, PageMeta,
|
AdminAuth, AdminEnvelope, AdminError, AdminJson, AdminQuery, AdminResponse, PageMeta,
|
||||||
WireValidationError, wire::map_admin_service_error,
|
WireValidationError, accounts::AccountModelView, wire::map_admin_service_error,
|
||||||
};
|
};
|
||||||
|
|
||||||
/// 账号、代理与 Client Key 共用的分组引用
|
/// 账号、代理与 Client Key 共用的分组引用
|
||||||
@@ -51,7 +54,6 @@ impl From<gateway_admin::model::account_groups::AccountGroupRef> for AccountGrou
|
|||||||
}
|
}
|
||||||
|
|
||||||
const DEFAULT_PAGE_SIZE: u32 = 50;
|
const DEFAULT_PAGE_SIZE: u32 = 50;
|
||||||
const MAX_PAGE_SIZE: u32 = 200;
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, Default, Deserialize)]
|
#[derive(Debug, Clone, Default, Deserialize)]
|
||||||
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
@@ -66,7 +68,7 @@ impl ListAccountGroupsQuery {
|
|||||||
fn into_command(self) -> Result<AccountGroupListQuery, WireValidationError> {
|
fn into_command(self) -> Result<AccountGroupListQuery, WireValidationError> {
|
||||||
let page = self.page.unwrap_or(1);
|
let page = self.page.unwrap_or(1);
|
||||||
let page_size = self.page_size.unwrap_or(DEFAULT_PAGE_SIZE);
|
let page_size = self.page_size.unwrap_or(DEFAULT_PAGE_SIZE);
|
||||||
if page == 0 || page_size == 0 || page_size > MAX_PAGE_SIZE {
|
if page == 0 {
|
||||||
return Err(WireValidationError::new("page"));
|
return Err(WireValidationError::new("page"));
|
||||||
}
|
}
|
||||||
let search = self
|
let search = self
|
||||||
@@ -91,15 +93,19 @@ impl ListAccountGroupsQuery {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const fn default_allow_image_generation() -> bool {
|
const fn default_allowed() -> bool {
|
||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Deserialize)]
|
#[derive(Debug, Clone, Deserialize)]
|
||||||
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
struct CreateAccountGroupRequest {
|
struct CreateAccountGroupRequest {
|
||||||
#[serde(default = "default_allow_image_generation")]
|
#[serde(default = "default_allowed")]
|
||||||
allow_image_generation: bool,
|
allow_image_generation: bool,
|
||||||
|
#[serde(default = "default_allowed")]
|
||||||
|
allow_subagents: bool,
|
||||||
|
#[serde(default)]
|
||||||
|
model_access: AccountModelAccess,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
fast_mode: FastMode,
|
fast_mode: FastMode,
|
||||||
name: String,
|
name: String,
|
||||||
@@ -111,6 +117,8 @@ struct CreateAccountGroupRequest {
|
|||||||
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
struct UpdateAccountGroupRequest {
|
struct UpdateAccountGroupRequest {
|
||||||
allow_image_generation: Option<bool>,
|
allow_image_generation: Option<bool>,
|
||||||
|
allow_subagents: Option<bool>,
|
||||||
|
model_access: Option<AccountModelAccess>,
|
||||||
fast_mode: Option<FastMode>,
|
fast_mode: Option<FastMode>,
|
||||||
id: String,
|
id: String,
|
||||||
name: String,
|
name: String,
|
||||||
@@ -128,6 +136,8 @@ struct AccountGroupIdRequest {
|
|||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
struct AccountGroupView {
|
struct AccountGroupView {
|
||||||
allow_image_generation: bool,
|
allow_image_generation: bool,
|
||||||
|
allow_subagents: bool,
|
||||||
|
model_access: AccountModelAccess,
|
||||||
fast_mode: FastMode,
|
fast_mode: FastMode,
|
||||||
id: String,
|
id: String,
|
||||||
name: String,
|
name: String,
|
||||||
@@ -176,6 +186,8 @@ impl From<(AccountGroupRecord, crate::time::TimePresenter)> for AccountGroupView
|
|||||||
description: record.description,
|
description: record.description,
|
||||||
fast_mode: record.fast_mode,
|
fast_mode: record.fast_mode,
|
||||||
allow_image_generation: record.allow_image_generation,
|
allow_image_generation: record.allow_image_generation,
|
||||||
|
allow_subagents: record.allow_subagents,
|
||||||
|
model_access: record.model_access,
|
||||||
color: record.color.as_str().to_owned(),
|
color: record.color.as_str().to_owned(),
|
||||||
enabled: record.enabled,
|
enabled: record.enabled,
|
||||||
member_count: record.member_count,
|
member_count: record.member_count,
|
||||||
@@ -305,6 +317,7 @@ where
|
|||||||
{
|
{
|
||||||
Router::new()
|
Router::new()
|
||||||
.route("/api/admin/account-groups", get(list::<S>))
|
.route("/api/admin/account-groups", get(list::<S>))
|
||||||
|
.route("/api/admin/account-groups/models", get(models::<S>))
|
||||||
.route("/api/admin/account-groups/options", get(list_options::<S>))
|
.route("/api/admin/account-groups/options", get(list_options::<S>))
|
||||||
.route("/api/admin/account-groups/create", post(create::<S>))
|
.route("/api/admin/account-groups/create", post(create::<S>))
|
||||||
.route("/api/admin/account-groups/update", post(update::<S>))
|
.route("/api/admin/account-groups/update", post(update::<S>))
|
||||||
@@ -333,6 +346,32 @@ where
|
|||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct AccountGroupModelsData {
|
||||||
|
models: Vec<AccountModelView>,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn models<S>(
|
||||||
|
_auth: AdminAuth,
|
||||||
|
State(state): State<S>,
|
||||||
|
AdminQuery(query): AdminQuery<AccountGroupIdRequest>,
|
||||||
|
) -> Result<impl IntoResponse, AdminError>
|
||||||
|
where
|
||||||
|
S: SessionState + Send + Sync,
|
||||||
|
{
|
||||||
|
let models = state
|
||||||
|
.admin_services()
|
||||||
|
.account_groups()
|
||||||
|
.models(&group_id(query.id)?)
|
||||||
|
.map_err(map_service_error)?;
|
||||||
|
Ok(AdminResponse::new(
|
||||||
|
StatusCode::OK,
|
||||||
|
AdminEnvelope::ok(AccountGroupModelsData {
|
||||||
|
models: models.into_iter().map(AccountModelView::from).collect(),
|
||||||
|
}),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
async fn list<S>(
|
async fn list<S>(
|
||||||
_auth: AdminAuth,
|
_auth: AdminAuth,
|
||||||
State(state): State<S>,
|
State(state): State<S>,
|
||||||
@@ -372,6 +411,8 @@ where
|
|||||||
&auth.context().mutation_context(),
|
&auth.context().mutation_context(),
|
||||||
CreateAccountGroup {
|
CreateAccountGroup {
|
||||||
allow_image_generation: request.allow_image_generation,
|
allow_image_generation: request.allow_image_generation,
|
||||||
|
allow_subagents: request.allow_subagents,
|
||||||
|
model_access: request.model_access,
|
||||||
name: request.name,
|
name: request.name,
|
||||||
description: request.description,
|
description: request.description,
|
||||||
fast_mode: request.fast_mode,
|
fast_mode: request.fast_mode,
|
||||||
@@ -401,6 +442,8 @@ where
|
|||||||
&auth.context().mutation_context(),
|
&auth.context().mutation_context(),
|
||||||
UpdateAccountGroup {
|
UpdateAccountGroup {
|
||||||
allow_image_generation: request.allow_image_generation,
|
allow_image_generation: request.allow_image_generation,
|
||||||
|
allow_subagents: request.allow_subagents,
|
||||||
|
model_access: request.model_access,
|
||||||
id: group_id(request.id)?,
|
id: group_id(request.id)?,
|
||||||
name: request.name,
|
name: request.name,
|
||||||
description: request.description,
|
description: request.description,
|
||||||
@@ -507,11 +550,16 @@ fn group_color(value: &str) -> Result<AccountGroupColor, AdminError> {
|
|||||||
|
|
||||||
fn validate_group_fields(name: &str, description: Option<&str>) -> Result<(), AdminError> {
|
fn validate_group_fields(name: &str, description: Option<&str>) -> Result<(), AdminError> {
|
||||||
gateway_admin::model::account_groups::validate_group_fields(name, description)
|
gateway_admin::model::account_groups::validate_group_fields(name, description)
|
||||||
.map_err(|_| AdminError::bad_request("账号组请求不合法"))
|
.map_err(map_admin_service_error)
|
||||||
}
|
}
|
||||||
|
|
||||||
fn map_wire_error(_: WireValidationError) -> AdminError {
|
fn map_wire_error(error: WireValidationError) -> AdminError {
|
||||||
AdminError::bad_request("账号组查询参数不合法")
|
match error.field() {
|
||||||
|
"page" => AdminError::bad_request("页码须大于 0"),
|
||||||
|
"pageSize" => AdminError::bad_request(format!("每页数量须为 1 至 {}", PageSize::MAX)),
|
||||||
|
"search" => AdminError::bad_request("搜索内容最多 256 字节,不能包含控制字符"),
|
||||||
|
field => AdminError::bad_request(format!("{field} 字段不合法")),
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn map_service_error(error: gateway_admin::model::AdminError) -> AdminError {
|
fn map_service_error(error: gateway_admin::model::AdminError) -> AdminError {
|
||||||
|
|||||||
@@ -118,7 +118,6 @@ pub struct StartAccountAuthorizationRequest {
|
|||||||
pub provider: String,
|
pub provider: String,
|
||||||
pub name: String,
|
pub name: String,
|
||||||
pub account_id: Option<String>,
|
pub account_id: Option<String>,
|
||||||
pub outbound_proxy_url: Option<super::wire::AccountProxyUpdate>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl StartAccountAuthorizationRequest {
|
impl StartAccountAuthorizationRequest {
|
||||||
@@ -148,10 +147,7 @@ impl StartAccountAuthorizationRequest {
|
|||||||
context,
|
context,
|
||||||
name: self.name.trim().to_owned(),
|
name: self.name.trim().to_owned(),
|
||||||
reauthorization,
|
reauthorization,
|
||||||
outbound_proxy: super::wire::proxy_selection(
|
outbound_proxy: super::wire::proxy_selection(self.outbound_proxy_id)?,
|
||||||
self.outbound_proxy_id,
|
|
||||||
self.outbound_proxy_url,
|
|
||||||
)?,
|
|
||||||
},
|
},
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
@@ -219,7 +215,6 @@ fn validate_authorization_flow(
|
|||||||
pub struct UpdateAccountRequest {
|
pub struct UpdateAccountRequest {
|
||||||
pub connection: Option<AccountConnectionUpdateRequest>,
|
pub connection: Option<AccountConnectionUpdateRequest>,
|
||||||
pub outbound_proxy_id: Option<String>,
|
pub outbound_proxy_id: Option<String>,
|
||||||
pub outbound_proxy_url: Option<super::wire::AccountProxyUpdate>,
|
|
||||||
pub account_id: String,
|
pub account_id: String,
|
||||||
pub name: Option<String>,
|
pub name: Option<String>,
|
||||||
pub notes: Option<String>,
|
pub notes: Option<String>,
|
||||||
@@ -255,10 +250,7 @@ impl UpdateAccountRequest {
|
|||||||
.connection
|
.connection
|
||||||
.map(AccountConnectionUpdateRequest::into_document);
|
.map(AccountConnectionUpdateRequest::into_document);
|
||||||
let settings = UpdateAccount {
|
let settings = UpdateAccount {
|
||||||
outbound_proxy: super::wire::proxy_selection(
|
outbound_proxy: super::wire::proxy_selection(self.outbound_proxy_id)?,
|
||||||
self.outbound_proxy_id,
|
|
||||||
self.outbound_proxy_url,
|
|
||||||
)?,
|
|
||||||
account_id: self.account_id,
|
account_id: self.account_id,
|
||||||
name: self.name.map(|name| name.trim().to_owned()),
|
name: self.name.map(|name| name.trim().to_owned()),
|
||||||
notes: self.notes,
|
notes: self.notes,
|
||||||
|
|||||||
@@ -53,13 +53,7 @@ pub(super) fn account_models_data(
|
|||||||
models: result
|
models: result
|
||||||
.models
|
.models
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|model| {
|
.map(|model| AccountModelView::from(model.id))
|
||||||
let id = model.id.to_string();
|
|
||||||
AccountModelView {
|
|
||||||
label: id.clone(),
|
|
||||||
id,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.collect(),
|
.collect(),
|
||||||
observed_at: observed_at.map(|value| time.rfc3339(&value)),
|
observed_at: observed_at.map(|value| time.rfc3339(&value)),
|
||||||
observed_at_display: observed_at
|
observed_at_display: observed_at
|
||||||
@@ -117,7 +111,7 @@ pub(super) fn account_view(
|
|||||||
let (mut quota, refresh_token_expires_at) = account_quota_view(quota, cooldown, now, time);
|
let (mut quota, refresh_token_expires_at) = account_quota_view(quota, cooldown, now, time);
|
||||||
quota.protection_rules = protection_rules;
|
quota.protection_rules = protection_rules;
|
||||||
AccountView {
|
AccountView {
|
||||||
quota_limits: account.quota_limits,
|
quota_settings: account.quota_settings,
|
||||||
auto_use_quota_credits: account.auto_use_quota_credits,
|
auto_use_quota_credits: account.auto_use_quota_credits,
|
||||||
upstream,
|
upstream,
|
||||||
capabilities: capabilities.into(),
|
capabilities: capabilities.into(),
|
||||||
|
|||||||
@@ -2,46 +2,22 @@
|
|||||||
|
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct AccountProxyUpdate(pub Option<gateway_core::account::OutboundProxy>);
|
|
||||||
|
|
||||||
impl<'de> Deserialize<'de> for AccountProxyUpdate {
|
|
||||||
fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
|
|
||||||
let value = String::deserialize(deserializer)?;
|
|
||||||
if value.is_empty() {
|
|
||||||
return Ok(Self(None));
|
|
||||||
}
|
|
||||||
gateway_core::account::OutboundProxy::parse(&value)
|
|
||||||
.map(|proxy| Self(Some(proxy)))
|
|
||||||
.map_err(serde::de::Error::custom)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub(super) fn proxy_selection(
|
pub(super) fn proxy_selection(
|
||||||
id: Option<String>,
|
id: Option<String>,
|
||||||
url: Option<AccountProxyUpdate>,
|
|
||||||
) -> Result<Option<gateway_admin::model::proxies::AccountProxySelection>, WireValidationError> {
|
) -> Result<Option<gateway_admin::model::proxies::AccountProxySelection>, WireValidationError> {
|
||||||
use gateway_admin::model::proxies::AccountProxySelection;
|
use gateway_admin::model::proxies::AccountProxySelection;
|
||||||
match (id, url) {
|
let Some(id) = id else { return Ok(None) };
|
||||||
(Some(_), Some(_)) => Err(WireValidationError::new("outboundProxyId")),
|
if id.is_empty() {
|
||||||
(Some(id), None) if id.is_empty() => Ok(Some(AccountProxySelection::Direct)),
|
return Ok(Some(AccountProxySelection::Direct));
|
||||||
(Some(id), None) => {
|
|
||||||
if id.len() > 128
|
|
||||||
|| !id
|
|
||||||
.bytes()
|
|
||||||
.all(|byte| byte.is_ascii_alphanumeric() || matches!(byte, b'_' | b'-'))
|
|
||||||
{
|
|
||||||
return Err(WireValidationError::new("outboundProxyId"));
|
|
||||||
}
|
|
||||||
Ok(Some(AccountProxySelection::Saved(id)))
|
|
||||||
}
|
|
||||||
(None, Some(value)) => Ok(Some(
|
|
||||||
value
|
|
||||||
.0
|
|
||||||
.map_or(AccountProxySelection::Direct, AccountProxySelection::Url),
|
|
||||||
)),
|
|
||||||
(None, None) => Ok(None),
|
|
||||||
}
|
}
|
||||||
|
if id.len() > 128
|
||||||
|
|| !id
|
||||||
|
.bytes()
|
||||||
|
.all(|byte| byte.is_ascii_alphanumeric() || matches!(byte, b'_' | b'-'))
|
||||||
|
{
|
||||||
|
return Err(WireValidationError::new("outboundProxyId"));
|
||||||
|
}
|
||||||
|
Ok(Some(AccountProxySelection::Saved(id)))
|
||||||
}
|
}
|
||||||
|
|
||||||
/// 账号列表查询参数
|
/// 账号列表查询参数
|
||||||
@@ -61,10 +37,9 @@ pub struct ListQuery {
|
|||||||
#[derive(Debug, Clone, Deserialize)]
|
#[derive(Debug, Clone, Deserialize)]
|
||||||
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
pub struct BatchUpdateAccountsRequest {
|
pub struct BatchUpdateAccountsRequest {
|
||||||
pub quota_limits: Option<gateway_core::account::AccountQuotaLimits>,
|
pub quota_settings: Option<gateway_core::account::AccountQuotaSettings>,
|
||||||
pub auto_use_quota_credits: Option<bool>,
|
pub auto_use_quota_credits: Option<bool>,
|
||||||
pub outbound_proxy_id: Option<String>,
|
pub outbound_proxy_id: Option<String>,
|
||||||
pub outbound_proxy_url: Option<AccountProxyUpdate>,
|
|
||||||
pub account_ids: Vec<String>,
|
pub account_ids: Vec<String>,
|
||||||
pub enabled: Option<bool>,
|
pub enabled: Option<bool>,
|
||||||
#[serde(default, deserialize_with = "deserialize_optional_nullable_limit")]
|
#[serde(default, deserialize_with = "deserialize_optional_nullable_limit")]
|
||||||
@@ -119,7 +94,7 @@ impl BatchUpdateAccountsRequest {
|
|||||||
.map(parse_concurrency_limit)
|
.map(parse_concurrency_limit)
|
||||||
.transpose()?;
|
.transpose()?;
|
||||||
self.weight.map(parse_account_weight).transpose()?;
|
self.weight.map(parse_account_weight).transpose()?;
|
||||||
if self.quota_limits.is_none()
|
if self.quota_settings.is_none()
|
||||||
&& self.auto_use_quota_credits.is_none()
|
&& self.auto_use_quota_credits.is_none()
|
||||||
&& self.enabled.is_none()
|
&& self.enabled.is_none()
|
||||||
&& self.concurrency_limit.is_none()
|
&& self.concurrency_limit.is_none()
|
||||||
@@ -127,7 +102,6 @@ impl BatchUpdateAccountsRequest {
|
|||||||
&& self.group_ids.is_none()
|
&& self.group_ids.is_none()
|
||||||
&& self.model_access.is_none()
|
&& self.model_access.is_none()
|
||||||
&& self.outbound_proxy_id.is_none()
|
&& self.outbound_proxy_id.is_none()
|
||||||
&& self.outbound_proxy_url.is_none()
|
|
||||||
{
|
{
|
||||||
return Err(WireValidationError::new("accountSettings"));
|
return Err(WireValidationError::new("accountSettings"));
|
||||||
}
|
}
|
||||||
@@ -137,9 +111,9 @@ impl BatchUpdateAccountsRequest {
|
|||||||
pub(super) fn into_command(self) -> Result<BatchUpdateAccounts, WireValidationError> {
|
pub(super) fn into_command(self) -> Result<BatchUpdateAccounts, WireValidationError> {
|
||||||
self.validate()?;
|
self.validate()?;
|
||||||
Ok(BatchUpdateAccounts {
|
Ok(BatchUpdateAccounts {
|
||||||
quota_limits: self.quota_limits,
|
quota_settings: self.quota_settings,
|
||||||
auto_use_quota_credits: self.auto_use_quota_credits,
|
auto_use_quota_credits: self.auto_use_quota_credits,
|
||||||
outbound_proxy: proxy_selection(self.outbound_proxy_id, self.outbound_proxy_url)?,
|
outbound_proxy: proxy_selection(self.outbound_proxy_id)?,
|
||||||
account_ids: self.account_ids,
|
account_ids: self.account_ids,
|
||||||
enabled: self.enabled,
|
enabled: self.enabled,
|
||||||
concurrency_limit: self
|
concurrency_limit: self
|
||||||
@@ -273,7 +247,7 @@ pub struct AccountSummaryView {
|
|||||||
#[derive(Debug, Clone, Serialize)]
|
#[derive(Debug, Clone, Serialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct AccountView {
|
pub struct AccountView {
|
||||||
pub quota_limits: gateway_core::account::AccountQuotaLimits,
|
pub quota_settings: gateway_core::account::AccountQuotaSettings,
|
||||||
pub auto_use_quota_credits: bool,
|
pub auto_use_quota_credits: bool,
|
||||||
pub upstream: Option<super::AccountUpstreamInfoView>,
|
pub upstream: Option<super::AccountUpstreamInfoView>,
|
||||||
pub capabilities: AccountCapabilitiesView,
|
pub capabilities: AccountCapabilitiesView,
|
||||||
@@ -327,7 +301,7 @@ pub struct AccountCapacityView {
|
|||||||
#[derive(Debug, Clone, Serialize)]
|
#[derive(Debug, Clone, Serialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct AccountCapabilitiesView {
|
pub struct AccountCapabilitiesView {
|
||||||
pub quota_limits_supported: bool,
|
pub quota_settings_supported: bool,
|
||||||
pub quota_credits: bool,
|
pub quota_credits: bool,
|
||||||
pub quota: bool,
|
pub quota: bool,
|
||||||
pub quota_refresh: bool,
|
pub quota_refresh: bool,
|
||||||
@@ -347,7 +321,7 @@ impl From<gateway_admin::model::accounts::ProviderAccountCapabilities> for Accou
|
|||||||
subscription: value.subscription,
|
subscription: value.subscription,
|
||||||
avatar: value.avatar,
|
avatar: value.avatar,
|
||||||
reset_credits: value.reset_credits,
|
reset_credits: value.reset_credits,
|
||||||
quota_limits_supported: value.quota_limits_supported,
|
quota_settings_supported: value.quota_settings_supported,
|
||||||
quota_credits: value.quota_credits,
|
quota_credits: value.quota_credits,
|
||||||
consume_reset_credit: value.consume_reset_credit,
|
consume_reset_credit: value.consume_reset_credit,
|
||||||
}
|
}
|
||||||
@@ -743,6 +717,16 @@ pub struct AccountModelView {
|
|||||||
pub label: String,
|
pub label: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
impl From<UpstreamModelId> for AccountModelView {
|
||||||
|
fn from(model: UpstreamModelId) -> Self {
|
||||||
|
let id = model.to_string();
|
||||||
|
Self {
|
||||||
|
label: id.clone(),
|
||||||
|
id,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, Serialize)]
|
#[derive(Debug, Clone, Serialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct AccountModelsData {
|
pub struct AccountModelsData {
|
||||||
|
|||||||
@@ -0,0 +1,291 @@
|
|||||||
|
//! 管理员查看单个密钥的模型统计与手动对齐本期额度的接口
|
||||||
|
|
||||||
|
use axum::{Router, extract::State, http::StatusCode, response::IntoResponse, routing::get};
|
||||||
|
use chrono::{DateTime, Utc};
|
||||||
|
use gateway_admin::model::observability::{KeyStatisticsOverview, KeyUsageMetric, TimeRange};
|
||||||
|
use gateway_admin::{
|
||||||
|
AdminServices,
|
||||||
|
model::client_keys::{
|
||||||
|
ClientKeyBudgetMutationOrigin, ClientKeyBudgetReference, ClientKeyBudgetWindowPeriod,
|
||||||
|
SetClientKeyBudgetWindow,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
use gateway_core::{account::ProviderAccountId, policy::ClientApiKeyId};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
|
||||||
|
use super::{
|
||||||
|
AdminAuth, AdminEnvelope, AdminError, AdminJson, AdminQuery, AdminResponse,
|
||||||
|
client_keys::ClientBudgetView, wire::map_admin_service_error,
|
||||||
|
};
|
||||||
|
use crate::{auth::SessionState, time::TimePresenter};
|
||||||
|
|
||||||
|
pub(super) fn router<S: SessionState + Clone + Send + Sync + 'static>() -> Router<S> {
|
||||||
|
Router::new()
|
||||||
|
.route(
|
||||||
|
"/api/admin/client-keys/budget-reference-accounts",
|
||||||
|
get(accounts::<S>),
|
||||||
|
)
|
||||||
|
.route("/api/admin/client-keys/statistics", get(statistics::<S>))
|
||||||
|
.route("/api/admin/client-keys/statistics/models", get(models::<S>))
|
||||||
|
.route(
|
||||||
|
"/api/admin/client-keys/budget-alignment",
|
||||||
|
get(preview::<S>).post(align::<S>),
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
|
struct StatisticsQuery {
|
||||||
|
id: String,
|
||||||
|
period: Option<String>,
|
||||||
|
#[serde(default)]
|
||||||
|
metric: KeyUsageMetric,
|
||||||
|
as_of: Option<i64>,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn key_id(value: String) -> Result<ClientApiKeyId, AdminError> {
|
||||||
|
ClientApiKeyId::new(value).map_err(|_| AdminError::bad_request("API Key ID 无效"))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct Statistics {
|
||||||
|
budget: ClientBudgetView,
|
||||||
|
dates: Vec<chrono::NaiveDate>,
|
||||||
|
#[serde(rename = "asOf")]
|
||||||
|
as_of: i64,
|
||||||
|
#[serde(flatten)]
|
||||||
|
overview: KeyStatisticsOverview,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn statistics<S: SessionState>(
|
||||||
|
_auth: AdminAuth,
|
||||||
|
State(state): State<S>,
|
||||||
|
AdminQuery(query): AdminQuery<StatisticsQuery>,
|
||||||
|
) -> Result<impl IntoResponse, AdminError> {
|
||||||
|
let services = state.admin_services();
|
||||||
|
let id = key_id(query.id.clone())?;
|
||||||
|
let tz = services.timezone();
|
||||||
|
let range = statistics_range(&query, tz)?;
|
||||||
|
let budget = services
|
||||||
|
.client_keys()
|
||||||
|
.budget(&id)
|
||||||
|
.await
|
||||||
|
.map_err(map_admin_service_error)?;
|
||||||
|
let overview = services
|
||||||
|
.observability()
|
||||||
|
.client_key_statistics(range, &id, query.metric)
|
||||||
|
.await
|
||||||
|
.map_err(map_admin_service_error)?;
|
||||||
|
let end = tz.local(range.end).date_naive();
|
||||||
|
let dates = tz
|
||||||
|
.local(range.start)
|
||||||
|
.date_naive()
|
||||||
|
.iter_days()
|
||||||
|
.take_while(|date| *date <= end)
|
||||||
|
.collect();
|
||||||
|
Ok(AdminResponse::new(
|
||||||
|
StatusCode::OK,
|
||||||
|
AdminEnvelope::ok(Statistics {
|
||||||
|
budget: ClientBudgetView::from((budget, TimePresenter::new(tz))),
|
||||||
|
dates,
|
||||||
|
as_of: range.end.timestamp_millis(),
|
||||||
|
overview,
|
||||||
|
}),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn statistics_range(
|
||||||
|
query: &StatisticsQuery,
|
||||||
|
tz: gateway_core::time::DeploymentTimeZone,
|
||||||
|
) -> Result<TimeRange, AdminError> {
|
||||||
|
let period = query.period.as_deref().unwrap_or("7d");
|
||||||
|
if !matches!(period, "7d" | "30d") {
|
||||||
|
return Err(AdminError::bad_request("统计周期须为 7 天或 30 天"));
|
||||||
|
}
|
||||||
|
crate::time::query_range(
|
||||||
|
None,
|
||||||
|
None,
|
||||||
|
Some(period),
|
||||||
|
Some(query.as_of.unwrap_or_else(|| Utc::now().timestamp_millis())),
|
||||||
|
tz,
|
||||||
|
"7d",
|
||||||
|
)
|
||||||
|
.map_err(|_| AdminError::bad_request("统计时间范围无效"))
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn models<S: SessionState>(
|
||||||
|
_auth: AdminAuth,
|
||||||
|
State(state): State<S>,
|
||||||
|
AdminQuery(query): AdminQuery<StatisticsQuery>,
|
||||||
|
) -> Result<impl IntoResponse, AdminError> {
|
||||||
|
let services = state.admin_services();
|
||||||
|
let range = statistics_range(&query, services.timezone())?;
|
||||||
|
let id = key_id(query.id)?;
|
||||||
|
services
|
||||||
|
.client_keys()
|
||||||
|
.budget(&id)
|
||||||
|
.await
|
||||||
|
.map_err(map_admin_service_error)?;
|
||||||
|
let items = services
|
||||||
|
.observability()
|
||||||
|
.client_key_models(range, &id)
|
||||||
|
.await
|
||||||
|
.map_err(map_admin_service_error)?;
|
||||||
|
Ok(AdminResponse::new(StatusCode::OK, AdminEnvelope::ok(items)))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(deny_unknown_fields)]
|
||||||
|
struct AccountSearch {
|
||||||
|
id: String,
|
||||||
|
#[serde(default)]
|
||||||
|
search: String,
|
||||||
|
#[serde(default)]
|
||||||
|
cursor: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn accounts<S: SessionState>(
|
||||||
|
_auth: AdminAuth,
|
||||||
|
State(state): State<S>,
|
||||||
|
AdminQuery(query): AdminQuery<AccountSearch>,
|
||||||
|
) -> Result<impl IntoResponse, AdminError> {
|
||||||
|
let page = state
|
||||||
|
.admin_services()
|
||||||
|
.client_keys()
|
||||||
|
.budget_reference_accounts(&key_id(query.id)?, &query.search, &query.cursor)
|
||||||
|
.await
|
||||||
|
.map_err(map_admin_service_error)?;
|
||||||
|
Ok(AdminResponse::new(StatusCode::OK, AdminEnvelope::ok(page)))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
|
struct ReferenceQuery {
|
||||||
|
id: String,
|
||||||
|
account_id: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
struct ReferenceWindow {
|
||||||
|
key: String,
|
||||||
|
label: String,
|
||||||
|
period: &'static str,
|
||||||
|
starts_at: DateTime<Utc>,
|
||||||
|
ends_at: DateTime<Utc>,
|
||||||
|
starts_at_display: String,
|
||||||
|
ends_at_display: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
struct Preview {
|
||||||
|
revision: u64,
|
||||||
|
windows: Vec<ReferenceWindow>,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn reference_windows(
|
||||||
|
services: &AdminServices,
|
||||||
|
id: &ClientApiKeyId,
|
||||||
|
account: String,
|
||||||
|
) -> Result<Vec<ClientKeyBudgetReference>, AdminError> {
|
||||||
|
let account_id =
|
||||||
|
ProviderAccountId::new(account).map_err(|_| AdminError::bad_request("参考账号 ID 无效"))?;
|
||||||
|
let key = services
|
||||||
|
.client_keys()
|
||||||
|
.get(id)
|
||||||
|
.await
|
||||||
|
.map_err(map_admin_service_error)?;
|
||||||
|
services
|
||||||
|
.accounts()
|
||||||
|
.key_budget_references(&account_id, &key.groups)
|
||||||
|
.await
|
||||||
|
.map_err(map_admin_service_error)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn preview<S: SessionState>(
|
||||||
|
_auth: AdminAuth,
|
||||||
|
State(state): State<S>,
|
||||||
|
AdminQuery(query): AdminQuery<ReferenceQuery>,
|
||||||
|
) -> Result<impl IntoResponse, AdminError> {
|
||||||
|
let services = state.admin_services();
|
||||||
|
let id = key_id(query.id)?;
|
||||||
|
let time = TimePresenter::new(services.timezone());
|
||||||
|
let windows = reference_windows(services, &id, query.account_id)
|
||||||
|
.await?
|
||||||
|
.into_iter()
|
||||||
|
.map(
|
||||||
|
|ClientKeyBudgetReference {
|
||||||
|
key,
|
||||||
|
label,
|
||||||
|
period,
|
||||||
|
bounds,
|
||||||
|
}| ReferenceWindow {
|
||||||
|
key,
|
||||||
|
label,
|
||||||
|
period: period.as_str(),
|
||||||
|
starts_at: bounds.starts_at,
|
||||||
|
ends_at: bounds.ends_at,
|
||||||
|
starts_at_display: time.datetime(&bounds.starts_at),
|
||||||
|
ends_at_display: time.datetime(&bounds.ends_at),
|
||||||
|
},
|
||||||
|
)
|
||||||
|
.collect();
|
||||||
|
// 日周窗口共享配置版本,普通请求的消费累计不会让预览失效
|
||||||
|
let revision = services
|
||||||
|
.client_keys()
|
||||||
|
.budget_window(&id, ClientKeyBudgetWindowPeriod::Weekly)
|
||||||
|
.await
|
||||||
|
.map_err(map_admin_service_error)?
|
||||||
|
.revision;
|
||||||
|
Ok(AdminResponse::new(
|
||||||
|
StatusCode::OK,
|
||||||
|
AdminEnvelope::ok(Preview { revision, windows }),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
|
struct AlignRequest {
|
||||||
|
id: String,
|
||||||
|
account_id: String,
|
||||||
|
window_key: String,
|
||||||
|
starts_at: DateTime<Utc>,
|
||||||
|
ends_at: DateTime<Utc>,
|
||||||
|
revision: u64,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn align<S: SessionState>(
|
||||||
|
auth: AdminAuth,
|
||||||
|
State(state): State<S>,
|
||||||
|
AdminJson(input): AdminJson<AlignRequest>,
|
||||||
|
) -> Result<impl IntoResponse, AdminError> {
|
||||||
|
let services = state.admin_services();
|
||||||
|
let id = key_id(input.id)?;
|
||||||
|
let reference = reference_windows(services, &id, input.account_id)
|
||||||
|
.await?
|
||||||
|
.into_iter()
|
||||||
|
.find(|reference| {
|
||||||
|
reference.key == input.window_key
|
||||||
|
&& reference.bounds.starts_at == input.starts_at
|
||||||
|
&& reference.bounds.ends_at == input.ends_at
|
||||||
|
})
|
||||||
|
.ok_or_else(|| AdminError::conflict("参考窗口已变化,请重新预览"))?;
|
||||||
|
let revision = services
|
||||||
|
.client_keys()
|
||||||
|
.set_budget_window(
|
||||||
|
&auth.context().mutation_context(),
|
||||||
|
SetClientKeyBudgetWindow {
|
||||||
|
id,
|
||||||
|
period: reference.period,
|
||||||
|
expected_revision: input.revision,
|
||||||
|
window: Some(reference.bounds),
|
||||||
|
},
|
||||||
|
ClientKeyBudgetMutationOrigin::Admin,
|
||||||
|
)
|
||||||
|
.await
|
||||||
|
.map_err(map_admin_service_error)?;
|
||||||
|
Ok(AdminResponse::new(
|
||||||
|
StatusCode::OK,
|
||||||
|
AdminEnvelope::ok(revision),
|
||||||
|
))
|
||||||
|
}
|
||||||
@@ -7,11 +7,12 @@ use std::{collections::BTreeMap, fmt};
|
|||||||
use base64::{Engine as _, engine::general_purpose::URL_SAFE_NO_PAD};
|
use base64::{Engine as _, engine::general_purpose::URL_SAFE_NO_PAD};
|
||||||
use chrono::{DateTime, Utc};
|
use chrono::{DateTime, Utc};
|
||||||
use gateway_admin::model::client_keys::{
|
use gateway_admin::model::client_keys::{
|
||||||
ClientKeyBudgetPeriod, ClientKeyCursor, ClientKeyCursorValue as DomainCursorValue,
|
BatchUpdateClientKeys, ClientKeyBudgetPeriod, ClientKeyCursor,
|
||||||
ClientKeyListQuery, ClientKeyMutation, ClientKeyPage, ClientKeyPageSize, ClientKeyRecord,
|
ClientKeyCursorValue as DomainCursorValue, ClientKeyListQuery, ClientKeyMutation,
|
||||||
ClientKeySecret, ClientKeySort as DomainSort, ClientKeySortField as DomainSortField,
|
ClientKeyPage, ClientKeyPageSize, ClientKeyRecord, ClientKeySecret,
|
||||||
CreateClientKey, CreatedClientKey, DeleteClientKey, ResetClientKeyBudget, SetClientKeyEnabled,
|
ClientKeySort as DomainSort, ClientKeySortField as DomainSortField, CreateClientKey,
|
||||||
SortDirection, UpdateClientKey,
|
CreatedClientKey, DeleteClientKey, ResetClientKeyBudget, SetClientKeyEnabled, SortDirection,
|
||||||
|
UpdateClientKey,
|
||||||
};
|
};
|
||||||
use gateway_core::{
|
use gateway_core::{
|
||||||
engine::budget::ClientBudgetLimits,
|
engine::budget::ClientBudgetLimits,
|
||||||
@@ -156,8 +157,6 @@ pub struct CreateClientKeyRequest {
|
|||||||
peer_sharing: gateway_core::policy::ClientPeerSharing,
|
peer_sharing: gateway_core::policy::ClientPeerSharing,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
provider_request_profile_overrides: ProviderRequestProfileOverrides,
|
provider_request_profile_overrides: ProviderRequestProfileOverrides,
|
||||||
openai_client_profile_override: Option<serde_json::Map<String, serde_json::Value>>,
|
|
||||||
xai_client_profile_override: Option<serde_json::Map<String, serde_json::Value>>,
|
|
||||||
custom_key: Option<String>,
|
custom_key: Option<String>,
|
||||||
name: String,
|
name: String,
|
||||||
label: Option<String>,
|
label: Option<String>,
|
||||||
@@ -186,11 +185,8 @@ impl CreateClientKeyRequest {
|
|||||||
let group_ids = validate_group_ids(self.group_ids)?;
|
let group_ids = validate_group_ids(self.group_ids)?;
|
||||||
validate_limit(self.max_concurrency, "maxConcurrency")?;
|
validate_limit(self.max_concurrency, "maxConcurrency")?;
|
||||||
validate_limit(self.requests_per_minute, "requestsPerMinute")?;
|
validate_limit(self.requests_per_minute, "requestsPerMinute")?;
|
||||||
let request_profile_overrides = normalize_request_profile_overrides(
|
let request_profile_overrides =
|
||||||
self.provider_request_profile_overrides,
|
normalize_request_profile_overrides(self.provider_request_profile_overrides)?;
|
||||||
self.openai_client_profile_override,
|
|
||||||
self.xai_client_profile_override,
|
|
||||||
)?;
|
|
||||||
Ok(CreateClientKey {
|
Ok(CreateClientKey {
|
||||||
peer_sharing: self.peer_sharing,
|
peer_sharing: self.peer_sharing,
|
||||||
request_profile_overrides,
|
request_profile_overrides,
|
||||||
@@ -223,10 +219,6 @@ pub struct UpdateClientKeyRequest {
|
|||||||
peer_sharing: Option<gateway_core::policy::ClientPeerSharing>,
|
peer_sharing: Option<gateway_core::policy::ClientPeerSharing>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
provider_request_profile_overrides: ProviderRequestProfileOverrideUpdates,
|
provider_request_profile_overrides: ProviderRequestProfileOverrideUpdates,
|
||||||
#[serde(default, deserialize_with = "deserialize_profile_override")]
|
|
||||||
openai_client_profile_override: Option<Option<serde_json::Map<String, serde_json::Value>>>,
|
|
||||||
#[serde(default, deserialize_with = "deserialize_profile_override")]
|
|
||||||
xai_client_profile_override: Option<Option<serde_json::Map<String, serde_json::Value>>>,
|
|
||||||
id: String,
|
id: String,
|
||||||
name: String,
|
name: String,
|
||||||
label: Option<String>,
|
label: Option<String>,
|
||||||
@@ -246,11 +238,8 @@ impl UpdateClientKeyRequest {
|
|||||||
let group_ids = validate_group_ids(self.group_ids)?;
|
let group_ids = validate_group_ids(self.group_ids)?;
|
||||||
validate_limit(self.max_concurrency, "maxConcurrency")?;
|
validate_limit(self.max_concurrency, "maxConcurrency")?;
|
||||||
validate_limit(self.requests_per_minute, "requestsPerMinute")?;
|
validate_limit(self.requests_per_minute, "requestsPerMinute")?;
|
||||||
let request_profile_override_updates = normalize_request_profile_override_updates(
|
let request_profile_override_updates =
|
||||||
self.provider_request_profile_overrides,
|
normalize_request_profile_override_updates(self.provider_request_profile_overrides)?;
|
||||||
self.openai_client_profile_override,
|
|
||||||
self.xai_client_profile_override,
|
|
||||||
)?;
|
|
||||||
Ok(UpdateClientKey {
|
Ok(UpdateClientKey {
|
||||||
peer_sharing: self.peer_sharing,
|
peer_sharing: self.peer_sharing,
|
||||||
request_profile_override_updates,
|
request_profile_override_updates,
|
||||||
@@ -335,16 +324,54 @@ impl ClientKeyMutationRequest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, PartialEq, Serialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
pub(super) struct ClientBudgetView {
|
||||||
|
daily_limit_usd: String,
|
||||||
|
weekly_limit_usd: String,
|
||||||
|
daily_used_usd: String,
|
||||||
|
weekly_used_usd: String,
|
||||||
|
daily_resets_at: Option<DateTime<Utc>>,
|
||||||
|
daily_resets_at_display: Option<String>,
|
||||||
|
weekly_resets_at: Option<DateTime<Utc>>,
|
||||||
|
weekly_resets_at_display: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl
|
||||||
|
From<(
|
||||||
|
gateway_core::engine::budget::ClientBudgetStatus,
|
||||||
|
crate::time::TimePresenter,
|
||||||
|
)> for ClientBudgetView
|
||||||
|
{
|
||||||
|
fn from(
|
||||||
|
(budget, time): (
|
||||||
|
gateway_core::engine::budget::ClientBudgetStatus,
|
||||||
|
crate::time::TimePresenter,
|
||||||
|
),
|
||||||
|
) -> Self {
|
||||||
|
Self {
|
||||||
|
daily_limit_usd: budget.limits.daily_usd.canonical(),
|
||||||
|
weekly_limit_usd: budget.limits.weekly_usd.canonical(),
|
||||||
|
daily_used_usd: budget.daily_used_usd.canonical(),
|
||||||
|
weekly_used_usd: budget.weekly_used_usd.canonical(),
|
||||||
|
daily_resets_at_display: budget
|
||||||
|
.daily_resets_at()
|
||||||
|
.map(|value| time.datetime(&value.into())),
|
||||||
|
daily_resets_at: budget.daily_resets_at().map(DateTime::from),
|
||||||
|
weekly_resets_at_display: budget
|
||||||
|
.weekly_resets_at()
|
||||||
|
.map(|value| time.datetime(&value.into())),
|
||||||
|
weekly_resets_at: budget.weekly_resets_at().map(DateTime::from),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// 不含完整 Key 的管理端安全视图
|
/// 不含完整 Key 的管理端安全视图
|
||||||
#[derive(Debug, Clone, PartialEq, Serialize)]
|
#[derive(Debug, Clone, PartialEq, Serialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct ClientKeyView {
|
pub struct ClientKeyView {
|
||||||
peer_sharing: gateway_core::policy::ClientPeerSharing,
|
peer_sharing: gateway_core::policy::ClientPeerSharing,
|
||||||
provider_request_profile_overrides: ProviderRequestProfileOverrides,
|
provider_request_profile_overrides: ProviderRequestProfileOverrides,
|
||||||
/// 固定兼容字段;值始终从 provider_request_profile_overrides 派生
|
|
||||||
openai_client_profile_override: Option<serde_json::Map<String, serde_json::Value>>,
|
|
||||||
/// 固定兼容字段;值始终从 provider_request_profile_overrides 派生
|
|
||||||
xai_client_profile_override: Option<serde_json::Map<String, serde_json::Value>>,
|
|
||||||
id: String,
|
id: String,
|
||||||
name: String,
|
name: String,
|
||||||
label: Option<String>,
|
label: Option<String>,
|
||||||
@@ -355,14 +382,8 @@ pub struct ClientKeyView {
|
|||||||
enabled: bool,
|
enabled: bool,
|
||||||
max_concurrency: u64,
|
max_concurrency: u64,
|
||||||
requests_per_minute: u64,
|
requests_per_minute: u64,
|
||||||
daily_limit_usd: String,
|
#[serde(flatten)]
|
||||||
weekly_limit_usd: String,
|
budget: ClientBudgetView,
|
||||||
daily_used_usd: String,
|
|
||||||
weekly_used_usd: String,
|
|
||||||
daily_resets_at: Option<DateTime<Utc>>,
|
|
||||||
daily_resets_at_display: Option<String>,
|
|
||||||
weekly_resets_at: Option<DateTime<Utc>>,
|
|
||||||
weekly_resets_at_display: Option<String>,
|
|
||||||
created_at: DateTime<Utc>,
|
created_at: DateTime<Utc>,
|
||||||
created_at_display: String,
|
created_at_display: String,
|
||||||
updated_at: DateTime<Utc>,
|
updated_at: DateTime<Utc>,
|
||||||
@@ -385,10 +406,6 @@ impl From<(ClientKeyRecord, crate::time::TimePresenter)> for ClientKeyView {
|
|||||||
.map(|(provider, profile)| (provider.as_str().to_owned(), profile.into_inner()))
|
.map(|(provider, profile)| (provider.as_str().to_owned(), profile.into_inner()))
|
||||||
.collect::<ProviderRequestProfileOverrides>();
|
.collect::<ProviderRequestProfileOverrides>();
|
||||||
Self {
|
Self {
|
||||||
openai_client_profile_override: provider_request_profile_overrides
|
|
||||||
.get("openai")
|
|
||||||
.cloned(),
|
|
||||||
xai_client_profile_override: provider_request_profile_overrides.get("xai").cloned(),
|
|
||||||
provider_request_profile_overrides,
|
provider_request_profile_overrides,
|
||||||
peer_sharing: record.peer_sharing,
|
peer_sharing: record.peer_sharing,
|
||||||
id: record.id.to_string(),
|
id: record.id.to_string(),
|
||||||
@@ -409,20 +426,7 @@ impl From<(ClientKeyRecord, crate::time::TimePresenter)> for ClientKeyView {
|
|||||||
enabled: record.enabled,
|
enabled: record.enabled,
|
||||||
max_concurrency: record.limits.max_concurrency,
|
max_concurrency: record.limits.max_concurrency,
|
||||||
requests_per_minute: record.limits.requests_per_minute,
|
requests_per_minute: record.limits.requests_per_minute,
|
||||||
daily_limit_usd: record.budget.limits.daily_usd.canonical(),
|
budget: ClientBudgetView::from((record.budget, time)),
|
||||||
weekly_limit_usd: record.budget.limits.weekly_usd.canonical(),
|
|
||||||
daily_used_usd: record.budget.daily_used_usd.canonical(),
|
|
||||||
weekly_used_usd: record.budget.weekly_used_usd.canonical(),
|
|
||||||
daily_resets_at_display: record
|
|
||||||
.budget
|
|
||||||
.daily_resets_at()
|
|
||||||
.map(|value| time.datetime(&value.into())),
|
|
||||||
daily_resets_at: record.budget.daily_resets_at().map(DateTime::from),
|
|
||||||
weekly_resets_at_display: record
|
|
||||||
.budget
|
|
||||||
.weekly_resets_at()
|
|
||||||
.map(|value| time.datetime(&value.into())),
|
|
||||||
weekly_resets_at: record.budget.weekly_resets_at().map(DateTime::from),
|
|
||||||
created_at_display: time.datetime(&record.created_at),
|
created_at_display: time.datetime(&record.created_at),
|
||||||
created_at: record.created_at,
|
created_at: record.created_at,
|
||||||
updated_at_display: time.datetime(&record.updated_at),
|
updated_at_display: time.datetime(&record.updated_at),
|
||||||
@@ -739,11 +743,9 @@ fn validate_limit(value: u64, field: &'static str) -> Result<(), WireValidationE
|
|||||||
|
|
||||||
fn normalize_request_profile_overrides(
|
fn normalize_request_profile_overrides(
|
||||||
profiles: ProviderRequestProfileOverrides,
|
profiles: ProviderRequestProfileOverrides,
|
||||||
openai: Option<serde_json::Map<String, serde_json::Value>>,
|
|
||||||
xai: Option<serde_json::Map<String, serde_json::Value>>,
|
|
||||||
) -> Result<gateway_admin::model::client_keys::ProviderRequestProfileOverrides, WireValidationError>
|
) -> Result<gateway_admin::model::client_keys::ProviderRequestProfileOverrides, WireValidationError>
|
||||||
{
|
{
|
||||||
let mut normalized = profiles
|
profiles
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|(provider, profile)| {
|
.map(|(provider, profile)| {
|
||||||
if !matches!(provider.as_str(), "openai" | "xai") {
|
if !matches!(provider.as_str(), "openai" | "xai") {
|
||||||
@@ -756,35 +758,16 @@ fn normalize_request_profile_overrides(
|
|||||||
gateway_core::account::OpaqueProviderData::new(profile),
|
gateway_core::account::OpaqueProviderData::new(profile),
|
||||||
))
|
))
|
||||||
})
|
})
|
||||||
.collect::<Result<gateway_admin::model::client_keys::ProviderRequestProfileOverrides, _>>(
|
.collect()
|
||||||
)?;
|
|
||||||
for (provider, profile) in [("openai", openai), ("xai", xai)] {
|
|
||||||
let Some(profile) = profile else {
|
|
||||||
continue;
|
|
||||||
};
|
|
||||||
validate_request_profile_size(&profile)?;
|
|
||||||
let provider = ProviderKind::new(provider).expect("static Provider kind is valid");
|
|
||||||
let profile = gateway_core::account::OpaqueProviderData::new(profile);
|
|
||||||
if normalized
|
|
||||||
.get(&provider)
|
|
||||||
.is_some_and(|current| current != &profile)
|
|
||||||
{
|
|
||||||
return Err(WireValidationError::new("providerRequestProfileOverrides"));
|
|
||||||
}
|
|
||||||
normalized.insert(provider, profile);
|
|
||||||
}
|
|
||||||
Ok(normalized)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn normalize_request_profile_override_updates(
|
fn normalize_request_profile_override_updates(
|
||||||
profiles: ProviderRequestProfileOverrideUpdates,
|
profiles: ProviderRequestProfileOverrideUpdates,
|
||||||
openai: Option<Option<serde_json::Map<String, serde_json::Value>>>,
|
|
||||||
xai: Option<Option<serde_json::Map<String, serde_json::Value>>>,
|
|
||||||
) -> Result<
|
) -> Result<
|
||||||
gateway_admin::model::client_keys::ProviderRequestProfileOverrideUpdates,
|
gateway_admin::model::client_keys::ProviderRequestProfileOverrideUpdates,
|
||||||
WireValidationError,
|
WireValidationError,
|
||||||
> {
|
> {
|
||||||
let mut normalized = profiles
|
profiles
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|(provider, profile)| {
|
.map(|(provider, profile)| {
|
||||||
if !matches!(provider.as_str(), "openai" | "xai") {
|
if !matches!(provider.as_str(), "openai" | "xai") {
|
||||||
@@ -794,34 +777,12 @@ fn normalize_request_profile_override_updates(
|
|||||||
validate_request_profile_size(profile)?;
|
validate_request_profile_size(profile)?;
|
||||||
}
|
}
|
||||||
Ok((
|
Ok((
|
||||||
ProviderKind::new(provider).map_err(|_| {
|
ProviderKind::new(provider)
|
||||||
WireValidationError::new("providerRequestProfileOverrides")
|
.map_err(|_| WireValidationError::new("providerRequestProfileOverrides"))?,
|
||||||
})?,
|
|
||||||
profile.map(gateway_core::account::OpaqueProviderData::new),
|
profile.map(gateway_core::account::OpaqueProviderData::new),
|
||||||
))
|
))
|
||||||
})
|
})
|
||||||
.collect::<Result<
|
.collect()
|
||||||
gateway_admin::model::client_keys::ProviderRequestProfileOverrideUpdates,
|
|
||||||
_,
|
|
||||||
>>()?;
|
|
||||||
for (provider, profile) in [("openai", openai), ("xai", xai)] {
|
|
||||||
let Some(profile) = profile else {
|
|
||||||
continue;
|
|
||||||
};
|
|
||||||
if let Some(profile) = profile.as_ref() {
|
|
||||||
validate_request_profile_size(profile)?;
|
|
||||||
}
|
|
||||||
let provider = ProviderKind::new(provider).expect("static Provider kind is valid");
|
|
||||||
let profile = profile.map(gateway_core::account::OpaqueProviderData::new);
|
|
||||||
if normalized
|
|
||||||
.get(&provider)
|
|
||||||
.is_some_and(|current| current != &profile)
|
|
||||||
{
|
|
||||||
return Err(WireValidationError::new("providerRequestProfileOverrides"));
|
|
||||||
}
|
|
||||||
normalized.insert(provider, profile);
|
|
||||||
}
|
|
||||||
Ok(normalized)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn validate_request_profile_size(
|
fn validate_request_profile_size(
|
||||||
@@ -866,7 +827,12 @@ where
|
|||||||
S: SessionState + Clone + Send + Sync + 'static,
|
S: SessionState + Clone + Send + Sync + 'static,
|
||||||
{
|
{
|
||||||
Router::new()
|
Router::new()
|
||||||
|
.merge(super::client_key_usage::router::<S>())
|
||||||
.route("/api/admin/client-keys", get(list_client_keys::<S>))
|
.route("/api/admin/client-keys", get(list_client_keys::<S>))
|
||||||
|
.route(
|
||||||
|
"/api/admin/client-keys/batch-update",
|
||||||
|
post(batch_update_client_keys::<S>),
|
||||||
|
)
|
||||||
.route(
|
.route(
|
||||||
"/api/admin/client-keys/create",
|
"/api/admin/client-keys/create",
|
||||||
post(create_client_key::<S>),
|
post(create_client_key::<S>),
|
||||||
@@ -913,6 +879,94 @@ where
|
|||||||
Ok(AdminResponse::new(StatusCode::OK, AdminEnvelope::ok(data)))
|
Ok(AdminResponse::new(StatusCode::OK, AdminEnvelope::ok(data)))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Deserialize)]
|
||||||
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
|
pub struct BatchUpdateClientKeysRequest {
|
||||||
|
ids: Vec<String>,
|
||||||
|
group_ids: Option<Vec<String>>,
|
||||||
|
enabled: Option<bool>,
|
||||||
|
max_concurrency: Option<u64>,
|
||||||
|
requests_per_minute: Option<u64>,
|
||||||
|
daily_limit_usd: Option<String>,
|
||||||
|
weekly_limit_usd: Option<String>,
|
||||||
|
peer_sharing: Option<gateway_admin::model::client_keys::ClientPeerSharingPatch>,
|
||||||
|
#[serde(default)]
|
||||||
|
provider_request_profile_overrides: ProviderRequestProfileOverrideUpdates,
|
||||||
|
installation_seed: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl BatchUpdateClientKeysRequest {
|
||||||
|
/// 复用单把密钥的字段校验,缺省和显式零值分别保留
|
||||||
|
pub fn into_command(self) -> Result<BatchUpdateClientKeys, WireValidationError> {
|
||||||
|
if let Some(limit) = self.max_concurrency {
|
||||||
|
validate_limit(limit, "maxConcurrency")?;
|
||||||
|
}
|
||||||
|
if let Some(limit) = self.requests_per_minute {
|
||||||
|
validate_limit(limit, "requestsPerMinute")?;
|
||||||
|
}
|
||||||
|
let installation_seed = self
|
||||||
|
.installation_seed
|
||||||
|
.map(|value| {
|
||||||
|
if value.len() != uuid::fmt::Hyphenated::LENGTH {
|
||||||
|
return Err(WireValidationError::new("installationSeed"));
|
||||||
|
}
|
||||||
|
uuid::Uuid::try_parse(&value)
|
||||||
|
.map_err(|_| WireValidationError::new("installationSeed"))
|
||||||
|
})
|
||||||
|
.transpose()?;
|
||||||
|
Ok(BatchUpdateClientKeys {
|
||||||
|
ids: self
|
||||||
|
.ids
|
||||||
|
.into_iter()
|
||||||
|
.map(|id| client_key_id(id, "id"))
|
||||||
|
.collect::<Result<_, _>>()?,
|
||||||
|
group_ids: self.group_ids.map(validate_group_ids).transpose()?,
|
||||||
|
enabled: self.enabled,
|
||||||
|
max_concurrency: self.max_concurrency,
|
||||||
|
requests_per_minute: self.requests_per_minute,
|
||||||
|
daily_limit_usd: parse_budget(self.daily_limit_usd, "dailyLimitUsd")?,
|
||||||
|
weekly_limit_usd: parse_budget(self.weekly_limit_usd, "weeklyLimitUsd")?,
|
||||||
|
peer_sharing: self.peer_sharing.unwrap_or_default(),
|
||||||
|
request_profile_override_updates: normalize_request_profile_override_updates(
|
||||||
|
self.provider_request_profile_overrides,
|
||||||
|
)?,
|
||||||
|
installation_seed,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize)]
|
||||||
|
#[serde(rename_all = "camelCase")]
|
||||||
|
struct BatchUpdatedClientKeysData {
|
||||||
|
config_revision: gateway_admin::model::Revision,
|
||||||
|
updated: usize,
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn batch_update_client_keys<S>(
|
||||||
|
auth: AdminAuth,
|
||||||
|
State(state): State<S>,
|
||||||
|
AdminJson(request): AdminJson<BatchUpdateClientKeysRequest>,
|
||||||
|
) -> Result<impl IntoResponse, AdminError>
|
||||||
|
where
|
||||||
|
S: SessionState + Send + Sync,
|
||||||
|
{
|
||||||
|
let command = request.into_command().map_err(map_wire_error)?;
|
||||||
|
let updated = command.ids.len();
|
||||||
|
let config_revision = state
|
||||||
|
.admin_services()
|
||||||
|
.client_keys()
|
||||||
|
.batch_update(&auth.context().mutation_context(), command)
|
||||||
|
.await
|
||||||
|
.map_err(map_service_error)?;
|
||||||
|
Ok(AdminResponse::new(
|
||||||
|
StatusCode::OK,
|
||||||
|
AdminEnvelope::ok(BatchUpdatedClientKeysData {
|
||||||
|
config_revision,
|
||||||
|
updated,
|
||||||
|
}),
|
||||||
|
))
|
||||||
|
}
|
||||||
|
|
||||||
async fn create_client_key<S>(
|
async fn create_client_key<S>(
|
||||||
auth: AdminAuth,
|
auth: AdminAuth,
|
||||||
State(state): State<S>,
|
State(state): State<S>,
|
||||||
@@ -1087,12 +1141,13 @@ fn map_wire_error(error: WireValidationError) -> AdminError {
|
|||||||
"requestsPerMinute" => "每分钟请求上限超出支持范围",
|
"requestsPerMinute" => "每分钟请求上限超出支持范围",
|
||||||
"dailyLimitUsd" => "每日美元限额须非负,整数和小数各最多 10 位",
|
"dailyLimitUsd" => "每日美元限额须非负,整数和小数各最多 10 位",
|
||||||
"weeklyLimitUsd" => "每周美元限额须非负,整数和小数各最多 10 位",
|
"weeklyLimitUsd" => "每周美元限额须非负,整数和小数各最多 10 位",
|
||||||
"providerRequestProfileOverrides" => "API Key 客户端身份配置无效或字段冲突",
|
"providerRequestProfileOverrides" => "API Key 客户端身份配置无效",
|
||||||
|
"installationSeed" => "安装身份种子必须是带连字符的 UUID",
|
||||||
"limit" => "每页数量须为 1 至 65535",
|
"limit" => "每页数量须为 1 至 65535",
|
||||||
"search" => "搜索内容过长或包含控制字符",
|
"search" => "搜索内容过长或包含控制字符",
|
||||||
"sortBy" => "排序字段不受支持",
|
"sortBy" => "排序字段不受支持",
|
||||||
"sortDirection" => "排序方向必须为 asc(升序)或 desc(降序)",
|
"sortDirection" => "排序方向必须为 asc(升序)或 desc(降序)",
|
||||||
_ => "API Key 请求参数不合法",
|
field => return AdminError::bad_request(format!("{field} 字段不合法")),
|
||||||
};
|
};
|
||||||
AdminError::bad_request(message)
|
AdminError::bad_request(message)
|
||||||
}
|
}
|
||||||
@@ -1100,10 +1155,3 @@ fn map_wire_error(error: WireValidationError) -> AdminError {
|
|||||||
fn map_service_error(error: gateway_admin::model::AdminError) -> AdminError {
|
fn map_service_error(error: gateway_admin::model::AdminError) -> AdminError {
|
||||||
map_admin_service_error(error)
|
map_admin_service_error(error)
|
||||||
}
|
}
|
||||||
|
|
||||||
// 省略表示不修改,null 表示恢复跟随通用设置
|
|
||||||
fn deserialize_profile_override<'de, D: serde::Deserializer<'de>>(
|
|
||||||
deserializer: D,
|
|
||||||
) -> Result<Option<Option<serde_json::Map<String, serde_json::Value>>>, D::Error> {
|
|
||||||
Option::<serde_json::Map<String, serde_json::Value>>::deserialize(deserializer).map(Some)
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ pub mod account_groups;
|
|||||||
pub mod accounts;
|
pub mod accounts;
|
||||||
pub mod auth;
|
pub mod auth;
|
||||||
pub mod backups;
|
pub mod backups;
|
||||||
|
mod client_key_usage;
|
||||||
pub mod client_keys;
|
pub mod client_keys;
|
||||||
mod compression;
|
mod compression;
|
||||||
pub(crate) mod diagnostics;
|
pub(crate) mod diagnostics;
|
||||||
|
|||||||
@@ -925,25 +925,9 @@ pub(crate) fn dashboard_view(
|
|||||||
.filter(|window| window.used_percent.is_none())
|
.filter(|window| window.used_percent.is_none())
|
||||||
.and_then(|window| window.local_usage.as_ref())
|
.and_then(|window| window.local_usage.as_ref())
|
||||||
.map(|usage| usage.request_count);
|
.map(|usage| usage.request_count);
|
||||||
let (metric, metric_value_raw, metric_label, metric_value) = match local_requests {
|
let (metric, metric_value_raw) = match local_requests {
|
||||||
Some(count) => (
|
Some(count) => (DashboardAccountMetric::Requests, Some(count)),
|
||||||
DashboardAccountMetric::Requests,
|
None => (DashboardAccountMetric::Tokens, credential.total_tokens),
|
||||||
Some(count),
|
|
||||||
"次数".to_owned(),
|
|
||||||
if count > 0 {
|
|
||||||
format_compact_number(count)
|
|
||||||
} else {
|
|
||||||
"—".to_owned()
|
|
||||||
},
|
|
||||||
),
|
|
||||||
None => (
|
|
||||||
DashboardAccountMetric::Tokens,
|
|
||||||
credential.total_tokens,
|
|
||||||
"今日 Token".to_owned(),
|
|
||||||
credential
|
|
||||||
.total_tokens
|
|
||||||
.map_or_else(|| "—".to_owned(), format_compact_number),
|
|
||||||
),
|
|
||||||
};
|
};
|
||||||
account_usage_views.push(DashboardAccountUsageView {
|
account_usage_views.push(DashboardAccountUsageView {
|
||||||
upstream: credential.upstream.map(|info| {
|
upstream: credential.upstream.map(|info| {
|
||||||
@@ -978,13 +962,10 @@ pub(crate) fn dashboard_view(
|
|||||||
.map(|window| crate::admin::accounts::quota_window_view(window, time)),
|
.map(|window| crate::admin::accounts::quota_window_view(window, time)),
|
||||||
metric,
|
metric,
|
||||||
metric_value_raw,
|
metric_value_raw,
|
||||||
metric_label,
|
|
||||||
metric_value,
|
|
||||||
last_used_at: credential.last_used_at,
|
last_used_at: credential.last_used_at,
|
||||||
last_used_relative: credential
|
last_used_relative: credential
|
||||||
.last_used_at
|
.last_used_at
|
||||||
.map(|value| time.relative_view(value, range.end)),
|
.map(|value| time.relative_view(value, range.end)),
|
||||||
last_used: time.relative_optional(credential.last_used_at, range.end),
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
let unavailable_accounts = provider_accounts
|
let unavailable_accounts = provider_accounts
|
||||||
@@ -1410,7 +1391,14 @@ pub(crate) fn map_wire_error(error: WireValidationError) -> AdminError {
|
|||||||
"dimension" => "诊断维度不合法",
|
"dimension" => "诊断维度不合法",
|
||||||
"id" => "用量记录 ID 不能为空",
|
"id" => "用量记录 ID 不能为空",
|
||||||
"cursor" => "观测数据游标不合法",
|
"cursor" => "观测数据游标不合法",
|
||||||
_ => "观测查询参数不合法",
|
"currentPage" => "页码须大于 0",
|
||||||
|
"pageSize" => {
|
||||||
|
return AdminError::bad_request(format!("每页数量须为 1 至 {}", DomainPageSize::MAX));
|
||||||
|
}
|
||||||
|
"status" => "请求状态须为 success、error 或 all",
|
||||||
|
"errorOrigin" => "错误来源须为 proxy、upstream、connection 或 unknown",
|
||||||
|
"errorOriginStatus" => "仅错误请求支持按错误来源筛选",
|
||||||
|
field => return AdminError::bad_request(format!("{field} 字段不合法")),
|
||||||
};
|
};
|
||||||
AdminError::bad_request(message)
|
AdminError::bad_request(message)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,8 +32,9 @@ impl DashboardQuery {
|
|||||||
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
pub struct UsageQuery {
|
pub struct UsageQuery {
|
||||||
pub client_api_key_name: Option<String>,
|
pub client_api_key_name: Option<String>,
|
||||||
pub account_name: Option<String>,
|
pub account_search: Option<String>,
|
||||||
pub status: Option<String>,
|
pub status: Option<String>,
|
||||||
|
pub error_origin: Option<String>,
|
||||||
pub current_page: Option<u32>,
|
pub current_page: Option<u32>,
|
||||||
pub page_size: Option<u16>,
|
pub page_size: Option<u16>,
|
||||||
pub provider: Option<String>,
|
pub provider: Option<String>,
|
||||||
@@ -339,7 +340,7 @@ pub(crate) fn dashboard_today_range(
|
|||||||
pub(crate) fn usage_filter(query: &UsageQuery) -> domain::UsageFilter {
|
pub(crate) fn usage_filter(query: &UsageQuery) -> domain::UsageFilter {
|
||||||
domain::UsageFilter {
|
domain::UsageFilter {
|
||||||
client_api_key_name: non_empty(query.client_api_key_name.clone()),
|
client_api_key_name: non_empty(query.client_api_key_name.clone()),
|
||||||
provider_account_name: non_empty(query.account_name.clone()),
|
provider_account_search: non_empty(query.account_search.clone()),
|
||||||
provider_kind: non_empty(query.provider.clone()),
|
provider_kind: non_empty(query.provider.clone()),
|
||||||
model_contains: non_empty(query.model.clone()),
|
model_contains: non_empty(query.model.clone()),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
@@ -354,11 +355,21 @@ pub(crate) fn usage_command(
|
|||||||
let page_size_value =
|
let page_size_value =
|
||||||
DomainPageSize::new(page_size).map_err(|_| WireValidationError::new("pageSize"))?;
|
DomainPageSize::new(page_size).map_err(|_| WireValidationError::new("pageSize"))?;
|
||||||
Ok(domain::UsageQuery {
|
Ok(domain::UsageQuery {
|
||||||
status: match query.status.as_deref() {
|
status: match (query.status.as_deref(), query.error_origin.as_deref()) {
|
||||||
None | Some("success") => domain::UsageRecordStatus::Success,
|
(None | Some("success"), None) => domain::UsageRecordStatus::Success,
|
||||||
Some("error") => domain::UsageRecordStatus::Error,
|
(Some("all"), None) => domain::UsageRecordStatus::All,
|
||||||
Some("all") => domain::UsageRecordStatus::All,
|
(Some("error"), origin) => domain::UsageRecordStatus::Error(match origin {
|
||||||
Some(_) => return Err(WireValidationError::new("status")),
|
None => None,
|
||||||
|
Some("proxy") => Some(domain::UsageErrorOrigin::Proxy),
|
||||||
|
Some("upstream") => Some(domain::UsageErrorOrigin::Upstream),
|
||||||
|
Some("connection") => Some(domain::UsageErrorOrigin::Connection),
|
||||||
|
Some("unknown") => Some(domain::UsageErrorOrigin::Unknown),
|
||||||
|
Some(_) => return Err(WireValidationError::new("errorOrigin")),
|
||||||
|
}),
|
||||||
|
(None | Some("success" | "all"), Some(_)) => {
|
||||||
|
return Err(WireValidationError::new("errorOriginStatus"));
|
||||||
|
}
|
||||||
|
(Some(_), _) => return Err(WireValidationError::new("status")),
|
||||||
},
|
},
|
||||||
range: usage_range(
|
range: usage_range(
|
||||||
query.start_time.as_deref(),
|
query.start_time.as_deref(),
|
||||||
|
|||||||
@@ -447,11 +447,8 @@ pub struct DashboardAccountUsageView {
|
|||||||
pub usage_window: Option<crate::admin::accounts::AccountQuotaWindowView>,
|
pub usage_window: Option<crate::admin::accounts::AccountQuotaWindowView>,
|
||||||
pub metric: DashboardAccountMetric,
|
pub metric: DashboardAccountMetric,
|
||||||
pub metric_value_raw: Option<u64>,
|
pub metric_value_raw: Option<u64>,
|
||||||
pub metric_label: String,
|
|
||||||
pub metric_value: String,
|
|
||||||
pub last_used_at: Option<DateTime<Utc>>,
|
pub last_used_at: Option<DateTime<Utc>>,
|
||||||
pub last_used_relative: Option<crate::time::RelativeTimeView>,
|
pub last_used_relative: Option<crate::time::RelativeTimeView>,
|
||||||
pub last_used: String,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Provider 账号池的持久事实汇总
|
/// Provider 账号池的持久事实汇总
|
||||||
|
|||||||
@@ -20,9 +20,24 @@ use serde::{Deserialize, Serialize};
|
|||||||
|
|
||||||
use super::{
|
use super::{
|
||||||
AdminAuth, AdminEnvelope, AdminError, AdminJson, AdminQuery, AdminResponse, PageMeta,
|
AdminAuth, AdminEnvelope, AdminError, AdminJson, AdminQuery, AdminResponse, PageMeta,
|
||||||
accounts::{AccountGroupRefView, AccountProxyUpdate},
|
accounts::AccountGroupRefView,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
struct ProxyUrl(Option<gateway_core::account::OutboundProxy>);
|
||||||
|
|
||||||
|
impl<'de> Deserialize<'de> for ProxyUrl {
|
||||||
|
fn deserialize<D: serde::Deserializer<'de>>(deserializer: D) -> Result<Self, D::Error> {
|
||||||
|
let value = String::deserialize(deserializer)?;
|
||||||
|
if value.is_empty() {
|
||||||
|
return Ok(Self(None));
|
||||||
|
}
|
||||||
|
gateway_core::account::OutboundProxy::parse(&value)
|
||||||
|
.map(|proxy| Self(Some(proxy)))
|
||||||
|
.map_err(serde::de::Error::custom)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
struct ListQuery {
|
struct ListQuery {
|
||||||
@@ -56,7 +71,7 @@ struct CreateRequest {
|
|||||||
auto_location: bool,
|
auto_location: bool,
|
||||||
location: Option<gateway_core::account::RequestLocation>,
|
location: Option<gateway_core::account::RequestLocation>,
|
||||||
name: String,
|
name: String,
|
||||||
proxy_url: AccountProxyUpdate,
|
proxy_url: ProxyUrl,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
@@ -70,7 +85,7 @@ struct UpdateRequest {
|
|||||||
id: String,
|
id: String,
|
||||||
revision: u64,
|
revision: u64,
|
||||||
name: String,
|
name: String,
|
||||||
proxy_url: Option<AccountProxyUpdate>,
|
proxy_url: Option<ProxyUrl>,
|
||||||
}
|
}
|
||||||
|
|
||||||
fn deserialize_location_update<'de, D>(
|
fn deserialize_location_update<'de, D>(
|
||||||
@@ -101,9 +116,11 @@ struct TestRequest {
|
|||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
#[serde(rename_all = "camelCase", deny_unknown_fields)]
|
||||||
struct ProbeRequest {
|
struct ProbeRequest {
|
||||||
|
#[serde(default)]
|
||||||
|
use_deployment_proxy: bool,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
detect_location: bool,
|
detect_location: bool,
|
||||||
proxy_url: AccountProxyUpdate,
|
proxy_url: ProxyUrl,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize)]
|
||||||
@@ -537,10 +554,21 @@ async fn probe<S>(
|
|||||||
where
|
where
|
||||||
S: SessionState + Send + Sync,
|
S: SessionState + Send + Sync,
|
||||||
{
|
{
|
||||||
|
use gateway_admin::ports::proxy::ProbeRoute;
|
||||||
|
let route = match (request.proxy_url.0.as_ref(), request.use_deployment_proxy) {
|
||||||
|
(Some(_), true) => {
|
||||||
|
return Err(AdminError::bad_request(
|
||||||
|
"指定代理地址时不能同时选择部署默认出口",
|
||||||
|
));
|
||||||
|
}
|
||||||
|
(Some(proxy), false) => ProbeRoute::Proxy(proxy),
|
||||||
|
(None, true) => ProbeRoute::Deployment,
|
||||||
|
(None, false) => ProbeRoute::Direct,
|
||||||
|
};
|
||||||
let result = state
|
let result = state
|
||||||
.admin_services()
|
.admin_services()
|
||||||
.proxies()
|
.proxies()
|
||||||
.probe(request.proxy_url.0.as_ref(), request.detect_location)
|
.probe(route, request.detect_location)
|
||||||
.await
|
.await
|
||||||
.map_err(map_error)?;
|
.map_err(map_error)?;
|
||||||
Ok(AdminResponse::new(
|
Ok(AdminResponse::new(
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
//! Runtime settings、旧设置页聚合投影与明文 Admin API Key wire
|
//! 管理端运行设置、模型定价与 Admin API Key 的 HTTP 接口
|
||||||
|
|
||||||
use crate::auth::SessionState;
|
use crate::auth::SessionState;
|
||||||
|
|
||||||
@@ -36,6 +36,8 @@ pub type ProviderRequestProfileUpdates =
|
|||||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
|
||||||
#[serde(rename_all = "camelCase")]
|
#[serde(rename_all = "camelCase")]
|
||||||
pub struct RuntimeSettingsFields {
|
pub struct RuntimeSettingsFields {
|
||||||
|
pub openai_oauth_guardian_review_model: bool,
|
||||||
|
pub openai_request_country: gateway_core::account::OpenAiRequestCountry,
|
||||||
pub codex_privacy_policy: gateway_core::settings::privacy::CodexPrivacyPolicy,
|
pub codex_privacy_policy: gateway_core::settings::privacy::CodexPrivacyPolicy,
|
||||||
pub request_location_enabled: bool,
|
pub request_location_enabled: bool,
|
||||||
pub request_location: gateway_core::account::RequestLocation,
|
pub request_location: gateway_core::account::RequestLocation,
|
||||||
@@ -54,6 +56,7 @@ pub struct RuntimeSettingsFields {
|
|||||||
pub openai_session_affinity_ttl_hours: u32,
|
pub openai_session_affinity_ttl_hours: u32,
|
||||||
pub responses_max_decompressed_body_bytes: u64,
|
pub responses_max_decompressed_body_bytes: u64,
|
||||||
pub smart_scheduling: gateway_core::account::SmartSchedulingConfig,
|
pub smart_scheduling: gateway_core::account::SmartSchedulingConfig,
|
||||||
|
pub quota_reset_window_weights: gateway_core::account::ResetWindowWeights,
|
||||||
pub min_codex_desktop_version: Option<String>,
|
pub min_codex_desktop_version: Option<String>,
|
||||||
pub min_codex_cli_version: Option<String>,
|
pub min_codex_cli_version: Option<String>,
|
||||||
pub usage_retention_days: u64,
|
pub usage_retention_days: u64,
|
||||||
@@ -63,7 +66,6 @@ pub struct RuntimeSettingsFields {
|
|||||||
pub account_warmup_enabled: bool,
|
pub account_warmup_enabled: bool,
|
||||||
pub account_warmup_cron: String,
|
pub account_warmup_cron: String,
|
||||||
pub account_warmup_model: Option<String>,
|
pub account_warmup_model: Option<String>,
|
||||||
#[serde(default)]
|
|
||||||
pub reset_credit_on_low_weekly_quota: bool,
|
pub reset_credit_on_low_weekly_quota: bool,
|
||||||
pub reset_credit_lead_minutes: u32,
|
pub reset_credit_lead_minutes: u32,
|
||||||
pub reset_credit_max_weekly_remaining_percent: Option<u32>,
|
pub reset_credit_max_weekly_remaining_percent: Option<u32>,
|
||||||
@@ -77,11 +79,8 @@ pub struct RuntimeSettingsView {
|
|||||||
pub values: RuntimeSettingsFields,
|
pub values: RuntimeSettingsFields,
|
||||||
pub config_revision: u64,
|
pub config_revision: u64,
|
||||||
pub smart_scheduling_defaults: gateway_core::account::SmartSchedulingConfig,
|
pub smart_scheduling_defaults: gateway_core::account::SmartSchedulingConfig,
|
||||||
|
pub quota_reset_window_weights_defaults: gateway_core::account::ResetWindowWeights,
|
||||||
pub provider_request_profiles: ProviderRequestProfiles,
|
pub provider_request_profiles: ProviderRequestProfiles,
|
||||||
/// 固定兼容字段;值始终从 provider_request_profiles 派生
|
|
||||||
pub openai_client_profile: Option<serde_json::Map<String, serde_json::Value>>,
|
|
||||||
/// 固定兼容字段;值始终从 provider_request_profiles 派生
|
|
||||||
pub xai_client_profile: Option<serde_json::Map<String, serde_json::Value>>,
|
|
||||||
pub model_mappings: ModelMappings,
|
pub model_mappings: ModelMappings,
|
||||||
pub rotation_strategy: String,
|
pub rotation_strategy: String,
|
||||||
pub updated_at: DateTime<Utc>,
|
pub updated_at: DateTime<Utc>,
|
||||||
@@ -97,12 +96,6 @@ pub struct UpdateRuntimeSettingsRequest {
|
|||||||
pub config_revision: u64,
|
pub config_revision: u64,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub provider_request_profiles: ProviderRequestProfileUpdates,
|
pub provider_request_profiles: ProviderRequestProfileUpdates,
|
||||||
/// 兼容既有 wire;与泛化字段冲突时拒绝整个请求
|
|
||||||
#[serde(default, deserialize_with = "deserialize_profile_update")]
|
|
||||||
pub openai_client_profile: Option<serde_json::Map<String, serde_json::Value>>,
|
|
||||||
/// 兼容既有 wire;与泛化字段冲突时拒绝整个请求
|
|
||||||
#[serde(default, deserialize_with = "deserialize_profile_update")]
|
|
||||||
pub xai_client_profile: Option<serde_json::Map<String, serde_json::Value>>,
|
|
||||||
pub model_mappings: ModelMappings,
|
pub model_mappings: ModelMappings,
|
||||||
pub rotation_strategy: String,
|
pub rotation_strategy: String,
|
||||||
}
|
}
|
||||||
@@ -119,11 +112,8 @@ impl UpdateRuntimeSettingsRequest {
|
|||||||
|
|
||||||
fn into_command(self) -> Result<ReplaceRuntimeSettings, WireValidationError> {
|
fn into_command(self) -> Result<ReplaceRuntimeSettings, WireValidationError> {
|
||||||
validate_model_mappings(&self.model_mappings)?;
|
validate_model_mappings(&self.model_mappings)?;
|
||||||
let request_profile_updates = normalize_request_profile_updates(
|
let request_profile_updates =
|
||||||
self.provider_request_profiles,
|
normalize_request_profile_updates(self.provider_request_profiles)?;
|
||||||
self.openai_client_profile,
|
|
||||||
self.xai_client_profile,
|
|
||||||
)?;
|
|
||||||
Ok(ReplaceRuntimeSettings {
|
Ok(ReplaceRuntimeSettings {
|
||||||
expected_revision: gateway_admin::model::Revision::new(self.config_revision)
|
expected_revision: gateway_admin::model::Revision::new(self.config_revision)
|
||||||
.map_err(|_| WireValidationError::new("configRevision"))?,
|
.map_err(|_| WireValidationError::new("configRevision"))?,
|
||||||
@@ -145,11 +135,11 @@ impl From<(RuntimeSettings, crate::time::TimePresenter)> for RuntimeSettingsView
|
|||||||
.collect::<ProviderRequestProfiles>();
|
.collect::<ProviderRequestProfiles>();
|
||||||
Self {
|
Self {
|
||||||
config_revision: settings.config_revision.get(),
|
config_revision: settings.config_revision.get(),
|
||||||
openai_client_profile: provider_request_profiles.get("openai").cloned(),
|
|
||||||
xai_client_profile: provider_request_profiles.get("xai").cloned(),
|
|
||||||
provider_request_profiles,
|
provider_request_profiles,
|
||||||
model_mappings: wire_model_mappings(settings.model_mappings),
|
model_mappings: wire_model_mappings(settings.model_mappings),
|
||||||
smart_scheduling_defaults: gateway_core::account::SmartSchedulingConfig::default(),
|
smart_scheduling_defaults: gateway_core::account::SmartSchedulingConfig::default(),
|
||||||
|
quota_reset_window_weights_defaults: gateway_core::account::ResetWindowWeights::default(
|
||||||
|
),
|
||||||
rotation_strategy: settings.rotation_strategy.as_str().to_owned(),
|
rotation_strategy: settings.rotation_strategy.as_str().to_owned(),
|
||||||
updated_at_display: time.datetime(&settings.updated_at),
|
updated_at_display: time.datetime(&settings.updated_at),
|
||||||
updated_at: settings.updated_at,
|
updated_at: settings.updated_at,
|
||||||
@@ -591,8 +581,9 @@ fn map_wire_error(error: WireValidationError) -> AdminError {
|
|||||||
"settingsUsageRetentionOverflow" => "用量记录保留天数不合法".to_owned(),
|
"settingsUsageRetentionOverflow" => "用量记录保留天数不合法".to_owned(),
|
||||||
"settingsOpsRetentionOverflow" => "运维事件保留天数不合法".to_owned(),
|
"settingsOpsRetentionOverflow" => "运维事件保留天数不合法".to_owned(),
|
||||||
"settingsAuditRetentionOverflow" => "审计记录保留天数不合法".to_owned(),
|
"settingsAuditRetentionOverflow" => "审计记录保留天数不合法".to_owned(),
|
||||||
|
"openaiRequestCountry" => "自定义请求国家必须是两位大写 ASCII 字母".to_owned(),
|
||||||
"requestLocation" => "请求位置的国家代码、地区或城市不合法".to_owned(),
|
"requestLocation" => "请求位置的国家代码、地区或城市不合法".to_owned(),
|
||||||
"providerRequestProfiles" => "服务商客户端身份配置无效或字段冲突".to_owned(),
|
"providerRequestProfiles" => "服务商客户端身份配置无效".to_owned(),
|
||||||
"minCodexDesktopVersion" => "Codex Desktop 最低版本格式不合法".to_owned(),
|
"minCodexDesktopVersion" => "Codex Desktop 最低版本格式不合法".to_owned(),
|
||||||
"minCodexCliVersion" => "Codex CLI 最低版本格式不合法".to_owned(),
|
"minCodexCliVersion" => "Codex CLI 最低版本格式不合法".to_owned(),
|
||||||
field => format!("{field} 字段不合法"),
|
field => format!("{field} 字段不合法"),
|
||||||
@@ -606,10 +597,8 @@ fn map_service_error(error: gateway_admin::model::AdminError) -> AdminError {
|
|||||||
|
|
||||||
fn normalize_request_profile_updates(
|
fn normalize_request_profile_updates(
|
||||||
profiles: ProviderRequestProfileUpdates,
|
profiles: ProviderRequestProfileUpdates,
|
||||||
openai: Option<serde_json::Map<String, serde_json::Value>>,
|
|
||||||
xai: Option<serde_json::Map<String, serde_json::Value>>,
|
|
||||||
) -> Result<gateway_admin::model::settings::ProviderRequestProfileUpdates, WireValidationError> {
|
) -> Result<gateway_admin::model::settings::ProviderRequestProfileUpdates, WireValidationError> {
|
||||||
let mut normalized = profiles
|
profiles
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|(provider, profile)| {
|
.map(|(provider, profile)| {
|
||||||
if !matches!(provider.as_str(), "openai" | "xai") {
|
if !matches!(provider.as_str(), "openai" | "xai") {
|
||||||
@@ -622,30 +611,7 @@ fn normalize_request_profile_updates(
|
|||||||
profile.map(gateway_core::account::OpaqueProviderData::new),
|
profile.map(gateway_core::account::OpaqueProviderData::new),
|
||||||
))
|
))
|
||||||
})
|
})
|
||||||
.collect::<Result<gateway_admin::model::settings::ProviderRequestProfileUpdates, _>>()?;
|
.collect()
|
||||||
for (provider, profile) in [("openai", openai), ("xai", xai)] {
|
|
||||||
let Some(profile) = profile else {
|
|
||||||
continue;
|
|
||||||
};
|
|
||||||
let provider = gateway_core::routing::ProviderKind::new(provider)
|
|
||||||
.expect("static Provider kind is valid");
|
|
||||||
let profile = gateway_core::account::OpaqueProviderData::new(profile);
|
|
||||||
if normalized
|
|
||||||
.get(&provider)
|
|
||||||
.is_some_and(|current| current.as_ref() != Some(&profile))
|
|
||||||
{
|
|
||||||
return Err(WireValidationError::new("providerRequestProfiles"));
|
|
||||||
}
|
|
||||||
normalized.insert(provider, Some(profile));
|
|
||||||
}
|
|
||||||
Ok(normalized)
|
|
||||||
}
|
|
||||||
|
|
||||||
// 字段省略时保留已有配置;显式 null 不能清空唯一的通用默认
|
|
||||||
fn deserialize_profile_update<'de, D: serde::Deserializer<'de>>(
|
|
||||||
deserializer: D,
|
|
||||||
) -> Result<Option<serde_json::Map<String, serde_json::Value>>, D::Error> {
|
|
||||||
serde_json::Map::<String, serde_json::Value>::deserialize(deserializer).map(Some)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn detect_location<S>(
|
async fn detect_location<S>(
|
||||||
@@ -658,7 +624,7 @@ where
|
|||||||
let result = state
|
let result = state
|
||||||
.admin_services()
|
.admin_services()
|
||||||
.proxies()
|
.proxies()
|
||||||
.probe(None, true)
|
.probe(gateway_admin::ports::proxy::ProbeRoute::Direct, true)
|
||||||
.await
|
.await
|
||||||
.map_err(map_service_error)?;
|
.map_err(map_service_error)?;
|
||||||
Ok(AdminResponse::new(
|
Ok(AdminResponse::new(
|
||||||
@@ -742,6 +708,8 @@ impl RuntimeSettingsFields {
|
|||||||
self,
|
self,
|
||||||
) -> Result<gateway_admin::model::settings::RuntimeSettingsValues, WireValidationError> {
|
) -> Result<gateway_admin::model::settings::RuntimeSettingsValues, WireValidationError> {
|
||||||
let values = gateway_admin::model::settings::RuntimeSettingsValues {
|
let values = gateway_admin::model::settings::RuntimeSettingsValues {
|
||||||
|
openai_oauth_guardian_review_model: self.openai_oauth_guardian_review_model,
|
||||||
|
openai_request_country: self.openai_request_country,
|
||||||
codex_privacy_policy: self.codex_privacy_policy,
|
codex_privacy_policy: self.codex_privacy_policy,
|
||||||
request_location_enabled: self.request_location_enabled,
|
request_location_enabled: self.request_location_enabled,
|
||||||
request_location: self
|
request_location: self
|
||||||
@@ -765,6 +733,7 @@ impl RuntimeSettingsFields {
|
|||||||
openai_session_affinity_ttl_hours: self.openai_session_affinity_ttl_hours,
|
openai_session_affinity_ttl_hours: self.openai_session_affinity_ttl_hours,
|
||||||
responses_max_decompressed_body_bytes: self.responses_max_decompressed_body_bytes,
|
responses_max_decompressed_body_bytes: self.responses_max_decompressed_body_bytes,
|
||||||
smart_scheduling: self.smart_scheduling,
|
smart_scheduling: self.smart_scheduling,
|
||||||
|
quota_reset_window_weights: self.quota_reset_window_weights,
|
||||||
min_codex_desktop_version: self.min_codex_desktop_version,
|
min_codex_desktop_version: self.min_codex_desktop_version,
|
||||||
min_codex_cli_version: self.min_codex_cli_version,
|
min_codex_cli_version: self.min_codex_cli_version,
|
||||||
usage_retention_days: u32::try_from(self.usage_retention_days)
|
usage_retention_days: u32::try_from(self.usage_retention_days)
|
||||||
@@ -790,6 +759,8 @@ impl RuntimeSettingsFields {
|
|||||||
impl From<gateway_admin::model::settings::RuntimeSettingsValues> for RuntimeSettingsFields {
|
impl From<gateway_admin::model::settings::RuntimeSettingsValues> for RuntimeSettingsFields {
|
||||||
fn from(settings: gateway_admin::model::settings::RuntimeSettingsValues) -> Self {
|
fn from(settings: gateway_admin::model::settings::RuntimeSettingsValues) -> Self {
|
||||||
crate::admin::settings::RuntimeSettingsFields {
|
crate::admin::settings::RuntimeSettingsFields {
|
||||||
|
openai_oauth_guardian_review_model: settings.openai_oauth_guardian_review_model,
|
||||||
|
openai_request_country: settings.openai_request_country,
|
||||||
codex_privacy_policy: settings.codex_privacy_policy,
|
codex_privacy_policy: settings.codex_privacy_policy,
|
||||||
request_location_enabled: settings.request_location_enabled,
|
request_location_enabled: settings.request_location_enabled,
|
||||||
request_location: settings.request_location,
|
request_location: settings.request_location,
|
||||||
@@ -808,6 +779,7 @@ impl From<gateway_admin::model::settings::RuntimeSettingsValues> for RuntimeSett
|
|||||||
openai_session_affinity_ttl_hours: settings.openai_session_affinity_ttl_hours,
|
openai_session_affinity_ttl_hours: settings.openai_session_affinity_ttl_hours,
|
||||||
responses_max_decompressed_body_bytes: settings.responses_max_decompressed_body_bytes,
|
responses_max_decompressed_body_bytes: settings.responses_max_decompressed_body_bytes,
|
||||||
smart_scheduling: settings.smart_scheduling,
|
smart_scheduling: settings.smart_scheduling,
|
||||||
|
quota_reset_window_weights: settings.quota_reset_window_weights,
|
||||||
min_codex_desktop_version: settings.min_codex_desktop_version,
|
min_codex_desktop_version: settings.min_codex_desktop_version,
|
||||||
min_codex_cli_version: settings.min_codex_cli_version,
|
min_codex_cli_version: settings.min_codex_cli_version,
|
||||||
usage_retention_days: u64::from(settings.usage_retention_days),
|
usage_retention_days: u64::from(settings.usage_retention_days),
|
||||||
@@ -842,6 +814,7 @@ fn settings_validation_error(field: &'static str) -> WireValidationError {
|
|||||||
"max_waiting_per_key" => "maxWaitingPerKey",
|
"max_waiting_per_key" => "maxWaitingPerKey",
|
||||||
"min_codex_cli_version" => "minCodexCliVersion",
|
"min_codex_cli_version" => "minCodexCliVersion",
|
||||||
"min_codex_desktop_version" => "minCodexDesktopVersion",
|
"min_codex_desktop_version" => "minCodexDesktopVersion",
|
||||||
|
"openai_request_country" => "openaiRequestCountry",
|
||||||
"openai_account_affinity" => "openaiAccountAffinity",
|
"openai_account_affinity" => "openaiAccountAffinity",
|
||||||
"openai_guardian_reserved_concurrency" => "openaiGuardianReservedConcurrency",
|
"openai_guardian_reserved_concurrency" => "openaiGuardianReservedConcurrency",
|
||||||
"openai_session_affinity_ttl_hours" => "openaiSessionAffinityTtlHours",
|
"openai_session_affinity_ttl_hours" => "openaiSessionAffinityTtlHours",
|
||||||
|
|||||||
@@ -215,12 +215,12 @@ const METHOD_NOT_ALLOWED: AdminErrorSpec = AdminErrorSpec::new(
|
|||||||
const TOO_MANY_LOGIN_ATTEMPTS: AdminErrorSpec = AdminErrorSpec::new(
|
const TOO_MANY_LOGIN_ATTEMPTS: AdminErrorSpec = AdminErrorSpec::new(
|
||||||
StatusCode::TOO_MANY_REQUESTS,
|
StatusCode::TOO_MANY_REQUESTS,
|
||||||
AdminErrorCode::TOO_MANY_LOGIN_ATTEMPTS,
|
AdminErrorCode::TOO_MANY_LOGIN_ATTEMPTS,
|
||||||
"登录尝试过多,请稍后重试",
|
"登录尝试过多",
|
||||||
);
|
);
|
||||||
const RATE_LIMITED: AdminErrorSpec = AdminErrorSpec::new(
|
const RATE_LIMITED: AdminErrorSpec = AdminErrorSpec::new(
|
||||||
StatusCode::TOO_MANY_REQUESTS,
|
StatusCode::TOO_MANY_REQUESTS,
|
||||||
AdminErrorCode::RATE_LIMITED,
|
AdminErrorCode::RATE_LIMITED,
|
||||||
"请求过于频繁,请稍后重试",
|
"请求过于频繁",
|
||||||
);
|
);
|
||||||
const INTERNAL: AdminErrorSpec = AdminErrorSpec::new(
|
const INTERNAL: AdminErrorSpec = AdminErrorSpec::new(
|
||||||
StatusCode::INTERNAL_SERVER_ERROR,
|
StatusCode::INTERNAL_SERVER_ERROR,
|
||||||
|
|||||||
@@ -72,6 +72,10 @@ pub(crate) fn client_error_code(code: &str) -> &str {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub(crate) fn is_retry_after_header(name: &str) -> bool {
|
||||||
|
name.eq_ignore_ascii_case("retry-after") || name.eq_ignore_ascii_case("retry-after-ms")
|
||||||
|
}
|
||||||
|
|
||||||
/// 为 HTTP 错误或流内失败保留原有字段,仅投影客户端需要的重试信号
|
/// 为 HTTP 错误或流内失败保留原有字段,仅投影客户端需要的重试信号
|
||||||
pub(crate) fn capacity_error_for_client(data: &Value) -> Option<Value> {
|
pub(crate) fn capacity_error_for_client(data: &Value) -> Option<Value> {
|
||||||
const CODE_PATHS: [&str; 2] = ["/error/code", "/response/error/code"];
|
const CODE_PATHS: [&str; 2] = ["/error/code", "/response/error/code"];
|
||||||
@@ -87,6 +91,12 @@ pub(crate) fn capacity_error_for_client(data: &Value) -> Option<Value> {
|
|||||||
return None;
|
return None;
|
||||||
}
|
}
|
||||||
let mut projected = data.clone();
|
let mut projected = data.clone();
|
||||||
|
// 容量等待与换号已由网关执行;旧账号的等待提示不能再次阻塞客户端的新一轮路由
|
||||||
|
for path in ["/headers", "/error/headers", "/response/error/headers"] {
|
||||||
|
if let Some(Value::Object(headers)) = projected.pointer_mut(path) {
|
||||||
|
headers.retain(|name, _| !is_retry_after_header(name));
|
||||||
|
}
|
||||||
|
}
|
||||||
for path in CODE_PATHS {
|
for path in CODE_PATHS {
|
||||||
if let Some(code) = projected.pointer_mut(path)
|
if let Some(code) = projected.pointer_mut(path)
|
||||||
&& capacity_code(code)
|
&& capacity_code(code)
|
||||||
|
|||||||
@@ -178,7 +178,7 @@ pub(crate) fn client_access_error_response(error: ClientAccessError) -> Response
|
|||||||
response
|
response
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Desktop 优先于内嵌 CLI/Core;未知客户端及未提供应用版本的手机远程客户端返回 `None`
|
/// 识别 Desktop 应用或 CLI/Core;未知客户端及未提供应用版本的手机远程客户端返回 `None`
|
||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn identify_codex_client(headers: &HeaderMap) -> Option<IdentifiedCodexClient> {
|
pub fn identify_codex_client(headers: &HeaderMap) -> Option<IdentifiedCodexClient> {
|
||||||
const MAXIMUM_HEADER_LENGTH: usize = 4096;
|
const MAXIMUM_HEADER_LENGTH: usize = 4096;
|
||||||
@@ -196,25 +196,35 @@ pub fn identify_codex_client(headers: &HeaderMap) -> Option<IdentifiedCodexClien
|
|||||||
"codex_mcp_server",
|
"codex_mcp_server",
|
||||||
];
|
];
|
||||||
|
|
||||||
let originator = bounded_ascii_header(headers, "originator", MAXIMUM_HEADER_LENGTH);
|
let ascii_header = |name: &'static str| headers.get(name).and_then(|value| value.to_str().ok());
|
||||||
let user_agent = bounded_ascii_header(headers, "user-agent", MAXIMUM_HEADER_LENGTH);
|
let raw_user_agent = ascii_header("user-agent");
|
||||||
let is_desktop = originator.is_some_and(|value| value.eq_ignore_ascii_case("Codex Desktop"))
|
// HeaderValue::to_str 只接受 ASCII,可以按字节截取搜索范围
|
||||||
|
let user_agent = raw_user_agent.map(|ua| &ua[..ua.len().min(MAXIMUM_HEADER_LENGTH)]);
|
||||||
|
let is_desktop = ascii_header("originator")
|
||||||
|
.is_some_and(|value| value.eq_ignore_ascii_case("Codex Desktop"))
|
||||||
|| user_agent.is_some_and(|value| contains_ascii_case_insensitive(value, "Codex Desktop"));
|
|| user_agent.is_some_and(|value| contains_ascii_case_insensitive(value, "Codex Desktop"));
|
||||||
if is_desktop {
|
if is_desktop {
|
||||||
let explicit_version = bounded_ascii_header(headers, "version", MAXIMUM_HEADER_LENGTH);
|
let version_header = headers.get("version");
|
||||||
let user_agent_version = user_agent.and_then(desktop_version_from_user_agent);
|
let user_agent_version = user_agent.and_then(desktop_version_from_user_agent);
|
||||||
// 手机远程初始化会覆盖进程级 UA 后缀,保留的 Desktop/Core 前缀不代表应用版本
|
if user_agent_version.is_none()
|
||||||
// 仅缺失版本信息时免于门禁;已提供的版本即使非法,也继续按 Desktop 校验
|
&& let Some(ua) = raw_user_agent.filter(|ua| ua.len() <= MAXIMUM_HEADER_LENGTH)
|
||||||
if !headers.contains_key("version")
|
&& let Some(client) = user_agent_client_name(ua)
|
||||||
&& user_agent_version.is_none()
|
|
||||||
&& headers
|
|
||||||
.get("user-agent")
|
|
||||||
.is_some_and(|value| value.as_bytes().len() <= MAXIMUM_HEADER_LENGTH)
|
|
||||||
&& user_agent.is_some_and(has_chatgpt_remote_user_agent_suffix)
|
|
||||||
{
|
{
|
||||||
return None;
|
// 共享 App Server 可保留 Desktop 进程名,TUI 请求的 version 头也可能重复 Core 版本
|
||||||
|
if client.eq_ignore_ascii_case("codex-tui")
|
||||||
|
&& let Some(core) = desktop_core_version(ua)
|
||||||
|
&& version_header.is_none_or(|value| value.as_bytes() == core.as_bytes())
|
||||||
|
{
|
||||||
|
return Some(IdentifiedCodexClient {
|
||||||
|
kind: CodexClientKind::Cli,
|
||||||
|
version: CodexClientVersion::parse(core).ok(),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
if version_header.is_none() && is_chatgpt_remote_client(client) {
|
||||||
|
return None;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
let version = match explicit_version {
|
let version = match version_header.and_then(|value| value.to_str().ok()) {
|
||||||
Some(value) => CodexClientVersion::parse(value).ok(),
|
Some(value) => CodexClientVersion::parse(value).ok(),
|
||||||
None => user_agent_version.and_then(|value| CodexClientVersion::parse(value).ok()),
|
None => user_agent_version.and_then(|value| CodexClientVersion::parse(value).ok()),
|
||||||
};
|
};
|
||||||
@@ -244,18 +254,6 @@ pub fn identify_codex_client(headers: &HeaderMap) -> Option<IdentifiedCodexClien
|
|||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|
||||||
fn bounded_ascii_header<'a>(
|
|
||||||
headers: &'a HeaderMap,
|
|
||||||
name: &'static str,
|
|
||||||
maximum_length: usize,
|
|
||||||
) -> Option<&'a str> {
|
|
||||||
let value = headers.get(name)?.to_str().ok()?;
|
|
||||||
if !value.is_ascii() {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
Some(&value[..value.len().min(maximum_length)])
|
|
||||||
}
|
|
||||||
|
|
||||||
fn desktop_version_from_user_agent(user_agent: &str) -> Option<&str> {
|
fn desktop_version_from_user_agent(user_agent: &str) -> Option<&str> {
|
||||||
let marker = "Codex Desktop;";
|
let marker = "Codex Desktop;";
|
||||||
let start = find_ascii_case_insensitive(user_agent, marker)? + marker.len();
|
let start = find_ascii_case_insensitive(user_agent, marker)? + marker.len();
|
||||||
@@ -266,27 +264,29 @@ fn desktop_version_from_user_agent(user_agent: &str) -> Option<&str> {
|
|||||||
.next()
|
.next()
|
||||||
}
|
}
|
||||||
|
|
||||||
fn has_chatgpt_remote_user_agent_suffix(user_agent: &str) -> bool {
|
fn desktop_core_version(user_agent: &str) -> Option<&str> {
|
||||||
let Some((_, suffix)) = user_agent
|
let (product, rest) = user_agent.split_once('/')?;
|
||||||
.strip_suffix(')')
|
let (version, _) = rest.split_once(' ')?;
|
||||||
.and_then(|value| value.rsplit_once(" ("))
|
product
|
||||||
else {
|
.eq_ignore_ascii_case("Codex Desktop")
|
||||||
return false;
|
.then_some(version)
|
||||||
};
|
}
|
||||||
let Some((name, version)) = suffix.split_once("; ") else {
|
|
||||||
return false;
|
fn user_agent_client_name(user_agent: &str) -> Option<&str> {
|
||||||
};
|
let (_, suffix) = user_agent.strip_suffix(')')?.rsplit_once(" (")?;
|
||||||
let Some(platform) = name
|
let (name, version) = suffix.split_once("; ")?;
|
||||||
.strip_prefix("codex_chatgpt_")
|
let valid_token = |value: &str| {
|
||||||
.and_then(|value| value.strip_suffix("_remote"))
|
|
||||||
else {
|
|
||||||
return false;
|
|
||||||
};
|
|
||||||
[platform, version].into_iter().all(|value| {
|
|
||||||
!value.is_empty()
|
!value.is_empty()
|
||||||
&& !value.contains(['(', ')', ';'])
|
&& !value.contains(['(', ')', ';'])
|
||||||
&& !value.bytes().any(|byte| byte.is_ascii_whitespace())
|
&& !value.bytes().any(|byte| byte.is_ascii_whitespace())
|
||||||
})
|
};
|
||||||
|
(valid_token(name) && valid_token(version)).then_some(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn is_chatgpt_remote_client(name: &str) -> bool {
|
||||||
|
name.strip_prefix("codex_chatgpt_")
|
||||||
|
.and_then(|value| value.strip_suffix("_remote"))
|
||||||
|
.is_some_and(|platform| !platform.is_empty())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn contains_ascii_case_insensitive(haystack: &str, needle: &str) -> bool {
|
fn contains_ascii_case_insensitive(haystack: &str, needle: &str) -> bool {
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ use gateway_core::{
|
|||||||
error::GatewayError,
|
error::GatewayError,
|
||||||
operation::Operation,
|
operation::Operation,
|
||||||
};
|
};
|
||||||
|
use gateway_protocol::openai::OPENAI_PROTOCOL;
|
||||||
|
|
||||||
use crate::client_error::{ProtocolError, ProtocolErrorBody};
|
use crate::client_error::{ProtocolError, ProtocolErrorBody};
|
||||||
use crate::middleware::headers::encode_headers;
|
use crate::middleware::headers::encode_headers;
|
||||||
@@ -65,7 +66,7 @@ where
|
|||||||
Box::new(move |prepared, request| {
|
Box::new(move |prepared, request| {
|
||||||
Box::pin(async move {
|
Box::pin(async move {
|
||||||
let (protocol, headers, body) = request_parts(request.clone())?;
|
let (protocol, headers, body) = request_parts(request.clone())?;
|
||||||
if protocol != "openai" {
|
if protocol != OPENAI_PROTOCOL {
|
||||||
return Err(MiddlewareError::Rejected);
|
return Err(MiddlewareError::Rejected);
|
||||||
}
|
}
|
||||||
let operation = request.apply_capabilities(decode(body, headers).await?)?;
|
let operation = request.apply_capabilities(decode(body, headers).await?)?;
|
||||||
@@ -80,7 +81,8 @@ where
|
|||||||
{
|
{
|
||||||
Ok(started) => started,
|
Ok(started) => started,
|
||||||
Err(error) => {
|
Err(error) => {
|
||||||
return buffered_response("openai", gateway_error_response(&error)).await;
|
return buffered_response(OPENAI_PROTOCOL, gateway_error_response(&error))
|
||||||
|
.await;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
collect_raw_json_response(started).await
|
collect_raw_json_response(started).await
|
||||||
@@ -89,7 +91,9 @@ where
|
|||||||
)
|
)
|
||||||
.await;
|
.await;
|
||||||
let response = match result {
|
let response = match result {
|
||||||
Ok(response) => into_http_response(response, ExpectedBody::SingleJson, "openai").await,
|
Ok(response) => {
|
||||||
|
into_http_response(response, ExpectedBody::SingleJson, OPENAI_PROTOCOL).await
|
||||||
|
}
|
||||||
Err(error) => error_response(error),
|
Err(error) => error_response(error),
|
||||||
};
|
};
|
||||||
if !execution_entered.load(Ordering::Relaxed) {
|
if !execution_entered.load(Ordering::Relaxed) {
|
||||||
@@ -143,7 +147,7 @@ async fn collect_raw_json_response(
|
|||||||
.await
|
.await
|
||||||
.map_err(|_| MiddlewareError::Fault)?;
|
.map_err(|_| MiddlewareError::Fault)?;
|
||||||
Ok(pending_execution_response(
|
Ok(pending_execution_response(
|
||||||
"openai".to_owned(),
|
OPENAI_PROTOCOL.to_owned(),
|
||||||
parts.status.as_u16(),
|
parts.status.as_u16(),
|
||||||
encode_headers(&parts.headers),
|
encode_headers(&parts.headers),
|
||||||
MiddlewareFrame::new(bytes, framing, true).with_transformed(transformed),
|
MiddlewareFrame::new(bytes, framing, true).with_transformed(transformed),
|
||||||
@@ -155,7 +159,7 @@ fn raw_json_body(events: Vec<ProviderEvent>) -> Option<Bytes> {
|
|||||||
let mut body = None;
|
let mut body = None;
|
||||||
for event in events {
|
for event in events {
|
||||||
let (_, wire) = event.into_parts();
|
let (_, wire) = event.into_parts();
|
||||||
let Some(wire) = wire.filter(|wire| wire.protocol() == "openai") else {
|
let Some(wire) = wire.filter(|wire| wire.protocol() == OPENAI_PROTOCOL) else {
|
||||||
continue;
|
continue;
|
||||||
};
|
};
|
||||||
let Some(raw) = wire.into_raw_json_body() else {
|
let Some(raw) = wire.into_raw_json_body() else {
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ use serde_json::{Value, json};
|
|||||||
|
|
||||||
pub use gateway_core::engine::execution::gateway_error_from_engine;
|
pub use gateway_core::engine::execution::gateway_error_from_engine;
|
||||||
|
|
||||||
use crate::client_error::{ProtocolErrorBody, capacity_error_for_client};
|
use crate::client_error::{ProtocolErrorBody, capacity_error_for_client, is_retry_after_header};
|
||||||
|
|
||||||
pub use crate::client_error::{
|
pub use crate::client_error::{
|
||||||
gateway_error_contract, gateway_error_response, openai_error_response,
|
gateway_error_contract, gateway_error_response, openai_error_response,
|
||||||
@@ -102,7 +102,9 @@ pub fn model_not_found_response() -> (StatusCode, Json<Value>) {
|
|||||||
/// 在下游尚未提交时交付 Provider 的 HTTP 失败响应,并应用客户端容量恢复合同
|
/// 在下游尚未提交时交付 Provider 的 HTTP 失败响应,并应用客户端容量恢复合同
|
||||||
pub fn engine_error_response(error: &EngineError) -> Response {
|
pub fn engine_error_response(error: &EngineError) -> Response {
|
||||||
let capacity_unavailable = matches!(error, EngineError::Provider(error)
|
let capacity_unavailable = matches!(error, EngineError::Provider(error)
|
||||||
if error.kind() == ProviderErrorKind::UpstreamCapacityUnavailable);
|
if error.kind() == ProviderErrorKind::UpstreamCapacityUnavailable
|
||||||
|
&& error.client_visible_upstream_error().and_then(|detail| detail.code())
|
||||||
|
!= Some("previous_response_not_found"));
|
||||||
if let EngineError::Provider(error) = error
|
if let EngineError::Provider(error) = error
|
||||||
&& let Some(upstream) = error.client_visible_upstream_response()
|
&& let Some(upstream) = error.client_visible_upstream_response()
|
||||||
&& let Ok(status) = StatusCode::from_u16(upstream.status())
|
&& let Ok(status) = StatusCode::from_u16(upstream.status())
|
||||||
@@ -110,6 +112,7 @@ pub fn engine_error_response(error: &EngineError) -> Response {
|
|||||||
let projected = serde_json::from_slice::<Value>(upstream.body())
|
let projected = serde_json::from_slice::<Value>(upstream.body())
|
||||||
.ok()
|
.ok()
|
||||||
.and_then(|body| capacity_error_for_client(&body));
|
.and_then(|body| capacity_error_for_client(&body));
|
||||||
|
let suppress_retry_after = capacity_unavailable || projected.is_some();
|
||||||
let mut response = match projected {
|
let mut response = match projected {
|
||||||
Some(body) => {
|
Some(body) => {
|
||||||
let mut response = Response::new(Body::from(body.to_string()));
|
let mut response = Response::new(Body::from(body.to_string()));
|
||||||
@@ -132,6 +135,9 @@ pub fn engine_error_response(error: &EngineError) -> Response {
|
|||||||
response.headers_mut().insert(CONTENT_TYPE, content_type);
|
response.headers_mut().insert(CONTENT_TYPE, content_type);
|
||||||
}
|
}
|
||||||
for header in upstream.headers() {
|
for header in upstream.headers() {
|
||||||
|
if suppress_retry_after && is_retry_after_header(header.name()) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
let Ok(name) = HeaderName::from_bytes(header.name().as_bytes()) else {
|
let Ok(name) = HeaderName::from_bytes(header.name().as_bytes()) else {
|
||||||
continue;
|
continue;
|
||||||
};
|
};
|
||||||
@@ -140,6 +146,13 @@ pub fn engine_error_response(error: &EngineError) -> Response {
|
|||||||
};
|
};
|
||||||
response.headers_mut().append(name, value);
|
response.headers_mut().append(name, value);
|
||||||
}
|
}
|
||||||
|
if !response.headers().contains_key("x-request-id")
|
||||||
|
&& !response.headers().contains_key("x-oai-request-id")
|
||||||
|
&& let Some(request_id) = error.upstream_request_id()
|
||||||
|
&& let Ok(value) = HeaderValue::from_str(request_id.as_str())
|
||||||
|
{
|
||||||
|
response.headers_mut().insert("x-request-id", value);
|
||||||
|
}
|
||||||
return response;
|
return response;
|
||||||
}
|
}
|
||||||
let mut response = gateway_error_response(&gateway_error_from_engine(error));
|
let mut response = gateway_error_response(&gateway_error_from_engine(error));
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ use gateway_core::engine::{
|
|||||||
use gateway_core::error::{GatewayError, GatewayErrorKind};
|
use gateway_core::error::{GatewayError, GatewayErrorKind};
|
||||||
use gateway_core::event::{ProviderEvent, ProviderResponseHeader};
|
use gateway_core::event::{ProviderEvent, ProviderResponseHeader};
|
||||||
use gateway_core::lifecycle::{CancellationToken, ConnectionGuard};
|
use gateway_core::lifecycle::{CancellationToken, ConnectionGuard};
|
||||||
|
use gateway_protocol::openai::OPENAI_PROTOCOL;
|
||||||
use gateway_protocol::openai::sse::response_failed_sse_event_with_id;
|
use gateway_protocol::openai::sse::response_failed_sse_event_with_id;
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
use tokio::time::Instant;
|
use tokio::time::Instant;
|
||||||
@@ -491,7 +492,9 @@ pub async fn collect_execution_response(session: Box<dyn ExecutionSession>) -> R
|
|||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
Ok(response) => into_http_response(response, ExpectedBody::SingleJson, "openai").await,
|
Ok(response) => {
|
||||||
|
into_http_response(response, ExpectedBody::SingleJson, OPENAI_PROTOCOL).await
|
||||||
|
}
|
||||||
Err(error) => error_response(error),
|
Err(error) => error_response(error),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -513,7 +516,9 @@ pub async fn stream_execution_response(
|
|||||||
)
|
)
|
||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
Ok(response) => into_http_response(response, ExpectedBody::Sse, "openai").await,
|
Ok(response) => {
|
||||||
|
into_http_response(response, ExpectedBody::Sse, OPENAI_PROTOCOL).await
|
||||||
|
}
|
||||||
Err(error) => error_response(error),
|
Err(error) => error_response(error),
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -15,6 +15,8 @@ use gateway_core::{
|
|||||||
error::{GatewayError, GatewayErrorKind},
|
error::{GatewayError, GatewayErrorKind},
|
||||||
operation::OperationKind,
|
operation::OperationKind,
|
||||||
};
|
};
|
||||||
|
use gateway_protocol::anthropic::ANTHROPIC_PROTOCOL;
|
||||||
|
use gateway_protocol::openai::OPENAI_PROTOCOL;
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
pub(crate) enum GenerationProtocol {
|
pub(crate) enum GenerationProtocol {
|
||||||
@@ -27,7 +29,7 @@ impl GenerationProtocol {
|
|||||||
pub(crate) fn from_request(request: &DecodedGenerationRequest) -> Self {
|
pub(crate) fn from_request(request: &DecodedGenerationRequest) -> Self {
|
||||||
if request.operation().kind() == OperationKind::CountTokens {
|
if request.operation().kind() == OperationKind::CountTokens {
|
||||||
Self::MessageTokenCount
|
Self::MessageTokenCount
|
||||||
} else if request.operation().protocol() == "anthropic" {
|
} else if request.operation().protocol() == ANTHROPIC_PROTOCOL {
|
||||||
Self::Messages
|
Self::Messages
|
||||||
} else {
|
} else {
|
||||||
Self::Responses
|
Self::Responses
|
||||||
@@ -36,8 +38,8 @@ impl GenerationProtocol {
|
|||||||
|
|
||||||
pub(crate) const fn wire(self) -> &'static str {
|
pub(crate) const fn wire(self) -> &'static str {
|
||||||
match self {
|
match self {
|
||||||
Self::Responses => "openai",
|
Self::Responses => OPENAI_PROTOCOL,
|
||||||
Self::Messages | Self::MessageTokenCount => "anthropic",
|
Self::Messages | Self::MessageTokenCount => ANTHROPIC_PROTOCOL,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
use axum::body::Bytes;
|
use axum::body::Bytes;
|
||||||
use gateway_core::{error::GatewayError, event::ProviderEvent};
|
use gateway_core::{error::GatewayError, event::ProviderEvent};
|
||||||
|
use gateway_protocol::anthropic::ANTHROPIC_PROTOCOL;
|
||||||
use gateway_protocol::{
|
use gateway_protocol::{
|
||||||
anthropic::MessagesAccumulator,
|
anthropic::MessagesAccumulator,
|
||||||
openai::sse::{
|
openai::sse::{
|
||||||
@@ -50,7 +51,7 @@ impl GenerationEncoder {
|
|||||||
} => {
|
} => {
|
||||||
let Some(wire) = event
|
let Some(wire) = event
|
||||||
.wire_event()
|
.wire_event()
|
||||||
.filter(|wire| wire.protocol() == "anthropic")
|
.filter(|wire| wire.protocol() == ANTHROPIC_PROTOCOL)
|
||||||
else {
|
else {
|
||||||
return Vec::new();
|
return Vec::new();
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
//! 出口校验按协议维护边界事实,不在流式路径保存生成正文
|
//! 出口校验按协议维护边界事实,不在流式路径保存生成正文
|
||||||
|
|
||||||
use gateway_core::event::ProviderEvent;
|
use gateway_core::event::ProviderEvent;
|
||||||
|
use gateway_protocol::anthropic::ANTHROPIC_PROTOCOL;
|
||||||
use gateway_protocol::openai::sse::parse_sse_events;
|
use gateway_protocol::openai::sse::parse_sse_events;
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
use std::sync::{Arc, Mutex};
|
use std::sync::{Arc, Mutex};
|
||||||
@@ -32,7 +33,7 @@ impl GenerationValidationFacts {
|
|||||||
Self::Messages(id) => {
|
Self::Messages(id) => {
|
||||||
if let Some(value) = event
|
if let Some(value) = event
|
||||||
.wire_event()
|
.wire_event()
|
||||||
.filter(|wire| wire.protocol() == "anthropic")
|
.filter(|wire| wire.protocol() == ANTHROPIC_PROTOCOL)
|
||||||
.map(|wire| wire.data())
|
.map(|wire| wire.data())
|
||||||
&& let Some(value) = value
|
&& let Some(value) = value
|
||||||
.pointer("/message/id")
|
.pointer("/message/id")
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ use gateway_core::error::{GatewayError, GatewayErrorKind};
|
|||||||
use gateway_core::operation::{
|
use gateway_core::operation::{
|
||||||
ImageRequest, ImageRequestKind, Operation, OperationKind, RawJsonPayload,
|
ImageRequest, ImageRequestKind, Operation, OperationKind, RawJsonPayload,
|
||||||
};
|
};
|
||||||
|
use gateway_protocol::openai::OPENAI_PROTOCOL;
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
|
|
||||||
use crate::ApiState;
|
use crate::ApiState;
|
||||||
@@ -25,7 +26,6 @@ use crate::openai::{
|
|||||||
router::{IMAGE_EDITS_PATH, IMAGE_GENERATIONS_PATH},
|
router::{IMAGE_EDITS_PATH, IMAGE_GENERATIONS_PATH},
|
||||||
};
|
};
|
||||||
|
|
||||||
const OPENAI_PROTOCOL: &str = "openai";
|
|
||||||
const IMAGE_TURN_ID_CONTEXT_KEY: &str = "image_turn_id";
|
const IMAGE_TURN_ID_CONTEXT_KEY: &str = "image_turn_id";
|
||||||
|
|
||||||
/// `POST /v1/images/generations`
|
/// `POST /v1/images/generations`
|
||||||
|
|||||||
@@ -13,6 +13,7 @@ use gateway_core::engine::execution::StartedExecution;
|
|||||||
use gateway_core::event::ProviderEvent;
|
use gateway_core::event::ProviderEvent;
|
||||||
use gateway_core::live::LiveHangupRequest;
|
use gateway_core::live::LiveHangupRequest;
|
||||||
use gateway_core::operation::Operation;
|
use gateway_core::operation::Operation;
|
||||||
|
use gateway_protocol::openai::OPENAI_PROTOCOL;
|
||||||
use serde_json::Value;
|
use serde_json::Value;
|
||||||
|
|
||||||
use super::{
|
use super::{
|
||||||
@@ -31,9 +32,6 @@ use crate::{
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
/// 引导 wire 事件使用的协议名;与 Provider 侧 `PROVIDER_NAME` 一致。
|
|
||||||
const LIVE_PROTOCOL: &str = "openai";
|
|
||||||
|
|
||||||
pub(crate) async fn live_call(
|
pub(crate) async fn live_call(
|
||||||
State(state): State<ApiState>,
|
State(state): State<ApiState>,
|
||||||
connect_info: Option<Extension<ConnectInfo<SocketAddr>>>,
|
connect_info: Option<Extension<ConnectInfo<SocketAddr>>>,
|
||||||
@@ -344,7 +342,7 @@ fn live_call_body(events: Vec<ProviderEvent>) -> Option<Bytes> {
|
|||||||
let mut raw_events = 0usize;
|
let mut raw_events = 0usize;
|
||||||
for event in events {
|
for event in events {
|
||||||
let (_, wire) = event.into_parts();
|
let (_, wire) = event.into_parts();
|
||||||
let Some(wire) = wire.filter(|wire| wire.protocol() == LIVE_PROTOCOL) else {
|
let Some(wire) = wire.filter(|wire| wire.protocol() == OPENAI_PROTOCOL) else {
|
||||||
continue;
|
continue;
|
||||||
};
|
};
|
||||||
let raw = wire.into_raw_http_body()?;
|
let raw = wire.into_raw_http_body()?;
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ use gateway_core::event::ProviderResponseHeader;
|
|||||||
use gateway_core::operation::{
|
use gateway_core::operation::{
|
||||||
ProviderHttpHeader, ProviderHttpMethod, ProviderHttpRequest, RawHttpPayload,
|
ProviderHttpHeader, ProviderHttpMethod, ProviderHttpRequest, RawHttpPayload,
|
||||||
};
|
};
|
||||||
|
use gateway_protocol::openai::OPENAI_PROTOCOL;
|
||||||
use serde_json::{Value, json};
|
use serde_json::{Value, json};
|
||||||
|
|
||||||
use crate::openai::error::openai_error_response;
|
use crate::openai::error::openai_error_response;
|
||||||
@@ -172,7 +173,7 @@ pub(crate) fn live_call_operation(
|
|||||||
"invalid_request",
|
"invalid_request",
|
||||||
))
|
))
|
||||||
};
|
};
|
||||||
let payload = RawHttpPayload::new("openai", body).map_err(|_| invalid())?;
|
let payload = RawHttpPayload::new(OPENAI_PROTOCOL, body).map_err(|_| invalid())?;
|
||||||
ProviderHttpRequest::new(
|
ProviderHttpRequest::new(
|
||||||
LIVE_CALLS_ENDPOINT,
|
LIVE_CALLS_ENDPOINT,
|
||||||
ProviderHttpMethod::Post,
|
ProviderHttpMethod::Post,
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ use gateway_core::{
|
|||||||
lifecycle::CancellationToken,
|
lifecycle::CancellationToken,
|
||||||
operation::OperationKind,
|
operation::OperationKind,
|
||||||
};
|
};
|
||||||
|
use gateway_protocol::openai::OPENAI_PROTOCOL;
|
||||||
use std::{future::Future, sync::Arc};
|
use std::{future::Future, sync::Arc};
|
||||||
|
|
||||||
use super::http::{ExpectedBody, buffered_response, error_response, into_http_response};
|
use super::http::{ExpectedBody, buffered_response, error_response, into_http_response};
|
||||||
@@ -38,7 +39,7 @@ impl RequestInput {
|
|||||||
pub(crate) fn query(endpoint: String, model_hint: Option<String>, headers: &HeaderMap) -> Self {
|
pub(crate) fn query(endpoint: String, model_hint: Option<String>, headers: &HeaderMap) -> Self {
|
||||||
Self {
|
Self {
|
||||||
endpoint,
|
endpoint,
|
||||||
protocol: "openai".to_owned(),
|
protocol: OPENAI_PROTOCOL.to_owned(),
|
||||||
operation: None,
|
operation: None,
|
||||||
transport: ClientTransport::HttpJson,
|
transport: ClientTransport::HttpJson,
|
||||||
model_hint,
|
model_hint,
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ use gateway_core::{
|
|||||||
engine::execution::AuthenticatedClient,
|
engine::execution::AuthenticatedClient,
|
||||||
routing::{PublicModelDescriptor, PublicModelId, PublicModelProfile},
|
routing::{PublicModelDescriptor, PublicModelId, PublicModelProfile},
|
||||||
};
|
};
|
||||||
|
use gateway_protocol::anthropic::ANTHROPIC_PROTOCOL;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
use serde_json::{Value, json};
|
use serde_json::{Value, json};
|
||||||
|
|
||||||
@@ -52,7 +53,7 @@ pub(crate) async fn models(
|
|||||||
|
|
||||||
let mut input = RequestInput::query(super::router::MODELS_PATH.to_owned(), None, &headers);
|
let mut input = RequestInput::query(super::router::MODELS_PATH.to_owned(), None, &headers);
|
||||||
if anthropic {
|
if anthropic {
|
||||||
input.protocol = "anthropic".to_owned();
|
input.protocol = ANTHROPIC_PROTOCOL.to_owned();
|
||||||
}
|
}
|
||||||
let response = middleware::query_response(service.execution(), client, input, move |client| {
|
let response = middleware::query_response(service.execution(), client, input, move |client| {
|
||||||
models_response(state, client, query, anthropic)
|
models_response(state, client, query, anthropic)
|
||||||
@@ -114,9 +115,14 @@ async fn models_response(
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
.collect::<Result<Vec<_>, ()>>();
|
.collect::<Result<Vec<_>, ()>>();
|
||||||
let Ok(models) = models else {
|
let Ok(mut models) = models else {
|
||||||
return catalog_unavailable_response();
|
return catalog_unavailable_response();
|
||||||
};
|
};
|
||||||
|
if !client.policy().account_scope().allows_subagents() {
|
||||||
|
for model in &mut models {
|
||||||
|
model["multi_agent_version"] = json!("disabled");
|
||||||
|
}
|
||||||
|
}
|
||||||
return (
|
return (
|
||||||
StatusCode::OK,
|
StatusCode::OK,
|
||||||
// 目录经过账号选择/别名/多 Provider 聚合,不能借用上游 ETag 表示改写后的正文
|
// 目录经过账号选择/别名/多 Provider 聚合,不能借用上游 ETag 表示改写后的正文
|
||||||
@@ -173,7 +179,7 @@ pub(crate) async fn model_detail(
|
|||||||
&headers,
|
&headers,
|
||||||
);
|
);
|
||||||
if anthropic {
|
if anthropic {
|
||||||
input.protocol = "anthropic".to_owned();
|
input.protocol = ANTHROPIC_PROTOCOL.to_owned();
|
||||||
}
|
}
|
||||||
let response = middleware::query_response(
|
let response = middleware::query_response(
|
||||||
service.execution(),
|
service.execution(),
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ use axum::http::{HeaderMap, HeaderName, HeaderValue};
|
|||||||
use base64::{Engine as _, engine::general_purpose::STANDARD};
|
use base64::{Engine as _, engine::general_purpose::STANDARD};
|
||||||
use bytes::Bytes;
|
use bytes::Bytes;
|
||||||
use gateway_core::operation::{ClientTurn, GenerateRequest, Operation, ProtocolPayload};
|
use gateway_core::operation::{ClientTurn, GenerateRequest, Operation, ProtocolPayload};
|
||||||
|
use gateway_protocol::openai::OPENAI_PROTOCOL;
|
||||||
use gateway_protocol::openai::{
|
use gateway_protocol::openai::{
|
||||||
X_OPENAI_INTERNAL_CODEX_RESPONSES_LITE_HEADER, X_OPENAI_MEMGEN_REQUEST_HEADER,
|
X_OPENAI_INTERNAL_CODEX_RESPONSES_LITE_HEADER, X_OPENAI_MEMGEN_REQUEST_HEADER,
|
||||||
is_transport_managed_request_header,
|
is_transport_managed_request_header,
|
||||||
@@ -17,9 +18,7 @@ use crate::openai::generation::{
|
|||||||
ContinuationIntent, DecodedGenerationRequest, GenerationRequestMetadata,
|
ContinuationIntent, DecodedGenerationRequest, GenerationRequestMetadata,
|
||||||
};
|
};
|
||||||
|
|
||||||
const OPENAI_PROTOCOL: &str = "openai";
|
|
||||||
const OPENAI_SUBAGENT_KEY: &str = "x-openai-subagent";
|
const OPENAI_SUBAGENT_KEY: &str = "x-openai-subagent";
|
||||||
const CODEX_TURN_METADATA_KEY: &str = "x-codex-turn-metadata";
|
|
||||||
const PASSTHROUGH_HEADERS_CONTEXT_KEY: &str = "opaque_request_headers";
|
const PASSTHROUGH_HEADERS_CONTEXT_KEY: &str = "opaque_request_headers";
|
||||||
const DOWNSTREAM_WEBSOCKET_CONNECTION_ID_CONTEXT_KEY: &str = "downstream_websocket_connection_id";
|
const DOWNSTREAM_WEBSOCKET_CONNECTION_ID_CONTEXT_KEY: &str = "downstream_websocket_connection_id";
|
||||||
|
|
||||||
@@ -34,11 +33,11 @@ pub(super) enum RequestDecodeSource {
|
|||||||
|
|
||||||
#[derive(Clone, Default)]
|
#[derive(Clone, Default)]
|
||||||
pub struct OpenAiRequestHeaders {
|
pub struct OpenAiRequestHeaders {
|
||||||
|
guardian: Option<String>,
|
||||||
|
ambiguous_guardian_headers: bool,
|
||||||
turn_state: Option<String>,
|
turn_state: Option<String>,
|
||||||
turn_metadata: Option<String>,
|
turn_metadata: Option<String>,
|
||||||
beta_features: Option<String>,
|
|
||||||
version: Option<String>,
|
version: Option<String>,
|
||||||
include_timing_metrics: Option<String>,
|
|
||||||
codex_window_id: Option<String>,
|
codex_window_id: Option<String>,
|
||||||
parent_thread_id: Option<String>,
|
parent_thread_id: Option<String>,
|
||||||
downstream_websocket_connection_id: Option<String>,
|
downstream_websocket_connection_id: Option<String>,
|
||||||
@@ -60,11 +59,20 @@ impl OpenAiRequestHeaders {
|
|||||||
#[must_use]
|
#[must_use]
|
||||||
pub fn from_headers(headers: &HeaderMap) -> Self {
|
pub fn from_headers(headers: &HeaderMap) -> Self {
|
||||||
Self {
|
Self {
|
||||||
|
guardian: header_string(headers, "x-codex-guardian"),
|
||||||
|
ambiguous_guardian_headers: [
|
||||||
|
"x-codex-guardian",
|
||||||
|
OPENAI_SUBAGENT_KEY,
|
||||||
|
"x-codex-turn-metadata",
|
||||||
|
]
|
||||||
|
.into_iter()
|
||||||
|
.any(|name| {
|
||||||
|
let mut values = headers.get_all(name).iter();
|
||||||
|
values.next().is_some_and(|v| v.to_str().is_err()) || values.next().is_some()
|
||||||
|
}),
|
||||||
turn_state: header_string(headers, "x-codex-turn-state"),
|
turn_state: header_string(headers, "x-codex-turn-state"),
|
||||||
turn_metadata: header_string(headers, "x-codex-turn-metadata"),
|
turn_metadata: header_string(headers, "x-codex-turn-metadata"),
|
||||||
beta_features: header_string(headers, "x-codex-beta-features"),
|
|
||||||
version: header_string(headers, "version"),
|
version: header_string(headers, "version"),
|
||||||
include_timing_metrics: header_string(headers, "x-responsesapi-include-timing-metrics"),
|
|
||||||
codex_window_id: header_string(headers, "x-codex-window-id"),
|
codex_window_id: header_string(headers, "x-codex-window-id"),
|
||||||
parent_thread_id: header_string(headers, "x-codex-parent-thread-id"),
|
parent_thread_id: header_string(headers, "x-codex-parent-thread-id"),
|
||||||
downstream_websocket_connection_id: None,
|
downstream_websocket_connection_id: None,
|
||||||
@@ -92,7 +100,46 @@ impl OpenAiRequestHeaders {
|
|||||||
self
|
self
|
||||||
}
|
}
|
||||||
|
|
||||||
fn apply_subagent(&self, body: &mut Map<String, Value>) {
|
fn apply_subagent(
|
||||||
|
&self,
|
||||||
|
body: &mut Map<String, Value>,
|
||||||
|
context: &mut Map<String, Value>,
|
||||||
|
source: RequestDecodeSource,
|
||||||
|
) {
|
||||||
|
if matches!(source, RequestDecodeSource::WebSocketFrame)
|
||||||
|
&& let Some(frame_agent) = body
|
||||||
|
.get("client_metadata")
|
||||||
|
.and_then(|m| m.get(OPENAI_SUBAGENT_KEY))
|
||||||
|
.and_then(Value::as_str)
|
||||||
|
&& (frame_agent == "guardian"
|
||||||
|
|| self.subagent.as_deref() == Some("guardian")
|
||||||
|
|| self.guardian.is_some())
|
||||||
|
{
|
||||||
|
// 帧内声明优先;旧 opening 的不透明副本也不能在 Provider 再度覆盖
|
||||||
|
let stale_subagent = self
|
||||||
|
.subagent
|
||||||
|
.as_deref()
|
||||||
|
.is_some_and(|opening| opening != frame_agent);
|
||||||
|
let stale_guardian = self.guardian.as_deref().is_some_and(|opening| {
|
||||||
|
frame_agent != "guardian"
|
||||||
|
|| gateway_protocol::openai::codex_guardian_role(body, context)
|
||||||
|
.is_some_and(|role| role.header() != Some(opening))
|
||||||
|
});
|
||||||
|
if stale_subagent {
|
||||||
|
context.insert("subagent".into(), Value::from(frame_agent));
|
||||||
|
}
|
||||||
|
if (stale_subagent || stale_guardian)
|
||||||
|
&& let Some(Value::Array(headers)) =
|
||||||
|
context.get_mut(PASSTHROUGH_HEADERS_CONTEXT_KEY)
|
||||||
|
{
|
||||||
|
headers.retain(|pair| match pair.get(0).and_then(Value::as_str) {
|
||||||
|
Some(OPENAI_SUBAGENT_KEY) => !stale_subagent,
|
||||||
|
Some("x-codex-guardian") => !stale_guardian,
|
||||||
|
_ => true,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
if let Some(subagent) = self.subagent.as_deref() {
|
if let Some(subagent) = self.subagent.as_deref() {
|
||||||
inject_subagent_metadata(body, subagent);
|
inject_subagent_metadata(body, subagent);
|
||||||
}
|
}
|
||||||
@@ -120,22 +167,19 @@ impl OpenAiRequestHeaders {
|
|||||||
fn protocol_context(
|
fn protocol_context(
|
||||||
&self,
|
&self,
|
||||||
use_websocket: Option<bool>,
|
use_websocket: Option<bool>,
|
||||||
frame_turn_metadata: Option<&String>,
|
source: RequestDecodeSource,
|
||||||
) -> Map<String, Value> {
|
) -> Map<String, Value> {
|
||||||
let mut context = Map::new();
|
let mut context = Map::new();
|
||||||
insert_protocol_context(&mut context, "turn_state", self.turn_state.as_ref());
|
insert_protocol_context(&mut context, "turn_state", self.turn_state.as_ref());
|
||||||
insert_protocol_context(
|
insert_protocol_context(&mut context, "turn_metadata", self.turn_metadata.as_ref());
|
||||||
&mut context,
|
insert_protocol_context(&mut context, "subagent", self.subagent.as_ref());
|
||||||
"turn_metadata",
|
if matches!(source, RequestDecodeSource::WebSocketFrame) {
|
||||||
frame_turn_metadata.or(self.turn_metadata.as_ref()),
|
context.insert(
|
||||||
);
|
gateway_protocol::openai::WEBSOCKET_FRAME_CONTEXT_KEY.to_owned(),
|
||||||
insert_protocol_context(&mut context, "beta_features", self.beta_features.as_ref());
|
Value::Bool(true),
|
||||||
|
);
|
||||||
|
}
|
||||||
insert_protocol_context(&mut context, "version", self.version.as_ref());
|
insert_protocol_context(&mut context, "version", self.version.as_ref());
|
||||||
insert_protocol_context(
|
|
||||||
&mut context,
|
|
||||||
"include_timing_metrics",
|
|
||||||
self.include_timing_metrics.as_ref(),
|
|
||||||
);
|
|
||||||
insert_protocol_context(
|
insert_protocol_context(
|
||||||
&mut context,
|
&mut context,
|
||||||
"codex_window_id",
|
"codex_window_id",
|
||||||
@@ -337,12 +381,14 @@ pub(super) fn decode_request_object(
|
|||||||
.map(|response_id| ContinuationIntent::PreviousResponseId(response_id.to_owned()))
|
.map(|response_id| ContinuationIntent::PreviousResponseId(response_id.to_owned()))
|
||||||
.unwrap_or(ContinuationIntent::None);
|
.unwrap_or(ContinuationIntent::None);
|
||||||
|
|
||||||
request_headers.apply_subagent(&mut object);
|
let mut protocol_context = request_headers.protocol_context(use_websocket, source);
|
||||||
let frame_turn_metadata = match source {
|
gateway_protocol::openai::capture_codex_guardian_identity(
|
||||||
RequestDecodeSource::Http => None,
|
&object,
|
||||||
RequestDecodeSource::WebSocketFrame => frame_turn_metadata(&object),
|
&mut protocol_context,
|
||||||
};
|
request_headers.guardian.as_deref(),
|
||||||
let protocol_context = request_headers.protocol_context(use_websocket, frame_turn_metadata);
|
request_headers.ambiguous_guardian_headers,
|
||||||
|
);
|
||||||
|
request_headers.apply_subagent(&mut object, &mut protocol_context, source);
|
||||||
|
|
||||||
let semantics =
|
let semantics =
|
||||||
gateway_protocol::openai::codex_responses_request_semantics(&object, &protocol_context);
|
gateway_protocol::openai::codex_responses_request_semantics(&object, &protocol_context);
|
||||||
@@ -381,16 +427,6 @@ pub(super) fn decode_request_object(
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fn frame_turn_metadata(body: &Map<String, Value>) -> Option<&String> {
|
|
||||||
body.get("client_metadata")
|
|
||||||
.and_then(Value::as_object)
|
|
||||||
.and_then(|metadata| metadata.get(CODEX_TURN_METADATA_KEY))
|
|
||||||
.and_then(|value| match value {
|
|
||||||
Value::String(value) if !value.trim().is_empty() => Some(value),
|
|
||||||
_ => None,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
fn inject_subagent_metadata(body: &mut Map<String, Value>, subagent: &str) {
|
fn inject_subagent_metadata(body: &mut Map<String, Value>, subagent: &str) {
|
||||||
let metadata = body
|
let metadata = body
|
||||||
.entry("client_metadata".to_owned())
|
.entry("client_metadata".to_owned())
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user