coding-proxy 0.2.1a2__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.1a2 → coding_proxy-0.2.1a3}/CHANGELOG.md +6 -3
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/PKG-INFO +1 -1
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/pyproject.toml +1 -1
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/logging/__init__.py +8 -8
- coding_proxy-0.2.1a3/src/coding/proxy/logging/formatters.py +27 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/circuit_breaker.py +30 -7
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/executor.py +59 -5
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/tier.py +24 -2
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/server/app.py +3 -1
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/server/factory.py +4 -1
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/antigravity.py +134 -3
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_antigravity.py +313 -1
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_logging_dual_write.py +32 -41
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/uv.lock +1 -1
- coding_proxy-0.2.1a2/src/coding/proxy/logging/formatters.py +0 -49
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/.github/workflows/ci.yml +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/.github/workflows/coverage.yml +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/.github/workflows/release.yml +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/.gitignore +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/AGENTS.md +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/CLAUDE.md +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/LICENSE +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/README.md +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/docs/ci-cd.md +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/docs/framework.md +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/docs/user-guide.md +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/docs/zh-CN/README.md +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/__init__.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/__init__.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/__main__.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/auth/__init__.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/auth/providers/__init__.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/auth/providers/base.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/auth/providers/github.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/auth/providers/google.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/auth/runtime.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/auth/store.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/cli/__init__.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/cli/auth_commands.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/cli/banner.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/compat/__init__.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/compat/canonical.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/compat/session_store.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/config/__init__.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/config/auth_schema.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/config/config.default.yaml +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/config/loader.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/config/resiliency.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/config/routing.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/config/schema.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/config/server.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/config/vendors.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/convert/__init__.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/convert/anthropic_to_gemini.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/convert/anthropic_to_openai.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/convert/gemini_sse_adapter.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/convert/gemini_to_anthropic.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/convert/openai_to_anthropic.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/logging/db.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/logging/stats.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/model/__init__.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/model/auth.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/model/compat.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/model/constants.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/model/pricing.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/model/token.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/model/vendor.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/pricing.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/__init__.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/error_classifier.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/model_mapper.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/quota_guard.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/rate_limit.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/retry.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/router.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/session_manager.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/usage_parser.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/routing/usage_recorder.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/server/__init__.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/server/request_normalizer.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/server/responses.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/server/routes.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/streaming/__init__.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/streaming/anthropic_compat.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/__init__.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/alibaba.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/anthropic.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/base.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/copilot.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/copilot_models.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/copilot_token_manager.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/copilot_urls.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/doubao.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/kimi.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/minimax.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/mixins.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/native_anthropic.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/token_manager.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/xiaomi.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/src/coding/proxy/vendors/zhipu.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/__init__.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_app_routes.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_auto_login.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_banner.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_circuit_breaker.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_cli_usage.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_compat.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_config_init.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_config_loader.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_convert_request.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_convert_response.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_convert_sse.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_copilot.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_copilot_convert_request.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_copilot_convert_response.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_copilot_models.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_copilot_urls.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_currency.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_error_classifier.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_mixins.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_model_auth.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_model_compat.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_model_constants.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_model_mapper.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_model_pricing.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_model_token.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_model_vendor.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_native_vendors.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_parse_usage.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_pricing.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_quota_guard.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_rate_limit.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_request_normalizer.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_router_chain.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_router_executor.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_runtime_reauth.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_schema.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_streaming_anthropic_compat.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_tier.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_tiers_config.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_time_range.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_token_logger.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_token_manager.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_types.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_vendor_streaming.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_vendors.py +0 -0
- {coding_proxy-0.2.1a2 → coding_proxy-0.2.1a3}/tests/test_zhipu.py +0 -0
|
@@ -3,6 +3,8 @@
|
|
|
3
3
|
本文件基于 [Keep a Changelog](https://keepachangelog.com/zh-CN/) 规范维护,版本号遵循 [语义化版本](https://semver.org/lang/zh-CN/)。
|
|
4
4
|
|
|
5
5
|
## [Unreleased]
|
|
6
|
+
|
|
7
|
+
- style(lint): 移除未使用变量 `old_base_url` 并合并重复的 `antigravity` 导入块;
|
|
6
8
|
## [v0.2.1](https://github.com/ThreeFish-AI/coding-proxy/releases/tag/v0.2.1a1) — 2026-04-11
|
|
7
9
|
|
|
8
10
|
- fix(antigravity): 修复 Google OAuth token 刷新后 scope 校验过严导致 403 的问题;
|
|
@@ -13,10 +15,11 @@
|
|
|
13
15
|
|
|
14
16
|
### 🐛 Bug 修复
|
|
15
17
|
|
|
16
|
-
- **fix(antigravity)**: 新增 Google Cloud Code **v1internal
|
|
18
|
+
- **fix(antigravity)**: 新增 Google Cloud Code **v1internal 协议支持 + project_id 自动发现**,彻底解决 `ACCESS_TOKEN_SCOPE_INSUFFICIENT` (403) 问题。
|
|
17
19
|
- **根因**:此前调用标准 Generative Language API (`generativelanguage.googleapis.com`),该端点对 OAuth scope 校验严格;参考项目 Antigravity-Manager 实际使用的是 Cloud Code v1internal 内部 API (`cloudcode-pa.googleapis.com/v1internal`),接受相同凭证但协议格式不同
|
|
18
|
-
-
|
|
19
|
-
-
|
|
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()` 暴露发现状态
|
|
20
23
|
|
|
21
24
|
## [v0.2.0](https://github.com/ThreeFish-AI/coding-proxy/releases/tag/v0.2.0) — 2026-04-09
|
|
22
25
|
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: coding-proxy
|
|
3
|
-
Version: 0.2.
|
|
3
|
+
Version: 0.2.1a3
|
|
4
4
|
Summary: A High-Availability, Transparent, and Smart Multi-Vendor Proxy for Claude Code. Support Claude Plans, GitHub Copilot, Google Antigravity, ZAI/GLM, MiniMax, Qwen, Xiaomi, Kimi, Doubao...
|
|
5
5
|
Project-URL: Source Code, https://github.com/ThreeFish-AI/coding-proxy
|
|
6
6
|
Project-URL: User Guide, https://github.com/ThreeFish-AI/coding-proxy/blob/master/docs/user-guide.md
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[project]
|
|
2
2
|
name = "coding-proxy"
|
|
3
|
-
version = "0.2.
|
|
3
|
+
version = "0.2.1a3"
|
|
4
4
|
description = "A High-Availability, Transparent, and Smart Multi-Vendor Proxy for Claude Code. Support Claude Plans, GitHub Copilot, Google Antigravity, ZAI/GLM, MiniMax, Qwen, Xiaomi, Kimi, Doubao..."
|
|
5
5
|
readme = "README.md"
|
|
6
6
|
requires-python = ">=3.12"
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"""日志模块.
|
|
2
2
|
|
|
3
|
-
提供 uvicorn 兼容的 dictConfig
|
|
3
|
+
提供 uvicorn 兼容的 dictConfig 构建、文件日志字符串格式化器、
|
|
4
4
|
以及 gzip 压缩轮转支持。
|
|
5
5
|
"""
|
|
6
6
|
|
|
@@ -12,7 +12,7 @@ import logging.handlers
|
|
|
12
12
|
import os
|
|
13
13
|
from pathlib import Path
|
|
14
14
|
|
|
15
|
-
from .formatters import
|
|
15
|
+
from .formatters import FileFormatter
|
|
16
16
|
|
|
17
17
|
# ── 常量 ────────────────────────────────────────────────────────
|
|
18
18
|
|
|
@@ -83,7 +83,7 @@ def build_log_config(
|
|
|
83
83
|
|
|
84
84
|
双写行为:
|
|
85
85
|
- 控制台:人类可读格式,级别由 ``level`` 参数控制(handler 级别过滤)
|
|
86
|
-
-
|
|
86
|
+
- 文件:字符串格式(与控制台风格一致),固定 DEBUG 级别(捕获所有日志)
|
|
87
87
|
- 当 ``file_path`` 为 ``None`` 或空字符串时,退化为纯控制台模式(向后兼容)
|
|
88
88
|
"""
|
|
89
89
|
config: dict = {
|
|
@@ -138,16 +138,16 @@ def build_log_config(
|
|
|
138
138
|
log_file = Path(file_path)
|
|
139
139
|
log_file.parent.mkdir(parents=True, exist_ok=True)
|
|
140
140
|
|
|
141
|
-
#
|
|
142
|
-
config["formatters"]["
|
|
143
|
-
"()": "coding.proxy.logging.formatters.
|
|
141
|
+
# 注入文件日志字符串 formatter
|
|
142
|
+
config["formatters"]["file_fmt"] = {
|
|
143
|
+
"()": "coding.proxy.logging.formatters.FileFormatter",
|
|
144
144
|
}
|
|
145
145
|
|
|
146
146
|
# 注入 RotatingFileHandler(gzip 压缩轮转)
|
|
147
147
|
# 使用工厂函数(而非 class + namer/rotator kwargs),
|
|
148
148
|
# 因为 dictConfig 不支持将 namer/rotator 作为构造参数传递
|
|
149
149
|
config["handlers"]["file"] = {
|
|
150
|
-
"formatter": "
|
|
150
|
+
"formatter": "file_fmt",
|
|
151
151
|
"()": "coding.proxy.logging._create_rotating_file_handler",
|
|
152
152
|
"filename": str(log_file.resolve()),
|
|
153
153
|
"maxBytes": max_bytes,
|
|
@@ -182,7 +182,7 @@ def build_log_config(
|
|
|
182
182
|
|
|
183
183
|
__all__ = [
|
|
184
184
|
"build_log_config",
|
|
185
|
-
"
|
|
185
|
+
"FileFormatter",
|
|
186
186
|
"_gzip_namer",
|
|
187
187
|
"_gzip_rotator",
|
|
188
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
|
|
|
@@ -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
|
)
|
|
@@ -91,13 +91,16 @@ def _find_copilot_vendor(router: Any) -> CopilotVendor | None:
|
|
|
91
91
|
return None
|
|
92
92
|
|
|
93
93
|
|
|
94
|
-
def _build_circuit_breaker(
|
|
94
|
+
def _build_circuit_breaker(
|
|
95
|
+
cfg: CircuitBreakerConfig, *, vendor_name: str = ""
|
|
96
|
+
) -> CircuitBreaker:
|
|
95
97
|
"""从配置构建熔断器实例."""
|
|
96
98
|
return CircuitBreaker(
|
|
97
99
|
failure_threshold=cfg.failure_threshold,
|
|
98
100
|
recovery_timeout_seconds=cfg.recovery_timeout_seconds,
|
|
99
101
|
success_threshold=cfg.success_threshold,
|
|
100
102
|
max_recovery_seconds=cfg.max_recovery_seconds,
|
|
103
|
+
vendor_name=vendor_name,
|
|
101
104
|
)
|
|
102
105
|
|
|
103
106
|
|
|
@@ -37,6 +37,9 @@ _V1INTERNAL_USER_AGENT = (
|
|
|
37
37
|
"Antigravity/4.1.31 (Macintosh; Intel Mac OS X 10_15_7) "
|
|
38
38
|
"Chrome/132.0.6834.160 Electron/39.2.3"
|
|
39
39
|
)
|
|
40
|
+
# Cloud Resource Manager API(用于自动发现 GCP project_id)
|
|
41
|
+
_CRM_PROJECTS_URL = "https://cloudresourcemanager.googleapis.com/v1/projects"
|
|
42
|
+
_V1INTERNAL_BASE_URL = "https://cloudcode-pa.googleapis.com/v1internal"
|
|
40
43
|
|
|
41
44
|
|
|
42
45
|
# ── Google OAuth2 Token 管理器(原 antigravity_token_manager.py) ──
|
|
@@ -148,13 +151,119 @@ class AntigravityVendor(TokenBackendMixin, BaseVendor):
|
|
|
148
151
|
self._project_id: str = config.project_id
|
|
149
152
|
self._session_id: str = uuid.uuid4().hex[:16]
|
|
150
153
|
self._message_count: int = 0
|
|
154
|
+
# project_id 自动发现状态
|
|
155
|
+
self._project_id_discovered: str = ""
|
|
156
|
+
self._project_discovery_attempted: bool = False
|
|
151
157
|
|
|
152
158
|
def get_name(self) -> str:
|
|
153
159
|
return "antigravity"
|
|
154
160
|
|
|
155
161
|
def _is_v1internal_mode(self) -> bool:
|
|
156
162
|
"""检测是否启用 v1internal 协议模式(与 Antigravity-Manager 对齐)."""
|
|
157
|
-
return bool(self.
|
|
163
|
+
return bool(self._effective_project_id) and "v1internal" in self._base_url
|
|
164
|
+
|
|
165
|
+
@property
|
|
166
|
+
def _effective_project_id(self) -> str:
|
|
167
|
+
"""返回有效的 project_id:显式配置优先,否则使用自动发现的值."""
|
|
168
|
+
return self._project_id or self._project_id_discovered
|
|
169
|
+
|
|
170
|
+
async def _discover_project_id(self, access_token: str) -> str:
|
|
171
|
+
"""通过 Cloud Resource Manager API 自动发现用户的 GCP project_id.
|
|
172
|
+
|
|
173
|
+
利用已有的 cloud-platform OAuth scope 调用 CRM API 列出用户有权限的项目,
|
|
174
|
+
选择合适的 project_id 后自动切换至 v1internal 模式。
|
|
175
|
+
|
|
176
|
+
Args:
|
|
177
|
+
access_token: 当前有效的 Google OAuth access_token
|
|
178
|
+
|
|
179
|
+
Returns:
|
|
180
|
+
发现到的 project_id;失败返回空字符串
|
|
181
|
+
"""
|
|
182
|
+
if self._project_discovery_attempted:
|
|
183
|
+
return self._project_id_discovered
|
|
184
|
+
|
|
185
|
+
# 已手动配置则跳过
|
|
186
|
+
if self._project_id:
|
|
187
|
+
self._project_discovery_attempted = True
|
|
188
|
+
return ""
|
|
189
|
+
|
|
190
|
+
self._project_discovery_attempted = True
|
|
191
|
+
client = self._get_client()
|
|
192
|
+
try:
|
|
193
|
+
response = await client.get(
|
|
194
|
+
_CRM_PROJECTS_URL,
|
|
195
|
+
headers={"authorization": f"Bearer {access_token}"},
|
|
196
|
+
)
|
|
197
|
+
response.raise_for_status()
|
|
198
|
+
|
|
199
|
+
data = response.json()
|
|
200
|
+
projects = data.get("projects", [])
|
|
201
|
+
|
|
202
|
+
if not projects:
|
|
203
|
+
logger.warning(
|
|
204
|
+
"GCP 项目自动发现完成但未找到任何项目,"
|
|
205
|
+
"回退至标准 GLA 模式。请手动配置 project_id 或确认账号已关联 GCP 项目。"
|
|
206
|
+
)
|
|
207
|
+
return ""
|
|
208
|
+
|
|
209
|
+
# 选择策略:优先 ACTIVE 状态的项目
|
|
210
|
+
selected = None
|
|
211
|
+
for p in projects:
|
|
212
|
+
if p.get("lifecycleState", "") == "ACTIVE":
|
|
213
|
+
selected = p
|
|
214
|
+
break
|
|
215
|
+
if selected is None:
|
|
216
|
+
for p in projects:
|
|
217
|
+
if p.get("lifecycleState", "") != "DELETE_REQUESTED":
|
|
218
|
+
selected = p
|
|
219
|
+
break
|
|
220
|
+
if selected is None:
|
|
221
|
+
selected = projects[0]
|
|
222
|
+
|
|
223
|
+
project_id = selected.get("projectId", "")
|
|
224
|
+
if not project_id:
|
|
225
|
+
logger.warning(
|
|
226
|
+
"GCP 项目 '%s' 缺少 projectId 字段,跳过。",
|
|
227
|
+
selected.get("name", "unknown"),
|
|
228
|
+
)
|
|
229
|
+
return ""
|
|
230
|
+
|
|
231
|
+
# 发现成功:原子性切换到 v1internal 模式
|
|
232
|
+
self._base_url = _V1INTERNAL_BASE_URL
|
|
233
|
+
self._project_id_discovered = project_id
|
|
234
|
+
|
|
235
|
+
# 重建 HTTP 客户端(base_url 是初始化参数)
|
|
236
|
+
if self._client is not None and not self._client.is_closed:
|
|
237
|
+
await self._client.aclose()
|
|
238
|
+
self._client = None
|
|
239
|
+
|
|
240
|
+
logger.info(
|
|
241
|
+
"GCP 项目自动发现成功: project_id=%s, name=%s, "
|
|
242
|
+
"已自动切换至 v1internal 协议模式",
|
|
243
|
+
project_id,
|
|
244
|
+
selected.get("name", "unknown"),
|
|
245
|
+
)
|
|
246
|
+
return project_id
|
|
247
|
+
|
|
248
|
+
except httpx.HTTPStatusError as exc:
|
|
249
|
+
logger.error(
|
|
250
|
+
"GCP 项目自动发现 API 错误 (HTTP %d),回退至标准 GLA 模式。%s",
|
|
251
|
+
exc.response.status_code,
|
|
252
|
+
exc,
|
|
253
|
+
)
|
|
254
|
+
return ""
|
|
255
|
+
except (httpx.TimeoutException, httpx.ConnectError) as exc:
|
|
256
|
+
logger.warning(
|
|
257
|
+
"GCP 项目自动发现网络异常,回退至标准 GLA 模式。%s",
|
|
258
|
+
exc,
|
|
259
|
+
)
|
|
260
|
+
return ""
|
|
261
|
+
except Exception as exc:
|
|
262
|
+
logger.error(
|
|
263
|
+
"GCP 项目自动发现未知异常,回退至标准 GLA 模式。%s",
|
|
264
|
+
exc,
|
|
265
|
+
)
|
|
266
|
+
return ""
|
|
158
267
|
|
|
159
268
|
def get_capabilities(self) -> VendorCapabilities:
|
|
160
269
|
return VendorCapabilities(
|
|
@@ -230,6 +339,19 @@ class AntigravityVendor(TokenBackendMixin, BaseVendor):
|
|
|
230
339
|
self._last_request_adaptations = converted.adaptations
|
|
231
340
|
token = await self._token_manager.get_token()
|
|
232
341
|
|
|
342
|
+
# 懒加载:未配置 project_id 时自动发现并切换 v1internal 模式
|
|
343
|
+
if not self._project_id and not self._project_discovery_attempted:
|
|
344
|
+
discovered = await self._discover_project_id(token)
|
|
345
|
+
if discovered:
|
|
346
|
+
logger.info(
|
|
347
|
+
"已自动启用 v1internal 协议模式(project_id=%s)", discovered
|
|
348
|
+
)
|
|
349
|
+
else:
|
|
350
|
+
logger.info(
|
|
351
|
+
"无法自动发现 GCP project_id,继续使用标准 GLA 模式。"
|
|
352
|
+
"如需启用 v1internal 协议,请在配置中手动指定 project_id。"
|
|
353
|
+
)
|
|
354
|
+
|
|
233
355
|
if self._is_v1internal_mode():
|
|
234
356
|
return self._prepare_v1internal_request(gemini_body, resolved_model, token)
|
|
235
357
|
|
|
@@ -259,7 +381,7 @@ class AntigravityVendor(TokenBackendMixin, BaseVendor):
|
|
|
259
381
|
"""
|
|
260
382
|
self._message_count += 1
|
|
261
383
|
envelope = {
|
|
262
|
-
"project": self.
|
|
384
|
+
"project": self._effective_project_id,
|
|
263
385
|
"requestId": f"agent/antigravity/{self._session_id}/{self._message_count}",
|
|
264
386
|
"request": gemini_body,
|
|
265
387
|
"model": resolved_model,
|
|
@@ -277,7 +399,7 @@ class AntigravityVendor(TokenBackendMixin, BaseVendor):
|
|
|
277
399
|
"_prepare_v1internal_request: model=%s -> %s, project=%s, requestId=%s",
|
|
278
400
|
resolved_model,
|
|
279
401
|
resolved_model,
|
|
280
|
-
self.
|
|
402
|
+
self._effective_project_id,
|
|
281
403
|
envelope["requestId"],
|
|
282
404
|
)
|
|
283
405
|
return envelope, new_headers
|
|
@@ -308,6 +430,15 @@ class AntigravityVendor(TokenBackendMixin, BaseVendor):
|
|
|
308
430
|
result["resolved_model"] = self._last_resolved_model
|
|
309
431
|
if self._last_model_resolution_reason:
|
|
310
432
|
result["model_resolution_reason"] = self._last_model_resolution_reason
|
|
433
|
+
# project_id 发现诊断
|
|
434
|
+
result["project_id_source"] = (
|
|
435
|
+
"configured"
|
|
436
|
+
if self._project_id
|
|
437
|
+
else ("discovered" if self._project_id_discovered else "none")
|
|
438
|
+
)
|
|
439
|
+
if self._project_id_discovered:
|
|
440
|
+
result["discovered_project_id"] = self._project_id_discovered
|
|
441
|
+
result["is_v1internal_mode"] = self._is_v1internal_mode()
|
|
311
442
|
return result
|
|
312
443
|
|
|
313
444
|
async def send_message(
|