klbr/khoj
1
0
Fork 0
mirror of https://github.com/khoaliber/khoj.git synced 2026-03-07 13:23:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Limit retries to fix invalid edit blocks in obsidian write mode

Browse Source
This commit is contained in:
Debanjum
2025-08-20 17:25:09 -07:00
parent c5e2373d73
commit 2e6928c582
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/interface/obsidian/src/chat_view.ts
View File

@@ -1374,19 +1374,26 @@ export class KhojChatView extends KhojPaneView {
if (this.fileAccessMode === 'write') { if (this.fileAccessMode === 'write') {
const editBlocks = this.parseEditBlocks(this.chatMessageState.rawResponse); const editBlocks = this.parseEditBlocks(this.chatMessageState.rawResponse);
// Check for errors and retry if needed
if (editBlocks.length > 0 && editBlocks[0].hasError && this.editRetryCount < this.maxEditRetries) {
await this.handleEditRetry(editBlocks[0]);
return;
}
// Reset retry count on success
this.editRetryCount = 0;
// Apply edits if there are any
if (editBlocks.length > 0) { if (editBlocks.length > 0) {
const firstBlock = editBlocks[0];
if (firstBlock.hasError) {
// Only retry if we have remaining attempts; do NOT reset counter on failure
if (this.editRetryCount < this.maxEditRetries) {
await this.handleEditRetry(firstBlock);
return; // Wait for retry response
} else {
// Exhausted retries; surface error and do not attempt further automatic retries
console.warn('[Khoj] Max edit retries reached. Aborting further retries.');
}
} else {
// Successful parse => reset counter and apply edits
this.editRetryCount = 0;
await this.applyEditBlocks(editBlocks); await this.applyEditBlocks(editBlocks);
} }
} else {
// No edit blocks => reset counter just in case
this.editRetryCount = 0;
}
} }
// Automatically respond with voice if the subscribed user has sent voice message // Automatically respond with voice if the subscribed user has sent voice message
@@ -2427,7 +2434,7 @@ export class KhojChatView extends KhojPaneView {
// Add retry count // Add retry count
retryBadge.createSpan({ retryBadge.createSpan({
cls: "retry-count", cls: "retry-count",
text: `Attempt ${this.editRetryCount}/3` text: `Attempt ${this.editRetryCount}/${this.maxEditRetries}`
}); });
// Add error details as a tooltip // Add error details as a tooltip
@@ -2442,7 +2449,7 @@ export class KhojChatView extends KhojPaneView {
retryBadge.scrollIntoView({ behavior: "smooth", block: "center" }); retryBadge.scrollIntoView({ behavior: "smooth", block: "center" });
// Create a retry prompt for the LLM // Create a retry prompt for the LLM
const retryPrompt = `/general I noticed some issues with the edit block. Please fix the following and provide a corrected version (retry ${this.editRetryCount}/3):\n\n${errorDetails}\n\nPlease provide a new edit block that fixes these issues. Make sure to follow the exact format required.`; const retryPrompt = `/general I noticed some issues with the edit block. Please fix the following and provide a corrected version (retry ${this.editRetryCount}/${this.maxEditRetries}):\n\n${errorDetails}\n\nPlease provide a new edit block that fixes these issues. Make sure to follow the exact format required.`;
// Send retry request without displaying the user message // Send retry request without displaying the user message
await this.getChatResponse(retryPrompt, "", false, false); await this.getChatResponse(retryPrompt, "", false, false);