Better naming

76193960537d0c0fa71de205b7e24c7c92ea52f6

bmen25124 <bmen25124@gmail.com>

public/scripts/custom-request.js+1 -2 Viewed

  * @property {Object} state - Generated state
  * @property {string?} [state.reasoning] - Generated reasoning
  * @property {string?} [state.image] - Generated image
- * @returns {StreamResponse}
  */
 // #endregion

                 const reply = getStreamingReply(parsed, state, {
                     chatCompletionSource: data.chat_completion_source,
-                    ignoreShowThoughts: true,
+                    overrideShowThoughts: true,
                 });
                 if (Array.isArray(parsed?.choices) && parsed?.choices?.[0]?.index > 0) {
                     const swipeIndex = parsed.choices[0].index - 1;

public/scripts/openai.js+16 -16 Viewed

  * Handles errors during streaming requests.
  * @param {Response} response
  * @param {string} decoded - response text or decoded stream data
- * @param {boolean?} [supressToastr=false]
+ * @param {boolean?} [quiet=false]
  */
-export function tryParseStreamingError(response, decoded, supressToastr = false) {
+export function tryParseStreamingError(response, decoded, quiet = false) {
     try {
         const data = JSON.parse(decoded);

@@ -1454,19 +1454,19 @@ export function tryParseStreamingError(response, decoded, supressToastr = false)
1454	return;	1454	return;
1455	}	1455	}
1456		1456
1457	checkQuotaError(data, supressToastr);	1457	checkQuotaError(data, quiet);
1458	checkModerationError(data, supressToastr);	1458	checkModerationError(data, quiet);
1459		1459
1460	// these do not throw correctly (equiv to Error("[object Object]"))	1460	// these do not throw correctly (equiv to Error("[object Object]"))
1461	// if trying to fix "[object Object]" displayed to users, start here	1461	// if trying to fix "[object Object]" displayed to users, start here
1462		1462
1463	if (data.error) {	1463	if (data.error) {
1464	!supressToastr && toastr.error(data.error.message \|\| response.statusText, 'Chat Completion API');	1464	!quiet && toastr.error(data.error.message \|\| response.statusText, 'Chat Completion API');
1465	throw new Error(data);	1465	throw new Error(data);
1466	}	1466	}
1467		1467
1468	if (data.message) {	1468	if (data.message) {
1469	!supressToastr && toastr.error(data.message, 'Chat Completion API');	1469	!quiet && toastr.error(data.message, 'Chat Completion API');
1470	throw new Error(data);	1470	throw new Error(data);
1471	}	1471	}
1472	}	1472	}

 /**
  * Checks if the response contains a quota error and displays a popup if it does.
  * @param data
- * @param {boolean?} [supressToastr=false]
+ * @param {boolean?} [quiet=false]
  * @returns {void}
  * @throws {object} - response JSON
  */
-function checkQuotaError(data, supressToastr = false) {
+function checkQuotaError(data, quiet = false) {
     if (!data) {
         return;
+    }
     if (data.quota_error) {
-        !supressToastr && renderTemplateAsync('quotaError').then((html) => Popup.show.text('Quota Error', html));
+        !quiet && renderTemplateAsync('quotaError').then((html) => Popup.show.text('Quota Error', html));
         // this does not throw correctly (equiv to Error("[object Object]"))
         // if trying to fix "[object Object]" displayed to users, start here

 /**
  * @param {any} data
- * @param {boolean?} [supressToastr=false]
+ * @param {boolean?} [quiet=false]
  */
-function checkModerationError(data, supressToastr = false) {
+function checkModerationError(data, quiet = false) {
     const moderationError = data?.error?.message?.includes('requires moderation');
-    if (moderationError && !supressToastr) {
+    if (moderationError && !quiet) {
         const moderationReason = `Reasons: ${data?.error?.metadata?.reasons?.join(', ') ?? '(N/A)'}`;
         const flaggedText = data?.error?.metadata?.flagged_input ?? '(N/A)';
         toastr.info(flaggedText, moderationReason, { timeOut: 10000 });

  * Extracts the reply from the response data from a chat completions-like source
  * @param {object} data Response data from the chat completions-like source
  * @param {object} state Additional state to keep track of
- * @param {object} options Additional options
+ * @param {object} [options] Additional options
  * @param {string?} [options.chatCompletionSource] Chat completion source
- * @param {boolean?} [options.ignoreShowThoughts] Ignore show thoughts
+ * @param {boolean?} [options.overrideShowThoughts] Override show thoughts
  * @returns {string} The reply extracted from the response data
  */
-export function getStreamingReply(data, state, { chatCompletionSource = null, ignoreShowThoughts = false } = {}) {
+export function getStreamingReply(data, state, { chatCompletionSource = null, overrideShowThoughts } = {}) {
     const chat_completion_source = chatCompletionSource ?? oai_settings.chat_completion_source;
-    const show_thoughts = ignoreShowThoughts ? true : oai_settings.show_thoughts;
+    const show_thoughts = overrideShowThoughts !== undefined ? overrideShowThoughts : oai_settings.show_thoughts;
     if (chat_completion_source === chat_completion_sources.CLAUDE) {
         if (show_thoughts) {