🗃️ Store model inside conversation instead (#165)

* 🗃️ Store model inside conversation instead

* fixup! 🗃️ Store model inside conversation instead

src/hooks.server.ts

@@ -6,7 +6,6 @@ import {
 	PUBLIC_DEPRECATED_GOOGLE_ANALYTICS_ID,
 } from "$env/static/public";
 import { addYears } from "date-fns";
-import { inspect } from "node:util";
 
 export const handle: Handle = async ({ event, resolve }) => {
 	const token = event.cookies.get(COOKIE_NAME);

src/lib/types/Conversation.ts

@@ -8,6 +8,8 @@ export interface Conversation extends Timestamps {
 	// Can be undefined for shared convo then deleted
 	sessionId: string;
 
+	model: string;
+
 	title: string;
 	messages: Message[];
 

src/lib/types/Message.ts

@@ -2,6 +2,4 @@ export interface Message {
 	from: "user" | "assistant";
 	id: ReturnType<typeof crypto.randomUUID>;
 	content: string;
-	// Only for "assistant" messages
-	model?: string;
 }

src/lib/types/SharedConversation.ts

@@ -6,6 +6,7 @@ export interface SharedConversation extends Timestamps {
 
 	hash: string;
 
+	model: string;
 	title: string;
 	messages: Message[];
 }

src/routes/+page.svelte

@@ -16,6 +16,7 @@
 				headers: {
 					"Content-Type": "application/json",
 				},
+				body: JSON.stringify({ model: data.models[0].name }),
 			});
 
 			if (!res.ok) {

src/routes/conversation/+server.ts

@@ -5,29 +5,35 @@ import { error, redirect } from "@sveltejs/kit";
 import { base } from "$app/paths";
 import { z } from "zod";
 import type { Message } from "$lib/types/Message";
+import { defaultModel, modelNames } from "$lib/server/models";
 
 export const POST: RequestHandler = async (input) => {
 	const body = await input.request.text();
 
 	let title = "";
 	let messages: Message[] = [];
-	let fromShareId: string | undefined;
 
-	if (body) {
-		fromShareId = z.object({ fromShare: z.string().optional() }).parse(JSON.parse(body)).fromShare;
+	const values = z
+		.object({
+			fromShare: z.string().optional(),
+			model: z
+				.enum([modelNames[0].name, ...modelNames.slice(1).map((m) => m.name)])
+				.default(defaultModel.name),
+		})
+		.parse(JSON.parse(body));
 
-		if (fromShareId) {
-			const conversation = await collections.sharedConversations.findOne({
-				_id: fromShareId,
-			});
+	if (values.fromShare) {
+		const conversation = await collections.sharedConversations.findOne({
+			_id: values.fromShare,
+		});
 
-			if (!conversation) {
-				throw error(404, "Conversation not found");
-			}
-
-			title = conversation.title;
-			messages = conversation.messages;
+		if (!conversation) {
+			throw error(404, "Conversation not found");
 		}
+
+		title = conversation.title;
+		messages = conversation.messages;
+		values.model = conversation.model;
 	}
 
 	const res = await collections.conversations.insertOne({
@@ -38,10 +44,11 @@ export const POST: RequestHandler = async (input) => {
 				((await collections.conversations.countDocuments({ sessionId: input.locals.sessionId })) +
 					1),
 		messages,
+		model: values.model,
 		createdAt: new Date(),
 		updatedAt: new Date(),
 		sessionId: input.locals.sessionId,
-		...(fromShareId ? { meta: { fromShareId } } : {}),
+		...(values.fromShare ? { meta: { fromShareId: values.fromShare } } : {}),
 	});
 
 	return new Response(

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

@@ -3,7 +3,7 @@ import { buildPrompt } from "$lib/buildPrompt.js";
 import { abortedGenerations } from "$lib/server/abortedGenerations.js";
 import { collections } from "$lib/server/database.js";
 import { modelEndpoint } from "$lib/server/modelEndpoint.js";
-import { defaultModel, modelNames } from "$lib/server/models.js";
+import { defaultModel } from "$lib/server/models.js";
 import type { Message } from "$lib/types/Message.js";
 import { concatUint8Arrays } from "$lib/utils/concatUint8Arrays.js";
 import { streamToAsyncIterable } from "$lib/utils/streamToAsyncIterable";
@@ -28,17 +28,15 @@ export async function POST({ request, fetch, locals, params }) {
 		throw error(404, "Conversation not found");
 	}
 
+	const model = conv.model ?? defaultModel.name;
+
 	const json = await request.json();
 	const {
 		inputs: newPrompt,
-		model,
 		options: { id: messageId, is_retry },
 	} = z
 		.object({
 			inputs: z.string().trim().min(1),
-			model: z
-				.enum([modelNames[0].name, ...modelNames.slice(1).map((m) => m.name)])
-				.default(defaultModel.name),
 			options: z.object({
 				id: z.optional(z.string().uuid()),
 				is_retry: z.optional(z.boolean()),
@@ -104,7 +102,7 @@ export async function POST({ request, fetch, locals, params }) {
 
 		generated_text = trimSuffix(trimPrefix(generated_text, "<|startoftext|>"), PUBLIC_SEP_TOKEN);
 
-		messages.push({ from: "assistant", content: generated_text, id: crypto.randomUUID(), model });
+		messages.push({ from: "assistant", content: generated_text, id: crypto.randomUUID() });
 
 		await collections.conversations.updateOne(
 			{

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

@@ -37,6 +37,7 @@ export async function POST({ params, url, locals }) {
 		hash,
 		updatedAt: new Date(),
 		title: conversation.title,
+		model: conversation.model,
 	};
 
 	await collections.sharedConversations.insertOne(shared);