coding-proxy 0.2.1a3__py3-none-any.whl → 0.2.2__py3-none-any.whl

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/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/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/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/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.dist-info → coding_proxy-0.2.2.dist-info}/METADATA

@@ -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.dist-info → coding_proxy-0.2.2.dist-info}/RECORD

@@ -9,7 +9,7 @@ coding/proxy/auth/providers/__init__.py,sha256=hnGL_aSHcMxiZHK6HKPWD0_tWSPcwuxwQ
 coding/proxy/auth/providers/base.py,sha256=TOtCi2b81-UBdEoWMv7HbYSmRxAjGSvnF1yBxazqai0,1092
 coding/proxy/auth/providers/github.py,sha256=xH6yygAzt8vI-MXV8EHl2tg4RcOmLaLBns93PBCyVG8,4835
 coding/proxy/auth/providers/google.py,sha256=MhbM5PXmgwQBgWCMDkhK_7GYyvS-IdPV4ATxKYH6WXM,8402
-coding/proxy/cli/__init__.py,sha256=glGVFdTj8fMLYSSWNtFGU4u9D2AoYBTLNgaSkjyQEnM,7911
+coding/proxy/cli/__init__.py,sha256=wkec3lIOglEOMN44ssGPzixCJ2hiTZ2wYL4_JtBc4Nw,8911
 coding/proxy/cli/auth_commands.py,sha256=tN5jWJo8sJP8jgoN4WH5iTl9rhi4xWPLMptgeTHIFpE,9212
 coding/proxy/cli/banner.py,sha256=gat7QGpfocL0wiAw3-MSUsCviyc59Sf-XswOp7Pg6LI,1694
 coding/proxy/compat/__init__.py,sha256=-msRszArsk2YJJtOeaidYDd1tAQEzeE91LvCi1CyMis,721
@@ -17,7 +17,7 @@ coding/proxy/compat/canonical.py,sha256=-zcuEwZ402xeH3C545RmuYRkT2HDuvFloyFydDv8
 coding/proxy/compat/session_store.py,sha256=B9IFjjQJnHMg1244m__jG9gnqGWi26-JyEtwopEri6Q,5244
 coding/proxy/config/__init__.py,sha256=hzgU5noJGecjj13UY38cC_p6jpWO3GO7okSW-A2XkJ0,127
 coding/proxy/config/auth_schema.py,sha256=LYrJQU_fgW-6AoQdjXt4-MgPJjXjv9HrghlCcZwotnA,696
-coding/proxy/config/config.default.yaml,sha256=UjtM6b4FNAJvilCm2fgjNvN5hPfDHt0EYKLlvL_0UDU,16404
+coding/proxy/config/config.default.yaml,sha256=WT5wK3T9h3ODyz7ydicieC4PGZTHq-419FV__dxdj4M,16575
 coding/proxy/config/loader.py,sha256=1J_RBJgjuC8RwB2mwewLMS7vy9WEhUqttZG2igeDm-w,8984
 coding/proxy/config/resiliency.py,sha256=GnzY-LoyfFqXFM1l6xEru418v-cKlv97-HM0noGPdks,1308
 coding/proxy/config/routing.py,sha256=aJMhfCRyoZIvemM3Q2_KV9rpWxUsFnoY0ZdCr4TwSs8,11765
@@ -30,7 +30,7 @@ coding/proxy/convert/anthropic_to_openai.py,sha256=crE8gi780Tr-dI58hce75BiaKzlh_
 coding/proxy/convert/gemini_sse_adapter.py,sha256=b7zQ9wBBn1bbG46WpLrAYOl0ExpyMTzpTorxoTadWaM,7395
 coding/proxy/convert/gemini_to_anthropic.py,sha256=EE_rUsLmWTsF2QSYWqIYzsjyk1mKXFp2sziqj_S2W5U,3446
 coding/proxy/convert/openai_to_anthropic.py,sha256=8rg8NZs_1up27MixrXRJAfmSiYrOkh_lkAJuytDGZow,3694
-coding/proxy/logging/__init__.py,sha256=vql4zfdnvHZCTzajqMCGATu1uSA7zYWQiGTkk8Eq_zs,6647
+coding/proxy/logging/__init__.py,sha256=6zEh2CELMJ5aZvM6PNCOFlZ55De8xoC6QNyMAa9WeCA,6755
 coding/proxy/logging/db.py,sha256=uARNaaAXWxemwfyybp660ujpi6UikNtFokG0pzXYwR8,19058
 coding/proxy/logging/formatters.py,sha256=8LDqiNAxGcfn9fsHqZzdK9TKGqOGNAOls75B1byBjnM,823
 coding/proxy/logging/stats.py,sha256=JlhJC4a2RmuCjbaseSUONScbcgn41KNR_sNsZ0OScbw,9203
