fix(gateway): clamp chat.history to 1000 max
parent
d691e28675
commit
74b19843ae
|
|
@ -458,7 +458,7 @@ export const CronRunLogEntrySchema = Type.Object(
|
||||||
export const ChatHistoryParamsSchema = Type.Object(
|
export const ChatHistoryParamsSchema = Type.Object(
|
||||||
{
|
{
|
||||||
sessionKey: NonEmptyString,
|
sessionKey: NonEmptyString,
|
||||||
limit: Type.Optional(Type.Integer({ minimum: 1 })),
|
limit: Type.Optional(Type.Integer({ minimum: 1, maximum: 1000 })),
|
||||||
},
|
},
|
||||||
{ additionalProperties: false },
|
{ additionalProperties: false },
|
||||||
);
|
);
|
||||||
|
|
|
||||||
|
|
@ -1786,8 +1786,8 @@ describe("gateway server", () => {
|
||||||
);
|
);
|
||||||
expect(defaultRes.ok).toBe(true);
|
expect(defaultRes.ok).toBe(true);
|
||||||
const defaultMsgs = defaultRes.payload?.messages ?? [];
|
const defaultMsgs = defaultRes.payload?.messages ?? [];
|
||||||
expect(defaultMsgs.length).toBe(300);
|
expect(defaultMsgs.length).toBe(200);
|
||||||
expect(firstContentText(defaultMsgs[0])).toBe("m0");
|
expect(firstContentText(defaultMsgs[0])).toBe("m100");
|
||||||
|
|
||||||
const limitedRes = await rpcReq<{ messages?: unknown[] }>(
|
const limitedRes = await rpcReq<{ messages?: unknown[] }>(
|
||||||
ws,
|
ws,
|
||||||
|
|
@ -1829,21 +1829,21 @@ describe("gateway server", () => {
|
||||||
);
|
);
|
||||||
expect(cappedRes.ok).toBe(true);
|
expect(cappedRes.ok).toBe(true);
|
||||||
const cappedMsgs = cappedRes.payload?.messages ?? [];
|
const cappedMsgs = cappedRes.payload?.messages ?? [];
|
||||||
expect(cappedMsgs.length).toBe(1000);
|
expect(cappedMsgs.length).toBe(200);
|
||||||
expect(firstContentText(cappedMsgs[0])).toBe("b500");
|
expect(firstContentText(cappedMsgs[0])).toBe("b1300");
|
||||||
|
|
||||||
const overLimitRes = await rpcReq<{ messages?: unknown[] }>(
|
const maxRes = await rpcReq<{ messages?: unknown[] }>(
|
||||||
ws,
|
ws,
|
||||||
"chat.history",
|
"chat.history",
|
||||||
{
|
{
|
||||||
sessionKey: "main",
|
sessionKey: "main",
|
||||||
limit: 5000,
|
limit: 1000,
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
expect(overLimitRes.ok).toBe(true);
|
expect(maxRes.ok).toBe(true);
|
||||||
const overLimitMsgs = overLimitRes.payload?.messages ?? [];
|
const maxMsgs = maxRes.payload?.messages ?? [];
|
||||||
expect(overLimitMsgs.length).toBe(1000);
|
expect(maxMsgs.length).toBe(1000);
|
||||||
expect(firstContentText(overLimitMsgs[0])).toBe("b500");
|
expect(firstContentText(maxMsgs[0])).toBe("b500");
|
||||||
|
|
||||||
ws.close();
|
ws.close();
|
||||||
await server.close();
|
await server.close();
|
||||||
|
|
|
||||||
|
|
@ -1824,7 +1824,8 @@ export async function startGatewayServer(
|
||||||
? readSessionMessages(sessionId, storePath)
|
? readSessionMessages(sessionId, storePath)
|
||||||
: [];
|
: [];
|
||||||
const hardMax = 1000;
|
const hardMax = 1000;
|
||||||
const requested = typeof limit === "number" ? limit : hardMax;
|
const defaultLimit = 200;
|
||||||
|
const requested = typeof limit === "number" ? limit : defaultLimit;
|
||||||
const max = Math.min(hardMax, requested);
|
const max = Math.min(hardMax, requested);
|
||||||
const messages =
|
const messages =
|
||||||
rawMessages.length > max ? rawMessages.slice(-max) : rawMessages;
|
rawMessages.length > max ? rawMessages.slice(-max) : rawMessages;
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue