ruflo 3.10.45 → 3.11.0

package/src/ruvocal/src/lib/server/exitHandler.ts

@@ -1,59 +1,59 @@
-import { randomUUID } from "$lib/utils/randomUuid";
-import { timeout } from "$lib/utils/timeout";
-import { logger } from "./logger";
-
-type ExitHandler = () => void | Promise<void>;
-type ExitHandlerUnsubscribe = () => void;
-
-const listeners = new Map<string, ExitHandler>();
-
-export function onExit(cb: ExitHandler): ExitHandlerUnsubscribe {
-	const uuid = randomUUID();
-	listeners.set(uuid, cb);
-	return () => {
-		listeners.delete(uuid);
-	};
-}
-
-async function runExitHandler(handler: ExitHandler): Promise<void> {
-	return timeout(Promise.resolve().then(handler), 30_000).catch((err) => {
-		logger.error(err, "Exit handler failed to run");
-	});
-}
-
-export function initExitHandler() {
-	let signalCount = 0;
-	const exitHandler = async () => {
-		if (signalCount === 1) {
-			logger.info("Received signal... Exiting");
-			await Promise.all(Array.from(listeners.values()).map(runExitHandler));
-			logger.info("All exit handlers ran... Waiting for svelte server to exit");
-		}
-	};
-
-	process.on("SIGINT", () => {
-		signalCount++;
-
-		if (signalCount >= 2) {
-			process.kill(process.pid, "SIGKILL");
-		} else {
-			exitHandler().catch((err) => {
-				logger.error(err, "Error in exit handler on SIGINT:");
-				process.kill(process.pid, "SIGKILL");
-			});
-		}
-	});
-
-	process.on("SIGTERM", () => {
-		signalCount++;
-
-		if (signalCount >= 2) {
-			process.kill(process.pid, "SIGKILL");
-		} else {
-			exitHandler().catch((err) => {
-				logger.error(err, "Error in exit handler on SIGTERM:");
-				process.kill(process.pid, "SIGKILL");
-			});
-		}
-	});
-}
+import { randomUUID } from "$lib/utils/randomUuid";
+import { timeout } from "$lib/utils/timeout";
+import { logger } from "./logger";
+
+type ExitHandler = () => void | Promise<void>;
+type ExitHandlerUnsubscribe = () => void;
+
+const listeners = new Map<string, ExitHandler>();
+
+export function onExit(cb: ExitHandler): ExitHandlerUnsubscribe {
+	const uuid = randomUUID();
+	listeners.set(uuid, cb);
+	return () => {
+		listeners.delete(uuid);
+	};
+}
+
+async function runExitHandler(handler: ExitHandler): Promise<void> {
+	return timeout(Promise.resolve().then(handler), 30_000).catch((err) => {
+		logger.error(err, "Exit handler failed to run");
+	});
+}
+
+export function initExitHandler() {
+	let signalCount = 0;
+	const exitHandler = async () => {
+		if (signalCount === 1) {
+			logger.info("Received signal... Exiting");
+			await Promise.all(Array.from(listeners.values()).map(runExitHandler));
+			logger.info("All exit handlers ran... Waiting for svelte server to exit");
+		}
+	};
+
+	process.on("SIGINT", () => {
+		signalCount++;
+
+		if (signalCount >= 2) {
+			process.kill(process.pid, "SIGKILL");
+		} else {
+			exitHandler().catch((err) => {
+				logger.error(err, "Error in exit handler on SIGINT:");
+				process.kill(process.pid, "SIGKILL");
+			});
+		}
+	});
+
+	process.on("SIGTERM", () => {
+		signalCount++;
+
+		if (signalCount >= 2) {
+			process.kill(process.pid, "SIGKILL");
+		} else {
+			exitHandler().catch((err) => {
+				logger.error(err, "Error in exit handler on SIGTERM:");
+				process.kill(process.pid, "SIGKILL");
+			});
+		}
+	});
+}

package/src/ruvocal/src/lib/server/files/downloadFile.ts

