kamp/anything-llm
1
0
Fork 0
mirror of https://github.com/Mintplex-Labs/anything-llm.git synced 2024-10-03 17:30:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

patch workspace chat history windows to persist most recent chats, not the top n

Browse Source
This commit is contained in:
timothycarambat 2023-11-01 14:12:27 -07:00
parent 67c85f1550
commit 24823cb5e2
2 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server/models/workspaceChats.js
View File

@ -21,7 +21,8 @@ const WorkspaceChats = {
forWorkspaceByUser: async function (
workspaceId = null,
userId = null,
limit = null
limit = null,
orderBy = null
) {
if (!workspaceId || !userId) return [];
try {
@ -32,9 +33,7 @@ const WorkspaceChats = {
include: true,
},
...(limit !== null ? { take: limit } : {}),
orderBy: {
id: "asc",
},
...(orderBy !== null ? { orderBy } : { orderBy: { id: "asc" } }),
});
return chats;
} catch (error) {
@ -43,7 +42,11 @@ const WorkspaceChats = {
}
},
forWorkspace: async function (workspaceId = null, limit = null) {
forWorkspace: async function (
workspaceId = null,
limit = null,
orderBy = null
) {
if (!workspaceId) return [];
try {
const chats = await prisma.workspace_chats.findMany({
@ -52,9 +55,7 @@ const WorkspaceChats = {
include: true,
},
...(limit !== null ? { take: limit } : {}),
orderBy: {
id: "asc",
},
...(orderBy !== null ? { orderBy } : { orderBy: { id: "asc" } }),
});
return chats;
} catch (error) {

32
server/utils/chats/index.js
View File

@ -87,10 +87,22 @@ async function chatWithWorkspace(
};
}
const messageLimit = workspace?.openAiHistory || 20;
const hasVectorizedSpace = await VectorDb.hasNamespace(workspace.slug);
const embeddingsCount = await VectorDb.namespaceCount(workspace.slug);
if (!hasVectorizedSpace || embeddingsCount === 0) {
const rawHistory = await WorkspaceChats.forWorkspace(workspace.id);
const rawHistory = (
user
? await WorkspaceChats.forWorkspaceByUser(
workspace.id,
user.id,
messageLimit,
{ id: "desc" }
)
: await WorkspaceChats.forWorkspace(workspace.id, messageLimit, {
id: "desc",
})
).reverse();
const chatHistory = convertToPromptHistory(rawHistory);
const response = await LLMConnector.sendChat(
chatHistory,
@ -114,12 +126,18 @@ async function chatWithWorkspace(
error: null,
};
} else {
var messageLimit = workspace?.openAiHistory;
const rawHistory = await WorkspaceChats.forWorkspace(
workspace.id,
messageLimit
);
const rawHistory = (
user
? await WorkspaceChats.forWorkspaceByUser(
workspace.id,
user.id,
messageLimit,
{ id: "desc" }
)
: await WorkspaceChats.forWorkspace(workspace.id, messageLimit, {
id: "desc",
})
).reverse();
const chatHistory = convertToPromptHistory(rawHistory);
const {
response,