coding-proxy 0.2.1a1__tar.gz → 0.2.1a2__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.1a2}/.gitignore +3 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/CHANGELOG.md +9 -1
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/PKG-INFO +2 -2
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/pyproject.toml +2 -2
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/cli/__init__.py +8 -1
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/config/config.default.yaml +15 -12
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/config/server.py +12 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/config/vendors.py +1 -0
- coding_proxy-0.2.1a2/src/coding/proxy/logging/__init__.py +188 -0
- coding_proxy-0.2.1a2/src/coding/proxy/logging/formatters.py +49 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/routing/usage_recorder.py +1 -1
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/antigravity.py +79 -6
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_antigravity.py +104 -0
- coding_proxy-0.2.1a2/tests/test_logging_dual_write.py +339 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/uv.lock +1 -1
- coding_proxy-0.2.1a1/src/coding/proxy/logging/__init__.py +0 -50
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/.github/workflows/ci.yml +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/.github/workflows/coverage.yml +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/.github/workflows/release.yml +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/AGENTS.md +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/CLAUDE.md +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/LICENSE +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/README.md +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/docs/ci-cd.md +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/docs/framework.md +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/docs/user-guide.md +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/docs/zh-CN/README.md +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/__main__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/auth/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/auth/providers/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/auth/providers/base.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/auth/providers/github.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/auth/providers/google.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/auth/runtime.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/auth/store.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/cli/auth_commands.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/cli/banner.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/compat/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/compat/canonical.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/compat/session_store.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/config/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/config/auth_schema.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/config/loader.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/config/resiliency.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/config/routing.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/config/schema.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/convert/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/convert/anthropic_to_gemini.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/convert/anthropic_to_openai.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/convert/gemini_sse_adapter.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/convert/gemini_to_anthropic.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/convert/openai_to_anthropic.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/logging/db.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/logging/stats.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/model/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/model/auth.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/model/compat.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/model/constants.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/model/pricing.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/model/token.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/model/vendor.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/pricing.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/routing/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/routing/circuit_breaker.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/routing/error_classifier.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/routing/executor.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/routing/model_mapper.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/routing/quota_guard.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/routing/rate_limit.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/routing/retry.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/routing/router.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/routing/session_manager.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/routing/tier.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/routing/usage_parser.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/server/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/server/app.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/server/factory.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/server/request_normalizer.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/server/responses.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/server/routes.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/streaming/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/streaming/anthropic_compat.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/alibaba.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/anthropic.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/base.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/copilot.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/copilot_models.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/copilot_token_manager.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/copilot_urls.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/doubao.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/kimi.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/minimax.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/mixins.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/native_anthropic.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/token_manager.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/xiaomi.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/src/coding/proxy/vendors/zhipu.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/__init__.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_app_routes.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_auto_login.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_banner.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_circuit_breaker.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_cli_usage.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_compat.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_config_init.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_config_loader.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_convert_request.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_convert_response.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_convert_sse.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_copilot.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_copilot_convert_request.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_copilot_convert_response.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_copilot_models.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_copilot_urls.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_currency.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_error_classifier.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_mixins.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_model_auth.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_model_compat.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_model_constants.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_model_mapper.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_model_pricing.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_model_token.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_model_vendor.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_native_vendors.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_parse_usage.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_pricing.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_quota_guard.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_rate_limit.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_request_normalizer.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_router_chain.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_router_executor.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_runtime_reauth.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_schema.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_streaming_anthropic_compat.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_tier.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_tiers_config.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_time_range.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_token_logger.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_token_manager.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_types.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_vendor_streaming.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_vendors.py +0 -0
- {coding_proxy-0.2.1a1 → coding_proxy-0.2.1a2}/tests/test_zhipu.py +0 -0
|
@@ -3,12 +3,20 @@
|
|
|
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
|
+
|
|
8
|
+
- fix(antigravity): 修复 Google OAuth token 刷新后 scope 校验过严导致 403 的问题;
|
|
9
|
+
- refactor(request-normalizer): 移除跨供应商 tool_result 重定位死代码,docstring 对齐实际剥离行为;
|
|
10
|
+
|
|
6
11
|
|
|
7
12
|
- **请求规范化死代码清理**:移除 `request_normalizer` 中永远不可达的 `tool_result` 重定位逻辑(Phase 1 剥离已覆盖全部场景,Phase 2 重定位因方向错误无法启用);更新 docstring 使之与实际行为(剥离)一致;
|
|
8
13
|
|
|
9
14
|
### 🐛 Bug 修复
|
|
10
15
|
|
|
11
|
-
- **fix(antigravity)**:
|
|
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 协议
|
|
12
20
|
|
|
13
21
|
## [v0.2.0](https://github.com/ThreeFish-AI/coding-proxy/releases/tag/v0.2.0) — 2026-04-09
|
|
14
22
|
|
|
@@ -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.1a2
|
|
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.1a2"
|
|
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 构建、JSON 结构化格式化器、
|
|
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 JsonFormatter
|
|
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
|
+
- 文件:JSON 结构化格式,固定 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
|
+
# 注入 JSON formatter
|
|
142
|
+
config["formatters"]["json"] = {
|
|
143
|
+
"()": "coding.proxy.logging.formatters.JsonFormatter",
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
# 注入 RotatingFileHandler(gzip 压缩轮转)
|
|
147
|
+
# 使用工厂函数(而非 class + namer/rotator kwargs),
|
|
148
|
+
# 因为 dictConfig 不支持将 namer/rotator 作为构造参数传递
|
|
149
|
+
config["handlers"]["file"] = {
|
|
150
|
+
"formatter": "json",
|
|
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
|
+
"JsonFormatter",
|
|
186
|
+
"_gzip_namer",
|
|
187
|
+
"_gzip_rotator",
|
|
188
|
+
]
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"""结构化日志格式化器(JSON 输出).
|
|
2
|
+
|
|
3
|
+
为文件日志提供机器可读的 JSON 格式输出,
|
|
4
|
+
与控制台的人类可读格式形成正交双写。
|
|
5
|
+
"""
|
|
6
|
+
|
|
7
|
+
from __future__ import annotations
|
|
8
|
+
|
|
9
|
+
import json
|
|
10
|
+
import logging
|
|
11
|
+
from datetime import UTC, datetime
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
class JsonFormatter(logging.Formatter):
|
|
15
|
+
"""将 LogRecord 格式化为单行 JSON 字符串.
|
|
16
|
+
|
|
17
|
+
输出字段:
|
|
18
|
+
- ``timestamp``: ISO 8601 UTC 时间戳
|
|
19
|
+
- ``level``: 日志级别名称(DEBUG/INFO/WARNING/ERROR)
|
|
20
|
+
- ``logger``: logger 名称(如 ``coding.proxy.routing.executor``)
|
|
21
|
+
- ``message``: 格式化后的日志消息
|
|
22
|
+
- ``exception``: 异常堆栈(仅当存在时)
|
|
23
|
+
|
|
24
|
+
设计要点:
|
|
25
|
+
- 使用 ``ensure_ascii=False`` 支持中文日志内容
|
|
26
|
+
- 异常信息(exc_info)序列化为 ``exception`` 字段
|
|
27
|
+
- 时间戳统一使用 UTC ISO 格式,便于跨时区聚合分析
|
|
28
|
+
- ``sort_keys=True`` 保证输出确定性,便于日志聚合工具处理
|
|
29
|
+
"""
|
|
30
|
+
|
|
31
|
+
def format(self, record: logging.LogRecord) -> str:
|
|
32
|
+
"""将 LogRecord 序列化为 JSON 行."""
|
|
33
|
+
message = record.getMessage()
|
|
34
|
+
|
|
35
|
+
exception: str | None = None
|
|
36
|
+
if record.exc_info and record.exc_info[0] is not None:
|
|
37
|
+
exception = self.formatException(record.exc_info)
|
|
38
|
+
|
|
39
|
+
log_entry: dict[str, object] = {
|
|
40
|
+
"timestamp": datetime.fromtimestamp(record.created, tz=UTC).isoformat(),
|
|
41
|
+
"level": record.levelname,
|
|
42
|
+
"logger": record.name,
|
|
43
|
+
"message": message,
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
if exception:
|
|
47
|
+
log_entry["exception"] = exception
|
|
48
|
+
|
|
49
|
+
return json.dumps(log_entry, ensure_ascii=False, sort_keys=True)
|
|
@@ -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,
|
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
"""Google Antigravity Claude 供应商 — OAuth2 认证 + Gemini 格式转换."""
|
|
1
|
+
"""Google Antigravity Claude 供应商 — OAuth2 认证 + Gemini/v1internal 格式转换."""
|
|
2
2
|
|
|
3
3
|
from __future__ import annotations
|
|
4
4
|
|
|
5
5
|
import json
|
|
6
6
|
import logging
|
|
7
|
+
import uuid
|
|
7
8
|
from collections.abc import AsyncIterator
|
|
8
9
|
from typing import Any
|
|
9
10
|
|
|
@@ -31,6 +32,12 @@ from .token_manager import BaseTokenManager, TokenAcquireError, TokenErrorKind
|
|
|
31
32
|
|
|
32
33
|
logger = logging.getLogger(__name__)
|
|
33
34
|
|
|
35
|
+
# v1internal 客户端指纹常量(与 Antigravity-Manager 对齐)
|
|
36
|
+
_V1INTERNAL_USER_AGENT = (
|
|
37
|
+
"Antigravity/4.1.31 (Macintosh; Intel Mac OS X 10_15_7) "
|
|
38
|
+
"Chrome/132.0.6834.160 Electron/39.2.3"
|
|
39
|
+
)
|
|
40
|
+
|
|
34
41
|
|
|
35
42
|
# ── Google OAuth2 Token 管理器(原 antigravity_token_manager.py) ──
|
|
36
43
|
|
|
@@ -137,10 +144,18 @@ class AntigravityVendor(TokenBackendMixin, BaseVendor):
|
|
|
137
144
|
self._default_model = config.model_endpoint.removeprefix("models/")
|
|
138
145
|
self._last_request_adaptations: list[str] = []
|
|
139
146
|
self._safety_settings = config.safety_settings
|
|
147
|
+
# v1internal 协议字段
|
|
148
|
+
self._project_id: str = config.project_id
|
|
149
|
+
self._session_id: str = uuid.uuid4().hex[:16]
|
|
150
|
+
self._message_count: int = 0
|
|
140
151
|
|
|
141
152
|
def get_name(self) -> str:
|
|
142
153
|
return "antigravity"
|
|
143
154
|
|
|
155
|
+
def _is_v1internal_mode(self) -> bool:
|
|
156
|
+
"""检测是否启用 v1internal 协议模式(与 Antigravity-Manager 对齐)."""
|
|
157
|
+
return bool(self._project_id) and "v1internal" in self._base_url
|
|
158
|
+
|
|
144
159
|
def get_capabilities(self) -> VendorCapabilities:
|
|
145
160
|
return VendorCapabilities(
|
|
146
161
|
supports_tools=True,
|
|
@@ -199,7 +214,12 @@ class AntigravityVendor(TokenBackendMixin, BaseVendor):
|
|
|
199
214
|
request_body: dict[str, Any],
|
|
200
215
|
headers: dict[str, str],
|
|
201
216
|
) -> tuple[dict[str, Any], dict[str, str]]:
|
|
202
|
-
"""转换 Anthropic
|
|
217
|
+
"""转换 Anthropic 请求并注入 Google OAuth token.
|
|
218
|
+
|
|
219
|
+
支持两种协议模式:
|
|
220
|
+
- 标准 Gemini 模式:直接发送 Gemini 请求体到 generativelanguage.googleapis.com
|
|
221
|
+
- v1internal 模式:将请求体包裹在 v1internal 信封中发送到 cloudcode-pa.googleapis.com
|
|
222
|
+
"""
|
|
203
223
|
resolved_model = self.map_model(request_body.get("model", "unknown"))
|
|
204
224
|
converted = convert_request(
|
|
205
225
|
request_body,
|
|
@@ -209,6 +229,10 @@ class AntigravityVendor(TokenBackendMixin, BaseVendor):
|
|
|
209
229
|
gemini_body = converted.body
|
|
210
230
|
self._last_request_adaptations = converted.adaptations
|
|
211
231
|
token = await self._token_manager.get_token()
|
|
232
|
+
|
|
233
|
+
if self._is_v1internal_mode():
|
|
234
|
+
return self._prepare_v1internal_request(gemini_body, resolved_model, token)
|
|
235
|
+
|
|
212
236
|
new_headers = {
|
|
213
237
|
"content-type": "application/json",
|
|
214
238
|
"authorization": f"Bearer {token}",
|
|
@@ -222,10 +246,51 @@ class AntigravityVendor(TokenBackendMixin, BaseVendor):
|
|
|
222
246
|
)
|
|
223
247
|
return gemini_body, new_headers
|
|
224
248
|
|
|
249
|
+
def _prepare_v1internal_request(
|
|
250
|
+
self,
|
|
251
|
+
gemini_body: dict[str, Any],
|
|
252
|
+
resolved_model: str,
|
|
253
|
+
token: str,
|
|
254
|
+
) -> tuple[dict[str, Any], dict[str, str]]:
|
|
255
|
+
"""将 Gemini 请求体包裹在 v1internal 信封中(与 Antigravity-Manager 对齐).
|
|
256
|
+
|
|
257
|
+
v1internal 是 Google Cloud Code 内部 API 协议,接受与标准 GLA 相同的 OAuth 凭证,
|
|
258
|
+
但需要特定的信封格式和客户端指纹 Headers。
|
|
259
|
+
"""
|
|
260
|
+
self._message_count += 1
|
|
261
|
+
envelope = {
|
|
262
|
+
"project": self._project_id,
|
|
263
|
+
"requestId": f"agent/antigravity/{self._session_id}/{self._message_count}",
|
|
264
|
+
"request": gemini_body,
|
|
265
|
+
"model": resolved_model,
|
|
266
|
+
"userAgent": "antigravity",
|
|
267
|
+
"requestType": "agent",
|
|
268
|
+
}
|
|
269
|
+
new_headers = {
|
|
270
|
+
"content-type": "application/json",
|
|
271
|
+
"authorization": f"Bearer {token}",
|
|
272
|
+
"user-agent": _V1INTERNAL_USER_AGENT,
|
|
273
|
+
"x-client-name": "antigravity",
|
|
274
|
+
"x-client-version": "4.1.31",
|
|
275
|
+
}
|
|
276
|
+
logger.debug(
|
|
277
|
+
"_prepare_v1internal_request: model=%s -> %s, project=%s, requestId=%s",
|
|
278
|
+
resolved_model,
|
|
279
|
+
resolved_model,
|
|
280
|
+
self._project_id,
|
|
281
|
+
envelope["requestId"],
|
|
282
|
+
)
|
|
283
|
+
return envelope, new_headers
|
|
284
|
+
|
|
225
285
|
def _mark_scope_error_if_needed(self, error_text: str) -> None:
|
|
226
286
|
lowered = error_text.lower()
|
|
227
287
|
if "access_token_scope_insufficient" not in lowered:
|
|
228
288
|
return
|
|
289
|
+
logger.error(
|
|
290
|
+
"Generative Language API 拒绝访问(ACCESS_TOKEN_SCOPE_INSUFFICIENT)。"
|
|
291
|
+
"如使用标准 GLA 端点,请确认凭证已授权正确的 scope;"
|
|
292
|
+
"建议切换至 v1internal 协议(配置 project_id)以获得更好的兼容性。"
|
|
293
|
+
)
|
|
229
294
|
self._token_manager.mark_error(
|
|
230
295
|
"Google access_token scope 不足,当前凭证不能调用 Generative Language API",
|
|
231
296
|
kind=TokenErrorKind.INSUFFICIENT_SCOPE,
|
|
@@ -250,11 +315,15 @@ class AntigravityVendor(TokenBackendMixin, BaseVendor):
|
|
|
250
315
|
request_body: dict[str, Any],
|
|
251
316
|
headers: dict[str, str],
|
|
252
317
|
) -> VendorResponse:
|
|
253
|
-
"""覆写: Gemini 端点 + 响应逆转换."""
|
|
318
|
+
"""覆写: Gemini / v1internal 端点 + 响应逆转换."""
|
|
254
319
|
body, prepared_headers = await self._prepare_request(request_body, headers)
|
|
255
320
|
client = self._get_client()
|
|
256
321
|
resolved_model = self._last_resolved_model
|
|
257
|
-
endpoint =
|
|
322
|
+
endpoint = (
|
|
323
|
+
":generateContent"
|
|
324
|
+
if self._is_v1internal_mode()
|
|
325
|
+
else f"/models/{resolved_model}:generateContent"
|
|
326
|
+
)
|
|
258
327
|
|
|
259
328
|
logger.debug("send_message: POST %s", endpoint)
|
|
260
329
|
response = await client.post(endpoint, json=body, headers=prepared_headers)
|
|
@@ -292,11 +361,15 @@ class AntigravityVendor(TokenBackendMixin, BaseVendor):
|
|
|
292
361
|
request_body: dict[str, Any],
|
|
293
362
|
headers: dict[str, str],
|
|
294
363
|
) -> AsyncIterator[bytes]:
|
|
295
|
-
"""覆写: Gemini SSE 流 -> Anthropic SSE 流适配."""
|
|
364
|
+
"""覆写: Gemini / v1internal SSE 流 -> Anthropic SSE 流适配."""
|
|
296
365
|
body, prepared_headers = await self._prepare_request(request_body, headers)
|
|
297
366
|
client = self._get_client()
|
|
298
367
|
resolved_model = self._last_resolved_model
|
|
299
|
-
endpoint =
|
|
368
|
+
endpoint = (
|
|
369
|
+
":streamGenerateContent?alt=sse"
|
|
370
|
+
if self._is_v1internal_mode()
|
|
371
|
+
else f"/models/{resolved_model}:streamGenerateContent?alt=sse"
|
|
372
|
+
)
|
|
300
373
|
|
|
301
374
|
logger.debug("send_message_stream: POST %s", endpoint)
|
|
302
375
|
|
|
@@ -363,3 +363,107 @@ def test_compatibility_profile_json_output_native():
|
|
|
363
363
|
vendor = AntigravityVendor(AntigravityConfig(), FailoverConfig(), ModelMapper([]))
|
|
364
364
|
profile = vendor.get_compatibility_profile()
|
|
365
365
|
assert profile.json_output.name == "NATIVE"
|
|
366
|
+
|
|
367
|
+
|
|
368
|
+
# ── v1internal 协议测试 ──────────────────────────────
|
|
369
|
+
|
|
370
|
+
|
|
371
|
+
def test_is_v1internal_mode_with_project_id_and_v1internal_url():
|
|
372
|
+
"""配置了 project_id 且 base_url 含 v1internal 时启用 v1internal 模式."""
|
|
373
|
+
config = AntigravityConfig(
|
|
374
|
+
project_id="my-gcp-project",
|
|
375
|
+
base_url="https://cloudcode-pa.googleapis.com/v1internal",
|
|
376
|
+
)
|
|
377
|
+
vendor = AntigravityVendor(config, FailoverConfig(), ModelMapper([]))
|
|
378
|
+
assert vendor._is_v1internal_mode() is True
|
|
379
|
+
|
|
380
|
+
|
|
381
|
+
def test_is_v1internal_mode_without_project_id():
|
|
382
|
+
"""未配置 project_id 时即使 URL 含 v1internal 也不启用."""
|
|
383
|
+
config = AntigravityConfig(
|
|
384
|
+
base_url="https://cloudcode-pa.googleapis.com/v1internal",
|
|
385
|
+
)
|
|
386
|
+
vendor = AntigravityVendor(config, FailoverConfig(), ModelMapper([]))
|
|
387
|
+
assert vendor._is_v1internal_mode() is False
|
|
388
|
+
|
|
389
|
+
|
|
390
|
+
def test_is_v1internal_mode_standard_gla_url():
|
|
391
|
+
"""标准 GLA URL 不启用 v1internal 模式(即使有 project_id)."""
|
|
392
|
+
config = AntigravityConfig(
|
|
393
|
+
project_id="my-gcp-project",
|
|
394
|
+
base_url="https://generativelanguage.googleapis.com/v1beta",
|
|
395
|
+
)
|
|
396
|
+
vendor = AntigravityVendor(config, FailoverConfig(), ModelMapper([]))
|
|
397
|
+
assert vendor._is_v1internal_mode() is False
|
|
398
|
+
|
|
399
|
+
|
|
400
|
+
@pytest.mark.asyncio
|
|
401
|
+
async def test_prepare_request_v1internal_envelope():
|
|
402
|
+
"""v1internal 模式下请求体应被包裹在 v1internal 信封中."""
|
|
403
|
+
config = AntigravityConfig(
|
|
404
|
+
project_id="test-project-123",
|
|
405
|
+
base_url="https://cloudcode-pa.googleapis.com/v1internal",
|
|
406
|
+
model_endpoint="models/claude-sonnet-4-20250514",
|
|
407
|
+
)
|
|
408
|
+
vendor = AntigravityVendor(config, FailoverConfig(), ModelMapper([]))
|
|
409
|
+
vendor._token_manager.get_token = AsyncMock(return_value="v1_tok")
|
|
410
|
+
|
|
411
|
+
body, headers = await vendor._prepare_request(
|
|
412
|
+
{
|
|
413
|
+
"model": "claude-sonnet-4-20250514",
|
|
414
|
+
"messages": [{"role": "user", "content": "Hello"}],
|
|
415
|
+
},
|
|
416
|
+
{},
|
|
417
|
+
)
|
|
418
|
+
|
|
419
|
+
# 验证信封结构
|
|
420
|
+
assert body["project"] == "test-project-123"
|
|
421
|
+
assert body["userAgent"] == "antigravity"
|
|
422
|
+
assert body["requestType"] == "agent"
|
|
423
|
+
assert "requestId" in body
|
|
424
|
+
assert "request" in body # 原始 Gemini 请求体
|
|
425
|
+
assert "model" in body
|
|
426
|
+
|
|
427
|
+
# 验证客户端指纹 Headers
|
|
428
|
+
assert headers["x-client-name"] == "antigravity"
|
|
429
|
+
assert headers["x-client-version"] == "4.1.31"
|
|
430
|
+
assert "Antigravity/4.1.31" in headers["user-agent"]
|
|
431
|
+
assert headers["authorization"] == "Bearer v1_tok"
|
|
432
|
+
|
|
433
|
+
|
|
434
|
+
@pytest.mark.asyncio
|
|
435
|
+
async def test_prepare_request_standard_gla_no_envelope():
|
|
436
|
+
"""标准 GLA 模式下请求体不做信封包装."""
|
|
437
|
+
config = AntigravityConfig(
|
|
438
|
+
base_url="https://generativelanguage.googleapis.com/v1beta",
|
|
439
|
+
)
|
|
440
|
+
vendor = AntigravityVendor(config, FailoverConfig(), ModelMapper([]))
|
|
441
|
+
vendor._token_manager.get_token = AsyncMock(return_value="gla_tok")
|
|
442
|
+
|
|
443
|
+
body, headers = await vendor._prepare_request(
|
|
444
|
+
{
|
|
445
|
+
"model": "claude-sonnet-4-20250514",
|
|
446
|
+
"messages": [{"role": "user", "content": "Hello"}],
|
|
447
|
+
},
|
|
448
|
+
{},
|
|
449
|
+
)
|
|
450
|
+
|
|
451
|
+
# 标准模式:直接是 Gemini 请求体,无信封字段
|
|
452
|
+
assert "project" not in body
|
|
453
|
+
assert "contents" in body # Gemini 格式的 contents 字段
|
|
454
|
+
assert headers["authorization"] == "Bearer gla_tok"
|
|
455
|
+
assert "x-client-name" not in headers
|
|
456
|
+
|
|
457
|
+
|
|
458
|
+
def test_mark_scope_error_if_needed_enhanced_logging(caplog):
|
|
459
|
+
"""_mark_scope_error_if_needed 在检测到 scope 错误时应输出增强诊断日志."""
|
|
460
|
+
import logging
|
|
461
|
+
|
|
462
|
+
vendor = AntigravityVendor(AntigravityConfig(), FailoverConfig(), ModelMapper([]))
|
|
463
|
+
with caplog.at_level(logging.ERROR, logger="coding.proxy.vendors.antigravity"):
|
|
464
|
+
vendor._mark_scope_error_if_needed(
|
|
465
|
+
'{"error": {"message": "ACCESS_TOKEN_SCOPE_INSUFFICIENT"}}'
|
|
466
|
+
)
|
|
467
|
+
|
|
468
|
+
# 应包含增强的诊断提示信息
|
|
469
|
+
assert any("v1internal" in r.message for r in caplog.records)
|