Skip to content

feat: selective sync upstream fixes, database migrations, and channels 77-80 - #16

Merged
piexian merged 41 commits into
mainfrom
sync/upstream-picks-1
Oct 4, 2026
Merged

piexian merged 41 commits into
mainfrom
sync/upstream-picks-1

Conversation

@piexian

@piexian piexian commented Oct 4, 2026 •

Copy link
Copy Markdown
Owner

Summary

This PR selectively ports high-value bug fixes, database schema migrations, and new channels from upstream (\QuantumNous/new-api), fully preserving fork-specific enhancements (split subscription deduction, loan system, risk center, channels 58-76, transactional notifications, etc.).

1. Database Migrations (Phase 2)

  • Added prefill group migration (\model/prefill_group_migration.go).
  • Added token group & foreign key migration (\model/token_migration.go).
  • Added options primary key migration (\model/option_primary_key_migration.go).
  • Added migration dialector & database compatibility checks (\model/migration_dialector.go).

2. New Channels Sequenced 77–80 & TokenHub (Phase 3)

Sequenced sequentially after fork's channel 76 (\CHANNEL_TYPE_TYPESAFE):

  • Channel 77: \ChannelTypeSub2API\ (Sub2API gateway adapter, endpoint mapping & icon).
  • Channel 78: \ChannelTypeNewAPI\ (New API instance nesting & endpoint mapping).
  • Channel 79: \ChannelTypeVLLM\ (vLLM self-hosted inference & status monitoring, default port 8000).
  • Channel 80: \ChannelTypeSGLang\ (SGLang self-hosted inference & status monitoring, default port 30000, created_at float coercion).
  • Tencent TokenHub: Integrated via channel 23 dispatch adapter.

3. Inference Status Monitoring (vLLM / SGLang)

  • Backend endpoints: /api/channel/:id/vllm/status\ & /api/channel/:id/sglang/status.
  • Frontend UI: Status button in channel balance column, dialog showing cluster load, TTFT, cache hit rate, metrics export, auto-refresh.

4. Frontend Parity & i18n

  • Default Theme (React 19 TS): Icons, status dialog, \server-error-message.ts, full 7-locale translations
  • Classic Theme (React 18 JS): Channel constants 77-80, option dropdowns, fetchable types, default base URL auto-population.

5. Group A Bug Fixes & Security (Phase 1)

  • 39 upstream commits cherry-picked cleanly (tiered pricing time rule \�c381acf4, security checks, relay error handling, etc.).

seefs001 and others added 30 commits October 3, 2026 14:59
* fix: purge authentication data on hard user deletion

* fix: fail closed when 2FA status lookup fails

* fix: reject stale Telegram login callbacks

* fix(twofa): prevent concurrent backup code and lockout bypasses

* fix(auth): harden user deletion and Telegram verification

(cherry picked from commit b6b97a6)
* fix: infer MiniMax vendor for MiniMax models

* Delete model/pricing_default_test.go

---------

Co-authored-by: duanxufu <duanxufu@rededa.com>
(cherry picked from commit a63364d)
…uantumNous#6253)

DataTableRow's React.memo did not depend on columnVisibility.
TanStack row references stay stable when visible columns change, so the
table body did not refresh after View -> Toggle columns until another
action rebuilt the column definitions.

Capture a visible column id signature (visibleColumnIds) outside the
memo and compare it, matching the existing isSelected snapshot pattern.
All tables that use DataTableRow pick up the fix.

(cherry picked from commit dc9aeab)
…ntumNous#6225)

When a function call was already registered under its output_index key
via response.output_item.added, the synthetic events built from the
terminal response.completed output carry no output_index and resolve to
a different item-based key. ensureToolForEvent then created a second
tool index and resent the full arguments, so Chat Completions clients
received the same tool call twice.

Reuse the tool registered under itemIDToKey/callIDToKey before creating
a new one, and alias the new key to the existing tool.

Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
(cherry picked from commit 1086038)
…umNous#6074)

* fix: prevent duplicate suno task refunds via cas status update

* fix: reconcile failed task refunds

---------

