feat(chat): 将 AQBot 加入第三方聊天默认列表 - #7079
Merged
Merged
Conversation
说明：
- 默认聊天预设增加 AQBot，点击后通过 aqbot://providers 一键导入当前站点地址和 API Key
- 新增 {aqbotConfig} 占位符，按 AQBot 协议编码 name、baseurl、apikey 和 type=openai
操作：
- 新部署会在聊天预设中看到 AQBot
- 已保存过 Chats 的站点需在系统设置中手动添加：{"AQBot":"aqbot://providers?{aqbotConfig}"}
Contributor
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Organization UI Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (2)
Included review availability: Your plan provides up to 10 included reviews per hour; 9 remain after this review. WalkthroughThe default chat preset list now includes AQBot. The frontend recognizes ChangesAQBot integration
Estimated code review effort: 2 (Simple) | ~10 minutes Merge Risk: 🔵 Low · up to The new AQBot preset lets users send the selected API key and server address to the locally registered AQBot application. The action is explicit and uses the existing key-selection safeguards, so the PR is mergeable with owner awareness that the receiving desktop application must be trusted. Suggested reviewers: Poem
🚥 Pre-merge checks | ✅ 4 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (4 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
Pull request overview
本 PR 为 new-api 的「第三方聊天」默认预设新增 AQBot 集成入口，并在前端统一链接解析逻辑中支持 {aqbotConfig} 占位符，以生成符合 AQBot aqbot://providers 协议的导入链接。
Changes:
- 在后端默认
Chats列表中新增AQBot预设条目：aqbot://providers?{aqbotConfig}。 - 在前端
chatLinkRequiresApiKey/resolveChatUrl中新增{aqbotConfig}识别与参数编码拼装（name/baseurl/apikey/type=openai）。
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
setting/chat.go |
在默认第三方聊天预设列表中加入 AQBot deeplink 模板 |
web/src/features/chat/lib/chat-links.ts |
新增 {aqbotConfig} 占位符解析，生成 AQBot providers 导入链接 |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
Comment on lines
+193
to
+201
| if (url.includes('{aqbotConfig}')) { | ||
| const query = [ | ||
| `name=${encodeURIComponent('New API')}`, | ||
| `baseurl=${encodeURIComponent(safeServerAddress)}`, | ||
| `apikey=${encodeURIComponent(safeApiKey)}`, | ||
| 'type=openai', | ||
| ].join('&') | ||
| return replaceToken(url, '{aqbotConfig}', query) | ||
| } |
chunfeng789
added a commit
to chunfeng789/new-api
that referenced
this pull request
Aug 30, 2026
* fix(web): restore admin unbinding for built-in providers (QuantumNous#6987) * fix(web): align admin binding types Refs QuantumNous#6985 * test(web): restore animation mock * fix(billing): 修复时间规则恒真表达式导致倍率全天生效 (QuantumNous#6934) Co-authored-by: seefs001 <i@seefs.me> * fix(docker): add relaykit go.mod to dev build context (QuantumNous#7072) * feat(task): replace built-in task adaptors with a sandboxed JS plugin system (QuantumNous#7076) * fix(relay): 请求参数校验错误返回 HTTP 400 (QuantumNous#6774) * fix(relay): return 400 for invalid request parameters * fix(web): recheck setup status after page reload (QuantumNous#6968) * feat(auth): encrypt password login transport Closes QuantumNous#6743 * feat(chat): add AQBot preset (QuantumNous#7079) * feat(auth): make password encryption opt-in QuantumNous#6743 * feat(task): resolve channel-mapped aliases and case variants for plugin 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. * fix(model): disable PostgreSQL prepared statements for pooler compatibility 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. * fix(ali): honor image response format (QuantumNous#5513) (QuantumNous#7048) * feat(web): factory task plugins update only with the system 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. * fix(subscription): 无有效订阅时前端如实显示「仅用订阅」偏好 (QuantumNous#6222) (QuantumNous#7086) Co-authored-by: Claude <noreply@anthropic.com> * fix(sqlite): enable WAL + working busy timeout + _txlock=immediate to stop concurrent write lockouts (QuantumNous#7030) * fix(sqlite): enable WAL + working busy timeout + _txlock=immediate to stop concurrent write lockouts * fix(model): return string from JSON column Valuers for pg simple protocol 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. * fix(relay): bound the wait for upstream response headers (fixes unbounded 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.) * fix initialize database * fix(model): drop leftover prefill_groups unique constraints before AutoMigrate (QuantumNous#7100) * Revert "fix(model): drop leftover prefill_groups unique constraints before Au…" (QuantumNous#7101) This reverts commit 69a41ee. * fix(model): drop leftover prefill_groups unique constraints before AutoMigrate --------- Co-authored-by: zcxads666 <128150298+zcxads666@users.noreply.github.com> Co-authored-by: seefs001 <i@seefs.me> Co-authored-by: Uladzislau <53997152+VladKabiak@users.noreply.github.com> Co-authored-by: Calcium-Ion <i@caion.me> Co-authored-by: Alex Xiang <ax2@zicode.com> Co-authored-by: Seefs <40468931+seefs001@users.noreply.github.com> Co-authored-by: 憧憬Licoy <licoycn@gmail.com> Co-authored-by: PuppetKL <154485567+PuppetKL@users.noreply.github.com> Co-authored-by: ruiyunzhao <91191418+CR-Yun@users.noreply.github.com> Co-authored-by: Claude <noreply@anthropic.com> Co-authored-by: Xayinn <129403670+LinineTy@users.noreply.github.com> Co-authored-by: txgo <tianxi.liu@gmail.com>
yiranxiaohui
pushed a commit
to yiranxiaohui/new-api
that referenced
this pull request
Sep 2, 2026
(cherry picked from commit 8454082)
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
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
User request
将 https://github.com/AQBot-Desktop/AQBot 集成到 newapi 当前这个项目的第三方聊天的默认列表里面去，给一个完整的方案
Out of scope — refuse
Kind
Issue facts
aqbot://providers导入链接。Chats的部署。aqbot://providers；缺口在 new-api 默认Chats和resolveChatUrl。Change
默认
Chats在 DeepChat 后增加 AQBot 条目，模板为aqbot://providers?{aqbotConfig}。chatLinkRequiresApiKey识别{aqbotConfig}；resolveChatUrl按 AQBot 协议用encodeURIComponent拼name=New API、baseurl（站点根地址，不带/v1）、apikey、type=openai。侧边栏、API 密钥行操作、聊天页已走同一解析函数，不用再改组件。已保存过Chats的站点不自动合并。Research
Duplicate / prior art
AQBot；DeepChat；聊天预设；Cherry StudioDocs and code
setting/chat.go为准。setting/chat.go默认列表；web/src/features/chat/lib/chat-links.ts已有{cherryConfig}{aionuiConfig}{deepchatConfig}。AQBot 源码要求aqbot://providers?name&baseurl&apikey&type。Alternatives considered
{aqbotConfig}专用占位符，JS 编码 query。{address}{key}拼 URL。{key}当前不编码，密钥里的&会截断 query；A 与 Cherry/DeepChat 一致。Files
setting/chat.goweb/src/features/chat/lib/chat-links.ts{aqbotConfig}并编码导入链接Behavior
aqbot://providers?name=New%20API&baseurl=...&apikey=...&type=openai。Chats。Verification
cd web && bun run test src/features/chat/lib/chat-links.test.ts4 passed（测试文件未纳入本次提交）；cd web && bun run typecheck通过；cd web && bunx oxlint -c .oxlintrc.json src/features/chat/lib/chat-links.ts0 error；gofmt -e -l setting/chat.go无输出。GET /api/status的chats含 AQBot，位于 DeepChat 与 Lobe Chat 之间。chat-links.test.ts，按要求未提交。Risks
aqbot://，与 Cherry Studio 相同；已保存自定义Chats的站点升级后不会自动出现 AQBot。{"AQBot":"aqbot://providers?{aqbotConfig}"}。Scope check
Summary by CodeRabbit
New Features
Bug Fixes