| Name |
Last commit
|
Last Update |
|---|---|---|
| .. | ||
| channels | ||
| mj-logs | ||
| model-deployments | ||
| model-pricing | ||
| models | ||
| redemptions | ||
| subscriptions | ||
| task-logs | ||
| tokens | ||
| usage-logs | ||
| users |
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 |
|---|---|---|
| .. | ||
| channels | Loading commit data... | |
| mj-logs | Loading commit data... | |
| model-deployments | Loading commit data... | |
| model-pricing | Loading commit data... | |
| models | Loading commit data... | |
| redemptions | Loading commit data... | |
| subscriptions | Loading commit data... | |
| task-logs | Loading commit data... | |
| tokens | Loading commit data... | |
| usage-logs | Loading commit data... | |
| users | Loading commit data... |