@@ -1,34 +1,34 @@
-import { error } from "@sveltejs/kit";
-import { collections } from "$lib/server/database";
-import type { Conversation } from "$lib/types/Conversation";
-import type { SharedConversation } from "$lib/types/SharedConversation";
-import type { MessageFile } from "$lib/types/Message";
-
-export async function downloadFile(
-	sha256: string,
-	convId: Conversation["_id"] | SharedConversation["_id"]
-): Promise<MessageFile & { type: "base64" }> {
-	const fileId = collections.bucket.find({ filename: `${convId.toString()}-${sha256}` });
-
-	const file = await fileId.next();
-	if (!file) {
-		error(404, "File not found");
-	}
-	if (file.metadata?.conversation !== convId.toString()) {
-		error(403, "You don't have access to this file.");
-	}
-
-	const mime = file.metadata?.mime;
-	const name = file.filename;
-
-	const fileStream = collections.bucket.openDownloadStream(file._id);
-
-	const buffer = await new Promise<Buffer>((resolve, reject) => {
-		const chunks: Uint8Array[] = [];
-		fileStream.on("data", (chunk) => chunks.push(chunk));
-		fileStream.on("error", reject);
-		fileStream.on("end", () => resolve(Buffer.concat(chunks)));
-	});
-
-	return { type: "base64", name, value: buffer.toString("base64"), mime };
-}
+import { error } from "@sveltejs/kit";
+import { collections } from "$lib/server/database";
+import type { Conversation } from "$lib/types/Conversation";
+import type { SharedConversation } from "$lib/types/SharedConversation";
+import type { MessageFile } from "$lib/types/Message";
+
+export async function downloadFile(
+	sha256: string,
+	convId: Conversation["_id"] | SharedConversation["_id"]
+): Promise<MessageFile & { type: "base64" }> {
+	const fileId = collections.bucket.find({ filename: `${convId.toString()}-${sha256}` });
+
+	const file = await fileId.next();
+	if (!file) {
+		error(404, "File not found");
+	}
+	if (file.metadata?.conversation !== convId.toString()) {
+		error(403, "You don't have access to this file.");
+	}
+
+	const mime = file.metadata?.mime;
+	const name = file.filename;
+
+	const fileStream = collections.bucket.openDownloadStream(file._id);
+
+	const buffer = await new Promise<Buffer>((resolve, reject) => {
+		const chunks: Uint8Array[] = [];
+		fileStream.on("data", (chunk) => chunks.push(chunk));
+		fileStream.on("error", reject);
+		fileStream.on("end", () => resolve(Buffer.concat(chunks)));
+	});
+
+	return { type: "base64", name, value: buffer.toString("base64"), mime };
+}

package/src/ruvocal/src/lib/server/files/uploadFile.ts

@@ -1,29 +1,29 @@
-import type { Conversation } from "$lib/types/Conversation";
-import type { MessageFile } from "$lib/types/Message";
-import { sha256 } from "$lib/utils/sha256";
-import { fileTypeFromBuffer } from "file-type";
-import { collections } from "$lib/server/database";
-
-export async function uploadFile(file: File, conv: Conversation): Promise<MessageFile> {
-	const sha = await sha256(await file.text());
-	const buffer = await file.arrayBuffer();
-
-	// Attempt to detect the mime type of the file, fallback to the uploaded mime
-	const mime = await fileTypeFromBuffer(buffer).then((fileType) => fileType?.mime ?? file.type);
-
-	const upload = collections.bucket.openUploadStream(`${conv._id}-${sha}`, {
-		metadata: { conversation: conv._id.toString(), mime },
-	});
-
-	upload.write((await file.arrayBuffer()) as unknown as Buffer);
-	upload.end();
-
-	// only return the filename when upload throws a finish event or a 20s time out occurs
-	return new Promise((resolve, reject) => {
-		upload.once("finish", () =>
-			resolve({ type: "hash", value: sha, mime: file.type, name: file.name })
-		);
-		upload.once("error", reject);
-		setTimeout(() => reject(new Error("Upload timed out")), 20_000);
-	});
-}
+import type { Conversation } from "$lib/types/Conversation";
+import type { MessageFile } from "$lib/types/Message";
+import { sha256 } from "$lib/utils/sha256";
+import { fileTypeFromBuffer } from "file-type";
+import { collections } from "$lib/server/database";
+
+export async function uploadFile(file: File, conv: Conversation): Promise<MessageFile> {
+	const sha = await sha256(await file.text());
+	const buffer = await file.arrayBuffer();
+
+	// Attempt to detect the mime type of the file, fallback to the uploaded mime
+	const mime = await fileTypeFromBuffer(buffer).then((fileType) => fileType?.mime ?? file.type);
+
+	const upload = collections.bucket.openUploadStream(`${conv._id}-${sha}`, {
+		metadata: { conversation: conv._id.toString(), mime },
+	});
+
+	upload.write((await file.arrayBuffer()) as unknown as Buffer);
+	upload.end();
+
+	// only return the filename when upload throws a finish event or a 20s time out occurs
+	return new Promise((resolve, reject) => {
+		upload.once("finish", () =>
+			resolve({ type: "hash", value: sha, mime: file.type, name: file.name })
+		);
+		upload.once("error", reject);
+		setTimeout(() => reject(new Error("Upload timed out")), 20_000);
+	});
+}

