Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

In chat template, display preformatted/code snippet outputs sensibly #6137

Merged
merged 2 commits into from
Mar 18, 2025
+32 −0
Merged

In chat template, display preformatted/code snippet outputs sensibly #6137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f51b1e3
In chat template, display code snippet outputs sensibly
SteveSandersonMS Mar 17, 2025
0304f4c
Revert change I never asked for
SteveSandersonMS Mar 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions ...hCustomData/ChatWithCustomData.Web-CSharp/Components/Pages/Chat/ChatMessageItem.razor.css
View file
Original file line number Diff line number Diff line change
@@ -110,3 +110,11 @@
::deep th, ::deep tr:nth-child(even) {
background-color: rgba(0, 0, 0, 0.05);
}

::deep pre > code {
background-color: white;
display: block;
padding: 0.5rem 1rem;
margin: 1rem 0;
overflow-x: auto;
}
8 changes: 8 additions & 0 deletions ...tensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData.Web-CSharp/wwwroot/app.js
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,14 @@ customElements.define('assistant-message', class extends HTMLElement {
newValue = newValue.replace(/<citation.*?<\/citation>/gs, '');
const elements = marked.parse(newValue.replace(/</g, '&lt;'));
this.innerHTML = purify.sanitize(elements, { KEEP_CONTENT: false });

// Within text nodes, unescape the &lt; entities otherwise it will be displayed
// to the user as escaped if the element uses preformatted styling. This is safe
// because we're only updating the text content of text nodes.
const walker = document.createTreeWalker(this, NodeFilter.SHOW_TEXT);
while (walker.nextNode()) {
walker.currentNode.textContent = walker.currentNode.textContent.replace(/&lt;/g, '<');
}
}
}
});
8 changes: 8 additions & 0 deletions ...pshots/aichatweb.Basic.verified/aichatweb/Components/Pages/Chat/ChatMessageItem.razor.css
View file
Original file line number Diff line number Diff line change
@@ -110,3 +110,11 @@
::deep th, ::deep tr:nth-child(even) {
background-color: rgba(0, 0, 0, 0.05);
}

::deep pre > code {
background-color: white;
display: block;
padding: 0.5rem 1rem;
margin: 1rem 0;
overflow-x: auto;
}
8 changes: 8 additions & 0 deletions ...AI.Templates.IntegrationTests/Snapshots/aichatweb.Basic.verified/aichatweb/wwwroot/app.js
View file
Original file line number Diff line number Diff line change
@@ -11,6 +11,14 @@ customElements.define('assistant-message', class extends HTMLElement {
newValue = newValue.replace(/<citation.*?<\/citation>/gs, '');
const elements = marked.parse(newValue.replace(/</g, '&lt;'));
this.innerHTML = purify.sanitize(elements, { KEEP_CONTENT: false });

// Within text nodes, unescape the &lt; entities otherwise it will be displayed
// to the user as escaped if the element uses preformatted styling. This is safe
// because we're only updating the text content of text nodes.
const walker = document.createTreeWalker(this, NodeFilter.SHOW_TEXT);
while (walker.nextNode()) {
walker.currentNode.textContent = walker.currentNode.textContent.replace(/&lt;/g, '<');
}
}
}
});