slvccans/ST-Amily2-Chat-Optimisation
1
0
Fork 0
mirror of https://github.com/Wx-2025/ST-Amily2-Chat-Optimisation.git synced 2026-06-06 12:45:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update cwb_apiService.js

Browse Source
This commit is contained in:
Wx-2025
2025-09-08 03:33:44 +08:00
committed by GitHub
parent 071e8b084f
commit 6845353730
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CharacterWorldBook/src/cwb_apiService.js
View File

@@ -607,28 +607,18 @@ export function updateApiStatusDisplay($panel) {
} }
} }
export async function callCustomOpenAI(systemPrompt, userPromptContent) { export async function callCustomOpenAI(messages) {
const apiSettings = getCwbApiSettings(); const apiSettings = getCwbApiSettings();
if (apiSettings.apiMode === 'sillytavern_preset') { if (apiSettings.apiMode === 'sillytavern_preset') {
const combinedSystemPrompt = `${state.currentBreakArmorPrompt}\n\n${systemPrompt}`;
const messages = [
{ role: 'system', content: combinedSystemPrompt },
{ role: 'user', content: userPromptContent },
];
return await callCwbSillyTavernPreset(messages, { tavernProfile: apiSettings.tavernProfile, maxTokens: 65000 }); return await callCwbSillyTavernPreset(messages, { tavernProfile: apiSettings.tavernProfile, maxTokens: 65000 });
} else { } else {
if (!state.customApiConfig.url || !state.customApiConfig.model) { if (!state.customApiConfig.url || !state.customApiConfig.model) {
throw new Error('API URL/Model未配置。'); throw new Error('API URL/Model未配置。');
} }
const combinedSystemPrompt = `${state.currentBreakArmorPrompt}\n\n${systemPrompt}`;
const requestBody = { const requestBody = {
messages: [ messages: messages,
{ role: 'system', content: combinedSystemPrompt },
{ role: 'user', content: userPromptContent },
],
model: state.customApiConfig.model, model: state.customApiConfig.model,
temperature: 1, temperature: 1,
frequency_penalty: 0, frequency_penalty: 0,