Merge branch 'staging' into woo-yeah

7f9b139ae0dffe93fe16c7f29971df1f6222c8fd

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: 144277bdcc5ac110d888510b79d0ad6a8d92873a 6aaeb754efbec318f179c695202b6471934d7589
7 files changed, +131 -23Ignore whitespace
public/index.html+2 -2
@@ -2692,7 +2692,7 @@
26922692 <option value="windowai">Window AI</option>
26932693 </optgroup>
26942694 </select>
26952695 <div class="inline-drawer wide100p" data-source="openai,claude,mistralai,makersuite,deepseek">
26962696 <div class="inline-drawer-toggle inline-drawer-header">
26972697 <b data-i18n="Reverse Proxy">Reverse Proxy</b>
26982698 <div class="fa-solid fa-circle-chevron-down inline-drawer-icon down"></div>
@@ -2755,7 +2755,7 @@
27552755 </div>
27562756 </div>
27572757 </div>
27582758 <div id="ReverseProxyWarningMessage" data-source="openai,claude,mistralai,makersuite,deepseek">
27592759 <div class="reverse_proxy_warning">
27602760 <b>
27612761 <div data-i18n="Using a proxy that you're not running yourself is a risk to your data privacy.">
public/script.js+1 -0
@@ -724,6 +724,7 @@ async function getSystemMessages() {
724724 is_user: false,
725725 is_system: true,
726726 mes: await renderTemplateAsync('assistantNote'),
727+ uses_system_ui: true,
727728 extra: {
728729 isSmallSys: true,
729730 },
public/scripts/chats.js+17 -0
@@ -11,6 +11,7 @@ import {
1111 getCurrentChatId,
1212 getRequestHeaders,
1313 hideSwipeButtons,
14+ name1,
1415 name2,
1516 reloadCurrentChat,
1617 saveChatDebounced,
@@ -21,6 +22,7 @@ import {
2122 chat_metadata,
2223 neutralCharacterName,
2324 updateChatMetadata,
25+ system_message_types,
2426} from '../script.js';
2527import { selected_group } from './group-chats.js';
2628import { power_user } from './power-user.js';
@@ -34,6 +36,7 @@ import {
3436 humanFileSize,
3537 saveBase64AsFile,
3638 extractTextFromOffice,
39+ download,
3740} from './utils.js';
3841import { extension_settings, renderExtensionTemplateAsync, saveMetadataDebounced } from './extensions.js';
3942import { POPUP_RESULT, POPUP_TYPE, Popup, callGenericPopup } from './popup.js';
@@ -41,6 +44,7 @@ import { ScraperManager } from './scrapers.js';
4144import { DragAndDropHandler } from './dragdrop.js';
4245import { renderTemplateAsync } from './templates.js';
4346import { t } from './i18n.js';
47+import { humanizedDateTime } from './RossAscends-mods.js';
4448
4549/**
4650 * @typedef {Object} FileAttachment
@@ -1437,6 +1441,19 @@ jQuery(function () {
14371441 await viewMessageFile(messageId);
14381442 });
14391443
1444+ $(document).on('click', '.assistant_note_export', async function () {
1445+ const chatToSave = [
1446+ {
1447+ user_name: name1,
1448+ character_name: name2,
1449+ chat_metadata: chat_metadata,
1450+ },
1451+ ...chat.filter(x => x?.extra?.type !== system_message_types.ASSISTANT_NOTE),
1452+ ];
1453+
1454+ download(JSON.stringify(chatToSave, null, 4), `Assistant - ${humanizedDateTime()}.json`, 'application/json');
1455+ });
1456+
14401457 // Do not change. #attachFile is added by extension.
14411458 $(document).on('click', '#attachFile', function () {
14421459 $('#file_form_input').trigger('click');
public/scripts/openai.js+3 -3
@@ -1922,7 +1922,7 @@ async function sendOpenAIRequest(type, messages, signal) {
19221922 }
19231923
19241924 // Proxy is only supported for Claude, OpenAI, Mistral, and Google MakerSuite
19251925 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)) {
19261926 await validateReverseProxy();
19271927 generate_data['reverse_proxy'] = oai_settings.reverse_proxy;
19281928 generate_data['proxy_password'] = oai_settings.proxy_password;
@@ -3371,7 +3371,7 @@ async function getStatusOpen() {
33713371 chat_completion_source: oai_settings.chat_completion_source,
33723372 };
33733373
33743374 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)) {
33753375 await validateReverseProxy();
33763376 }
33773377
@@ -4750,7 +4750,7 @@ async function onConnectButtonClick(e) {
47504750 await writeSecret(SECRET_KEYS.DEEPSEEK, api_key_deepseek);
47514751 }
47524752
47534753 if (!secret_state[SECRET_KEYS.DEEPSEEK] && !oai_settings.reverse_proxy) {
47544754 console.log('No secret key saved for DeepSeek');
47554755 return;
47564756 }
public/scripts/templates/assistantNote.html+8 -2
@@ -1,3 +1,9 @@
1-<div>
1+<div data-type="assistant_note">
2- <b data-i18n="Note:">Note:</b> <span data-i18n="this chat is temporary and will be deleted as soon as you leave it.">this chat is temporary and will be deleted as soon as you leave it.</span>
2+ <div>
3+ <b data-i18n="Note:">Note:</b> <span data-i18n="this chat is temporary and will be deleted as soon as you leave it.">this chat is temporary and will be deleted as soon as you leave it.</span>
4+ <span>Click the button to save it as a file.</span>
5+ </div>
6+ <div class="assistant_note_export menu_button menu_button_icon" title="Export as JSONL">
7+ <i class="fa-solid fa-file-export"></i>
8+ </div>
39</div>
public/style.css+14 -0
@@ -5795,3 +5795,17 @@ body:not(.movingUI) .drawer-content.maximized {
57955795.alternate_greetings_list {
57965796 overflow-y: scroll;
57975797}
5798+
5799+.mes_text div[data-type="assistant_note"]:has(.assistant_note_export) {
5800+ display: flex;
5801+ flex-direction: row;
5802+ flex-wrap: nowrap;
5803+ justify-content: space-between;
5804+ align-items: center;
5805+ gap: 10px;
5806+ padding: 0 2px;
5807+}
5808+
5809+.mes_text div[data-type="assistant_note"]:has(.assistant_note_export)>div:not(.assistant_note_export) {
5810+ flex: 1;
5811+}
src/endpoints/backends/chat-completions.js+86 -16
@@ -646,6 +646,89 @@ async function sendCohereRequest(request, response) {
646646 }
647647}
648648
649+/**
650+ * Sends a request to DeepSeek API.
651+ * @param {express.Request} request Express request
652+ * @param {express.Response} response Express response
653+ */
654+async function sendDeepSeekRequest(request, response) {
655+ const apiUrl = new URL(request.body.reverse_proxy || API_DEEPSEEK).toString();
656+ const apiKey = request.body.reverse_proxy ? request.body.proxy_password : readSecret(request.user.directories, SECRET_KEYS.DEEPSEEK);
657+
658+ if (!apiKey && !request.body.reverse_proxy) {
659+ console.log('DeepSeek API key is missing.');
660+ return response.status(400).send({ error: true });
661+ }
662+
663+ const controller = new AbortController();
664+ request.socket.removeAllListeners('close');
665+ request.socket.on('close', function () {
666+ controller.abort();
667+ });
668+
669+ try {
670+ let bodyParams = {};
671+
672+ if (request.body.logprobs > 0) {
673+ bodyParams['top_logprobs'] = request.body.logprobs;
674+ bodyParams['logprobs'] = true;
675+ }
676+
677+ const postProcessType = String(request.body.model).endsWith('-reasoner') ? 'deepseek-reasoner' : 'deepseek';
678+ const processedMessages = postProcessPrompt(request.body.messages, postProcessType, getPromptNames(request));
679+
680+ const requestBody = {
681+ 'messages': processedMessages,
682+ 'model': request.body.model,
683+ 'temperature': request.body.temperature,
684+ 'max_tokens': request.body.max_tokens,
685+ 'stream': request.body.stream,
686+ 'presence_penalty': request.body.presence_penalty,
687+ 'frequency_penalty': request.body.frequency_penalty,
688+ 'top_p': request.body.top_p,
689+ 'stop': request.body.stop,
690+ 'seed': request.body.seed,
691+ ...bodyParams,
692+ };
693+
694+ const config = {
695+ method: 'POST',
696+ headers: {
697+ 'Content-Type': 'application/json',
698+ 'Authorization': 'Bearer ' + apiKey,
699+ },
700+ body: JSON.stringify(requestBody),
701+ signal: controller.signal,
702+ };
703+
704+ console.log('DeepSeek request:', requestBody);
705+
706+ const generateResponse = await fetch(apiUrl + '/chat/completions', config);
707+
708+ if (request.body.stream) {
709+ forwardFetchResponse(generateResponse, response);
710+ } else {
711+ if (!generateResponse.ok) {
712+ const errorText = await generateResponse.text();
713+ console.log(`DeepSeek API returned error: ${generateResponse.status} ${generateResponse.statusText} ${errorText}`);
714+ const errorJson = tryParse(errorText) ?? { error: true };
715+ return response.status(500).send(errorJson);
716+ }
717+ const generateResponseJson = await generateResponse.json();
718+ console.log('DeepSeek response:', generateResponseJson);
719+ return response.send(generateResponseJson);
720+ }
721+ } catch (error) {
722+ console.log('Error communicating with DeepSeek API: ', error);
723+ if (!response.headersSent) {
724+ response.send({ error: true });
725+ } else {
726+ response.end();
727+ }
728+ }
729+}
730+
731+
649732export const router = express.Router();
650733
651734router.post('/status', jsonParser, async function (request, response_getstatus_openai) {
@@ -690,8 +773,8 @@ router.post('/status', jsonParser, async function (request, response_getstatus_o
690773 api_key_openai = readSecret(request.user.directories, SECRET_KEYS.NANOGPT);
691774 headers = {};
692775 } else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.DEEPSEEK) {
693776 api_url = new URL(request.body.reverse_proxy || API_DEEPSEEK.replace('/beta', ''));
694777 api_key_openai = request.body.reverse_proxy ? request.body.proxy_password : readSecret(request.user.directories, SECRET_KEYS.DEEPSEEK);
695778 headers = {};
696779 } else {
697780 console.log('This chat completion source is not supported yet.');
@@ -851,6 +934,7 @@ router.post('/generate', jsonParser, function (request, response) {
851934 case CHAT_COMPLETION_SOURCES.MAKERSUITE: return sendMakerSuiteRequest(request, response);
852935 case CHAT_COMPLETION_SOURCES.MISTRALAI: return sendMistralAIRequest(request, response);
853936 case CHAT_COMPLETION_SOURCES.COHERE: return sendCohereRequest(request, response);
937+ case CHAT_COMPLETION_SOURCES.DEEPSEEK: return sendDeepSeekRequest(request, response);
854938 }
855939
856940 let apiUrl;
@@ -964,19 +1048,6 @@ router.post('/generate', jsonParser, function (request, response) {
9641048 apiKey = readSecret(request.user.directories, SECRET_KEYS.BLOCKENTROPY);
9651049 headers = {};
9661050 bodyParams = {};
967- } else if (request.body.chat_completion_source === CHAT_COMPLETION_SOURCES.DEEPSEEK) {
968- apiUrl = API_DEEPSEEK;
969- apiKey = readSecret(request.user.directories, SECRET_KEYS.DEEPSEEK);
970- headers = {};
971- bodyParams = {};
972-
973- if (request.body.logprobs > 0) {
974- bodyParams['top_logprobs'] = request.body.logprobs;
975- bodyParams['logprobs'] = true;
976- }
977-
978- const postProcessType = String(request.body.model).endsWith('-reasoner') ? 'deepseek-reasoner' : 'deepseek';
979- request.body.messages = postProcessPrompt(request.body.messages, postProcessType, getPromptNames(request));
9801051 } else {
9811052 console.log('This chat completion source is not supported yet.');
9821053 return response.status(400).send({ error: true });
@@ -1114,4 +1185,3 @@ router.post('/generate', jsonParser, function (request, response) {
11141185 }
11151186 }
11161187});
1117-