Merge upstream QuantumNous/new-api into main (sync through 2b6f1dfef) - #9
Merged
Conversation
…#6987) * fix(web): align admin binding types Refs QuantumNous#6985 * test(web): restore animation mock
Co-authored-by: seefs001 <i@seefs.me>
* fix(relay): return 400 for invalid request parameters
…in models Channel model_mapping keys exposed in a channel's model list now act as first-class aliases for task-plugin models across the whole line: - Derived alias view (model/task_model_alias.go): built from enabled channels' model_mapping, chain-following with cycle detection, declared names always win, cross-plugin conflicts dropped. Rebuilt on channel cache refresh, registry generation change, and a 60s TTL. - Request path: PinTaskPluginEndpoint resolves declared-name case folds and mapping aliases before endpoint lookup (never rewriting the body until the endpoint is claimed), pins with MappedModel, and the decode contract accepts alias echoes without loosening model ownership for normal pins. Legacy /v1/tasks submit folds case variants the same way. Fixes aliases on POST /v1/responses silently falling through to the main relay against task channels. - Mapping order: ModelMappedHelper now runs before the plugin submit hook builds and caches the upstream body, so channel model_mapping actually reaches the upstream request. Plugins receive the mapped name as ctx.upstreamModel in both decode and submit contexts. - Billing: identity stays the origin name; when the alias has no tiered expression, the selected channel's mapping tail expression applies. Pricing page and billing-expr smoke tests resolve aliases to the owning plugin's usage schema. - Case folding: ASCII-only fold with exact-match priority; same-plugin and cross-plugin fold collisions rejected at registration. - Plugins: model-keyed rate tables, req_key derivation, and combo validation in doubao/kling/jimeng/hailuo/vidu/sunoapi now key on ctx.upstreamModel || ctx.model; render/echo paths keep ctx.model.
…bility GORM v1.25.2 closes cached prepared statements asynchronously on any SQL error and immediately re-Parses the same deterministic name (pgx's stmt_<sha256>) on the same client connection. Transaction-pooling proxies (PgBouncer >=1.21 with max_prepared_statements, Neon, Supabase) respond with FATAL "prepared statement name is already in use" (SQLSTATE 08P01) and drop the connection. PreferSimpleProtocol only disables pgx's implicit prepare and never covered GORM's explicit PrepareStmt cache. - PostgreSQL now runs with PrepareStmt disabled entirely; named prepared statements are fundamentally session state and cannot be made safe under transaction pooling. Parse/plan cost is noise for this workload. - Upgrade gorm to v1.25.12 so MySQL/SQLite statement caches (still enabled) no longer churn close/re-prepare on ordinary SQL errors; v1.25.9+ restricts eviction to driver.ErrBadConn. Deliberately not v1.26+, whose LRU eviction has an open use-after-close race (#7831). - sanitizeDBError now attaches a remediation hint on 08P01/42P05 so affected deployments can self-diagnose from the log line.
Marketplace install/upgrade on a factory-served plugin actually created a permanent override shadowing every future built-in release. The card now shows an informational "Updates with the system" badge instead of the action, while keeping the built-in vs marketplace version line and the upgradable state badge visible. Deliberate overrides are untouched: upload and marketplace actions on overridden or third-party plugins behave as before, and the plugins table now hints when an override lags behind the shipped built-in version so operators know deleting it restores the newer factory plugin.
…us#7086) Co-authored-by: Claude <noreply@anthropic.com>
… stop concurrent write lockouts (QuantumNous#7030) * fix(sqlite): enable WAL + working busy timeout + _txlock=immediate to stop concurrent write lockouts
…ocol
With PrepareStmt disabled, PostgreSQL queries run over pgx's simple
protocol, which encodes every []byte parameter as a bytea hex literal
('\x...'). driver.Valuer implementations returning []byte from
json.Marshal therefore fail json-column writes with SQLSTATE 22P02
(reported on the channels UPDATE path via ChannelInfo).
Reproduced against a live PostgreSQL 16: []byte Valuer into a json
column fails under simple protocol, string succeeds; []byte into a
text column silently stores the hex literal (no such path exists in
the repo today — audited all Valuers, json.RawMessage fields, and raw
SQL call sites).
- ChannelInfo, Properties, TaskPrivateData, JSONValue Value() now
return string; zero-value nil semantics unchanged. Task.Data
(bare json.RawMessage) is unaffected — database/sql's default
converter already passes it as expected.
- Their Scan() counterparts now accept both []byte and string via a
shared jsonScanBytes helper: SQLite returns string for these columns
once Value() emits string, and the old []byte-only assertions
silently zeroed the field (caught by the model test suite).
- Add regression tests locking both contracts: json-column Valuers
must return string (or nil for zero values), Scanners must accept
[]byte and string.
Verified end-to-end against PostgreSQL 16 with the real model types:
Channel create/update/read-back, Task json fields, PrefillGroup items.
…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.)
…efore Au…" (QuantumNous#7101) This reverts commit 69a41ee.
Merge 21 upstream commits (through 2b6f1df) into the fork. Highlights: sandboxed JS task-plugin system, opt-in password login encryption, relay 400 validation, SQLite WAL + busy timeout, upstream response header timeout bound, and PG pooler/prepared-statement fixes. Conflicts resolved: - CLAUDE.md: kept upstream's mandatory Read-AGENTS.md section and re-added the fork's 'never PR to upstream' rule under Claude Code. - README.md: kept the fork's Chinese README (Aliyun registry image). - go.mod: unioned fork go-pay/* deps with upstream go-sourcemap/pprof; reconciled with 'go mod tidy'. - router/web-router.go: combined upstream's NoRoute pluginDispatcher + RouteTag("web") chain with the fork's Cloudflare per-host analytics token injection. - web/src/i18n/locales/_reports/_sync-report.json: accepted upstream deletion (generated report). Verified: go build ./..., relaykit GOWORK=off go build ./..., go vet ./router/, and web typecheck all pass. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
5 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Agent
Links
QuantumNous/new-apimain@2b6f1dfef(merged here)This is a fork-maintenance sync PR: it merges the latest upstream
QuantumNous/new-apimaininto this fork'smain. It is not a feature contribution, so there is no issue to close.User request
Out of scope — refuse
Kind
mainIssue facts
Not applicable — this is a routine upstream sync, not a bug report. No linked issue.
Change
Merges 21 upstream commits (through
2b6f1dfef) into this fork'smainvia a merge commit, preserving the fork's 8 local customization commits. Notable upstream changes pulled in:_txlock=immediateto stop concurrent write lockouts (fix(sqlite): enable WAL + working busy timeout + _txlock=immediate to stop concurrent write lockouts QuantumNous/new-api#7030)prefill_groupsunique-constraint migration fixes (fix(model): drop leftover prefill_groups unique constraints QuantumNous/new-api#7100/Revert "fix(model): drop leftover prefill_groups unique constraints" QuantumNous/new-api#7101)response_formathonored (Bug: 百炼(Ali)渠道 response_format=b64_json 不生效，URL未转base64 QuantumNous/new-api#5513/fix(ali): honor image response format (#5513) QuantumNous/new-api#7048); billing time-rule always-true expression fix (fix(billing): 修复时间规则区间恒真表达式导致倍率全天生效 QuantumNous/new-api#6934); admin unbinding restored for built-in providers (fix(web): restore admin unbinding for built-in providers QuantumNous/new-api#6987)Five files conflicted and were resolved so the fork's customizations are preserved on top of upstream:
AGENTS.md" section and re-added the fork's "never PR to upstream; always--repo chunfeng789/new-api" rule under aClaude Codesection.registry.cn-hongkong.aliyuncs.com/...). Upstream contributed nothing to README outside the conflict block, so the fork copy is retained verbatim.go-pay/*indirect deps (WeChat/Alipay native QR pay) with upstream'sgo-sourcemap/sourcemap+google/pprof, then reconciled withgo mod tidy.SetWebRouter(..., pluginDispatcher gin.HandlerFunc)signature and itsNoRoute(pluginDispatcher, middleware.RouteTag("web"), gzip, rateLimit, cache, static.Serve, fallback)chain with the fork's Cloudflare per-host Web Analytics token injection (injectedPagespre-render +cloudflareWebAnalyticsTokenForHost). The call site inrouter/main.goalready passespluginDispatcher;WebAssetsretains the fork'sCloudflareWebAnalyticsToken/CloudflareWebAnalyticsHostTokensfields, populated inmain.go.web/scripts/sync-i18n.mjs).Research
Duplicate / prior art
a81b2f8cf("Merge branch 'QuantumNous:main' into main"); this continues that same sync workflow with the newer upstreammain.Docs and code
AGENTS.md/CLAUDE.mdconflict-resolution and PR rules (target the fork, mark AI-assisted, use this template).router/web-router.go,router/main.go,main.go(web asset wiring + Cloudflare analytics),go.mod/go.sum(dependency union), and the upstream JS-plugin subsystem (pkg/jsplugin/,plugins/,controller/task_plugin*) which builds cleanly against the merged tree.Alternatives considered
rebasethe fork's 8 commits onto upstreammain— rejected; it rewrites the fork's published history and loses the merge audit trail.mergeupstream intomain(chosen) — preserves both histories and records the resolution in one merge commit.Files
go mod tidyreconcileBehavior
mainat2ca289aa, 21 commits behind upstreammain.maincontains all upstream changes through2b6f1dfefplus the fork's 8 customization commits; web routing serves the plugin dispatcher chain while still injecting the fork's per-host Cloudflare analytics token.Verification
go build ./...— passcd relaykit && GOWORK=off go build ./...— pass (relaykit module independence per AGENTS.md)go vet ./router/— passgo mod tidy— clean; forkgo-pay/*and upstream deps both retainedcd web && bun install— installed upstream's newnode-forge/@types/node-forge(and@codemirror/lang-javascript)cd web && bun run typecheck(tsgo -b) — passSetWebRoutercall site (router/main.go) passespluginDispatcher; verifiedWebAssetsCloudflare fields still populated inmain.go; confirmed zero leftover conflict markers in the tree.go test ./..., frontendvitest, productionrsbuild build, and runtime behavior of the merged upstream subsystems.Risks
go test ./...+bun run test+ a production build before shipping; smoke-test login (password encryption) and a task-plugin flow.Scope check