rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Allow prompt post-processing for all sources. Add 'single user msg' processing (#4009)

Browse Source 
* Allow prompt post-processing for all sources. Add 'single user msg' PPP type

* Fix copilot comments

* Fix typo in element id

* Remove redundant conditions

* Lint fix

* Add link to PPP docs
This commit is contained in:
Cohee
2025-05-22 20:36:22 +03:00
committed by GitHub
parent 157315cd68
commit ade45b6cd1
5 changed files with 55 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/prompt-converters.js
View File

@ -695,11 +695,13 @@ export function convertXAIMessages(messages, names) {
* Merge messages with the same consecutive role, removing names if they exist.
* @param {any[]} messages Messages to merge
* @param {PromptNames} names Prompt names
* @param {boolean} strict Enable strict mode: only allow one system message at the start, force user first message
* @param {boolean} placeholders Add user placeholders to the messages in strict mode
* @param {object} options Options for merging
* @param {boolean} [options.strict] Enable strict mode: only allow one system message at the start, force user first message
* @param {boolean} [options.placeholders] Add user placeholders to the messages in strict mode
* @param {boolean} [options.single] Force every role to be user, merging all messages into one
* @returns {any[]} Merged messages
*/
export function mergeMessages(messages, names, strict, placeholders) {
export function mergeMessages(messages, names, { strict = false, placeholders = false, single = false } = {}) {
let mergedMessages = [];
/** @type {Map<string,object>} */
@ -744,6 +746,20 @@ export function mergeMessages(messages, names, strict, placeholders) {
if (message.role === 'tool') {
message.role = 'user';
}
if (single) {
if (message.role === 'assistant') {
if (names.charName && !message.content.startsWith(`${names.charName}: `) && !names.startsWithGroupName(message.content)) {
message.content = `${names.charName}: ${message.content}`;
}
}
if (message.role === 'user') {
if (names.userName && !message.content.startsWith(`${names.userName}: `)) {
message.content = `${names.userName}: ${message.content}`;
}
}
message.role = 'user';
}
delete message.name;
delete message.tool_calls;
delete message.tool_call_id;
@ -807,7 +823,7 @@ export function mergeMessages(messages, names, strict, placeholders) {
mergedMessages.unshift({ role: 'user', content: PROMPT_PLACEHOLDER });
}
}
return mergeMessages(mergedMessages, names, false, placeholders);
return mergeMessages(mergedMessages, names, { strict: false, placeholders, single: false });
}
return mergedMessages;