coding-proxy 0.2.1a2__tar.gz → 0.2.2__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (147) hide show
  1. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/CHANGELOG.md +6 -10
  2. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/PKG-INFO +2 -2
  3. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/README.md +1 -1
  4. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/docs/zh-CN/README.md +1 -1
  5. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/pyproject.toml +1 -1
  6. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/cli/__init__.py +37 -3
  7. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/config/config.default.yaml +6 -1
  8. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/logging/__init__.py +13 -9
  9. coding_proxy-0.2.2/src/coding/proxy/logging/formatters.py +27 -0
  10. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/routing/circuit_breaker.py +30 -7
  11. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/routing/executor.py +59 -5
  12. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/routing/router.py +60 -0
  13. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/routing/tier.py +24 -2
  14. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/server/app.py +3 -1
  15. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/server/factory.py +4 -1
  16. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/server/routes.py +44 -2
  17. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/antigravity.py +134 -3
  18. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_antigravity.py +313 -1
  19. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_app_routes.py +155 -0
  20. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_logging_dual_write.py +32 -41
  21. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/uv.lock +1 -1
  22. coding_proxy-0.2.1a2/src/coding/proxy/logging/formatters.py +0 -49
  23. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/.github/workflows/ci.yml +0 -0
  24. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/.github/workflows/coverage.yml +0 -0
  25. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/.github/workflows/release.yml +0 -0
  26. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/.gitignore +0 -0
  27. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/AGENTS.md +0 -0
  28. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/CLAUDE.md +0 -0
  29. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/LICENSE +0 -0
  30. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/docs/ci-cd.md +0 -0
  31. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/docs/framework.md +0 -0
  32. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/docs/user-guide.md +0 -0
  33. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/__init__.py +0 -0
  34. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/__init__.py +0 -0
  35. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/__main__.py +0 -0
  36. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/auth/__init__.py +0 -0
  37. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/auth/providers/__init__.py +0 -0
  38. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/auth/providers/base.py +0 -0
  39. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/auth/providers/github.py +0 -0
  40. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/auth/providers/google.py +0 -0
  41. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/auth/runtime.py +0 -0
  42. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/auth/store.py +0 -0
  43. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/cli/auth_commands.py +0 -0
  44. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/cli/banner.py +0 -0
  45. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/compat/__init__.py +0 -0
  46. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/compat/canonical.py +0 -0
  47. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/compat/session_store.py +0 -0
  48. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/config/__init__.py +0 -0
  49. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/config/auth_schema.py +0 -0
  50. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/config/loader.py +0 -0
  51. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/config/resiliency.py +0 -0
  52. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/config/routing.py +0 -0
  53. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/config/schema.py +0 -0
  54. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/config/server.py +0 -0
  55. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/config/vendors.py +0 -0
  56. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/convert/__init__.py +0 -0
  57. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/convert/anthropic_to_gemini.py +0 -0
  58. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/convert/anthropic_to_openai.py +0 -0
  59. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/convert/gemini_sse_adapter.py +0 -0
  60. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/convert/gemini_to_anthropic.py +0 -0
  61. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/convert/openai_to_anthropic.py +0 -0
  62. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/logging/db.py +0 -0
  63. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/logging/stats.py +0 -0
  64. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/model/__init__.py +0 -0
  65. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/model/auth.py +0 -0
  66. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/model/compat.py +0 -0
  67. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/model/constants.py +0 -0
  68. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/model/pricing.py +0 -0
  69. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/model/token.py +0 -0
  70. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/model/vendor.py +0 -0
  71. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/pricing.py +0 -0
  72. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/routing/__init__.py +0 -0
  73. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/routing/error_classifier.py +0 -0
  74. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/routing/model_mapper.py +0 -0
  75. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/routing/quota_guard.py +0 -0
  76. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/routing/rate_limit.py +0 -0
  77. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/routing/retry.py +0 -0
  78. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/routing/session_manager.py +0 -0
  79. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/routing/usage_parser.py +0 -0
  80. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/routing/usage_recorder.py +0 -0
  81. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/server/__init__.py +0 -0
  82. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/server/request_normalizer.py +0 -0
  83. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/server/responses.py +0 -0
  84. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/streaming/__init__.py +0 -0
  85. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/streaming/anthropic_compat.py +0 -0
  86. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/__init__.py +0 -0
  87. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/alibaba.py +0 -0
  88. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/anthropic.py +0 -0
  89. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/base.py +0 -0
  90. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/copilot.py +0 -0
  91. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/copilot_models.py +0 -0
  92. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/copilot_token_manager.py +0 -0
  93. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/copilot_urls.py +0 -0
  94. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/doubao.py +0 -0
  95. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/kimi.py +0 -0
  96. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/minimax.py +0 -0
  97. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/mixins.py +0 -0
  98. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/native_anthropic.py +0 -0
  99. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/token_manager.py +0 -0
  100. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/xiaomi.py +0 -0
  101. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/src/coding/proxy/vendors/zhipu.py +0 -0
  102. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/__init__.py +0 -0
  103. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_auto_login.py +0 -0
  104. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_banner.py +0 -0
  105. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_circuit_breaker.py +0 -0
  106. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_cli_usage.py +0 -0
  107. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_compat.py +0 -0
  108. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_config_init.py +0 -0
  109. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_config_loader.py +0 -0
  110. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_convert_request.py +0 -0
  111. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_convert_response.py +0 -0
  112. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_convert_sse.py +0 -0
  113. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_copilot.py +0 -0
  114. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_copilot_convert_request.py +0 -0
  115. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_copilot_convert_response.py +0 -0
  116. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_copilot_models.py +0 -0
  117. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_copilot_urls.py +0 -0
  118. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_currency.py +0 -0
  119. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_error_classifier.py +0 -0
  120. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_mixins.py +0 -0
  121. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_model_auth.py +0 -0
  122. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_model_compat.py +0 -0
  123. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_model_constants.py +0 -0
  124. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_model_mapper.py +0 -0
  125. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_model_pricing.py +0 -0
  126. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_model_token.py +0 -0
  127. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_model_vendor.py +0 -0
  128. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_native_vendors.py +0 -0
  129. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_parse_usage.py +0 -0
  130. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_pricing.py +0 -0
  131. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_quota_guard.py +0 -0
  132. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_rate_limit.py +0 -0
  133. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_request_normalizer.py +0 -0
  134. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_router_chain.py +0 -0
  135. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_router_executor.py +0 -0
  136. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_runtime_reauth.py +0 -0
  137. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_schema.py +0 -0
  138. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_streaming_anthropic_compat.py +0 -0
  139. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_tier.py +0 -0
  140. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_tiers_config.py +0 -0
  141. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_time_range.py +0 -0
  142. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_token_logger.py +0 -0
  143. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_token_manager.py +0 -0
  144. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_types.py +0 -0
  145. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_vendor_streaming.py +0 -0
  146. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_vendors.py +0 -0
  147. {coding_proxy-0.2.1a2 → coding_proxy-0.2.2}/tests/test_zhipu.py +0 -0
