Add option to return malformed JSON string from extractJsonFromData (#5578) * feat: add option to return malformed JSON string from extractJsonFromData Fixes #5569 * fix: add fallback for Perplexity case

e5ae782705ee392bede099d3155931bde552d6b1

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

Signed

public/script.js+15 -4 Viewed

  * @prop {number} [responseLength] Maximum response length. If unset, the global default value is used.
  * @prop {boolean} [trimNames] Whether to allow trimming "{{user}}:" and "{{char}}:" from the response.
  * @prop {string} [prefill] An optional prefill for the prompt.
  * @prop {objectJsonSchema} [jsonSchema] JSON schema to use for the structured generation. Usually requires a special instruction.
  */
 /**

@@ -4041,7 +4041,7 @@ export async function generateRawData({ prompt = '', api = null, instructOverrid
4041	4041	}
4042	4042
4043	4043	if (jsonSchema) {
4044	4044	return extractJsonFromData(data, { mainApi: api, returnInvalidJson: jsonSchema.returnInvalid });
4045	4045	}
4046	4046
4047	4047	return data;

  * @property {object} value JSON schema value.
  * @property {string} [description] Description of the schema.
  * @property {boolean} [strict] If true, the schema will be used in strict mode, meaning that only the fields defined in the schema will be allowed.
 + * @property {boolean} [returnInvalid] If true, a string that can't be parsed as a JSON will be returned as is, instead of an empty object.
+ *
  * @typedef {object} GenerateOptions
  * @property {boolean} [automatic_trigger] If the generation was triggered automatically (e.g. group auto mode).

         if (jsonSchema) {
             unblockGeneration(type);
 -            return extractJsonFromData(data);
 +            return extractJsonFromData(data, { returnInvalidJson: jsonSchema.returnInvalid ?? false });
+        }
         //const getData = await response.json();

 /**
  * Extracts JSON from the response data.
  * @param {object} data Response data
 + * @param {object} [options] Extraction options
 + * @param {string} [options.mainApi] Main API to use
 + * @param {string} [options.chatCompletionSource] Chat completion source
 + * @param {boolean} [options.returnInvalidJson=false] Whether to return the raw JSON string even if it fails to parse
  * @returns {string} Extracted JSON string from the response data
  */
 export function extractJsonFromData(data, { mainApi = null, chatCompletionSource = null, returnInvalidJson = false } = {}) {
     mainApi = mainApi ?? main_api;
     chatCompletionSource = chatCompletionSource ?? oai_settings.chat_completion_source;

                     break;
                 case chat_completion_sources.PERPLEXITY:
                     result = tryParse(removeReasoningFromString(text));
 +                    if (!result && returnInvalidJson) {
 +                        return text;
 +                    }
                     break;
                 case chat_completion_sources.VERTEXAI:
                 case chat_completion_sources.MAKERSUITE:

                 case chat_completion_sources.ZAI:
                 default:
                     result = tryParse(text);
 +                    if (!result && returnInvalidJson) {
 +                        return text;
 +                    }
                     break;
+            }
         } break;

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

  * @property {string} [reverse_proxy] - Optional reverse proxy URL
  * @property {string} [proxy_password] - Optional proxy password
  * @property {string} [custom_prompt_post_processing] - Optional custom prompt post-processing
 + * @property {import('../script.js').JsonSchema} [json_schema] - Optional JSON schema for structured generation
  */
 /** @typedef {Record<string, any> & ChatCompletionPayloadBase} ChatCompletionPayload */