coding-proxy 0.3.1a8__tar.gz → 0.3.1a10__tar.gz

{coding_proxy-0.3.1a8 → coding_proxy-0.3.1a10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: coding-proxy
-Version: 0.3.1a8
+Version: 0.3.1a10
 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

{coding_proxy-0.3.1a8 → coding_proxy-0.3.1a10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "coding-proxy"
-version = "0.3.1a8"
+version = "0.3.1a10"
 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.3.1a8 → coding_proxy-0.3.1a10}/src/coding/proxy/cli/__init__.py

@@ -30,6 +30,10 @@ logger = logging.getLogger(__name__)
 # 注册 Auth 子应用
 app.add_typer(auth_app, name="auth")
 
+# 注册 Session 子应用
+session_app = typer.Typer(name="session", help="管理 Session-Vendor 运行时绑定")
+app.add_typer(session_app, name="session")
+
 
 def _build_token_store(cfg_path: Path | None = None):
     """按配置解析 Token Store 路径并完成加载."""
@@ -264,6 +268,97 @@ def reset(
         console.print("[red]代理服务未运行[/red]")
 
 
+# ── Session 子命令 ───────────────────────────────────────────────
+
+
+@session_app.command("bind")
+def session_bind(
+    key: str = typer.Option(..., "--key", "-k", help="Session key"),
+    vendor: str = typer.Option(
+        ..., "--vendor", "-v", help="绑定 vendor（逗号分隔多个）"
+    ),
+    port: int = typer.Option(3392, "--port", "-p", help="代理服务端口"),
+) -> None:
+    """为指定 Session 绑定 vendor 优先级."""
+    import httpx as _httpx
+
+    vendors = [v.strip() for v in vendor.split(",") if v.strip()]
+    try:
+        resp = _httpx.put(
+            f"http://127.0.0.1:{port}/api/session-vendor",
+            json={"session_key": key, "vendors": vendors},
+            timeout=5,
+        )
+        if resp.status_code == 200:
+            data = resp.json()
+            console.print(
+                f"[green]绑定成功:[/] session [cyan]{key[:16]}…[/cyan] → "
+                + " → ".join(data.get("vendors", vendors))
+            )
+        else:
+            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]")
+
+
+@session_app.command("unbind")
+def session_unbind(
+    key: str = typer.Option(..., "--key", "-k", help="Session key"),
+    port: int = typer.Option(3392, "--port", "-p", help="代理服务端口"),
+) -> None:
+    """解除指定 Session 的 vendor 绑定."""
+    from urllib.parse import quote
+
+    import httpx as _httpx
+
+    try:
+        resp = _httpx.delete(
+            f"http://127.0.0.1:{port}/api/session-vendor/{quote(key, safe='')}",
+            timeout=5,
+        )
+        if resp.status_code == 200:
+            console.print(f"[green]已解除绑定:[/] session [cyan]{key[:16]}…[/cyan]")
+        elif resp.status_code == 404:
+            console.print(f"[yellow]未找到绑定:[/] session [cyan]{key[:16]}…[/cyan]")
+        else:
+            console.print(f"[red]解除失败: {resp.status_code} {resp.text}[/red]")
+    except _httpx.ConnectError:
+        console.print("[red]代理服务未运行[/red]")
+
+
+@session_app.command("list")
+def session_list(
+    port: int = typer.Option(3392, "--port", "-p", help="代理服务端口"),
+) -> None:
+    """列出所有运行时 Session-Vendor 绑定."""
+    import httpx as _httpx
+
+    try:
+        resp = _httpx.get(
+            f"http://127.0.0.1:{port}/api/session-vendor",
+            timeout=5,
+        )
+        if resp.status_code == 200:
+            data = resp.json()
+            bindings = data.get("bindings", [])
+            if not bindings:
+                console.print("[dim]当前无运行时绑定[/dim]")
+                return
+            for b in bindings:
+                key = b.get("session_key", "?")
+                vendors = b.get("vendors", [])
+                console.print(f"  [cyan]{key[:24]}…[/cyan] → " + " → ".join(vendors))
+        else:
+            console.print(f"[red]查询失败: {resp.status_code} {resp.text}[/red]")
+    except _httpx.ConnectError:
+        console.print("[red]代理服务未运行[/red]")
+
+
 def _resolve_config_path(config: str | Path | None = None) -> Path | None:
     """标准化配置路径输入."""
     if config is None:

coding_proxy-0.3.1a10/src/coding/proxy/routing/session_policy.py

@@ -0,0 +1,116 @@
+"""Session Policy 解析引擎 — 根据 session_key + client_category 解析适用的路由策略."""
+
+from __future__ import annotations
+
+import logging
+import threading
+
+from ..config.session_policy import SessionPolicy, SessionPolicyMatch
+
+logger = logging.getLogger(__name__)
+
+
+class SessionPolicyResolver:
+    """根据 session_key + client_category 解析适用的 SessionPolicy.
+
+    设计要点：
+    - 启动时构建索引，运行时 O(1) 查找
+    - 精确匹配优先：session_key > client_category > 无策略
+    - 无侵入性：不匹配时返回 None，路由行为与现有一致
+    - 运行时可变：支持 API 动态 upsert/remove session → vendor 绑定
+    """
+
+    def __init__(self, policies: list[SessionPolicy] | None = None) -> None:
+        self._policies = policies or []
+        self._key_index: dict[str, SessionPolicy] = {}
+        self._category_index: dict[str, SessionPolicy] = {}
+        self._config_key_backup: dict[str, SessionPolicy] = {}
+        self._lock = threading.Lock()
+        self._build_index()
+
+    def _build_index(self) -> None:
+        """构建 session_key / client_category → SessionPolicy 的查找索引.
+
+        按定义顺序遍历，首次出现的 key/category 获得最高优先级。
+        """
+        for policy in self._policies:
+            for key in policy.match.session_keys:
+                if key not in self._key_index:
+                    self._key_index[key] = policy
+            if (
+                policy.match.client_category
+                and policy.match.client_category not in self._category_index
+            ):
+                self._category_index[policy.match.client_category] = policy
+
+        if self._key_index or self._category_index:
+            logger.info(
+                "SessionPolicyResolver initialized: %d key rules, %d category rules",
+                len(self._key_index),
+                len(self._category_index),
+            )
+
+    def resolve(
+        self, session_key: str, client_category: str = "cc"
+    ) -> SessionPolicy | None:
+        """返回匹配的策略，优先精确 session_key 匹配，其次 category 匹配.
+
+        返回的 SessionPolicy 对象应为不可变引用；调用方不应修改其内部属性，
+        否则在并发 upsert/remove 场景下可能产生竞态。
+        """
+        with self._lock:
+            policy = self._key_index.get(session_key)
+        if policy:
+            return policy
+        return self._category_index.get(client_category)
+
+    # ── 运行时 session → vendor 绑定 ──────────────────────────────
+
+    def upsert(self, session_key: str, tier_names: list[str]) -> SessionPolicy:
+        """为指定 session key 创建或替换运行时 vendor 绑定.
+
+        运行时策略使用 ``runtime:`` 名称前缀，与配置文件驱动的策略区分。
+        """
+        policy = SessionPolicy(
+            name=f"runtime:{session_key}",
+            match=SessionPolicyMatch(session_keys=[session_key]),
+            tiers=tier_names,
+        )
+        with self._lock:
+            existing = self._key_index.get(session_key)
+            if existing and not existing.name.startswith("runtime:"):
+                self._config_key_backup[session_key] = existing
+            self._key_index[session_key] = policy
+        logger.info(
+            "Session vendor binding upserted: session_key=%s → %s",
+            session_key,
+            tier_names,
+        )
+        return policy
+
+    def remove(self, session_key: str) -> bool:
+        """删除指定 session key 的运行时 vendor 绑定.
+
+        Returns:
+            True 如果找到并删除了绑定，False 如果不存在。
+        """
+        with self._lock:
+            policy = self._key_index.get(session_key)
+            if policy is None or not policy.name.startswith("runtime:"):
+                return False
+            del self._key_index[session_key]
+            # 恢复被运行时绑定覆盖的配置策略
+            backup = self._config_key_backup.pop(session_key, None)
+            if backup is not None:
+                self._key_index[session_key] = backup
+        logger.info("Session vendor binding removed: session_key=%s", session_key)
+        return True
+
+    def list_runtime_bindings(self) -> list[dict[str, str | list[str]]]:
+        """返回所有运行时注入的绑定快照（仅 API 创建的，不含配置文件驱动的）."""
+        with self._lock:
+            return [
+                {"session_key": key, "vendors": policy.tiers}
+                for key, policy in self._key_index.items()
+                if policy.name.startswith("runtime:")
+            ]