diff --git a/.gitignore b/.gitignore index e201974879..7d333204e8 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ client/public/main.js.LICENSE.txt # Deployed apps should consider commenting these lines out: # see https://npmjs.org/doc/faq.html#Should-I-check-my-node_modules-folder-into-git node_modules/ +meili_data/ api/node_modules/ client/node_modules/ bower_components/ diff --git a/api/server/routes/askBing.js b/api/server/routes/askBing.js index 0614faf86a..18a08c4135 100644 --- a/api/server/routes/askBing.js +++ b/api/server/routes/askBing.js @@ -117,8 +117,8 @@ const ask = async ({ ); conversationId = userMessage.conversationId; - response.text = response.response; - delete response.response; + response.text = response.response || response.details.spokenText || '**Bing refused to answer.**'; + // delete response.response; // response.id = response.details.messageId; response.suggestions = response.details.suggestedResponses && diff --git a/api/server/routes/askSydney.js b/api/server/routes/askSydney.js index a2017cf7d6..c85bd20d52 100644 --- a/api/server/routes/askSydney.js +++ b/api/server/routes/askSydney.js @@ -111,8 +111,8 @@ const ask = async ({ response.conversationSignature = convo.conversationSignature ? convo.conversationSignature : crypto.randomUUID(); - response.text = response.response; - delete response.response; + response.text = response.response || response.details.spokenText || '**Bing refused to answer.**'; + // delete response.response; response.suggestions = response.details.suggestedResponses && response.details.suggestedResponses.map((s) => s.text); diff --git a/api/server/routes/handlers.js b/api/server/routes/handlers.js index 3ba4e81243..99a70e6e8f 100644 --- a/api/server/routes/handlers.js +++ b/api/server/routes/handlers.js @@ -1,8 +1,6 @@ const _ = require('lodash'); -const sanitizeHtml = require('sanitize-html'); const citationRegex = /\[\^\d+?\^]/g; const { getCitations, citeText, detectCode } = require('../../app/'); -// const htmlTagRegex = /(<\/?\s*[a-zA-Z]*\s*(?:\s+[a-zA-Z]+\s*=\s*(?:"[^"]*"|'[^']*'))*\s*(?:\/?)>|<\s*[a-zA-Z]+\s*(?:\s+[a-zA-Z]+\s*=\s*(?:"[^"]*"|'[^']*'))*\s*(?:\/?>|<\/?>))/g; const handleError = (res, message) => { res.write(`event: error\ndata: ${JSON.stringify(message)}\n\n`); @@ -28,14 +26,6 @@ const createOnProgress = () => { tokens = tokens.replace(/^\n/, ''); } - // const htmlTags = tokens.match(htmlTagRegex); - // if (tokens.includes('```') && htmlTags && htmlTags.length > 0) { - // htmlTags.forEach((tag) => { - // const sanitizedTag = sanitizeHtml(tag); - // tokens = tokens.replaceAll(tag, sanitizedTag); - // }); - // } - if (bing) { tokens = citeText(tokens, true); } @@ -54,7 +44,7 @@ const createOnProgress = () => { const handleText = async (response, bing = false) => { let { text } = response; - text = await detectCode(text); + // text = await detectCode(text); response.text = text; if (bing) { @@ -66,14 +56,6 @@ const handleText = async (response, bing = false) => { text += links?.length > 0 ? `\n${links}` : ''; } - // const htmlTags = text.match(htmlTagRegex); - // if (text.includes('```') && htmlTags && htmlTags.length > 0) { - // htmlTags.forEach((tag) => { - // const sanitizedTag = sanitizeHtml(tag); - // text = text.replaceAll(tag, sanitizedTag); - // }); - // } - return text; };