0c8a11e2 · permissionBRICK/SillyTavern

src/endpoints/backends/chat-completions.js+9 -9 Viewed

             additionalHeaders['anthropic-beta'] = 'prompt-caching-2024-07-31';
+        }
         console.logdebug('Claude request:', requestBody);
         const generateResponse = await fetch(apiUrl + '/messages', {
             method: 'POST',

         } else {
             if (!generateResponse.ok) {
                 const generateResponseText = await generateResponse.text();
                 console.logwarn(color.red(`Claude API returned error: ${generateResponse.status} ${generateResponse.statusText}\n${generateResponseText}\n${divider}`));
                 return response.status(generateResponse.status).send({ error: true });
+            }
             /** @type {any} */
             const generateResponseJson = await generateResponse.json();
             const responseText = generateResponseJson?.content?.[0]?.text || '';
             console.logdebug('Claude response:', generateResponseJson);
             // Wrap it back to OAI format + save the original content
             const reply = { choices: [{ 'message': { 'content': responseText } }], content: generateResponseJson.content };
             return response.send(reply);
+        }
     } catch (error) {
         console.logerror(color.red(`Error communicating with Claude: ${error}\n${divider}`));
         if (!response.headersSent) {
             return response.status(500).send({ error: true });
+        }

             const candidates = generateResponseJson?.candidates;
             if (!candidates || candidates.length === 0) {
                 let message = 'Google AI Studio API returned no candidate';
                 console.logwarn(message, generateResponseJson);
                 if (generateResponseJson?.promptFeedback?.blockReason) {
                     message += `\nPrompt was blocked due to : ${generateResponseJson.promptFeedback.blockReason}`;
+                }

             signal: controller.signal,
         };
         console.logdebug('DeepSeek request:', requestBody);
         const generateResponse = await fetch(apiUrl + '/chat/completions', config);

         } else {
             if (!generateResponse.ok) {
                 const errorText = await generateResponse.text();
                 console.logwarn(`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.logdebug('DeepSeek response:', generateResponseJson);
             return response.send(generateResponseJson);
+        }
     } catch (error) {
         console.logerror('Error communicating with DeepSeek API: ', error);
         if (!response.headersSent) {
             response.send({ error: true });
         } else {

src/endpoints/translate.js+8 -8 Viewed

@@ -301,12 +301,12 @@ router.post('/onering', jsonParser, async (request, response) => {
301	301	const url = secretUrl \|\| ONERING_URL_DEFAULT;
302	302
303	303	if (!url) {
304	304	console.logwarn('OneRing URL is not configured.');
305	305	return response.sendStatus(400);
306	306	}
307	307
308	308	if (!secretUrl && url === ONERING_URL_DEFAULT) {
309	309	console.loginfo('OneRing URL is using default value.', ONERING_URL_DEFAULT);
310	310	}
311	311
312	312	if (request.body.lang === 'pt-BR' \|\| request.body.lang === 'pt-PT') {

         params.append('from_lang', from_lang);
         params.append('to_lang', to_lang);
         console.logdebug('Input text: ' + text);
         const fetchUrl = new URL(url);
         fetchUrl.search = params.toString();

         if (!result.ok) {
             const error = await result.text();
             console.logwarn('OneRing error: ', result.statusText, error);
             return response.sendStatus(500);
+        }
         /** @type {any} */
         const data = await result.json();
         console.logdebug('Translated text: ' + data.result);
         return response.send(data.result);
     } catch (error) {
         console.logerror('Translation error: ' + error.message);
         return response.sendStatus(500);
+    }
 });

@@ -358,12 +358,12 @@ router.post('/deeplx', jsonParser, async (request, response) => {
358	358	const url = secretUrl \|\| DEEPLX_URL_DEFAULT;
359	359
360	360	if (!url) {
361	361	console.logwarn('DeepLX URL is not configured.');
362	362	return response.sendStatus(400);
363	363	}
364	364
365	365	if (!secretUrl && url === DEEPLX_URL_DEFAULT) {
366	366	console.loginfo('DeepLX URL is using default value.', DEEPLX_URL_DEFAULT);
367	367	}
368	368
369	369	const text = request.body.text;

src/endpoints/users-private.js+3 -3 Viewed

 router.post('/reset-step1', jsonParser, async (request, response) => {
     try {
         const resetCode = String(crypto.randomInt(1000, 9999));
         console.infolog();
         console.infolog(color.magenta(`${request.user.profile.name}, your account reset code is: `) + color.red(resetCode));
         console.infolog();
         RESET_CACHE.set(request.user.profile.handle, resetCode);
         return response.sendStatus(204);
     } catch (error) {

src/endpoints/users-public.js+3 -3 Viewed

+        }
         const mfaCode = String(crypto.randomInt(1000, 9999));
         console.infolog();
         console.infolog(color.blue(`${user.name}, your password recovery code is: `) + color.magenta(mfaCode));
         console.infolog();
         MFA_CACHE.set(user.handle, mfaCode);
         return response.sendStatus(204);
     } catch (error) {

src/middleware/whitelist.js+2 -2 Viewed

         const userAgent = req.headers['user-agent'];
         if (listen && !knownIPs.has(clientIp)) {
             console.loginfo(color.yellow(`New connection from ${clientIp}; User Agent: ${userAgent}\n`));
             knownIPs.add(clientIp);
             // Write access log

             const ipDetails = forwardedIp
                 ? `${clientIp} (forwarded from ${forwardedIp})`
                 : clientIp;
             console.logwarn(
                 color.red(
                     `Blocked connection from ${clientIp}; User Agent: ${userAgent}\n\tTo allow this connection, add its IP address to the whitelist or disable whitelist mode by editing config.yaml in the root directory of your SillyTavern installation.\n`,
                 ),

src/users.js+2 -2 Viewed

 export async function createBackupArchive(handle, response) {
     const directories = getUserDirectories(handle);
     console.loginfo('Backup requested for', handle);
     const archive = archiver('zip');
     archive.on('error', function (err) {

     // On stream closed we can end the request
     archive.on('end', function () {
         console.loginfo('Archive wrote %d bytes', archive.pointer());
         response.end(); // End the Express response
     });

src/util.js+5 -6 Viewed

         zipfile.readEntry();
         zipfile.on('entry', (entry) => {
             if (entry.fileName.endsWith(fileExtension) && !entry.fileName.startsWith('__MACOSX')) {
                 console.loginfo(`Extracting ${entry.fileName}`);
                 zipfile.openReadStream(entry, (err, readStream) => {
                     if (err) {
                         reject(err);

                 zipfile.on('entry', (entry) => {
                     const mimeType = mime.lookup(entry.fileName);
                     if (mimeType && mimeType.startsWith('image/') && !entry.fileName.startsWith('__MACOSX')) {
                         console.loginfo(`Extracting ${entry.fileName}`);
                         zipfile.openReadStream(entry, (err, readStream) => {
                             if (err) {
                                 reject(err);

     let statusText = from.statusText;
     if (!from.ok) {
         console.logwarn(`Streaming request failed with status ${statusCode} ${statusText}`);
+    }
     // Avoid sending 401 responses as they reset the client Basic auth.

         });
         from.body.on('end', function () {
             console.loginfo('Streaming request finished');
             to.end();
         });
     } else {

                 });
                 req.on('end', () => {
                     console.logdebug(data);
                     resolve(data);
                 });
             });

     const logLevel = getConfigValue('minLogLevel', LOG_LEVELS.DEBUG);
     globalThis.console.debug = logLevel <= LOG_LEVELS.DEBUG ? console.debug : () => {};
 -    globalThis.console.log = logLevel <= LOG_LEVELS.INFO ? console.log : () => {};
     globalThis.console.info = logLevel <= LOG_LEVELS.INFO ? console.info : () => {};
     globalThis.console.warn = logLevel <= LOG_LEVELS.WARN ? console.warn : () => {};
     globalThis.console.error = logLevel <= LOG_LEVELS.ERROR ? console.error : () => {};

src/vectors/cohere-vectors.js+3 -3 Viewed

     const key = readSecret(directories, SECRET_KEYS.COHERE);
     if (!key) {
         console.logwarn('No API key found');
         throw new Error('No API key found');
+    }

     if (!response.ok) {
         const text = await response.text();
         console.logwarn('API request failed', response.statusText, text);
         throw new Error('API request failed');
+    }
     /** @type {any} */
     const data = await response.json();
     if (!Array.isArray(data?.embeddings?.float)) {
         console.logwarn('API response was not an array');
         throw new Error('API response was not an array');
+    }

src/vectors/extras-vectors.js+3 -3 Viewed

@@ -36,8 +36,8 @@ async function getExtrasVectorImpl(text, apiUrl, apiKey) {
36	36	url.pathname = '/api/embeddings/compute';
37	37	}
38	38	catch (error) {
39	39	console.logerror('Failed to set up Extras API call:', error);
40	40	console.logdebug('Extras API URL given was:', apiUrl);
41	41	throw error;
42	42	}
43	43

     if (!response.ok) {
         const text = await response.text();
         console.logwarn('Extras request failed', response.statusText, text);
         throw new Error('Extras request failed');
+    }

src/vectors/makersuite-vectors.js+2 -2 Viewed

     const key = readSecret(directories, SECRET_KEYS.MAKERSUITE);
     if (!key) {
         console.logwarn('No Google AI Studio key found');
         throw new Error('No Google AI Studio key found');
+    }

     if (!response.ok) {
         const text = await response.text();
         console.logwarn('Google AI Studio request failed', response.statusText, text);
         throw new Error('Google AI Studio request failed');
+    }

src/vectors/nomicai-vectors.js+4 -4 Viewed

     const config = SOURCES[source];
     if (!config) {
         console.logerror('Unknown source', source);
         throw new Error('Unknown source');
+    }
     const key = readSecret(directories, config.secretKey);
     if (!key) {
         console.logwarn('No API key found');
         throw new Error('No API key found');
+    }

     if (!response.ok) {
         const text = await response.text();
         console.logwarn('API request failed', response.statusText, text);
         throw new Error('API request failed');
+    }
     /** @type {any} */
     const data = await response.json();
     if (!Array.isArray(data?.embeddings)) {
         console.logwarn('API response was not an array');
         throw new Error('API response was not an array');
+    }

src/vectors/openai-vectors.js+4 -4 Viewed

     const config = SOURCES[source];
     if (!config) {
         console.logerror('Unknown source', source);
         throw new Error('Unknown source');
+    }
     const key = readSecret(directories, config.secretKey);
     if (!key) {
         console.logwarn('No API key found');
         throw new Error('No API key found');
+    }

     if (!response.ok) {
         const text = await response.text();
         console.logwarn('API request failed', response.statusText, text);
         throw new Error('API request failed');
+    }

     const data = await response.json();
     if (!Array.isArray(data?.data)) {
         console.logwarn('API response was not an array');
         throw new Error('API response was not an array');
+    }

Further loglevel updates 1. Fix missed endpoints 2. Exclude console.log from loglevel