Resolve 4 conflicts:
- relay/compatible_handler.go: accept main's refactor (postConsumeQuota -> service.PostTextConsumeQuota)
- service/quota.go: accept main's PostClaudeConsumeQuota deletion, keep nightly's tiered billing in PostWssConsumeQuota and PostAudioConsumeQuota
- web/src/i18n/locales/{en,zh-CN}.json: merge both sets of translation keys
Post-merge integration:
- Add tiered billing (TryTieredSettle, InjectTieredBillingInfo) to PostTextConsumeQuota
- Update tool pricing calls to use nightly's generic GetToolPriceForModel/GetToolPrice API
| Name |
Last commit
|
Last Update |
|---|---|---|
| .. | ||
| billing_expr_request.go | Loading commit data... | |
| billing_expr_request_test.go | Loading commit data... | |
| common.go | Loading commit data... | |
| model_mapped.go | Loading commit data... | |
| price.go | Loading commit data... | |
| stream_result.go | Loading commit data... | |
| stream_scanner.go | Loading commit data... | |
| stream_scanner_test.go | Loading commit data... | |
| valid_request.go | Loading commit data... |