Merge pull request #746 from ollama-webui/continue

fix: title

Merge pull request #746 from ollama-webui/continue
fix: title
83be93f9 · Timothy Jaeryang Baek · GitHub · 9e7f67aa · 2c1184fe · 83be93f9
Unverified Commit 83be93f9 authored Feb 15, 2024 by Timothy Jaeryang Baek Committed by GitHub Feb 15, 2024
Show whitespace changes
Inline Side-by-side

Showing with 24 additions and 4 deletions

src/routes/(app)/+page.svelte src/routes/(app)/+page.svelte +12 -2

src/routes/(app)/c/[id]/+page.svelte src/routes/(app)/c/[id]/+page.svelte +12 -2

No files found.
--- a/src/routes/(app)/+page.svelte
+++ b/src/routes/(app)/+page.svelte
@@ -708,9 +708,19 @@
 			const modelTag = $models.filter((m) => m.name === responseMessage.model).at(0);

 			if (modelTag?.external) {
-				await sendPromptOpenAI(responseMessage.model, prompt, responseMessage.id, _chatId);
+				await sendPromptOpenAI(
+					responseMessage.model,
+					history.messages[responseMessage.parentId].content,
+					responseMessage.id,
+					_chatId
+				);
 			} else if (modelTag) {
-				await sendPromptOllama(responseMessage.model, prompt, responseMessage.id, _chatId);
+				await sendPromptOllama(
+					responseMessage.model,
+					history.messages[responseMessage.parentId].content,
+					responseMessage.id,
+					_chatId
+				);
 			} else {
 				toast.error(`Model ${model} not found`);
 			}

--- a/src/routes/(app)/c/[id]/+page.svelte
+++ b/src/routes/(app)/c/[id]/+page.svelte
@@ -709,9 +709,19 @@
 			const modelTag = $models.filter((m) => m.name === responseMessage.model).at(0);

 			if (modelTag?.external) {
-				await sendPromptOpenAI(responseMessage.model, prompt, responseMessage.id, _chatId);
+				await sendPromptOpenAI(
+					responseMessage.model,
+					history.messages[responseMessage.parentId].content,
+					responseMessage.id,
+					_chatId
+				);
 			} else if (modelTag) {
-				await sendPromptOllama(responseMessage.model, prompt, responseMessage.id, _chatId);
+				await sendPromptOllama(
+					responseMessage.model,
+					history.messages[responseMessage.parentId].content,
+					responseMessage.id,
+					_chatId
+				);
 			} else {
 				toast.error(`Model ${model} not found`);
 			}