ruflo 3.10.45 → 3.11.0

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

@@ -1,66 +1,66 @@
-import { buildPrompt } from "$lib/buildPrompt";
-import { authCondition } from "$lib/server/auth";
-import { collections } from "$lib/server/database";
-import { models } from "$lib/server/models";
-import { buildSubtree } from "$lib/utils/tree/buildSubtree";
-import { isMessageId } from "$lib/utils/tree/isMessageId";
-import { error } from "@sveltejs/kit";
-import { ObjectId } from "mongodb";
-
-export async function GET({ params, locals }) {
-	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) {
-		error(404, "Conversation not found");
-	}
-
-	const messageId = params.messageId;
-
-	const messageIndex = conv.messages.findIndex((msg) => msg.id === messageId);
-
-	if (!isMessageId(messageId) || messageIndex === -1) {
-		error(404, "Message not found");
-	}
-
-	const model = models.find((m) => m.id === conv.model);
-
-	if (!model) {
-		error(404, "Conversation model not found");
-	}
-
-	const messagesUpTo = buildSubtree(conv, messageId);
-
-	const prompt = await buildPrompt({
-		preprompt: conv.preprompt,
-		messages: messagesUpTo,
-		model,
-	}).catch((err) => {
-		console.error(err);
-		return "Prompt generation failed";
-	});
-
-	return Response.json({
-		prompt,
-		model: model.name,
-		parameters: {
-			...model.parameters,
-			return_full_text: false,
-		},
-		messages: messagesUpTo.map((msg) => ({
-			role: msg.from,
-			content: msg.content,
-			createdAt: msg.createdAt,
-			updatedAt: msg.updatedAt,
-			updates: msg.updates?.filter((u) => u.type === "title"),
-			files: msg.files,
-		})),
-	});
-}
+import { buildPrompt } from "$lib/buildPrompt";
+import { authCondition } from "$lib/server/auth";
+import { collections } from "$lib/server/database";
+import { models } from "$lib/server/models";
+import { buildSubtree } from "$lib/utils/tree/buildSubtree";
+import { isMessageId } from "$lib/utils/tree/isMessageId";
+import { error } from "@sveltejs/kit";
+import { ObjectId } from "mongodb";
+
+export async function GET({ params, locals }) {
+	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) {
+		error(404, "Conversation not found");
+	}
+
+	const messageId = params.messageId;
+
+	const messageIndex = conv.messages.findIndex((msg) => msg.id === messageId);
+
+	if (!isMessageId(messageId) || messageIndex === -1) {
+		error(404, "Message not found");
+	}
+
+	const model = models.find((m) => m.id === conv.model);
+
+	if (!model) {
+		error(404, "Conversation model not found");
+	}
+
+	const messagesUpTo = buildSubtree(conv, messageId);
+
+	const prompt = await buildPrompt({
+		preprompt: conv.preprompt,
+		messages: messagesUpTo,
+		model,
+	}).catch((err) => {
+		console.error(err);
+		return "Prompt generation failed";
+	});
+
+	return Response.json({
+		prompt,
+		model: model.name,
+		parameters: {
+			...model.parameters,
+			return_full_text: false,
+		},
+		messages: messagesUpTo.map((msg) => ({
+			role: msg.from,
+			content: msg.content,
+			createdAt: msg.createdAt,
+			updatedAt: msg.updatedAt,
+			updates: msg.updates?.filter((u) => u.type === "title"),
+			files: msg.files,
+		})),
+	});
+}

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

