Merge pull request #30 from PromptMixerDev/29-add-option-to-send-para…

…meters-and-images

Bump version to 1.0.7 in package.json and manifest.json

config.js

@@ -78,10 +78,18 @@ export const config = {
 		'llama3:text',
 		'llama3:70b-text',
 	],
+	properties: [
+		{
+			id: 'prompt',
+			name: 'System Prompt',
+			value: 'You are a helpful assistant.',
+			type: 'string',
+		},
+	],
 	settings: [],
 	description:
 		'Ollama connector runs open-source large language models (LLMs). It supports a variety of LLMs including LLaMA-2, uncensored LLaMA, CodeLLaMA, Falcon, Mistral, Vicuna model, WizardCoder, and Wizard',
-	author: 'Prompt Mixer team',
+	author: 'Prompt Mixer',
 	iconBase64:
 		'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMjAiIGhlaWdodD0iMjAiIHZpZXdCb3g9IjAgMCAyMCAyMCIgZmlsbD0ibm9uZSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIj4KPHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBjbGlwLXJ1bGU9ImV2ZW5vZGQiIGQ9Ik01LjM2MTI5IDEuNUM2LjAxMTY1IDEuNSA2LjU0MDA3IDIuMzMxOTMgNi41NTA3NSAzLjM2NDYxTDYuNTcxMzUgMy4zNTIxMUw2LjU5NTE4IDMuMzM4MDFDNi42MDg3NSAzLjMzMDE1IDYuNjIyMzkgMy4zMjI0IDYuNjM2MTEgMy4zMTQ4MkM3LjA3MDI3IDMuMDc0NzkgNy41NDY4NyAzLjAwNzA0IDcuOTg4NjEgMy4wMDQ4NUg4TDguMDExMzkgMy4wMDQ5MkM4LjQ1MzEzIDMuMDA3MTEgOC45Mjk3MyAzLjA3NDc5IDkuMzYzODkgMy4zMTQ4MkM5LjQwOTc5IDMuMzQwMjEgOS40NTQ3OSAzLjM2NzI3IDkuNDk4ODYgMy4zOTYwNkM5LjQ5OTAxIDIuMzQ4ODUgMTAuMDMxNiAxLjUgMTAuNjg4NSAxLjVDMTEuMzQ1NSAxLjUgMTEuODc4MSAyLjM0OTA3IDExLjg3ODEgMy4zOTY0OEMxMS44NzgxIDMuODc3IDExLjc2NiA0LjMxNTgxIDExLjU4MTIgNC42NUMxMS44OTU4IDQuODI4ODcgMTIuMTkyNCA1LjA3MzMgMTIuNDMyNiA1LjM3NTQxQzEyLjc1ODEgNS43ODQ3OCAxMi45ODI3IDYuMzA0MjIgMTIuOTk5IDYuOTA2NTdDMTMuMDEzNyA3LjQ0NDYgMTIuODYxNSA4LjAyMzYgMTIuNTA0MSA4LjYyNDQ2QzEyLjUxNDQgOC42NDM2MiAxMi41MjUyIDguNjYzODcgMTIuNTM2MiA4LjY4NTEyQzEyLjU0NjYgOC43MDUyNCAxMi41NTczIDguNzI2MjQgMTIuNTY4MiA4Ljc0ODE2QzEyLjY3NTIgOC45NjM4MiAxMi44MDQ2IDkuMjcwNjEgMTIuODkxNCA5LjYzMzY2QzEzLjA1MTIgMTAuMzAxOSAxMy4wNzA1IDExLjE4OTYgMTIuNTA5MSAxMi4wM0MxMi41NzM4IDEyLjE2MjUgMTIuNjUxIDEyLjM0MzkgMTIuNzE3NiAxMi41NjU4QzEyLjg2MTYgMTMuMDQ1NiAxMi45NTgxIDEzLjcyMTYgMTIuNzY1NyAxNC41TDExLjk3IDE0LjMwNjZDMTIuMTIgMTMuNjk5NiAxMi4wNDUyIDEzLjE3MzUgMTEuOTMyNCAxMi43OTc1QzExLjg3NiAxMi42MDk1IDExLjgxMDQgMTIuNDYwNyAxMS43NjA0IDEyLjM2MUMxMS43MzU0IDEyLjMxMTMgMTEuNzE0NCAxMi4yNzQyIDExLjcwMDcgMTIuMjUwOUwxMS42OTE1IDEyLjIzNTZMMTEuNjg1OSAxMi4yMjY3TDExLjY4MzQgMTIuMjIyN0wxMS41MTg2IDExLjk3NzZMMTEuNzA1MiAxMS43NDU3QzEyLjIyNDQgMTEuMTAwOCAxMi4yMzIgMTAuMzk3MyAxMi4wOTQyIDkuODIwOTZDMTIuMDI1MiA5LjUzMjAzIDExLjkyMDggOS4yODM1NyAxMS44MzMyIDkuMTA3QzExLjc4OTYgOS4wMTkyNCAxMS43NTA4IDguOTUwNTggMTEuNzIzNyA4LjkwNTE0QzExLjcxMDIgOC44ODI0NCAxMS42OTk3IDguODY1NjYgMTEuNjkzIDguODU1MjVMMTEuNjg2MSA4Ljg0NDU1TDExLjY4NSA4Ljg0MjkyTDExLjUzMjIgOC42MTgxMkwxMS42ODQ1IDguMzkxNThDMTIuMDYzOSA3LjgyNzQxIDEyLjE5MTEgNy4zMzU1MyAxMi4xODAxIDYuOTI4NDJDMTIuMTY5IDYuNTIwOTIgMTIuMDE4NiA2LjE2Njc4IDExLjc4OTMgNS44NzgzMUMxMS41NTc3IDUuNTg3MDcgMTEuMjQ4NSA1LjM2NzA1IDEwLjkzNiA1LjIzODZDMTAuNjE3MiA1LjEwNzU4IDEwLjMzNCA1LjA4Njc5IDEwLjE0NjcgNS4xMzc0Nkw5Ljc4ODk4IDUuMjM0MThMOS42NTYzNyA0Ljg5MDg4QzkuNDc1NzkgNC40MjM0MyA5LjIyNzkyIDQuMTY5NjkgOC45NjQ5NCA0LjAyNDI5QzguNjk1MjEgMy44NzUxNiA4LjM3MDA1IDMuODE4MjkgOCAzLjgxNzE2QzcuNjI5OTUgMy44MTgyOSA3LjMwNDc5IDMuODc1MTYgNy4wMzUwNiA0LjAyNDI5QzYuNzcyMDggNC4xNjk2OSA2LjUyNDIxIDQuNDIzNDMgNi4zNDM2MyA0Ljg5MDg4TDYuMjExMDEgNS4yMzQxOEw1Ljg1MzMyIDUuMTM3NDZDNS42NjU5OSA1LjA4Njc5IDUuMzgyNzYgNS4xMDc1OCA1LjA2Mzk5IDUuMjM4NkM0Ljc1MTUxIDUuMzY3MDUgNC40NDIyOCA1LjU4NzA3IDQuMjEwNzMgNS44NzgzMUMzLjk4MTM2IDYuMTY2NzggMy44MzA5NiA2LjUyMDkyIDMuODE5ODkgNi45Mjg0MkMzLjgwODg2IDcuMzM1NTMgMy45MzYxNSA3LjgyNzQxIDQuMzE1NDkgOC4zOTE1OEw0LjQ2Nzc4IDguNjE4MTJMNC4zMTQ5NSA4Ljg0MjkyTDQuMzEzODggOC44NDQ1NUw0LjMwNjk1IDguODU1MjVDNC4zMDAzMSA4Ljg2NTY2IDQuMjg5NzcgOC44ODI0NCA0LjI3NjI3IDguOTA1MTRDNC4yNDkyIDguOTUwNTggNC4yMTA0MSA5LjAxOTI0IDQuMTY2ODQgOS4xMDdDNC4wNzkxNSA5LjI4MzU3IDMuOTc0NzkgOS41MzIwMyAzLjkwNTc1IDkuODIwOTZDMy43NjggMTAuMzk3MyAzLjc3NTU3IDExLjEwMDggNC4yOTQ3NyAxMS43NDU3TDQuNDgxNDMgMTEuOTc3Nkw0LjMxNjYgMTIuMjIyN0w0LjMxNDA2IDEyLjIyNjdDNC4zMTEyNCAxMi4yMzExIDQuMzA2MTcgMTIuMjM5MyA0LjI5OTMxIDEyLjI1MDlDNC4yODU1NiAxMi4yNzQyIDQuMjY0NTkgMTIuMzExMyA0LjIzOTYzIDEyLjM2MUM0LjE4OTU1IDEyLjQ2MDcgNC4xMjQwMSAxMi42MDk1IDQuMDY3NTggMTIuNzk3NUMzLjk1NDc2IDEzLjE3MzUgMy44Nzk5NyAxMy42OTk2IDQuMDMwMDEgMTQuMzA2NkwzLjIzNDMzIDE0LjVDMy4wNDE5MiAxMy43MjE2IDMuMTM4MzYgMTMuMDQ1NiAzLjI4MjM2IDEyLjU2NThDMy4zNDg5NyAxMi4zNDM5IDMuNDI2MTYgMTIuMTYyNSAzLjQ5MDkxIDEyLjAzQzIuOTI5NDUgMTEuMTg5NiAyLjk0ODg1IDEwLjMwMTkgMy4xMDg1NyA5LjYzMzY2QzMuMTk1MzYgOS4yNzA2MSAzLjMyNDc2IDguOTYzODIgMy40MzE4NyA4Ljc0ODE2QzMuNDU0MjMgOC43MDMwOCAzLjQ3NTc3IDguNjYxNzUgMy40OTU5MSA4LjYyNDQ2QzMuMTM4NSA4LjAyMzYgMi45ODYzNSA3LjQ0NDYgMy4wMDA5NiA2LjkwNjU3QzMuMDE3MzEgNi4zMDQyMiAzLjI0MTkgNS43ODQ3OCAzLjU2NzM4IDUuMzc1NDFDMy44MTcyOCA1LjA2MTExIDQuMTI4MTYgNC44MDkyNiA0LjQ1Njk2IDQuNjI4NjhDNC4yNzkxMyA0LjI5NzI1IDQuMTcxNyAzLjg2Njg4IDQuMTcxNyAzLjM5NjQ4QzQuMTcxNyAyLjM0OTA3IDQuNzA0MjkgMS41IDUuMzYxMjkgMS41Wk01Ljg0ODcxIDMuMzk2NDhDNS44NDg3MSAzLjc2ODg1IDUuNzYyNTYgNC4wODI4MiA1LjY0Njc3IDQuMjk5NjJDNS40NzEyMyA0LjI5OTIgNS4yOTE3OSA0LjMyMzUzIDUuMTE1MTQgNC4zNjc3MkM0Ljk4MDA5IDQuMTUxMzUgNC44NzM5MSAzLjgwOTkgNC44NzM5MSAzLjM5NjQ4QzQuODczOTEgMi45ODE3NiA0Ljk4MDc0IDIuNjM5NDUgNS4xMTY0MiAyLjQyMzE5QzUuMTgzMzkgMi4zMTY0MiA1LjI0NzU3IDIuMjU1NSA1LjI5MzE1IDIuMjI0NzdDNS4zMTQ0NyAyLjIxMDM5IDUuMzMwNCAyLjIwMzI3IDUuMzQxNTggMi4xOTk3M0M1LjM1MjQgMi4xOTYyOSA1LjM1ODc2IDIuMTk2MjYgNS4zNjEyOSAyLjE5NjI2QzUuMzY1MzYgMi4xOTYyNiA1LjM3OTI2IDIuMTk2NCA1LjQwNTM3IDIuMjEwMThDNS40MDg5NCAyLjIxMjA1IDUuNDEyNzIgMi4yMTQyMSA1LjQxNjggMi4yMTY2NkM1LjQyMDggMi4yMTkwNiA1LjQyNTAxIDIuMjIxNzYgNS40Mjk0NyAyLjIyNDc3QzUuNDc1MDUgMi4yNTU1IDUuNTM5MjMgMi4zMTY0MiA1LjYwNjIgMi40MjMxOUM1Ljc0MTg1IDIuNjM5NDUgNS44NDg3MSAyLjk4MTc2IDUuODQ4NzEgMy4zOTY0OFpNMTAuOTI3NiA0LjM3ODg0QzEwLjc1MzkgNC4zMzIxMyAxMC41NzcgNC4zMDQzMyAxMC40MDMzIDQuMzAwMTlDMTAuMjg3NCA0LjA4MzM2IDEwLjIwMTEgMy43NjkxNyAxMC4yMDExIDMuMzk2NDhDMTAuMjAxMSAyLjk4MTc2IDEwLjMwNzkgMi42Mzk0NSAxMC40NDM2IDIuNDIzMTlDMTAuNDc3MSAyLjM2OTgyIDEwLjUwOTggMi4zMjc4OSAxMC41NCAyLjI5NTQ1QzEwLjU3MDEgMi4yNjMwNSAxMC41OTc1IDIuMjQwMTQgMTAuNjIwMyAyLjIyNDc3QzEwLjY2MjIgMi4xOTY0NyAxMC42ODMzIDIuMTk2MjYgMTAuNjg4NSAyLjE5NjI2QzEwLjY5MDkgMi4xOTYyNiAxMC42OTY4IDIuMTk2MjkgMTAuNzA2NiAyLjE5OTIzQzEwLjcxNzkgMi4yMDI2IDEwLjczNDMgMi4yMDk2OCAxMC43NTY2IDIuMjI0NzdDMTAuODAyMiAyLjI1NTUgMTAuODY2NCAyLjMxNjQyIDEwLjkzMzQgMi40MjMxOUMxMS4wNjkgMi42Mzk0NSAxMS4xNzU5IDIuOTgxNzYgMTEuMTc1OSAzLjM5NjQ4QzExLjE3NTkgMy44MTEyMSAxMS4wNjkgNC4xNTM1MSAxMC45MzM0IDQuMzY5NzhMMTAuOTI3NiA0LjM3ODg0WiIgZmlsbD0iIzZGNzM3QSIvPgo8cGF0aCBkPSJNNy42NDE3IDguMDgwNTVDNy41NTE1NSA4LjE2OTkzIDcuNTUxNTUgOC4zMTQ5MSA3LjY0MTcgOC40MDQyOUw3Ljc5NjEzIDguNTU3NDJWOC43ODI3MkM3Ljc5NjEzIDguOTA5MTggNy44OTk0OSA5LjAxMTY3IDguMDI3IDkuMDExNjdDOC4xNTQ1NCA5LjAxMTY3IDguMjU3OTEgOC45MDkxOCA4LjI1NzkxIDguNzgyNzJWOC41NjYyTDguNDIxMTYgOC40MDQyOUM4LjUxMTM1IDguMzE0OTEgOC41MTEzNSA4LjE2OTk3IDguNDIxMTYgOC4wODA1NUM4LjMzMTAyIDcuOTkxMTYgOC4xODQ3OSA3Ljk5MTE2IDguMDk0NjUgOC4wODA1NUw4LjAzMTQzIDguMTQzMjNMNy45NjgyMSA4LjA4MDU1QzcuODc4MDcgNy45OTExMyA3LjczMTg4IDcuOTkxMTMgNy42NDE3IDguMDgwNTVaIiBmaWxsPSIjNkY3MzdBIi8+CjxwYXRoIGZpbGwtcnVsZT0iZXZlbm9kZCIgY2xpcC1ydWxlPSJldmVub2RkIiBkPSJNOS45NjA0NiA4LjY5Mzk0QzkuOTYwNDYgOS41NzA0MiA5LjA5Mzg4IDEwLjA0ODQgOC4wMjQ4NiAxMC4wNDg0QzYuOTU1ODcgMTAuMDQ4NCA2LjA4OTI5IDkuNTcwNDIgNi4wODkyOSA4LjY5Mzk0QzYuMDg5MjkgNy44MTc0MyA2Ljk1NTg3IDYuODYwMjggOC4wMjQ4NiA2Ljg2MDI4QzkuMDkzODggNi44NjAyOCA5Ljk2MDQ2IDcuODE3NDMgOS45NjA0NiA4LjY5Mzk0Wk05LjM3NTI5IDguNjkzOTRDOS4zNzUyOSA4LjkxMTQ1IDkuMjgwMzIgOS4wNzg4MSA5LjA3MTM4IDkuMjE1NDdDOC44NDMyOSA5LjM2NDU5IDguNDgxNDUgOS40NjgxNCA4LjAyNDg2IDkuNDY4MTRDNy41NjgzIDkuNDY4MTQgNy4yMDY0NiA5LjM2NDU5IDYuOTc4MzggOS4yMTU0N0M2Ljc2OTQ0IDkuMDc4ODEgNi42NzQ0NyA4LjkxMTQ1IDYuNjc0NDcgOC42OTM5NEM2LjY3NDQ3IDguNDM4MDggNi44MDczIDguMTIwMzIgNy4wNzA5MiA3Ljg1Nzc2QzcuMzI5NTQgNy42MDAyIDcuNjcwMDIgNy40NDA0OSA4LjAyNDg2IDcuNDQwNDlDOC4zNzk3MyA3LjQ0MDQ5IDguNzIwMjIgNy42MDAyIDguOTc4ODQgNy44NTc3NkM5LjI0MjQ2IDguMTIwMzIgOS4zNzUyOSA4LjQzODA4IDkuMzc1MjkgOC42OTM5NFoiIGZpbGw9IiM2RjczN0EiLz4KPHBhdGggZD0iTTEwLjk1NDUgNy4yMzYwOEMxMS4xMDE0IDcuNDg4MjYgMTEuMDQwMyA3Ljc5NTgzIDEwLjgxODEgNy45MjI5OUMxMC41OTYgOC4wNTAxNiAxMC4yOTY4IDcuOTQ4ODEgMTAuMTUgNy42OTY2M0MxMC4wMDMxIDcuNDQ0NDIgMTAuMDY0MiA3LjEzNjg5IDEwLjI4NjQgNy4wMDk2OUMxMC41MDg1IDYuODgyNTIgMTAuODA3NyA2Ljk4Mzg3IDEwLjk1NDUgNy4yMzYwOFoiIGZpbGw9IiM2RjczN0EiLz4KPHBhdGggZD0iTTUuMTQ5NzUgNy44MzkyMUM1LjMzMTE1IDguMDE5MDcgNS42NDY1NiA3Ljk5NzkzIDUuODU0MjUgNy43OTIwNEM2LjA2MTkgNy41ODYxMSA2LjA4MzIyIDcuMjczMzggNS45MDE4MiA3LjA5MzUxQzUuNzIwNDIgNi45MTM2NSA1LjQwNTAxIDYuOTM0NzkgNS4xOTczMiA3LjE0MDcyQzQuOTg5NjcgNy4zNDY2MSA0Ljk2ODM0IDcuNjU5MzQgNS4xNDk3NSA3LjgzOTIxWiIgZmlsbD0iIzZGNzM3QSIvPgo8L3N2Zz4K',
 };

