Remove shared routes (#478)

* rm shared route

* fix sharing of shared convs

src/lib/shareConversation.ts

@@ -1,25 +1,31 @@
 import { base } from "$app/paths";
 import { ERROR_MESSAGES, error } from "$lib/stores/errors";
 import { share } from "./utils/share";
-
+import { page } from "$app/stores";
+import { get } from "svelte/store";
+import { getShareUrl } from "./utils/getShareUrl";
 export async function shareConversation(id: string, title: string) {
 	try {
-		const res = await fetch(`${base}/conversation/${id}/share`, {
-			method: "POST",
-			headers: {
-				"Content-Type": "application/json",
-			},
-		});
-
-		if (!res.ok) {
-			error.set("Error while sharing conversation, try again.");
-			console.error("Error while sharing conversation: " + (await res.text()));
-			return;
-		}
+		if (id.length === 7) {
+			const url = get(page).url;
+			share(getShareUrl(url, id), title);
+		} else {
+			const res = await fetch(`${base}/conversation/${id}/share`, {
+				method: "POST",
+				headers: {
+					"Content-Type": "application/json",
+				},
+			});
 
-		const { url } = await res.json();
+			if (!res.ok) {
+				error.set("Error while sharing conversation, try again.");
+				console.error("Error while sharing conversation: " + (await res.text()));
+				return;
+			}
 
-		share(url, title);
+			const { url } = await res.json();
+			share(url, title);
+		}
 	} catch (err) {
 		error.set(ERROR_MESSAGES.default);
 		console.error(err);

src/lib/stores/pendingMessageIdToRetry.ts

@@ -1,4 +0,0 @@
-import type { Message } from "$lib/types/Message";
-import { writable } from "svelte/store";
-
-export const pendingMessageIdToRetry = writable<Message["id"] | null>(null);

src/lib/utils/getShareUrl.ts

@@ -0,0 +1,6 @@
+import { base } from "$app/paths";
+import { PUBLIC_ORIGIN, PUBLIC_SHARE_PREFIX } from "$env/static/public";
+
+export function getShareUrl(url: URL, shareId: string): string {
+	return `${PUBLIC_SHARE_PREFIX || `${PUBLIC_ORIGIN || url.origin}${base}`}/r/${shareId}`;
+}

src/routes/conversation/[id]/+page.server.ts

@@ -5,34 +5,50 @@ import { authCondition } from "$lib/server/auth";
 import { UrlDependency } from "$lib/types/UrlDependency";
 
 export const load = async ({ params, depends, locals }) => {
-	// todo: add validation on params.id
-	const conversation = await collections.conversations.findOne({
-		_id: new ObjectId(params.id),
-		...authCondition(locals),
-	});
+	let conversation;
+	let shared = false;
 
-	depends(UrlDependency.Conversation);
+	// if the conver
+	if (params.id.length === 7) {
+		// shared link of length 7
+		conversation = await collections.sharedConversations.findOne({
+			_id: params.id,
+		});
+		shared = true;
 
-	if (!conversation) {
-		const conversationExists =
-			(await collections.conversations.countDocuments({
-				_id: new ObjectId(params.id),
-			})) !== 0;
-
-		if (conversationExists) {
-			throw error(
-				403,
-				"You don't have access to this conversation. If someone gave you this link, ask them to use the 'share' feature instead."
-			);
+		if (!conversation) {
+			throw error(404, "Conversation not found");
 		}
+	} else {
+		// todo: add validation on params.id
+		conversation = await collections.conversations.findOne({
+			_id: new ObjectId(params.id),
+			...authCondition(locals),
+		});
 
-		throw error(404, "Conversation not found.");
-	}
+		depends(UrlDependency.Conversation);
+
+		if (!conversation) {
+			const conversationExists =
+				(await collections.conversations.countDocuments({
+					_id: new ObjectId(params.id),
+				})) !== 0;
 
+			if (conversationExists) {
+				throw error(
+					403,
+					"You don't have access to this conversation. If someone gave you this link, ask them to use the 'share' feature instead."
+				);
+			}
+
+			throw error(404, "Conversation not found.");
+		}
+	}
 	return {
 		messages: conversation.messages,
 		title: conversation.title,
 		model: conversation.model,
 		preprompt: conversation.preprompt,
+		shared,
 	};
 };

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

@@ -1,10 +1,9 @@
 <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 { invalidate } from "$app/navigation";
+	import { goto, invalidate } from "$app/navigation";
 	import { base } from "$app/paths";
 	import { shareConversation } from "$lib/shareConversation";
 	import { UrlDependency } from "$lib/types/UrlDependency";
@@ -34,6 +33,35 @@
 	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;
@@ -76,6 +104,10 @@
 				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();
@@ -84,7 +116,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) {
@@ -111,6 +143,7 @@
 							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;
@@ -128,6 +161,8 @@
 								}
 							} else if (update.type === "webSearch") {
 								webSearchMessages = [...webSearchMessages, update];
+							} else {
+								console.log();
 							}
 						} catch (parseError) {
 							// in case of parsing error we wait for the next message
@@ -185,15 +220,38 @@
 	}
 
 	onMount(async () => {
+		// only used in case of creating new conversations (from the parent POST endpoint)
 		if ($pendingMessage) {
-			const val = $pendingMessage;
-			const messageId = $pendingMessageIdToRetry || undefined;
-			$pendingMessage = "";
-			$pendingMessageIdToRetry = null;
-
-			writeMessage(val, messageId);
+			writeMessage($pendingMessage);
 		}
 	});
+
+	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));
+		}
+	}
+
+	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;
 