@@ -1,69 +1,69 @@
-import { authCondition } from "$lib/server/auth";
-import { collections } from "$lib/server/database";
-import type { SharedConversation } from "$lib/types/SharedConversation";
-import { hashConv } from "$lib/utils/hashConv";
-import { error } from "@sveltejs/kit";
-import { ObjectId } from "mongodb";
-import { nanoid } from "nanoid";
-
-export async function POST({ params, locals }) {
-	const conversation = await collections.conversations.findOne({
-		_id: new ObjectId(params.id),
-		...authCondition(locals),
-	});
-
-	if (!conversation) {
-		error(404, "Conversation not found");
-	}
-
-	const hash = await hashConv(conversation);
-
-	const existingShare = await collections.sharedConversations.findOne({ hash });
-
-	if (existingShare) {
-		return new Response(
-			JSON.stringify({
-				shareId: existingShare._id,
-			}),
-			{ headers: { "Content-Type": "application/json" } }
-		);
-	}
-
-	const shared: SharedConversation = {
-		_id: nanoid(7),
-		hash,
-		createdAt: new Date(),
-		updatedAt: new Date(),
-		rootMessageId: conversation.rootMessageId,
-		messages: conversation.messages,
-		title: conversation.title,
-		model: conversation.model,
-		preprompt: conversation.preprompt,
-	};
-
-	await collections.sharedConversations.insertOne(shared);
-
-	// copy files from `${conversation._id}-` to `${shared._id}-`
-	const files = await collections.bucket
-		.find({ filename: { $regex: `^${conversation._id}-` } })
-		.toArray();
-
-	await Promise.all(
-		files.map(async (file) => {
-			const newFilename = file.filename.replace(`${conversation._id}-`, `${shared._id}-`);
-			// copy files from `${conversation._id}-` to `${shared._id}-` by downloading and reuploaidng
-			const downloadStream = collections.bucket.openDownloadStream(file._id);
-			const uploadStream = collections.bucket.openUploadStream(newFilename, {
-				metadata: { ...file.metadata, conversation: shared._id.toString() },
-			});
-			downloadStream.pipe(uploadStream);
-		})
-	);
-
-	return new Response(
-		JSON.stringify({
-			shareId: shared._id,
-		}),
-		{ headers: { "Content-Type": "application/json" } }
-	);
-}
+import { authCondition } from "$lib/server/auth";
+import { collections } from "$lib/server/database";
+import type { SharedConversation } from "$lib/types/SharedConversation";
+import { hashConv } from "$lib/utils/hashConv";
+import { error } from "@sveltejs/kit";
+import { ObjectId } from "mongodb";
+import { nanoid } from "nanoid";
+
+export async function POST({ params, locals }) {
+	const conversation = await collections.conversations.findOne({
+		_id: new ObjectId(params.id),
+		...authCondition(locals),
+	});
+
+	if (!conversation) {
+		error(404, "Conversation not found");
+	}
+
+	const hash = await hashConv(conversation);
+
+	const existingShare = await collections.sharedConversations.findOne({ hash });
+
+	if (existingShare) {
+		return new Response(
+			JSON.stringify({
+				shareId: existingShare._id,
+			}),
+			{ headers: { "Content-Type": "application/json" } }
+		);
+	}
+
+	const shared: SharedConversation = {
+		_id: nanoid(7),
+		hash,
+		createdAt: new Date(),
+		updatedAt: new Date(),
+		rootMessageId: conversation.rootMessageId,
+		messages: conversation.messages,
+		title: conversation.title,
+		model: conversation.model,
+		preprompt: conversation.preprompt,
+	};
+
+	await collections.sharedConversations.insertOne(shared);
+
+	// copy files from `${conversation._id}-` to `${shared._id}-`
+	const files = await collections.bucket
+		.find({ filename: { $regex: `^${conversation._id}-` } })
+		.toArray();
+
+	await Promise.all(
+		files.map(async (file) => {
+			const newFilename = file.filename.replace(`${conversation._id}-`, `${shared._id}-`);
+			// copy files from `${conversation._id}-` to `${shared._id}-` by downloading and reuploaidng
+			const downloadStream = collections.bucket.openDownloadStream(file._id);
+			const uploadStream = collections.bucket.openUploadStream(newFilename, {
+				metadata: { ...file.metadata, conversation: shared._id.toString() },
+			});
+			downloadStream.pipe(uploadStream);
+		})
+	);
+
+	return new Response(
+		JSON.stringify({
+			shareId: shared._id,
+		}),
+		{ headers: { "Content-Type": "application/json" } }
+	);
+}

package/src/ruvocal/src/routes/conversation/[id]/stop-generating/+server.ts

