coding-proxy 0.1.4a7__tar.gz → 0.1.4a8__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.4a7 → coding_proxy-0.1.4a8}/PKG-INFO +1 -1
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/pyproject.toml +1 -1
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/cli/__init__.py +18 -4
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/logging/db.py +12 -8
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/logging/stats.py +55 -3
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_cli_usage.py +105 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_token_logger.py +3 -3
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/uv.lock +1 -1
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/.github/workflows/ci.yml +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/.github/workflows/coverage.yml +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/.github/workflows/promote.yml +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/.github/workflows/release.yml +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/.gitignore +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/AGENTS.md +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/CHANGELOG.md +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/CLAUDE.md +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/LICENSE +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/README.md +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/docs/ci-cd.md +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/docs/framework.md +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/docs/user-guide.md +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/docs/zh-CN/README.md +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/__init__.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/__init__.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/__main__.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/auth/__init__.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/auth/providers/__init__.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/auth/providers/base.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/auth/providers/github.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/auth/providers/google.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/auth/runtime.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/auth/store.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/cli/auth_commands.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/cli/banner.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/compat/__init__.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/compat/canonical.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/compat/session_store.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/config/__init__.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/config/auth_schema.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/config/config.default.yaml +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/config/loader.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/config/resiliency.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/config/routing.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/config/schema.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/config/server.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/config/vendors.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/convert/__init__.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/convert/anthropic_to_gemini.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/convert/anthropic_to_openai.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/convert/gemini_sse_adapter.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/convert/gemini_to_anthropic.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/convert/openai_to_anthropic.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/logging/__init__.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/model/__init__.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/model/auth.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/model/compat.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/model/constants.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/model/pricing.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/model/token.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/model/vendor.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/pricing.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/routing/__init__.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/routing/circuit_breaker.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/routing/error_classifier.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/routing/executor.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/routing/model_mapper.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/routing/quota_guard.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/routing/rate_limit.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/routing/retry.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/routing/router.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/routing/session_manager.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/routing/tier.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/routing/usage_parser.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/routing/usage_recorder.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/server/__init__.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/server/app.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/server/factory.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/server/request_normalizer.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/server/responses.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/server/routes.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/streaming/__init__.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/streaming/anthropic_compat.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/vendors/__init__.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/vendors/anthropic.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/vendors/antigravity.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/vendors/base.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/vendors/copilot.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/vendors/copilot_models.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/vendors/copilot_token_manager.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/vendors/copilot_urls.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/vendors/mixins.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/vendors/token_manager.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/vendors/zhipu.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/__init__.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_antigravity.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_app_routes.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_auto_login.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_banner.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_circuit_breaker.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_compat.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_config_init.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_config_loader.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_convert_request.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_convert_response.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_convert_sse.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_copilot.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_copilot_convert_request.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_copilot_convert_response.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_copilot_models.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_copilot_urls.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_currency.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_error_classifier.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_mixins.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_model_auth.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_model_compat.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_model_constants.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_model_mapper.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_model_pricing.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_model_token.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_model_vendor.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_parse_usage.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_pricing.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_quota_guard.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_rate_limit.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_request_normalizer.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_router_chain.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_router_executor.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_runtime_reauth.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_schema.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_streaming_anthropic_compat.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_tier.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_tiers_config.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_time_range.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_token_manager.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_types.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_vendor_streaming.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/tests/test_vendors.py +0 -0
- {coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/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.4a8
|
|
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.4a8"
|
|
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"
|
|
@@ -150,7 +150,9 @@ def usage(
|
|
|
150
150
|
),
|
|
151
151
|
total: bool = typer.Option(False, "--total", "-t", help="统计全部历史记录"),
|
|
152
152
|
vendor: str | None = typer.Option(None, "--vendor", "-v", help="过滤供应商"),
|
|
153
|
-
model: str | None = typer.Option(
|
|
153
|
+
model: str | None = typer.Option(
|
|
154
|
+
None, "--model", help="过滤实际服务模型(model_served),逗号分隔可指定多个"
|
|
155
|
+
),
|
|
154
156
|
db_path: str | None = typer.Option(None, "--db", help="数据库路径"),
|
|
155
157
|
) -> None:
|
|
156
158
|
"""查看 Token 使用统计.
|
|
@@ -166,15 +168,27 @@ def usage(
|
|
|
166
168
|
period, count = _resolve_period(days=days, week=week, month=month, total=total)
|
|
167
169
|
cfg = load_config(Path(db_path) if db_path else None)
|
|
168
170
|
token_logger = TokenLogger(cfg.db_path)
|
|
169
|
-
|
|
171
|
+
# 解析逗号分隔的多 vendor(如 "anthropic,zhipu" → ["anthropic", "zhipu"])
|
|
172
|
+
vendor_filter: str | list[str] | None = None
|
|
173
|
+
if vendor:
|
|
174
|
+
parts = [v.strip() for v in vendor.split(",") if v.strip()]
|
|
175
|
+
vendor_filter = parts[0] if len(parts) == 1 else parts
|
|
176
|
+
# 解析逗号分隔的多 model(如 "glm-5,glm-5.1" → ["glm-5", "glm-5.1"])
|
|
177
|
+
model_filter: str | list[str] | None = None
|
|
178
|
+
if model:
|
|
179
|
+
parts = [m.strip() for m in model.split(",") if m.strip()]
|
|
180
|
+
model_filter = parts[0] if len(parts) == 1 else parts
|
|
181
|
+
asyncio.run(
|
|
182
|
+
_run_usage(token_logger, period, count, vendor_filter, model_filter, cfg)
|
|
183
|
+
)
|
|
170
184
|
|
|
171
185
|
|
|
172
186
|
async def _run_usage(
|
|
173
187
|
token_logger: TokenLogger,
|
|
174
188
|
period: TimePeriod,
|
|
175
189
|
count: int,
|
|
176
|
-
vendor: str | None,
|
|
177
|
-
model: str | None,
|
|
190
|
+
vendor: str | list[str] | None,
|
|
191
|
+
model: str | list[str] | None,
|
|
178
192
|
cfg: ProxyConfig,
|
|
179
193
|
) -> None:
|
|
180
194
|
from ..pricing import PricingTable
|
|
@@ -374,8 +374,8 @@ class TokenLogger:
|
|
|
374
374
|
*,
|
|
375
375
|
period: TimePeriod = TimePeriod.DAY,
|
|
376
376
|
count: int = 7,
|
|
377
|
-
vendor: str | None = None,
|
|
378
|
-
model: str | None = None,
|
|
377
|
+
vendor: str | list[str] | None = None,
|
|
378
|
+
model: str | list[str] | None = None,
|
|
379
379
|
) -> list[dict]:
|
|
380
380
|
"""按指定时间维度聚合 Token 使用统计.
|
|
381
381
|
|
|
@@ -383,8 +383,8 @@ class TokenLogger:
|
|
|
383
383
|
period: 时间维度(日/周/月/全量)。
|
|
384
384
|
count: ``period`` 的数量。仅用于计算起始时间边界,
|
|
385
385
|
``TOTAL`` 维度下忽略此参数。
|
|
386
|
-
vendor:
|
|
387
|
-
model:
|
|
386
|
+
vendor: 过滤供应商,支持单个字符串或字符串列表(多 vendor 过滤)。
|
|
387
|
+
model: 过滤实际服务模型(model_served),支持单个字符串或字符串列表。
|
|
388
388
|
"""
|
|
389
389
|
if not self._db:
|
|
390
390
|
return []
|
|
@@ -411,11 +411,15 @@ class TokenLogger:
|
|
|
411
411
|
params.append(start_iso)
|
|
412
412
|
|
|
413
413
|
if vendor:
|
|
414
|
-
|
|
415
|
-
|
|
414
|
+
vendors = [vendor] if isinstance(vendor, str) else vendor
|
|
415
|
+
placeholders = ",".join("?" * len(vendors))
|
|
416
|
+
sql += f" AND vendor IN ({placeholders})"
|
|
417
|
+
params.extend(vendors)
|
|
416
418
|
if model:
|
|
417
|
-
|
|
418
|
-
|
|
419
|
+
models = [model] if isinstance(model, str) else model
|
|
420
|
+
placeholders = ",".join("?" * len(models))
|
|
421
|
+
sql += f" AND model_served IN ({placeholders})"
|
|
422
|
+
params.extend(models)
|
|
419
423
|
|
|
420
424
|
sql += f" GROUP BY {group_clause} ORDER BY {order_clause}"
|
|
421
425
|
|
|
@@ -95,8 +95,8 @@ _PERIOD_DATE_LABELS: dict[TimePeriod, str] = {
|
|
|
95
95
|
async def show_usage(
|
|
96
96
|
logger: TokenLogger,
|
|
97
97
|
*,
|
|
98
|
-
vendor: str | None = None,
|
|
99
|
-
model: str | None = None,
|
|
98
|
+
vendor: str | list[str] | None = None,
|
|
99
|
+
model: str | list[str] | None = None,
|
|
100
100
|
pricing_table: PricingTable | None = None,
|
|
101
101
|
period: TimePeriod = TimePeriod.DAY,
|
|
102
102
|
count: int = 7,
|
|
@@ -126,6 +126,15 @@ async def show_usage(
|
|
|
126
126
|
table.add_column("Cost", justify="right", style="bold green")
|
|
127
127
|
table.add_column("平均耗时(ms)", justify="right")
|
|
128
128
|
|
|
129
|
+
# ── 汇总累计变量 ──────────────────────────────────────────
|
|
130
|
+
sum_requests = 0
|
|
131
|
+
sum_input = 0
|
|
132
|
+
sum_output = 0
|
|
133
|
+
sum_cache_creation = 0
|
|
134
|
+
sum_cache_read = 0
|
|
135
|
+
weighted_duration_sum = 0.0 # Σ(avg_duration_ms × total_requests)
|
|
136
|
+
cost_totals: dict = {} # currency → float
|
|
137
|
+
|
|
129
138
|
for row in rows:
|
|
130
139
|
total_input = row.get("total_input", 0) or 0
|
|
131
140
|
total_output = row.get("total_output", 0) or 0
|
|
@@ -137,6 +146,7 @@ async def show_usage(
|
|
|
137
146
|
|
|
138
147
|
vendor_name = str(row.get("vendor", ""))
|
|
139
148
|
model_served = str(row.get("model_served", ""))
|
|
149
|
+
cost_value = None
|
|
140
150
|
if pricing_table is not None:
|
|
141
151
|
cost_value = pricing_table.compute_cost(
|
|
142
152
|
vendor_name,
|
|
@@ -150,13 +160,27 @@ async def show_usage(
|
|
|
150
160
|
else:
|
|
151
161
|
cost_str = "-"
|
|
152
162
|
|
|
163
|
+
# 累加汇总
|
|
164
|
+
total_requests_row = row.get("total_requests", 0) or 0
|
|
165
|
+
sum_requests += total_requests_row
|
|
166
|
+
sum_input += total_input
|
|
167
|
+
sum_output += total_output
|
|
168
|
+
sum_cache_creation += total_cache_creation
|
|
169
|
+
sum_cache_read += total_cache_read
|
|
170
|
+
weighted_duration_sum += (
|
|
171
|
+
row.get("avg_duration_ms", 0) or 0
|
|
172
|
+
) * total_requests_row
|
|
173
|
+
if cost_value is not None:
|
|
174
|
+
cur = cost_value.currency
|
|
175
|
+
cost_totals[cur] = cost_totals.get(cur, 0.0) + cost_value.amount
|
|
176
|
+
|
|
153
177
|
date_value = row.get("date") or ""
|
|
154
178
|
table.add_row(
|
|
155
179
|
str(date_value),
|
|
156
180
|
vendor_name,
|
|
157
181
|
_format_model_display(row.get("model_requested")),
|
|
158
182
|
model_served,
|
|
159
|
-
str(
|
|
183
|
+
str(total_requests_row),
|
|
160
184
|
_format_tokens(total_input),
|
|
161
185
|
_format_tokens(total_output),
|
|
162
186
|
_format_tokens(total_cache_creation),
|
|
@@ -166,6 +190,34 @@ async def show_usage(
|
|
|
166
190
|
str(int(row.get("avg_duration_ms", 0) or 0)),
|
|
167
191
|
)
|
|
168
192
|
|
|
193
|
+
# ── 汇总行 ───────────────────────────────────────────────
|
|
194
|
+
table.add_section()
|
|
195
|
+
|
|
196
|
+
sum_tokens = sum_input + sum_output + sum_cache_creation + sum_cache_read
|
|
197
|
+
avg_duration = int(weighted_duration_sum / sum_requests) if sum_requests else 0
|
|
198
|
+
|
|
199
|
+
if cost_totals:
|
|
200
|
+
total_cost_str = " + ".join(
|
|
201
|
+
f"{cur.symbol}{amt:.4f}" for cur, amt in cost_totals.items()
|
|
202
|
+
)
|
|
203
|
+
else:
|
|
204
|
+
total_cost_str = "-"
|
|
205
|
+
|
|
206
|
+
table.add_row(
|
|
207
|
+
"[bold]总计[/bold]",
|
|
208
|
+
"",
|
|
209
|
+
"",
|
|
210
|
+
"",
|
|
211
|
+
f"[bold]{sum_requests}[/bold]",
|
|
212
|
+
f"[bold]{_format_tokens(sum_input)}[/bold]",
|
|
213
|
+
f"[bold]{_format_tokens(sum_output)}[/bold]",
|
|
214
|
+
f"[bold]{_format_tokens(sum_cache_creation)}[/bold]",
|
|
215
|
+
f"[bold]{_format_tokens(sum_cache_read)}[/bold]",
|
|
216
|
+
f"[bold]{_format_tokens(sum_tokens)}[/bold]",
|
|
217
|
+
f"[bold]{total_cost_str}[/bold]",
|
|
218
|
+
f"[bold]{avg_duration}[/bold]",
|
|
219
|
+
)
|
|
220
|
+
|
|
169
221
|
console.print(table)
|
|
170
222
|
|
|
171
223
|
# 故障转移来源汇总(使用与主查询相同的时间范围)
|
|
@@ -231,3 +231,108 @@ class TestTimeDimensionFlags:
|
|
|
231
231
|
assert result.exit_code == 0
|
|
232
232
|
kw = _kwargs(mock_show)
|
|
233
233
|
assert kw["period"] == TimePeriod.MONTH
|
|
234
|
+
|
|
235
|
+
|
|
236
|
+
# ── F 组:多 vendor 过滤 ─────────────────────────────────────
|
|
237
|
+
|
|
238
|
+
|
|
239
|
+
class TestMultiVendorFilter:
|
|
240
|
+
"""验证 -v 参数支持逗号分隔的多 vendor 过滤."""
|
|
241
|
+
|
|
242
|
+
def test_single_vendor_remains_string(self, _isolate_cli_deps):
|
|
243
|
+
"""单个 vendor 应保持字符串类型(向后兼容)."""
|
|
244
|
+
mock_show = _isolate_cli_deps
|
|
245
|
+
result = runner.invoke(app, ["usage", "-v", "anthropic"])
|
|
246
|
+
assert result.exit_code == 0
|
|
247
|
+
assert _kwargs(mock_show)["vendor"] == "anthropic"
|
|
248
|
+
|
|
249
|
+
def test_multi_vendor_parsed_as_list(self, _isolate_cli_deps):
|
|
250
|
+
"""'-v anthropic,zhipu' 应将 vendor 解析为 list 传递."""
|
|
251
|
+
mock_show = _isolate_cli_deps
|
|
252
|
+
result = runner.invoke(app, ["usage", "-v", "anthropic,zhipu"])
|
|
253
|
+
assert result.exit_code == 0
|
|
254
|
+
assert _kwargs(mock_show)["vendor"] == ["anthropic", "zhipu"]
|
|
255
|
+
|
|
256
|
+
def test_multi_vendor_three_values(self, _isolate_cli_deps):
|
|
257
|
+
"""三个 vendor 同样解析为 list."""
|
|
258
|
+
mock_show = _isolate_cli_deps
|
|
259
|
+
result = runner.invoke(app, ["usage", "-v", "anthropic,zhipu,copilot"])
|
|
260
|
+
assert result.exit_code == 0
|
|
261
|
+
assert _kwargs(mock_show)["vendor"] == ["anthropic", "zhipu", "copilot"]
|
|
262
|
+
|
|
263
|
+
def test_multi_vendor_with_spaces(self, _isolate_cli_deps):
|
|
264
|
+
"""逗号周围的空格应被正确去除."""
|
|
265
|
+
mock_show = _isolate_cli_deps
|
|
266
|
+
result = runner.invoke(app, ["usage", "-v", "anthropic , zhipu"])
|
|
267
|
+
assert result.exit_code == 0
|
|
268
|
+
assert _kwargs(mock_show)["vendor"] == ["anthropic", "zhipu"]
|
|
269
|
+
|
|
270
|
+
def test_multi_vendor_combined_with_time_dim(self, _isolate_cli_deps):
|
|
271
|
+
"""多 vendor 过滤可与时间维度参数组合使用."""
|
|
272
|
+
mock_show = _isolate_cli_deps
|
|
273
|
+
result = runner.invoke(app, ["usage", "-w", "2", "-v", "anthropic,copilot"])
|
|
274
|
+
assert result.exit_code == 0
|
|
275
|
+
kw = _kwargs(mock_show)
|
|
276
|
+
assert kw["period"] == TimePeriod.WEEK
|
|
277
|
+
assert kw["count"] == 2
|
|
278
|
+
assert kw["vendor"] == ["anthropic", "copilot"]
|
|
279
|
+
|
|
280
|
+
def test_no_vendor_passes_none(self, _isolate_cli_deps):
|
|
281
|
+
"""不传 -v 时 vendor 应为 None(不过滤)."""
|
|
282
|
+
mock_show = _isolate_cli_deps
|
|
283
|
+
result = runner.invoke(app, ["usage"])
|
|
284
|
+
assert result.exit_code == 0
|
|
285
|
+
assert _kwargs(mock_show)["vendor"] is None
|
|
286
|
+
|
|
287
|
+
|
|
288
|
+
# ── G 组:多 model 过滤 ─────────────────────────────────────
|
|
289
|
+
|
|
290
|
+
|
|
291
|
+
class TestMultiModelFilter:
|
|
292
|
+
"""验证 --model 参数支持逗号分隔的多 model_served 过滤."""
|
|
293
|
+
|
|
294
|
+
def test_single_model_remains_string(self, _isolate_cli_deps):
|
|
295
|
+
"""单个 model 应保持字符串类型(向后兼容)."""
|
|
296
|
+
mock_show = _isolate_cli_deps
|
|
297
|
+
result = runner.invoke(app, ["usage", "--model", "glm-5"])
|
|
298
|
+
assert result.exit_code == 0
|
|
299
|
+
assert _kwargs(mock_show)["model"] == "glm-5"
|
|
300
|
+
|
|
301
|
+
def test_multi_model_parsed_as_list(self, _isolate_cli_deps):
|
|
302
|
+
"""'--model glm-5,glm-5.1' 应将 model 解析为 list 传递."""
|
|
303
|
+
mock_show = _isolate_cli_deps
|
|
304
|
+
result = runner.invoke(app, ["usage", "--model", "glm-5,glm-5.1"])
|
|
305
|
+
assert result.exit_code == 0
|
|
306
|
+
assert _kwargs(mock_show)["model"] == ["glm-5", "glm-5.1"]
|
|
307
|
+
|
|
308
|
+
def test_multi_model_three_values(self, _isolate_cli_deps):
|
|
309
|
+
"""三个 model 同样解析为 list."""
|
|
310
|
+
mock_show = _isolate_cli_deps
|
|
311
|
+
result = runner.invoke(app, ["usage", "--model", "glm-5,glm-5.1,glm-4"])
|
|
312
|
+
assert result.exit_code == 0
|
|
313
|
+
assert _kwargs(mock_show)["model"] == ["glm-5", "glm-5.1", "glm-4"]
|
|
314
|
+
|
|
315
|
+
def test_multi_model_with_spaces(self, _isolate_cli_deps):
|
|
316
|
+
"""逗号周围的空格应被正确去除."""
|
|
317
|
+
mock_show = _isolate_cli_deps
|
|
318
|
+
result = runner.invoke(app, ["usage", "--model", "glm-5 , glm-5.1"])
|
|
319
|
+
assert result.exit_code == 0
|
|
320
|
+
assert _kwargs(mock_show)["model"] == ["glm-5", "glm-5.1"]
|
|
321
|
+
|
|
322
|
+
def test_multi_model_combined_with_vendor(self, _isolate_cli_deps):
|
|
323
|
+
"""多 model 过滤可与 -v 供应商参数组合使用."""
|
|
324
|
+
mock_show = _isolate_cli_deps
|
|
325
|
+
result = runner.invoke(
|
|
326
|
+
app, ["usage", "-v", "zhipu", "--model", "glm-5,glm-5.1"]
|
|
327
|
+
)
|
|
328
|
+
assert result.exit_code == 0
|
|
329
|
+
kw = _kwargs(mock_show)
|
|
330
|
+
assert kw["vendor"] == "zhipu"
|
|
331
|
+
assert kw["model"] == ["glm-5", "glm-5.1"]
|
|
332
|
+
|
|
333
|
+
def test_no_model_passes_none(self, _isolate_cli_deps):
|
|
334
|
+
"""不传 --model 时 model 应为 None(不过滤)."""
|
|
335
|
+
mock_show = _isolate_cli_deps
|
|
336
|
+
result = runner.invoke(app, ["usage"])
|
|
337
|
+
assert result.exit_code == 0
|
|
338
|
+
assert _kwargs(mock_show)["model"] is None
|
|
@@ -571,11 +571,11 @@ async def test_query_daily_distinct_deduplication(logger):
|
|
|
571
571
|
|
|
572
572
|
@pytest.mark.asyncio
|
|
573
573
|
async def test_query_daily_model_filter_still_works(logger):
|
|
574
|
-
"""--model
|
|
574
|
+
"""--model 过滤按 model_served 执行,仅返回实际服务模型匹配的记录."""
|
|
575
575
|
await logger.log(
|
|
576
576
|
vendor="anthropic",
|
|
577
577
|
model_requested="claude-opus-4-6",
|
|
578
|
-
model_served="claude-
|
|
578
|
+
model_served="claude-opus-4-6",
|
|
579
579
|
input_tokens=100,
|
|
580
580
|
output_tokens=50,
|
|
581
581
|
)
|
|
@@ -586,7 +586,7 @@ async def test_query_daily_model_filter_still_works(logger):
|
|
|
586
586
|
input_tokens=200,
|
|
587
587
|
output_tokens=80,
|
|
588
588
|
)
|
|
589
|
-
# 按
|
|
589
|
+
# 按 model_served 过滤,仅保留 model_served=opus 的记录
|
|
590
590
|
rows = await logger.query_daily(days=7, model="claude-opus-4-6")
|
|
591
591
|
assert len(rows) == 1
|
|
592
592
|
assert rows[0]["total_requests"] == 1
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/convert/anthropic_to_gemini.py
RENAMED
|
File without changes
|
{coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/convert/anthropic_to_openai.py
RENAMED
|
File without changes
|
{coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/convert/gemini_sse_adapter.py
RENAMED
|
File without changes
|
{coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/convert/gemini_to_anthropic.py
RENAMED
|
File without changes
|
{coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/convert/openai_to_anthropic.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/streaming/anthropic_compat.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{coding_proxy-0.1.4a7 → coding_proxy-0.1.4a8}/src/coding/proxy/vendors/copilot_token_manager.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|