kenji/illogical-impulse
1
0
Fork 0
forked from Shinonome/dots-hyprland
Code Pull Requests Activity

ai: actually make chat messages update incrementally

Browse Source 
(instead of destroying and recreating every update)
MUCH better performance and no more hundreds of latex files for one integration by parts work
This commit is contained in:
end-4
2025-04-08 11:28:31 +02:00
parent d74ac27db0
commit 9d33e8a404
3 changed files with 73 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.config/ags/modules/.miscutils/md2pango.js
+1 -1
View File
@@ -49,7 +49,7 @@ const replaceCategory = (text, replaces) => {
// Main function // Main function
export function replaceInlineLatexWithCodeBlocks(text) { export function replaceInlineLatexWithCodeBlocks(text) {
return text.replace(/\\\[(.*?)\\\]|\\\((.*?)\\\)|\$\$(.*?)\$\$|(?<!\w)\$(.*?[^\\])\$(?!\w)/gs, (match, square, round, double, single) => { return text.replace(/\\\[(.*?)\\\]|\\\((.*?)\\\)|\$\$(.*?)\$\$|(?:^|[^\w])\$(.*?[^\\])\$(?!\w)/gs, (match, square, round, double, single) => {
const latex = square || round || double || single; const latex = square || round || double || single;
return `\n\`\`\`latex\n${latex}\n\`\`\`\n`; return `\n\`\`\`latex\n${latex}\n\`\`\`\n`;
}); });
.config/ags/modules/sideleft/apis/ai_chatmessage.js
+71 -45
View File
@@ -49,12 +49,15 @@ const HighlightedCode = (content, lang) => {
const TextBlock = (content = '') => { const TextBlock = (content = '') => {
const widget = Label({ const widget = Label({
attribute: { attribute: {
'updateTextPlain': (text) => { 'text': content,
widget.label = text;
},
'updateText': (text) => { 'updateText': (text) => {
widget.attribute.updateTextPlain(md2pango(text)); widget.attribute.text = text;
} widget.label = md2pango(widget.attribute.text)
},
'appendText': (text) => {
widget.attribute.text += text;
widget.label = md2pango(widget.attribute.text)
},
}, },
hpack: 'fill', hpack: 'fill',
className: 'txt sidebar-chat-txtblock sidebar-chat-txt', className: 'txt sidebar-chat-txtblock sidebar-chat-txt',
@@ -93,11 +96,14 @@ const ThinkBlock = (content = '', revealChild = true) => {
}); });
const widget = Box({ const widget = Box({
attribute: { attribute: {
'updateTextPlain': (text) => { 'text': content,
mainText.label = text;
},
'updateText': (text) => { 'updateText': (text) => {
widget.attribute.updateTextPlain(md2pango(text)); widget.attribute.text = text;
mainText.label = md2pango(widget.attribute.text);
},
'appendText': (text) => {
widget.attribute.text += text;
mainText.label = md2pango(widget.attribute.text);
}, },
'done': () => { 'done': () => {
revealThought.value = false; revealThought.value = false;
@@ -150,7 +156,7 @@ const LatexBlock = (content = '') => {
// hscroll: 'automatic', // hscroll: 'automatic',
// homogeneous: true, // homogeneous: true,
attribute: { attribute: {
render: async (self, text) => { 'render': async (self, text) => {
if (text.length == 0) return; if (text.length == 0) return;
const styleContext = self.get_style_context(); const styleContext = self.get_style_context();
const fontSize = styleContext.get_property('font-size', Gtk.StateFlags.NORMAL); const fontSize = styleContext.get_property('font-size', Gtk.StateFlags.NORMAL);
@@ -193,9 +199,15 @@ sed -i 's/stroke="rgb(0%, 0%, 0%)"/stroke="${darkMode.value ? '#ffffff' : '#0000
className: 'sidebar-chat-latex', className: 'sidebar-chat-latex',
homogeneous: true, homogeneous: true,
attribute: { attribute: {
'text': content,
'updateText': (text) => { 'updateText': (text) => {
latexViewArea.attribute.render(latexViewArea, text).catch(print); wholeThing.attribute.text = text;
} latexViewArea.attribute.render(latexViewArea, wholeThing.attribute.text).catch(print);
},
'appendText': (text) => {
wholeThing.attribute.text += text;
latexViewArea.attribute.render(latexViewArea, wholeThing.attribute.text).catch(print);
},
}, },
children: [Scrollable({ children: [Scrollable({
vscroll: 'never', vscroll: 'never',
@@ -253,7 +265,10 @@ const CodeBlock = (content = '', lang = 'txt') => {
sourceView.showLineMarks = true; sourceView.showLineMarks = true;
} }
sourceView.get_buffer().set_text(text, -1); sourceView.get_buffer().set_text(text, -1);
} },
'appendText': (text) => {
codeBlock.attribute.updateText(sourceView.get_buffer().text + text);
},
}, },
className: 'sidebar-chat-codeblock', className: 'sidebar-chat-codeblock',
vertical: true, vertical: true,
@@ -294,76 +309,83 @@ const MessageContent = (content) => {
const contentBox = Box({ const contentBox = Box({
vertical: true, vertical: true,
attribute: { attribute: {
'lastUpdateTextLength': 0,
'inCode': false,
'fullUpdate': (self, content, useCursor = false) => { 'fullUpdate': (self, content, useCursor = false) => {
// Clear and add first text widget // First text widget
const children = contentBox.get_children(); if (contentBox.attribute.lastUpdateTextLength === 0
for (let i = 0; i < children.length; i++) { && contentBox.get_children().length === 0
const child = children[i]; ) {
child.destroy(); contentBox.add(TextBlock())
} }
contentBox.add(TextBlock())
let lines = replaceInlineLatexWithCodeBlocks(content).split('\n'); const codeBlockRegex = /^\s*```([a-zA-Z0-9]+)?\n?/;
const thinkBlockStartRegex = /^\s*<think>/; // Start: <think>
const thinkBlockEndRegex = /<\/think>\s*$/; // End: </think>
const dividerRegex = /^\s*---/;
const newContent = content.slice(contentBox.attribute.lastUpdateTextLength);
// print("CONTENT:'" + content + "'")
// print("LAST UPDATE LENGTH:" + contentBox.attribute.lastUpdateTextLength)
// print("NEW CONTENT:" + newContent)
if (newContent.length == 0) return;
let lines = replaceInlineLatexWithCodeBlocks(newContent).split('\n');
// let lines = newContent.split('\n');
// Process each line except the last line (potentially incomplete)
let lastProcessed = 0; let lastProcessed = 0;
let inCode = false;
for (let [index, line] of lines.entries()) { for (let [index, line] of lines.entries()) {
if (index == lines.length - 1) break;
// Code blocks // Code blocks
const codeBlockRegex = /^\s*```([a-zA-Z0-9]+)?\n?/;
if (codeBlockRegex.test(line)) { if (codeBlockRegex.test(line)) {
const kids = self.get_children(); const kids = self.get_children();
const lastLabel = kids[kids.length - 1]; const lastLabel = kids[kids.length - 1];
const blockContent = lines.slice(lastProcessed, index).join('\n'); const blockContent = lines.slice(lastProcessed, index).join('\n');
if (!inCode) {
lastLabel.attribute.updateText(blockContent); if (!contentBox.attribute.inCode) {
if (lastLabel.label == '') lastLabel.destroy(); lastLabel.attribute.appendText(blockContent);
if (lastLabel.label === '') lastLabel.destroy();
contentBox.add(CodeBlock('', codeBlockRegex.exec(line)[1])); contentBox.add(CodeBlock('', codeBlockRegex.exec(line)[1]));
} }
else { else {
lastLabel.attribute.updateText(blockContent); lastLabel.attribute.appendText(blockContent);
contentBox.add(TextBlock()); contentBox.add(TextBlock());
} }
lastProcessed = index + 1; lastProcessed = index + 1;
inCode = !inCode; contentBox.attribute.inCode = !contentBox.attribute.inCode;
} }
// Think block // Think block
const thinkBlockStartRegex = /^\s*<think>/; // Start: <think> if (!contentBox.attribute.inCode && (thinkBlockStartRegex.test(line) || thinkBlockEndRegex.test(line))) {
const thinkBlockEndRegex = /<\/think>\s*$/; // End: </think>
if (!inCode && (thinkBlockStartRegex.test(line) || thinkBlockEndRegex.test(line))) {
const kids = self.get_children(); const kids = self.get_children();
const lastLabel = kids[kids.length - 1]; const lastLabel = kids[kids.length - 1];
const blockContent = lines.slice(lastProcessed, index).join('\n'); const blockContent = lines.slice(lastProcessed, index).join('\n');
lastLabel.attribute.updateTextPlain(blockContent); lastLabel.attribute.appendText(blockContent);
if (lastLabel.label == '') lastLabel.destroy(); if (lastLabel.label === '') lastLabel.destroy();
if (thinkBlockStartRegex.test(line)) contentBox.add(ThinkBlock()); if (thinkBlockStartRegex.test(line)) contentBox.add(ThinkBlock());
else { else {
// lastLabel.attribute.done(); lastLabel.attribute.done();
contentBox.add(TextBlock()); contentBox.add(TextBlock());
} }
lastProcessed = index + 1; lastProcessed = index + 1;
} }
// Breaks // Breaks
const dividerRegex = /^\s*---/; if (!contentBox.attribute.inCode && dividerRegex.test(line)) {
if (!inCode && dividerRegex.test(line)) {
const kids = self.get_children(); const kids = self.get_children();
const lastLabel = kids[kids.length - 1]; const lastLabel = kids[kids.length - 1];
const blockContent = lines.slice(lastProcessed, index).join('\n'); const blockContent = lines.slice(lastProcessed, index).join('\n');
lastLabel.attribute.updateTextPlain(blockContent); lastLabel.attribute.appendText(blockContent);
contentBox.add(Divider()); contentBox.add(Divider());
contentBox.add(TextBlock()); contentBox.add(TextBlock());
lastProcessed = index + 1; lastProcessed = index + 1;
} }
} }
if (lastProcessed < lines.length) { if (lastProcessed < lines.length - 1) {
const kids = self.get_children(); const kids = self.get_children();
const lastLabel = kids[kids.length - 1]; const lastLabel = kids[kids.length - 1];
let blockContent = lines.slice(lastProcessed, lines.length).join('\n'); let blockContent = lines.slice(lastProcessed, lines.length - 1).join('\n') + '\n';
if (!inCode) lastLabel.attribute.appendText(blockContent);
lastLabel.attribute.updateTextPlain(`${md2pango(blockContent)}${useCursor ? userOptions.ai.writingCursor : ''}`);
else
lastLabel.attribute.updateText(blockContent);
} }
// Debug: plain text // Debug: plain text
// contentBox.add(Label({ // contentBox.add(Label({
@@ -376,6 +398,7 @@ const MessageContent = (content) => {
// label: '------------------------------\n' + md2pango(content), // label: '------------------------------\n' + md2pango(content),
// })) // }))
contentBox.show_all(); contentBox.show_all();
contentBox.attribute.lastUpdateTextLength = content.length - lines[lines.length - 1].length;
} }
} }
}); });
@@ -416,7 +439,7 @@ export const ChatMessage = (message, modelName = 'Model') => {
className: `txt txt-bold sidebar-chat-name sidebar-chat-name-${message.role == 'user' ? 'user' : 'bot'}`, className: `txt txt-bold sidebar-chat-name sidebar-chat-name-${message.role == 'user' ? 'user' : 'bot'}`,
wrap: true, wrap: true,
useMarkup: true, useMarkup: true,
label: (message.role == 'user' ? USERNAME : modelName), label: (message.role === 'user' ? USERNAME : modelName),
}), }),
Box({ Box({
homogeneous: true, homogeneous: true,
@@ -432,7 +455,10 @@ export const ChatMessage = (message, modelName = 'Model') => {
messageContentBox.attribute.fullUpdate(messageContentBox, message.content, message.role != 'user'); messageContentBox.attribute.fullUpdate(messageContentBox, message.content, message.role != 'user');
}, 'notify::content') }, 'notify::content')
.hook(message, (label, isDone) => { // Remove the cursor .hook(message, (label, isDone) => { // Remove the cursor
messageContentBox.attribute.fullUpdate(messageContentBox, message.content, false); if (!isDone && message.role !== 'user') return;
messageContentBox.attribute.fullUpdate(messageContentBox, message.content + '\n', false);
// print('----------------')
// print(message.content)
}, 'notify::done') }, 'notify::done')
, ,
}) })
@@ -442,7 +468,7 @@ export const ChatMessage = (message, modelName = 'Model') => {
} }
export const SystemMessage = (content, commandName, scrolledWindow) => { export const SystemMessage = (content, commandName, scrolledWindow) => {
const messageContentBox = MessageContent(content); const messageContentBox = MessageContent(content + '\n'); // Add newline so everything is added
const thisMessage = Box({ const thisMessage = Box({
className: 'sidebar-chat-message', className: 'sidebar-chat-message',
children: [ children: [
.config/ags/services/gemini.js
+1 -1
View File
@@ -284,7 +284,7 @@ class GeminiService extends Service {
send(msg) { send(msg) {
this._messages.push(new GeminiMessage('user', msg, false)); this._messages.push(new GeminiMessage('user', msg, false));
this.emit('newMsg', this._messages.length - 1); this.emit('newMsg', this._messages.length - 1);
const aiResponse = new GeminiMessage('model', 'thinking...', true, false) const aiResponse = new GeminiMessage('model', '', true, false)
const body = const body =
{ {