refac
This commit is contained in:
1 parent
a209f7f6e0
commit
18fe17127a
1 file changed
+45
-44
@@ -2195,53 +2195,54 @@
|
|||||||
$settings?.params?.stream_response ??
|
$settings?.params?.stream_response ??
|
||||||
params?.stream_response ??
|
params?.stream_response ??
|
||||||
true;
|
true;
|
||||||
|
// Always include system prompt — backend extracts it and prepends to DB messages.
|
||||||
|
// Only temp chats need conversation messages (persisted chats load from DB).
|
||||||
let messages = [
|
let messages = [
|
||||||
params?.system || $settings.system
|
params?.system || $settings.system
|
||||||
? {
|
? { role: 'system', content: `${params?.system ?? $settings?.system ?? ''}` }
|
||||||
role: 'system',
|
: undefined
|
||||||
content: `${params?.system ?? $settings?.system ?? ''}`
|
].filter(Boolean);
|
||||||
}
|
if ($temporaryChatEnabled) {
|
||||||
: undefined,
|
messages = [
|
||||||
..._messages.map((message) => ({
|
...messages,
|
||||||
...message,
|
..._messages.map((message) => ({
|
||||||
content: processDetails(message.content),
|
...message,
|
||||||
// Include output for temp chats (backend will use it and strip before LLM)
|
content: processDetails(message.content),
|
||||||
...(message.output ? { output: message.output } : {})
|
...(message.output ? { output: message.output } : {})
|
||||||
}))
|
}))
|
||||||
].filter((message) => message);
|
].filter((message) => message);
|
||||||
|
|
||||||
messages = messages
|
messages = messages
|
||||||
.map((message, idx, arr) => {
|
.map((message, idx, arr) => {
|
||||||
const imageFiles = (message?.files ?? []).filter(
|
const imageFiles = (message?.files ?? []).filter(
|
||||||
(file) => file.type === 'image' || (file?.content_type ?? '').startsWith('image/')
|
(file) => file.type === 'image' || (file?.content_type ?? '').startsWith('image/')
|
||||||
);
|
);
|
||||||
|
|
||||||
return {
|
return {
|
||||||
role: message.role,
|
role: message.role,
|
||||||
// Preserve output items so backend can reconstruct tool_calls/tool-role messages (temp chats)
|
...(message.output ? { output: message.output } : {}),
|
||||||
...(message.output ? { output: message.output } : {}),
|
...(message.role === 'user' && imageFiles.length > 0
|
||||||
...(message.role === 'user' && imageFiles.length > 0
|
? {
|
||||||
? {
|
content: [
|
||||||
content: [
|
{
|
||||||
{
|
type: 'text',
|
||||||
type: 'text',
|
text: message?.merged?.content ?? message.content
|
||||||
text: message?.merged?.content ?? message.content
|
},
|
||||||
},
|
...imageFiles.map((file) => ({
|
||||||
...imageFiles.map((file) => ({
|
type: 'image_url',
|
||||||
type: 'image_url',
|
image_url: {
|
||||||
image_url: {
|
url: file.url
|
||||||
url: file.url
|
}
|
||||||
}
|
}))
|
||||||
}))
|
]
|
||||||
]
|
}
|
||||||
}
|
: {
|
||||||
: {
|
content: message?.merged?.content ?? message.content
|
||||||
content: message?.merged?.content ?? message.content
|
})
|
||||||
})
|
};
|
||||||
};
|
})
|
||||||
})
|
.filter((message) => message?.role === 'user' || message?.content?.trim());
|
||||||
.filter((message) => message?.role === 'user' || message?.content?.trim());
|
}
|
||||||
|
|
||||||
const toolIds = [];
|
const toolIds = [];
|
||||||
const toolServerIds = [];
|
const toolServerIds = [];
|
||||||
@@ -2303,7 +2304,7 @@
|
|||||||
{
|
{
|
||||||
stream: stream,
|
stream: stream,
|
||||||
model: model.id,
|
model: model.id,
|
||||||
messages: messages,
|
...(messages.length > 0 ? { messages } : {}),
|
||||||
params: {
|
params: {
|
||||||
...$settings?.params,
|
...$settings?.params,
|
||||||
...params,
|
...params,
|
||||||
|
|||||||
Reference in new issue
Block a user