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

{coding_proxy-0.2.1a3 → coding_proxy-0.2.2}/CHANGELOG.md

@@ -4,22 +4,15 @@
 
 ## [Unreleased]
 
-- style(lint): 移除未使用变量 `old_base_url` 并合并重复的 `antigravity` 导入块;
-## [v0.2.1](https://github.com/ThreeFish-AI/coding-proxy/releases/tag/v0.2.1a1) — 2026-04-11
+## [v0.2.2](https://github.com/ThreeFish-AI/coding-proxy/releases/tag/v0.2.2) — 2026-04-13
 
-- fix(antigravity): 修复 Google OAuth token 刷新后 scope 校验过严导致 403 的问题;
-- refactor(request-normalizer): 移除跨供应商 tool_result 重定位死代码，docstring 对齐实际剥离行为;
+- feat(reset): CLI reset 命令新增 -v/--vendor 参数，支持运行时 N-tier 链路重排序（逗号分隔的 vendor 列表）;
+- fix(logging): 修复 uvicorn.error 日志在文件中重复打印的问题;
 
+## [v0.2.1](https://github.com/ThreeFish-AI/coding-proxy/releases/tag/v0.2.1) — 2026-04-11
 
-- **请求规范化死代码清理**：移除 `request_normalizer` 中永远不可达的 `tool_result` 重定位逻辑（Phase 1 剥离已覆盖全部场景，Phase 2 重定位因方向错误无法启用）；更新 docstring 使之与实际行为（剥离）一致；
-
-### 🐛 Bug 修复
-
-- **fix(antigravity)**: 新增 Google Cloud Code **v1internal 协议支持 + project_id 自动发现**，彻底解决 `ACCESS_TOKEN_SCOPE_INSUFFICIENT` (403) 问题。
-  - **根因**：此前调用标准 Generative Language API (`generativelanguage.googleapis.com`)，该端点对 OAuth scope 校验严格；参考项目 Antigravity-Manager 实际使用的是 Cloud Code v1internal 内部 API (`cloudcode-pa.googleapis.com/v1internal`)，接受相同凭证但协议格式不同
-  - **修复（v1internal 协议）**：新增 `project_id` 配置字段 + v1internal 请求信封包装 + 客户端指纹 Headers + 端点 URL 适配
-  - **修复（自动发现）**：利用已有的 `cloud-platform` OAuth scope 通过 Cloud Resource Manager API 自动发现用户的 GCP `project_id`，首次请求时零配置自动切换至 v1internal 模式——开箱即用，无需手动配置
-  - **附带改进**：`_acquire()` scope 校验保持 warning 降级；`_mark_scope_error_if_needed()` 增强诊断日志；`get_diagnostics()` 暴露发现状态
+- feat(logging): 实现日志双写（控制台 + 本地文件），日志文件支持 5MB 自动轮转及 gzip 压缩备份；ModelCall 日志降级为 DEBUG 级别；
+- feat(circuit-breaker): 补全熔断器状态转换日志的 vendor 上下文信息;
 
 ## [v0.2.0](https://github.com/ThreeFish-AI/coding-proxy/releases/tag/v0.2.0) — 2026-04-09
 