@@ -3,20 +3,16 @@
3
3
  本文件基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/) 规范维护,版本号遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
4
4
 
5
5
  ## [Unreleased]
6
- ## [v0.2.1](https://github.com/ThreeFish-AI/coding-proxy/releases/tag/v0.2.1a1) — 2026-04-11
7
6
 
8
- - fix(antigravity): 修复 Google OAuth token 刷新后 scope 校验过严导致 403 的问题;
9
- - refactor(request-normalizer): 移除跨供应商 tool_result 重定位死代码,docstring 对齐实际剥离行为;
7
+ ## [v0.2.2](https://github.com/ThreeFish-AI/coding-proxy/releases/tag/v0.2.2) 2026-04-13
10
8
 
9
+ - feat(reset): CLI reset 命令新增 -v/--vendor 参数,支持运行时 N-tier 链路重排序(逗号分隔的 vendor 列表);
10
+ - fix(logging): 修复 uvicorn.error 日志在文件中重复打印的问题;
11
11
 
12
- - **请求规范化死代码清理**:移除 `request_normalizer` 中永远不可达的 `tool_result` 重定位逻辑(Phase 1 剥离已覆盖全部场景,Phase 2 重定位因方向错误无法启用);更新 docstring 使之与实际行为(剥离)一致;
12
+ ## [v0.2.1](https://github.com/ThreeFish-AI/coding-proxy/releases/tag/v0.2.1) 2026-04-11
13
13
 
14
- ### 🐛 Bug 修复
15
-
16
- - **fix(antigravity)**: 新增 Google Cloud Code **v1internal 协议支持**,彻底解决 `ACCESS_TOKEN_SCOPE_INSUFFICIENT` (403) 问题。
17
- - **根因**:此前调用标准 Generative Language API (`generativelanguage.googleapis.com`),该端点对 OAuth scope 校验严格;参考项目 Antigravity-Manager 实际使用的是 Cloud Code v1internal 内部 API (`cloudcode-pa.googleapis.com/v1internal`),接受相同凭证但协议格式不同
18
- - **修复**:新增 `project_id` 配置字段,当配置 `project_id` 且 `base_url` 含 `v1internal` 时自动启用 v1internal 模式:请求体包裹在 v1internal 信封中(含 `project`/`requestId`/`model`/`userAgent` 字段),注入客户端指纹 Headers(`x-client-name`/`x-client-version`/Chrome-Electron UA),端点 URL 适配 v1internal 格式
19
- - **附带改进**:`_acquire()` scope 校验保持 warning 降级(与 Antigravity-Manager 行为对齐);`_mark_scope_error_if_needed()` 增强诊断日志,提示用户切换 v1internal 协议
14
+ - feat(logging): 实现日志双写(控制台 + 本地文件),日志文件支持 5MB 自动轮转及 gzip 压缩备份;ModelCall 日志降级为 DEBUG 级别;
15
+ - feat(circuit-breaker): 补全熔断器状态转换日志的 vendor 上下文信息;
20
16
 
21
17
  ## [v0.2.0](https://github.com/ThreeFish-AI/coding-proxy/releases/tag/v0.2.0) — 2026-04-09
22
18
 
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: coding-proxy
3
- Version: 0.2.1a2
3
+ Version: 0.2.2
4
4
  Summary: A High-Availability, Transparent, and Smart Multi-Vendor Proxy for Claude Code. Support Claude Plans, GitHub Copilot, Google Antigravity, ZAI/GLM, MiniMax, Qwen, Xiaomi, Kimi, Doubao...
