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 |
|---|---|---|
| .. | ||
| auth | Loading commit data... | |
| common | Loading commit data... | |
| dashboard | Loading commit data... | |
| layout | Loading commit data... | |
| model-deployments | Loading commit data... | |
| playground | Loading commit data... | |
| settings | Loading commit data... | |
| setup | Loading commit data... | |
| table | Loading commit data... | |
| topup | Loading commit data... |