Repository navigation
Conversation
|
No actionable comments were generated in the recent review.
|
| Layer / File(s) | Summary |
|---|---|
Derive quota categories web/src/features/pricing/lib/filters.ts |
Adds getModelQuotaType to classify task-usage and tiered-expression models. Quota filtering uses the derived categories, with a legacy quota fallback when parsing does not yield a ready expression. Tag extraction uses spread syntax and retains sorting. |
Apply categories to sidebar counts web/src/features/pricing/components/pricing-sidebar.tsx, web/src/features/pricing/__tests__/pricing-controls.test.tsx |
The sidebar increments counts for the category returned by getModelQuotaType. Parameterized tests compare filter results and sidebar counts across legacy, dynamic, task-usage, and unparseable pricing cases. |
Priority:
Estimated code review effort: 3 (Moderate) | ~20 minutes
Change: Bug fix
Possibly related issues
- QuantumNous/new-api#7392: This change classifies expression-billed models for quota filtering, but does not change the billing-mode label described in the issue.
Suggested reviewers: calcium-ion
Merge Risk: 
Minimal · up to b6d61
-
The pricing classification change is mergeable after normal checks; no concrete issue remains from this review.
Pre-merge checks: 
5
Finishing Touches
-
🧪 Generate unit tests (beta)
-
- Create a new PR
-
- Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.
A rabbit checks the pricing rows,
Where task and tiered billing flows.
Token, request, and task counts align,
Legacy rules still draw the line.
Tests hop through each pricing case,
And leave each quota in its place.
Comment @coderabbitai help to get the list of available commands.
Port upstream f1569d1 (QuantumNous#8010). Closes #151 Co-authored-by: woncc <3104616+woncc@users.noreply.github.com>
Sync 75 upstream commit(s) via merge (fork history preserved). Upstream commits: - 7061447 fix(auth): 校验 Redis 鉴权缓存完整性 (QuantumNous#8200) - ba5f736 fix(gemini): bill embeddings from upstream usageMetadata (QuantumNous#8182) - 94b5216 feat(vertex): add per-channel v1beta1 endpoint switch (QuantumNous#8179) - 83b18fe feat(channel): return created IDs with input mappings (QuantumNous#8164) - 52c1730 feat(gemini): add Argon fields and reasoning mappings (QuantumNous#8177) - 9b473a3 fix(twofa): restart the failure count after a lockout expires (QuantumNous#8172) - 45746ee feat(relay): add opt-in HTTP/2 health checks (QuantumNous#8059) - c046559 feat(plugins): bill gemini omni by the tokens vertex reports (QuantumNous#8153) - 651d5a2 fix(xai): preserve token details in stream usage conversion (QuantumNous#6420) - 70e6af6 perf: read and edit request JSON and base64 with moego (QuantumNous#8148) - d0abbf6 feat(plugins): generate video with Gemini Omni on Vertex AI channels (QuantumNous#8142) - ea343c4 fix(plugins): charge relayed streams even when the reserve or task insert fails (QuantumNous#8121) - fe57cba fix(plugins): prefer Kling's returned price (list_price) for Kling 4.0 cash billing (QuantumNous#8125) - 1424ffd fix(plugins): load plugins that declare their own /{key} address (QuantumNous#8119) - 8b253de fix(plugins): keep Kling 4.0 durations in range and map every video size (QuantumNous#8118) - c59f6fd feat(plugins): serve task plugins at the vendors' own paths and answer as the vendors do (QuantumNous#8117) - 37d23dc fix(profile): honor global sidebar visibility (QuantumNous#7429) - 7743627 fix(deps): upgrade DOMPurify to 3.4.17 (QuantumNous#8116) - 883eeb8 feat(plugins): warn about task models a plugin cannot charge - 1e8c707 chore(deps): bump @codemirror/language from 6.12.4 to 6.13.1 in /web (QuantumNous#8102) - 6e78cb3 chore(deps): bump marked from 18.0.6 to 18.1.2 in /web (QuantumNous#8103) - 9fc70bb chore(deps-dev): bump @tanstack/react-query-devtools in /web (QuantumNous#8104) - cef7820 chore(deps-dev): bump knip from 6.27.0 to 6.43.0 in /web (QuantumNous#8105) - 1695171 chore(deps): bump tailwind-merge from 3.6.0 to 3.7.0 in /web (QuantumNous#8106) - 7fa815e chore(deps-dev): bump fast-uri from 3.1.7 to 3.1.9 in /electron (QuantumNous#8007) - ee0f0ac chore(deps-dev): bump electron from 41.10.6 to 42.11.16 in /electron (QuantumNous#8008) - 837b814 chore(deps): bump undici in /electron (QuantumNous#8006) - 3150dfe chore(deps): bump github.com/go-jose/go-jose/v4 from 4.1.4 to 4.1.6 (QuantumNous#8112) - a3851c2 fix: save Turnstile keys before enabling (QuantumNous#7960) - 4193734 fix(logger): keep gin access and recovery logs on the current log file after rotation (QuantumNous#8098) - f366017 Merge commit from fork - 829f082 fix: unmount authenticated layout on sign-out to stop credential-less refetches (QuantumNous#8110) - 9eda50a Merge commit from fork - a2defd2 Merge commit from fork - e449cc7 feat: sample immediate task successes in model performance metrics (QuantumNous#8067) - fcc241c fix: start affinity fallback at the highest channel priority (QuantumNous#8078) - b08ee86 fix(cloudflare): preserve embedding response data (QuantumNous#8041) - 26c488c fix(relay): allow Azure channels to opt in to Responses WebSocket (QuantumNous#8047) (QuantumNous#8075) - 55515db fix(relay): terminate streams on exact bare done markers (QuantumNous#8074) - 49271d2 fix(aws): preserve safeguards in Bedrock Invoke requests (QuantumNous#8071) - 5478811 fix: count completed non-stream relays after context cancellation (QuantumNous#7844) - ad56112 fix(relay): apply GPT-6 chat parameter rules to gpt-6.1-sol and gpt-6.1-terra (QuantumNous#8064) - 01da3a5 perf(relay): stop recompiling param override regexes on every request (QuantumNous#8061) - 34003e9 test: stabilize channel affinity cache keys (QuantumNous#8009) - 0165fef fix(relaykit): preserve Gemini text alongside tool calls (QuantumNous#7998) - 4d962e4 fix(relaykit): preserve tool argument numbers in Claude responses (QuantumNous#7996) - f1569d1 fix(pricing): classify dynamic per-request billing correctly (QuantumNous#8010) - bc795cc fix:修复stop为非字符串和[]string的协议转换问题 (QuantumNous#7935) - 9823ebc fix(billing): bill cache_creation_input_tokens reported in prompt_tokens_details (QuantumNous#7909) - e835b1b chore(deps): bump axios from 1.18.1 to 1.20.0 in /web (QuantumNous#7835) - 5c8032d chore(deps): bump react-i18next from 17.0.10 to 17.1.0 in /web (QuantumNous#7981) - 0b667ca chore(deps): bump i18next from 26.3.6 to 26.5.3 in /web (QuantumNous#7979) - 4105bd0 chore(deps): bump input-otp from 1.4.2 to 1.5.0 in /web (QuantumNous#7980) - b6b85ca chore(deps): bump react-resizable-panels from 4.12.2 to 4.14.6 in /web (QuantumNous#7982) - 1dafb19 fix(gemini): preserve top-level imageConfig in chat conversion - 0034b24 fix(task): wait up to 72 hours before timing out tasks - a404460 chore(web): upgrade Bun to 1.4.4 and use bun check - 33c61a2 fix: prevent stale values when switching edit drawer records (QuantumNous#7989) - 30748c6 fix(logging): 隐藏访问日志中的查询凭据 (QuantumNous#7972) - 7fb6e57 fix(channels): preserve advanced custom body passthrough settings (QuantumNous#7971) - e9d4d63 feat(billing): bill OpenAI 12-hour prompt cache writes at their own price (QuantumNous#7965) - d0b840e fix(relay): keep the client's JSON Schema property order - d8e6561 feat(web): copy model names from usage log details - 8802113 feat(task): let ordinary channels compete on shared plugin endpoints - eb169e7 feat(pricing): adjust synced upstream prices by the site exchange rate - e2321a5 chore(web): sort locale keys - db80ac8 fix(task): let task plugins validate their own requests - dbe97be feat(task): pass client request headers to task plugin drivers - 556517f feat(task): accept multipart bodies on native plugin routes - 94cc3ff fix(billing): bill Claude cache writes that arrive without a 5m/1h split - 7e65967 fix(relay): stop cutting off slow clients during large stream events - 0c2af97 fix(relay): finish delivered Responses streams without false disconnect errors (QuantumNous#7956) - 7d8b912 fix: upgrade Go to 1.26.10 for CVE-2026-111943 (QuantumNous#7942) - 4d36f2c chore(deps-dev): bump vitest from 4.1.10 to 5.0.4 in /web (QuantumNous#7838) - eea05e0 chore(deps): bump github.com/klauspost/compress from 1.18.3 to 1.18.7 (QuantumNous#7931) Local tests not run (CI-only).
…Nous#8010) * fix(pricing): classify dynamic per-request billing correctly * fix(pricing): classify mixed billing as token-based
English template:
.github/PULL_REQUEST_TEMPLATE/en.mdImportant
🔗 关联任务 / Related Issue
新功能请填写下方 Issue 编号;若还没有对应 Issue,请先自行创建。功能讨论请放在 Issue 中进行。
改动较大或方向性变更,请先在关联 Issue 中与维护者达成一致,再提交 PR。
Bug 修复请关联对应 Issue。设计取舍、理解偏差或预期不一致,更适合作为讨论或功能请求。
Closes #
🚀 变更类型 / Type of change
📝 变更描述 / Description
(简述做了什么、为什么生效。不得直接粘贴未经人工过滤的大段 AI 文本。如果难以简述,建议先拆分范围,或在 Issue 中与维护者对齐。)
修复 表达式计费 下的 按次计费 在模型广场被归类到按量的情况。
len < 1000
? tier("short", fixed(0.01))
: tier("long", p * 2 + c * 8)
此类混合会被归类到按量。
📸 运行证明 / Proof of Work
(请写明如何验证:实际命令或步骤,以及观察结果。仅声明
go build通过或测试通过,不视为有效证明。UI 变更请附截图或录屏;Bug 修复请说明复现过程与修复后结果。)✅ 提交前检查项 / Checklist
New feature,我已关联对应 Issue;若尚无 Issue,我已先自行创建。go build通过或测试通过,不视为有效证明。Summary by CodeRabbit
Summary