{coding_proxy-0.2.1a3 → coding_proxy-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coding-proxy
-Version: 0.2.1a3
+Version: 0.2.2
 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...
 Project-URL: Source Code, https://github.com/ThreeFish-AI/coding-proxy
 Project-URL: User Guide, https://github.com/ThreeFish-AI/coding-proxy/blob/master/docs/user-guide.md
@@ -56,7 +56,7 @@ When you're deeply immersed in your coding "zone" with **Claude Code** (or any A
 
 ## 🌟 Core Features
 
-- **⛓️ N-tier Chained Failover**: Automatically downgrades from official Claude Plans, gracefully falling back to GitHub Copilot, then Google Antigravity, with Zhipu GLM acting as the ultimate safety net.
+- **⛓️ N-tier Chained Failover**: Autonomous descending sequence, supporting Claude's official plans, as well as Coding Plans from GitHub Copilot, Z AI, MiniMax, Alibaba Qwen, Xiaomi, Kimi, Doubao, etc.
 - **🛡️ Smart Resilience & Quota Guardians**: Every single vendor node comes fully armed with an independent **Circuit Breaker** and **Quota Guard** to proactively dodge avalanches without breaking a sweat.
 - **👻 Phantom-like Transparency**: **100% transparent** to the client! No code tweaks required. Overwrite `ANTHROPIC_BASE_URL` with a single line, and you're good to go.
 - **🔄 Universal Alchemy (Formats & Models)**: Native support for two-way request/streaming (SSE) translations between Anthropic ←→ Gemini. Plus, auto/DIY model name mapping (e.g., effortlessly morphing `claude-*` into `glm-*`).

{coding_proxy-0.2.1a3 → coding_proxy-0.2.2}/README.md

@@ -29,7 +29,7 @@ When you're deeply immersed in your coding "zone" with **Claude Code** (or any A
 
 ## 🌟 Core Features
 
-- **⛓️ N-tier Chained Failover**: Automatically downgrades from official Claude Plans, gracefully falling back to GitHub Copilot, then Google Antigravity, with Zhipu GLM acting as the ultimate safety net.
+- **⛓️ N-tier Chained Failover**: Autonomous descending sequence, supporting Claude's official plans, as well as Coding Plans from GitHub Copilot, Z AI, MiniMax, Alibaba Qwen, Xiaomi, Kimi, Doubao, etc.
 - **🛡️ Smart Resilience & Quota Guardians**: Every single vendor node comes fully armed with an independent **Circuit Breaker** and **Quota Guard** to proactively dodge avalanches without breaking a sweat.
 - **👻 Phantom-like Transparency**: **100% transparent** to the client! No code tweaks required. Overwrite `ANTHROPIC_BASE_URL` with a single line, and you're good to go.
 - **🔄 Universal Alchemy (Formats & Models)**: Native support for two-way request/streaming (SSE) translations between Anthropic ←→ Gemini. Plus, auto/DIY model name mapping (e.g., effortlessly morphing `claude-*` into `glm-*`).

{coding_proxy-0.2.1a3 → coding_proxy-0.2.2}/docs/zh-CN/README.md

@@ -29,7 +29,7 @@
 
 ## 🌟 核心特性 (Core Features)
 
-- **⛓️ N-tier 链式故障转移 (Failover)**：自动从 Claude 官方 Plans 依次降级至 GitHub Copilot、Google Antigravity，最后由智谱 GLM 兜底。
+- **⛓️ N-tier 链式故障转移 (Failover)**：自主降序序列，支持 Claude 官方 Plans，以及 GitHub Copilot、智谱、MiniMax、阿里千问、小米、Kimi、豆包等的 Coding Plan。
 - **🛡️ 智能弹性与容灾守卫**：每个供应商节点独立配备 **熔断器 (Circuit Breaker)** 与 **配额守卫 (Quota Guard)**，防雪崩、主动避险。
 - **👻 透明无感代理机制**：对客户端 **100% 透明**！无需修改任何代码，仅需一行配置覆盖 `ANTHROPIC_BASE_URL` 即可接入。
 - **🔄 跨模型与全格式转换**：原生支持 Anthropic ←→ Gemini 的请求与流式响应（SSE）双向转换，并支持自动/自助映射模型名称（如 `claude-*` 至 `glm-*`）。

{coding_proxy-0.2.1a3 → coding_proxy-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "coding-proxy"
-version = "0.2.1a3"
+version = "0.2.2"
 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..."
 readme = "README.md"
 requires-python = ">=3.12"

{coding_proxy-0.2.1a3 → coding_proxy-0.2.2}/src/coding/proxy/cli/__init__.py

@@ -216,16 +216,50 @@ async def _run_usage(
 @app.command()
 def reset(
     port: int = typer.Option(8046, "--port", "-p", help="代理服务端口"),
+    vendor: str | None = typer.Option(
+        None,
+        "--vendor",
+        "-v",
+        help="提升/重排序 vendor 优先级（单个或逗号分隔多个）",
+    ),
 ) -> None:
-    """重置所有层级的熔断器和配额守卫（恢复使用最高优先级供应商）."""
+    """重置所有层级的熔断器和配额守卫.
+
+    可通过 -v 指定运行时 N-tier 链路重排序：
+
+    \b
+      -v zhipu               提升 zhipu 到最高优先级
+      -v zhipu,anthropic     替换整个 N-tier 链路顺序
+    """
     import httpx
 
+    # 构建请求 body
+    json_body: dict | None = None
+    if vendor:
+        parts = [v.strip() for v in vendor.split(",") if v.strip()]
+        if parts:
+            json_body = {"vendors": parts}
+
     try:
-        resp = httpx.post(f"http://127.0.0.1:{port}/api/reset", timeout=5)
+        resp = httpx.post(
+            f"http://127.0.0.1:{port}/api/reset",
+            json=json_body,
+            timeout=5,
+        )
         if resp.status_code == 200:
+            data = resp.json()
             console.print("[green]所有层级的熔断器和配额守卫已重置[/green]")
+            tier_order = data.get("tier_order")
+            if tier_order:
+                order_str = " → ".join(tier_order)
+                console.print(f"[cyan]当前链路顺序:[/] {order_str}")
         else:
-            console.print(f"[red]重置失败: {resp.status_code}[/red]")
+            try:
+                err = resp.json()
+                msg = err.get("error", {}).get("message", resp.text)
+            except Exception:
+                msg = resp.text
+            console.print(f"[red]重置失败: {msg}[/red]")
     except httpx.ConnectError:
         console.print("[red]代理服务未运行[/red]")
 

{coding_proxy-0.2.1a3 → coding_proxy-0.2.2}/src/coding/proxy/config/config.default.yaml

@@ -111,7 +111,7 @@ vendors:
     # 不配置 circuit_breaker → 自动成为终端层，不触发向下故障转移
     circuit_breaker:
       failure_threshold: 3
-      recovery_timeout_seconds: 300
+      recovery_timeout_seconds: 30
       success_threshold: 2
     quota_guard:
       enabled: true # 启用后按 Premium Requests 配额管理
@@ -421,6 +421,11 @@ pricing:
     input_cost_per_mtok: ¥0.80
     output_cost_per_mtok: ¥2.00
     cache_read_cost_per_mtok: ¥0.16
+  - vendor: zhipu
+    model: glm-4.7 # 待区分长短上下文定价
+    input_cost_per_mtok: ¥2.00
+    output_cost_per_mtok: ¥8.00
+    cache_read_cost_per_mtok: ¥0.40
   - vendor: zhipu
     model: glm-5v-turbo # 待区分长短上下文定价
     input_cost_per_mtok: ¥5.00

{coding_proxy-0.2.1a3 → coding_proxy-0.2.2}/src/coding/proxy/logging/__init__.py

@@ -118,7 +118,11 @@ def build_log_config(
         },
         "loggers": {
             "uvicorn": {"handlers": ["default"], "level": level, "propagate": False},
-            "uvicorn.error": {"level": level},
+            "uvicorn.error": {
+                "handlers": ["default"],
+                "level": level,
+                "propagate": False,
+            },
             "uvicorn.access": {
                 "handlers": ["access"],
                 "level": "INFO",

{coding_proxy-0.2.1a3 → coding_proxy-0.2.2}/src/coding/proxy/routing/router.py

@@ -68,6 +68,66 @@ class RequestRouter:
         """当前活跃供应商名称（由 Executor 在成功响应时写入）."""
         return self._active_vendor_name
 
+    # ── 运行时 N-tier 链路重排序 ─────────────────────────────
+
+    def get_vendor_names(self) -> list[str]:
+        """返回当前 tiers 的供应商名称列表（按优先级顺序）."""
+        return [t.name for t in self._tiers]
+
+    def reorder_tiers(self, vendor_names: list[str]) -> None:
+        """原地重排序 N-tier 链路.
+
+        使用切片赋值保持列表引用同一性，使 ``_RouteExecutor`` 立即可见。
+
+        Args:
+            vendor_names: 新的供应商名称顺序（必须包含所有当前 tier）。
+
+        Raises:
+            ValueError: 名称不存在、有重复、或未覆盖所有 tier。
+        """
+        name_to_tier = {t.name: t for t in self._tiers}
+        current_names = set(name_to_tier)
+
+        # 校验：重复
+        if len(vendor_names) != len(set(vendor_names)):
+            seen: set[str] = set()
+            dups = [n for n in vendor_names if n in seen or seen.add(n)]  # type: ignore[func-returns-value]
+            raise ValueError(f"vendor 名称重复: {', '.join(dups)}")
+
+        # 校验：名称存在性
+        unknown = [n for n in vendor_names if n not in current_names]
+        if unknown:
+            raise ValueError(
+                f"未知 vendor: {', '.join(unknown)}; "
+                f"可用: {', '.join(sorted(current_names))}"
+            )
+
+        # 校验：全量覆盖
+        provided = set(vendor_names)
+        if provided != current_names:
+            missing = current_names - provided
+            raise ValueError(f"缺少 vendor: {', '.join(sorted(missing))}")
+
+        self._tiers[:] = [name_to_tier[n] for n in vendor_names]
+
+    def promote_vendor(self, vendor_name: str) -> None:
+        """将指定 vendor 提升至最高优先级，其余保持相对顺序.
+
+        Args:
+            vendor_name: 要提升的供应商名称。
+
+        Raises:
+            ValueError: 名称不存在。
+        """
+        current_names = self.get_vendor_names()
+        if vendor_name not in current_names:
+            available = sorted(t.name for t in self._tiers)
+            raise ValueError(
+                f"未知 vendor: {vendor_name}; 可用: {', '.join(available)}"
+            )
+        new_order = [vendor_name] + [n for n in current_names if n != vendor_name]
+        self.reorder_tiers(new_order)
+
     # ── 公开路由接口（委托给 _RouteExecutor）───────────────
 
     async def route_stream(

{coding_proxy-0.2.1a3 → coding_proxy-0.2.2}/src/coding/proxy/server/routes.py

@@ -261,7 +261,40 @@ def register_admin_routes(app: Any, router: Any) -> None:
     """注册管理操作路由（重置等）."""
 
     @app.post("/api/reset")
-    async def reset_circuit() -> dict:
+    async def reset_circuit(request: Request) -> Response:
+        """重置所有层级的熔断器/配额守卫/rate limit.
+
+        可选 JSON body ``{"vendors": ["v1", "v2", ...]}`` 支持运行时重排序：
+        - 单个 vendor → 提升至最高优先级，其余保持相对顺序
+        - 多个 vendor → 替换整个 N-tier 链路顺序（需覆盖所有 vendor）
+        """
+        # 解析可选 body
+        vendor_names: list[str] | None = None
+        try:
+            body = await request.json()
+            if isinstance(body, dict):
+                raw = body.get("vendors")
+                if isinstance(raw, list) and raw:
+                    vendor_names = [str(v) for v in raw]
+        except Exception:
+            # 无 body 或非 JSON → 仅 reset（向后兼容）
+            pass
+
+        # 重排序（如果指定）
+        if vendor_names is not None:
+            try:
+                if len(vendor_names) == 1:
+                    router.promote_vendor(vendor_names[0])
+                else:
+                    router.reorder_tiers(vendor_names)
+            except ValueError as exc:
+                return json_error_response(
+                    400,
+                    error_type="invalid_request_error",
+                    message=str(exc),
+                )
+
+        # 全量 reset
         for tier in router.tiers:
             if tier.circuit_breaker:
                 tier.circuit_breaker.reset()
@@ -270,7 +303,16 @@ def register_admin_routes(app: Any, router: Any) -> None:
             if tier.weekly_quota_guard:
                 tier.weekly_quota_guard.reset()
             tier.reset_rate_limit()
-        return {"status": "ok"}
+
+        result: dict[str, Any] = {"status": "ok"}
+        if vendor_names is not None:
+            result["tier_order"] = router.get_vendor_names()
+
+        return Response(
+            content=json.dumps(result, ensure_ascii=False).encode(),
+            status_code=200,
+            media_type="application/json",
+        )
 
 
 def register_reauth_routes(app: Any, reauth_coordinator: Any) -> None:

{coding_proxy-0.2.1a3 → coding_proxy-0.2.2}/tests/test_app_routes.py

@@ -868,3 +868,158 @@ def test_vendor_500_passthrough_preserves_raw_body():
 
     assert resp.status_code == 500
     assert resp.content == original_body
+
+
+# ── /api/reset 重排序测试 ────────────────────────────────────────
+
+
+def _make_reorder_app() -> tuple:
+    """创建包含 anthropic + zhipu + copilot 三层的测试应用."""
+    config = ProxyConfig(
+        tiers=[
+            {
+                "vendor": "anthropic",
+                "enabled": True,
+                "circuit_breaker": {"failure_threshold": 3},
+            },
+            {"vendor": "zhipu", "enabled": True, "api_key": "sk-test"},
+            {"vendor": "copilot", "enabled": True},
+        ],
+        database={"path": "/tmp/test-coding-proxy-reorder.db"},
+    )
+    app = create_app(config)
+
+    async def route_ok(body, headers):
+        return VendorResponse(
+            status_code=200, raw_body=b"{}", usage=UsageInfo(input_tokens=1)
+        )
+
+    for tier in app.state.router.tiers:
+        tier.vendor.send_message = route_ok
+
+    return app
+
+
+def test_reset_promote_single_vendor():
+    """单 vendor → promote_vendor：将该 vendor 提升至首位，其余保持相对顺序."""
+    app = _make_reorder_app()
+    with TestClient(app) as client:
+        resp = client.post("/api/reset", json={"vendors": ["zhipu"]})
+        assert resp.status_code == 200
+        data = resp.json()
+        assert data["tier_order"] == ["zhipu", "anthropic", "copilot"]
+
+        # 验证路由器内部状态一致
+        assert app.state.router.get_vendor_names() == ["zhipu", "anthropic", "copilot"]
+
+
+def test_reset_reorder_full_chain():
+    """多 vendor → reorder_tiers：精确匹配指定顺序."""
+    app = _make_reorder_app()
+    with TestClient(app) as client:
+        resp = client.post(
+            "/api/reset", json={"vendors": ["copilot", "anthropic", "zhipu"]}
+        )
+        assert resp.status_code == 200
+        data = resp.json()
+        assert data["tier_order"] == ["copilot", "anthropic", "zhipu"]
+        assert app.state.router.get_vendor_names() == [
+            "copilot",
+            "anthropic",
+            "zhipu",
+        ]
+
+
+def test_reset_no_body_backward_compatible():
+    """无 body → 仅 reset，不返回 tier_order（向后兼容）."""
+    app = _make_reorder_app()
+    with TestClient(app) as client:
+        resp = client.post("/api/reset")
+        assert resp.status_code == 200
+        data = resp.json()
+        assert "tier_order" not in data
+        assert data["status"] == "ok"
+        # 顺序不变
+        assert app.state.router.get_vendor_names() == [
+            "anthropic",
+            "zhipu",
+            "copilot",
+        ]
+
+
+def test_reset_unknown_vendor_returns_400():
+    """未知 vendor 名称 → 400 错误."""
+    app = _make_reorder_app()
+    with TestClient(app) as client:
+        resp = client.post("/api/reset", json={"vendors": ["nonexist"]})
+        assert resp.status_code == 400
+        err = resp.json()["error"]
+        assert "未知 vendor" in err["message"]
+
+
+def test_reset_duplicate_vendor_returns_400():
+    """重复 vendor 名称 → 400 错误."""
+    app = _make_reorder_app()
+    with TestClient(app) as client:
+        resp = client.post(
+            "/api/reset", json={"vendors": ["anthropic", "anthropic", "zhipu"]}
+        )
+        assert resp.status_code == 400
+        err = resp.json()["error"]
+        assert "重复" in err["message"]
+
+
+def test_reset_incomplete_vendor_list_returns_400():
+    """不完整的 vendor 列表（缺少现有 tier）→ 400 错误."""
+    app = _make_reorder_app()
+    with TestClient(app) as client:
+        resp = client.post("/api/reset", json={"vendors": ["anthropic", "zhipu"]})
+        assert resp.status_code == 400
+        err = resp.json()["error"]
+        assert "缺少 vendor" in err["message"]
+
+
+def test_reset_reorder_also_resets_circuit_breaker_and_rate_limit():
+    """重排序同时执行全量 reset（熔断器/配额守卫/rate limit 均被重置）."""
+    app = _make_reorder_app()
+    router = app.state.router
+
+    # 手动触发熔断器失败并设置 rate limit
+    router.tiers[0].record_failure(retry_after_seconds=300)
+    router.tiers[0]._rate_limit_deadline = 999999.0
+    assert not router.tiers[0].can_execute()
+
+    with TestClient(app) as client:
+        resp = client.post("/api/reset", json={"vendors": ["zhipu"]})
+        assert resp.status_code == 200
+
+    # 重排序后原 anthropic 仍是 tier 成员，但熔断器/rate limit 已被重置
+    anthropic_tier = next(t for t in router.tiers if t.name == "zhipu")
+    assert anthropic_tier.can_execute()
+    assert not anthropic_tier.is_rate_limited
+
+
+def test_reorder_tiers_shared_reference():
+    """验证 reorder_tiers 使用切片赋值，Executor 立即可见."""
+    from coding.proxy.routing.router import RequestRouter
+    from coding.proxy.routing.tier import VendorTier
+
+    t1 = VendorTier(vendor=MagicMock())
+    t1.vendor.get_name.return_value = "a"
+    t2 = VendorTier(vendor=MagicMock())
+    t2.vendor.get_name.return_value = "b"
+    t3 = VendorTier(vendor=MagicMock())
+    t3.vendor.get_name.return_value = "c"
+
+    router = RequestRouter([t1, t2, t3])
+    executor_tiers = router._executor._tiers
+
+    # 验证共享引用
+    assert executor_tiers is router._tiers
+
+    # 重排序
+    router.reorder_tiers(["c", "a", "b"])
+
+    # Executor 的列表也改变了（因为是同一个对象）
+    assert [t.name for t in executor_tiers] == ["c", "a", "b"]
+    assert router.get_vendor_names() == ["c", "a", "b"]

{coding_proxy-0.2.1a3 → coding_proxy-0.2.2}/uv.lock

@@ -65,7 +65,7 @@ wheels = [
 
 [[package]]
 name = "coding-proxy"
-version = "0.2.1a3"
+version = "0.2.2"
 source = { editable = "." }
 dependencies = [
     { name = "aiosqlite" },