CaIon 35d0704640 Merge branch 'origin/main' into nightly ...

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

2026-04-02 00:39:13 +08:00

..

channel

Merge branch 'origin/main' into nightly

2026-04-02 00:39:13 +08:00

common

Merge branch 'origin/main' into nightly

2026-04-02 00:39:13 +08:00

common_handler

feat: refactor token estimation logic

2025-12-02 21:34:39 +08:00

constant

feat: openai response /v1/response/compact (#2644)

2026-01-26 20:20:16 +08:00

helper

Merge branch 'origin/main' into nightly

2026-04-02 00:39:13 +08:00

reasonmap

fix: reason convert

2026-01-25 15:31:23 +08:00

audio_handler.go

Merge branch 'origin/main' into nightly

2026-04-02 00:39:13 +08:00

chat_completions_via_responses.go

feat: implement tiered billing expression evaluation and related functionality

2026-03-17 16:59:25 +08:00

claude_handler.go

refactor: optimize billing flow for OpenAI-to-Anthropic convert

2026-03-23 14:22:12 +08:00

compatible_handler.go

refactor: optimize billing flow for OpenAI-to-Anthropic convert

2026-03-23 14:22:12 +08:00

embedding_handler.go

Merge branch 'origin/main' into nightly

2026-04-02 00:39:13 +08:00

gemini_handler.go

refactor: optimize billing flow for OpenAI-to-Anthropic convert

2026-03-23 14:22:12 +08:00

image_handler.go

fix: move image count n to OtherRatio to prevent double-counting

2026-03-31 23:58:10 +08:00

mjproxy_handler.go

fix: harden SSRF protection for unauthenticated and user-level endpoints

2026-03-31 17:57:47 +08:00

param_override_error.go

feat: add retry-aware param override with return_error and prune_objects

2026-02-22 00:10:49 +08:00

relay_adaptor.go

feat: codex channel (#2652)

2026-01-14 22:29:43 +08:00

relay_task.go

Return error when model price/ratio unset

2026-03-02 19:09:48 +08:00

rerank_handler.go

refactor: optimize billing flow for OpenAI-to-Anthropic convert

2026-03-23 14:22:12 +08:00

responses_handler.go

refactor: optimize billing flow for OpenAI-to-Anthropic convert

2026-03-23 14:22:12 +08:00

websocket.go

format: package name -> github.com/QuantumNous/new-api (#2017)

2025-10-11 15:30:09 +08:00