package/src/ruvocal/src/lib/server/findRepoRoot.ts

@@ -1,13 +1,13 @@
-import { existsSync } from "fs";
-import { join, dirname } from "path";
-
-export function findRepoRoot(startPath: string): string {
-	let currentPath = startPath;
-	while (currentPath !== "/") {
-		if (existsSync(join(currentPath, "package.json"))) {
-			return currentPath;
-		}
-		currentPath = dirname(currentPath);
-	}
-	throw new Error("Could not find repository root (no package.json found)");
-}
+import { existsSync } from "fs";
+import { join, dirname } from "path";
+
+export function findRepoRoot(startPath: string): string {
+	let currentPath = startPath;
+	while (currentPath !== "/") {
+		if (existsSync(join(currentPath, "package.json"))) {
+			return currentPath;
+		}
+		currentPath = dirname(currentPath);
+	}
+	throw new Error("Could not find repository root (no package.json found)");
+}

package/src/ruvocal/src/lib/server/generateFromDefaultEndpoint.ts

@@ -1,46 +1,46 @@
-import { taskModel, models } from "$lib/server/models";
-import { MessageUpdateType, type MessageUpdate } from "$lib/types/MessageUpdate";
-import type { EndpointMessage } from "./endpoints/endpoints";
-
-export async function* generateFromDefaultEndpoint({
-	messages,
-	preprompt,
-	generateSettings,
-	modelId,
-	locals,
-}: {
-	messages: EndpointMessage[];
-	preprompt?: string;
-	generateSettings?: Record<string, unknown>;
-	/** Optional: use this model instead of the default task model */
-	modelId?: string;
-	locals: App.Locals | undefined;
-}): AsyncGenerator<MessageUpdate, string, undefined> {
-	try {
-		// Choose endpoint based on provided modelId, else fall back to taskModel
-		const model = modelId ? (models.find((m) => m.id === modelId) ?? taskModel) : taskModel;
-		const endpoint = await model.getEndpoint();
-		const tokenStream = await endpoint({ messages, preprompt, generateSettings, locals });
-
-		for await (const output of tokenStream) {
-			// if not generated_text is here it means the generation is not done
-			if (output.generated_text) {
-				let generated_text = output.generated_text;
-				for (const stop of [...(model.parameters?.stop ?? []), "<|endoftext|>"]) {
-					if (generated_text.endsWith(stop)) {
-						generated_text = generated_text.slice(0, -stop.length).trimEnd();
-					}
-				}
-				return generated_text;
-			}
-			yield {
-				type: MessageUpdateType.Stream,
-				token: output.token.text,
-			};
-		}
-	} catch (error) {
-		return "";
-	}
-
-	return "";
-}
+import { taskModel, models } from "$lib/server/models";
+import { MessageUpdateType, type MessageUpdate } from "$lib/types/MessageUpdate";
+import type { EndpointMessage } from "./endpoints/endpoints";
+
+export async function* generateFromDefaultEndpoint({
+	messages,
+	preprompt,
+	generateSettings,
+	modelId,
+	locals,
+}: {
+	messages: EndpointMessage[];
+	preprompt?: string;
+	generateSettings?: Record<string, unknown>;
+	/** Optional: use this model instead of the default task model */
+	modelId?: string;
+	locals: App.Locals | undefined;
+}): AsyncGenerator<MessageUpdate, string, undefined> {
+	try {
+		// Choose endpoint based on provided modelId, else fall back to taskModel
+		const model = modelId ? (models.find((m) => m.id === modelId) ?? taskModel) : taskModel;
+		const endpoint = await model.getEndpoint();
+		const tokenStream = await endpoint({ messages, preprompt, generateSettings, locals });
+
+		for await (const output of tokenStream) {
+			// if not generated_text is here it means the generation is not done
+			if (output.generated_text) {
+				let generated_text = output.generated_text;
+				for (const stop of [...(model.parameters?.stop ?? []), "<|endoftext|>"]) {
+					if (generated_text.endsWith(stop)) {
+						generated_text = generated_text.slice(0, -stop.length).trimEnd();
+					}
+				}
+				return generated_text;
+			}
+			yield {
+				type: MessageUpdateType.Stream,
+				token: output.token.text,
+			};
+		}
+	} catch (error) {
+		return "";
+	}
+
+	return "";
+}

