coding-proxy 0.1.4a1__tar.gz → 0.1.4a3__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.

Potentially problematic release.


This version of coding-proxy might be problematic. Click here for more details.

Files changed (137) hide show
  1. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/PKG-INFO +1 -1
  2. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/pyproject.toml +1 -1
  3. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/cli/__init__.py +5 -0
  4. coding_proxy-0.1.4a3/src/coding/proxy/cli/banner.py +61 -0
  5. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/config/config.default.yaml +5 -5
  6. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/logging/db.py +5 -3
  7. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/logging/stats.py +1 -1
  8. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/server/factory.py +1 -1
  9. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/vendors/zhipu.py +5 -2
  10. coding_proxy-0.1.4a3/tests/test_banner.py +82 -0
  11. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_router_executor.py +177 -0
  12. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_token_logger.py +124 -0
  13. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/uv.lock +1 -1
  14. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/.github/workflows/ci.yml +0 -0
  15. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/.github/workflows/coverage.yml +0 -0
  16. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/.github/workflows/promote.yml +0 -0
  17. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/.github/workflows/release.yml +0 -0
  18. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/.gitignore +0 -0
  19. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/AGENTS.md +0 -0
  20. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/CHANGELOG.md +0 -0
  21. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/CLAUDE.md +0 -0
  22. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/LICENSE +0 -0
  23. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/README.md +0 -0
  24. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/docs/ci-cd.md +0 -0
  25. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/docs/framework.md +0 -0
  26. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/docs/user-guide.md +0 -0
  27. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/docs/zh-CN/README.md +0 -0
  28. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/__init__.py +0 -0
  29. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/__init__.py +0 -0
  30. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/__main__.py +0 -0
  31. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/auth/__init__.py +0 -0
  32. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/auth/providers/__init__.py +0 -0
  33. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/auth/providers/base.py +0 -0
  34. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/auth/providers/github.py +0 -0
  35. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/auth/providers/google.py +0 -0
  36. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/auth/runtime.py +0 -0
  37. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/auth/store.py +0 -0
  38. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/cli/auth_commands.py +0 -0
  39. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/compat/__init__.py +0 -0
  40. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/compat/canonical.py +0 -0
  41. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/compat/session_store.py +0 -0
  42. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/config/__init__.py +0 -0
  43. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/config/auth_schema.py +0 -0
  44. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/config/loader.py +0 -0
  45. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/config/resiliency.py +0 -0
  46. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/config/routing.py +0 -0
  47. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/config/schema.py +0 -0
  48. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/config/server.py +0 -0
  49. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/config/vendors.py +0 -0
  50. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/convert/__init__.py +0 -0
  51. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/convert/anthropic_to_gemini.py +0 -0
  52. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/convert/anthropic_to_openai.py +0 -0
  53. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/convert/gemini_sse_adapter.py +0 -0
  54. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/convert/gemini_to_anthropic.py +0 -0
  55. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/convert/openai_to_anthropic.py +0 -0
  56. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/logging/__init__.py +0 -0
  57. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/model/__init__.py +0 -0
  58. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/model/auth.py +0 -0
  59. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/model/compat.py +0 -0
  60. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/model/constants.py +0 -0
  61. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/model/pricing.py +0 -0
  62. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/model/token.py +0 -0
  63. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/model/vendor.py +0 -0
  64. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/pricing.py +0 -0
  65. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/routing/__init__.py +0 -0
  66. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/routing/circuit_breaker.py +0 -0
  67. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/routing/error_classifier.py +0 -0
  68. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/routing/executor.py +0 -0
  69. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/routing/model_mapper.py +0 -0
  70. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/routing/quota_guard.py +0 -0
  71. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/routing/rate_limit.py +0 -0
  72. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/routing/retry.py +0 -0
  73. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/routing/router.py +0 -0
  74. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/routing/session_manager.py +0 -0
  75. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/routing/tier.py +0 -0
  76. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/routing/usage_parser.py +0 -0
  77. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/routing/usage_recorder.py +0 -0
  78. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/server/__init__.py +0 -0
  79. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/server/app.py +0 -0
  80. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/server/request_normalizer.py +0 -0
  81. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/server/responses.py +0 -0
  82. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/server/routes.py +0 -0
  83. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/streaming/__init__.py +0 -0
  84. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/streaming/anthropic_compat.py +0 -0
  85. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/vendors/__init__.py +0 -0
  86. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/vendors/anthropic.py +0 -0
  87. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/vendors/antigravity.py +0 -0
  88. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/vendors/base.py +0 -0
  89. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/vendors/copilot.py +0 -0
  90. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/vendors/copilot_models.py +0 -0
  91. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/vendors/copilot_token_manager.py +0 -0
  92. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/vendors/copilot_urls.py +0 -0
  93. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/vendors/mixins.py +0 -0
  94. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/src/coding/proxy/vendors/token_manager.py +0 -0
  95. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/__init__.py +0 -0
  96. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_antigravity.py +0 -0
  97. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_app_routes.py +0 -0
  98. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_auto_login.py +0 -0
  99. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_circuit_breaker.py +0 -0
  100. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_cli_usage.py +0 -0
  101. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_compat.py +0 -0
  102. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_config_init.py +0 -0
  103. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_config_loader.py +0 -0
  104. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_convert_request.py +0 -0
  105. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_convert_response.py +0 -0
  106. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_convert_sse.py +0 -0
  107. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_copilot.py +0 -0
  108. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_copilot_convert_request.py +0 -0
  109. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_copilot_convert_response.py +0 -0
  110. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_copilot_models.py +0 -0
  111. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_copilot_urls.py +0 -0
  112. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_currency.py +0 -0
  113. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_error_classifier.py +0 -0
  114. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_mixins.py +0 -0
  115. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_model_auth.py +0 -0
  116. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_model_compat.py +0 -0
  117. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_model_constants.py +0 -0
  118. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_model_mapper.py +0 -0
  119. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_model_pricing.py +0 -0
  120. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_model_token.py +0 -0
  121. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_model_vendor.py +0 -0
  122. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_parse_usage.py +0 -0
  123. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_pricing.py +0 -0
  124. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_quota_guard.py +0 -0
  125. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_rate_limit.py +0 -0
  126. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_request_normalizer.py +0 -0
  127. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_router_chain.py +0 -0
  128. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_runtime_reauth.py +0 -0
  129. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_schema.py +0 -0
  130. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_streaming_anthropic_compat.py +0 -0
  131. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_tier.py +0 -0
  132. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_tiers_config.py +0 -0
  133. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_token_manager.py +0 -0
  134. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_types.py +0 -0
  135. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_vendor_streaming.py +0 -0
  136. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_vendors.py +0 -0
  137. {coding_proxy-0.1.4a1 → coding_proxy-0.1.4a3}/tests/test_zhipu.py +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: coding-proxy
