"git@developer.sourcefind.cn:chenpangpang/open-webui.git" did not exist on "130d15a2fb4b1fdf5a98ab8e9475ab7f5bdcaec8"
Commit bcc2bab6 authored by Timothy J. Baek's avatar Timothy J. Baek
Browse files

refac

parent 0260c714
...@@ -255,8 +255,6 @@ ...@@ -255,8 +255,6 @@
const sendPrompt = async (prompt, parentId, modelId = null) => { const sendPrompt = async (prompt, parentId, modelId = null) => {
const _chatId = JSON.parse(JSON.stringify($chatId)); const _chatId = JSON.parse(JSON.stringify($chatId));
let userContext = null;
await Promise.all( await Promise.all(
(modelId ? [modelId] : atSelectedModel !== '' ? [atSelectedModel.id] : selectedModels).map( (modelId ? [modelId] : atSelectedModel !== '' ? [atSelectedModel.id] : selectedModels).map(
async (modelId) => { async (modelId) => {
...@@ -273,7 +271,7 @@ ...@@ -273,7 +271,7 @@
role: 'assistant', role: 'assistant',
content: '', content: '',
model: model.id, model: model.id,
userContext: userContext, userContext: null,
timestamp: Math.floor(Date.now() / 1000) // Unix epoch timestamp: Math.floor(Date.now() / 1000) // Unix epoch
}; };
...@@ -291,6 +289,7 @@ ...@@ -291,6 +289,7 @@
await tick(); await tick();
let userContext = null;
if ($settings?.memory ?? false) { if ($settings?.memory ?? false) {
if (userContext === null) { if (userContext === null) {
const res = await queryMemory(localStorage.token, prompt).catch((error) => { const res = await queryMemory(localStorage.token, prompt).catch((error) => {
...@@ -314,7 +313,6 @@ ...@@ -314,7 +313,6 @@
} }
} }
} }
responseMessage.userContext = userContext; responseMessage.userContext = userContext;
if (model?.external) { if (model?.external) {
......
...@@ -261,8 +261,6 @@ ...@@ -261,8 +261,6 @@
const sendPrompt = async (prompt, parentId, modelId = null) => { const sendPrompt = async (prompt, parentId, modelId = null) => {
const _chatId = JSON.parse(JSON.stringify($chatId)); const _chatId = JSON.parse(JSON.stringify($chatId));
let userContext = null;
await Promise.all( await Promise.all(
(modelId ? [modelId] : atSelectedModel !== '' ? [atSelectedModel.id] : selectedModels).map( (modelId ? [modelId] : atSelectedModel !== '' ? [atSelectedModel.id] : selectedModels).map(
async (modelId) => { async (modelId) => {
...@@ -279,7 +277,7 @@ ...@@ -279,7 +277,7 @@
role: 'assistant', role: 'assistant',
content: '', content: '',
model: model.id, model: model.id,
userContext: userContext, userContext: null,
timestamp: Math.floor(Date.now() / 1000) // Unix epoch timestamp: Math.floor(Date.now() / 1000) // Unix epoch
}; };
...@@ -297,6 +295,7 @@ ...@@ -297,6 +295,7 @@
await tick(); await tick();
let userContext = null;
if ($settings?.memory ?? false) { if ($settings?.memory ?? false) {
if (userContext === null) { if (userContext === null) {
const res = await queryMemory(localStorage.token, prompt).catch((error) => { const res = await queryMemory(localStorage.token, prompt).catch((error) => {
...@@ -320,7 +319,6 @@ ...@@ -320,7 +319,6 @@
} }
} }
} }
responseMessage.userContext = userContext; responseMessage.userContext = userContext;
if (model?.external) { if (model?.external) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment