mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-02-12 12:28:42 +00:00
feat: allow sort and filter forked session (#7519)
This commit is contained in:
@@ -108,17 +108,33 @@ class CreateChatMessageInput implements Omit<SubmittedMessage, 'content'> {
|
||||
params!: Record<string, string> | undefined;
|
||||
}
|
||||
|
||||
enum ChatHistoryOrder {
|
||||
asc = 'asc',
|
||||
desc = 'desc',
|
||||
}
|
||||
|
||||
registerEnumType(ChatHistoryOrder, { name: 'ChatHistoryOrder' });
|
||||
|
||||
@InputType()
|
||||
class QueryChatHistoriesInput implements Partial<ListHistoriesOptions> {
|
||||
@Field(() => Boolean, { nullable: true })
|
||||
action: boolean | undefined;
|
||||
|
||||
@Field(() => Boolean, { nullable: true })
|
||||
fork: boolean | undefined;
|
||||
|
||||
@Field(() => Number, { nullable: true })
|
||||
limit: number | undefined;
|
||||
|
||||
@Field(() => Number, { nullable: true })
|
||||
skip: number | undefined;
|
||||
|
||||
@Field(() => ChatHistoryOrder, { nullable: true })
|
||||
messageOrder: 'asc' | 'desc' | undefined;
|
||||
|
||||
@Field(() => ChatHistoryOrder, { nullable: true })
|
||||
sessionOrder: 'asc' | 'desc' | undefined;
|
||||
|
||||
@Field(() => String, { nullable: true })
|
||||
sessionId: string | undefined;
|
||||
}
|
||||
|
||||
@@ -382,6 +382,21 @@ export class ChatSessionService {
|
||||
options?: ListHistoriesOptions,
|
||||
withPrompt = false
|
||||
): Promise<ChatHistory[]> {
|
||||
const extraCondition = [];
|
||||
|
||||
if (!options?.action && options?.fork) {
|
||||
// only query forked session if fork == true and action == false
|
||||
extraCondition.push({
|
||||
userId: { not: userId },
|
||||
workspaceId: workspaceId,
|
||||
docId: workspaceId === docId ? undefined : docId,
|
||||
id: options?.sessionId ? { equals: options.sessionId } : undefined,
|
||||
// should only find forked session
|
||||
parentSessionId: { not: null },
|
||||
deletedAt: null,
|
||||
});
|
||||
}
|
||||
|
||||
return await this.db.aiSession
|
||||
.findMany({
|
||||
where: {
|
||||
@@ -395,21 +410,7 @@ export class ChatSessionService {
|
||||
: undefined,
|
||||
deletedAt: null,
|
||||
},
|
||||
...(options?.action
|
||||
? []
|
||||
: [
|
||||
{
|
||||
userId: { not: userId },
|
||||
workspaceId: workspaceId,
|
||||
docId: workspaceId === docId ? undefined : docId,
|
||||
id: options?.sessionId
|
||||
? { equals: options.sessionId }
|
||||
: undefined,
|
||||
// should only find forked session
|
||||
parentSessionId: { not: null },
|
||||
deletedAt: null,
|
||||
},
|
||||
]),
|
||||
...extraCondition,
|
||||
],
|
||||
},
|
||||
select: {
|
||||
@@ -428,13 +429,17 @@ export class ChatSessionService {
|
||||
createdAt: true,
|
||||
},
|
||||
orderBy: {
|
||||
createdAt: 'asc',
|
||||
// message order is asc by default
|
||||
createdAt: options?.messageOrder === 'desc' ? 'desc' : 'asc',
|
||||
},
|
||||
},
|
||||
},
|
||||
take: options?.limit,
|
||||
skip: options?.skip,
|
||||
orderBy: { createdAt: 'desc' },
|
||||
orderBy: {
|
||||
// session order is desc by default
|
||||
createdAt: options?.sessionOrder === 'asc' ? 'asc' : 'desc',
|
||||
},
|
||||
})
|
||||
.then(sessions =>
|
||||
Promise.all(
|
||||
|
||||
@@ -131,8 +131,11 @@ export interface ChatSessionState
|
||||
|
||||
export type ListHistoriesOptions = {
|
||||
action: boolean | undefined;
|
||||
fork: boolean | undefined;
|
||||
limit: number | undefined;
|
||||
skip: number | undefined;
|
||||
sessionOrder: 'asc' | 'desc' | undefined;
|
||||
messageOrder: 'asc' | 'desc' | undefined;
|
||||
sessionId: string | undefined;
|
||||
};
|
||||
|
||||
|
||||
@@ -7,6 +7,11 @@ type BlobNotFoundDataType {
|
||||
workspaceId: String!
|
||||
}
|
||||
|
||||
enum ChatHistoryOrder {
|
||||
asc
|
||||
desc
|
||||
}
|
||||
|
||||
type ChatMessage {
|
||||
attachments: [String!]
|
||||
content: String!
|
||||
@@ -554,8 +559,11 @@ type Query {
|
||||
|
||||
input QueryChatHistoriesInput {
|
||||
action: Boolean
|
||||
fork: Boolean
|
||||
limit: Int
|
||||
messageOrder: ChatHistoryOrder
|
||||
sessionId: String
|
||||
sessionOrder: ChatHistoryOrder
|
||||
skip: Int
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user