Fix for chat completion prompts

792c077267f7370bcfc6554ebb8a4b2cadb45fe3

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

Parents: 014ef0cc4fdf4b70b70cbe2dd3bf1d3e88e88ea8

.eslintrc.js+1 -0 Viewed

                 Readability: 'readonly',
                 isProbablyReaderable: 'readonly',
                 ePub: 'readonly',
 +                diff_match_patch: 'readonly',
             },
         },
     ],

public/script.js+23 -24 Viewed

@@ -4907,7 +4907,7 @@ export function findItemizedPromptSet(itemizedPrompts, incomingMesId) {
4907	4907	console.log(`wanting to raw display of ArrayItem: ${PromptArrayItemForRawPromptDisplay} which is mesID ${incomingMesId}`);
4908	4908	console.log(itemizedPrompts[thisPromptSet]);
4909	4909	break;
4910	4910	} else if (itemizedPrompts[i].rawPrompt) {
4911	4911	priorPromptArrayItemForRawPromptDisplay = i;
4912	4912	}
4913	4913	}

+    }
     const params = await itemizedParams(itemizedPrompts, thisPromptSet);
 +    const flatten = (rawPrompt) => Array.isArray(rawPrompt) ? rawPrompt.map(x => x.content).join('\n') : rawPrompt;
     const template = params.this_main_api == 'openai'
         ? await renderTemplateAsync('itemizationChat', params)
         : await renderTemplateAsync('itemizationText', params);
     const popup = new Popup(template, POPUP_TYPE.TEXT);
 -    if (priorPromptArrayItemForRawPromptDisplay){
++
 -        popup.dlg.querySelector('#diffPrevPrompt').style.display='';
 +    /** @type {HTMLElement} */
 -        popup.dlg.querySelector('#diffPrevPrompt').addEventListener('click', function () {
 +    const diffPrevPrompt = popup.dlg.querySelector('#diffPrevPrompt');
 -            var dmp = new diff_match_patch();
 +    if (priorPromptArrayItemForRawPromptDisplay) {
 -            var text1 = itemizedPrompts[priorPromptArrayItemForRawPromptDisplay].rawPrompt;
 +        diffPrevPrompt.style.display = '';
 -            var text2 = itemizedPrompts[PromptArrayItemForRawPromptDisplay].rawPrompt;
 +        diffPrevPrompt.addEventListener('click', function () {
 +            const dmp = new diff_match_patch();
 +            const text1 = flatten(itemizedPrompts[priorPromptArrayItemForRawPromptDisplay].rawPrompt);
 +            const text2 = flatten(itemizedPrompts[PromptArrayItemForRawPromptDisplay].rawPrompt);
             dmp.Diff_Timeout = 2.0;
+-
 -            var d = dmp.diff_main(text1, text2);
 -            var ds = dmp.diff_prettyHtml(d);
 +            const d = dmp.diff_main(text1, text2);
 +            let ds = dmp.diff_prettyHtml(d);
             // make it readable
             ds = ds.replaceAll("'background:#e6ffe6;"', "'background:#b9f3b9; color:black;"');
             ds = ds.replaceAll("'background:#ffe6e6;"', "'background:#f5b4b4; color:black;"');
             ds = ds.replaceAll("'&para;"', ""'');
 -            ds = "<div style='display:block;'>" + ds + "</div>";
 +            const container = document.createElement('div');
 +            container.innerHTML = DOMPurify.sanitize(ds);
             const rawPromptWrapper = document.getElementById('rawPromptWrapper');
 -            rawPromptWrapper.innerHTML = ds;
 +            rawPromptWrapper.replaceChildren(container);
             $('#rawPromptPopup').slideToggle();
         });
     } else {
         popup.dlg.querySelector('#diffPrevPrompt').style.display = 'none';
+    }
     popup.dlg.querySelector('#copyPromptToClipboard').addEventListener('click', function () {
         let rawPrompt = itemizedPrompts[PromptArrayItemForRawPromptDisplay].rawPrompt;

         console.log(itemizedPrompts);
         console.log(itemizedPrompts[PromptArrayItemForRawPromptDisplay].rawPrompt);
         letconst rawPrompt = flatten(itemizedPrompts[PromptArrayItemForRawPromptDisplay].rawPrompt);
 -        let rawPromptValues = rawPrompt;
+-
 -        if (Array.isArray(rawPrompt)) {
 -            rawPromptValues = rawPrompt.map(x => x.content).join('\n');
 -        }
         //let DisplayStringifiedPrompt = JSON.stringify(itemizedPrompts[PromptArrayItemForRawPromptDisplay].rawPrompt).replace(/\n+/g, '<br>');
         const rawPromptWrapper = document.getElementById('rawPromptWrapper');
         rawPromptWrapper.innerText = rawPromptValuesrawPrompt;
         $('#rawPromptPopup').slideToggle();
     });