3
- Version: 0.1.4a1
3
+ Version: 0.1.4a3
4
4
  Summary: A High-Availability, Transparent, and Smart Multi-Vendor Proxy for Claude Code. Support Claude Plans, GitHub Copilot, Google Antigravity, ZAI/GLM.
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
@@ -1,6 +1,6 @@
1
1
  [project]
2
2
  name = "coding-proxy"
3
- version = "0.1.4a1"
3
+ version = "0.1.4a3"
4
4
  description = "A High-Availability, Transparent, and Smart Multi-Vendor Proxy for Claude Code. Support Claude Plans, GitHub Copilot, Google Antigravity, ZAI/GLM."
5
5
  readme = "README.md"
6
6
  requires-python = ">=3.12"
@@ -61,6 +61,7 @@ def start(
61
61
  import uvicorn
62
62
 
63
63
  from ..server.app import create_app
64
+ from .banner import print_banner
64
65
 
65
66
  cfg_path = _resolve_config_path(config)
66
67
  cfg = load_config(cfg_path)
@@ -76,6 +77,10 @@ def start(
76
77
  from ..logging import build_log_config
77
78
 
78
79
  fastapi_app = create_app(cfg)
80
+
81
+ # 打印启动品牌横幅
82
+ print_banner(console, host=cfg.server.host, port=cfg.server.port)
83
+
79
84
  uvicorn.run(
80
85
  fastapi_app,
81
86
  host=cfg.server.host,
@@ -0,0 +1,61 @@
1
+ """CLI 启动品牌横幅.
2
+
3
+ 使用 Rich Panel 构建紧凑的品牌展示面板,
4
+ 在服务启动前向终端输出版本与监听地址信息。
5
+
6
+ 设计原则:
7
+ - 正交分解: 展示逻辑独立于业务逻辑
8
+ - 复用驱动: 使用项目已有的 Rich Console 模式
9
+ - 最小干预: 无新依赖,纯组合现有组件
10
+ """
11
+
12
+ from __future__ import annotations
13
+
14
+ from typing import TYPE_CHECKING
15
+
16
+ from rich.panel import Panel
17
+ from rich.text import Text
18
+
19
+ if TYPE_CHECKING:
20
+ from rich.console import Console
21
+
22
+ from .. import __version__
23
+
24
+
25
+ def build_banner(host: str = "127.0.0.1", port: int = 8046) -> Panel:
26
+ """构建品牌横幅 Panel.
27
+
28
+ Args:
29
+ host: 监听地址.
30
+ port: 监听端口.
31
+
32
+ Returns:
33
+ 配置完成的 Rich Panel 实例.
34
+ """
35
+ brand_text = Text()
36
+ brand_text.append("⚡ ", style="bold")
37
+ brand_text.append("Coding Proxy", style="bold cyan")
38
+ brand_text.append("\n\n")
39
+
40
+ info_text = Text()
41
+ info_text.append("Version: ", style="dim")
42
+ info_text.append(__version__, style="green")
43
+ info_text.append(" │ ", style="dim")
44
+ info_text.append("Listening: ", style="dim")
45
+ info_text.append(f"http://{host}:{port}", style="blue")
46
+ brand_text.append(info_text)
47
+
48
+ return Panel(brand_text, border_style="cyan", padding=(1, 2), expand=False)
49
+
50
+
51
+ def print_banner(console: Console, host: str = "127.0.0.1", port: int = 8046) -> None:
52
+ """通过指定 Console 打印品牌横幅.
53
+
54
+ Args:
55
+ console: Rich Console 实例(复用 CLI 层已有实例).
56
+ host: 监听地址.
57
+ port: 监听端口.
58
+ """
59
+ console.print()
60
+ console.print(build_banner(host=host, port=port))
61
+ console.print()
@@ -158,7 +158,7 @@ model_mapping:
158
158
  is_regex: true
159
159
  - pattern: "claude-opus-.*"
160
160
  vendors: ["zhipu"]
161
- target: "glm-5v-turbo"
161
+ target: "glm-5.1"
162
162
  is_regex: true
163
163
  - pattern: "claude-haiku-.*"
164
164
  vendors: ["zhipu"]
@@ -247,7 +247,7 @@ pricing:
247
247
  - vendor: zhipu
248
248
  model: glm-4.5-air # 待区分长短上下文定价
249
249
  input_cost_per_mtok: ¥0.80
250
- output_cost_per_mtok: ¥6.00
250
+ output_cost_per_mtok: ¥2.00
251
251
  cache_read_cost_per_mtok: ¥0.16
252
252
  - vendor: zhipu
253
253
  model: glm-5v-turbo # 待区分长短上下文定价
@@ -256,9 +256,9 @@ pricing:
256
256
  cache_read_cost_per_mtok: ¥1.20
257
257
  - vendor: zhipu
258
258
  model: glm-5.1 # 待区分长短上下文定价
259
- input_cost_per_mtok: ¥4.00
260
- output_cost_per_mtok: ¥18.00
261
- cache_read_cost_per_mtok: ¥1.00
259
+ input_cost_per_mtok: ¥6.00
260
+ output_cost_per_mtok: ¥24.00
261
+ cache_read_cost_per_mtok: ¥1.30
262
262
  - vendor: zhipu
263
263
  model: glm-5-turbo # 待区分长短上下文定价
264
264
  input_cost_per_mtok: ¥5.00
@@ -255,7 +255,9 @@ class TokenLogger:
255
255
  return []
256
256
  days = max(1, days)
257
257
  start_iso = _days_start_utc_iso(days)
258
- sql = """SELECT local_date(ts) AS date, vendor, model_requested, model_served,
258
+ sql = """SELECT local_date(ts) AS date, vendor,
259
+ GROUP_CONCAT(DISTINCT model_requested) AS model_requested,
260
+ model_served,
259
261
  COUNT(*) AS total_requests,
260
262
  SUM(input_tokens) AS total_input,
261
263
  SUM(output_tokens) AS total_output,
@@ -272,8 +274,8 @@ class TokenLogger:
272
274
  sql += " AND model_requested = ?"
273
275
  params.append(model)
274
276
  sql += (
275
- " GROUP BY local_date(ts), vendor, model_requested, model_served"
276
- " ORDER BY local_date(ts) DESC, vendor, model_requested, model_served"
277
+ " GROUP BY local_date(ts), vendor, model_served"
278
+ " ORDER BY local_date(ts) DESC, vendor, model_served"
277
279
  )
278
280
  cursor = await self._db.execute(sql, params)
279
281
  rows = await cursor.fetchall()
@@ -101,7 +101,7 @@ async def show_usage(
101
101
  table.add_row(
102
102
  str(row.get("date", "")),
103
103
  vendor_name,
104
- str(row.get("model_requested", "")),
104
+ _format_model_display(row.get("model_requested")),
105
105
  model_served,
106
106
  str(row.get("total_requests", 0)),
107
107
  _format_tokens(total_input),
@@ -150,7 +150,7 @@ def _create_vendor_from_config(
150
150
  api_key=vendor_cfg.api_key,
151
151
  timeout_ms=vendor_cfg.timeout_ms,
152
152
  )
153
- return ZhipuVendor(cfg, mapper)
153
+ return ZhipuVendor(cfg, mapper, failover_cfg)
154
154
  case _:
155
155
  raise ValueError(f"未知的 vendor 类型: {vendor_cfg.vendor!r}")
156
156
 
@@ -16,7 +16,7 @@ from typing import Any
16
16
 
17
17
  import httpx
18
18
 
19
- from ..config.schema import ZhipuConfig
19
+ from ..config.schema import FailoverConfig, ZhipuConfig
20
20
  from ..routing.model_mapper import ModelMapper
21
21
  from .base import (
22
22
  PROXY_SKIP_HEADERS,
@@ -42,8 +42,11 @@ class ZhipuVendor(BaseVendor):
42
42
  self,
43
43
  config: ZhipuConfig,
44
44
  model_mapper: ModelMapper,
45
+ failover_config: FailoverConfig | None = None,
45
46
  ) -> None:
46
- super().__init__(config.base_url, config.timeout_ms)
47
+ super().__init__(
48
+ config.base_url, config.timeout_ms, failover_config=failover_config
49
+ )
47
50
  self._api_key = config.api_key
48
51
  self._model_mapper = model_mapper
49
52
 
@@ -0,0 +1,82 @@
1
+ """CLI 品牌横幅测试."""
2
+
3
+ from unittest.mock import MagicMock
4
+
5
+ from rich.panel import Panel
6
+
7
+ from coding.proxy.cli.banner import build_banner, print_banner
8
+
9
+ # ── build_banner() 测试 ────────────────────────────────────────
10
+
11
+
12
+ class TestBuildBanner:
13
+ """验证 build_banner() 返回正确的 Panel 结构与内容."""
14
+
15
+ def test_returns_panel_instance(self):
16
+ """返回值应为 Rich Panel 实例."""
17
+ panel = build_banner()
18
+ assert isinstance(panel, Panel)
19
+
20
+ def test_contains_brand_name(self):
21
+ """横幅应包含品牌名称 'Coding Proxy'."""
22
+ panel = build_banner()
23
+ plain = panel.renderable.plain
24
+ assert "Coding Proxy" in plain
25
+
26
+ def test_contains_version(self):
27
+ """横幅应包含当前版本号."""
28
+ from coding.proxy import __version__
29
+
30
+ panel = build_banner()
31
+ plain = panel.renderable.plain
32
+ assert __version__ in plain
33
+
34
+ def test_default_host_port(self):
35
+ """默认参数应使用 127.0.0.1:8046."""
36
+ panel = build_banner()
37
+ plain = panel.renderable.plain
38
+ assert "127.0.0.1" in plain
39
+ assert "8046" in plain
40
+
41
+ def test_custom_host_port(self):
42
+ """自定义 host/port 应正确渲染至横幅."""
43
+ panel = build_banner(host="0.0.0.0", port=9090)
44
+ plain = panel.renderable.plain
45
+ assert "0.0.0.0" in plain
46
+ assert "9090" in plain
47
+
48
+ def test_contains_listening_url(self):
49
+ """横幅应包含完整的监听 URL 格式."""
50
+ panel = build_banner(host="192.168.1.1", port=3000)
51
+ plain = panel.renderable.plain
52
+ assert "http://192.168.1.1:3000" in plain
53
+
54
+
55
+ # ── print_banner() 测试 ───────────────────────────────────────
56
+
57
+
58
+ class TestPrintBanner:
59
+ """验证 print_banner() 通过 Console 输出."""
60
+
61
+ def test_prints_to_console(self):
62
+ """print_banner 应调用 console.print()."""
63
+ mock_console = MagicMock()
64
+ print_banner(mock_console)
65
+ assert mock_console.print.called
66
+
67
+ def test_print_called_multiple_times(self):
68
+ """print_banner 应调用 console.print() 多次(空行 + Panel + 空行)."""
69
+ mock_console = MagicMock()
70
+ print_banner(mock_console)
71
+ # 预期调用次数:3 次(空行 + banner + 空行)
72
+ assert mock_console.print.call_count == 3
73
+
74
+ def test_print_includes_panel(self):
75
+ """print_banner 的某次调用应传入 Panel 实例."""
76
+ mock_console = MagicMock()
77
+ print_banner(mock_console)
78
+ call_args_list = mock_console.print.call_args_list
79
+ has_panel = any(
80
+ isinstance(call[0][0], Panel) for call in call_args_list if call[0]
81
+ )
82
+ assert has_panel
@@ -938,3 +938,180 @@ class TestExecuteMessageVendorErrorLogging:
938
938
  )
939
939
  assert "has_tool_results=True" in log_text
940
940
  assert "claude-opus-4-6" in log_text
941
+
942
+
943
+ # ── execute_message 429 降级测试 ─────────────────────────────
944
+
945
+
946
+ class TestExecuteMessageFailoverOn429:
947
+ """非流式路径下 vendor 返回 429 时应触发 tier 降级.
948
+
949
+ 覆盖核心修复场景:ZhipuVendor 未注入 FailoverConfig 导致
950
+ should_trigger_failover() 永远返回 False,429 无法降级到下一层。
951
+ """
952
+
953
+ @pytest.mark.asyncio
954
+ async def test_429_with_failover_config_triggers_failover(self):
955
+ """非 terminal 层 vendor 有 failover_config 时,429 应触发降级到下一层."""
956
+ # 模拟 zhipu 层返回 429(有 failover_config → should_trigger_failover 返回 True)
957
+ zhipu = _mock_vendor("zhipu")
958
+ zhipu.send_message = AsyncMock(
959
+ return_value=VendorResponse(
960
+ status_code=429,
961
+ raw_body='{"error":{"code":"1305","message":"\u8be5\u6a21\u578b\u5f53\u524d\u8bbf\u95ee\u91cf\u8fc7\u5927"}}'.encode(),
962
+ error_type=None,
963
+ error_message="该模型当前访问量过大,请您稍后再试",
964
+ )
965
+ )
966
+ zhipu.should_trigger_failover.return_value = True
967
+
968
+ # copilot 层正常响应
969
+ copilot = _mock_vendor("copilot")
970
+ copilot.send_message = AsyncMock(
971
+ return_value=VendorResponse(
972
+ status_code=200,
973
+ raw_body=b'{"content":"ok"}',
974
+ usage=UsageInfo(input_tokens=1, output_tokens=1),
975
+ )
976
+ )
977
+
978
+ zhipu_tier = _make_tier(zhipu)
979
+ exec_inst = _executor([zhipu_tier, _make_tier(copilot)])
980
+ resp = await exec_inst.execute_message({"model": "test"}, {})
981
+
982
+ assert resp.status_code == 200
983
+ assert copilot.send_message.called
984
+ # record_failure 在 VendorTier 上(非 vendor),通过 circuit_breaker 调用链验证
985
+ if zhipu_tier.circuit_breaker:
986
+ assert zhipu_tier.circuit_breaker.failure_count > 0
987
+
988
+ @pytest.mark.asyncio
989
+ async def test_429_without_failover_config_no_failover(self):
990
+ """非 terminal 层 vendor 无 failover_config 时,429 不应触发降级(原始行为)."""
991
+ bad = _mock_vendor("bad")
992
+ bad.send_message = AsyncMock(
993
+ return_value=VendorResponse(
994
+ status_code=429,
995
+ raw_body=b'{"error":{"message":"rate limited"}}',
996
+ error_type=None,
997
+ error_message="rate limited",
998
+ )
999
+ )
1000
+ # 显式设为 False:模拟无 failover_config 时 should_trigger_failover 的行为
1001
+ bad.should_trigger_failover.return_value = False
1002
+
1003
+ good = _mock_vendor("good")
1004
+ good_resp = VendorResponse(
1005
+ status_code=200,
1006
+ raw_body=b"{}",
1007
+ usage=UsageInfo(input_tokens=1, output_tokens=1),
1008
+ )
1009
+ good.send_message = AsyncMock(return_value=good_resp)
1010
+
1011
+ exec_inst = _executor([_make_tier(bad), _make_tier(good)])
1012
+ resp = await exec_inst.execute_message({"model": "test"}, {})
1013
+
1014
+ # 无 failover_config 时直接返回 429,不降级
1015
+ assert resp.status_code == 429
1016
+ assert not good.send_message.called
1017
+
1018
+ @pytest.mark.asyncio
1019
+ async def test_multi_tier_429_cascade(self):
1020
+ """多层降级链路:anthropic→zhipu(429)→copilot(success)."""
1021
+ anthropic = _mock_vendor("anthropic")
1022
+ anthropic.send_message = AsyncMock(
1023
+ return_value=VendorResponse(
1024
+ status_code=429,
1025
+ raw_body=b'{"error":{"type":"rate_limit_error","message":"quota exceeded"}}',
1026
+ error_type="rate_limit_error",
1027
+ error_message="quota exceeded",
1028
+ )
1029
+ )
1030
+ anthropic.should_trigger_failover.return_value = True
1031
+
1032
+ zhipu = _mock_vendor("zhipu")
1033
+ zhipu.send_message = AsyncMock(
1034
+ return_value=VendorResponse(
1035
+ status_code=429,
1036
+ raw_body=b'{"error":{"code":"1305","message":"model overloaded"}}',
1037
+ error_type=None,
1038
+ error_message="模型过载",
1039
+ )
1040
+ )
1041
+ zhipu.should_trigger_failover.return_value = True
1042
+
1043
+ copilot = _mock_vendor("copilot")
1044
+ copilot.send_message = AsyncMock(
1045
+ return_value=VendorResponse(
1046
+ status_code=200,
1047
+ raw_body=b'{"content":"fallback success"}',
1048
+ usage=UsageInfo(input_tokens=10, output_tokens=5),
1049
+ )
1050
+ )
1051
+
1052
+ exec_inst = _executor(
1053
+ [
1054
+ _make_tier(anthropic),
1055
+ _make_tier(zhipu),
1056
+ _make_tier(copilot),
1057
+ ]
1058
+ )
1059
+ resp = await exec_inst.execute_message({"model": "claude-opus-4-6"}, {})
1060
+
1061
+ assert resp.status_code == 200
1062
+ assert anthropic.send_message.called
1063
+ assert zhipu.send_message.called
1064
+ assert copilot.send_message.called
1065
+
1066
+ @pytest.mark.asyncio
1067
+ async def test_last_tier_429_returns_directly(self):
1068
+ """最后一层 vendor 返回 429 时应直接返回给客户端."""
1069
+ vendor = _mock_vendor()
1070
+ vendor.send_message = AsyncMock(
1071
+ return_value=VendorResponse(
1072
+ status_code=429,
1073
+ raw_body=b'{"error":{"message":"too many requests"}}',
1074
+ error_type=None,
1075
+ error_message="too many requests",
1076
+ )
1077
+ )
1078
+
1079
+ exec_inst = _executor([_make_tier(vendor)])
1080
+ resp = await exec_inst.execute_message({"model": "test"}, {})
1081
+
1082
+ assert resp.status_code == 429
1083
+
1084
+ @pytest.mark.asyncio
1085
+ async def test_429_failover_logs_warning(self, caplog):
1086
+ """429 触发降级时应输出 'failing over' 日志."""
1087
+ import logging as _logging
1088
+
1089
+ bad = _mock_vendor("zhipu")
1090
+ bad.send_message = AsyncMock(
1091
+ return_value=VendorResponse(
1092
+ status_code=429,
1093
+ raw_body=b'{"error":{"message":"overloaded"}}',
1094
+ error_type=None,
1095
+ error_message="overloaded",
1096
+ )
1097
+ )
1098
+ bad.should_trigger_failover.return_value = True
1099
+
1100
+ good = _mock_vendor("copilot")
1101
+ good.send_message = AsyncMock(
1102
+ return_value=VendorResponse(
1103
+ status_code=200,
1104
+ raw_body=b"{}",
1105
+ usage=UsageInfo(),
1106
+ )
1107
+ )
1108
+
1109
+ exec_inst = _executor([_make_tier(bad), _make_tier(good)])
1110
+
1111
+ with caplog.at_level(_logging.WARNING, logger="coding.proxy.routing.executor"):
1112
+ await exec_inst.execute_message({"model": "test"}, {})
1113
+
1114
+ warnings = [r for r in caplog.records if r.levelno == _logging.WARNING]
1115
+ log_text = "\n".join(r.message for r in warnings)
1116
+ assert "failing over" in log_text
1117
+ assert "zhipu" in log_text
@@ -491,3 +491,127 @@ async def test_query_daily_clamps_zero_days(logger):
491
491
  # days=0 不应报错,行为等同 days=1
492
492
  rows = await logger.query_daily(days=0)
493
493
  assert len(rows) >= 1
494
+
495
+
496
+ # ---------------------------------------------------------------------------
497
+ # 按 model_served 聚合测试(同日/同供应商/同实际模型 → 合并为一行)
498
+ # ---------------------------------------------------------------------------
499
+
500
+
501
+ @pytest.mark.asyncio
502
+ async def test_query_daily_aggregates_by_model_served(logger):
503
+ """核心场景:同日/同供应商/同 model_served 但不同 model_requested 应聚为一行."""
504
+ await logger.log(
505
+ vendor="anthropic",
506
+ model_requested="claude-opus-4-6",
507
+ model_served="claude-sonnet-4-6",
508
+ input_tokens=100,
509
+ output_tokens=50,
510
+ )
511
+ await logger.log(
512
+ vendor="anthropic",
513
+ model_requested="claude-sonnet-4-6",
514
+ model_served="claude-sonnet-4-6",
515
+ input_tokens=200,
516
+ output_tokens=80,
517
+ )
518
+ rows = await logger.query_daily(days=7)
519
+ # 同一 model_served → 聚为一行
520
+ assert len(rows) == 1
521
+ row = rows[0]
522
+ # model_requested 应包含两个值,逗号分隔
523
+ requested_models = set(row["model_requested"].split(","))
524
+ assert requested_models == {"claude-opus-4-6", "claude-sonnet-4-6"}
525
+ # Token 统计应正确求和
526
+ assert row["total_requests"] == 2
527
+ assert row["total_input"] == 300
528
+ assert row["total_output"] == 130
529
+
530
+
531
+ @pytest.mark.asyncio
532
+ async def test_query_daily_single_model_no_comma(logger):
533
+ """边界:仅一个 model_requested 时不应出现多余逗号."""
534
+ await logger.log(
535
+ vendor="anthropic",
536
+ model_requested="claude-sonnet-4-6",
537
+ model_served="claude-sonnet-4-6",
538
+ input_tokens=100,
539
+ output_tokens=50,
540
+ )
541
+ rows = await logger.query_daily(days=7)
542
+ assert len(rows) == 1
543
+ # 单值时应为纯字符串,不含逗号
544
+ assert rows[0]["model_requested"] == "claude-sonnet-4-6"
545
+ assert "," not in rows[0]["model_requested"]
546
+
547
+
548
+ @pytest.mark.asyncio
549
+ async def test_query_daily_distinct_deduplication(logger):
550
+ """DISTINCT 应去重相同的 model_requested."""
551
+ await logger.log(
552
+ vendor="anthropic",
553
+ model_requested="claude-sonnet-4-6",
554
+ model_served="claude-sonnet-4-6",
555
+ input_tokens=100,
556
+ output_tokens=50,
557
+ )
558
+ await logger.log(
559
+ vendor="anthropic",
560
+ model_requested="claude-sonnet-4-6", # 相同的 model_requested
561
+ model_served="claude-sonnet-4-6",
562
+ input_tokens=200,
563
+ output_tokens=80,
564
+ )
565
+ rows = await logger.query_daily(days=7)
566
+ assert len(rows) == 1
567
+ # 去重后不应重复出现
568
+ assert rows[0]["model_requested"] == "claude-sonnet-4-6"
569
+ assert rows[0]["model_requested"].count(",") == 0
570
+
571
+
572
+ @pytest.mark.asyncio
573
+ async def test_query_daily_model_filter_still_works(logger):
574
+ """--model/-m 过滤在聚合前执行,行为不变."""
575
+ await logger.log(
576
+ vendor="anthropic",
577
+ model_requested="claude-opus-4-6",
578
+ model_served="claude-sonnet-4-6",
579
+ input_tokens=100,
580
+ output_tokens=50,
581
+ )
582
+ await logger.log(
583
+ vendor="anthropic",
584
+ model_requested="claude-sonnet-4-6",
585
+ model_served="claude-sonnet-4-6",
586
+ input_tokens=200,
587
+ output_tokens=80,
588
+ )
589
+ # 按 model_requested 过滤,仅保留 opus 的记录
590
+ rows = await logger.query_daily(days=7, model="claude-opus-4-6")
591
+ assert len(rows) == 1
592
+ assert rows[0]["total_requests"] == 1
593
+ assert rows[0]["total_input"] == 100
594
+
595
+
596
+ @pytest.mark.asyncio
597
+ async def test_query_daily_different_vendors_not_merged(logger):
598
+ """不同供应商即使 model_served 相同也不应合并."""
599
+ await logger.log(
600
+ vendor="anthropic",
601
+ model_requested="claude-sonnet-4-6",
602
+ model_served="claude-sonnet-4-6",
603
+ input_tokens=100,
604
+ output_tokens=50,
605
+ )
606
+ await logger.log(
607
+ vendor="zhipu",
608
+ model_requested="claude-sonnet-4-6",
609
+ model_served="claude-sonnet-4-6", # 同一 model_served
610
+ input_tokens=200,
611
+ output_tokens=80,
612
+ )
613
+ rows = await logger.query_daily(days=7)
614
+ # 不同供应商,应为两行
615
+ assert len(rows) == 2
616
+ vendors = {r["vendor"] for r in rows}
617
+ assert vendors == {"anthropic", "zhipu"}
@@ -65,7 +65,7 @@ wheels = [
65
65
 
66
66
  [[package]]
67
67
  name = "coding-proxy"
68
- version = "0.1.4a1"
68
+ version = "0.1.4a3"
69
69
  source = { editable = "." }
70
70
  dependencies = [
71
71
  { name = "aiosqlite" },
File without changes
File without changes
File without changes
File without changes