5
5
  Project-URL: Source Code, https://github.com/ThreeFish-AI/coding-proxy
6
6
  Project-URL: User Guide, https://github.com/ThreeFish-AI/coding-proxy/blob/master/docs/user-guide.md
@@ -56,7 +56,7 @@ When you're deeply immersed in your coding "zone" with **Claude Code** (or any A
56
56
 
57
57
  ## 🌟 Core Features
58
58
 
59
- - **⛓️ N-tier Chained Failover**: Automatically downgrades from official Claude Plans, gracefully falling back to GitHub Copilot, then Google Antigravity, with Zhipu GLM acting as the ultimate safety net.
59
+ - **⛓️ N-tier Chained Failover**: Autonomous descending sequence, supporting Claude's official plans, as well as Coding Plans from GitHub Copilot, Z AI, MiniMax, Alibaba Qwen, Xiaomi, Kimi, Doubao, etc.
60
60
  - **🛡️ Smart Resilience & Quota Guardians**: Every single vendor node comes fully armed with an independent **Circuit Breaker** and **Quota Guard** to proactively dodge avalanches without breaking a sweat.
61
61
  - **👻 Phantom-like Transparency**: **100% transparent** to the client! No code tweaks required. Overwrite `ANTHROPIC_BASE_URL` with a single line, and you're good to go.
62
62
  - **🔄 Universal Alchemy (Formats & Models)**: Native support for two-way request/streaming (SSE) translations between Anthropic ←→ Gemini. Plus, auto/DIY model name mapping (e.g., effortlessly morphing `claude-*` into `glm-*`).
@@ -29,7 +29,7 @@ When you're deeply immersed in your coding "zone" with **Claude Code** (or any A
29
29
 
30
30
  ## 🌟 Core Features
31
31
 
32
- - **⛓️ N-tier Chained Failover**: Automatically downgrades from official Claude Plans, gracefully falling back to GitHub Copilot, then Google Antigravity, with Zhipu GLM acting as the ultimate safety net.
32
+ - **⛓️ N-tier Chained Failover**: Autonomous descending sequence, supporting Claude's official plans, as well as Coding Plans from GitHub Copilot, Z AI, MiniMax, Alibaba Qwen, Xiaomi, Kimi, Doubao, etc.
33
33
  - **🛡️ Smart Resilience & Quota Guardians**: Every single vendor node comes fully armed with an independent **Circuit Breaker** and **Quota Guard** to proactively dodge avalanches without breaking a sweat.
34
34
  - **👻 Phantom-like Transparency**: **100% transparent** to the client! No code tweaks required. Overwrite `ANTHROPIC_BASE_URL` with a single line, and you're good to go.
35
35
  - **🔄 Universal Alchemy (Formats & Models)**: Native support for two-way request/streaming (SSE) translations between Anthropic ←→ Gemini. Plus, auto/DIY model name mapping (e.g., effortlessly morphing `claude-*` into `glm-*`).
@@ -29,7 +29,7 @@
29
29
 
30
30
  ## 🌟 核心特性 (Core Features)
31
31
 
32
- - **⛓️ N-tier 链式故障转移 (Failover)**:自动从 Claude 官方 Plans 依次降级至 GitHub Copilot、Google Antigravity,最后由智谱 GLM 兜底。
32
+ - **⛓️ N-tier 链式故障转移 (Failover)**:自主降序序列,支持 Claude 官方 Plans,以及 GitHub Copilot、智谱、MiniMax、阿里千问、小米、Kimi、豆包等的 Coding Plan。
33
33
  - **🛡️ 智能弹性与容灾守卫**:每个供应商节点独立配备 **熔断器 (Circuit Breaker)** 与 **配额守卫 (Quota Guard)**,防雪崩、主动避险。
34
34
  - **👻 透明无感代理机制**:对客户端 **100% 透明**!无需修改任何代码,仅需一行配置覆盖 `ANTHROPIC_BASE_URL` 即可接入。
35
35
  - **🔄 跨模型与全格式转换**:原生支持 Anthropic ←→ Gemini 的请求与流式响应(SSE)双向转换,并支持自动/自助映射模型名称(如 `claude-*` 至 `glm-*`)。
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "coding-proxy"
3
- version = "0.2.1a2"
3
+ version = "0.2.2"
4
4
  description = "A High-Availability, Transparent, and Smart Multi-Vendor Proxy for Claude Code. Support Claude Plans, GitHub Copilot, Google Antigravity, ZAI/GLM, MiniMax, Qwen, Xiaomi, Kimi, Doubao..."
5
5
  readme = "README.md"
6
6
  requires-python = ">=3.12"