@@ -218,10 +276,11 @@
 	{loading}
 	{pending}
 	{messages}
+	shared={data.shared}
 	preprompt={data.preprompt}
 	bind:webSearchMessages
-	on:message={(event) => writeMessage(event.detail)}
-	on:retry={(event) => writeMessage(event.detail.content, event.detail.id)}
+	on:message={onMessage}
+	on:retry={onRetry}
 	on:vote={(event) => voteMessage(event.detail.score, event.detail.id)}
 	on:share={() => shareConversation($page.params.id, data.title)}
 	on:stop={() => (isAborted = true)}

src/routes/conversation/[id]/message/[messageId]/prompt/+server.ts

@@ -6,14 +6,17 @@ import { error } from "@sveltejs/kit";
 import { ObjectId } from "mongodb";
 
 export async function GET({ params, locals }) {
-	const convId = new ObjectId(params.id);
-
-	const conv = await collections.conversations.findOne({
-		_id: convId,
-		...authCondition(locals),
-	});
-
-	if (!conv) {
+	const conv =
+		params.id.length === 7
+			? await collections.sharedConversations.findOne({
+					_id: params.id,
+			  })
+			: await collections.conversations.findOne({
+					_id: new ObjectId(params.id),
+					...authCondition(locals),
+			  });
+
+	if (conv === null) {
 		throw error(404, "Conversation not found");
 	}
 
@@ -31,8 +34,12 @@ export async function GET({ params, locals }) {
 		throw error(404, "Conversation model not found");
 	}
 
+	const messagesUpTo = conv.messages.slice(0, messageIndex + 1);
+
 	const prompt = await buildPrompt({
-		messages: conv.messages.slice(0, messageIndex + 1),
+		preprompt: conv.preprompt,
+		webSearch: messagesUpTo[messagesUpTo.length - 1].webSearch,
+		messages: messagesUpTo,
 		model: model,
 	});
 

src/routes/conversation/[id]/share/+server.ts

@@ -1,8 +1,7 @@
-import { base } from "$app/paths";
-import { PUBLIC_ORIGIN, PUBLIC_SHARE_PREFIX } from "$env/static/public";
 import { authCondition } from "$lib/server/auth";
 import { collections } from "$lib/server/database";
 import type { SharedConversation } from "$lib/types/SharedConversation";
+import { getShareUrl } from "$lib/utils/getShareUrl.js";
 import { hashConv } from "$lib/utils/hashConv";
 import { error } from "@sveltejs/kit";
 import { ObjectId } from "mongodb";
@@ -51,7 +50,3 @@ export async function POST({ params, url, locals }) {
 		{ headers: { "Content-Type": "application/json" } }
 	);
 }
-
-function getShareUrl(url: URL, shareId: string): string {
-	return `${PUBLIC_SHARE_PREFIX || `${PUBLIC_ORIGIN || url.origin}${base}`}/r/${shareId}`;
-}

src/routes/r/[id]/+page.server.ts

@@ -1,20 +0,0 @@
-import type { PageServerLoad } from "./$types";
-import { collections } from "$lib/server/database";
-import { error } from "@sveltejs/kit";
-
-export const load: PageServerLoad = async ({ params }) => {
-	const conversation = await collections.sharedConversations.findOne({
-		_id: params.id,
-	});
-
-	if (!conversation) {
-		throw error(404, "Conversation not found");
-	}
-
-	return {
-		preprompt: conversation.preprompt,
-		messages: conversation.messages,
-		title: conversation.title,
-		model: conversation.model,
-	};
-};

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

@@ -1,87 +0,0 @@
-<script lang="ts">
-	import { goto } from "$app/navigation";
-	import { base } from "$app/paths";
-	import { page } from "$app/stores";
-	import { PUBLIC_APP_DISCLAIMER } from "$env/static/public";
-	import ChatWindow from "$lib/components/chat/ChatWindow.svelte";
-	import { ERROR_MESSAGES, error } from "$lib/stores/errors";
-	import { pendingMessage } from "$lib/stores/pendingMessage";
-	import { pendingMessageIdToRetry } from "$lib/stores/pendingMessageIdToRetry";
-	import { findCurrentModel } from "$lib/utils/models";
-	import { share } from "$lib/utils/share";
-	import type { PageData } from "./$types";
-
-	export let data: PageData;
-
-	let loading = false;
-
-	async function createConversation() {
-		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;
-		}
-	}
-
-	async function shareConversation() {
-		const url = `${window.location.origin}${window.location.pathname}`;
-
-		share(url, data.title);
-	}
-</script>
-
-<svelte:head>
-	<title>{data.title}</title>
-</svelte:head>
-
-<ChatWindow
-	{loading}
-	shared={true}
-	messages={data.messages}
-	preprompt={data.preprompt}
-	on:message={(ev) =>
-		createConversation()
-			.then((convId) => {
-				$pendingMessage = ev.detail;
-				return goto(`${base}/conversation/${convId}`, { invalidateAll: true });
-			})
-			.finally(() => (loading = false))}
-	on:share={shareConversation}
-	on:retry={(ev) =>
-		createConversation()
-			.then((convId) => {
-				$pendingMessageIdToRetry = ev.detail.id;
-				$pendingMessage = ev.detail.content;
-				return goto(`${base}/conversation/${convId}`, { invalidateAll: true });
-			})
-			.finally(() => (loading = false))}
-	models={data.models}
-	currentModel={findCurrentModel(data.models, data.model)}
-	settings={data.settings}
-	loginRequired={!$page.error &&
-		(data.requiresLogin
-			? !data.user
-			: !data.settings.ethicsModalAcceptedAt && !!PUBLIC_APP_DISCLAIMER)}
-/>