@@ -1,35 +1,35 @@
-import { authCondition } from "$lib/server/auth";
-import { collections } from "$lib/server/database";
-import { AbortRegistry } from "$lib/server/abortRegistry";
-import { error } from "@sveltejs/kit";
-import { ObjectId } from "mongodb";
-
-/**
- * Ideally, we'd be able to detect the client-side abort, see https://github.com/huggingface/chat-ui/pull/88#issuecomment-1523173850
- */
-export async function POST({ params, locals }) {
-	if (!locals.user && !locals.sessionId) {
-		error(401, "Unauthorized");
-	}
-
-	const conversationId = new ObjectId(params.id);
-
-	const conversation = await collections.conversations.findOne({
-		_id: conversationId,
-		...authCondition(locals),
-	});
-
-	if (!conversation) {
-		error(404, "Conversation not found");
-	}
-
-	AbortRegistry.getInstance().abort(conversationId.toString());
-
-	await collections.abortedGenerations.updateOne(
-		{ conversationId },
-		{ $set: { updatedAt: new Date() }, $setOnInsert: { createdAt: new Date() } },
-		{ upsert: true }
-	);
-
-	return new Response();
-}
+import { authCondition } from "$lib/server/auth";
+import { collections } from "$lib/server/database";
+import { AbortRegistry } from "$lib/server/abortRegistry";
+import { error } from "@sveltejs/kit";
+import { ObjectId } from "mongodb";
+
+/**
+ * Ideally, we'd be able to detect the client-side abort, see https://github.com/huggingface/chat-ui/pull/88#issuecomment-1523173850
+ */
+export async function POST({ params, locals }) {
+	if (!locals.user && !locals.sessionId) {
+		error(401, "Unauthorized");
+	}
+
+	const conversationId = new ObjectId(params.id);
+
+	const conversation = await collections.conversations.findOne({
+		_id: conversationId,
+		...authCondition(locals),
+	});
+
+	if (!conversation) {
+		error(404, "Conversation not found");
+	}
+
+	AbortRegistry.getInstance().abort(conversationId.toString());
+
+	await collections.abortedGenerations.updateOne(
+		{ conversationId },
+		{ $set: { updatedAt: new Date() }, $setOnInsert: { createdAt: new Date() } },
+		{ upsert: true }
+	);
+
+	return new Response();
+}

package/src/ruvocal/src/routes/healthcheck/+server.ts

@@ -1,3 +1,3 @@
-export async function GET() {
-	return new Response("OK", { status: 200 });
-}
+export async function GET() {
+	return new Response("OK", { status: 200 });
+}

package/src/ruvocal/src/routes/login/+server.ts

@@ -1,5 +1,5 @@
-import { triggerOauthFlow } from "$lib/server/auth";
-
-export async function GET(event) {
-	return await triggerOauthFlow(event);
-}
+import { triggerOauthFlow } from "$lib/server/auth";
+
+export async function GET(event) {
+	return await triggerOauthFlow(event);
+}

package/src/ruvocal/src/routes/login/callback/+server.ts