@@ -216,16 +216,50 @@ async def _run_usage(
216
216
  @app.command()
217
217
  def reset(
218
218
  port: int = typer.Option(8046, "--port", "-p", help="代理服务端口"),
219
+ vendor: str | None = typer.Option(
220
+ None,
221
+ "--vendor",
222
+ "-v",
223
+ help="提升/重排序 vendor 优先级(单个或逗号分隔多个)",
224
+ ),
219
225
  ) -> None:
220
- """重置所有层级的熔断器和配额守卫(恢复使用最高优先级供应商)."""
226
+ """重置所有层级的熔断器和配额守卫.
227
+
228
+ 可通过 -v 指定运行时 N-tier 链路重排序:
229
+
230
+ \b
231
+ -v zhipu 提升 zhipu 到最高优先级
232
+ -v zhipu,anthropic 替换整个 N-tier 链路顺序
233
+ """
221
234
  import httpx
222
235
 
236
+ # 构建请求 body
237
+ json_body: dict | None = None
238
+ if vendor:
239
+ parts = [v.strip() for v in vendor.split(",") if v.strip()]
240
+ if parts:
241
+ json_body = {"vendors": parts}
242
+
223
243
  try:
224
- resp = httpx.post(f"http://127.0.0.1:{port}/api/reset", timeout=5)
244
+ resp = httpx.post(
245
+ f"http://127.0.0.1:{port}/api/reset",
246
+ json=json_body,
247
+ timeout=5,
248
+ )
225
249
  if resp.status_code == 200:
250
+ data = resp.json()
226
251
  console.print("[green]所有层级的熔断器和配额守卫已重置[/green]")
252
+ tier_order = data.get("tier_order")
253
+ if tier_order:
254
+ order_str = " → ".join(tier_order)
255
+ console.print(f"[cyan]当前链路顺序:[/] {order_str}")
227
256
  else:
228
- console.print(f"[red]重置失败: {resp.status_code}[/red]")
257
+ try:
258
+ err = resp.json()
259
+ msg = err.get("error", {}).get("message", resp.text)
260
+ except Exception:
261
+ msg = resp.text
262
+ console.print(f"[red]重置失败: {msg}[/red]")
229
263
  except httpx.ConnectError:
230
264
  console.print("[red]代理服务未运行[/red]")
231
265
 
@@ -111,7 +111,7 @@ vendors:
111
111
  # 不配置 circuit_breaker → 自动成为终端层,不触发向下故障转移
112
112
  circuit_breaker:
113
113
  failure_threshold: 3
114
- recovery_timeout_seconds: 300
114
+ recovery_timeout_seconds: 30
115
115
  success_threshold: 2
116
116
  quota_guard:
117
117
  enabled: true # 启用后按 Premium Requests 配额管理
@@ -421,6 +421,11 @@ pricing:
421
421
  input_cost_per_mtok: ¥0.80
422
422
  output_cost_per_mtok: ¥2.00
423
423
  cache_read_cost_per_mtok: ¥0.16
424
+ - vendor: zhipu
425
+ model: glm-4.7 # 待区分长短上下文定价
426
+ input_cost_per_mtok: ¥2.00
427
+ output_cost_per_mtok: ¥8.00
428
+ cache_read_cost_per_mtok: ¥0.40
424
429
  - vendor: zhipu
425
430
  model: glm-5v-turbo # 待区分长短上下文定价
426
431
  input_cost_per_mtok: ¥5.00
@@ -1,6 +1,6 @@
1
1
  """日志模块.
2
2
 
3
- 提供 uvicorn 兼容的 dictConfig 构建、JSON 结构化格式化器、
3
+ 提供 uvicorn 兼容的 dictConfig 构建、文件日志字符串格式化器、
4
4
  以及 gzip 压缩轮转支持。
5
5
  """
6
6
 
@@ -12,7 +12,7 @@ import logging.handlers
12
12
  import os
13
13
  from pathlib import Path
14
14
 
15
- from .formatters import JsonFormatter
15
+ from .formatters import FileFormatter
16
16
 
17
17
  # ── 常量 ────────────────────────────────────────────────────────
18
18
 
@@ -83,7 +83,7 @@ def build_log_config(
83
83
 
84
84
  双写行为:
85
85
  - 控制台:人类可读格式,级别由 ``level`` 参数控制(handler 级别过滤)
86
- - 文件:JSON 结构化格式,固定 DEBUG 级别(捕获所有日志)
86
+ - 文件:字符串格式(与控制台风格一致),固定 DEBUG 级别(捕获所有日志)
87
87
  - 当 ``file_path`` 为 ``None`` 或空字符串时,退化为纯控制台模式(向后兼容)
88
88
  """
89
89
  config: dict = {
@@ -118,7 +118,11 @@ def build_log_config(
118
118
  },
119
119
  "loggers": {
120
120
  "uvicorn": {"handlers": ["default"], "level": level, "propagate": False},
121
- "uvicorn.error": {"level": level},
121
+ "uvicorn.error": {
122
+ "handlers": ["default"],
123
+ "level": level,
124
+ "propagate": False,
125
+ },
122
126
  "uvicorn.access": {
123
127
  "handlers": ["access"],
124
128
  "level": "INFO",
@@ -138,16 +142,16 @@ def build_log_config(
138
142
  log_file = Path(file_path)
139
143
  log_file.parent.mkdir(parents=True, exist_ok=True)
140
144
 
141
- # 注入 JSON formatter
142
- config["formatters"]["json"] = {
143
- "()": "coding.proxy.logging.formatters.JsonFormatter",
145
+ # 注入文件日志字符串 formatter
146
+ config["formatters"]["file_fmt"] = {
147
+ "()": "coding.proxy.logging.formatters.FileFormatter",
144
148
  }
145
149
 
146
150
  # 注入 RotatingFileHandler(gzip 压缩轮转)
147
151
  # 使用工厂函数(而非 class + namer/rotator kwargs),
148
152
  # 因为 dictConfig 不支持将 namer/rotator 作为构造参数传递
149
153
  config["handlers"]["file"] = {
150
- "formatter": "json",
154
+ "formatter": "file_fmt",
151
155
  "()": "coding.proxy.logging._create_rotating_file_handler",
152
156
  "filename": str(log_file.resolve()),
153
157
  "maxBytes": max_bytes,
@@ -182,7 +186,7 @@ def build_log_config(
182
186
 
183
187
  __all__ = [
184
188
  "build_log_config",
185
- "JsonFormatter",
189
+ "FileFormatter",
186
190
  "_gzip_namer",
187
191
  "_gzip_rotator",
188
192
  ]
@@ -0,0 +1,27 @@
1
+ """文件日志格式化器(字符串输出).
2
+
3
+ 为文件日志提供人类可读的字符串格式输出,
4
+ 与控制台输出风格一致,便于人工阅读和 grep 检索。
5
+ """
6
+
7
+ from __future__ import annotations
8
+
9
+ import logging
10
+
11
+
12
+ class FileFormatter(logging.Formatter):
13
+ """将 LogRecord 格式化为单行可读字符串.
14
+
15
+ 输出格式:``2026-04-11 16:51:13 INFO ModelCall: vendor=zhipu ...``
16
+
17
+ 设计要点:
18
+ - 时间戳使用 ``yyyy-MM-dd HH:mm:ss`` 格式(与控制台一致)
19
+ - 日志级别左对齐 5 字符宽度,保证多行对齐美观
20
+ - 无 ANSI 颜色码(文件输出不需要终端转义)
21
+ """
22
+
23
+ def __init__(self) -> None:
24
+ super().__init__(
25
+ fmt="%(asctime)s %(levelname)-5s %(message)s",
26
+ datefmt="%Y-%m-%d %H:%M:%S",
27
+ )
@@ -32,11 +32,14 @@ class CircuitBreaker:
32
32
  recovery_timeout_seconds: int = 300,
33
33
  success_threshold: int = 2,
34
34
  max_recovery_seconds: int = 3600,
35
+ *,
36
+ vendor_name: str = "",
35
37
  ) -> None:
36
38
  self._failure_threshold = failure_threshold
37
39
  self._recovery_timeout = recovery_timeout_seconds
38
40
  self._success_threshold = success_threshold
39
41
  self._max_recovery = max_recovery_seconds
42
+ self._vendor_label = f" [{vendor_name}]" if vendor_name else ""
40
43
 
41
44
  self._state = CircuitState.CLOSED
42
45
  self._failure_count = 0
@@ -65,7 +68,13 @@ class CircuitBreaker:
65
68
  self._success_count += 1
66
69
  if self._success_count >= self._success_threshold:
67
70
  self._transition_to(CircuitState.CLOSED)
68
- logger.info("Circuit breaker: HALF_OPEN → CLOSED (recovered)")
71
+ logger.info(
72
+ "Circuit breaker%s: HALF_OPEN → CLOSED "
73
+ "(recovered, %d/%d consecutive successes)",
74
+ self._vendor_label,
75
+ self._success_count,
76
+ self._success_threshold,
77
+ )
69
78
  elif self._state == CircuitState.CLOSED:
70
79
  # 正常状态下成功,无需操作
71
80
  pass
@@ -94,7 +103,10 @@ class CircuitBreaker:
94
103
  self._transition_to(CircuitState.OPEN)
95
104
  self._backoff_recovery(hint_seconds=retry_after_seconds)
96
105
  logger.warning(
97
- "Circuit breaker: HALF_OPEN → OPEN (recovery failed, next retry in %ds)",
106
+ "Circuit breaker%s: HALF_OPEN → OPEN "
107
+ "(recovery probe failed, backoff %ds → next retry in %ds)",
108
+ self._vendor_label,
109
+ self._current_recovery,
98
110
  self._current_recovery,
99
111
  )
100
112
  elif self._state == CircuitState.CLOSED:
@@ -117,14 +129,17 @@ class CircuitBreaker:
117
129
  )
118
130
  if force_open:
119
131
  logger.warning(
120
- "Circuit breaker: CLOSED → OPEN "
121
- "(forced, rate-limited, next retry in %ds)",
132
+ "Circuit breaker%s: CLOSED → OPEN "
133
+ "(forced, rate-limited, retry-after=%ss → next retry in %ds)",
134
+ self._vendor_label,
135
+ retry_after_seconds or "N/A",
122
136
  self._current_recovery,
123
137
  )
124
138
  else:
125
139
  logger.warning(
126
- "Circuit breaker: CLOSED → OPEN "
140
+ "Circuit breaker%s: CLOSED → OPEN "
127
141
  "(%d consecutive failures, next retry in %ds)",
142
+ self._vendor_label,
128
143
  self._failure_count,
129
144
  self._current_recovery,
130
145
  )
@@ -134,7 +149,9 @@ class CircuitBreaker:
134
149
  with self._lock:
135
150
  self._transition_to(CircuitState.CLOSED)
136
151
  self._current_recovery = self._recovery_timeout
137
- logger.info("Circuit breaker: manually reset to CLOSED")
152
+ logger.info(
153
+ "Circuit breaker%s: manually reset to CLOSED", self._vendor_label
154
+ )
138
155
 
139
156
  def get_info(self) -> dict:
140
157
  """获取熔断器状态信息."""
@@ -157,7 +174,13 @@ class CircuitBreaker:
157
174
  elapsed = time.monotonic() - self._last_failure_time
158
175
  if elapsed >= self._current_recovery:
159
176
  self._transition_to(CircuitState.HALF_OPEN)
160
- logger.info("Circuit breaker: OPEN → HALF_OPEN (recovery timeout)")
177
+ elapsed_s = int(elapsed)
178
+ logger.info(
179
+ "Circuit breaker%s: OPEN → HALF_OPEN (recovery timeout, waited %ds/%ds)",
180
+ self._vendor_label,
181
+ elapsed_s,
182
+ self._current_recovery,
183
+ )
161
184
 
162
185
  def _transition_to(self, new_state: CircuitState) -> None:
163
186
  self._state = new_state
@@ -48,9 +48,13 @@ logger = logging.getLogger(__name__)
48
48
 
49
49
 
50
50
  def _log_http_error_detail(
51
- tier_name: str, exc: Exception, *, is_stream: bool = False
51
+ tier_name: str,
52
+ exc: Exception,
53
+ *,
54
+ is_stream: bool = False,
55
+ tier: VendorTier | None = None,
52
56
  ) -> None:
53
- """记录 HTTP 错误的详细信息(状态码 / 响应体摘要 / 异常类型).
57
+ """记录 HTTP 错误的详细信息(状态码 / 响应体摘要 / 异常类型 / 熔断器快照).
54
58
 
55
59
  替代原先单行 ``logger.warning("Tier %s stream failed: %s", ...)``,
56
60
  在非 200 响应时输出更丰富的诊断上下文,便于跟踪上游故障根因。
@@ -78,6 +82,14 @@ def _log_http_error_detail(
78
82
  detail_parts.append(f" error_msg={err.get('message', 'N/A')[:200]}")
79
83
  else:
80
84
  detail_parts.append(f" message={str(exc)[:300]}")
85
+ # 熔断器状态快照
86
+ if tier and tier.circuit_breaker:
87
+ cb = tier.circuit_breaker
88
+ cb_info = cb.get_info()
89
+ detail_parts.append(
90
+ f" circuit_breaker={cb_info['state']} "
91
+ f"(failures={cb_info['failure_count']}/{cb._failure_threshold})"
92
+ )
81
93
  logger.warning("\n".join(detail_parts))
82
94
 
83
95
 
@@ -268,6 +280,12 @@ class _RouteExecutor:
268
280
  duration = int((time.monotonic() - start) * 1000)
269
281
  model = body.get("model", "unknown")
270
282
  model_served = usage.get("model_served") or tier.vendor.map_model(model)
283
+ if failed_tier_name is not None:
284
+ logger.info(
285
+ "Tier %s stream succeeded (took over from failed tier: %s)",
286
+ tier.name,
287
+ failed_tier_name,
288
+ )
271
289
  self._recorder.log_model_call(
272
290
  vendor=tier.name,
273
291
  model_requested=model,
@@ -310,7 +328,7 @@ class _RouteExecutor:
310
328
  httpx.ConnectError,
311
329
  httpx.ReadError,
312
330
  ) as exc:
313
- _log_http_error_detail(tier.name, exc, is_stream=True)
331
+ _log_http_error_detail(tier.name, exc, is_stream=True, tier=tier)
314
332
  (
315
333
  should_continue,
316
334
  failed_tier_name,
@@ -325,6 +343,7 @@ class _RouteExecutor:
325
343
  request_body=body,
326
344
  )
327
345
  if should_continue:
346
+ self._log_failover_transition(tier, exc, self._tiers, i)
328
347
  continue
329
348
  if is_last:
330
349
  raise
@@ -399,6 +418,12 @@ class _RouteExecutor:
399
418
  duration = int((time.monotonic() - start) * 1000)
400
419
  model = body.get("model", "unknown")
401
420
  model_served = resp.model_served or tier.vendor.map_model(model)
421
+ if failed_tier_name is not None:
422
+ logger.info(
423
+ "Tier %s message succeeded (took over from failed tier: %s)",
424
+ tier.name,
425
+ failed_tier_name,
426
+ )
402
427
  self._recorder.log_model_call(
403
428
  vendor=tier.name,
404
429
  model_requested=model,
@@ -469,10 +494,15 @@ class _RouteExecutor:
469
494
  rate_limit_deadline=compute_rate_limit_deadline(rl_info),
470
495
  )
471
496
  if not is_last:
497
+ next_tier = (
498
+ self._tiers[i + 1] if i + 1 < len(self._tiers) else None
499
+ )
500
+ next_info = f" → next: {next_tier.name}" if next_tier else ""
472
501
  logger.warning(
473
- "Tier %s error %d, failing over",
502
+ "Tier %s error %d, failing over%s",
474
503
  tier.name,
475
504
  resp.status_code,
505
+ next_info,
476
506
  )
477
507
  failed_tier_name = tier.name
478
508
  continue
@@ -513,7 +543,7 @@ class _RouteExecutor:
513
543
  continue
514
544
 
515
545
  except (httpx.TimeoutException, httpx.ConnectError, httpx.ReadError) as exc:
516
- _log_http_error_detail(tier.name, exc, is_stream=False)
546
+ _log_http_error_detail(tier.name, exc, is_stream=False, tier=tier)
517
547
  tier.record_failure()
518
548
  failed_tier_name = tier.name
519
549
  if is_last:
@@ -694,6 +724,30 @@ class _RouteExecutor:
694
724
 
695
725
  return False, tier.name, exc
696
726
 
727
+ @staticmethod
728
+ def _log_failover_transition(
729
+ current_tier: VendorTier,
730
+ exc: Exception,
731
+ tiers: list[VendorTier],
732
+ current_index: int,
733
+ ) -> None:
734
+ """记录 vendor 轮转摘要日志(谁 → 谁,原因)."""
735
+ next_tier = tiers[current_index + 1] if current_index + 1 < len(tiers) else None
736
+ if next_tier is None:
737
+ return
738
+
739
+ # 提取错误摘要
740
+ reason = type(exc).__name__
741
+ if isinstance(exc, httpx.HTTPStatusError) and exc.response is not None:
742
+ reason = f"HTTP {exc.response.status_code}"
743
+
744
+ logger.info(
745
+ "Failover: %s → %s (reason: %s)",
746
+ current_tier.name,
747
+ next_tier.name,
748
+ reason,
749
+ )
750
+
697
751
  @staticmethod
698
752
  def _is_cap_error(resp: VendorResponse) -> bool:
699
753
  """判断是否为订阅用量上限错误."""
@@ -68,6 +68,66 @@ class RequestRouter:
68
68
  """当前活跃供应商名称(由 Executor 在成功响应时写入)."""
69
69
  return self._active_vendor_name
70
70
 
71
+ # ── 运行时 N-tier 链路重排序 ─────────────────────────────
72
+
73
+ def get_vendor_names(self) -> list[str]:
74
+ """返回当前 tiers 的供应商名称列表(按优先级顺序)."""
75
+ return [t.name for t in self._tiers]
76
+
77
+ def reorder_tiers(self, vendor_names: list[str]) -> None:
78
+ """原地重排序 N-tier 链路.
79
+
80
+ 使用切片赋值保持列表引用同一性,使 ``_RouteExecutor`` 立即可见。
81
+
82
+ Args:
83
+ vendor_names: 新的供应商名称顺序(必须包含所有当前 tier)。
84
+
85
+ Raises:
86
+ ValueError: 名称不存在、有重复、或未覆盖所有 tier。
87
+ """
88
+ name_to_tier = {t.name: t for t in self._tiers}
89
+ current_names = set(name_to_tier)
90
+
91
+ # 校验:重复
92
+ if len(vendor_names) != len(set(vendor_names)):
93
+ seen: set[str] = set()
94
+ dups = [n for n in vendor_names if n in seen or seen.add(n)] # type: ignore[func-returns-value]
95
+ raise ValueError(f"vendor 名称重复: {', '.join(dups)}")
96
+
97
+ # 校验:名称存在性
98
+ unknown = [n for n in vendor_names if n not in current_names]
99
+ if unknown:
100
+ raise ValueError(
101
+ f"未知 vendor: {', '.join(unknown)}; "
102
+ f"可用: {', '.join(sorted(current_names))}"
103
+ )
104
+
105
+ # 校验:全量覆盖
106
+ provided = set(vendor_names)
107
+ if provided != current_names:
108
+ missing = current_names - provided
109
+ raise ValueError(f"缺少 vendor: {', '.join(sorted(missing))}")
110
+
111
+ self._tiers[:] = [name_to_tier[n] for n in vendor_names]
112
+
113
+ def promote_vendor(self, vendor_name: str) -> None:
114
+ """将指定 vendor 提升至最高优先级,其余保持相对顺序.
115
+
116
+ Args:
117
+ vendor_name: 要提升的供应商名称。
118
+
119
+ Raises:
120
+ ValueError: 名称不存在。
121
+ """
122
+ current_names = self.get_vendor_names()
123
+ if vendor_name not in current_names:
124
+ available = sorted(t.name for t in self._tiers)
125
+ raise ValueError(
126
+ f"未知 vendor: {vendor_name}; 可用: {', '.join(available)}"
127
+ )
128
+ new_order = [vendor_name] + [n for n in current_names if n != vendor_name]
129
+ self.reorder_tiers(new_order)
130
+
71
131
  # ── 公开路由接口(委托给 _RouteExecutor)───────────────
72
132
 
73
133
  async def route_stream(
@@ -155,11 +155,33 @@ class VendorTier:
155
155
  if not is_probe_scenario:
156
156
  return cb_allows and qg_allows and wqg_allows
157
157
 
158
+ # 构建探测上下文摘要
159
+ probe_context_parts: list[str] = []
160
+ if self.circuit_breaker:
161
+ cb_info = self.circuit_breaker.get_info()
162
+ probe_context_parts.append(
163
+ f"circuit_breaker={cb_info['state']}, "
164
+ f"failures={cb_info['failure_count']}"
165
+ )
166
+ if self._rate_limit_deadline > 0:
167
+ waited = int(time.monotonic() - self._rate_limit_deadline)
168
+ probe_context_parts.append(f"rate_limit_waited={waited}s")
169
+ probe_context = (
170
+ " (" + ", ".join(probe_context_parts) + ")" if probe_context_parts else ""
171
+ )
172
+
158
173
  # ── 第二层: Health Check 门控 ──
159
- logger.info("Tier %s: probe scenario, running health check", self.name)
174
+ logger.info(
175
+ "Tier %s: probe scenario%s, running health check",
176
+ self.name,
177
+ probe_context,
178
+ )
160
179
  healthy = await self.vendor.check_health()
161
180
  if not healthy:
162
- logger.warning("Tier %s: health check failed, staying degraded", self.name)
181
+ logger.warning(
182
+ "Tier %s: health check failed, staying degraded",
183
+ self.name,
184
+ )
163
185
  self.record_failure()
164
186
  return False
165
187
 
@@ -106,7 +106,9 @@ def create_app(config: ProxyConfig | None = None) -> FastAPI:
106
106
  vendor_cfg, config.failover, mapper, token_store
107
107
  )
108
108
  cb = (
109
- _build_circuit_breaker(vendor_cfg.circuit_breaker)
109
+ _build_circuit_breaker(
110
+ vendor_cfg.circuit_breaker, vendor_name=vendor_cfg.vendor
111
+ )
110
112
  if vendor_cfg.circuit_breaker
111
113
  else None
112
114
  )
@@ -91,13 +91,16 @@ def _find_copilot_vendor(router: Any) -> CopilotVendor | None:
91
91
  return None
92
92
 
93
93
 
94
- def _build_circuit_breaker(cfg: CircuitBreakerConfig) -> CircuitBreaker:
94
+ def _build_circuit_breaker(
95
+ cfg: CircuitBreakerConfig, *, vendor_name: str = ""
96
+ ) -> CircuitBreaker:
95
97
  """从配置构建熔断器实例."""
96
98
  return CircuitBreaker(
97
99
  failure_threshold=cfg.failure_threshold,
98
100
  recovery_timeout_seconds=cfg.recovery_timeout_seconds,
99
101
  success_threshold=cfg.success_threshold,
100
102
  max_recovery_seconds=cfg.max_recovery_seconds,
103
+ vendor_name=vendor_name,
101
104
  )
102
105
 
103
106
 
@@ -261,7 +261,40 @@ def register_admin_routes(app: Any, router: Any) -> None:
261
261
  """注册管理操作路由(重置等)."""
262
262
 
263
263
  @app.post("/api/reset")
264
- async def reset_circuit() -> dict:
264
+ async def reset_circuit(request: Request) -> Response:
265
+ """重置所有层级的熔断器/配额守卫/rate limit.
266
+
267
+ 可选 JSON body ``{"vendors": ["v1", "v2", ...]}`` 支持运行时重排序:
268
+ - 单个 vendor → 提升至最高优先级,其余保持相对顺序
269
+ - 多个 vendor → 替换整个 N-tier 链路顺序(需覆盖所有 vendor)
270
+ """
271
+ # 解析可选 body
272
+ vendor_names: list[str] | None = None
273
+ try:
274
+ body = await request.json()
275
+ if isinstance(body, dict):
276
+ raw = body.get("vendors")
277
+ if isinstance(raw, list) and raw:
278
+ vendor_names = [str(v) for v in raw]
279
+ except Exception:
280
+ # 无 body 或非 JSON → 仅 reset(向后兼容)
281
+ pass
282
+
283
+ # 重排序(如果指定)
284
+ if vendor_names is not None:
285
+ try:
286
+ if len(vendor_names) == 1:
287
+ router.promote_vendor(vendor_names[0])
288
+ else:
289
+ router.reorder_tiers(vendor_names)
290
+ except ValueError as exc:
291
+ return json_error_response(
292
+ 400,
293
+ error_type="invalid_request_error",
294
+ message=str(exc),
295
+ )
296
+
297
+ # 全量 reset
265
298
  for tier in router.tiers:
266
299
  if tier.circuit_breaker:
267
300
  tier.circuit_breaker.reset()
@@ -270,7 +303,16 @@ def register_admin_routes(app: Any, router: Any) -> None:
270
303
  if tier.weekly_quota_guard:
271
304
  tier.weekly_quota_guard.reset()
272
305
  tier.reset_rate_limit()
273
- return {"status": "ok"}
306
+
307
+ result: dict[str, Any] = {"status": "ok"}
308
+ if vendor_names is not None:
309
+ result["tier_order"] = router.get_vendor_names()
310
+
311
+ return Response(
312
+ content=json.dumps(result, ensure_ascii=False).encode(),
313
+ status_code=200,
314
+ media_type="application/json",
315
+ )
274
316
 
275
317
 
276
318
  def register_reauth_routes(app: Any, reauth_coordinator: Any) -> None: