xinyin025/ChatGPT-Next-Web
1
0
Fork 0
mirror of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git synced 2026-02-11 08:54:29 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

refactor(api): update file_url field in MultimodalContent interface

Browse Source
This commit is contained in:
dakai
2024-10-05 23:00:02 +08:00
parent 83f948239c
commit 10f6ef0fb1
4 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
app/store/chat.ts
View File

@@ -350,36 +350,57 @@ export const useChatStore = createPersistStore(
const modelConfig = session.mask.modelConfig;
//read file content from the url
if (attachFiles && attachFiles.length > 0) {
content += " file content: \n";
for (let i = 0; i < attachFiles.length; i++) {
content += await readFileContent(attachFiles[i]);
}
}
const userContent = fillTemplateWith(content, modelConfig);
console.log("[User Input] after template: ", userContent);
let mContent: string | MultimodalContent[] = userContent;
let displayContent: string | MultimodalContent[] = userContent;
if (attachImages && attachImages.length > 0) {
mContent = [
{
type: "text",
text: userContent,
},
];
mContent = mContent.concat(
attachImages.map((url) => {
return {
type: "image_url",
image_url: {
url: url,
},
};
}),
);
if (attachFiles && attachFiles.length > 0) {
let fileContent = userContent + " file content: \n";
for (let i = 0; i < attachFiles.length; i++) {
fileContent += await readFileContent(attachFiles[i]);
}
if (attachImages && attachImages.length > 0) {
mContent = [
{
type: "text",
text: fileContent,
},
];
displayContent = [
{
type: "text",
text: userContent,
},
];
mContent = mContent.concat(
attachImages.map((url) => {
return {
type: "image_url",
image_url: {
url: url,
},
};
}),
);
displayContent = displayContent.concat(
attachFiles.map((url) => {
return {
type: "file_url",
file_url: {
url: url,
},
};
}),
);
} else {
mContent = fileContent;
displayContent = userContent;
}
}
let userMessage: ChatMessage = createMessage({
role: "user",
content: mContent,
@@ -400,7 +421,8 @@ export const useChatStore = createPersistStore(
get().updateCurrentSession((session) => {
const savedUserMessage = {
...userMessage,
content: mContent,
//content: mContent,
content: displayContent,
};
session.messages = session.messages.concat([
savedUserMessage,