@@ -49,7 +49,7 @@ coding/proxy/routing/model_mapper.py,sha256=b72CGRdusLAwoq7p8-8TWAv9-Zv8BozssiZC
 coding/proxy/routing/quota_guard.py,sha256=TRJs3mjdRMc_u0HCw-hZn--osha_m11dEtAUxOO2P5A,6806
 coding/proxy/routing/rate_limit.py,sha256=i2cCqtbmXrP6wjRUTWXLP4DdYwVj0C4o59QdYGkPQj0,5122
 coding/proxy/routing/retry.py,sha256=KEYVToBkBOtXdqY7He70RrtVWFqIpnOQf2VVksdLrlk,2386
-coding/proxy/routing/router.py,sha256=bXaglxuT-5qYzrSMk7ZE4mpQynP4Z6F2pm9hnCbdG90,3440
+coding/proxy/routing/router.py,sha256=x5x6cjL5BOnRXZZuzK3GCnNtaMVjw75xw2OQ-DoO9_s,5830
 coding/proxy/routing/session_manager.py,sha256=kpEPCo67CdsELX71hoe6G7sb2dcda7gTNL0FtpgRK7I,2950
 coding/proxy/routing/tier.py,sha256=OBrJiMxfLCxXvZfARD5oNmuhpYASKnyrW9sOCHLdQ1g,7777
 coding/proxy/routing/usage_parser.py,sha256=j4G0ArFduQ2D4Yeuad94DVlwdc-JvSh7SJLVzc-hLcs,8480
@@ -59,7 +59,7 @@ coding/proxy/server/app.py,sha256=kRGgb772dZu8200LPnn7Nt0IU5oagcbBf_Vc5ynxxzE,55
 coding/proxy/server/factory.py,sha256=w8VFvxoogw9K9sO8MlT6bIP7xM7mR6sCohrZle9y_Gg,9985
 coding/proxy/server/request_normalizer.py,sha256=F_mgxxuA3i7cN1CEWlto7Mm9VT_QG2QNspiUWeYVBpM,10511
 coding/proxy/server/responses.py,sha256=i0ugnLRNOdRYGHEWxkwsxR35ChmdMQsSaD8AjRluTn4,2167
-coding/proxy/server/routes.py,sha256=QeEsYczjvPfVhOrED2qe1V6CpwVBZbQHs8dP0OGdGXQ,11734
+coding/proxy/server/routes.py,sha256=_CkeOEcnMe21RcLZ-raxgknUbdclV-Uf9f_B2Xz9_a8,13325
 coding/proxy/streaming/__init__.py,sha256=0al5TC-zJt8Bz0CibTmd8WPza-Cs-qcuZWvT2fKPqHI,23
 coding/proxy/streaming/anthropic_compat.py,sha256=cycYiJ-glN88OmfLTR7FroHRethONlEcK0PT78KqGbA,21202
 coding/proxy/vendors/__init__.py,sha256=fehSpQ2-kUlZY6N8cNMGVJYMXspQmi3V4e0FgC4Ay4k,1011
@@ -79,8 +79,8 @@ coding/proxy/vendors/native_anthropic.py,sha256=SxtM71PDci0gqLqiwCrFnT410SnSoD7F
 coding/proxy/vendors/token_manager.py,sha256=s10t4Com0jNnKGkPyJ_HpG5SjHrCEJvfArEOAaPKA_k,4189
 coding/proxy/vendors/xiaomi.py,sha256=E-GcmJBZh7GOtDFonxZmlf0hKRhrlrXzL0IxHFRYcRo,860
 coding/proxy/vendors/zhipu.py,sha256=3j_rqNFu1CX-B5ugtrL6Y1OeWSy9yiqsVa9Bi1ssaAA,1062
-coding_proxy-0.2.1a3.dist-info/METADATA,sha256=YHD2K4iRXx3xiPxG2dk2uHm-H05IKQdQfEULtW1YAXQ,10821
-coding_proxy-0.2.1a3.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-coding_proxy-0.2.1a3.dist-info/entry_points.txt,sha256=moIVzt5ho0Wk9B47LOo2SEAbhzuDDHWi-EfM30U0XBg,54
-coding_proxy-0.2.1a3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-coding_proxy-0.2.1a3.dist-info/RECORD,,
+coding_proxy-0.2.2.dist-info/METADATA,sha256=4eYTzmULjk3sHv87lB4NnGv4RQ2I_VNADAeLVJGB9mQ,10817
+coding_proxy-0.2.2.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+coding_proxy-0.2.2.dist-info/entry_points.txt,sha256=moIVzt5ho0Wk9B47LOo2SEAbhzuDDHWi-EfM30U0XBg,54
+coding_proxy-0.2.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+coding_proxy-0.2.2.dist-info/RECORD,,