coding-proxy 0.2.1a1__tar.gz → 0.2.1a3__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.
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/.gitignore +3 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/CHANGELOG.md +12 -1
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/PKG-INFO +2 -2
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/pyproject.toml +2 -2
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/cli/__init__.py +8 -1
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/config/config.default.yaml +15 -12
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/config/server.py +12 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/config/vendors.py +1 -0
- coding_proxy-0.2.1a3/src/coding/proxy/logging/__init__.py +188 -0
- coding_proxy-0.2.1a3/src/coding/proxy/logging/formatters.py +27 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/circuit_breaker.py +30 -7
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/executor.py +59 -5
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/tier.py +24 -2
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/usage_recorder.py +1 -1
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/server/app.py +3 -1
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/server/factory.py +4 -1
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/antigravity.py +210 -6
- coding_proxy-0.2.1a3/tests/test_antigravity.py +781 -0
- coding_proxy-0.2.1a3/tests/test_logging_dual_write.py +330 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/uv.lock +1 -1
- coding_proxy-0.2.1a1/src/coding/proxy/logging/__init__.py +0 -50
- coding_proxy-0.2.1a1/tests/test_antigravity.py +0 -365
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/.github/workflows/ci.yml +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/.github/workflows/coverage.yml +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/.github/workflows/release.yml +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/AGENTS.md +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/CLAUDE.md +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/LICENSE +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/README.md +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/docs/ci-cd.md +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/docs/framework.md +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/docs/user-guide.md +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/docs/zh-CN/README.md +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/__main__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/auth/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/auth/providers/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/auth/providers/base.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/auth/providers/github.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/auth/providers/google.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/auth/runtime.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/auth/store.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/cli/auth_commands.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/cli/banner.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/compat/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/compat/canonical.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/compat/session_store.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/config/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/config/auth_schema.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/config/loader.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/config/resiliency.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/config/routing.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/config/schema.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/convert/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/convert/anthropic_to_gemini.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/convert/anthropic_to_openai.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/convert/gemini_sse_adapter.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/convert/gemini_to_anthropic.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/convert/openai_to_anthropic.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/logging/db.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/logging/stats.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/model/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/model/auth.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/model/compat.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/model/constants.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/model/pricing.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/model/token.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/model/vendor.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/pricing.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/error_classifier.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/model_mapper.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/quota_guard.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/rate_limit.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/retry.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/router.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/session_manager.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/usage_parser.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/server/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/server/request_normalizer.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/server/responses.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/server/routes.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/streaming/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/streaming/anthropic_compat.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/alibaba.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/anthropic.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/base.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/copilot.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/copilot_models.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/copilot_token_manager.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/copilot_urls.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/doubao.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/kimi.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/minimax.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/mixins.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/native_anthropic.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/token_manager.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/xiaomi.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/zhipu.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_app_routes.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_auto_login.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_banner.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_circuit_breaker.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_cli_usage.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_compat.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_config_init.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_config_loader.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_convert_request.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_convert_response.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_convert_sse.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_copilot.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_copilot_convert_request.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_copilot_convert_response.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_copilot_models.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_copilot_urls.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_currency.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_error_classifier.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_mixins.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_model_auth.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_model_compat.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_model_constants.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_model_mapper.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_model_pricing.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_model_token.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_model_vendor.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_native_vendors.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_parse_usage.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_pricing.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_quota_guard.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_rate_limit.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_request_normalizer.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_router_chain.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_router_executor.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_runtime_reauth.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_schema.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_streaming_anthropic_compat.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_tier.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_tiers_config.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_time_range.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_token_logger.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_token_manager.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_types.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_vendor_streaming.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_vendors.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a3}/tests/test_zhipu.py +0 -0
|
@@ -4,11 +4,22 @@
|
|
|
4
4
|
|
|
5
5
|
## [Unreleased]
|
|
6
6
|
|
|
7
|
+
- style(lint): 移除未使用变量 `old_base_url` 并合并重复的 `antigravity` 导入块;
|
|
8
|
+
## [v0.2.1](https://github.com/ThreeFish-AI/coding-proxy/releases/tag/v0.2.1a1) — 2026-04-11
|
|
9
|
+
|
|
10
|
+
- fix(antigravity): 修复 Google OAuth token 刷新后 scope 校验过严导致 403 的问题;
|
|
11
|
+
- refactor(request-normalizer): 移除跨供应商 tool_result 重定位死代码,docstring 对齐实际剥离行为;
|
|
12
|
+
|
|
13
|
+
|
|
7
14
|
- **请求规范化死代码清理**:移除 `request_normalizer` 中永远不可达的 `tool_result` 重定位逻辑(Phase 1 剥离已覆盖全部场景,Phase 2 重定位因方向错误无法启用);更新 docstring 使之与实际行为(剥离)一致;
|
|
8
15
|
|
|
9
16
|
### 🐛 Bug 修复
|
|
10
17
|
|
|
11
|
-
- **fix(antigravity)**:
|
|
18
|
+
- **fix(antigravity)**: 新增 Google Cloud Code **v1internal 协议支持 + project_id 自动发现**,彻底解决 `ACCESS_TOKEN_SCOPE_INSUFFICIENT` (403) 问题。
|
|
19
|
+
- **根因**:此前调用标准 Generative Language API (`generativelanguage.googleapis.com`),该端点对 OAuth scope 校验严格;参考项目 Antigravity-Manager 实际使用的是 Cloud Code v1internal 内部 API (`cloudcode-pa.googleapis.com/v1internal`),接受相同凭证但协议格式不同
|
|
20
|
+
- **修复(v1internal 协议)**:新增 `project_id` 配置字段 + v1internal 请求信封包装 + 客户端指纹 Headers + 端点 URL 适配
|
|
21
|
+
- **修复(自动发现)**:利用已有的 `cloud-platform` OAuth scope 通过 Cloud Resource Manager API 自动发现用户的 GCP `project_id`,首次请求时零配置自动切换至 v1internal 模式——开箱即用,无需手动配置
|
|
22
|
+
- **附带改进**:`_acquire()` scope 校验保持 warning 降级;`_mark_scope_error_if_needed()` 增强诊断日志;`get_diagnostics()` 暴露发现状态
|
|
12
23
|
|
|
13
24
|
## [v0.2.0](https://github.com/ThreeFish-AI/coding-proxy/releases/tag/v0.2.0) — 2026-04-09
|
|
14
25
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: coding-proxy
|
|
3
|
-
Version: 0.2.
|
|
4
|
-
Summary: A High-Availability, Transparent, and Smart Multi-Vendor Proxy for Claude Code. Support Claude Plans, GitHub Copilot, Google Antigravity, ZAI/GLM
|
|
3
|
+
Version: 0.2.1a3
|
|
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
|
|
7
7
|
Project-URL: Bug Tracker, https://github.com/ThreeFish-AI/coding-proxy/issues
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
[project]
|
|
2
2
|
name = "coding-proxy"
|
|
3
|
-
version = "0.2.
|
|
4
|
-
description = "A High-Availability, Transparent, and Smart Multi-Vendor Proxy for Claude Code. Support Claude Plans, GitHub Copilot, Google Antigravity, ZAI/GLM
|
|
3
|
+
version = "0.2.1a3"
|
|
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"
|
|
7
7
|
authors = [{ name = "ThreeFish-AI", email = "threefish.ai@gmail.com" }]
|
|
@@ -104,11 +104,18 @@ def start(
|
|
|
104
104
|
# 打印启动品牌横幅
|
|
105
105
|
print_banner(console, host=cfg.server.host, port=cfg.server.port)
|
|
106
106
|
|
|
107
|
+
# 解析文件日志路径:未显式配置时使用默认值
|
|
108
|
+
_file_path: str | None = cfg.logging.file or "coding-proxy.log"
|
|
107
109
|
uvicorn.run(
|
|
108
110
|
fastapi_app,
|
|
109
111
|
host=cfg.server.host,
|
|
110
112
|
port=cfg.server.port,
|
|
111
|
-
log_config=build_log_config(
|
|
113
|
+
log_config=build_log_config(
|
|
114
|
+
level=cfg.logging.level,
|
|
115
|
+
file_path=_file_path,
|
|
116
|
+
max_bytes=cfg.logging.max_bytes,
|
|
117
|
+
backup_count=cfg.logging.backup_count,
|
|
118
|
+
),
|
|
112
119
|
)
|
|
113
120
|
|
|
114
121
|
|
|
@@ -8,6 +8,9 @@ server:
|
|
|
8
8
|
|
|
9
9
|
logging:
|
|
10
10
|
level: "INFO"
|
|
11
|
+
# file: "coding-proxy.log" # 文件日志路径;设为 null 或空字符串禁用
|
|
12
|
+
# max_bytes: 5242880 # 单文件上限(5 MB),触发轮转
|
|
13
|
+
# backup_count: 5 # 保留 gzip 压缩备份文件数
|
|
11
14
|
|
|
12
15
|
# === 降级链路优先级(可选) ===
|
|
13
16
|
#
|
|
@@ -334,12 +337,6 @@ pricing:
|
|
|
334
337
|
output_cost_per_mtok: $25.0
|
|
335
338
|
cache_write_cost_per_mtok: $6.25
|
|
336
339
|
cache_read_cost_per_mtok: $0.50
|
|
337
|
-
- vendor: anthropic
|
|
338
|
-
model: Claude Opus 4.6
|
|
339
|
-
input_cost_per_mtok: $5.0
|
|
340
|
-
output_cost_per_mtok: $25.0
|
|
341
|
-
cache_write_cost_per_mtok: $6.25
|
|
342
|
-
cache_read_cost_per_mtok: $0.50
|
|
343
340
|
- vendor: anthropic
|
|
344
341
|
model: claude-sonnet-4-6
|
|
345
342
|
input_cost_per_mtok: $3.0
|
|
@@ -352,12 +349,6 @@ pricing:
|
|
|
352
349
|
output_cost_per_mtok: $5
|
|
353
350
|
cache_write_cost_per_mtok: $1.25
|
|
354
351
|
cache_read_cost_per_mtok: $0.10
|
|
355
|
-
- vendor: anthropic
|
|
356
|
-
model: Claude Haiku 4.5
|
|
357
|
-
input_cost_per_mtok: $1
|
|
358
|
-
output_cost_per_mtok: $5
|
|
359
|
-
cache_write_cost_per_mtok: $1.25
|
|
360
|
-
cache_read_cost_per_mtok: $0.10
|
|
361
352
|
# ── GitHub Copilot(透传 Claude,参照 Anthropic 定价估算) ──
|
|
362
353
|
- vendor: copilot
|
|
363
354
|
model: claude-opus-4.6
|
|
@@ -365,6 +356,12 @@ pricing:
|
|
|
365
356
|
output_cost_per_mtok: $25.0
|
|
366
357
|
cache_write_cost_per_mtok: $6.25
|
|
367
358
|
cache_read_cost_per_mtok: $0.50
|
|
359
|
+
- vendor: copilot
|
|
360
|
+
model: Claude Opus 4.6
|
|
361
|
+
input_cost_per_mtok: $5.0
|
|
362
|
+
output_cost_per_mtok: $25.0
|
|
363
|
+
cache_write_cost_per_mtok: $6.25
|
|
364
|
+
cache_read_cost_per_mtok: $0.50
|
|
368
365
|
- vendor: copilot
|
|
369
366
|
model: Claude Sonnet 4.6
|
|
370
367
|
input_cost_per_mtok: $3.0
|
|
@@ -389,6 +386,12 @@ pricing:
|
|
|
389
386
|
output_cost_per_mtok: $5
|
|
390
387
|
cache_write_cost_per_mtok: $1.25
|
|
391
388
|
cache_read_cost_per_mtok: $0.10
|
|
389
|
+
- vendor: copilot
|
|
390
|
+
model: Claude Haiku 4.5
|
|
391
|
+
input_cost_per_mtok: $1
|
|
392
|
+
output_cost_per_mtok: $5
|
|
393
|
+
cache_write_cost_per_mtok: $1.25
|
|
394
|
+
cache_read_cost_per_mtok: $0.10
|
|
392
395
|
# ── Google Antigravity(参照 Anthropic 定价估算) ──
|
|
393
396
|
- vendor: antigravity
|
|
394
397
|
model: claude-opus-4-6-thinking
|
|
@@ -17,8 +17,20 @@ class DatabaseConfig(BaseModel):
|
|
|
17
17
|
|
|
18
18
|
|
|
19
19
|
class LoggingConfig(BaseModel):
|
|
20
|
+
"""日志配置.
|
|
21
|
+
|
|
22
|
+
Attributes:
|
|
23
|
+
level: 控制台日志级别(INFO / WARNING / DEBUG 等)。
|
|
24
|
+
file: 文件日志路径。为 ``None`` 时使用默认值 ``coding-proxy.log``;
|
|
25
|
+
设为空字符串可禁用文件日志。
|
|
26
|
+
max_bytes: 单个日志文件最大字节数(触发轮转)。默认 5 MB。
|
|
27
|
+
backup_count: 保留的已压缩备份文件数。默认 5。
|
|
28
|
+
"""
|
|
29
|
+
|
|
20
30
|
level: str = "INFO"
|
|
21
31
|
file: str | None = None
|
|
32
|
+
max_bytes: int = 5 * 1024 * 1024
|
|
33
|
+
backup_count: int = 5
|
|
22
34
|
|
|
23
35
|
|
|
24
36
|
__all__ = ["ServerConfig", "DatabaseConfig", "LoggingConfig"]
|
|
@@ -34,6 +34,7 @@ class AntigravityConfig(BaseModel):
|
|
|
34
34
|
model_endpoint: str = "models/claude-sonnet-4-20250514"
|
|
35
35
|
timeout_ms: int = 300000
|
|
36
36
|
safety_settings: dict[str, str] | None = None
|
|
37
|
+
project_id: str = "" # GCP Project ID(v1internal 协议必填)
|
|
37
38
|
|
|
38
39
|
|
|
39
40
|
class ZhipuConfig(BaseModel):
|
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
"""日志模块.
|
|
2
|
+
|
|
3
|
+
提供 uvicorn 兼容的 dictConfig 构建、文件日志字符串格式化器、
|
|
4
|
+
以及 gzip 压缩轮转支持。
|
|
5
|
+
"""
|
|
6
|
+
|
|
7
|
+
from __future__ import annotations
|
|
8
|
+
|
|
9
|
+
import gzip
|
|
10
|
+
import logging
|
|
11
|
+
import logging.handlers
|
|
12
|
+
import os
|
|
13
|
+
from pathlib import Path
|
|
14
|
+
|
|
15
|
+
from .formatters import FileFormatter
|
|
16
|
+
|
|
17
|
+
# ── 常量 ────────────────────────────────────────────────────────
|
|
18
|
+
|
|
19
|
+
_DEFAULT_MAX_BYTES = 5 * 1024 * 1024 # 5 MB per file
|
|
20
|
+
_DEFAULT_BACKUP_COUNT = 5 # Keep 5 rotated backups
|
|
21
|
+
_FILE_LOG_LEVEL = "DEBUG" # File logs capture everything
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
def _gzip_namer(default_name: str) -> str:
|
|
25
|
+
"""RotatingFileHandler namer: 为轮转文件添加 .gz 后缀."""
|
|
26
|
+
return default_name + ".gz"
|
|
27
|
+
|
|
28
|
+
|
|
29
|
+
def _gzip_rotator(source: str, dest: str) -> None:
|
|
30
|
+
"""RotatingFileHandler rotator: 将源文件 gzip 压缩后写入目标.
|
|
31
|
+
|
|
32
|
+
流程:
|
|
33
|
+
1. 读取 source 文件全部内容
|
|
34
|
+
2. gzip 压缩写入 dest 文件
|
|
35
|
+
3. 删除 source 原文件
|
|
36
|
+
"""
|
|
37
|
+
with open(source, "rb") as f_in:
|
|
38
|
+
data = f_in.read()
|
|
39
|
+
with open(dest, "wb") as f_out:
|
|
40
|
+
f_out.write(gzip.compress(data, compresslevel=6))
|
|
41
|
+
os.remove(source)
|
|
42
|
+
|
|
43
|
+
|
|
44
|
+
def _create_rotating_file_handler(
|
|
45
|
+
*,
|
|
46
|
+
filename: str,
|
|
47
|
+
maxBytes: int = _DEFAULT_MAX_BYTES,
|
|
48
|
+
backupCount: int = _DEFAULT_BACKUP_COUNT,
|
|
49
|
+
encoding: str = "utf-8",
|
|
50
|
+
) -> logging.handlers.RotatingFileHandler:
|
|
51
|
+
"""创建带 gzip 压缩轮转的 RotatingFileHandler(dictConfig 兼容工厂函数).
|
|
52
|
+
|
|
53
|
+
``logging.config.dictConfig`` 仅支持通过构造函数 kwargs 配置 handler,
|
|
54
|
+
而 ``namer`` / ``rotator`` 是实例属性而非构造参数,因此需要通过工厂函数注入。
|
|
55
|
+
"""
|
|
56
|
+
handler = logging.handlers.RotatingFileHandler(
|
|
57
|
+
filename=filename,
|
|
58
|
+
maxBytes=maxBytes,
|
|
59
|
+
backupCount=backupCount,
|
|
60
|
+
encoding=encoding,
|
|
61
|
+
)
|
|
62
|
+
handler.namer = _gzip_namer
|
|
63
|
+
handler.rotator = _gzip_rotator
|
|
64
|
+
return handler
|
|
65
|
+
|
|
66
|
+
|
|
67
|
+
def build_log_config(
|
|
68
|
+
level: str = "INFO",
|
|
69
|
+
file_path: str | None = None,
|
|
70
|
+
max_bytes: int = _DEFAULT_MAX_BYTES,
|
|
71
|
+
backup_count: int = _DEFAULT_BACKUP_COUNT,
|
|
72
|
+
) -> dict:
|
|
73
|
+
"""构建 uvicorn log_config,支持双写(控制台 + 文件).
|
|
74
|
+
|
|
75
|
+
Args:
|
|
76
|
+
level: 控制台日志级别(默认 INFO)。
|
|
77
|
+
file_path: 文件日志路径。为 ``None`` 时仅输出到控制台(向后兼容)。
|
|
78
|
+
max_bytes: 单个日志文件最大字节数(默认 5 MB)。
|
|
79
|
+
backup_count: 保留的轮转备份文件数(默认 5)。
|
|
80
|
+
|
|
81
|
+
Returns:
|
|
82
|
+
符合 ``logging.config.dictConfig`` 规范的字典。
|
|
83
|
+
|
|
84
|
+
双写行为:
|
|
85
|
+
- 控制台:人类可读格式,级别由 ``level`` 参数控制(handler 级别过滤)
|
|
86
|
+
- 文件:字符串格式(与控制台风格一致),固定 DEBUG 级别(捕获所有日志)
|
|
87
|
+
- 当 ``file_path`` 为 ``None`` 或空字符串时,退化为纯控制台模式(向后兼容)
|
|
88
|
+
"""
|
|
89
|
+
config: dict = {
|
|
90
|
+
"version": 1,
|
|
91
|
+
"disable_existing_loggers": False,
|
|
92
|
+
"formatters": {
|
|
93
|
+
"default": {
|
|
94
|
+
"()": "uvicorn.logging.DefaultFormatter",
|
|
95
|
+
"fmt": "%(asctime)s %(levelprefix)s %(message)s",
|
|
96
|
+
"datefmt": "%Y-%m-%d %H:%M:%S",
|
|
97
|
+
"use_colors": None,
|
|
98
|
+
},
|
|
99
|
+
"access": {
|
|
100
|
+
"()": "uvicorn.logging.AccessFormatter",
|
|
101
|
+
"fmt": '%(asctime)s %(levelprefix)s %(client_addr)s - "%(request_line)s" %(status_code)s',
|
|
102
|
+
"datefmt": "%Y-%m-%d %H:%M:%S",
|
|
103
|
+
},
|
|
104
|
+
},
|
|
105
|
+
"handlers": {
|
|
106
|
+
"default": {
|
|
107
|
+
"formatter": "default",
|
|
108
|
+
"class": "logging.StreamHandler",
|
|
109
|
+
"stream": "ext://sys.stderr",
|
|
110
|
+
"level": level,
|
|
111
|
+
},
|
|
112
|
+
"access": {
|
|
113
|
+
"formatter": "access",
|
|
114
|
+
"class": "logging.StreamHandler",
|
|
115
|
+
"stream": "ext://sys.stdout",
|
|
116
|
+
"level": "INFO",
|
|
117
|
+
},
|
|
118
|
+
},
|
|
119
|
+
"loggers": {
|
|
120
|
+
"uvicorn": {"handlers": ["default"], "level": level, "propagate": False},
|
|
121
|
+
"uvicorn.error": {"level": level},
|
|
122
|
+
"uvicorn.access": {
|
|
123
|
+
"handlers": ["access"],
|
|
124
|
+
"level": "INFO",
|
|
125
|
+
"propagate": False,
|
|
126
|
+
},
|
|
127
|
+
"coding.proxy": {
|
|
128
|
+
"handlers": ["default"],
|
|
129
|
+
"level": level,
|
|
130
|
+
"propagate": False,
|
|
131
|
+
},
|
|
132
|
+
},
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
# ── 条件注入:文件日志基础设施 ────────────────────────────
|
|
136
|
+
if file_path:
|
|
137
|
+
# 确保日志目录存在
|
|
138
|
+
log_file = Path(file_path)
|
|
139
|
+
log_file.parent.mkdir(parents=True, exist_ok=True)
|
|
140
|
+
|
|
141
|
+
# 注入文件日志字符串 formatter
|
|
142
|
+
config["formatters"]["file_fmt"] = {
|
|
143
|
+
"()": "coding.proxy.logging.formatters.FileFormatter",
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
# 注入 RotatingFileHandler(gzip 压缩轮转)
|
|
147
|
+
# 使用工厂函数(而非 class + namer/rotator kwargs),
|
|
148
|
+
# 因为 dictConfig 不支持将 namer/rotator 作为构造参数传递
|
|
149
|
+
config["handlers"]["file"] = {
|
|
150
|
+
"formatter": "file_fmt",
|
|
151
|
+
"()": "coding.proxy.logging._create_rotating_file_handler",
|
|
152
|
+
"filename": str(log_file.resolve()),
|
|
153
|
+
"maxBytes": max_bytes,
|
|
154
|
+
"backupCount": backup_count,
|
|
155
|
+
"encoding": "utf-8",
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
# 为每个 logger 添加 file handler
|
|
159
|
+
# 注意:uvicorn.error 无 handlers 键(通过 propagate 继承 uvicorn 的 handler)
|
|
160
|
+
for logger_name in (
|
|
161
|
+
"uvicorn",
|
|
162
|
+
"uvicorn.error",
|
|
163
|
+
"uvicorn.access",
|
|
164
|
+
"coding.proxy",
|
|
165
|
+
):
|
|
166
|
+
logger_cfg = config["loggers"][logger_name]
|
|
167
|
+
handlers = logger_cfg.get("handlers", [])
|
|
168
|
+
if isinstance(handlers, list):
|
|
169
|
+
handlers.append("file")
|
|
170
|
+
logger_cfg["handlers"] = handlers
|
|
171
|
+
else:
|
|
172
|
+
logger_cfg["handlers"] = [handlers, "file"]
|
|
173
|
+
|
|
174
|
+
# Logger 级别设为 DEBUG(让所有消息通过到 file handler)
|
|
175
|
+
# Console handler 已设 level 过滤,确保控制台仅输出 INFO+
|
|
176
|
+
config["loggers"]["coding.proxy"]["level"] = _FILE_LOG_LEVEL
|
|
177
|
+
config["loggers"]["uvicorn"]["level"] = _FILE_LOG_LEVEL
|
|
178
|
+
config["loggers"]["uvicorn.error"]["level"] = _FILE_LOG_LEVEL
|
|
179
|
+
|
|
180
|
+
return config
|
|
181
|
+
|
|
182
|
+
|
|
183
|
+
__all__ = [
|
|
184
|
+
"build_log_config",
|
|
185
|
+
"FileFormatter",
|
|
186
|
+
"_gzip_namer",
|
|
187
|
+
"_gzip_rotator",
|
|
188
|
+
]
|
|
@@ -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(
|
|
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
|
|
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(
|
|
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
|
-
|
|
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,
|
|
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
|
"""判断是否为订阅用量上限错误."""
|
|
@@ -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(
|
|
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(
|
|
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
|
|
|
@@ -66,7 +66,7 @@ class UsageRecorder:
|
|
|
66
66
|
)
|
|
67
67
|
if cost_value is not None:
|
|
68
68
|
cost_str = cost_value.format()
|
|
69
|
-
logger.
|
|
69
|
+
logger.debug(
|
|
70
70
|
"ModelCall: vendor=%s model_requested=%s model_served=%s "
|
|
71
71
|
"duration=%dms tokens=[in:%d out:%d cache_create:%d cache_read:%d] cost=%s",
|
|
72
72
|
vendor,
|
|
@@ -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(
|
|
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
|
)
|