src/routes/r/[id]/+page.ts

@@ -0,0 +1,5 @@
+import { redirect } from "@sveltejs/kit";
+
+export const load = async ({ params }) => {
+	throw redirect(302, "../conversation/" + params.id);
+};

src/routes/r/[id]/message/[messageId]/prompt/+server.ts

@@ -1,47 +0,0 @@
-import { buildPrompt } from "$lib/buildPrompt";
-import { collections } from "$lib/server/database";
-import { models } from "$lib/server/models";
-import { error } from "@sveltejs/kit";
-
-export async function GET({ params }) {
-	const conv = await collections.sharedConversations.findOne({
-		_id: params.id,
-	});
-
-	if (!conv) {
-		throw error(404, "Conversation not found");
-	}
-
-	const messageId = params.messageId;
-
-	const messageIndex = conv.messages.findIndex((msg) => msg.id === messageId);
-
-	if (messageIndex === -1) {
-		throw error(404, "Message not found");
-	}
-
-	const model = models.find((m) => m.id === conv.model);
-
-	if (!model) {
-		throw error(404, "Conversation model not found");
-	}
-
-	const prompt = await buildPrompt({ messages: conv.messages.slice(0, messageIndex + 1), model });
-
-	return new Response(
-		JSON.stringify(
-			{
-				note: "This is a preview of the prompt that will be sent to the model when retrying the message. It may differ from what was sent in the past if the parameters have been updated since",
-				prompt,
-				model: model.name,
-				parameters: {
-					...model.parameters,
-					return_full_text: false,
-				},
-			},
-			null,
-			2
-		),
-		{ headers: { "Content-Type": "application/json" } }
-	);
-}