main.ts

@@ -1,9 +1,11 @@
 import ollama from 'ollama';
 import { config } from './config';
+import * as fs from 'fs';
 
 interface Message {
 	role: string;
 	content: string;
+	images?: Uint8Array[] | string[];
 }
 
 interface Completion {
@@ -31,18 +33,56 @@ const mapToResponse = (outputs: ChatCompletion[]): ConnectorResponse => {
 	};
 };
 
+function extractImageUrls(prompt: string): string[] {
+	const imageExtensions = ['.png', '.jpeg', '.jpg', '.webp', '.gif'];
+	// Updated regex to match both http and local file paths
+	const urlRegex =
+		/(https?:\/\/[^\s]+|[a-zA-Z]:\\[^:<>"|?\n]*|\/[^:<>"|?\n]*)/g;
+	const urls = prompt.match(urlRegex) || [];
+
+	return urls.filter((url) => {
+		const extensionIndex = url.lastIndexOf('.');
+		if (extensionIndex === -1) {
+			// If no extension found, return false.
+			return false;
+		}
+		const extension = url.slice(extensionIndex);
+		return imageExtensions.includes(extension.toLowerCase());
+	});
+}
+
+function encodeImage(imagePath: string): string {
+	const imageBuffer = fs.readFileSync(imagePath);
+	return Buffer.from(imageBuffer).toString('base64');
+}
+
 async function main(
 	model: string,
 	prompts: string[],
+	properties: Record<string, unknown>,
 ): Promise<ConnectorResponse> {
+	const { prompt, ...restProperties } = properties;
+	const systemPrompt = (prompt ||
+		config.properties.find((prop) => prop.id === 'prompt')?.value) as string;
+
 	const messageHistory: Message[] = [
-		{ role: 'system', content: 'You are a helpful assistant.' },
+		{
+			role: 'system',
+			content: systemPrompt,
+			...restProperties,
+		},
 	];
 	const outputs: ChatCompletion[] = [];
 
 	try {
 		for (const prompt of prompts) {
-			messageHistory.push({ role: 'user', content: prompt });
+			const imageUrls = extractImageUrls(prompt);
+			const base64Images = imageUrls.map((imagePath) => encodeImage(imagePath));
+			messageHistory.push({
+				role: 'user',
+				content: prompt,
+				images: base64Images,
+			});
 
 			const response = await ollama.chat({
 				model: model,

manifest.json

@@ -1,7 +1,7 @@
 {
 	"id": "prompt-mixer-ollama-connector",
 	"name": "Ollama Connector",
-	"version": "1.0.6",
+	"version": "1.0.7",
 	"minAppVersion": "0.1.0",
 	"description": "Connector for local LLM models installed by Ollama",
 	"author": "Prompt Mixer",

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "prompt-mixer-ollama-connector",
-	"version": "1.0.6",
+	"version": "1.0.7",
 	"description": "",
 	"type": "module",
 	"main": "main.js",