Co-authored-by: CaIon <i@caion.me>
(cherry picked from commit e0d5156)
When an upstream error response parses as valid JSON but yields no usable
error message (e.g. an aggregator gateway returning {"error":{"message":""}}),
RelayErrorHandler previously produced a bare "bad response status code N"
error with no trace of the original body, making the failure undiagnosable.
Log the body preview in that case, mirroring the existing behavior for
unparseable bodies.

(cherry picked from commit 84a79b6)
* fix: parameterize slow/error SQL logs to avoid leaking credentials

* fix: validate SQL_SLOW_THRESHOLD_MS range

* fix: sanitize database driver error messages in SQL logs

* refactor: sanitize at gorm log writer seam to keep caller attribution

(cherry picked from commit c3db414)
)

* fix(aws): cancel Bedrock requests on client disconnect

* fix(billing): log effective usage billing path

(cherry picked from commit bd585d7)
…token and aff transfer routes

(cherry picked from commit 1da23d6)
* fix: support Gemini model listing on v1 route

* test: cover Gemini query key model listing

(cherry picked from commit 3d5dc36)
* fix(billing): 异步任务退款时同步减少 used_quota
退款时仅恢复了 quota(剩余额度),但未同步减少 used_quota(已用额度),
导致"总额度"(quota + used_quota)随退款次数持续虚增,超出用户实际充值金额。

修复三处退款路径:
- RefundTaskQuota:任务失败完整退款
- RecalculateTaskQuota:差额结算退款分支
- controller/midjourney.go:Midjourney 任务失败退款

新增 model.UpdateUserUsedQuota 公开函数,仅调整 used_quota 不影响 request_count。

* fix(billing): 任务退款时同步扣减渠道 used_quota

* fix(billing): complete async task refund accounting

* style(model): group internal Midjourney fields

---------

Co-authored-by: CaIon <i@caion.me>
(cherry picked from commit 58d4e9b)
* feat(ali): support Qwen Image 3 requests

* refactor(ali): narrow Qwen Image 3 support

* fix(ali): focus image model mapping fix

(cherry picked from commit 93d2df8)
* fix(topup): reject uncreditable orders before payment

* fix(topup): align zero-ratio Stripe validation

* fix(topup): mirror settlement conversions in validation

(cherry picked from commit 2a0ce34)
* fix(relay): return 400 for invalid request parameters

