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

feat(api): bridge ApiProfileManager to all AI callers, fix config split

Browse Source 
- Add core/api/api-resolver.js: getSlotProfile(slot) + providerToApiMode()
- core/api.js: getApiSettings() async, reads 'main' slot profile first
- NccsApi.js: getNccsApiSettings() async, reads 'nccs' slot profile first
- Ngms_api.js: getNgmsApiSettings() async, reads 'ngms' slot profile first
- JqyhApi.js: getJqyhApiSettings() async, reads 'jqyh' slot profile first
- All callers updated with await; legacy DOM/extension_settings as fallback
- .gitignore: add WorkDiary.md and Structure.md (local-only files)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
SilenceLurker
2026-03-11 20:50:08 +08:00
parent 5a6a8b205c
commit 1c64718391
6 changed files with 162 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
core/api/JqyhApi.js
View File

@@ -2,6 +2,7 @@ import { extension_settings, getContext } from "/scripts/extensions.js";
import { characters, this_chid, getRequestHeaders, saveSettingsDebounced, eventSource, event_types } from "/script.js";
import { extensionName } from "../../utils/settings.js";
import { amilyHelper } from '../../core/tavern-helper/main.js';
import { getSlotProfile, providerToApiMode } from './api-resolver.js';
let ChatCompletionService = undefined;
try {
@@ -42,15 +43,30 @@ function normalizeApiResponse(responseData) {
return data;
}
export function getJqyhApiSettings() {
export async function getJqyhApiSettings() {
// 优先读取 'jqyh' 槽位分配的 Profile
const profile = await getSlotProfile('jqyh');
if (profile) {
return {
apiMode: providerToApiMode(profile.provider),
apiUrl: profile.apiUrl,
apiKey: profile.apiKey ?? '',
model: profile.model,
maxTokens: profile.maxTokens ?? 65500,
temperature: profile.temperature ?? 1.0,
tavernProfile: '',
};
}
// 降级：读旧 extension_settings 字段
return {
apiMode: extension_settings[extensionName]?.jqyhApiMode || 'openai_test',
apiUrl: extension_settings[extensionName]?.jqyhApiUrl?.trim() || '',
apiKey: extension_settings[extensionName]?.jqyhApiKey?.trim() || '',
model: extension_settings[extensionName]?.jqyhModel || '',
maxTokens: extension_settings[extensionName]?.jqyhMaxTokens || 4000,
temperature: extension_settings[extensionName]?.jqyhTemperature || 0.7,
tavernProfile: extension_settings[extensionName]?.jqyhTavernProfile || ''
apiMode: extension_settings[extensionName]?.jqyhApiMode || 'openai_test',
apiUrl: extension_settings[extensionName]?.jqyhApiUrl?.trim() || '',
apiKey: extension_settings[extensionName]?.jqyhApiKey?.trim() || '',
model: extension_settings[extensionName]?.jqyhModel || '',
maxTokens: extension_settings[extensionName]?.jqyhMaxTokens || 4000,
temperature: extension_settings[extensionName]?.jqyhTemperature || 0.7,
tavernProfile: extension_settings[extensionName]?.jqyhTavernProfile || '',
};
}
@@ -60,7 +76,7 @@ export async function callJqyhAI(messages, options = {}) {
return null;
}
const apiSettings = getJqyhApiSettings();
const apiSettings = await getJqyhApiSettings();
const finalOptions = {
maxTokens: apiSettings.maxTokens,
@@ -258,7 +274,7 @@ async function callJqyhSillyTavernPreset(messages, options) {
export async function fetchJqyhModels() {
console.log('[Amily2号-Jqyh外交部] 开始获取模型列表');
const apiSettings = getJqyhApiSettings();
const apiSettings = await getJqyhApiSettings();
try {
if (apiSettings.apiMode === 'sillytavern_preset') {
@@ -339,7 +355,7 @@ export async function fetchJqyhModels() {
export async function testJqyhApiConnection() {
console.log('[Amily2号-Jqyh外交部] 开始API连接测试');
const apiSettings = getJqyhApiSettings();
const apiSettings = await getJqyhApiSettings();
if (apiSettings.apiMode === 'sillytavern_preset') {
if (!apiSettings.tavernProfile) {