mirror of
https://github.com/SillyTavern/SillyTavern.git
synced 2025-02-21 22:47:41 +01:00
Adding reverse proxy support to DeepSeek chat completion (#3328)
* added reverse proxy settings to deepseek chat completion * Update chat-completions.js * Update chat-completions.js * Update chat-completions.js * Update chat-completions.js * Update chat-completions.js * Update chat-completions.js * Unify API key requirement --------- Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>
This commit is contained in:
parent
6fef696268
commit
a503f58d0c
@ -2692,7 +2692,7 @@
|
|||||||
<option value="windowai">Window AI</option>
|
<option value="windowai">Window AI</option>
|
||||||
</optgroup>
|
</optgroup>
|
||||||
</select>
|
</select>
|
||||||
<div class="inline-drawer wide100p" data-source="openai,claude,mistralai,makersuite">
|
<div class="inline-drawer wide100p" data-source="openai,claude,mistralai,makersuite,deepseek">
|
||||||
<div class="inline-drawer-toggle inline-drawer-header">
|
<div class="inline-drawer-toggle inline-drawer-header">
|
||||||
<b data-i18n="Reverse Proxy">Reverse Proxy</b>
|
<b data-i18n="Reverse Proxy">Reverse Proxy</b>
|
||||||
<div class="fa-solid fa-circle-chevron-down inline-drawer-icon down"></div>
|
<div class="fa-solid fa-circle-chevron-down inline-drawer-icon down"></div>
|
||||||
@ -2755,7 +2755,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div id="ReverseProxyWarningMessage" data-source="openai,claude,mistralai,makersuite">
|
<div id="ReverseProxyWarningMessage" data-source="openai,claude,mistralai,makersuite,deepseek">
|
||||||
<div class="reverse_proxy_warning">
|
<div class="reverse_proxy_warning">
|
||||||
<b>
|
<b>
|
||||||
<div data-i18n="Using a proxy that you're not running yourself is a risk to your data privacy.">
|
<div data-i18n="Using a proxy that you're not running yourself is a risk to your data privacy.">
|
||||||
|
@ -1922,7 +1922,7 @@ async function sendOpenAIRequest(type, messages, signal) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Proxy is only supported for Claude, OpenAI, Mistral, and Google MakerSuite
|
// Proxy is only supported for Claude, OpenAI, Mistral, and Google MakerSuite
|
||||||
if (oai_settings.reverse_proxy && [chat_completion_sources.CLAUDE, chat_completion_sources.OPENAI, chat_completion_sources.MISTRALAI, chat_completion_sources.MAKERSUITE].includes(oai_settings.chat_completion_source)) {
|
if (oai_settings.reverse_proxy && [chat_completion_sources.CLAUDE, chat_completion_sources.OPENAI, chat_completion_sources.MISTRALAI, chat_completion_sources.MAKERSUITE, chat_completion_sources.DEEPSEEK].includes(oai_settings.chat_completion_source)) {
|
||||||
await validateReverseProxy();
|
await validateReverseProxy();
|
||||||
generate_data['reverse_proxy'] = oai_settings.reverse_proxy;
|
generate_data['reverse_proxy'] = oai_settings.reverse_proxy;
|
||||||
generate_data['proxy_password'] = oai_settings.proxy_password;
|
generate_data['proxy_password'] = oai_settings.proxy_password;
|
||||||
@ -3370,7 +3370,7 @@ async function getStatusOpen() {
|
|||||||
chat_completion_source: oai_settings.chat_completion_source,
|
chat_completion_source: oai_settings.chat_completion_source,
|
||||||
};
|
};
|
||||||
|
|
||||||
if (oai_settings.reverse_proxy && [chat_completion_sources.CLAUDE, chat_completion_sources.OPENAI, chat_completion_sources.MISTRALAI, chat_completion_sources.MAKERSUITE].includes(oai_settings.chat_completion_source)) {
|
if (oai_settings.reverse_proxy && [chat_completion_sources.CLAUDE, chat_completion_sources.OPENAI, chat_completion_sources.MISTRALAI, chat_completion_sources.MAKERSUITE, chat_completion_sources.DEEPSEEK].includes(oai_settings.chat_completion_source)) {
|
||||||
await validateReverseProxy();
|
await validateReverseProxy();
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4749,7 +4749,7 @@ async function onConnectButtonClick(e) {
|
|||||||
await writeSecret(SECRET_KEYS.DEEPSEEK, api_key_deepseek);
|
await writeSecret(SECRET_KEYS.DEEPSEEK, api_key_deepseek);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!secret_state[SECRET_KEYS.DEEPSEEK]) {
|
if (!secret_state[SECRET_KEYS.DEEPSEEK] && !oai_settings.reverse_proxy) {
|
||||||
console.log('No secret key saved for DeepSeek');
|
console.log('No secret key saved for DeepSeek');
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -639,6 +639,89 @@ async function sendCohereRequest(request, response) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Sends a request to DeepSeek API.
|
||||||
|
* @param {express.Request} request Express request
|
||||||
|
* @param {express.Response} response Express response
|
||||||
|
*/
|
||||||
|
async function sendDeepSeekRequest(request, response) {
|
||||||
|
const apiUrl = new URL(request.body.reverse_proxy || API_DEEPSEEK).toString();
|
||||||
|
const apiKey = request.body.reverse_proxy ? request.body.proxy_password : readSecret(request.user.directories, SECRET_KEYS.DEEPSEEK);
|
||||||
|
|
||||||
|
if (!apiKey && !request.body.reverse_proxy) {
|
||||||
|
console.log('DeepSeek API key is missing.');
|
||||||
|
return response.status(400).send({ error: true });
|
||||||
|
}
|
||||||
|
|
||||||
|
const controller = new AbortController();
|
||||||
|
request.socket.removeAllListeners('close');
|
||||||
|
request.socket.on('close', function () {
|
||||||
|
controller.abort();
|
||||||
|
});
|
||||||
|
|
||||||
|
try {
|
||||||
|
let bodyParams = {};
|
||||||
|
|
||||||
|
if (request.body.logprobs > 0) {
|
||||||
|
bodyParams['top_logprobs'] = request.body.logprobs;
|
||||||
|
bodyParams['logprobs'] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
const postProcessType = String(request.body.model).endsWith('-reasoner') ? 'deepseek-reasoner' : 'deepseek';
|
||||||
|
const processedMessages = postProcessPrompt(request.body.messages, postProcessType, getPromptNames(request));
|
||||||
|
|
||||||
|
const requestBody = {
|
||||||
|
'messages': processedMessages,
|
||||||
|
'model': request.body.model,
|
||||||
|
'temperature': request.body.temperature,
|
||||||
|
'max_tokens': request.body.max_tokens,
|
||||||
|
'stream': request.body.stream,
|
||||||
|
'presence_penalty': request.body.presence_penalty,
|
||||||
|
'frequency_penalty': request.body.frequency_penalty,
|
||||||
|
'top_p': request.body.top_p,
|
||||||
|
'stop': request.body.stop,
|
||||||
|
'seed': request.body.seed,
|
||||||
|
...bodyParams,
|
||||||
|
};
|
||||||
|
|
||||||
|
const config = {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
'Authorization': 'Bearer ' + apiKey,
|
||||||
|
},
|
||||||
|
body: JSON.stringify(requestBody),
|
||||||
|
signal: controller.signal,
|
||||||
|
};
|
||||||
|
|
||||||
|
console.log('DeepSeek request:', requestBody);
|
||||||
|
|
||||||
|
const generateResponse = await fetch(apiUrl + '/chat/completions', config);
|
||||||
|
|
||||||
|
if (request.body.stream) {
|
||||||
|
forwardFetchResponse(generateResponse, response);
|
||||||
|
} else {
|
||||||
|
if (!generateResponse.ok) {
|
||||||
|
const errorText = await generateResponse.text();
|
||||||
|
console.log(`DeepSeek API returned error: ${generateResponse.status} ${generateResponse.statusText} ${errorText}`);
|
||||||
|
const errorJson = tryParse(errorText) ?? { error: true };
|
||||||
|
return response.status(500).send(errorJson);
|
||||||
|
}
|
||||||
|
const generateResponseJson = await generateResponse.json();
|
||||||
|
console.log('DeepSeek response:', generateResponseJson);
|
||||||
|
return response.send(generateResponseJson);
|
||||||
|
}
|
||||||
|
} catch (error) {
|
||||||
|
console.log('Error communicating with DeepSeek API: ', error);
|
||||||
|
if (!response.headersSent) {
|
||||||
|
response.send({ error: true });
|
||||||
|
} else {
|
||||||
|
response.end();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
export const router = express.Router();
|
export const router = express.Router();
|
||||||
|
|
||||||
router.post('/status', jsonParser, async function (request, response_getstatus_openai) {
|
router.post('/status', jsonParser, async function (request, response_getstatus_openai) {
|
||||||
@ -683,8 +766,8 @@ router.post('/status', jsonParser, async function (request, response_getstatus_o
|
|||||||
api_key_openai = readSecret(request.user.directories, SECRET_KEYS.NANOGPT);
|
api_key_openai = readSecret(request.user.directories, SECRET_KEYS.NANOGPT);
|
||||||
headers = {};
|
headers = {};
|
||||||
} else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.DEEPSEEK) {
|
} else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.DEEPSEEK) {
|
||||||
api_url = API_DEEPSEEK.replace('/beta', '');
|
api_url = new URL(request.body.reverse_proxy || API_DEEPSEEK.replace('/beta', ''));
|
||||||
api_key_openai = readSecret(request.user.directories, SECRET_KEYS.DEEPSEEK);
|
api_key_openai = request.body.reverse_proxy ? request.body.proxy_password : readSecret(request.user.directories, SECRET_KEYS.DEEPSEEK);
|
||||||
headers = {};
|
headers = {};
|
||||||
} else {
|
} else {
|
||||||
console.log('This chat completion source is not supported yet.');
|
console.log('This chat completion source is not supported yet.');
|
||||||
@ -844,6 +927,7 @@ router.post('/generate', jsonParser, function (request, response) {
|
|||||||
case CHAT_COMPLETION_SOURCES.MAKERSUITE: return sendMakerSuiteRequest(request, response);
|
case CHAT_COMPLETION_SOURCES.MAKERSUITE: return sendMakerSuiteRequest(request, response);
|
||||||
case CHAT_COMPLETION_SOURCES.MISTRALAI: return sendMistralAIRequest(request, response);
|
case CHAT_COMPLETION_SOURCES.MISTRALAI: return sendMistralAIRequest(request, response);
|
||||||
case CHAT_COMPLETION_SOURCES.COHERE: return sendCohereRequest(request, response);
|
case CHAT_COMPLETION_SOURCES.COHERE: return sendCohereRequest(request, response);
|
||||||
|
case CHAT_COMPLETION_SOURCES.DEEPSEEK: return sendDeepSeekRequest(request, response);
|
||||||
}
|
}
|
||||||
|
|
||||||
let apiUrl;
|
let apiUrl;
|
||||||
@ -957,19 +1041,6 @@ router.post('/generate', jsonParser, function (request, response) {
|
|||||||
apiKey = readSecret(request.user.directories, SECRET_KEYS.BLOCKENTROPY);
|
apiKey = readSecret(request.user.directories, SECRET_KEYS.BLOCKENTROPY);
|
||||||
headers = {};
|
headers = {};
|
||||||
bodyParams = {};
|
bodyParams = {};
|
||||||
} else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.DEEPSEEK) {
|
|
||||||
apiUrl = API_DEEPSEEK;
|
|
||||||
apiKey = readSecret(request.user.directories, SECRET_KEYS.DEEPSEEK);
|
|
||||||
headers = {};
|
|
||||||
bodyParams = {};
|
|
||||||
|
|
||||||
if (request.body.logprobs > 0) {
|
|
||||||
bodyParams['top_logprobs'] = request.body.logprobs;
|
|
||||||
bodyParams['logprobs'] = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
const postProcessType = String(request.body.model).endsWith('-reasoner') ? 'deepseek-reasoner' : 'deepseek';
|
|
||||||
request.body.messages = postProcessPrompt(request.body.messages, postProcessType, getPromptNames(request));
|
|
||||||
} else {
|
} else {
|
||||||
console.log('This chat completion source is not supported yet.');
|
console.log('This chat completion source is not supported yet.');
|
||||||
return response.status(400).send({ error: true });
|
return response.status(400).send({ error: true });
|
||||||
@ -1107,4 +1178,3 @@ router.post('/generate', jsonParser, function (request, response) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user