mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-07-12 07:36:42 +08:00
feat(core): support fork session without latestMessageId (#12587)
Close [AI-86](https://linear.app/affine-design/issue/AI-86) <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit - **New Features** - Improved chat session forking to allow creating a fork without specifying the latest message, enabling more flexible session management. - **Bug Fixes** - Forking a chat session with an invalid latest message ID now correctly returns an error. - **Tests** - Added and updated test cases to cover session forking with missing or invalid latest message IDs, ensuring robust behavior in these scenarios. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
This commit is contained in:
@@ -116,6 +116,38 @@ Generated by [AVA](https://avajs.dev).
|
||||
},
|
||||
]
|
||||
|
||||
> should generate the final message
|
||||
|
||||
[
|
||||
{
|
||||
content: 'hello world',
|
||||
params: {
|
||||
word: 'world',
|
||||
},
|
||||
role: 'system',
|
||||
},
|
||||
{
|
||||
content: 'hello',
|
||||
params: {},
|
||||
role: 'user',
|
||||
},
|
||||
{
|
||||
content: 'world',
|
||||
params: {},
|
||||
role: 'assistant',
|
||||
},
|
||||
{
|
||||
content: 'aaa',
|
||||
params: {},
|
||||
role: 'user',
|
||||
},
|
||||
{
|
||||
content: 'bbb',
|
||||
params: {},
|
||||
role: 'assistant',
|
||||
},
|
||||
]
|
||||
|
||||
## should revert message correctly
|
||||
|
||||
> should have three messages before revert
|
||||
|
||||
Binary file not shown.
@@ -281,7 +281,7 @@ test('should fork session correctly', async t => {
|
||||
const assertForkSession = async (
|
||||
workspaceId: string,
|
||||
sessionId: string,
|
||||
lastMessageId: string,
|
||||
lastMessageId: string | undefined,
|
||||
error: string,
|
||||
asserter = async (x: any) => {
|
||||
const forkedSessionId = await x;
|
||||
@@ -330,6 +330,27 @@ test('should fork session correctly', async t => {
|
||||
);
|
||||
}
|
||||
|
||||
// should be able to fork session without latestMessageId (copy all messages)
|
||||
{
|
||||
forkedSessionId = await assertForkSession(
|
||||
id,
|
||||
sessionId,
|
||||
undefined,
|
||||
'should be able to fork session without latestMessageId'
|
||||
);
|
||||
}
|
||||
|
||||
// should not be able to fork session with wrong latestMessageId
|
||||
{
|
||||
await assertForkSession(id, sessionId, 'wrong-message-id', '', async x => {
|
||||
await t.throwsAsync(
|
||||
x,
|
||||
{ instanceOf: Error },
|
||||
'should not able to fork session with wrong latestMessageId'
|
||||
);
|
||||
});
|
||||
}
|
||||
|
||||
{
|
||||
const u2 = await app.signupV1('u2@affine.pro');
|
||||
await assertForkSession(id, sessionId, randomUUID(), '', async x => {
|
||||
|
||||
@@ -410,6 +410,27 @@ test('should be able to fork chat session', async t => {
|
||||
'should fork new session with same params'
|
||||
);
|
||||
|
||||
// fork session without latestMessageId
|
||||
const forkedSessionId3 = await session.fork({
|
||||
userId,
|
||||
sessionId,
|
||||
...commonParams,
|
||||
});
|
||||
|
||||
// fork session with wrong latestMessageId
|
||||
await t.throwsAsync(
|
||||
session.fork({
|
||||
userId,
|
||||
sessionId,
|
||||
latestMessageId: 'wrong-message-id',
|
||||
...commonParams,
|
||||
}),
|
||||
{
|
||||
instanceOf: Error,
|
||||
},
|
||||
'should not able to fork new session with wrong latestMessageId'
|
||||
);
|
||||
|
||||
const cleanObject = (obj: any[]) =>
|
||||
JSON.parse(
|
||||
JSON.stringify(obj, (k, v) =>
|
||||
@@ -436,11 +457,17 @@ test('should be able to fork chat session', async t => {
|
||||
t.snapshot(cleanObject(finalMessages), 'should generate the final message');
|
||||
}
|
||||
|
||||
// check third times forked session
|
||||
{
|
||||
const s3 = (await session.get(forkedSessionId3))!;
|
||||
const finalMessages = s3.finish(params);
|
||||
t.snapshot(cleanObject(finalMessages), 'should generate the final message');
|
||||
}
|
||||
|
||||
// check original session messages
|
||||
{
|
||||
const s3 = (await session.get(sessionId))!;
|
||||
|
||||
const finalMessages = s3.finish(params);
|
||||
const s4 = (await session.get(sessionId))!;
|
||||
const finalMessages = s4.finish(params);
|
||||
t.snapshot(cleanObject(finalMessages), 'should generate the final message');
|
||||
}
|
||||
|
||||
|
||||
@@ -57,7 +57,7 @@ export async function forkCopilotSession(
|
||||
workspaceId: string,
|
||||
docId: string,
|
||||
sessionId: string,
|
||||
latestMessageId: string
|
||||
latestMessageId?: string
|
||||
): Promise<string> {
|
||||
const res = await app.gql(
|
||||
`
|
||||
|
||||
@@ -91,8 +91,9 @@ class ForkChatSessionInput {
|
||||
@Field(() => String, {
|
||||
description:
|
||||
'Identify a message in the array and keep it with all previous messages into a forked session.',
|
||||
nullable: true,
|
||||
})
|
||||
latestMessageId!: string;
|
||||
latestMessageId?: string;
|
||||
}
|
||||
|
||||
@InputType()
|
||||
|
||||
@@ -673,16 +673,19 @@ export class ChatSessionService {
|
||||
if (!state) {
|
||||
throw new CopilotSessionNotFound();
|
||||
}
|
||||
const lastMessageIdx = state.messages.findLastIndex(
|
||||
({ id, role }) =>
|
||||
role === AiPromptRole.assistant && id === options.latestMessageId
|
||||
);
|
||||
if (lastMessageIdx < 0) {
|
||||
throw new CopilotMessageNotFound({ messageId: options.latestMessageId });
|
||||
let messages = state.messages.map(m => ({ ...m, id: undefined }));
|
||||
if (options.latestMessageId) {
|
||||
const lastMessageIdx = state.messages.findLastIndex(
|
||||
({ id, role }) =>
|
||||
role === AiPromptRole.assistant && id === options.latestMessageId
|
||||
);
|
||||
if (lastMessageIdx < 0) {
|
||||
throw new CopilotMessageNotFound({
|
||||
messageId: options.latestMessageId,
|
||||
});
|
||||
}
|
||||
messages = messages.slice(0, lastMessageIdx + 1);
|
||||
}
|
||||
const messages = state.messages
|
||||
.slice(0, lastMessageIdx + 1)
|
||||
.map(m => ({ ...m, id: undefined }));
|
||||
|
||||
const forkedState = {
|
||||
...state,
|
||||
|
||||
@@ -119,7 +119,7 @@ export interface ChatSessionPromptUpdateOptions
|
||||
export interface ChatSessionForkOptions
|
||||
extends Omit<ChatSessionOptions, 'promptName'> {
|
||||
sessionId: string;
|
||||
latestMessageId: string;
|
||||
latestMessageId?: string;
|
||||
}
|
||||
|
||||
export interface ChatSessionState
|
||||
|
||||
@@ -703,7 +703,7 @@ input ForkChatSessionInput {
|
||||
"""
|
||||
Identify a message in the array and keep it with all previous messages into a forked session.
|
||||
"""
|
||||
latestMessageId: String!
|
||||
latestMessageId: String
|
||||
sessionId: String!
|
||||
workspaceId: String!
|
||||
}
|
||||
|
||||
@@ -879,7 +879,7 @@ export enum FeatureType {
|
||||
export interface ForkChatSessionInput {
|
||||
docId: Scalars['String']['input'];
|
||||
/** Identify a message in the array and keep it with all previous messages into a forked session. */
|
||||
latestMessageId: Scalars['String']['input'];
|
||||
latestMessageId?: InputMaybe<Scalars['String']['input']>;
|
||||
sessionId: Scalars['String']['input'];
|
||||
workspaceId: Scalars['String']['input'];
|
||||
}
|
||||
|
||||
@@ -93,7 +93,7 @@ declare global {
|
||||
docId: string;
|
||||
workspaceId: string;
|
||||
sessionId: string;
|
||||
latestMessageId: string;
|
||||
latestMessageId?: string;
|
||||
}
|
||||
|
||||
interface AIImageActionOptions extends AITextActionOptions {
|
||||
|
||||
Reference in New Issue
Block a user