coding-proxy 0.1.4a3__tar.gz → 0.1.4a5__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.1.4a3 → coding_proxy-0.1.4a5}/PKG-INFO +1 -1
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/pyproject.toml +1 -1
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/cli/__init__.py +53 -8
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/config/config.default.yaml +3 -1
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/config/resiliency.py +8 -2
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/logging/db.py +189 -24
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/logging/stats.py +63 -21
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/routing/error_classifier.py +47 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/routing/executor.py +136 -14
- coding_proxy-0.1.4a5/src/coding/proxy/server/request_normalizer.py +286 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/vendors/anthropic.py +58 -4
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/vendors/base.py +2 -2
- coding_proxy-0.1.4a5/tests/test_cli_usage.py +215 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_error_classifier.py +100 -0
- coding_proxy-0.1.4a5/tests/test_request_normalizer.py +310 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_router_executor.py +425 -0
- coding_proxy-0.1.4a5/tests/test_time_range.py +48 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_vendors.py +208 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/uv.lock +1 -1
- coding_proxy-0.1.4a3/src/coding/proxy/server/request_normalizer.py +0 -143
- coding_proxy-0.1.4a3/tests/test_cli_usage.py +0 -112
- coding_proxy-0.1.4a3/tests/test_request_normalizer.py +0 -91
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/.github/workflows/ci.yml +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/.github/workflows/coverage.yml +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/.github/workflows/promote.yml +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/.github/workflows/release.yml +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/.gitignore +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/AGENTS.md +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/CHANGELOG.md +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/CLAUDE.md +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/LICENSE +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/README.md +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/docs/ci-cd.md +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/docs/framework.md +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/docs/user-guide.md +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/docs/zh-CN/README.md +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/__init__.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/__init__.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/__main__.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/auth/__init__.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/auth/providers/__init__.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/auth/providers/base.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/auth/providers/github.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/auth/providers/google.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/auth/runtime.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/auth/store.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/cli/auth_commands.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/cli/banner.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/compat/__init__.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/compat/canonical.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/compat/session_store.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/config/__init__.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/config/auth_schema.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/config/loader.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/config/routing.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/config/schema.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/config/server.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/config/vendors.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/convert/__init__.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/convert/anthropic_to_gemini.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/convert/anthropic_to_openai.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/convert/gemini_sse_adapter.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/convert/gemini_to_anthropic.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/convert/openai_to_anthropic.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/logging/__init__.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/model/__init__.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/model/auth.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/model/compat.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/model/constants.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/model/pricing.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/model/token.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/model/vendor.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/pricing.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/routing/__init__.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/routing/circuit_breaker.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/routing/model_mapper.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/routing/quota_guard.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/routing/rate_limit.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/routing/retry.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/routing/router.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/routing/session_manager.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/routing/tier.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/routing/usage_parser.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/routing/usage_recorder.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/server/__init__.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/server/app.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/server/factory.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/server/responses.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/server/routes.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/streaming/__init__.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/streaming/anthropic_compat.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/vendors/__init__.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/vendors/antigravity.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/vendors/copilot.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/vendors/copilot_models.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/vendors/copilot_token_manager.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/vendors/copilot_urls.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/vendors/mixins.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/vendors/token_manager.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/src/coding/proxy/vendors/zhipu.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/__init__.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_antigravity.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_app_routes.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_auto_login.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_banner.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_circuit_breaker.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_compat.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_config_init.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_config_loader.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_convert_request.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_convert_response.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_convert_sse.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_copilot.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_copilot_convert_request.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_copilot_convert_response.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_copilot_models.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_copilot_urls.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_currency.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_mixins.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_model_auth.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_model_compat.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_model_constants.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_model_mapper.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_model_pricing.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_model_token.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_model_vendor.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_parse_usage.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_pricing.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_quota_guard.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_rate_limit.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_router_chain.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_runtime_reauth.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_schema.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_streaming_anthropic_compat.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_tier.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_tiers_config.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_token_logger.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_token_manager.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_types.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_vendor_streaming.py +0 -0
- {coding_proxy-0.1.4a3 → coding_proxy-0.1.4a5}/tests/test_zhipu.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: coding-proxy
|
|
3
|
-
Version: 0.1.
|
|
3
|
+
Version: 0.1.4a5
|
|
4
4
|
Summary: A High-Availability, Transparent, and Smart Multi-Vendor Proxy for Claude Code. Support Claude Plans, GitHub Copilot, Google Antigravity, ZAI/GLM.
|
|
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.1.
|
|
3
|
+
version = "0.1.4a5"
|
|
4
4
|
description = "A High-Availability, Transparent, and Smart Multi-Vendor Proxy for Claude Code. Support Claude Plans, GitHub Copilot, Google Antigravity, ZAI/GLM."
|
|
5
5
|
readme = "README.md"
|
|
6
6
|
requires-python = ">=3.12"
|
|
@@ -8,7 +8,7 @@ from __future__ import annotations
|
|
|
8
8
|
import asyncio
|
|
9
9
|
import logging
|
|
10
10
|
from pathlib import Path
|
|
11
|
-
from typing import TYPE_CHECKING
|
|
11
|
+
from typing import TYPE_CHECKING
|
|
12
12
|
|
|
13
13
|
import typer
|
|
14
14
|
|
|
@@ -18,7 +18,7 @@ if TYPE_CHECKING:
|
|
|
18
18
|
from rich.console import Console
|
|
19
19
|
|
|
20
20
|
from ..config.loader import load_config
|
|
21
|
-
from ..logging.db import TokenLogger
|
|
21
|
+
from ..logging.db import TimePeriod, TokenLogger
|
|
22
22
|
from ..logging.stats import show_usage
|
|
23
23
|
from .auth_commands import app as auth_app
|
|
24
24
|
from .auth_commands import auto_login_if_needed as _auto_login_if_needed
|
|
@@ -48,6 +48,30 @@ def _build_token_store(cfg_path: Path | None = None):
|
|
|
48
48
|
return cfg, store
|
|
49
49
|
|
|
50
50
|
|
|
51
|
+
def _resolve_period(
|
|
52
|
+
*,
|
|
53
|
+
days: int = 7,
|
|
54
|
+
week: bool = False,
|
|
55
|
+
month: bool = False,
|
|
56
|
+
total: bool = False,
|
|
57
|
+
) -> tuple[TimePeriod, int]:
|
|
58
|
+
"""将互斥的时间维度标志解析为 (TimePeriod, count) 元组.
|
|
59
|
+
|
|
60
|
+
优先级: ``-t`` > ``-m`` > ``-w`` > ``-d``。
|
|
61
|
+
|
|
62
|
+
Returns:
|
|
63
|
+
``(period, count)`` 元组。``count`` 仅在 ``DAY`` 维度下有实际意义;
|
|
64
|
+
``WEEK`` / ``MONTH`` / ``TOTAL`` 维度始终使用 count=1。
|
|
65
|
+
"""
|
|
66
|
+
if total:
|
|
67
|
+
return TimePeriod.TOTAL, 1
|
|
68
|
+
if month:
|
|
69
|
+
return TimePeriod.MONTH, 1
|
|
70
|
+
if week:
|
|
71
|
+
return TimePeriod.WEEK, 1
|
|
72
|
+
return TimePeriod.DAY, max(1, days)
|
|
73
|
+
|
|
74
|
+
|
|
51
75
|
# ── 主命令 ─────────────────────────────────────────────────────
|
|
52
76
|
|
|
53
77
|
|
|
@@ -118,20 +142,34 @@ def status(
|
|
|
118
142
|
|
|
119
143
|
@app.command()
|
|
120
144
|
def usage(
|
|
121
|
-
days: int = typer.Option(7, "--days", "-d", help="
|
|
145
|
+
days: int = typer.Option(7, "--days", "-d", help="统计天数(与 -w/-m/-t 互斥)"),
|
|
146
|
+
week: bool = typer.Option(False, "--week", "-w", help="统计本周(按周聚合)"),
|
|
147
|
+
month: bool = typer.Option(False, "--month", "-m", help="统计本月(按月聚合)"),
|
|
148
|
+
total: bool = typer.Option(False, "--total", "-t", help="统计全部历史记录"),
|
|
122
149
|
vendor: str | None = typer.Option(None, "--vendor", "-v", help="过滤供应商"),
|
|
123
|
-
model: str | None = typer.Option(None, "--model",
|
|
150
|
+
model: str | None = typer.Option(None, "--model", help="过滤请求模型"),
|
|
124
151
|
db_path: str | None = typer.Option(None, "--db", help="数据库路径"),
|
|
125
152
|
) -> None:
|
|
126
|
-
"""查看 Token 使用统计.
|
|
153
|
+
"""查看 Token 使用统计.
|
|
154
|
+
|
|
155
|
+
时间维度(互斥,优先级 -t > -m > -w > -d):
|
|
156
|
+
|
|
157
|
+
\b
|
|
158
|
+
-d 7 最近 7 天(默认,按日聚合)
|
|
159
|
+
-w 本周(按周聚合)
|
|
160
|
+
-m 本月(按月聚合)
|
|
161
|
+
-t 全部历史(按供应商+模型聚合)
|
|
162
|
+
"""
|
|
163
|
+
period, count = _resolve_period(days=days, week=week, month=month, total=total)
|
|
127
164
|
cfg = load_config(Path(db_path) if db_path else None)
|
|
128
165
|
token_logger = TokenLogger(cfg.db_path)
|
|
129
|
-
asyncio.run(_run_usage(token_logger,
|
|
166
|
+
asyncio.run(_run_usage(token_logger, period, count, vendor, model, cfg))
|
|
130
167
|
|
|
131
168
|
|
|
132
169
|
async def _run_usage(
|
|
133
170
|
token_logger: TokenLogger,
|
|
134
|
-
|
|
171
|
+
period: TimePeriod,
|
|
172
|
+
count: int,
|
|
135
173
|
vendor: str | None,
|
|
136
174
|
model: str | None,
|
|
137
175
|
cfg: ProxyConfig,
|
|
@@ -140,7 +178,14 @@ async def _run_usage(
|
|
|
140
178
|
|
|
141
179
|
await token_logger.init()
|
|
142
180
|
pricing_table = PricingTable(cfg.pricing)
|
|
143
|
-
await show_usage(
|
|
181
|
+
await show_usage(
|
|
182
|
+
token_logger,
|
|
183
|
+
vendor=vendor,
|
|
184
|
+
model=model,
|
|
185
|
+
pricing_table=pricing_table,
|
|
186
|
+
period=period,
|
|
187
|
+
count=count,
|
|
188
|
+
)
|
|
144
189
|
await token_logger.close()
|
|
145
190
|
|
|
146
191
|
|
|
@@ -118,13 +118,15 @@ vendors:
|
|
|
118
118
|
|
|
119
119
|
# === 故障转移触发条件 ===
|
|
120
120
|
failover:
|
|
121
|
-
status_codes: [429, 403, 503, 500]
|
|
121
|
+
status_codes: [429, 403, 503, 500, 529]
|
|
122
122
|
error_types:
|
|
123
123
|
- "rate_limit_error"
|
|
124
124
|
- "overloaded_error"
|
|
125
|
+
- "api_error"
|
|
125
126
|
error_message_patterns:
|
|
126
127
|
- "quota"
|
|
127
128
|
- "usage cap"
|
|
129
|
+
- "internal network failure"
|
|
128
130
|
|
|
129
131
|
# === 模型映射 ===
|
|
130
132
|
model_mapping:
|
|
@@ -24,13 +24,19 @@ class RetryConfig(BaseModel):
|
|
|
24
24
|
|
|
25
25
|
class FailoverConfig(BaseModel):
|
|
26
26
|
status_codes: list[int] = Field(
|
|
27
|
-
default=[429, 403, 503, 500],
|
|
27
|
+
default=[429, 403, 503, 500, 529],
|
|
28
28
|
)
|
|
29
29
|
error_types: list[str] = Field(
|
|
30
30
|
default=["rate_limit_error", "overloaded_error", "api_error"],
|
|
31
31
|
)
|
|
32
32
|
error_message_patterns: list[str] = Field(
|
|
33
|
-
default=[
|
|
33
|
+
default=[
|
|
34
|
+
"quota",
|
|
35
|
+
"limit exceeded",
|
|
36
|
+
"usage cap",
|
|
37
|
+
"capacity",
|
|
38
|
+
"internal network failure",
|
|
39
|
+
],
|
|
34
40
|
)
|
|
35
41
|
|
|
36
42
|
|
|
@@ -4,6 +4,7 @@ from __future__ import annotations
|
|
|
4
4
|
|
|
5
5
|
import logging
|
|
6
6
|
from datetime import UTC, datetime, timedelta
|
|
7
|
+
from enum import StrEnum
|
|
7
8
|
from pathlib import Path
|
|
8
9
|
from zoneinfo import ZoneInfo
|
|
9
10
|
|
|
@@ -12,6 +13,21 @@ import aiosqlite
|
|
|
12
13
|
logger = logging.getLogger(__name__)
|
|
13
14
|
|
|
14
15
|
|
|
16
|
+
# ── 时间维度枚举 ──────────────────────────────────────────────
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
class TimePeriod(StrEnum):
|
|
20
|
+
"""用量查询时间维度."""
|
|
21
|
+
|
|
22
|
+
DAY = "day"
|
|
23
|
+
WEEK = "week"
|
|
24
|
+
MONTH = "month"
|
|
25
|
+
TOTAL = "total"
|
|
26
|
+
|
|
27
|
+
|
|
28
|
+
# ── 时区工具函数 ──────────────────────────────────────────────
|
|
29
|
+
|
|
30
|
+
|
|
15
31
|
def _local_tz() -> ZoneInfo:
|
|
16
32
|
"""获取系统本地时区,失败降级 UTC."""
|
|
17
33
|
try:
|
|
@@ -40,6 +56,48 @@ def _hours_ago_utc_iso(hours: float) -> str:
|
|
|
40
56
|
return cutoff.strftime("%Y-%m-%dT%H:%M:%f+00:00")
|
|
41
57
|
|
|
42
58
|
|
|
59
|
+
def _weeks_start_utc_iso(weeks: int) -> str:
|
|
60
|
+
"""计算本地时区下 weeks 周前的周一 00:00 对应的 UTC ISO 字符串."""
|
|
61
|
+
tz = _local_tz()
|
|
62
|
+
now = datetime.now(tz)
|
|
63
|
+
monday = now.date() - timedelta(days=now.weekday(), weeks=max(1, weeks) - 1)
|
|
64
|
+
start_dt = datetime(monday.year, monday.month, monday.day, tzinfo=tz)
|
|
65
|
+
return start_dt.astimezone(UTC).strftime("%Y-%m-%dT%H:%M:%f+00:00")
|
|
66
|
+
|
|
67
|
+
|
|
68
|
+
def _months_start_utc_iso(months: int) -> str:
|
|
69
|
+
"""计算本地时区下 months 个月前的 1 日 00:00 对应的 UTC ISO 字符串."""
|
|
70
|
+
tz = _local_tz()
|
|
71
|
+
now = datetime.now(tz)
|
|
72
|
+
y, m = now.year, now.month
|
|
73
|
+
m -= max(1, months) - 1
|
|
74
|
+
while m <= 0:
|
|
75
|
+
m += 12
|
|
76
|
+
y -= 1
|
|
77
|
+
start_dt = datetime(y, m, 1, tzinfo=tz)
|
|
78
|
+
return start_dt.astimezone(UTC).strftime("%Y-%m-%dT%H:%M:%f+00:00")
|
|
79
|
+
|
|
80
|
+
|
|
81
|
+
def _period_start_iso(period: TimePeriod, count: int) -> str | None:
|
|
82
|
+
"""根据时间维度和数量计算起始 UTC ISO 字符串.
|
|
83
|
+
|
|
84
|
+
Returns:
|
|
85
|
+
ISO 字符串,或 ``None``(``count == 0`` 或 TOTAL 维度时不限时间范围)。
|
|
86
|
+
"""
|
|
87
|
+
if count == 0:
|
|
88
|
+
return None # count=0 语义:不限时间
|
|
89
|
+
if period is TimePeriod.DAY:
|
|
90
|
+
return _days_start_utc_iso(count)
|
|
91
|
+
if period is TimePeriod.WEEK:
|
|
92
|
+
return _weeks_start_utc_iso(count)
|
|
93
|
+
if period is TimePeriod.MONTH:
|
|
94
|
+
return _months_start_utc_iso(count)
|
|
95
|
+
return None # TOTAL: 全量查询
|
|
96
|
+
|
|
97
|
+
|
|
98
|
+
# ── SQLite UDF ────────────────────────────────────────────────
|
|
99
|
+
|
|
100
|
+
|
|
43
101
|
def _local_date_udf(ts_str: str) -> str:
|
|
44
102
|
"""
|
|
45
103
|
SQLite UDF:将 UTC ISO 时间戳转为本地日期字符串.
|
|
@@ -63,6 +121,36 @@ def _local_date_udf(ts_str: str) -> str:
|
|
|
63
121
|
return ""
|
|
64
122
|
|
|
65
123
|
|
|
124
|
+
def _local_week_udf(ts_str: str) -> str:
|
|
125
|
+
"""SQLite UDF:将 UTC ISO 时间戳转为本地 ISO 周标识 (YYYY-WNN)."""
|
|
126
|
+
try:
|
|
127
|
+
tz = _local_tz()
|
|
128
|
+
return (
|
|
129
|
+
datetime.fromisoformat(ts_str.replace("Z", "+00:00"))
|
|
130
|
+
.astimezone(tz)
|
|
131
|
+
.strftime("%G-W%V")
|
|
132
|
+
)
|
|
133
|
+
except (ValueError, TypeError, AttributeError):
|
|
134
|
+
return ""
|
|
135
|
+
|
|
136
|
+
|
|
137
|
+
def _local_month_udf(ts_str: str) -> str:
|
|
138
|
+
"""SQLite UDF:将 UTC ISO 时间戳转为本地年月标识 (YYYY-MM)."""
|
|
139
|
+
try:
|
|
140
|
+
tz = _local_tz()
|
|
141
|
+
return (
|
|
142
|
+
datetime.fromisoformat(ts_str.replace("Z", "+00:00"))
|
|
143
|
+
.astimezone(tz)
|
|
144
|
+
.strftime("%Y-%m")
|
|
145
|
+
)
|
|
146
|
+
except (ValueError, TypeError, AttributeError):
|
|
147
|
+
if isinstance(ts_str, str) and len(ts_str) >= 7:
|
|
148
|
+
return ts_str[:7]
|
|
149
|
+
return ""
|
|
150
|
+
|
|
151
|
+
|
|
152
|
+
# ── DDL ───────────────────────────────────────────────────────
|
|
153
|
+
|
|
66
154
|
_CREATE_TABLES = """
|
|
67
155
|
CREATE TABLE IF NOT EXISTS usage_log (
|
|
68
156
|
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
|
@@ -104,6 +192,35 @@ CREATE INDEX IF NOT EXISTS idx_usage_evidence_request_id ON usage_evidence(reque
|
|
|
104
192
|
CREATE INDEX IF NOT EXISTS idx_usage_evidence_vendor ON usage_evidence(vendor);
|
|
105
193
|
"""
|
|
106
194
|
|
|
195
|
+
# ── 时间维度 → SQL 片段映射 ───────────────────────────────────
|
|
196
|
+
|
|
197
|
+
_PERIOD_SQL: dict[TimePeriod, tuple[str, str, str]] = {
|
|
198
|
+
# (date_expr, group_by, order_by_expr)
|
|
199
|
+
TimePeriod.DAY: (
|
|
200
|
+
"local_date(ts) AS date",
|
|
201
|
+
"local_date(ts), vendor, model_served",
|
|
202
|
+
"local_date(ts) DESC, vendor, model_served",
|
|
203
|
+
),
|
|
204
|
+
TimePeriod.WEEK: (
|
|
205
|
+
"local_week(ts) AS date",
|
|
206
|
+
"local_week(ts), vendor, model_served",
|
|
207
|
+
"local_week(ts) DESC, vendor, model_served",
|
|
208
|
+
),
|
|
209
|
+
TimePeriod.MONTH: (
|
|
210
|
+
"local_month(ts) AS date",
|
|
211
|
+
"local_month(ts), vendor, model_served",
|
|
212
|
+
"local_month(ts) DESC, vendor, model_served",
|
|
213
|
+
),
|
|
214
|
+
TimePeriod.TOTAL: (
|
|
215
|
+
"NULL AS date",
|
|
216
|
+
"vendor, model_served",
|
|
217
|
+
"vendor, model_served",
|
|
218
|
+
),
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
|
|
222
|
+
# ── TokenLogger ───────────────────────────────────────────────
|
|
223
|
+
|
|
107
224
|
|
|
108
225
|
class TokenLogger:
|
|
109
226
|
def __init__(self, db_path: Path) -> None:
|
|
@@ -120,8 +237,10 @@ class TokenLogger:
|
|
|
120
237
|
await self._migrate_rename_backend_to_vendor()
|
|
121
238
|
await self._migrate_add_failover_from()
|
|
122
239
|
await self._db.executescript(_CREATE_INDEXES)
|
|
123
|
-
# 注册时区感知的日期函数:将 UTC
|
|
240
|
+
# 注册时区感知的日期函数:将 UTC 时间戳转为本地时间维度
|
|
124
241
|
await self._db.create_function("local_date", 1, _local_date_udf)
|
|
242
|
+
await self._db.create_function("local_week", 1, _local_week_udf)
|
|
243
|
+
await self._db.create_function("local_month", 1, _local_month_udf)
|
|
125
244
|
await self._db.commit()
|
|
126
245
|
|
|
127
246
|
async def _migrate_add_failover_from(self) -> None:
|
|
@@ -248,14 +367,31 @@ class TokenLogger:
|
|
|
248
367
|
rows = await cursor.fetchall()
|
|
249
368
|
return [dict(row) for row in rows]
|
|
250
369
|
|
|
251
|
-
|
|
252
|
-
|
|
370
|
+
# ── 核心查询方法 ──────────────────────────────────────────
|
|
371
|
+
|
|
372
|
+
async def query_usage(
|
|
373
|
+
self,
|
|
374
|
+
*,
|
|
375
|
+
period: TimePeriod = TimePeriod.DAY,
|
|
376
|
+
count: int = 7,
|
|
377
|
+
vendor: str | None = None,
|
|
378
|
+
model: str | None = None,
|
|
253
379
|
) -> list[dict]:
|
|
380
|
+
"""按指定时间维度聚合 Token 使用统计.
|
|
381
|
+
|
|
382
|
+
Args:
|
|
383
|
+
period: 时间维度(日/周/月/全量)。
|
|
384
|
+
count: ``period`` 的数量。仅用于计算起始时间边界,
|
|
385
|
+
``TOTAL`` 维度下忽略此参数。
|
|
386
|
+
vendor: 过滤供应商。
|
|
387
|
+
model: 过滤请求模型。
|
|
388
|
+
"""
|
|
254
389
|
if not self._db:
|
|
255
390
|
return []
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
391
|
+
|
|
392
|
+
date_expr, group_clause, order_clause = _PERIOD_SQL[period]
|
|
393
|
+
|
|
394
|
+
sql = f"""SELECT {date_expr}, vendor,
|
|
259
395
|
GROUP_CONCAT(DISTINCT model_requested) AS model_requested,
|
|
260
396
|
model_served,
|
|
261
397
|
COUNT(*) AS total_requests,
|
|
@@ -265,56 +401,85 @@ class TokenLogger:
|
|
|
265
401
|
SUM(cache_read_tokens) AS total_cache_read,
|
|
266
402
|
SUM(CASE WHEN failover THEN 1 ELSE 0 END) AS total_failovers,
|
|
267
403
|
AVG(duration_ms) AS avg_duration_ms
|
|
268
|
-
FROM usage_log WHERE
|
|
269
|
-
|
|
404
|
+
FROM usage_log WHERE 1=1"""
|
|
405
|
+
|
|
406
|
+
params: list = []
|
|
407
|
+
|
|
408
|
+
start_iso = _period_start_iso(period, count)
|
|
409
|
+
if start_iso is not None:
|
|
410
|
+
sql += " AND ts >= ?"
|
|
411
|
+
params.append(start_iso)
|
|
412
|
+
|
|
270
413
|
if vendor:
|
|
271
414
|
sql += " AND vendor = ?"
|
|
272
415
|
params.append(vendor)
|
|
273
416
|
if model:
|
|
274
417
|
sql += " AND model_requested = ?"
|
|
275
418
|
params.append(model)
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
)
|
|
419
|
+
|
|
420
|
+
sql += f" GROUP BY {group_clause} ORDER BY {order_clause}"
|
|
421
|
+
|
|
280
422
|
cursor = await self._db.execute(sql, params)
|
|
281
423
|
rows = await cursor.fetchall()
|
|
282
424
|
return [dict(row) for row in rows]
|
|
283
425
|
|
|
284
|
-
async def
|
|
285
|
-
self,
|
|
426
|
+
async def query_daily(
|
|
427
|
+
self,
|
|
428
|
+
days: int | None = 7,
|
|
429
|
+
vendor: str | None = None,
|
|
430
|
+
model: str | None = None,
|
|
286
431
|
) -> list[dict]:
|
|
432
|
+
"""按日聚合 Token 使用统计.
|
|
433
|
+
|
|
434
|
+
Args:
|
|
435
|
+
days: 查询天数。``None`` 表示不限时间(全量查询)。
|
|
436
|
+
vendor: 过滤供应商。
|
|
437
|
+
model: 过滤请求模型。
|
|
287
438
|
"""
|
|
288
|
-
|
|
439
|
+
# days=None → count=0 → _period_start_iso 返回 None → 不限时间
|
|
440
|
+
count = 0 if days is None else days
|
|
441
|
+
return await self.query_usage(
|
|
442
|
+
period=TimePeriod.DAY, count=count, vendor=vendor, model=model
|
|
443
|
+
)
|
|
444
|
+
|
|
445
|
+
async def query_failover_stats(
|
|
446
|
+
self, days: int | None = 7, include_model_info: bool = False
|
|
447
|
+
) -> list[dict]:
|
|
448
|
+
"""按 failover_from → vendor 聚合故障转移次数.
|
|
289
449
|
|
|
290
450
|
Args:
|
|
291
|
-
days:
|
|
451
|
+
days: 查询天数。``None`` 表示不限时间(全量查询)。
|
|
292
452
|
include_model_info: 是否在聚合中包含模型信息
|
|
293
453
|
- False: 按 (failover_from, vendor) 聚合 (默认,向后兼容)
|
|
294
454
|
- True: 按 (failover_from, vendor, model_requested, model_served) 聚合
|
|
295
455
|
"""
|
|
296
456
|
if not self._db:
|
|
297
457
|
return []
|
|
298
|
-
|
|
299
|
-
|
|
458
|
+
|
|
459
|
+
time_clause = ""
|
|
460
|
+
params: list = []
|
|
461
|
+
if days is not None:
|
|
462
|
+
days = max(1, days)
|
|
463
|
+
start_iso = _days_start_utc_iso(days)
|
|
464
|
+
time_clause = " AND ts >= ?"
|
|
465
|
+
params.append(start_iso)
|
|
300
466
|
|
|
301
467
|
if include_model_info:
|
|
302
|
-
sql = """SELECT failover_from, vendor, model_requested, model_served,
|
|
468
|
+
sql = f"""SELECT failover_from, vendor, model_requested, model_served,
|
|
303
469
|
COUNT(*) AS count
|
|
304
470
|
FROM usage_log
|
|
305
|
-
WHERE failover = 1
|
|
471
|
+
WHERE failover = 1{time_clause}
|
|
306
472
|
GROUP BY failover_from, vendor, model_requested, model_served
|
|
307
473
|
ORDER BY count DESC"""
|
|
308
474
|
else:
|
|
309
|
-
|
|
310
|
-
sql = """SELECT failover_from, vendor,
|
|
475
|
+
sql = f"""SELECT failover_from, vendor,
|
|
311
476
|
COUNT(*) AS count
|
|
312
477
|
FROM usage_log
|
|
313
|
-
WHERE failover = 1
|
|
478
|
+
WHERE failover = 1{time_clause}
|
|
314
479
|
GROUP BY failover_from, vendor
|
|
315
480
|
ORDER BY count DESC"""
|
|
316
481
|
|
|
317
|
-
cursor = await self._db.execute(sql,
|
|
482
|
+
cursor = await self._db.execute(sql, params)
|
|
318
483
|
rows = await cursor.fetchall()
|
|
319
484
|
return [dict(row) for row in rows]
|
|
320
485
|
|
|
@@ -7,12 +7,33 @@ from typing import TYPE_CHECKING
|
|
|
7
7
|
from rich.console import Console
|
|
8
8
|
from rich.table import Table
|
|
9
9
|
|
|
10
|
-
from .db import TokenLogger
|
|
10
|
+
from .db import TimePeriod, TokenLogger
|
|
11
11
|
|
|
12
12
|
if TYPE_CHECKING:
|
|
13
13
|
from ..pricing import PricingTable
|
|
14
14
|
|
|
15
15
|
|
|
16
|
+
# ── 时间维度 → 表格标题 ──────────────────────────────────────
|
|
17
|
+
|
|
18
|
+
_PERIOD_TITLES: dict[TimePeriod, str] = {
|
|
19
|
+
TimePeriod.DAY: "日",
|
|
20
|
+
TimePeriod.WEEK: "周",
|
|
21
|
+
TimePeriod.MONTH: "月",
|
|
22
|
+
TimePeriod.TOTAL: "全部",
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
|
|
26
|
+
def _build_title(period: TimePeriod, count: int) -> str:
|
|
27
|
+
"""根据时间维度构建表格标题."""
|
|
28
|
+
if period is TimePeriod.TOTAL:
|
|
29
|
+
return "Token 使用统计(全部)"
|
|
30
|
+
label = _PERIOD_TITLES[period]
|
|
31
|
+
return f"Token 使用统计(最近 {count} {label})"
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
# ── 格式化工具 ───────────────────────────────────────────────
|
|
35
|
+
|
|
36
|
+
|
|
16
37
|
def _format_model_display(model_value: str | None) -> str:
|
|
17
38
|
"""格式化模型显示,处理 None 或空值."""
|
|
18
39
|
if not model_value or model_value.strip() == "":
|
|
@@ -31,37 +52,41 @@ def _format_tokens(n: int) -> str:
|
|
|
31
52
|
return str(n)
|
|
32
53
|
|
|
33
54
|
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
55
|
+
# ── 日期列名 ─────────────────────────────────────────────────
|
|
56
|
+
|
|
57
|
+
_PERIOD_DATE_LABELS: dict[TimePeriod, str] = {
|
|
58
|
+
TimePeriod.DAY: "日期",
|
|
59
|
+
TimePeriod.WEEK: "周",
|
|
60
|
+
TimePeriod.MONTH: "月",
|
|
61
|
+
TimePeriod.TOTAL: "维度",
|
|
62
|
+
}
|
|
63
|
+
|
|
38
64
|
|
|
39
|
-
|
|
40
|
-
model_pairs = {
|
|
41
|
-
(stat.get("model_requested", ""), stat.get("model_served", ""))
|
|
42
|
-
for stat in failover_stats
|
|
43
|
-
}
|
|
44
|
-
# 检查是否存在模型映射(请求模型与实际模型不同)
|
|
45
|
-
return any(pair[0] != pair[1] for pair in model_pairs if pair[0] and pair[1])
|
|
65
|
+
# ── 主展示函数 ───────────────────────────────────────────────
|
|
46
66
|
|
|
47
67
|
|
|
48
68
|
async def show_usage(
|
|
49
69
|
logger: TokenLogger,
|
|
50
|
-
|
|
70
|
+
*,
|
|
51
71
|
vendor: str | None = None,
|
|
52
72
|
model: str | None = None,
|
|
53
73
|
pricing_table: PricingTable | None = None,
|
|
74
|
+
period: TimePeriod = TimePeriod.DAY,
|
|
75
|
+
count: int = 7,
|
|
54
76
|
) -> None:
|
|
55
77
|
"""展示 Token 使用统计."""
|
|
56
78
|
console = Console()
|
|
57
|
-
rows = await logger.
|
|
79
|
+
rows = await logger.query_usage(
|
|
80
|
+
period=period, count=count, vendor=vendor, model=model
|
|
81
|
+
)
|
|
58
82
|
|
|
59
83
|
if not rows:
|
|
60
84
|
console.print("[yellow]暂无使用记录[/yellow]")
|
|
61
85
|
return
|
|
62
86
|
|
|
63
|
-
table = Table(title=
|
|
64
|
-
|
|
87
|
+
table = Table(title=_build_title(period, count))
|
|
88
|
+
date_label = _PERIOD_DATE_LABELS[period]
|
|
89
|
+
table.add_column(date_label, style="cyan")
|
|
65
90
|
table.add_column("供应商", style="green")
|
|
66
91
|
table.add_column("请求模型", style="magenta")
|
|
67
92
|
table.add_column("实际模型", style="yellow")
|
|
@@ -98,8 +123,9 @@ async def show_usage(
|
|
|
98
123
|
else:
|
|
99
124
|
cost_str = "-"
|
|
100
125
|
|
|
126
|
+
date_value = row.get("date") or ""
|
|
101
127
|
table.add_row(
|
|
102
|
-
str(
|
|
128
|
+
str(date_value),
|
|
103
129
|
vendor_name,
|
|
104
130
|
_format_model_display(row.get("model_requested")),
|
|
105
131
|
model_served,
|
|
@@ -115,8 +141,9 @@ async def show_usage(
|
|
|
115
141
|
|
|
116
142
|
console.print(table)
|
|
117
143
|
|
|
118
|
-
#
|
|
119
|
-
|
|
144
|
+
# 故障转移来源汇总(使用与主查询相同的时间范围)
|
|
145
|
+
failover_days = _period_to_days(period, count)
|
|
146
|
+
failover_stats = await logger.query_failover_stats(days=failover_days)
|
|
120
147
|
if failover_stats:
|
|
121
148
|
console.print()
|
|
122
149
|
ft_table = Table(title="故障转移来源明细")
|
|
@@ -126,6 +153,21 @@ async def show_usage(
|
|
|
126
153
|
for stat in failover_stats:
|
|
127
154
|
source = stat.get("failover_from") or "unknown"
|
|
128
155
|
target = stat.get("vendor", "")
|
|
129
|
-
|
|
130
|
-
ft_table.add_row(source, target, str(
|
|
156
|
+
count_val = stat.get("count", 0)
|
|
157
|
+
ft_table.add_row(source, target, str(count_val))
|
|
131
158
|
console.print(ft_table)
|
|
159
|
+
|
|
160
|
+
|
|
161
|
+
def _period_to_days(period: TimePeriod, count: int) -> int | None:
|
|
162
|
+
"""将 TimePeriod + count 近似转换为天数(供 query_failover_stats 使用).
|
|
163
|
+
|
|
164
|
+
Returns:
|
|
165
|
+
天数,或 ``None`` 表示全量查询。
|
|
166
|
+
"""
|
|
167
|
+
if period is TimePeriod.TOTAL:
|
|
168
|
+
return None
|
|
169
|
+
if period is TimePeriod.MONTH:
|
|
170
|
+
return count * 31 # 粗略近似,保证覆盖范围
|
|
171
|
+
if period is TimePeriod.WEEK:
|
|
172
|
+
return count * 7
|
|
173
|
+
return max(1, count) # DAY
|
|
@@ -9,6 +9,21 @@ import httpx
|
|
|
9
9
|
|
|
10
10
|
from ..vendors.base import RequestCapabilities
|
|
11
11
|
|
|
12
|
+
# ── 结构性验证错误标记 ──────────────────────────────────────
|
|
13
|
+
# 这些标记指示的是消息结构不合规(如 tool_result 角色错位、消息交替违规),
|
|
14
|
+
# 而非模型无法处理的语义内容。结构性错误不应触发级联故障转移,
|
|
15
|
+
# 因为将同样的畸形请求转发到下一层供应商只会重复失败。
|
|
16
|
+
_STRUCTURAL_ERROR_MARKERS: frozenset[str] = frozenset(
|
|
17
|
+
{
|
|
18
|
+
"tool_result blocks can only be",
|
|
19
|
+
"tool_use blocks can only be",
|
|
20
|
+
"messages must alternate",
|
|
21
|
+
"messages with role",
|
|
22
|
+
"thinking blocks can only be",
|
|
23
|
+
"content blocks can only be",
|
|
24
|
+
}
|
|
25
|
+
)
|
|
26
|
+
|
|
12
27
|
|
|
13
28
|
def extract_error_payload_from_http_status(
|
|
14
29
|
exc: httpx.HTTPStatusError,
|
|
@@ -23,6 +38,28 @@ def extract_error_payload_from_http_status(
|
|
|
23
38
|
return payload if isinstance(payload, dict) else None
|
|
24
39
|
|
|
25
40
|
|
|
41
|
+
def is_structural_validation_error(
|
|
42
|
+
*,
|
|
43
|
+
status_code: int,
|
|
44
|
+
error_message: str | None = None,
|
|
45
|
+
) -> bool:
|
|
46
|
+
"""检测是否为结构性验证错误(不应触发故障转移).
|
|
47
|
+
|
|
48
|
+
结构性错误指示请求的消息格式不合规(如 tool_result 角色错位),
|
|
49
|
+
将同样的畸形请求转发到下一层供应商不会解决问题。
|
|
50
|
+
与语义拒绝(模型无法处理某些内容)不同,结构性错误应直接返回客户端。
|
|
51
|
+
|
|
52
|
+
Returns:
|
|
53
|
+
True 如果是结构性验证错误。
|
|
54
|
+
"""
|
|
55
|
+
if status_code != 400:
|
|
56
|
+
return False
|
|
57
|
+
normalized_message = (error_message or "").lower()
|
|
58
|
+
return any(
|
|
59
|
+
marker.lower() in normalized_message for marker in _STRUCTURAL_ERROR_MARKERS
|
|
60
|
+
)
|
|
61
|
+
|
|
62
|
+
|
|
26
63
|
def is_semantic_rejection(
|
|
27
64
|
*,
|
|
28
65
|
status_code: int,
|
|
@@ -31,6 +68,13 @@ def is_semantic_rejection(
|
|
|
31
68
|
) -> bool:
|
|
32
69
|
if status_code != 400:
|
|
33
70
|
return False
|
|
71
|
+
|
|
72
|
+
# 结构性验证错误不应被视为语义拒绝
|
|
73
|
+
if is_structural_validation_error(
|
|
74
|
+
status_code=status_code, error_message=error_message
|
|
75
|
+
):
|
|
76
|
+
return False
|
|
77
|
+
|
|
34
78
|
normalized_type = (error_type or "").strip().lower()
|
|
35
79
|
if normalized_type == "invalid_request_error":
|
|
36
80
|
return True
|
|
@@ -43,6 +87,9 @@ def is_semantic_rejection(
|
|
|
43
87
|
"validation",
|
|
44
88
|
"tool_use_id",
|
|
45
89
|
"server_tool_use",
|
|
90
|
+
"tool_result",
|
|
91
|
+
"can only be in",
|
|
92
|
+
"bad request", # 覆盖 Copilot 等返回纯文本 "Bad Request" 的场景
|
|
46
93
|
)
|
|
47
94
|
)
|
|
48
95
|
|