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

Merge branch 'staging' into qr-rewrite

Browse Source
This commit is contained in:
LenAnderson
2023-12-25 13:10:58 +00:00
parent 29476e7c03 47cb017a45
commit c67317c2a1
4 changed files with 65 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/scripts/extensions/stable-diffusion/index.js
View File

@ -2286,7 +2286,7 @@ async function generateComfyImage(prompt, negativePrompt) {
toastr.error(`Failed to load workflow.\n\n${text}`);
}
let workflow = (await workflowResponse.json()).replace('"%prompt%"', JSON.stringify(prompt));
workflow = (await workflowResponse.json()).replace('"%negative_prompt%"', JSON.stringify(negativePrompt));
workflow = workflow.replace('"%negative_prompt%"', JSON.stringify(negativePrompt));
workflow = workflow.replace('"%seed%"', JSON.stringify(Math.round(Math.random() * Number.MAX_SAFE_INTEGER)));
placeholders.forEach(ph => {
workflow = workflow.replace(`"%${ph}%"`, JSON.stringify(extension_settings.sd[ph]));

5
public/scripts/openai.js
View File

@ -1556,9 +1556,10 @@ async function sendOpenAIRequest(type, messages, signal) {
delete generate_data.stop;
}
// Vision models don't support logit bias
if (isImageInliningSupported()) {
// Remove logit bias and stop strings if it's not supported by the model
if (isOAI && oai_settings.openai_model.includes('vision') || isOpenRouter && oai_settings.openrouter_model.includes('vision')) {
delete generate_data.logit_bias;
delete generate_data.stop;
}
// Proxy is only supported for Claude and OpenAI

1
public/scripts/textgen-settings.js
View File

@ -769,6 +769,7 @@ export function getTextGenGenerationData(finalPrompt, maxTokens, isImpersonate,
'logit_bias': logitBiasArray,
// Conflicts with ooba's grammar_string
'grammar': settings.grammar_string,
'cache_prompt': true,
};
params = Object.assign(params, llamaCppParams);
}