From 55b15636a637b6b69894364d05f42e138f71d092 Mon Sep 17 00:00:00 2001 From: XUANJI233 <56026539+XUANJI233@users.noreply.github.com> Date: Wed, 18 Nov 2026 05:00:28 -0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E5=8E=9F=E6=A0=B7=E9=87=8D?= =?UTF-8?q?=E5=8F=91=E4=B8=8E=E5=9B=9E=E9=80=80=E7=9A=84=E8=AF=B7=E6=B1=82?= =?UTF-8?q?=E5=BD=92=E5=85=A5=E5=8E=9F=E4=BC=9A=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 多于一条消息的请求成功后原样重发时归入原会话,沿用会话 ID 与各条消息的时间;只有一条消息的请求保持原规则 - 会话记录保存链位置之前最后 CONVERSATION_REWIND_DEPTH 项链摘要,没有会话直接匹配且本次多于一条消息时,回退或改写不超过保留条数的请求退回原会话继续使用 - 新增配置项 CONVERSATION_REWIND_DEPTH(默认 3,0 为不限制),设置页归入调度分区 Co-Authored-By: Claude Fable 5.2 --- .env.example | 3 + README.md | 2 + README_en.md | 2 + docs/development.md | 11 +- docs/protocol.md | 9 +- internal/config/config.go | 12 +++ internal/i18n/messages/de.json | 1 + internal/i18n/messages/en.json | 1 + internal/i18n/messages/fr.json | 1 + internal/i18n/messages/ja.json | 1 + internal/i18n/messages/ko.json | 1 + internal/i18n/messages/zh-TW.json | 1 + internal/service/conversation.go | 53 +++++++++- internal/service/generate_test.go | 114 +++++++++++++++++++++ internal/service/service.go | 3 +- web/src/features/settings/SettingsPage.tsx | 8 +- web/src/features/settings/schema.ts | 6 ++ web/src/locales/de.ts | 4 + web/src/locales/en.ts | 4 + web/src/locales/fr.ts | 4 + web/src/locales/ja.ts | 4 + web/src/locales/ko.ts | 4 + web/src/locales/zh-CN.ts | 4 + web/src/locales/zh-TW.ts | 4 + 24 files changed, 242 insertions(+), 15 deletions(-) diff --git a/.env.example b/.env.example index 00f7bd7..db1c181 100644 --- a/.env.example +++ b/.env.example @@ -60,6 +60,9 @@ QUOTA_RESERVE_PERCENT=0 # 每次自动刷新额度后,为每周额度窗口尚未开始计时的就绪账户发一条 Hi,开始本周计时;同一账户的每个额度组 6 天内最多一次 WEEKLY_QUOTA_WARMUP=false +# 会话记录为识别回退保留的消息摘要条数:客户端回退或改写最近这几条消息后再发请求时仍归入原会话,超出时新建会话;0 为不限制 +CONVERSATION_REWIND_DEPTH=3 + # 服务日志级别:debug、info、warn、error LOG_LEVEL=info diff --git a/README.md b/README.md index bd63e6a..7b90749 100644 --- a/README.md +++ b/README.md @@ -324,6 +324,7 @@ docs/ # 协议、开发与日志文档 | `QUOTA_REFRESH_INTERVAL` | 后台读取全部账户(含停用账户)额度的间隔,最短 `1m`,`0` 为不自动刷新 | `15m` | | `QUOTA_RESERVE_PERCENT` | 额度保留比例,0–99 | `0` | | `WEEKLY_QUOTA_WARMUP` | 自动开始每周额度计时 | `false` | +| `CONVERSATION_REWIND_DEPTH` | 回退匹配条数,`0` 为不限制 | `3` | | `LOG_LEVEL` | 日志级别:`debug`、`info`、`warn`、`error` | `info` | | `LOG_FORMAT` | 日志格式:`json` 或 `text` | `json` | | `LOG_FILE` | 同时把日志写入 `RUNTIME_DIR/logs/`,单文件 10 MB 轮转 | `true` | @@ -337,6 +338,7 @@ docs/ # 协议、开发与日志文档 - `ROUTING_STRATEGY`:在优先级最高的账户中,`round-robin` 选进行中请求最少者,并列时选最近一次被选中最早的账户;`fill-first` 先用满一个账户 - `QUOTA_RESERVE_PERCENT`:账户某个额度组的 5 小时或每周剩余比例不高于此百分比时,调度跳过该组,直到该窗口重置;`0` 时只跳过已用尽的组 - `WEEKLY_QUOTA_WARMUP`:每次自动刷新额度后,为每周额度窗口尚未开始计时的就绪账户发一条 `Hi`,开始本周计时;同一账户的每个额度组 6 天内最多一次 +- `CONVERSATION_REWIND_DEPTH`:会话记录为识别回退保留的消息摘要条数;客户端回退或改写最近这几条消息后再发请求时仍归入原会话,超出时新建会话 - `REQUEST_LOG_BODIES`:保存公开请求与响应正文和成功请求的上游尝试正文,失败请求的上游尝试正文总是保存;各截断到 64 KiB,各保留最近 1000 条 进程环境变量覆盖 `.env` 中的同名项。 diff --git a/README_en.md b/README_en.md index 522a50e..79307fe 100644 --- a/README_en.md +++ b/README_en.md @@ -324,6 +324,7 @@ docs/ # protocol, development and logging docs | `QUOTA_REFRESH_INTERVAL` | Interval for reading the quota of every account, disabled ones included, in the background; minimum `1m`, `0` turns it off | `15m` | | `QUOTA_RESERVE_PERCENT` | Quota reserve, 0–99 | `0` | | `WEEKLY_QUOTA_WARMUP` | Start weekly quota timers automatically | `false` | +| `CONVERSATION_REWIND_DEPTH` | Rewind matching depth, `0` for no limit | `3` | | `LOG_LEVEL` | Log level: `debug`, `info`, `warn`, `error` | `info` | | `LOG_FORMAT` | Log format: `json` or `text` | `json` | | `LOG_FILE` | Also write logs to `RUNTIME_DIR/logs/`, rotating at 10 MB per file | `true` | @@ -337,6 +338,7 @@ docs/ # protocol, development and logging docs - `ROUTING_STRATEGY`: among the highest-priority accounts, `round-robin` picks the one with the fewest running requests and, on ties, the one picked least recently; `fill-first` fills one account first - `QUOTA_RESERVE_PERCENT`: when the 5-hour or weekly remaining share of an account quota group is at or below this percentage, the group is not scheduled until that window resets; with `0` only used-up groups are skipped - `WEEKLY_QUOTA_WARMUP`: after each automatic quota refresh, send `Hi` from every ready account whose weekly window has not started, so the weekly timer starts; at most once per account and quota group every 6 days +- `CONVERSATION_REWIND_DEPTH`: how many trailing message digests a conversation record keeps for recognizing a rewind; a request that rewinds or edits within the last that many messages stays in the same conversation, and beyond that a new conversation starts - `REQUEST_LOG_BODIES`: store public request and response bodies and the upstream attempt bodies of successful requests; upstream attempt bodies of failed requests are always stored; each is truncated to 64 KiB, keeping the latest 1000 of each Process environment variables override the same keys in `.env`. diff --git a/docs/development.md b/docs/development.md index 11cfa1d..37997f8 100644 --- a/docs/development.md +++ b/docs/development.md @@ -185,7 +185,7 @@ api 层的公开接口规则: | `API_KEY_ACCOUNTS` | 每项以最后一个 `:` 分成 API key 与账户,账户以 `\|` 分隔、去重 | | `REQUEST_TIMEOUT`、`QUOTA_REFRESH_INTERVAL` | Go 时长,例如 `30s`、`5m`;`QUOTA_REFRESH_INTERVAL` 另接受 `0` | | 布尔项(`NONSTREAM_KEEPALIVE`、`FAKE_STREAM`、`WEEKLY_QUOTA_WARMUP`、`LOG_FILE`、`REQUEST_LOG_BODIES`、`ADMIN_AUTH_ENABLED`) | Go `strconv.ParseBool`,见表下 | -| 整数项(`ACCOUNT_CONCURRENCY`、`QUOTA_RESERVE_PERCENT`、`LOG_MAX_TOTAL_MB`) | 十进制整数,其他值报错 | +| 整数项(`ACCOUNT_CONCURRENCY`、`QUOTA_RESERVE_PERCENT`、`CONVERSATION_REWIND_DEPTH`、`LOG_MAX_TOTAL_MB`) | 十进制整数,其他值报错 | | `MEDIA_OUTPUT`、`FIRST_EVENT_HEDGE`、`LOG_LEVEL`、`LOG_FORMAT` | 去掉首尾空白后转小写 | | 其他文本项 | 去掉首尾空白,大小写敏感 | @@ -212,6 +212,7 @@ api 层的公开接口规则: | `FIRST_EVENT_HEDGE` | `off`、`auto` 或正整数秒 | | `QUOTA_REFRESH_INTERVAL` | 0 或不小于 `1m` | | `QUOTA_RESERVE_PERCENT` | 0 到 99 | +| `CONVERSATION_REWIND_DEPTH` | 不小于 0 | | `LOG_LEVEL` | `debug`、`info`、`warn`、`error` | | `LOG_FORMAT` | `json`、`text` | | `LOG_MAX_TOTAL_MB` | 不小于 20 | @@ -396,6 +397,7 @@ api 层的公开接口规则: | `cascade`、`trajectory` | UUID 字符串 | 会话 ID 与轨迹 ID | | `length` | 整数 | 最近一次请求在摘要链中的位置 | | `digest` | 十六进制字符串 | 该位置的链摘要 | +| `chain` | 十六进制字符串数组,可省略 | 该位置之前的最后 `CONVERSATION_REWIND_DEPTH` 项链摘要,不含链首,为 0 时是链首之后的全部;供回退匹配 | | `answer` | 字符串,可省略 | 该次成功生成的回答指纹 | | `times` | 整数数组 | 各条消息首次出现的 Unix 秒 | | `prompt` | 对象,可省略 | 最近一次成功生成的提示规模 | @@ -413,7 +415,7 @@ api 层的公开接口规则: - `origins` 的键为签名 SHA-256 前 16 字节的小写十六进制,值为生成它的模型的 `modelProvider`(`MODEL_PROVIDER_GOOGLE`、`MODEL_PROVIDER_ANTHROPIC`、`MODEL_PROVIDER_OPENAI`) - 会话记录写入时先写同目录临时文件(`.conversation-*`)再替换;启动时删除写入中断留下的临时文件并读入全部记录,任一文件无法解析时服务启动失败 -- 写入时机:请求开始时(取得会话后、选择账户前)写 `length`、`digest`、`times` 与 `used`,`answer` 清空;`times` 先截到上一次的 `length` 再按当前时刻补齐本次多出的消息。生成正常结束后再写 `prompt`、`signatures`、`origins`,会话仍停在本次请求时写 `answer` +- 写入时机:请求开始时(取得会话后、选择账户前)写 `length`、`digest`、`chain`、`times` 与 `used`,`answer` 清空;`times` 先截到上一次的 `length`(回退时为与本次相同的消息条数)再按当前时刻补齐本次多出的消息。生成正常结束后再写 `prompt`、`signatures`、`origins`,会话仍停在本次请求时写 `answer` - 失败或取消的请求只有请求开始时的写入;之后原样重发时按协议参考「会话 ID」第 3 步匹配回同一会话,沿用已写的 `times` - 摘要链:`digest(prev, data) = hex(SHA-256(prev + data))`,`prev` 为上一项的小写十六进制文本;`d0 = digest("", {"Session":<分区>,"System":<去掉计费行后的客户端系统提示>,"Tools":<规范工具>})`,`di = digest(d(i-1), 第 i 条规范消息的 JSON)` - 回答指纹:`digest("", 正文 + NUL + 调用)`。正文为各非思考 part 的 `text` 相连后按 Go `strings.Fields` 切分、以单个空格相连;调用为各函数调用的“函数名 + 参数 JSON”以 NUL 相连,参数 JSON 先解析再编码,对象键按字典序 @@ -1018,7 +1020,7 @@ api 层的公开接口规则: | 服务 `service` | `LISTEN`、`AUTH_DIR`、`RUNTIME_DIR`、API key(链接到接入页)、`MEDIA_OUTPUT`、`MEDIA_BASE_URL` | | 网络 `network` | `PROXY`(每行一个)与代理池状态 | | 系统提示 `prompt` | `SYSTEM_PROMPT`、原文预览、`SYSTEM_PROMPT_TEMPLATE`、`SYSTEM_PROMPT_USER_TEMPLATE` | -| 调度 `scheduling` | `ROUTING_STRATEGY`、`PREFER_LOWER_TIER_MODELS`、`ACCOUNT_CONCURRENCY`、`REQUEST_TIMEOUT`、`FIRST_EVENT_HEDGE`、`FIRST_EVENT_HEDGE_MODELS`、`NONSTREAM_KEEPALIVE`、`FAKE_STREAM`、`QUOTA_REFRESH_INTERVAL`、`QUOTA_RESERVE_PERCENT`、`WEEKLY_QUOTA_WARMUP` | +| 调度 `scheduling` | `ROUTING_STRATEGY`、`PREFER_LOWER_TIER_MODELS`、`ACCOUNT_CONCURRENCY`、`REQUEST_TIMEOUT`、`FIRST_EVENT_HEDGE`、`FIRST_EVENT_HEDGE_MODELS`、`NONSTREAM_KEEPALIVE`、`FAKE_STREAM`、`QUOTA_REFRESH_INTERVAL`、`QUOTA_RESERVE_PERCENT`、`WEEKLY_QUOTA_WARMUP`、`CONVERSATION_REWIND_DEPTH` | | 日志 `logging` | `LOG_LEVEL`、`LOG_FORMAT`、`LOG_FILE`、`LOG_MAX_TOTAL_MB`、`REQUEST_LOG_BODIES` | | 远程访问 `remote` | `ADMIN_AUTH_ENABLED`、`ADMIN_USERNAME`、`ADMIN_PASSWORD`(已设置时输入框为空并显示占位) | | 关于 `about` | 版本与在线更新、宿主、监听地址、API 地址、启动时间、模拟的客户端版本与官方最新版本、许可证、主页、发行页 | @@ -1027,6 +1029,7 @@ api 层的公开接口规则: | --- | --- | --- | | `ACCOUNT_CONCURRENCY` | 1–64 | 正整数 | | `QUOTA_RESERVE_PERCENT` | 0–99 | 0–99 的整数 | +| `CONVERSATION_REWIND_DEPTH` | 0–100 | 不小于 0 的整数 | | `LOG_MAX_TOTAL_MB` | 20–100000 | 不小于 20 的整数 | - 内置三档的说明带模板规模:全保留档为官方段数与模板字符数,中等与激进档为模板字符数,字符数取整到百位,取自 `GET /api/prompt/templates` @@ -1624,7 +1627,7 @@ go vet ./... | `balancer` | 按目录选账户、最久未选中者轮换、等待槽位、冷却、会话粘连、排除账户、目录合并 | | `app` | 远程管理需要登录、验证链接、代理脱敏 | | `requestdb` | 记录查询与详情、正文保留条数、过期清理、汇总与记录一致、日志查询、结果判定、上游错误读取、费用 | -| `service` | 流中错误原样返回、客户端取消后排空上游 | +| `service` | 流中错误原样返回、客户端取消后排空上游、原样重发与多出几条消息的续接归入原会话、改写已发消息与回退仍用原会话、第一条消息不同的请求新建会话、只有一条消息的请求成功后原样重发新建会话、回退匹配在保留条数边界上的行为 | | `sqlitedb` | 打开已有库时保留记录、删除建表语句中没有的表与索引、转为增量收缩并交还空闲页 | | `api` | 空消息过滤、Gemini 输出 part 与签名、`inlineData` 兼容、API key 匹配 | diff --git a/docs/protocol.md b/docs/protocol.md index 78b8906..1c50508 100644 --- a/docs/protocol.md +++ b/docs/protocol.md @@ -1352,9 +1352,10 @@ accept-encoding: gzip 1. 分区:API key 与客户端会话标识(Anthropic `metadata.user_id`,OpenAI 的 `session_id`、`conversation_id` 请求头、`prompt_cache_key` 与 `user`)中首个去掉首尾空白后非空者以 NUL 字符相连;没有客户端标识时为 API key 加 NUL 字符。Anthropic `metadata.user_id` 是带 `session_id` 的 JSON 时取 `session_id`,以 `_session_<十六进制与连字符>` 结尾时取该段,否则取原值;Gemini 与 Interactions 没有客户端标识 2. 摘要链:第 0 项为分区、客户端系统提示与工具声明的 SHA-256,第 i 项为第 i-1 项与第 i 条规范消息 JSON 的 SHA-256;公式与 JSON 编码见 [开发文档的运行目录](development.md#运行目录) -3. 匹配:会话记录保存上一次请求的链位置 L 与该处摘要;本次链的第 L 项等于该摘要,且满足下列之一时为同一会话:L 小于本次的消息条数;会话还没有成功生成过;最近一次成功生成的消息条数小于 L。取 L 最大者;并列时先取上一轮回答指纹与本次该位置的 assistant 消息一致者,再取最近使用者。回答指纹的算法同见运行目录 - - 因此请求失败后原样重发时匹配同一会话;成功后原样重发时新建会话 -4. 都不匹配时新建会话;编辑早期消息后链从该处分叉,得到新会话 +3. 匹配:会话记录保存上一次请求的链位置 L 与该处摘要;本次链的第 L 项等于该摘要时为同一会话,本次只有一条消息且会话已成功回答过这条消息时除外。取 L 最大者;并列时先取上一轮回答指纹与本次该位置的 assistant 消息一致者,再取最近使用者。回答指纹的算法同见运行目录 + - 因此请求原样重发时匹配同一会话;只有一条消息的请求成功后原样重发时新建会话 +4. 都不匹配且本次多于一条消息时按回退处理:会话记录还保存链位置 L 之前最后 `CONVERSATION_REWIND_DEPTH` 项的链摘要(默认 3,0 为链首之后的全部),本次在其中某个位置与之相同时,取相同位置最靠后的会话(并列时取最近使用者),退回到该位置继续使用,之前的消息沿用原来的时间。回退或改写的消息不超过保留条数时仍是原会话,超过时不匹配 +5. 仍没有时新建会话 序号为 `E` 的用户请求的执行 ID 为 `uuidOf("execution:" + cascade_id + ":" + E)`,`E` 以十进制写入,首个用户请求为 `:0`;`last_execution_id` 取序号 `E-1` 的执行 ID。`uuidOf(s)` 取 `SHA-256(s)` 前 16 字节,按 UUIDv4 设置版本与变体位后写成 `8-4-4-4-12` 形式。`requestId` 的时间段每次请求取当前毫秒。会话记录空闲 24 小时后删除。 @@ -2666,7 +2667,7 @@ Chat 与 Anthropic 的 Markdown 图片地址由 `MEDIA_OUTPUT` 决定:`inline` - Gemini `candidateCount` 为 0 与省略时都为 1;超出范围时返回 400 - 流式时各候选的事件按到达顺序交错写出,带各自的 `index` - 每个候选是一次完整的生成,各自选择账户并发出上游请求;候选同时开始,按「会话 ID」的规则共用一个会话: - - 新会话时第一个取得会话的候选新建会话,只有它发 ACL、标题请求与新会话事件;其余候选按第 3 步“链位置相同但尚未成功生成”匹配到这个会话 + - 新会话时第一个取得会话的候选新建会话,只有它发 ACL、标题请求与新会话事件;其余候选按第 3 步链位置相同匹配到这个会话 - 每个成功的候选都写入会话记录:回答指纹与上游用量取最后完成的候选,各候选的思考签名合并保存 - 客户端以任一候选的回答续写都匹配这个会话 - 一个公开请求只记一条账本记录:`response_id` 为响应 ID,`attempts` 含全部候选的上游尝试,`account` 为最后一次分配的账户 diff --git a/internal/config/config.go b/internal/config/config.go index fc74847..bb6c894 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -47,6 +47,7 @@ var Keys = []string{ "QUOTA_REFRESH_INTERVAL", "QUOTA_RESERVE_PERCENT", "WEEKLY_QUOTA_WARMUP", + "CONVERSATION_REWIND_DEPTH", "LOG_LEVEL", "LOG_FORMAT", "LOG_FILE", @@ -131,6 +132,8 @@ type Config struct { QuotaReservePercent int // WeeklyQuotaWarmup 为真时在定时额度刷新后为周额度窗口未开始计时的账户发一次最小请求 WeeklyQuotaWarmup bool + // ConversationRewindDepth 是会话记录为回退匹配保留的链摘要条数,即最多能认出回退几条消息,为 0 时全部保留 + ConversationRewindDepth int // Invalid 是加载时取值无效、改用默认值的配置项 Invalid []InvalidValue // Environment 是取自进程环境变量、覆盖 .env 的配置项 @@ -164,6 +167,7 @@ func Default() Config { FirstEventHedgeModels: []string{"gemini-4-argon"}, NonstreamKeepalive: true, QuotaRefreshInterval: 15 * time.Minute, + ConversationRewindDepth: 3, LogLevel: "info", LogFormat: "json", LogFile: true, @@ -282,6 +286,7 @@ func (c *Config) Set(values map[string]string) error { duration("QUOTA_REFRESH_INTERVAL", &c.QuotaRefreshInterval) integer("QUOTA_RESERVE_PERCENT", &c.QuotaReservePercent) boolean("WEEKLY_QUOTA_WARMUP", &c.WeeklyQuotaWarmup) + integer("CONVERSATION_REWIND_DEPTH", &c.ConversationRewindDepth) text("LOG_LEVEL", &c.LogLevel) c.LogLevel = strings.ToLower(c.LogLevel) text("LOG_FORMAT", &c.LogFormat) @@ -323,6 +328,7 @@ func (c Config) Values() map[string]string { "QUOTA_REFRESH_INTERVAL": formatDuration(c.QuotaRefreshInterval), "QUOTA_RESERVE_PERCENT": strconv.Itoa(c.QuotaReservePercent), "WEEKLY_QUOTA_WARMUP": strconv.FormatBool(c.WeeklyQuotaWarmup), + "CONVERSATION_REWIND_DEPTH": strconv.Itoa(c.ConversationRewindDepth), "LOG_LEVEL": c.LogLevel, "LOG_FORMAT": c.LogFormat, "LOG_FILE": strconv.FormatBool(c.LogFile), @@ -448,6 +454,12 @@ var checks = []struct { } return nil }}, + {[]string{"CONVERSATION_REWIND_DEPTH"}, func(c Config) error { + if c.ConversationRewindDepth < 0 { + return fmt.Errorf("CONVERSATION_REWIND_DEPTH 不能小于 0") + } + return nil + }}, {[]string{"LOG_LEVEL"}, func(c Config) error { if !slices.Contains(LogLevels, c.LogLevel) { return fmt.Errorf("LOG_LEVEL 必须是 %s", strings.Join(LogLevels, "、")) diff --git a/internal/i18n/messages/de.json b/internal/i18n/messages/de.json index c17f747..ef8fd61 100644 --- a/internal/i18n/messages/de.json +++ b/internal/i18n/messages/de.json @@ -17,6 +17,7 @@ "API_KEY_ACCOUNTS 中 API key 的账户不能为空": "Konten für einen API-Schlüssel in API_KEY_ACCOUNTS dürfen nicht leer sein", "API_KEY_ACCOUNTS 的每一项必须是 API key:账户|账户": "Jeder Eintrag in API_KEY_ACCOUNTS muss das Format API-Schlüssel:Konto|Konto haben", "AUTH_DIR 不能为空": "AUTH_DIR darf nicht leer sein", + "CONVERSATION_REWIND_DEPTH 不能小于 0": "CONVERSATION_REWIND_DEPTH darf nicht kleiner als 0 sein", "Docker 部署随镜像更新": "Docker-Bereitstellungen werden über das Image aktualisiert", "FIRST_EVENT_HEDGE 必须是 off、auto 或正整数秒": "FIRST_EVENT_HEDGE muss off, auto oder eine positive Ganzzahl in Sekunden sein", "LISTEN 必须是 host:port": "LISTEN muss im Format host:port sein", diff --git a/internal/i18n/messages/en.json b/internal/i18n/messages/en.json index bafe9ca..8597c69 100644 --- a/internal/i18n/messages/en.json +++ b/internal/i18n/messages/en.json @@ -17,6 +17,7 @@ "API_KEY_ACCOUNTS 中 API key 的账户不能为空": "accounts for an API key in API_KEY_ACCOUNTS cannot be empty", "API_KEY_ACCOUNTS 的每一项必须是 API key:账户|账户": "each entry in API_KEY_ACCOUNTS must be API key:account|account", "AUTH_DIR 不能为空": "AUTH_DIR cannot be empty", + "CONVERSATION_REWIND_DEPTH 不能小于 0": "CONVERSATION_REWIND_DEPTH cannot be less than 0", "Docker 部署随镜像更新": "Docker deployments update via the image", "FIRST_EVENT_HEDGE 必须是 off、auto 或正整数秒": "FIRST_EVENT_HEDGE must be off, auto, or a positive integer in seconds", "LISTEN 必须是 host:port": "LISTEN must be host:port", diff --git a/internal/i18n/messages/fr.json b/internal/i18n/messages/fr.json index f2096bd..4fe2e76 100644 --- a/internal/i18n/messages/fr.json +++ b/internal/i18n/messages/fr.json @@ -17,6 +17,7 @@ "API_KEY_ACCOUNTS 中 API key 的账户不能为空": "Les comptes d’une clé API dans API_KEY_ACCOUNTS ne peuvent pas être vides", "API_KEY_ACCOUNTS 的每一项必须是 API key:账户|账户": "Chaque entrée de API_KEY_ACCOUNTS doit être au format clé API:compte|compte", "AUTH_DIR 不能为空": "AUTH_DIR ne peut pas être vide", + "CONVERSATION_REWIND_DEPTH 不能小于 0": "CONVERSATION_REWIND_DEPTH ne peut pas être inférieur à 0", "Docker 部署随镜像更新": "Les déploiements Docker sont mis à jour via l’image", "FIRST_EVENT_HEDGE 必须是 off、auto 或正整数秒": "FIRST_EVENT_HEDGE doit être off, auto ou un nombre entier positif de secondes", "LISTEN 必须是 host:port": "LISTEN doit être au format host:port", diff --git a/internal/i18n/messages/ja.json b/internal/i18n/messages/ja.json index 39102e4..9ac8ac7 100644 --- a/internal/i18n/messages/ja.json +++ b/internal/i18n/messages/ja.json @@ -17,6 +17,7 @@ "API_KEY_ACCOUNTS 中 API key 的账户不能为空": "API_KEY_ACCOUNTS 内の API キーのアカウントは空にできません", "API_KEY_ACCOUNTS 的每一项必须是 API key:账户|账户": "API_KEY_ACCOUNTS の各項目は API キー:アカウント|アカウント である必要があります", "AUTH_DIR 不能为空": "AUTH_DIR は空にできません", + "CONVERSATION_REWIND_DEPTH 不能小于 0": "CONVERSATION_REWIND_DEPTH は 0 未満にできません", "Docker 部署随镜像更新": "Docker デプロイはイメージとともに更新されます", "FIRST_EVENT_HEDGE 必须是 off、auto 或正整数秒": "FIRST_EVENT_HEDGE は off、auto、または正の整数秒である必要があります", "LISTEN 必须是 host:port": "LISTEN は host:port である必要があります", diff --git a/internal/i18n/messages/ko.json b/internal/i18n/messages/ko.json index 4e373cb..71d5826 100644 --- a/internal/i18n/messages/ko.json +++ b/internal/i18n/messages/ko.json @@ -17,6 +17,7 @@ "API_KEY_ACCOUNTS 中 API key 的账户不能为空": "API_KEY_ACCOUNTS에서 API 키의 계정은 비워 둘 수 없습니다", "API_KEY_ACCOUNTS 的每一项必须是 API key:账户|账户": "API_KEY_ACCOUNTS의 각 항목은 API 키:계정|계정이어야 합니다", "AUTH_DIR 不能为空": "AUTH_DIR은 비워 둘 수 없습니다", + "CONVERSATION_REWIND_DEPTH 不能小于 0": "CONVERSATION_REWIND_DEPTH는 0보다 작을 수 없습니다", "Docker 部署随镜像更新": "Docker 배포는 이미지를 통해 업데이트됩니다", "FIRST_EVENT_HEDGE 必须是 off、auto 或正整数秒": "FIRST_EVENT_HEDGE는 off, auto 또는 양의 정수(초)여야 합니다", "LISTEN 必须是 host:port": "LISTEN은 host:port여야 합니다", diff --git a/internal/i18n/messages/zh-TW.json b/internal/i18n/messages/zh-TW.json index e49c96e..b3431a2 100644 --- a/internal/i18n/messages/zh-TW.json +++ b/internal/i18n/messages/zh-TW.json @@ -17,6 +17,7 @@ "API_KEY_ACCOUNTS 中 API key 的账户不能为空": "API_KEY_ACCOUNTS 中 API key 的帳號不能為空", "API_KEY_ACCOUNTS 的每一项必须是 API key:账户|账户": "API_KEY_ACCOUNTS 的每一項必須是 API key:帳號|帳號", "AUTH_DIR 不能为空": "AUTH_DIR 不能為空", + "CONVERSATION_REWIND_DEPTH 不能小于 0": "CONVERSATION_REWIND_DEPTH 不能小於 0", "Docker 部署随镜像更新": "Docker 部署隨映像檔更新", "FIRST_EVENT_HEDGE 必须是 off、auto 或正整数秒": "FIRST_EVENT_HEDGE 必須是 off、auto 或正整數秒", "LISTEN 必须是 host:port": "LISTEN 必須是 host:port", diff --git a/internal/service/conversation.go b/internal/service/conversation.go index cf42148..d077d1c 100644 --- a/internal/service/conversation.go +++ b/internal/service/conversation.go @@ -8,6 +8,7 @@ import ( "maps" "os" "path/filepath" + "sort" "strings" "sync" "time" @@ -23,12 +24,13 @@ const conversationTTL = 24 * time.Hour // conversationTemp 为写入会话文件时同目录临时文件的名称前缀 const conversationTemp = ".conversation-" -// conversation 表示一个客户端会话的 cascade 与 trajectory 标识、最近一次请求在摘要链中的位置与其成功生成的回答指纹、各条消息首次出现的 Unix 秒、最近一次成功生成的上游输入用量、各函数调用 ID 与各回答指纹的思考签名、各签名摘要对应的模型族 +// conversation 表示一个客户端会话的 cascade 与 trajectory 标识、最近一次请求在摘要链中的位置、该位置之前供回退匹配的最后若干项链摘要与其成功生成的回答指纹、各条消息首次出现的 Unix 秒、最近一次成功生成的上游输入用量、各函数调用 ID 与各回答指纹的思考签名、各签名摘要对应的模型族 type conversation struct { Cascade string `json:"cascade"` Trajectory string `json:"trajectory"` Length int `json:"length"` Digest string `json:"digest"` + Chain []string `json:"chain,omitempty"` Answer string `json:"answer,omitempty"` Times []int64 `json:"times"` Prompt *promptUsage `json:"prompt,omitempty"` @@ -47,12 +49,13 @@ type promptUsage struct { Tokens int64 `json:"tokens"` } -// conversations 在内存与 dir 下每个会话一个 JSON 文件中保存会话记录 +// conversations 在内存与 dir 下每个会话一个 JSON 文件中保存会话记录,keep 为每条记录为回退匹配保留的链摘要条数,0 为全部保留 type conversations struct { dir string mu sync.Mutex items map[string]*conversation now func() time.Time + keep int } // openConversations 读取 dir 下未过期的会话记录并删除写入中断留下的临时文件,目录不存在时创建 @@ -143,15 +146,18 @@ func digest(previous string, data []byte) string { return hex.EncodeToString(hash.Sum(nil)) } -// begin 为生成请求取得会话:先找最近一次请求是本次严格前缀的会话,其次找本次与之相同但尚未成功生成的会话,都没有时新建;记下本次的链位置与新消息的时间并落盘,返回会话副本,新建时副本的 New 为真 +// begin 为生成请求取得会话:找最近一次请求是本次前缀或与本次相同的会话,本次只有一条消息时不取已成功生成过这条消息的会话;没有且本次多于一条消息时由 rewind 取回退的会话,仍没有时新建;记下本次的摘要链与新消息的时间并落盘,返回会话副本,新建时副本的 New 为真 func (c *conversations) begin(digests, answers []string) (conversation, error) { c.mu.Lock() defer c.mu.Unlock() now := c.now() length := len(digests) - 1 item := c.match(digests, answers, func(item *conversation) bool { - return item.Length < length || item.Prompt == nil || item.Prompt.Length < item.Length + return length > 1 || item.Length < length || item.Prompt == nil || item.Prompt.Length < item.Length }) + if item == nil && length > 1 { + item = c.rewind(digests) + } created := item == nil if created { item = &conversation{Cascade: uuid.NewString(), Trajectory: uuid.NewString()} @@ -161,13 +167,50 @@ func (c *conversations) begin(digests, answers []string) (conversation, error) { for len(times) < length { times = append(times, now.Unix()) } - item.Length, item.Digest, item.Answer, item.Times, item.Used = length, digests[length], "", times, now + item.Length, item.Digest, item.Chain, item.Answer, item.Times, item.Used = length, digests[length], c.tail(digests), "", times, now c.sweep() snapshot := c.snapshot(item) snapshot.New = created return snapshot, c.save(item) } +// retain 设置每条会话记录为回退匹配保留的链摘要条数,0 为全部保留,下一次请求写入记录时生效 +func (c *conversations) retain(keep int) { + c.mu.Lock() + defer c.mu.Unlock() + c.keep = keep +} + +// tail 返回摘要链中链位置之前的最后 keep 项的副本,不含链首;keep 为 0 时取链首之后的全部,链位置之前没有消息时为空 +func (c *conversations) tail(digests []string) []string { + length := len(digests) - 1 + from := 1 + if c.keep > 0 { + from = max(length-c.keep, 1) + } + if from >= length { + return nil + } + return append([]string(nil), digests[from:length]...) +} + +// rewind 取回退的会话:会话保留的链摘要从 start 处起,本次在这些位置上与之相同的项数用二分查找(链摘要逐项累积,某项相同则之前各项都相同),取相同处最靠后的会话,把它的链位置退回到该处并返回;并列时取最近使用者。本次比 start 短或在 start 处已不同时该会话不算,都不算时返回 nil +func (c *conversations) rewind(digests []string) *conversation { + var best *conversation + kept := 0 + for _, item := range c.items { + start := item.Length - len(item.Chain) + count := sort.Search(max(min(len(item.Chain), len(digests)-start), 0), func(i int) bool { return item.Chain[i] != digests[start+i] }) + if shared := start + count - 1; count > 0 && (shared > kept || shared == kept && item.Used.After(best.Used)) { + best, kept = item, shared + } + } + if best != nil { + best.Length, best.Digest = kept, digests[kept] + } + return best +} + // find 返回链位置是本次前缀的会话副本,供计数使用且不改动记录 func (c *conversations) find(digests, answers []string) (conversation, bool) { c.mu.Lock() diff --git a/internal/service/generate_test.go b/internal/service/generate_test.go index c5d1fec..a3c5c0d 100644 --- a/internal/service/generate_test.go +++ b/internal/service/generate_test.go @@ -3,6 +3,7 @@ package service import ( "context" "net/http" + "slices" "testing" "time" @@ -56,3 +57,116 @@ func TestForwardDrainsUpstreamAfterCancel(t *testing.T) { t.Fatal("客户端取消后上游没有被排空") } } + +// TestBeginKeepsConversationOfIdenticalRequest 验证成功后原样重发的请求归入原会话并沿用各消息的时间,之后一次多出几条消息的请求仍续接这个会话,改写已发消息与回退到早先消息的请求仍用原会话并沿用相同消息的时间,第一条消息不同的请求新建会话 +func TestBeginKeepsConversationOfIdenticalRequest(t *testing.T) { + records, err := openConversations(t.TempDir()) + if err != nil { + t.Fatal(err) + } + clock := time.Unix(1700000000, 0) + records.now = func() time.Time { return clock } + digests, answers := []string{"head", "first", "second", "third"}, []string{"", "reply", ""} + first, err := records.begin(digests, answers) + if err != nil || !first.New { + t.Fatalf("首次请求返回 %v,New 为 %v,期望新建会话", err, first.New) + } + if err := records.record(first.Cascade, digests, "answer", "model", 1, 10, signatureRecord{}); err != nil { + t.Fatal(err) + } + clock = clock.Add(4 * time.Minute) + again, err := records.begin(digests, answers) + if err != nil || again.New || again.Cascade != first.Cascade || again.Trajectory != first.Trajectory || !slices.Equal(again.Times, first.Times) { + t.Fatalf("原样重发返回 %v,会话 %s 时间 %v,期望原会话 %s 时间 %v", err, again.Cascade, again.Times, first.Cascade, first.Times) + } + next, err := records.begin([]string{"head", "first", "second", "third", "fourth", "fifth"}, []string{"", "reply", "", "answer", ""}) + if err != nil || next.New || next.Cascade != first.Cascade || next.Times[0] != first.Times[0] { + t.Fatalf("续接请求返回 %v,会话 %s 时间 %v,期望原会话 %s 且首条时间不变", err, next.Cascade, next.Times, first.Cascade) + } + clock = clock.Add(time.Minute) + edited, err := records.begin([]string{"head", "first", "second", "third", "fourth", "changed", "sixth", "seventh"}, []string{"", "reply", "", "answer", "", "", ""}) + if err != nil || edited.New || edited.Cascade != first.Cascade || !slices.Equal(edited.Times[:4], next.Times[:4]) || edited.Times[4] != clock.Unix() { + t.Fatalf("改写已发消息的请求返回 %v,会话 %s 时间 %v,期望原会话 %s、前 4 条时间不变、其后为当前时间", err, edited.Cascade, edited.Times, first.Cascade) + } + back, err := records.begin([]string{"head", "first", "second"}, []string{"", "reply"}) + if err != nil || back.New || back.Cascade != first.Cascade || !slices.Equal(back.Times, first.Times[:2]) { + t.Fatalf("回退的请求返回 %v,会话 %s 时间 %v,期望原会话 %s 与前 2 条的时间", err, back.Cascade, back.Times, first.Cascade) + } + other, err := records.begin([]string{"head", "another", "more"}, []string{"", ""}) + if err != nil || !other.New { + t.Fatalf("第一条消息不同的请求返回 %v,New 为 %v,期望新建会话", err, other.New) + } +} + +// TestBeginStartsConversationForRepeatedFirstMessage 验证只有一条消息的请求成功后原样重发时新建会话 +func TestBeginStartsConversationForRepeatedFirstMessage(t *testing.T) { + records, err := openConversations(t.TempDir()) + if err != nil { + t.Fatal(err) + } + digests := []string{"head", "first"} + first, err := records.begin(digests, []string{""}) + if err != nil { + t.Fatal(err) + } + if err := records.record(first.Cascade, digests, "answer", "model", 1, 10, signatureRecord{}); err != nil { + t.Fatal(err) + } + again, err := records.begin(digests, []string{""}) + if err != nil || !again.New || again.Cascade == first.Cascade { + t.Fatalf("原样重发返回 %v,会话 %s,New 为 %v,期望新建会话", err, again.Cascade, again.New) + } +} + +// TestRewindWithinKeptDigests 验证会话记录只保留链位置之前最后几项链摘要时,回退不超过保留条数的请求仍用原会话,超过的与短于保留范围的新建会话;保留条数为 0 或多于已有消息时保留链首之后的全部 +func TestRewindWithinKeptDigests(t *testing.T) { + records, err := openConversations(t.TempDir()) + if err != nil { + t.Fatal(err) + } + base := []string{"head", "m1", "m2", "m3", "m4", "m5", "m6"} + for _, test := range []struct { + name string + keep int + request []string + stored int + same bool + }{ + {"回退一条", 3, []string{"head", "m1", "m2", "m3", "m4", "m5", "x", "y"}, 3, true}, + {"回退条数等于保留条数", 3, []string{"head", "m1", "m2", "m3", "x"}, 3, true}, + {"回退条数超过保留条数", 3, []string{"head", "m1", "m2", "x", "y"}, 3, false}, + {"截短到保留范围内", 3, []string{"head", "m1", "m2", "m3"}, 3, true}, + {"截短到保留范围之前", 3, []string{"head", "m1", "m2"}, 3, false}, + {"只保留一条时回退一条", 1, []string{"head", "m1", "m2", "m3", "m4", "m5", "x"}, 1, true}, + {"只保留一条时回退两条", 1, []string{"head", "m1", "m2", "m3", "m4", "x"}, 1, false}, + {"不限制", 0, []string{"head", "m1", "x"}, 5, true}, + {"保留条数多于已有消息", 10, []string{"head", "m1", "x"}, 5, true}, + } { + // 各用例的消息摘要带用例名,在同一个目录中互不匹配 + mark := func(digests []string) []string { + marked := []string{digests[0]} + for _, digest := range digests[1:] { + marked = append(marked, test.name+digest) + } + return marked + } + records.retain(test.keep) + first, err := records.begin(mark(base), make([]string, len(base)-1)) + if err != nil { + t.Fatal(err) + } + if stored := len(records.items[first.Cascade].Chain); stored != test.stored { + t.Fatalf("%s:记录保留了 %d 项链摘要,期望 %d 项", test.name, stored, test.stored) + } + next, err := records.begin(mark(test.request), make([]string, len(test.request)-1)) + if err != nil || (next.Cascade == first.Cascade) != test.same || next.New == test.same { + t.Fatalf("%s:返回 %v,会话 %s,New 为 %v,原会话 %s,期望沿用原会话为 %v", test.name, err, next.Cascade, next.New, first.Cascade, test.same) + } + } + records = &conversations{keep: 3} + for length, stored := range []int{0, 0, 1, 2, 3, 3} { + if kept := len(records.tail(make([]string, length+1))); kept != stored { + t.Fatalf("%d 条消息的请求保留了 %d 项链摘要,期望 %d 项", length, kept, stored) + } + } +} diff --git a/internal/service/service.go b/internal/service/service.go index e8fe02b..aed8714 100644 --- a/internal/service/service.go +++ b/internal/service/service.go @@ -738,10 +738,11 @@ func (s *Service) RefreshQuotas(ctx context.Context) map[string]error { return failed } -// configure 把实时配置的单账户并发上限、调度策略与额度保留比例交给账户池 +// configure 把实时配置的单账户并发上限、调度策略与额度保留比例交给账户池,回退匹配保留的链摘要条数交给会话记录 func (s *Service) configure(cfg *config.Config) { s.pool.Configure(cfg.AccountConcurrency, cfg.RoutingStrategy == "fill-first") s.pool.Reserve(float64(cfg.QuotaReservePercent) / 100) + s.conversations.retain(cfg.ConversationRewindDepth) } // composer 返回实时配置档位对应的 Composer,档位或自定义档的模板变化时重建 diff --git a/web/src/features/settings/SettingsPage.tsx b/web/src/features/settings/SettingsPage.tsx index f088d5d..f670262 100644 --- a/web/src/features/settings/SettingsPage.tsx +++ b/web/src/features/settings/SettingsPage.tsx @@ -99,6 +99,7 @@ const fieldSection: Record = { QUOTA_REFRESH_INTERVAL: 'scheduling', QUOTA_RESERVE_PERCENT: 'scheduling', WEEKLY_QUOTA_WARMUP: 'scheduling', + CONVERSATION_REWIND_DEPTH: 'scheduling', LOG_LEVEL: 'logging', LOG_FORMAT: 'logging', LOG_FILE: 'logging', @@ -548,7 +549,11 @@ function SettingsEditor({ , ) const number = ( - key: 'ACCOUNT_CONCURRENCY' | 'LOG_MAX_TOTAL_MB' | 'QUOTA_RESERVE_PERCENT', + key: + | 'ACCOUNT_CONCURRENCY' + | 'LOG_MAX_TOTAL_MB' + | 'QUOTA_RESERVE_PERCENT' + | 'CONVERSATION_REWIND_DEPTH', label: string, hint: string, min: number, @@ -769,6 +774,7 @@ function SettingsEditor({ {duration('QUOTA_REFRESH_INTERVAL', m.quotaRefresh, m.quotaRefreshHint)} {number('QUOTA_RESERVE_PERCENT', m.quotaReserve, m.quotaReserveHint, 0, 99)} {toggle('WEEKLY_QUOTA_WARMUP', m.warmup, m.warmupHint)} + {number('CONVERSATION_REWIND_DEPTH', m.rewindDepth, m.rewindDepthHint, 0, 100)} Date: Thu, 19 Nov 2026 00:29:52 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E5=9B=9E=E9=80=80=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E4=BF=9D=E7=95=99=E4=BC=9A=E8=AF=9D=E7=9A=84=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E9=93=BE=E6=91=98=E8=A6=81=E5=B9=B6=E5=88=A0=E9=99=A4=E5=9B=9E?= =?UTF-8?q?=E9=80=80=E5=8C=B9=E9=85=8D=E6=9D=A1=E6=95=B0=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.example | 3 - README.md | 2 - README_en.md | 2 - docs/development.md | 12 +- docs/protocol.md | 4 +- internal/config/config.go | 12 -- internal/i18n/messages/de.json | 1 - internal/i18n/messages/en.json | 1 - internal/i18n/messages/fr.json | 1 - internal/i18n/messages/ja.json | 1 - internal/i18n/messages/ko.json | 1 - internal/i18n/messages/zh-TW.json | 1 - internal/service/conversation.go | 58 ++++----- internal/service/conversation_test.go | 137 +++++++++++++++++++++ internal/service/generate_test.go | 114 ----------------- internal/service/service.go | 3 +- web/src/features/settings/SettingsPage.tsx | 8 +- web/src/features/settings/schema.ts | 6 - web/src/locales/de.ts | 4 - web/src/locales/en.ts | 4 - web/src/locales/fr.ts | 4 - web/src/locales/ja.ts | 4 - web/src/locales/ko.ts | 4 - web/src/locales/zh-CN.ts | 4 - web/src/locales/zh-TW.ts | 4 - 25 files changed, 170 insertions(+), 225 deletions(-) create mode 100644 internal/service/conversation_test.go diff --git a/.env.example b/.env.example index db1c181..00f7bd7 100644 --- a/.env.example +++ b/.env.example @@ -60,9 +60,6 @@ QUOTA_RESERVE_PERCENT=0 # 每次自动刷新额度后,为每周额度窗口尚未开始计时的就绪账户发一条 Hi,开始本周计时;同一账户的每个额度组 6 天内最多一次 WEEKLY_QUOTA_WARMUP=false -# 会话记录为识别回退保留的消息摘要条数:客户端回退或改写最近这几条消息后再发请求时仍归入原会话,超出时新建会话;0 为不限制 -CONVERSATION_REWIND_DEPTH=3 - # 服务日志级别:debug、info、warn、error LOG_LEVEL=info diff --git a/README.md b/README.md index 7b90749..bd63e6a 100644 --- a/README.md +++ b/README.md @@ -324,7 +324,6 @@ docs/ # 协议、开发与日志文档 | `QUOTA_REFRESH_INTERVAL` | 后台读取全部账户(含停用账户)额度的间隔,最短 `1m`,`0` 为不自动刷新 | `15m` | | `QUOTA_RESERVE_PERCENT` | 额度保留比例,0–99 | `0` | | `WEEKLY_QUOTA_WARMUP` | 自动开始每周额度计时 | `false` | -| `CONVERSATION_REWIND_DEPTH` | 回退匹配条数,`0` 为不限制 | `3` | | `LOG_LEVEL` | 日志级别:`debug`、`info`、`warn`、`error` | `info` | | `LOG_FORMAT` | 日志格式:`json` 或 `text` | `json` | | `LOG_FILE` | 同时把日志写入 `RUNTIME_DIR/logs/`,单文件 10 MB 轮转 | `true` | @@ -338,7 +337,6 @@ docs/ # 协议、开发与日志文档 - `ROUTING_STRATEGY`:在优先级最高的账户中,`round-robin` 选进行中请求最少者,并列时选最近一次被选中最早的账户;`fill-first` 先用满一个账户 - `QUOTA_RESERVE_PERCENT`:账户某个额度组的 5 小时或每周剩余比例不高于此百分比时,调度跳过该组,直到该窗口重置;`0` 时只跳过已用尽的组 - `WEEKLY_QUOTA_WARMUP`:每次自动刷新额度后,为每周额度窗口尚未开始计时的就绪账户发一条 `Hi`,开始本周计时;同一账户的每个额度组 6 天内最多一次 -- `CONVERSATION_REWIND_DEPTH`:会话记录为识别回退保留的消息摘要条数;客户端回退或改写最近这几条消息后再发请求时仍归入原会话,超出时新建会话 - `REQUEST_LOG_BODIES`:保存公开请求与响应正文和成功请求的上游尝试正文,失败请求的上游尝试正文总是保存;各截断到 64 KiB,各保留最近 1000 条 进程环境变量覆盖 `.env` 中的同名项。 diff --git a/README_en.md b/README_en.md index 79307fe..522a50e 100644 --- a/README_en.md +++ b/README_en.md @@ -324,7 +324,6 @@ docs/ # protocol, development and logging docs | `QUOTA_REFRESH_INTERVAL` | Interval for reading the quota of every account, disabled ones included, in the background; minimum `1m`, `0` turns it off | `15m` | | `QUOTA_RESERVE_PERCENT` | Quota reserve, 0–99 | `0` | | `WEEKLY_QUOTA_WARMUP` | Start weekly quota timers automatically | `false` | -| `CONVERSATION_REWIND_DEPTH` | Rewind matching depth, `0` for no limit | `3` | | `LOG_LEVEL` | Log level: `debug`, `info`, `warn`, `error` | `info` | | `LOG_FORMAT` | Log format: `json` or `text` | `json` | | `LOG_FILE` | Also write logs to `RUNTIME_DIR/logs/`, rotating at 10 MB per file | `true` | @@ -338,7 +337,6 @@ docs/ # protocol, development and logging docs - `ROUTING_STRATEGY`: among the highest-priority accounts, `round-robin` picks the one with the fewest running requests and, on ties, the one picked least recently; `fill-first` fills one account first - `QUOTA_RESERVE_PERCENT`: when the 5-hour or weekly remaining share of an account quota group is at or below this percentage, the group is not scheduled until that window resets; with `0` only used-up groups are skipped - `WEEKLY_QUOTA_WARMUP`: after each automatic quota refresh, send `Hi` from every ready account whose weekly window has not started, so the weekly timer starts; at most once per account and quota group every 6 days -- `CONVERSATION_REWIND_DEPTH`: how many trailing message digests a conversation record keeps for recognizing a rewind; a request that rewinds or edits within the last that many messages stays in the same conversation, and beyond that a new conversation starts - `REQUEST_LOG_BODIES`: store public request and response bodies and the upstream attempt bodies of successful requests; upstream attempt bodies of failed requests are always stored; each is truncated to 64 KiB, keeping the latest 1000 of each Process environment variables override the same keys in `.env`. diff --git a/docs/development.md b/docs/development.md index 37997f8..ef3692a 100644 --- a/docs/development.md +++ b/docs/development.md @@ -185,7 +185,7 @@ api 层的公开接口规则: | `API_KEY_ACCOUNTS` | 每项以最后一个 `:` 分成 API key 与账户,账户以 `\|` 分隔、去重 | | `REQUEST_TIMEOUT`、`QUOTA_REFRESH_INTERVAL` | Go 时长,例如 `30s`、`5m`;`QUOTA_REFRESH_INTERVAL` 另接受 `0` | | 布尔项(`NONSTREAM_KEEPALIVE`、`FAKE_STREAM`、`WEEKLY_QUOTA_WARMUP`、`LOG_FILE`、`REQUEST_LOG_BODIES`、`ADMIN_AUTH_ENABLED`) | Go `strconv.ParseBool`,见表下 | -| 整数项(`ACCOUNT_CONCURRENCY`、`QUOTA_RESERVE_PERCENT`、`CONVERSATION_REWIND_DEPTH`、`LOG_MAX_TOTAL_MB`) | 十进制整数,其他值报错 | +| 整数项(`ACCOUNT_CONCURRENCY`、`QUOTA_RESERVE_PERCENT`、`LOG_MAX_TOTAL_MB`) | 十进制整数,其他值报错 | | `MEDIA_OUTPUT`、`FIRST_EVENT_HEDGE`、`LOG_LEVEL`、`LOG_FORMAT` | 去掉首尾空白后转小写 | | 其他文本项 | 去掉首尾空白,大小写敏感 | @@ -212,7 +212,6 @@ api 层的公开接口规则: | `FIRST_EVENT_HEDGE` | `off`、`auto` 或正整数秒 | | `QUOTA_REFRESH_INTERVAL` | 0 或不小于 `1m` | | `QUOTA_RESERVE_PERCENT` | 0 到 99 | -| `CONVERSATION_REWIND_DEPTH` | 不小于 0 | | `LOG_LEVEL` | `debug`、`info`、`warn`、`error` | | `LOG_FORMAT` | `json`、`text` | | `LOG_MAX_TOTAL_MB` | 不小于 20 | @@ -397,7 +396,7 @@ api 层的公开接口规则: | `cascade`、`trajectory` | UUID 字符串 | 会话 ID 与轨迹 ID | | `length` | 整数 | 最近一次请求在摘要链中的位置 | | `digest` | 十六进制字符串 | 该位置的链摘要 | -| `chain` | 十六进制字符串数组,可省略 | 该位置之前的最后 `CONVERSATION_REWIND_DEPTH` 项链摘要,不含链首,为 0 时是链首之后的全部;供回退匹配 | +| `chain` | 十六进制字符串数组,可省略 | 链首之后、该位置之前的全部链摘要,供回退匹配 | | `answer` | 字符串,可省略 | 该次成功生成的回答指纹 | | `times` | 整数数组 | 各条消息首次出现的 Unix 秒 | | `prompt` | 对象,可省略 | 最近一次成功生成的提示规模 | @@ -415,7 +414,7 @@ api 层的公开接口规则: - `origins` 的键为签名 SHA-256 前 16 字节的小写十六进制,值为生成它的模型的 `modelProvider`(`MODEL_PROVIDER_GOOGLE`、`MODEL_PROVIDER_ANTHROPIC`、`MODEL_PROVIDER_OPENAI`) - 会话记录写入时先写同目录临时文件(`.conversation-*`)再替换;启动时删除写入中断留下的临时文件并读入全部记录,任一文件无法解析时服务启动失败 -- 写入时机:请求开始时(取得会话后、选择账户前)写 `length`、`digest`、`chain`、`times` 与 `used`,`answer` 清空;`times` 先截到上一次的 `length`(回退时为与本次相同的消息条数)再按当前时刻补齐本次多出的消息。生成正常结束后再写 `prompt`、`signatures`、`origins`,会话仍停在本次请求时写 `answer` +- 写入时机:请求开始时(取得会话后、选择账户前)写 `length`、`digest`、`chain`、`times` 与 `used`,`answer` 清空;`times` 先截到上一次的 `length`(回退时为从第 1 条消息起与本次相同的消息条数)再按当前时刻补齐本次多出的消息。生成正常结束后再写 `prompt`、`signatures`、`origins`,会话仍停在本次请求时写 `answer` - 失败或取消的请求只有请求开始时的写入;之后原样重发时按协议参考「会话 ID」第 3 步匹配回同一会话,沿用已写的 `times` - 摘要链:`digest(prev, data) = hex(SHA-256(prev + data))`,`prev` 为上一项的小写十六进制文本;`d0 = digest("", {"Session":<分区>,"System":<去掉计费行后的客户端系统提示>,"Tools":<规范工具>})`,`di = digest(d(i-1), 第 i 条规范消息的 JSON)` - 回答指纹:`digest("", 正文 + NUL + 调用)`。正文为各非思考 part 的 `text` 相连后按 Go `strings.Fields` 切分、以单个空格相连;调用为各函数调用的“函数名 + 参数 JSON”以 NUL 相连,参数 JSON 先解析再编码,对象键按字典序 @@ -1020,7 +1019,7 @@ api 层的公开接口规则: | 服务 `service` | `LISTEN`、`AUTH_DIR`、`RUNTIME_DIR`、API key(链接到接入页)、`MEDIA_OUTPUT`、`MEDIA_BASE_URL` | | 网络 `network` | `PROXY`(每行一个)与代理池状态 | | 系统提示 `prompt` | `SYSTEM_PROMPT`、原文预览、`SYSTEM_PROMPT_TEMPLATE`、`SYSTEM_PROMPT_USER_TEMPLATE` | -| 调度 `scheduling` | `ROUTING_STRATEGY`、`PREFER_LOWER_TIER_MODELS`、`ACCOUNT_CONCURRENCY`、`REQUEST_TIMEOUT`、`FIRST_EVENT_HEDGE`、`FIRST_EVENT_HEDGE_MODELS`、`NONSTREAM_KEEPALIVE`、`FAKE_STREAM`、`QUOTA_REFRESH_INTERVAL`、`QUOTA_RESERVE_PERCENT`、`WEEKLY_QUOTA_WARMUP`、`CONVERSATION_REWIND_DEPTH` | +| 调度 `scheduling` | `ROUTING_STRATEGY`、`PREFER_LOWER_TIER_MODELS`、`ACCOUNT_CONCURRENCY`、`REQUEST_TIMEOUT`、`FIRST_EVENT_HEDGE`、`FIRST_EVENT_HEDGE_MODELS`、`NONSTREAM_KEEPALIVE`、`FAKE_STREAM`、`QUOTA_REFRESH_INTERVAL`、`QUOTA_RESERVE_PERCENT`、`WEEKLY_QUOTA_WARMUP` | | 日志 `logging` | `LOG_LEVEL`、`LOG_FORMAT`、`LOG_FILE`、`LOG_MAX_TOTAL_MB`、`REQUEST_LOG_BODIES` | | 远程访问 `remote` | `ADMIN_AUTH_ENABLED`、`ADMIN_USERNAME`、`ADMIN_PASSWORD`(已设置时输入框为空并显示占位) | | 关于 `about` | 版本与在线更新、宿主、监听地址、API 地址、启动时间、模拟的客户端版本与官方最新版本、许可证、主页、发行页 | @@ -1029,7 +1028,6 @@ api 层的公开接口规则: | --- | --- | --- | | `ACCOUNT_CONCURRENCY` | 1–64 | 正整数 | | `QUOTA_RESERVE_PERCENT` | 0–99 | 0–99 的整数 | -| `CONVERSATION_REWIND_DEPTH` | 0–100 | 不小于 0 的整数 | | `LOG_MAX_TOTAL_MB` | 20–100000 | 不小于 20 的整数 | - 内置三档的说明带模板规模:全保留档为官方段数与模板字符数,中等与激进档为模板字符数,字符数取整到百位,取自 `GET /api/prompt/templates` @@ -1627,7 +1625,7 @@ go vet ./... | `balancer` | 按目录选账户、最久未选中者轮换、等待槽位、冷却、会话粘连、排除账户、目录合并 | | `app` | 远程管理需要登录、验证链接、代理脱敏 | | `requestdb` | 记录查询与详情、正文保留条数、过期清理、汇总与记录一致、日志查询、结果判定、上游错误读取、费用 | -| `service` | 流中错误原样返回、客户端取消后排空上游、原样重发与多出几条消息的续接归入原会话、改写已发消息与回退仍用原会话、第一条消息不同的请求新建会话、只有一条消息的请求成功后原样重发新建会话、回退匹配在保留条数边界上的行为 | +| `service` | 流中错误原样返回、客户端取消后排空上游、原样重发与多出几条消息的续接归入原会话、改写已发消息与回退仍用原会话、第一条消息不同的请求新建会话、只有一条消息的请求成功后原样重发新建会话、回退到任意更早的消息仍用原会话、回退的相同部分更长时不被只含首条消息的会话取走 | | `sqlitedb` | 打开已有库时保留记录、删除建表语句中没有的表与索引、转为增量收缩并交还空闲页 | | `api` | 空消息过滤、Gemini 输出 part 与签名、`inlineData` 兼容、API key 匹配 | diff --git a/docs/protocol.md b/docs/protocol.md index 1c50508..74b34f1 100644 --- a/docs/protocol.md +++ b/docs/protocol.md @@ -1352,9 +1352,9 @@ accept-encoding: gzip 1. 分区:API key 与客户端会话标识(Anthropic `metadata.user_id`,OpenAI 的 `session_id`、`conversation_id` 请求头、`prompt_cache_key` 与 `user`)中首个去掉首尾空白后非空者以 NUL 字符相连;没有客户端标识时为 API key 加 NUL 字符。Anthropic `metadata.user_id` 是带 `session_id` 的 JSON 时取 `session_id`,以 `_session_<十六进制与连字符>` 结尾时取该段,否则取原值;Gemini 与 Interactions 没有客户端标识 2. 摘要链:第 0 项为分区、客户端系统提示与工具声明的 SHA-256,第 i 项为第 i-1 项与第 i 条规范消息 JSON 的 SHA-256;公式与 JSON 编码见 [开发文档的运行目录](development.md#运行目录) -3. 匹配:会话记录保存上一次请求的链位置 L 与该处摘要;本次链的第 L 项等于该摘要时为同一会话,本次只有一条消息且会话已成功回答过这条消息时除外。取 L 最大者;并列时先取上一轮回答指纹与本次该位置的 assistant 消息一致者,再取最近使用者。回答指纹的算法同见运行目录 +3. 匹配:会话记录保存上一次请求的链位置 L 与该处摘要;本次链的第 L 项等于该摘要时为同一会话,本次不多于一条消息且会话已成功生成过时除外。取 L 最大者;并列时先取上一轮回答指纹与本次该位置的 assistant 消息一致者,再取最近使用者。回答指纹的算法同见运行目录 - 因此请求原样重发时匹配同一会话;只有一条消息的请求成功后原样重发时新建会话 -4. 都不匹配且本次多于一条消息时按回退处理:会话记录还保存链位置 L 之前最后 `CONVERSATION_REWIND_DEPTH` 项的链摘要(默认 3,0 为链首之后的全部),本次在其中某个位置与之相同时,取相同位置最靠后的会话(并列时取最近使用者),退回到该位置继续使用,之前的消息沿用原来的时间。回退或改写的消息不超过保留条数时仍是原会话,超过时不匹配 +4. 本次多于一条消息时另按回退匹配:会话记录还保存链位置 L 之前的全部链摘要,取从第 1 条消息起与本次相同部分最长的会话(并列时取最近使用者),相同部分比第 3 步匹配到的 L 更长时改用该会话,退回到相同部分的末尾继续使用,之前的消息沿用原来的时间;客户端回退、改写或替换较早的消息后仍是原会话 5. 仍没有时新建会话 序号为 `E` 的用户请求的执行 ID 为 `uuidOf("execution:" + cascade_id + ":" + E)`,`E` 以十进制写入,首个用户请求为 `:0`;`last_execution_id` 取序号 `E-1` 的执行 ID。`uuidOf(s)` 取 `SHA-256(s)` 前 16 字节,按 UUIDv4 设置版本与变体位后写成 `8-4-4-4-12` 形式。`requestId` 的时间段每次请求取当前毫秒。会话记录空闲 24 小时后删除。 diff --git a/internal/config/config.go b/internal/config/config.go index bb6c894..fc74847 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -47,7 +47,6 @@ var Keys = []string{ "QUOTA_REFRESH_INTERVAL", "QUOTA_RESERVE_PERCENT", "WEEKLY_QUOTA_WARMUP", - "CONVERSATION_REWIND_DEPTH", "LOG_LEVEL", "LOG_FORMAT", "LOG_FILE", @@ -132,8 +131,6 @@ type Config struct { QuotaReservePercent int // WeeklyQuotaWarmup 为真时在定时额度刷新后为周额度窗口未开始计时的账户发一次最小请求 WeeklyQuotaWarmup bool - // ConversationRewindDepth 是会话记录为回退匹配保留的链摘要条数,即最多能认出回退几条消息,为 0 时全部保留 - ConversationRewindDepth int // Invalid 是加载时取值无效、改用默认值的配置项 Invalid []InvalidValue // Environment 是取自进程环境变量、覆盖 .env 的配置项 @@ -167,7 +164,6 @@ func Default() Config { FirstEventHedgeModels: []string{"gemini-4-argon"}, NonstreamKeepalive: true, QuotaRefreshInterval: 15 * time.Minute, - ConversationRewindDepth: 3, LogLevel: "info", LogFormat: "json", LogFile: true, @@ -286,7 +282,6 @@ func (c *Config) Set(values map[string]string) error { duration("QUOTA_REFRESH_INTERVAL", &c.QuotaRefreshInterval) integer("QUOTA_RESERVE_PERCENT", &c.QuotaReservePercent) boolean("WEEKLY_QUOTA_WARMUP", &c.WeeklyQuotaWarmup) - integer("CONVERSATION_REWIND_DEPTH", &c.ConversationRewindDepth) text("LOG_LEVEL", &c.LogLevel) c.LogLevel = strings.ToLower(c.LogLevel) text("LOG_FORMAT", &c.LogFormat) @@ -328,7 +323,6 @@ func (c Config) Values() map[string]string { "QUOTA_REFRESH_INTERVAL": formatDuration(c.QuotaRefreshInterval), "QUOTA_RESERVE_PERCENT": strconv.Itoa(c.QuotaReservePercent), "WEEKLY_QUOTA_WARMUP": strconv.FormatBool(c.WeeklyQuotaWarmup), - "CONVERSATION_REWIND_DEPTH": strconv.Itoa(c.ConversationRewindDepth), "LOG_LEVEL": c.LogLevel, "LOG_FORMAT": c.LogFormat, "LOG_FILE": strconv.FormatBool(c.LogFile), @@ -454,12 +448,6 @@ var checks = []struct { } return nil }}, - {[]string{"CONVERSATION_REWIND_DEPTH"}, func(c Config) error { - if c.ConversationRewindDepth < 0 { - return fmt.Errorf("CONVERSATION_REWIND_DEPTH 不能小于 0") - } - return nil - }}, {[]string{"LOG_LEVEL"}, func(c Config) error { if !slices.Contains(LogLevels, c.LogLevel) { return fmt.Errorf("LOG_LEVEL 必须是 %s", strings.Join(LogLevels, "、")) diff --git a/internal/i18n/messages/de.json b/internal/i18n/messages/de.json index ef8fd61..c17f747 100644 --- a/internal/i18n/messages/de.json +++ b/internal/i18n/messages/de.json @@ -17,7 +17,6 @@ "API_KEY_ACCOUNTS 中 API key 的账户不能为空": "Konten für einen API-Schlüssel in API_KEY_ACCOUNTS dürfen nicht leer sein", "API_KEY_ACCOUNTS 的每一项必须是 API key:账户|账户": "Jeder Eintrag in API_KEY_ACCOUNTS muss das Format API-Schlüssel:Konto|Konto haben", "AUTH_DIR 不能为空": "AUTH_DIR darf nicht leer sein", - "CONVERSATION_REWIND_DEPTH 不能小于 0": "CONVERSATION_REWIND_DEPTH darf nicht kleiner als 0 sein", "Docker 部署随镜像更新": "Docker-Bereitstellungen werden über das Image aktualisiert", "FIRST_EVENT_HEDGE 必须是 off、auto 或正整数秒": "FIRST_EVENT_HEDGE muss off, auto oder eine positive Ganzzahl in Sekunden sein", "LISTEN 必须是 host:port": "LISTEN muss im Format host:port sein", diff --git a/internal/i18n/messages/en.json b/internal/i18n/messages/en.json index 8597c69..bafe9ca 100644 --- a/internal/i18n/messages/en.json +++ b/internal/i18n/messages/en.json @@ -17,7 +17,6 @@ "API_KEY_ACCOUNTS 中 API key 的账户不能为空": "accounts for an API key in API_KEY_ACCOUNTS cannot be empty", "API_KEY_ACCOUNTS 的每一项必须是 API key:账户|账户": "each entry in API_KEY_ACCOUNTS must be API key:account|account", "AUTH_DIR 不能为空": "AUTH_DIR cannot be empty", - "CONVERSATION_REWIND_DEPTH 不能小于 0": "CONVERSATION_REWIND_DEPTH cannot be less than 0", "Docker 部署随镜像更新": "Docker deployments update via the image", "FIRST_EVENT_HEDGE 必须是 off、auto 或正整数秒": "FIRST_EVENT_HEDGE must be off, auto, or a positive integer in seconds", "LISTEN 必须是 host:port": "LISTEN must be host:port", diff --git a/internal/i18n/messages/fr.json b/internal/i18n/messages/fr.json index 4fe2e76..f2096bd 100644 --- a/internal/i18n/messages/fr.json +++ b/internal/i18n/messages/fr.json @@ -17,7 +17,6 @@ "API_KEY_ACCOUNTS 中 API key 的账户不能为空": "Les comptes d’une clé API dans API_KEY_ACCOUNTS ne peuvent pas être vides", "API_KEY_ACCOUNTS 的每一项必须是 API key:账户|账户": "Chaque entrée de API_KEY_ACCOUNTS doit être au format clé API:compte|compte", "AUTH_DIR 不能为空": "AUTH_DIR ne peut pas être vide", - "CONVERSATION_REWIND_DEPTH 不能小于 0": "CONVERSATION_REWIND_DEPTH ne peut pas être inférieur à 0", "Docker 部署随镜像更新": "Les déploiements Docker sont mis à jour via l’image", "FIRST_EVENT_HEDGE 必须是 off、auto 或正整数秒": "FIRST_EVENT_HEDGE doit être off, auto ou un nombre entier positif de secondes", "LISTEN 必须是 host:port": "LISTEN doit être au format host:port", diff --git a/internal/i18n/messages/ja.json b/internal/i18n/messages/ja.json index 9ac8ac7..39102e4 100644 --- a/internal/i18n/messages/ja.json +++ b/internal/i18n/messages/ja.json @@ -17,7 +17,6 @@ "API_KEY_ACCOUNTS 中 API key 的账户不能为空": "API_KEY_ACCOUNTS 内の API キーのアカウントは空にできません", "API_KEY_ACCOUNTS 的每一项必须是 API key:账户|账户": "API_KEY_ACCOUNTS の各項目は API キー:アカウント|アカウント である必要があります", "AUTH_DIR 不能为空": "AUTH_DIR は空にできません", - "CONVERSATION_REWIND_DEPTH 不能小于 0": "CONVERSATION_REWIND_DEPTH は 0 未満にできません", "Docker 部署随镜像更新": "Docker デプロイはイメージとともに更新されます", "FIRST_EVENT_HEDGE 必须是 off、auto 或正整数秒": "FIRST_EVENT_HEDGE は off、auto、または正の整数秒である必要があります", "LISTEN 必须是 host:port": "LISTEN は host:port である必要があります", diff --git a/internal/i18n/messages/ko.json b/internal/i18n/messages/ko.json index 71d5826..4e373cb 100644 --- a/internal/i18n/messages/ko.json +++ b/internal/i18n/messages/ko.json @@ -17,7 +17,6 @@ "API_KEY_ACCOUNTS 中 API key 的账户不能为空": "API_KEY_ACCOUNTS에서 API 키의 계정은 비워 둘 수 없습니다", "API_KEY_ACCOUNTS 的每一项必须是 API key:账户|账户": "API_KEY_ACCOUNTS의 각 항목은 API 키:계정|계정이어야 합니다", "AUTH_DIR 不能为空": "AUTH_DIR은 비워 둘 수 없습니다", - "CONVERSATION_REWIND_DEPTH 不能小于 0": "CONVERSATION_REWIND_DEPTH는 0보다 작을 수 없습니다", "Docker 部署随镜像更新": "Docker 배포는 이미지를 통해 업데이트됩니다", "FIRST_EVENT_HEDGE 必须是 off、auto 或正整数秒": "FIRST_EVENT_HEDGE는 off, auto 또는 양의 정수(초)여야 합니다", "LISTEN 必须是 host:port": "LISTEN은 host:port여야 합니다", diff --git a/internal/i18n/messages/zh-TW.json b/internal/i18n/messages/zh-TW.json index b3431a2..e49c96e 100644 --- a/internal/i18n/messages/zh-TW.json +++ b/internal/i18n/messages/zh-TW.json @@ -17,7 +17,6 @@ "API_KEY_ACCOUNTS 中 API key 的账户不能为空": "API_KEY_ACCOUNTS 中 API key 的帳號不能為空", "API_KEY_ACCOUNTS 的每一项必须是 API key:账户|账户": "API_KEY_ACCOUNTS 的每一項必須是 API key:帳號|帳號", "AUTH_DIR 不能为空": "AUTH_DIR 不能為空", - "CONVERSATION_REWIND_DEPTH 不能小于 0": "CONVERSATION_REWIND_DEPTH 不能小於 0", "Docker 部署随镜像更新": "Docker 部署隨映像檔更新", "FIRST_EVENT_HEDGE 必须是 off、auto 或正整数秒": "FIRST_EVENT_HEDGE 必須是 off、auto 或正整數秒", "LISTEN 必须是 host:port": "LISTEN 必須是 host:port", diff --git a/internal/service/conversation.go b/internal/service/conversation.go index d077d1c..426e507 100644 --- a/internal/service/conversation.go +++ b/internal/service/conversation.go @@ -8,6 +8,7 @@ import ( "maps" "os" "path/filepath" + "slices" "sort" "strings" "sync" @@ -24,7 +25,7 @@ const conversationTTL = 24 * time.Hour // conversationTemp 为写入会话文件时同目录临时文件的名称前缀 const conversationTemp = ".conversation-" -// conversation 表示一个客户端会话的 cascade 与 trajectory 标识、最近一次请求在摘要链中的位置、该位置之前供回退匹配的最后若干项链摘要与其成功生成的回答指纹、各条消息首次出现的 Unix 秒、最近一次成功生成的上游输入用量、各函数调用 ID 与各回答指纹的思考签名、各签名摘要对应的模型族 +// conversation 表示一个客户端会话的 cascade 与 trajectory 标识、最近一次请求在摘要链中的位置与该处的链摘要、该次请求成功生成的回答指纹、该位置之前供回退匹配的链摘要、各条消息首次出现的 Unix 秒、最近一次成功生成的上游输入用量、各函数调用 ID 与各回答指纹的思考签名、各签名摘要对应的模型族 type conversation struct { Cascade string `json:"cascade"` Trajectory string `json:"trajectory"` @@ -49,13 +50,12 @@ type promptUsage struct { Tokens int64 `json:"tokens"` } -// conversations 在内存与 dir 下每个会话一个 JSON 文件中保存会话记录,keep 为每条记录为回退匹配保留的链摘要条数,0 为全部保留 +// conversations 在内存与 dir 下每个会话一个 JSON 文件中保存会话记录 type conversations struct { dir string mu sync.Mutex items map[string]*conversation now func() time.Time - keep int } // openConversations 读取 dir 下未过期的会话记录并删除写入中断留下的临时文件,目录不存在时创建 @@ -146,7 +146,7 @@ func digest(previous string, data []byte) string { return hex.EncodeToString(hash.Sum(nil)) } -// begin 为生成请求取得会话:找最近一次请求是本次前缀或与本次相同的会话,本次只有一条消息时不取已成功生成过这条消息的会话;没有且本次多于一条消息时由 rewind 取回退的会话,仍没有时新建;记下本次的摘要链与新消息的时间并落盘,返回会话副本,新建时副本的 New 为真 +// begin 为生成请求取得会话:找最近一次请求是本次前缀或与本次相同的会话,本次不多于一条消息时不取已成功生成过的会话;本次多于一条消息时另由 rewind 取回退的会话,相同部分更长时改用它;都没有时新建;记下本次的摘要链与新消息的时间并落盘,返回会话副本,新建时副本的 New 为真 func (c *conversations) begin(digests, answers []string) (conversation, error) { c.mu.Lock() defer c.mu.Unlock() @@ -155,60 +155,50 @@ func (c *conversations) begin(digests, answers []string) (conversation, error) { item := c.match(digests, answers, func(item *conversation) bool { return length > 1 || item.Length < length || item.Prompt == nil || item.Prompt.Length < item.Length }) - if item == nil && length > 1 { - item = c.rewind(digests) + shared := 0 + if item != nil { + shared = item.Length + } + if length > 1 { + if back, kept := c.rewind(digests); kept > shared { + item, shared = back, kept + } } created := item == nil if created { item = &conversation{Cascade: uuid.NewString(), Trajectory: uuid.NewString()} c.items[item.Cascade] = item } - times := item.Times[:min(item.Length, len(item.Times))] + times := item.Times[:min(shared, len(item.Times))] for len(times) < length { times = append(times, now.Unix()) } - item.Length, item.Digest, item.Chain, item.Answer, item.Times, item.Used = length, digests[length], c.tail(digests), "", times, now + item.Length, item.Digest, item.Chain, item.Answer, item.Times, item.Used = length, digests[length], history(digests), "", times, now c.sweep() snapshot := c.snapshot(item) snapshot.New = created return snapshot, c.save(item) } -// retain 设置每条会话记录为回退匹配保留的链摘要条数,0 为全部保留,下一次请求写入记录时生效 -func (c *conversations) retain(keep int) { - c.mu.Lock() - defer c.mu.Unlock() - c.keep = keep -} - -// tail 返回摘要链中链位置之前的最后 keep 项的副本,不含链首;keep 为 0 时取链首之后的全部,链位置之前没有消息时为空 -func (c *conversations) tail(digests []string) []string { - length := len(digests) - 1 - from := 1 - if c.keep > 0 { - from = max(length-c.keep, 1) - } - if from >= length { +// history 返回摘要链中链首之后、链位置之前各项的副本,链位置之前没有消息时为空 +func history(digests []string) []string { + if len(digests) <= 2 { return nil } - return append([]string(nil), digests[from:length]...) + return slices.Clone(digests[1 : len(digests)-1]) } -// rewind 取回退的会话:会话保留的链摘要从 start 处起,本次在这些位置上与之相同的项数用二分查找(链摘要逐项累积,某项相同则之前各项都相同),取相同处最靠后的会话,把它的链位置退回到该处并返回;并列时取最近使用者。本次比 start 短或在 start 处已不同时该会话不算,都不算时返回 nil -func (c *conversations) rewind(digests []string) *conversation { +// rewind 返回从第 1 条消息起与本次相同条数最多的会话与相同条数:条数按会话保留的链摘要二分查找(链摘要逐项累积,某项相同则之前各项都相同),并列时取最近使用者;第 1 条消息就不同的会话不算,都不算时返回 nil 与 0 +func (c *conversations) rewind(digests []string) (*conversation, int) { var best *conversation kept := 0 for _, item := range c.items { - start := item.Length - len(item.Chain) - count := sort.Search(max(min(len(item.Chain), len(digests)-start), 0), func(i int) bool { return item.Chain[i] != digests[start+i] }) - if shared := start + count - 1; count > 0 && (shared > kept || shared == kept && item.Used.After(best.Used)) { - best, kept = item, shared + count := sort.Search(min(len(item.Chain), len(digests)-1), func(i int) bool { return item.Chain[i] != digests[i+1] }) + if count > kept || count > 0 && count == kept && item.Used.After(best.Used) { + best, kept = item, count } } - if best != nil { - best.Length, best.Digest = kept, digests[kept] - } - return best + return best, kept } // find 返回链位置是本次前缀的会话副本,供计数使用且不改动记录 diff --git a/internal/service/conversation_test.go b/internal/service/conversation_test.go new file mode 100644 index 0000000..1915b3d --- /dev/null +++ b/internal/service/conversation_test.go @@ -0,0 +1,137 @@ +package service + +import ( + "slices" + "testing" + "time" +) + +// TestBeginKeepsConversationOfIdenticalRequest 验证成功后原样重发的请求归入原会话并沿用各消息的时间,之后一次多出几条消息的请求仍续接这个会话,改写已发消息与回退到早先消息的请求仍用原会话并沿用相同消息的时间,第一条消息不同的请求新建会话 +func TestBeginKeepsConversationOfIdenticalRequest(t *testing.T) { + records, err := openConversations(t.TempDir()) + if err != nil { + t.Fatal(err) + } + clock := time.Unix(1700000000, 0) + records.now = func() time.Time { return clock } + digests, answers := []string{"head", "first", "second", "third"}, []string{"", "reply", ""} + first, err := records.begin(digests, answers) + if err != nil || !first.New { + t.Fatalf("首次请求返回 %v,New 为 %v,期望新建会话", err, first.New) + } + if err := records.record(first.Cascade, digests, "answer", "model", 1, 10, signatureRecord{}); err != nil { + t.Fatal(err) + } + clock = clock.Add(4 * time.Minute) + again, err := records.begin(digests, answers) + if err != nil || again.New || again.Cascade != first.Cascade || again.Trajectory != first.Trajectory || !slices.Equal(again.Times, first.Times) { + t.Fatalf("原样重发返回 %v,会话 %s 时间 %v,期望原会话 %s 时间 %v", err, again.Cascade, again.Times, first.Cascade, first.Times) + } + next, err := records.begin([]string{"head", "first", "second", "third", "fourth", "fifth"}, []string{"", "reply", "", "answer", ""}) + if err != nil || next.New || next.Cascade != first.Cascade || next.Times[0] != first.Times[0] { + t.Fatalf("续接请求返回 %v,会话 %s 时间 %v,期望原会话 %s 且首条时间不变", err, next.Cascade, next.Times, first.Cascade) + } + clock = clock.Add(time.Minute) + edited, err := records.begin([]string{"head", "first", "second", "third", "fourth", "changed", "sixth", "seventh"}, []string{"", "reply", "", "answer", "", "", ""}) + if err != nil || edited.New || edited.Cascade != first.Cascade || !slices.Equal(edited.Times[:4], next.Times[:4]) || edited.Times[4] != clock.Unix() { + t.Fatalf("改写已发消息的请求返回 %v,会话 %s 时间 %v,期望原会话 %s、前 4 条时间不变、其后为当前时间", err, edited.Cascade, edited.Times, first.Cascade) + } + back, err := records.begin([]string{"head", "first", "second"}, []string{"", "reply"}) + if err != nil || back.New || back.Cascade != first.Cascade || !slices.Equal(back.Times, first.Times[:2]) { + t.Fatalf("回退的请求返回 %v,会话 %s 时间 %v,期望原会话 %s 与前 2 条的时间", err, back.Cascade, back.Times, first.Cascade) + } + other, err := records.begin([]string{"head", "another", "more"}, []string{"", ""}) + if err != nil || !other.New { + t.Fatalf("第一条消息不同的请求返回 %v,New 为 %v,期望新建会话", err, other.New) + } +} + +// TestBeginStartsConversationForRepeatedFirstMessage 验证只有一条消息的请求成功后原样重发时新建会话 +func TestBeginStartsConversationForRepeatedFirstMessage(t *testing.T) { + records, err := openConversations(t.TempDir()) + if err != nil { + t.Fatal(err) + } + digests := []string{"head", "first"} + first, err := records.begin(digests, []string{""}) + if err != nil { + t.Fatal(err) + } + if err := records.record(first.Cascade, digests, "answer", "model", 1, 10, signatureRecord{}); err != nil { + t.Fatal(err) + } + again, err := records.begin(digests, []string{""}) + if err != nil || !again.New || again.Cascade == first.Cascade { + t.Fatalf("原样重发返回 %v,会话 %s,New 为 %v,期望新建会话", err, again.Cascade, again.New) + } +} + +// TestRewindToEarlierMessage 验证从任意更早的消息处回退、改写或截短的请求仍用原会话,第一条消息不同的请求新建会话 +func TestRewindToEarlierMessage(t *testing.T) { + records, err := openConversations(t.TempDir()) + if err != nil { + t.Fatal(err) + } + base := []string{"head", "m1", "m2", "m3", "m4", "m5", "m6"} + for _, test := range []struct { + name string + request []string + same bool + }{ + {"回退一条", []string{"head", "m1", "m2", "m3", "m4", "m5", "x", "y"}, true}, + {"改写第二条后保留其后的消息", []string{"head", "m1", "x", "m3", "m4", "m5", "m6", "y"}, true}, + {"截短到第二条", []string{"head", "m1", "m2"}, true}, + {"第一条不同", []string{"head", "x", "m2", "m3"}, false}, + } { + // 各用例的消息摘要带用例名,在同一个目录中互不匹配 + mark := func(digests []string) []string { + marked := []string{digests[0]} + for index := range digests[1:] { + marked = append(marked, digest(marked[index], []byte(test.name+digests[index+1]))) + } + return marked + } + first, err := records.begin(mark(base), make([]string, len(base)-1)) + if err != nil { + t.Fatal(err) + } + next, err := records.begin(mark(test.request), make([]string, len(test.request)-1)) + if err != nil || (next.Cascade == first.Cascade) != test.same || next.New == test.same { + t.Fatalf("%s:返回 %v,会话 %s,New 为 %v,原会话 %s,期望沿用原会话为 %v", test.name, err, next.Cascade, next.New, first.Cascade, test.same) + } + } +} + +// TestRewindPrefersLongerSharedConversation 验证另有一个只含相同首条消息的会话时,改写长会话最后一条消息的请求仍回到长会话,并沿用长会话中相同消息的时间 +func TestRewindPrefersLongerSharedConversation(t *testing.T) { + records, err := openConversations(t.TempDir()) + if err != nil { + t.Fatal(err) + } + clock := time.Unix(1700000000, 0) + records.now = func() time.Time { return clock } + chained := func(messages ...string) []string { + digests := []string{"head"} + for index, message := range messages { + digests = append(digests, digest(digests[index], []byte(message))) + } + return digests + } + long, err := records.begin(chained("first", "reply", "second"), make([]string, 3)) + if err != nil { + t.Fatal(err) + } + if err := records.record(long.Cascade, chained("first", "reply", "second"), "answer", "model", 3, 10, signatureRecord{}); err != nil { + t.Fatal(err) + } + clock = clock.Add(time.Minute) + short, err := records.begin(chained("first"), make([]string, 1)) + if err != nil || !short.New { + t.Fatalf("以相同首条消息新开的请求返回 %v,New 为 %v,期望新建会话", err, short.New) + } + clock = clock.Add(time.Minute) + edited, err := records.begin(chained("first", "reply", "changed"), make([]string, 3)) + if err != nil || edited.Cascade != long.Cascade || !slices.Equal(edited.Times[:2], long.Times[:2]) || edited.Times[2] != clock.Unix() { + t.Fatalf("改写长会话最后一条的请求返回 %v,会话 %s 时间 %v,期望长会话 %s、前 2 条时间 %v、第 3 条为当前时间", err, edited.Cascade, edited.Times, long.Cascade, long.Times[:2]) + } +} diff --git a/internal/service/generate_test.go b/internal/service/generate_test.go index a3c5c0d..c5d1fec 100644 --- a/internal/service/generate_test.go +++ b/internal/service/generate_test.go @@ -3,7 +3,6 @@ package service import ( "context" "net/http" - "slices" "testing" "time" @@ -57,116 +56,3 @@ func TestForwardDrainsUpstreamAfterCancel(t *testing.T) { t.Fatal("客户端取消后上游没有被排空") } } - -// TestBeginKeepsConversationOfIdenticalRequest 验证成功后原样重发的请求归入原会话并沿用各消息的时间,之后一次多出几条消息的请求仍续接这个会话,改写已发消息与回退到早先消息的请求仍用原会话并沿用相同消息的时间,第一条消息不同的请求新建会话 -func TestBeginKeepsConversationOfIdenticalRequest(t *testing.T) { - records, err := openConversations(t.TempDir()) - if err != nil { - t.Fatal(err) - } - clock := time.Unix(1700000000, 0) - records.now = func() time.Time { return clock } - digests, answers := []string{"head", "first", "second", "third"}, []string{"", "reply", ""} - first, err := records.begin(digests, answers) - if err != nil || !first.New { - t.Fatalf("首次请求返回 %v,New 为 %v,期望新建会话", err, first.New) - } - if err := records.record(first.Cascade, digests, "answer", "model", 1, 10, signatureRecord{}); err != nil { - t.Fatal(err) - } - clock = clock.Add(4 * time.Minute) - again, err := records.begin(digests, answers) - if err != nil || again.New || again.Cascade != first.Cascade || again.Trajectory != first.Trajectory || !slices.Equal(again.Times, first.Times) { - t.Fatalf("原样重发返回 %v,会话 %s 时间 %v,期望原会话 %s 时间 %v", err, again.Cascade, again.Times, first.Cascade, first.Times) - } - next, err := records.begin([]string{"head", "first", "second", "third", "fourth", "fifth"}, []string{"", "reply", "", "answer", ""}) - if err != nil || next.New || next.Cascade != first.Cascade || next.Times[0] != first.Times[0] { - t.Fatalf("续接请求返回 %v,会话 %s 时间 %v,期望原会话 %s 且首条时间不变", err, next.Cascade, next.Times, first.Cascade) - } - clock = clock.Add(time.Minute) - edited, err := records.begin([]string{"head", "first", "second", "third", "fourth", "changed", "sixth", "seventh"}, []string{"", "reply", "", "answer", "", "", ""}) - if err != nil || edited.New || edited.Cascade != first.Cascade || !slices.Equal(edited.Times[:4], next.Times[:4]) || edited.Times[4] != clock.Unix() { - t.Fatalf("改写已发消息的请求返回 %v,会话 %s 时间 %v,期望原会话 %s、前 4 条时间不变、其后为当前时间", err, edited.Cascade, edited.Times, first.Cascade) - } - back, err := records.begin([]string{"head", "first", "second"}, []string{"", "reply"}) - if err != nil || back.New || back.Cascade != first.Cascade || !slices.Equal(back.Times, first.Times[:2]) { - t.Fatalf("回退的请求返回 %v,会话 %s 时间 %v,期望原会话 %s 与前 2 条的时间", err, back.Cascade, back.Times, first.Cascade) - } - other, err := records.begin([]string{"head", "another", "more"}, []string{"", ""}) - if err != nil || !other.New { - t.Fatalf("第一条消息不同的请求返回 %v,New 为 %v,期望新建会话", err, other.New) - } -} - -// TestBeginStartsConversationForRepeatedFirstMessage 验证只有一条消息的请求成功后原样重发时新建会话 -func TestBeginStartsConversationForRepeatedFirstMessage(t *testing.T) { - records, err := openConversations(t.TempDir()) - if err != nil { - t.Fatal(err) - } - digests := []string{"head", "first"} - first, err := records.begin(digests, []string{""}) - if err != nil { - t.Fatal(err) - } - if err := records.record(first.Cascade, digests, "answer", "model", 1, 10, signatureRecord{}); err != nil { - t.Fatal(err) - } - again, err := records.begin(digests, []string{""}) - if err != nil || !again.New || again.Cascade == first.Cascade { - t.Fatalf("原样重发返回 %v,会话 %s,New 为 %v,期望新建会话", err, again.Cascade, again.New) - } -} - -// TestRewindWithinKeptDigests 验证会话记录只保留链位置之前最后几项链摘要时,回退不超过保留条数的请求仍用原会话,超过的与短于保留范围的新建会话;保留条数为 0 或多于已有消息时保留链首之后的全部 -func TestRewindWithinKeptDigests(t *testing.T) { - records, err := openConversations(t.TempDir()) - if err != nil { - t.Fatal(err) - } - base := []string{"head", "m1", "m2", "m3", "m4", "m5", "m6"} - for _, test := range []struct { - name string - keep int - request []string - stored int - same bool - }{ - {"回退一条", 3, []string{"head", "m1", "m2", "m3", "m4", "m5", "x", "y"}, 3, true}, - {"回退条数等于保留条数", 3, []string{"head", "m1", "m2", "m3", "x"}, 3, true}, - {"回退条数超过保留条数", 3, []string{"head", "m1", "m2", "x", "y"}, 3, false}, - {"截短到保留范围内", 3, []string{"head", "m1", "m2", "m3"}, 3, true}, - {"截短到保留范围之前", 3, []string{"head", "m1", "m2"}, 3, false}, - {"只保留一条时回退一条", 1, []string{"head", "m1", "m2", "m3", "m4", "m5", "x"}, 1, true}, - {"只保留一条时回退两条", 1, []string{"head", "m1", "m2", "m3", "m4", "x"}, 1, false}, - {"不限制", 0, []string{"head", "m1", "x"}, 5, true}, - {"保留条数多于已有消息", 10, []string{"head", "m1", "x"}, 5, true}, - } { - // 各用例的消息摘要带用例名,在同一个目录中互不匹配 - mark := func(digests []string) []string { - marked := []string{digests[0]} - for _, digest := range digests[1:] { - marked = append(marked, test.name+digest) - } - return marked - } - records.retain(test.keep) - first, err := records.begin(mark(base), make([]string, len(base)-1)) - if err != nil { - t.Fatal(err) - } - if stored := len(records.items[first.Cascade].Chain); stored != test.stored { - t.Fatalf("%s:记录保留了 %d 项链摘要,期望 %d 项", test.name, stored, test.stored) - } - next, err := records.begin(mark(test.request), make([]string, len(test.request)-1)) - if err != nil || (next.Cascade == first.Cascade) != test.same || next.New == test.same { - t.Fatalf("%s:返回 %v,会话 %s,New 为 %v,原会话 %s,期望沿用原会话为 %v", test.name, err, next.Cascade, next.New, first.Cascade, test.same) - } - } - records = &conversations{keep: 3} - for length, stored := range []int{0, 0, 1, 2, 3, 3} { - if kept := len(records.tail(make([]string, length+1))); kept != stored { - t.Fatalf("%d 条消息的请求保留了 %d 项链摘要,期望 %d 项", length, kept, stored) - } - } -} diff --git a/internal/service/service.go b/internal/service/service.go index aed8714..e8fe02b 100644 --- a/internal/service/service.go +++ b/internal/service/service.go @@ -738,11 +738,10 @@ func (s *Service) RefreshQuotas(ctx context.Context) map[string]error { return failed } -// configure 把实时配置的单账户并发上限、调度策略与额度保留比例交给账户池,回退匹配保留的链摘要条数交给会话记录 +// configure 把实时配置的单账户并发上限、调度策略与额度保留比例交给账户池 func (s *Service) configure(cfg *config.Config) { s.pool.Configure(cfg.AccountConcurrency, cfg.RoutingStrategy == "fill-first") s.pool.Reserve(float64(cfg.QuotaReservePercent) / 100) - s.conversations.retain(cfg.ConversationRewindDepth) } // composer 返回实时配置档位对应的 Composer,档位或自定义档的模板变化时重建 diff --git a/web/src/features/settings/SettingsPage.tsx b/web/src/features/settings/SettingsPage.tsx index f670262..f088d5d 100644 --- a/web/src/features/settings/SettingsPage.tsx +++ b/web/src/features/settings/SettingsPage.tsx @@ -99,7 +99,6 @@ const fieldSection: Record = { QUOTA_REFRESH_INTERVAL: 'scheduling', QUOTA_RESERVE_PERCENT: 'scheduling', WEEKLY_QUOTA_WARMUP: 'scheduling', - CONVERSATION_REWIND_DEPTH: 'scheduling', LOG_LEVEL: 'logging', LOG_FORMAT: 'logging', LOG_FILE: 'logging', @@ -549,11 +548,7 @@ function SettingsEditor({ , ) const number = ( - key: - | 'ACCOUNT_CONCURRENCY' - | 'LOG_MAX_TOTAL_MB' - | 'QUOTA_RESERVE_PERCENT' - | 'CONVERSATION_REWIND_DEPTH', + key: 'ACCOUNT_CONCURRENCY' | 'LOG_MAX_TOTAL_MB' | 'QUOTA_RESERVE_PERCENT', label: string, hint: string, min: number, @@ -774,7 +769,6 @@ function SettingsEditor({ {duration('QUOTA_REFRESH_INTERVAL', m.quotaRefresh, m.quotaRefreshHint)} {number('QUOTA_RESERVE_PERCENT', m.quotaReserve, m.quotaReserveHint, 0, 99)} {toggle('WEEKLY_QUOTA_WARMUP', m.warmup, m.warmupHint)} - {number('CONVERSATION_REWIND_DEPTH', m.rewindDepth, m.rewindDepthHint, 0, 100)}