ruflo 3.7.0-alpha.11 → 3.7.0-alpha.13

package/src/ruvocal/src/lib/migrations/routines/10-update-reports-assistantid.ts

@@ -1,29 +1,29 @@
-import { collections } from "$lib/server/database";
-import type { Migration } from ".";
-import { ObjectId } from "mongodb";
-
-const migration: Migration = {
-	_id: new ObjectId("000000000000000000000010"),
-	name: "Update reports with assistantId to use contentId",
-	up: async () => {
-		await collections.reports.updateMany(
-			{
-				assistantId: { $exists: true, $ne: null },
-			},
-			[
-				{
-					$set: {
-						object: "assistant",
-						contentId: "$assistantId",
-					},
-				},
-				{
-					$unset: "assistantId",
-				},
-			]
-		);
-		return true;
-	},
-};
-
-export default migration;
+import { collections } from "$lib/server/database";
+import type { Migration } from ".";
+import { ObjectId } from "mongodb";
+
+const migration: Migration = {
+	_id: new ObjectId("000000000000000000000010"),
+	name: "Update reports with assistantId to use contentId",
+	up: async () => {
+		await collections.reports.updateMany(
+			{
+				assistantId: { $exists: true, $ne: null },
+			},
+			[
+				{
+					$set: {
+						object: "assistant",
+						contentId: "$assistantId",
+					},
+				},
+				{
+					$unset: "assistantId",
+				},
+			]
+		);
+		return true;
+	},
+};
+
+export default migration;

package/src/ruvocal/src/lib/migrations/routines/index.ts

@@ -1,15 +1,15 @@
-import type { ObjectId } from "mongodb";
-
-import type { Database } from "$lib/server/database";
-
-export interface Migration {
-	_id: ObjectId;
-	name: string;
-	up: (client: Database) => Promise<boolean>;
-	down?: (client: Database) => Promise<boolean>;
-	runForFreshInstall?: "only" | "never"; // leave unspecified to run for both
-	runForHuggingChat?: "only" | "never"; // leave unspecified to run for both
-	runEveryTime?: boolean;
-}
-
-export const migrations: Migration[] = [];
+import type { ObjectId } from "mongodb";
+
+import type { Database } from "$lib/server/database";
+
+export interface Migration {
+	_id: ObjectId;
+	name: string;
+	up: (client: Database) => Promise<boolean>;
+	down?: (client: Database) => Promise<boolean>;
+	runForFreshInstall?: "only" | "never"; // leave unspecified to run for both
+	runForHuggingChat?: "only" | "never"; // leave unspecified to run for both
+	runEveryTime?: boolean;
+}
+
+export const migrations: Migration[] = [];

package/src/ruvocal/src/lib/server/__tests__/conversation-stop-generating.spec.ts

@@ -1,103 +1,103 @@
-import { afterEach, describe, expect, it, vi } from "vitest";
-import { ObjectId } from "mongodb";
-
-import { collections } from "$lib/server/database";
-import { AbortRegistry } from "$lib/server/abortRegistry";
-import {
-	cleanupTestData,
-	createTestConversation,
-	createTestLocals,
-	createTestUser,
-} from "$lib/server/api/__tests__/testHelpers";
-import { POST } from "../../../routes/conversation/[id]/stop-generating/+server";
-
-describe.sequential("POST /conversation/[id]/stop-generating", () => {
-	afterEach(async () => {
-		vi.restoreAllMocks();
-		await cleanupTestData();
-	});
-
-	it(
-		"creates abort marker and aborts active registry controllers",
-		{ timeout: 30000 },
-		async () => {
-			const { locals } = await createTestUser();
-			const conversation = await createTestConversation(locals);
-			const abortSpy = vi.spyOn(AbortRegistry.getInstance(), "abort");
-
-			const response = await POST({
-				params: { id: conversation._id.toString() },
-				locals,
-			} as never);
-
-			expect(response.status).toBe(200);
-			expect(abortSpy).toHaveBeenCalledWith(conversation._id.toString());
-
-			const marker = await collections.abortedGenerations.findOne({
-				conversationId: conversation._id,
-			});
-			expect(marker).not.toBeNull();
-			expect(marker?.createdAt).toBeInstanceOf(Date);
-			expect(marker?.updatedAt).toBeInstanceOf(Date);
-		}
-	);
-
-	it("updates updatedAt while preserving createdAt on repeated stop", async () => {
-		const { locals } = await createTestUser();
-		const conversation = await createTestConversation(locals);
-
-		await POST({
-			params: { id: conversation._id.toString() },
-			locals,
-		} as never);
-		const firstMarker = await collections.abortedGenerations.findOne({
-			conversationId: conversation._id,
-		});
-
-		await new Promise((resolve) => setTimeout(resolve, 5));
-
-		await POST({
-			params: { id: conversation._id.toString() },
-			locals,
-		} as never);
-		const secondMarker = await collections.abortedGenerations.findOne({
-			conversationId: conversation._id,
-		});
-
-		expect(firstMarker).not.toBeNull();
-		expect(secondMarker).not.toBeNull();
-		expect(secondMarker?.createdAt.getTime()).toBe(firstMarker?.createdAt.getTime());
-		expect(secondMarker?.updatedAt.getTime()).toBeGreaterThan(
-			firstMarker?.updatedAt.getTime() ?? 0
-		);
-	});
-
-	it("throws 404 when conversation is not found", async () => {
-		const { locals } = await createTestUser();
-		const missingId = new ObjectId().toString();
-
-		try {
-			await POST({
-				params: { id: missingId },
-				locals,
-			} as never);
-			expect.fail("Expected 404 error");
-		} catch (e: unknown) {
-			expect((e as { status: number }).status).toBe(404);
-		}
-	});
-
-	it("throws 401 for unauthenticated requests", async () => {
-		const locals = createTestLocals({ user: undefined, sessionId: undefined });
-
-		try {
-			await POST({
-				params: { id: new ObjectId().toString() },
-				locals,
-			} as never);
-			expect.fail("Expected 401 error");
-		} catch (e: unknown) {
-			expect((e as { status: number }).status).toBe(401);
-		}
-	});
-});
+import { afterEach, describe, expect, it, vi } from "vitest";
+import { ObjectId } from "mongodb";
+
+import { collections } from "$lib/server/database";
+import { AbortRegistry } from "$lib/server/abortRegistry";
+import {
+	cleanupTestData,
+	createTestConversation,
+	createTestLocals,
+	createTestUser,
+} from "$lib/server/api/__tests__/testHelpers";
+import { POST } from "../../../routes/conversation/[id]/stop-generating/+server";
+
+describe.sequential("POST /conversation/[id]/stop-generating", () => {
+	afterEach(async () => {
+		vi.restoreAllMocks();
+		await cleanupTestData();
+	});
+
+	it(
+		"creates abort marker and aborts active registry controllers",
+		{ timeout: 30000 },
+		async () => {
+			const { locals } = await createTestUser();
+			const conversation = await createTestConversation(locals);
+			const abortSpy = vi.spyOn(AbortRegistry.getInstance(), "abort");
+
+			const response = await POST({
+				params: { id: conversation._id.toString() },
+				locals,
+			} as never);
+
+			expect(response.status).toBe(200);
+			expect(abortSpy).toHaveBeenCalledWith(conversation._id.toString());
+
+			const marker = await collections.abortedGenerations.findOne({
+				conversationId: conversation._id,
+			});
+			expect(marker).not.toBeNull();
+			expect(marker?.createdAt).toBeInstanceOf(Date);
+			expect(marker?.updatedAt).toBeInstanceOf(Date);
+		}
+	);
+
+	it("updates updatedAt while preserving createdAt on repeated stop", async () => {
+		const { locals } = await createTestUser();
+		const conversation = await createTestConversation(locals);
+
+		await POST({
+			params: { id: conversation._id.toString() },
+			locals,
+		} as never);
+		const firstMarker = await collections.abortedGenerations.findOne({
+			conversationId: conversation._id,
+		});
+
+		await new Promise((resolve) => setTimeout(resolve, 5));
+
+		await POST({
+			params: { id: conversation._id.toString() },
+			locals,
+		} as never);
+		const secondMarker = await collections.abortedGenerations.findOne({
+			conversationId: conversation._id,
+		});
+
+		expect(firstMarker).not.toBeNull();
+		expect(secondMarker).not.toBeNull();
+		expect(secondMarker?.createdAt.getTime()).toBe(firstMarker?.createdAt.getTime());
+		expect(secondMarker?.updatedAt.getTime()).toBeGreaterThan(
+			firstMarker?.updatedAt.getTime() ?? 0
+		);
+	});
+
+	it("throws 404 when conversation is not found", async () => {
+		const { locals } = await createTestUser();
+		const missingId = new ObjectId().toString();
+
+		try {
+			await POST({
+				params: { id: missingId },
+				locals,
+			} as never);
+			expect.fail("Expected 404 error");
+		} catch (e: unknown) {
+			expect((e as { status: number }).status).toBe(404);
+		}
+	});
+
+	it("throws 401 for unauthenticated requests", async () => {
+		const locals = createTestLocals({ user: undefined, sessionId: undefined });
+
+		try {
+			await POST({
+				params: { id: new ObjectId().toString() },
+				locals,
+			} as never);
+			expect.fail("Expected 401 error");
+		} catch (e: unknown) {
+			expect((e as { status: number }).status).toBe(401);
+		}
+	});
+});

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

@@ -1,57 +1,57 @@
-import { logger } from "$lib/server/logger";
-
-/**
- * Tracks active upstream generation requests so they can be cancelled on demand.
- * Multiple controllers can be registered per conversation (for threaded/background runs).
- */
-export class AbortRegistry {
-	private static instance: AbortRegistry;
-
-	private controllers = new Map<string, Set<AbortController>>();
-
-	public static getInstance(): AbortRegistry {
-		if (!AbortRegistry.instance) {
-			AbortRegistry.instance = new AbortRegistry();
-		}
-		return AbortRegistry.instance;
-	}
-
-	public register(conversationId: string, controller: AbortController) {
-		const key = conversationId.toString();
-		let set = this.controllers.get(key);
-		if (!set) {
-			set = new Set();
-			this.controllers.set(key, set);
-		}
-		set.add(controller);
-		controller.signal.addEventListener(
-			"abort",
-			() => {
-				this.unregister(key, controller);
-			},
-			{ once: true }
-		);
-	}
-
-	public abort(conversationId: string) {
-		const set = this.controllers.get(conversationId);
-		if (!set?.size) return;
-
-		logger.debug({ conversationId }, "Aborting active generation via AbortRegistry");
-		for (const controller of set) {
-			if (!controller.signal.aborted) {
-				controller.abort();
-			}
-		}
-		this.controllers.delete(conversationId);
-	}
-
-	public unregister(conversationId: string, controller: AbortController) {
-		const set = this.controllers.get(conversationId);
-		if (!set) return;
-		set.delete(controller);
-		if (set.size === 0) {
-			this.controllers.delete(conversationId);
-		}
-	}
-}
+import { logger } from "$lib/server/logger";
+
+/**
+ * Tracks active upstream generation requests so they can be cancelled on demand.
+ * Multiple controllers can be registered per conversation (for threaded/background runs).
+ */
+export class AbortRegistry {
+	private static instance: AbortRegistry;
+
+	private controllers = new Map<string, Set<AbortController>>();
+
+	public static getInstance(): AbortRegistry {
+		if (!AbortRegistry.instance) {
+			AbortRegistry.instance = new AbortRegistry();
+		}
+		return AbortRegistry.instance;
+	}
+
+	public register(conversationId: string, controller: AbortController) {
+		const key = conversationId.toString();
+		let set = this.controllers.get(key);
+		if (!set) {
+			set = new Set();
+			this.controllers.set(key, set);
+		}
+		set.add(controller);
+		controller.signal.addEventListener(
+			"abort",
+			() => {
+				this.unregister(key, controller);
+			},
+			{ once: true }
+		);
+	}
+
+	public abort(conversationId: string) {
+		const set = this.controllers.get(conversationId);
+		if (!set?.size) return;
+
+		logger.debug({ conversationId }, "Aborting active generation via AbortRegistry");
+		for (const controller of set) {
+			if (!controller.signal.aborted) {
+				controller.abort();
+			}
+		}
+		this.controllers.delete(conversationId);
+	}
+
+	public unregister(conversationId: string, controller: AbortController) {
+		const set = this.controllers.get(conversationId);
+		if (!set) return;
+		set.delete(controller);
+		if (set.size === 0) {
+			this.controllers.delete(conversationId);
+		}
+	}
+}

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

@@ -1,43 +1,43 @@
-// Shouldn't be needed if we dove into sveltekit internals, see https://github.com/huggingface/chat-ui/pull/88#issuecomment-1523173850
-
-import { logger } from "$lib/server/logger";
-import { collections } from "$lib/server/database";
-import { onExit } from "./exitHandler";
-
-export class AbortedGenerations {
-	private static instance: AbortedGenerations;
-
-	private abortedGenerations: Record<string, Date> = {};
-
-	private constructor() {
-		// Poll every 500ms for faster abort detection (reduced from 1000ms)
-		const interval = setInterval(() => this.updateList(), 500);
-		onExit(() => clearInterval(interval));
-
-		this.updateList();
-	}
-
-	public static getInstance(): AbortedGenerations {
-		if (!AbortedGenerations.instance) {
-			AbortedGenerations.instance = new AbortedGenerations();
-		}
-
-		return AbortedGenerations.instance;
-	}
-
-	public getAbortTime(conversationId: string): Date | undefined {
-		return this.abortedGenerations[conversationId];
-	}
-
-	private async updateList() {
-		try {
-			const aborts = await collections.abortedGenerations.find({}).sort({ createdAt: 1 }).toArray();
-
-			this.abortedGenerations = Object.fromEntries(
-				aborts.map((abort) => [abort.conversationId.toString(), abort.updatedAt ?? abort.createdAt])
-			);
-		} catch (err) {
-			logger.error(err, "Error updating aborted generations list");
-		}
-	}
-}
+// Shouldn't be needed if we dove into sveltekit internals, see https://github.com/huggingface/chat-ui/pull/88#issuecomment-1523173850
+
+import { logger } from "$lib/server/logger";
+import { collections } from "$lib/server/database";
+import { onExit } from "./exitHandler";
+
+export class AbortedGenerations {
+	private static instance: AbortedGenerations;
+
+	private abortedGenerations: Record<string, Date> = {};
+
+	private constructor() {
+		// Poll every 500ms for faster abort detection (reduced from 1000ms)
+		const interval = setInterval(() => this.updateList(), 500);
+		onExit(() => clearInterval(interval));
+
+		this.updateList();
+	}
+
+	public static getInstance(): AbortedGenerations {
+		if (!AbortedGenerations.instance) {
+			AbortedGenerations.instance = new AbortedGenerations();
+		}
+
+		return AbortedGenerations.instance;
+	}
+
+	public getAbortTime(conversationId: string): Date | undefined {
+		return this.abortedGenerations[conversationId];
+	}
+
+	private async updateList() {
+		try {
+			const aborts = await collections.abortedGenerations.find({}).sort({ createdAt: 1 }).toArray();
+
+			this.abortedGenerations = Object.fromEntries(
+				aborts.map((abort) => [abort.conversationId.toString(), abort.updatedAt ?? abort.createdAt])
+			);
+		} catch (err) {
+			logger.error(err, "Error updating aborted generations list");
+		}
+	}
+}

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

@@ -1,62 +1,62 @@
-import { config } from "$lib/server/config";
-import type { Session } from "$lib/types/Session";
-import { logger } from "./logger";
-import { v4 } from "uuid";
-
-class AdminTokenManager {
-	private token = config.ADMIN_TOKEN || v4();
-	// contains all session ids that are currently admin sessions
-	private adminSessions: Array<Session["sessionId"]> = [];
-
-	public get enabled() {
-		// if open id is configured, disable the feature
-		return config.ADMIN_CLI_LOGIN === "true";
-	}
-	public isAdmin(sessionId: Session["sessionId"]) {
-		if (!this.enabled) return false;
-		return this.adminSessions.includes(sessionId);
-	}
-
-	public checkToken(token: string, sessionId: Session["sessionId"]) {
-		if (!this.enabled) return false;
-		if (token === this.token) {
-			logger.info(`[ADMIN] Token validated`);
-			this.adminSessions.push(sessionId);
-			this.token = config.ADMIN_TOKEN || v4();
-			return true;
-		}
-
-		return false;
-	}
-
-	public removeSession(sessionId: Session["sessionId"]) {
-		this.adminSessions = this.adminSessions.filter((id) => id !== sessionId);
-	}
-
-	public displayToken() {
-		// if admin token is set, don't display it
-		if (!this.enabled || config.ADMIN_TOKEN) return;
-
-		let port = process.env.PORT
-			? parseInt(process.env.PORT)
-			: process.argv.includes("--port")
-				? parseInt(process.argv[process.argv.indexOf("--port") + 1])
-				: undefined;
-
-		if (!port) {
-			const mode = process.argv.find((arg) => arg === "preview" || arg === "dev");
-			if (mode === "preview") {
-				port = 4173;
-			} else if (mode === "dev") {
-				port = 5173;
-			} else {
-				port = 3000;
-			}
-		}
-
-		const url = (config.PUBLIC_ORIGIN || `http://localhost:${port}`) + "?token=";
-		logger.info(`[ADMIN] You can login with ${url + this.token}`);
-	}
-}
-
-export const adminTokenManager = new AdminTokenManager();
+import { config } from "$lib/server/config";
+import type { Session } from "$lib/types/Session";
+import { logger } from "./logger";
+import { v4 } from "uuid";
+
+class AdminTokenManager {
+	private token = config.ADMIN_TOKEN || v4();
+	// contains all session ids that are currently admin sessions
+	private adminSessions: Array<Session["sessionId"]> = [];
+
+	public get enabled() {
+		// if open id is configured, disable the feature
+		return config.ADMIN_CLI_LOGIN === "true";
+	}
+	public isAdmin(sessionId: Session["sessionId"]) {
+		if (!this.enabled) return false;
+		return this.adminSessions.includes(sessionId);
+	}
+
+	public checkToken(token: string, sessionId: Session["sessionId"]) {
+		if (!this.enabled) return false;
+		if (token === this.token) {
+			logger.info(`[ADMIN] Token validated`);
+			this.adminSessions.push(sessionId);
+			this.token = config.ADMIN_TOKEN || v4();
+			return true;
+		}
+
+		return false;
+	}
+
+	public removeSession(sessionId: Session["sessionId"]) {
+		this.adminSessions = this.adminSessions.filter((id) => id !== sessionId);
+	}
+
+	public displayToken() {
+		// if admin token is set, don't display it
+		if (!this.enabled || config.ADMIN_TOKEN) return;
+
+		let port = process.env.PORT
+			? parseInt(process.env.PORT)
+			: process.argv.includes("--port")
+				? parseInt(process.argv[process.argv.indexOf("--port") + 1])
+				: undefined;
+
+		if (!port) {
+			const mode = process.argv.find((arg) => arg === "preview" || arg === "dev");
+			if (mode === "preview") {
+				port = 4173;
+			} else if (mode === "dev") {
+				port = 5173;
+			} else {
+				port = 3000;
+			}
+		}
+
+		const url = (config.PUBLIC_ORIGIN || `http://localhost:${port}`) + "?token=";
+		logger.info(`[ADMIN] You can login with ${url + this.token}`);
+	}
+}
+
+export const adminTokenManager = new AdminTokenManager();