use workspace.showInputPalette instead of NotificationRequest

Signed-off-by: Tobias Wolf <[email protected]>

Author: tobiasfabian

README.md

@@ -1,7 +1,11 @@
-This Nova extension integrates [ollama](https://ollama.com) to help you *complete code* or *generate code* based on a prompt.
+This Nova extension integrates [ollama](https://ollama.com) to help you *complete code* or *generate code* based on a prompt. This extension was developed to use code completion without external services, to ensure privacy and to be independent of online services.
 
 The extension comes with two commands, `Assist` and `Complete code`.
 
+<video src="https://github.com/tobiasfabian/nova-ollama/assets/1524319/6b3058e8-a9d1-4d1e-b511-e4943aac11c8" autoplay muted loop width="600"></video>
+
+<video src="https://github.com/tobiasfabian/nova-ollama/assets/1524319/2de55322-989a-4e13-bf4e-660688d5ab09" autoplay muted loop width="600"></video>
+
 
 ## Requirements
 
@@ -21,6 +25,7 @@ To run one of these commands
 - Select the **Editor → ollama** menu item and click on `Assist` or `Complete code`
 - Open **Command Palette …** (`shift + cmd + p`) and type `Assist` or `Complete code`
 
+The `Assist` command is bind to `cmd + opt + ctrl + p`. To change the key binding, open the **Settings**, got to **Key Bindings** and search for *Assist*.
 
 ### Configuration
 
@@ -58,20 +63,18 @@ Controls how long the model will stay loaded into memory following the request
 #### System message “Complete code”
 Default: 
 ```
-You are a code autocompletion engine. Respond with a continuation of the code provided and nothing else. Don’t format code. Don’t put code in code block. Don’t repeat the input.
+You are a code autocompletion engine. Respond with a continuation of the code provided and nothing else. Code should not be in a code block. Anything that is not code should be written as a code comment.
 ```
 
-This system message is used when you run the “Complete code” command. You can try different messages to fine tune the output.
+This system message is used when you run the “Complete code” command. You can try different messages to fine-tune the output.
 
 #### System message “Assist”
 Default: 
 ```
-You are an assistant helping with coding. Respond with code only. Don’t format code. Don’t put code in code block. Don’t repeat the input.
+You are an assistant helping with coding. Respond with code only. Don’t format code. Don’t put code in code blocks. Don’t repeat the input.
 ```
 
-This system message is used when you run the “Assist” command. You can try different messages to fine tune the output.
+This system message is used when you run the “Assist” command. You can try different messages to fine-tune the output.
 
 ### Privacy
 This extension needs **Send Network Requests** permission to send and receive requests to the locally running ollama server. No data will be sent to external servers.
-
-> This Nova extension is briefly inspired by [ollama-autocoder (VS Code extension)](https://github.com/10Nates/ollama-autocoder)

Scripts/main.js

@@ -4,9 +4,12 @@
 
 const encoder = new TextDecoder();
 
+// Toggle which controls insertStream()
+let continueReading = true;
+
 let ollamaOrigin = nova.config.get('tobiaswolf.ollama.origin') ?? 'http://localhost:11434';
 let apiUrl = `${ollamaOrigin}/api`;
-let modelName = nova.config.get('tobiaswolf.ollama.modelName') ?? llama2;
+let modelName = nova.config.get('tobiaswolf.ollama.modelName') ?? 'llama2';
 
 const checkIfModelExists = async () => {
 	try {
@@ -39,6 +42,8 @@ const showError = async (message) => {
 
 const requestOllama = async (input, apiSystem) => {
 	try {
+		openCancelNotificationRequest();
+
 		if (input === '') {
 			console.log(`No input provided. ${input}`);
 			return;
@@ -84,13 +89,28 @@ const cleanResponseText = (responseText, editor) => {
 	return responseText;
 }
 
+const interruptCodeGeneration = () => {
+	// set continueReading toggle
+	continueReading = false;
+	setTimeout(() => {
+		continueReading = true;
+	}, 500);
+}
+
 const insertStream = async (reader, editor) => {
 	return await new Promise((resolve, reject) => {
 		let responseText = '';
 		const startInputPosition = editor.selectedRange.end;
 		let inputPosition = startInputPosition;
 
 		const readStream = () => {
+			if (continueReading === false) {
+				const inputRange = new Range(startInputPosition, startInputPosition + responseText.length);
+
+				editor.addSelectionForRange(inputRange);
+				return reject('Stream reading interrupted');
+			}
+
 			reader.read().then(async ({ done, value }) => {
 				const data = JSON.parse(encoder.decode(value));
 				let responseTextChunk = data.response;
@@ -121,6 +141,7 @@ const insertStream = async (reader, editor) => {
 					newInputRange = new Range(startInputPosition, startInputPosition + responseText.length);
 
 					editor.addSelectionForRange(newInputRange);
+					nova.notifications.cancel('ollama-cancel-request');
 					resolve(responseText);
 				} else {
 					readStream();
@@ -136,45 +157,74 @@ const insertStream = async (reader, editor) => {
 	});
 }
 
+
+
+const openCancelNotificationRequest = async () => {
+	const notificationRequest = new NotificationRequest("ollama-cancel-request");
+	notificationRequest.title = nova.localize("Cancel output?");
+	notificationRequest.actions = [nova.localize("Cancel output")];
+
+	const promise = nova.notifications.add(notificationRequest);
+	promise.then(async (reply) => {
+		if (reply.actionIdx === 0) {
+			console.info('Cancel output');
+			interruptCodeGeneration();
+		}
+	});
+}
+
 const completeCode = async (editor) => {
-	var selectedRanges = editor.selectedRanges.reverse();
-	for (var range of selectedRanges) {
-		// get selected text
-		let input = editor.getTextInRange(range);
-		if (input === '') {
+	try {
+		var selectedRange = editor.selectedRange;
+		const selectedText = editor.selectedText;
+		let input = selectedText;
+		if (selectedText === '') {
 			// get text from cursor to beginning of file
-			input = editor.getTextInRange(new Range(0, range.end));
+			input = editor.getTextInRange(new Range(0, selectedRange.end));
 		}
 		const systemMessageCompleteCode = nova.config.get('tobiaswolf.ollama.systemMessageCompleteCode');
 		const response = await requestOllama(input, systemMessageCompleteCode);
 		const responseText = await insertStream(response.body.getReader(), editor);
+	} catch (exception) {
+		console.error(exception);
 	}
 }
 
 const openAssistant = async (editor) => {
-	let notificationRequest = new NotificationRequest("ollama-assistant");
-	const syntax = editor.document.syntax;
-
-	notificationRequest.title = nova.localize("How can I assist you?");
-	notificationRequest.body = nova.localize(`Language: ${syntax}`);
-
-	if (syntax) {
-		notificationRequest.textInputValue = `${syntax}: `;
-	}
+	try {
+		const syntax = editor.document.syntax;
 
-	notificationRequest.type = "input";
-	notificationRequest.actions = [nova.localize("OK"), nova.localize("Cancel")];
+		const selectedText = editor.selectedText;
+		let inputMessage = 'Write a command.';
 
-	let promise = nova.notifications.add(notificationRequest);
-	promise.then(async (reply) => {
-		if (reply.actionIdx === 0) {
-			const systemMessageAssist = nova.config.get('tobiaswolf.ollama.systemMessageAssist');
-			const response = await requestOllama(reply.textInputValue, systemMessageAssist)
-			const responseText = await insertStream(response.body.getReader(), editor);
+		if (selectedText !== '') {
+			inputMessage = 'Write a command, selected text is added to the end of the command.';
 		}
-	}, error => {
-		console.error(error);
-	});
+
+		nova.workspace.showInputPalette(inputMessage, {
+			value: syntax ? `${syntax}: ` : null,
+			placeholder: 'JS: Fetch request with json reponse.',
+		}, async (input) => {
+			console.log(input);
+			if (input) {
+				if (selectedText !== '') {
+					input += `
+
+					${selectedText}
+					`
+				}
+				try {
+					const systemMessageAssist = nova.config.get('tobiaswolf.ollama.systemMessageAssist');
+					const response = await requestOllama(input, systemMessageAssist)
+					const responseText = await insertStream(response.body.getReader(), editor);
+				} catch (exception) {
+					console.error(exception);
+				}
+			}
+		});
+	} catch (exception) {
+		console.error(exception);
+	}
 };
 
 
@@ -183,7 +233,6 @@ const openAssistant = async (editor) => {
 nova.config.onDidChange('tobiaswolf.ollama.origin', (disposable) => {
 	ollamaOrigin = disposable;
 	apiUrl = `${ollamaOrigin}/api`;
-	console.log(apiUrl);
 	checkIfModelExists();
 });
 nova.config.onDidChange('tobiaswolf.ollama.modelName', (disposable) => {

extension.json

@@ -7,6 +7,7 @@
   "license": "MIT",
   "repository": "https://github.com/tobiasfabian/nova-ollama",
   "bugs": "https://github.com/tobiasfabian/nova-ollama/issues",
+  "funding": "https://github.com/sponsors/tobiasfabian",
   "categories": [
     "commands"
   ],
@@ -22,7 +23,8 @@
       },
       {
         "title": "Assist",
-        "command": "tobiaswolf.ollama.assist"
+        "command": "tobiaswolf.ollama.assist",
+        "shortcut": "cmd-opt-ctrl-p"
       }
     ]
   },
@@ -61,16 +63,16 @@
       "key": "tobiaswolf.ollama.systemMessageCompleteCode",
       "title": "System message “Complete code”",
       "type": "text",
-      "placeholder": "e.g. “You are a code autocompletion engine. Respond with a continuation of the code provided and nothing else. Don’t format code. Don’t put code in code block. Don’t repeat the input.”",
-      "default": "You are a code autocompletion engine. Respond with a continuation of the code provided and nothing else. Don’t format code. Don’t put code in code block. Don’t repeat the input.",
+      "placeholder": "e.g. “You are a code autocompletion engine. Respond with a continuation of the code provided and nothing else. Code should not be in a code block. Anything that is not code should be written as a code comment.”",
+      "default": "You are a code autocompletion engine. Respond with a continuation of the code provided and nothing else. Code should not be in a code block. Anything that is not code should be written as a code comment.",
       "description": "This system message is used, when you run the “Complete code” command."
     },
     {
       "key": "tobiaswolf.ollama.systemMessageAssist",
       "title": "System message “Assist”",
       "type": "text",
-      "placeholder": "e.g. “You are an assistant helping with coding. Respond with code only. Don’t format code. Don’t put code in code block. Don’t repeat the input.”",
-      "default": "You are an assistant helping with coding. Respond with code only. Don’t format code. Don’t put code in code block. Don’t repeat the input.",
+      "placeholder": "e.g. “You are an assistant helping with coding. Respond with code only. Don’t format code. Don’t put code in code blocks. Don’t repeat the input.”",
+      "default": "You are an assistant helping with coding. Respond with code only. Don’t format code. Don’t put code in code blocks. Don’t repeat the input.",
       "description": "This system message is used, when you run the “Assist” command."
     }
   ],
@@ -109,16 +111,16 @@
       "key": "tobiaswolf.ollama.systemMessageCompleteCode",
       "title": "System message “Complete code”",
       "type": "text",
-      "placeholder": "e.g. “You are a code autocompletion engine. Respond with a continuation of the code provided and nothing else. Don’t format code. Don’t put code in code block. Don’t repeat the input.”",
-      "default": "You are a code autocompletion engine. Respond with a continuation of the code provided and nothing else. Don’t format code. Don’t put code in code block. Don’t repeat the input.",
+      "placeholder": "e.g. “You are a code autocompletion engine. Respond with a continuation of the code provided and nothing else. Code should not be in a code block. Anything that is not code should be written as a code comment.”",
+      "default": "You are a code autocompletion engine. Respond with a continuation of the code provided and nothing else. Code should not be in a code block. Anything that is not code should be written as a code comment.",
       "description": "This system message is used, when you run the “Complete code” command."
     },
     {
       "key": "tobiaswolf.ollama.systemMessageAssist",
       "title": "System message “Assist”",
       "type": "text",
-      "placeholder": "e.g. “You are an assistant helping with coding. Respond with code only. Don’t format code. Don’t put code in code block. Don’t repeat the input.”",
-      "default": "You are an assistant helping with coding. Respond with code only. Don’t format code. Don’t put code in code block. Don’t repeat the input.",
+      "placeholder": "e.g. “You are an assistant helping with coding. Respond with code only. Don’t format code. Don’t put code in code blocks. Don’t repeat the input.”",
+      "default": "You are an assistant helping with coding. Respond with code only. Don’t format code. Don’t put code in code blocks. Don’t repeat the input.",
       "description": "This system message is used, when you run the “Assist” command."
     }
   ]