package/src/ruvocal/src/lib/server/hooks/error.ts

@@ -1,37 +1,37 @@
-import type { HandleServerError } from "@sveltejs/kit";
-import { logger } from "$lib/server/logger";
-
-type HandleServerErrorInput = Parameters<HandleServerError>[0];
-
-export async function handleServerError({
-	error,
-	event,
-	status,
-	message,
-}: HandleServerErrorInput): Promise<App.Error> {
-	// handle 404
-	if (event.route.id === null) {
-		return {
-			message: `Page ${event.url.pathname} not found`,
-		};
-	}
-
-	const errorId = crypto.randomUUID();
-
-	logger.error({
-		locals: event.locals,
-		url: event.request.url,
-		params: event.params,
-		request: event.request,
-		message,
-		error,
-		errorId,
-		status,
-		stack: error instanceof Error ? error.stack : undefined,
-	});
-
-	return {
-		message: "An error occurred",
-		errorId,
-	};
-}
+import type { HandleServerError } from "@sveltejs/kit";
+import { logger } from "$lib/server/logger";
+
+type HandleServerErrorInput = Parameters<HandleServerError>[0];
+
+export async function handleServerError({
+	error,
+	event,
+	status,
+	message,
+}: HandleServerErrorInput): Promise<App.Error> {
+	// handle 404
+	if (event.route.id === null) {
+		return {
+			message: `Page ${event.url.pathname} not found`,
+		};
+	}
+
+	const errorId = crypto.randomUUID();
+
+	logger.error({
+		locals: event.locals,
+		url: event.request.url,
+		params: event.params,
+		request: event.request,
+		message,
+		error,
+		errorId,
+		status,
+		stack: error instanceof Error ? error.stack : undefined,
+	});
+
+	return {
+		message: "An error occurred",
+		errorId,
+	};
+}

package/src/ruvocal/src/lib/server/hooks/fetch.ts

@@ -1,22 +1,22 @@
-import type { HandleFetch } from "@sveltejs/kit";
-import { isHostLocalhost } from "$lib/server/isURLLocal";
-
-type HandleFetchInput = Parameters<HandleFetch>[0];
-
-export async function handleFetchRequest({
-	event,
-	request,
-	fetch,
-}: HandleFetchInput): Promise<Response> {
-	if (isHostLocalhost(new URL(request.url).hostname)) {
-		const cookieHeader = event.request.headers.get("cookie");
-		if (cookieHeader) {
-			const headers = new Headers(request.headers);
-			headers.set("cookie", cookieHeader);
-
-			return fetch(new Request(request, { headers }));
-		}
-	}
-
-	return fetch(request);
-}
+import type { HandleFetch } from "@sveltejs/kit";
+import { isHostLocalhost } from "$lib/server/isURLLocal";
+
+type HandleFetchInput = Parameters<HandleFetch>[0];
+
+export async function handleFetchRequest({
+	event,
+	request,
+	fetch,
+}: HandleFetchInput): Promise<Response> {
+	if (isHostLocalhost(new URL(request.url).hostname)) {
+		const cookieHeader = event.request.headers.get("cookie");
+		if (cookieHeader) {
+			const headers = new Headers(request.headers);
+			headers.set("cookie", cookieHeader);
+
+			return fetch(new Request(request, { headers }));
+		}
+	}
+
+	return fetch(request);
+}