@@ -1,103 +1,103 @@
-import { error, redirect } from "@sveltejs/kit";
-import { getOIDCUserData, validateAndParseCsrfToken } from "$lib/server/auth";
-import { z } from "zod";
-import { base } from "$app/paths";
-import { config } from "$lib/server/config";
-import JSON5 from "json5";
-import { updateUser } from "./updateUser.js";
-
-const sanitizeJSONEnv = (val: string, fallback: string) => {
-	const raw = (val ?? "").trim();
-	const unquoted = raw.startsWith("`") && raw.endsWith("`") ? raw.slice(1, -1) : raw;
-	return unquoted || fallback;
-};
-
-const allowedUserEmails = z
-	.array(z.string().email())
-	.optional()
-	.default([])
-	.parse(JSON5.parse(sanitizeJSONEnv(config.ALLOWED_USER_EMAILS, "[]")));
-
-const allowedUserDomains = z
-	.array(z.string().regex(/\.\w+$/)) // Contains at least a dot
-	.optional()
-	.default([])
-	.parse(JSON5.parse(sanitizeJSONEnv(config.ALLOWED_USER_DOMAINS, "[]")));
-
-export async function GET({ url, locals, cookies, request, getClientAddress }) {
-	const { error: errorName, error_description: errorDescription } = z
-		.object({
-			error: z.string().optional(),
-			error_description: z.string().optional(),
-		})
-		.parse(Object.fromEntries(url.searchParams.entries()));
-
-	if (errorName) {
-		throw error(400, errorName + (errorDescription ? ": " + errorDescription : ""));
-	}
-
-	const { code, state, iss } = z
-		.object({
-			code: z.string(),
-			state: z.string(),
-			iss: z.string().optional(),
-		})
-		.parse(Object.fromEntries(url.searchParams.entries()));
-
-	const csrfToken = Buffer.from(state, "base64").toString("utf-8");
-
-	const validatedToken = await validateAndParseCsrfToken(csrfToken, locals.sessionId);
-
-	if (!validatedToken) {
-		throw error(403, "Invalid or expired CSRF token");
-	}
-
-	const codeVerifier = cookies.get("hfChat-codeVerifier");
-	if (!codeVerifier) {
-		throw error(403, "Code verifier cookie not found");
-	}
-
-	const { userData, token } = await getOIDCUserData(
-		{ redirectURI: validatedToken.redirectUrl },
-		code,
-		codeVerifier,
-		iss,
-		url
-	);
-
-	// Filter by allowed user emails or domains
-	if (allowedUserEmails.length > 0 || allowedUserDomains.length > 0) {
-		if (!userData.email) {
-			throw error(403, "User not allowed: email not returned");
-		}
-		const emailVerified = userData.email_verified ?? true;
-		if (!emailVerified) {
-			throw error(403, "User not allowed: email not verified");
-		}
-
-		const emailDomain = userData.email.split("@")[1];
-		const isEmailAllowed = allowedUserEmails.includes(userData.email);
-		const isDomainAllowed = allowedUserDomains.includes(emailDomain);
-
-		if (!isEmailAllowed && !isDomainAllowed) {
-			throw error(403, "User not allowed");
-		}
-	}
-
-	await updateUser({
-		userData,
-		token,
-		locals,
-		cookies,
-		userAgent: request.headers.get("user-agent") ?? undefined,
-		ip: getClientAddress(),
-	});
-
-	// Prefer returning the user to their original in-app path when provided.
-	// `validatedToken.next` is sanitized server-side to avoid protocol-relative redirects.
-	const next = validatedToken.next;
-	if (next) {
-		return redirect(302, next);
-	}
-	return redirect(302, `${base}/`);
-}
+import { error, redirect } from "@sveltejs/kit";
+import { getOIDCUserData, validateAndParseCsrfToken } from "$lib/server/auth";
+import { z } from "zod";
+import { base } from "$app/paths";
+import { config } from "$lib/server/config";
+import JSON5 from "json5";
+import { updateUser } from "./updateUser.js";
+
+const sanitizeJSONEnv = (val: string, fallback: string) => {
+	const raw = (val ?? "").trim();
+	const unquoted = raw.startsWith("`") && raw.endsWith("`") ? raw.slice(1, -1) : raw;
+	return unquoted || fallback;
+};
+
+const allowedUserEmails = z
+	.array(z.string().email())
+	.optional()
+	.default([])
+	.parse(JSON5.parse(sanitizeJSONEnv(config.ALLOWED_USER_EMAILS, "[]")));
+
+const allowedUserDomains = z
+	.array(z.string().regex(/\.\w+$/)) // Contains at least a dot
+	.optional()
+	.default([])
+	.parse(JSON5.parse(sanitizeJSONEnv(config.ALLOWED_USER_DOMAINS, "[]")));
+
+export async function GET({ url, locals, cookies, request, getClientAddress }) {
+	const { error: errorName, error_description: errorDescription } = z
+		.object({
+			error: z.string().optional(),
+			error_description: z.string().optional(),
+		})
+		.parse(Object.fromEntries(url.searchParams.entries()));
+
+	if (errorName) {
+		throw error(400, errorName + (errorDescription ? ": " + errorDescription : ""));
+	}
+
+	const { code, state, iss } = z
+		.object({
+			code: z.string(),
+			state: z.string(),
+			iss: z.string().optional(),
+		})
+		.parse(Object.fromEntries(url.searchParams.entries()));
+
+	const csrfToken = Buffer.from(state, "base64").toString("utf-8");
+
+	const validatedToken = await validateAndParseCsrfToken(csrfToken, locals.sessionId);
+
+	if (!validatedToken) {
+		throw error(403, "Invalid or expired CSRF token");
+	}
+
+	const codeVerifier = cookies.get("hfChat-codeVerifier");
+	if (!codeVerifier) {
+		throw error(403, "Code verifier cookie not found");
+	}
+
+	const { userData, token } = await getOIDCUserData(
+		{ redirectURI: validatedToken.redirectUrl },
+		code,
+		codeVerifier,
+		iss,
+		url
+	);
+
+	// Filter by allowed user emails or domains
+	if (allowedUserEmails.length > 0 || allowedUserDomains.length > 0) {
+		if (!userData.email) {
+			throw error(403, "User not allowed: email not returned");
+		}
+		const emailVerified = userData.email_verified ?? true;
+		if (!emailVerified) {
+			throw error(403, "User not allowed: email not verified");
+		}
+
+		const emailDomain = userData.email.split("@")[1];
+		const isEmailAllowed = allowedUserEmails.includes(userData.email);
+		const isDomainAllowed = allowedUserDomains.includes(emailDomain);
+
+		if (!isEmailAllowed && !isDomainAllowed) {
+			throw error(403, "User not allowed");
+		}
+	}
+
+	await updateUser({
+		userData,
+		token,
+		locals,
+		cookies,
+		userAgent: request.headers.get("user-agent") ?? undefined,
+		ip: getClientAddress(),
+	});
+
+	// Prefer returning the user to their original in-app path when provided.
+	// `validatedToken.next` is sanitized server-side to avoid protocol-relative redirects.
+	const next = validatedToken.next;
+	if (next) {
+		return redirect(302, next);
+	}
+	return redirect(302, `${base}/`);
+}