Update src/routes/conversation/[id]/+page.svelte

src/routes/conversation/[id]/+page.svelte

@@ -1,9 +1,10 @@
 <script lang="ts">
 	import ChatWindow from "$lib/components/chat/ChatWindow.svelte";
 	import { pendingMessage } from "$lib/stores/pendingMessage";
+	import { pendingMessageIdToRetry } from "$lib/stores/pendingMessageIdToRetry";
 	import { onMount } from "svelte";
 	import { page } from "$app/stores";
-	import { goto, invalidate } from "$app/navigation";
+	import { invalidate } from "$app/navigation";
 	import { base } from "$app/paths";
 	import { shareConversation } from "$lib/shareConversation";
 	import { UrlDependency } from "$lib/types/UrlDependency";
@@ -33,35 +34,6 @@
 	let pending = false;
 	let loginRequired = false;
 
-	async function convFromShared() {
-		try {
-			loading = true;
-			const res = await fetch(`${base}/conversation`, {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
-				},
-				body: JSON.stringify({
-					fromShare: $page.params.id,
-					model: data.model,
-				}),
-			});
-
-			if (!res.ok) {
-				error.set("Error while creating conversation, try again.");
-				console.error("Error while creating conversation: " + (await res.text()));
-				return;
-			}
-
-			const { conversationId } = await res.json();
-
-			return conversationId;
-		} catch (err) {
-			error.set(ERROR_MESSAGES.default);
-			console.error(String(err));
-			throw err;
-		}
-	}
 	// this function is used to send new message to the backends
 	async function writeMessage(message: string, messageId = randomUUID()) {
 		if (!message.trim()) return;
@@ -97,6 +69,7 @@
 					response_id: responseId,
 					is_retry: isRetry,
 					web_search: $webSearchParameters.useSearch,
+					domainFilters: $webSearchParameters.domainFilters,
 				}),
 			});
 
@@ -104,10 +77,6 @@
 				throw new Error("Body not defined");
 			}
 
-			if (!response.ok) {
-				error.set((await response.json())?.message);
-				return;
-			}
 			// eslint-disable-next-line no-undef
 			const encoder = new TextDecoderStream();
 			const reader = response?.body?.pipeThrough(encoder).getReader();
@@ -116,7 +85,7 @@
 			// this is a bit ugly
 			// we read the stream until we get the final answer
 			while (finalAnswer === "") {
-				await new Promise((r) => setTimeout(r, 25));
+				// await new Promise((r) => setTimeout(r, 25));
 
 				// check for abort
 				if (isAborted) {
@@ -143,7 +112,6 @@
 							let update = JSON.parse(el) as MessageUpdate;
 							if (update.type === "finalAnswer") {
 								finalAnswer = update.text;
-								reader.cancel();
 								invalidate(UrlDependency.Conversation);
 							} else if (update.type === "stream") {
 								pending = false;
@@ -218,38 +186,15 @@
 	}
 
 	onMount(async () => {
-		// only used in case of creating new conversations (from the parent POST endpoint)
 		if ($pendingMessage) {
-			writeMessage($pendingMessage);
-		}
-	});
+			const val = $pendingMessage;
+			const messageId = $pendingMessageIdToRetry || undefined;
+			$pendingMessage = "";
+			$pendingMessageIdToRetry = null;
 
-	async function onMessage(event: CustomEvent<string>) {
-		if (!data.shared) {
-			writeMessage(event.detail);
-		} else {
-			convFromShared()
-				.then(async (convId) => {
-					await goto(`${base}/conversation/${convId}`, { invalidateAll: true });
-				})
-				.then(() => writeMessage(event.detail))
-				.finally(() => (loading = false));
+			writeMessage(val, messageId);
 		}
-	}
-
-	async function onRetry(event: CustomEvent<{ id: Message["id"]; content: string }>) {
-		if (!data.shared) {
-			writeMessage(event.detail.content, event.detail.id);
-		} else {
-			convFromShared()
-				.then(async (convId) => {
-					await goto(`${base}/conversation/${convId}`, { invalidateAll: true });
-				})
-				.then(() => writeMessage(event.detail.content, event.detail.id))
-				.finally(() => (loading = false));
-		}
-	}
-
+	});
 	$: $page.params.id, (isAborted = true);
 	$: title = data.conversations.find((conv) => conv.id === $page.params.id)?.title ?? data.title;
 
@@ -274,11 +219,9 @@
 	{loading}
 	{pending}
 	{messages}
-	shared={data.shared}
-	preprompt={data.preprompt}
 	bind:webSearchMessages
-	on:message={onMessage}
-	on:retry={onRetry}
+	on:message={(event) => writeMessage(event.detail)}
+	on:retry={(event) => writeMessage(event.detail.content, event.detail.id)}
 	on:vote={(event) => voteMessage(event.detail.score, event.detail.id)}
 	on:share={() => shareConversation($page.params.id, data.title)}
 	on:stop={() => (isAborted = true)}
@@ -286,4 +229,4 @@
 	currentModel={findCurrentModel([...data.models, ...data.oldModels], data.model)}
 	settings={data.settings}
 	{loginRequired}
-/>
+/>