Improve error handling of /genraw and /gen - /generate TC backend returns more status/error texts - Fix /genraw and /gen returning null/undefined - Logging errors on /genraw if backend throws an error - Fixes #2836

f5b68893d097d466d555eae68216cc23195b3651

Wolfsblvt <wolfsblvt@gmail.com>

public/script.js+1 -1 Viewed

@@ -3265,7 +3265,7 @@ export async function generateRaw(prompt, api, instructOverride, quietToLoud, sy
3265	3265	}
3266	3266
3267	3267	if (data.error) {
3268	3268	throw new Error(data.errorresponse);
3269	3269	}
3270	3270
3271	3271	const message = cleanUpMessage(extractMessageFromData(data), false, false, true);

public/scripts/slash-commands.js+9 -1 Viewed

 async function generateRawCallback(args, value) {
     if (!value) {
         console.warn('WARN: No argument provided for /genraw command');
         return '';
+    }
     // Prevent generate recursion

         setEphemeralStopStrings(resolveVariable(args?.stop));
         const result = await generateRaw(value, '', isFalseBoolean(args?.instruct), quietToLoud, systemPrompt, length);
         return result;
 +    } catch (err) {
 +        console.error('Error on /genraw generation', err);
 +        toastr.error(err.message, 'Error on Generate');
     } finally {
         if (lock) {
             activateSendButtons();
+        }
         flushEphemeralStoppingStrings();
+    }
 +    return '';
+}
 /**

         const name = args?.name;
         const result = await generateQuietPrompt(value, quietToLoud, false, '', name, length);
         return result;
 +    } catch (err) {
 +        console.error('Error on /genraw generation', err);
 +        toastr.error(err.message, 'Error on Generate');
     } finally {
         if (lock) {
             activateSendButtons();
+        }
         flushEphemeralStoppingStrings();
+    }
 +    return '';
+}
 /**

src/endpoints/backends/text-completions.js+3 -1 Viewed

@@ -375,7 +375,9 @@ router.post('/generate', jsonParser, async function (request, response) {
375	375	}
376	376	}
377	377	} catch (error) {
378	378	letconst valuestatus = { error: true, status: error?.status, response:?? error?.statusTextcode }?? 'UNKNOWN';
	379	+ const text = error?.error ?? error?.statusText ?? error?.message ?? 'Unknown error on /generate endpoint';
	380	+ let value = { error: true, status: status, response: text };
379	381	console.log('Endpoint error:', error);
380	382
381	383	if (!response.headersSent) {