(cherry picked from commit 0f2a207)
… stop concurrent write lockouts (QuantumNous#7030)

* fix(sqlite): enable WAL + working busy timeout + _txlock=immediate to stop concurrent write lockouts

(cherry picked from commit 1751f43)
…nded heap growth → OOM) (QuantumNous#6949)

* fix(relay): bound the wait for upstream response headers (fixes unbounded heap growth)

The relay transport sets a dial timeout, a TLS handshake timeout and an expect-continue
timeout, but nothing bounds how long it waits for the upstream *response headers* after
the request has been written. An upstream that accepts the connection and then never
answers -- without sending FIN/RST, which is what happens when a NAT/firewall silently
drops the flow or the provider hangs -- parks the goroutine in
net/http.(*persistConn).roundTrip forever.

That goroutine keeps the whole request alive, which in practice means three copies of the
request body stay reachable for the lifetime of the process: the raw bytes from
io.ReadAll in CreateBodyStorageFromReader, the decoded messages held as json.RawMessage,
and the re-marshalled upstream body from common.Marshal. BodyStorageCleanup cannot help
here: it runs after c.Next() returns, and for these requests c.Next() never returns.

Measured on v1.0.0-rc.23 in production (see QuantumNous#6947 for the full evidence):

  - 23 goroutines stuck in persistConn.roundTrip on a single 40h-old instance,
    blocked between 353 and 1894 minutes (5.9h to 31.5h)
  - 96.9% of the live heap, sampled after a forced GC, attributable to those three
    body copies (HeapAlloc 892 MiB surviving three GC cycles; HeapObjects dropping
    30x while bytes dropped only 25%)
  - the live floor grows with uptime: 33.7 MiB at 0.1h, 89.2 at 13.8h, 510.0 at 40.1h,
    955.2 at 146.8h, OOMKilled at 172.9h -- same image, same config, same load

Doubling the memory limit and adding GOMEMLIMIT only moved the OOM from 132h to 172.9h.

RELAY_TIMEOUT (http.Client.Timeout) cannot be used for this: it covers the whole response
read and would cut legitimate long streaming calls, which is why it defaults to 0.
ResponseHeaderTimeout only bounds the wait for the headers; streaming after they arrive is
unaffected.

The default is deliberately generous. Non-streaming upstreams usually send the response
headers only once generation has finished, so the value has to leave room for a long
completion. 1800s is 12x shorter than the shortest hang observed here while leaving
several times the headroom a normal non-streaming request needs; 0 restores the previous
unbounded behaviour.

The assignment goes next to the other transport.* lines rather than inside the else
branch: newRelayHTTPTransport() normally takes the http.DefaultTransport.Clone() path,
and DefaultTransport does not set ResponseHeaderTimeout either.

This repo already sets ResponseHeaderTimeout on its other outbound transports
(controller/model_sync.go, controller/ratio_sync.go); the relay path appears to have
been missed.

Refs QuantumNous#6947. Likely also the root cause of QuantumNous#6731, which reported the same symptom
(production OOM on /v1/responses after ~64h) but was closed for template reasons.

* review: clamp overflowing timeout values and switch the test to testify

Addresses the two CodeRabbit findings on this PR.

Overflow (common/init.go:113): a RELAY_RESPONSE_HEADER_TIMEOUT beyond ~9.2e9 seconds
overflows time.Duration and can wrap into a *tiny positive* timeout, which would cut
every relay request instead of only the stuck ones. The value is now clamped before the
conversion, with regression tests for both the negative and the overflowing input.

I did not add fail-on-startup validation for negative values, for two reasons: the
existing `if seconds > 0` guard already treats them as "disabled", and the neighbouring
env-driven timeouts in this file are less strict still -- RelayIdleConnTimeout is
converted with no guard at all. Failing startup on a bad value would be a behaviour
change out of step with the rest of the file; happy to add it if you'd prefer that
direction repo-wide.

Test style: switched to testify (require.Equal / require.Zero / require.Positive), which
is what every other test under service/ uses.

go build, go vet and go test ./common/... ./service/... pass.
(`go build ./...` fails on the `web/dist` embed both with and without this change -- the
frontend bundle is not checked in.)

(cherry picked from commit b518d00)
* fix(log): preserve quota in usage statistics

(cherry picked from commit 8c8c415)
* perf(relay): bulk-copy Responses raw JSON fields

* perf(common): share RawMessage deep-copy optimization

---------

Co-authored-by: CaIon <i@caion.me>
(cherry picked from commit 2cf177a)
chiliec and others added 11 commits October 3, 2026 21:52
…mNous#7321)

Uppercase or mixed-case extensions (e.g. .MP3, .WAV) fell through to the
default branch and returned "unsupported audio format", so audio token
usage could not be measured. Lowercase the extension before the switch.

Closes QuantumNous#7319

(cherry picked from commit 76f7daf)
OpenaiImageHandler and the JSON-to-SSE fallback billed the gjson data.#
element count. An object-shaped data yielded 0 and kept the requested n
while the SSE fallback dropped the image and sent only [DONE]; one image
split into a url entry and a b64_json entry billed twice; entries carrying
only revised_prompt billed as images.

Count images by payload: an object with url or b64_json is one image and
arrays bill max(url entries, b64_json entries). The SSE fallback forwards
one completed event per image payload for both shapes. xAI inherits the
fix through OpenaiImageHandler.

(cherry picked from commit 07578fa)
@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

@sourcery-ai sourcery-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry @piexian, your pull request is larger than the review limit of 150,000 diff characters

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 4, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
🔒 Security Review ✅ Completed 2026-10-04T01:23:27.026337Z c4fc8d2 PR opened
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@piexian
piexian merged commit 59f59ed into main Oct 4, 2026
8 checks passed
@piexian
piexian deleted the sync/upstream-picks-1 branch October 4, 2026 01:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.