ruflo 3.10.36 → 3.10.38

package/src/ruvocal/src/lib/utils/tree/buildSubtree.spec.ts

@@ -1,110 +1,110 @@
-import { collections } from "$lib/server/database";
-import { ObjectId } from "mongodb";
-import { describe, expect, it } from "vitest";
-
-import {
-	insertLegacyConversation,
-	insertLinearBranchConversation,
-	insertSideBranchesConversation,
-} from "./treeHelpers.spec";
-import { buildSubtree } from "./buildSubtree";
-
-describe("buildSubtree", () => {
-	it("a subtree in a legacy conversation should be just a slice", async () => {
-		const convId = await insertLegacyConversation();
-		const conv = await collections.conversations.findOne({ _id: new ObjectId(convId) });
-		if (!conv) throw new Error("Conversation not found");
-
-		// check middle
-		const id = conv.messages[2].id;
-		const subtree = buildSubtree(conv, id);
-		expect(subtree).toEqual(conv.messages.slice(0, 3));
-
-		// check zero
-		const id2 = conv.messages[0].id;
-		const subtree2 = buildSubtree(conv, id2);
-		expect(subtree2).toEqual(conv.messages.slice(0, 1));
-
-		//check full length
-		const id3 = conv.messages[conv.messages.length - 1].id;
-		const subtree3 = buildSubtree(conv, id3);
-		expect(subtree3).toEqual(conv.messages);
-	});
-
-	it("a subtree in a linear branch conversation should be the ancestors and the message", async () => {
-		const convId = await insertLinearBranchConversation();
-		const conv = await collections.conversations.findOne({ _id: new ObjectId(convId) });
-		if (!conv) throw new Error("Conversation not found");
-
-		// check middle
-		const id = conv.messages[1].id;
-		const subtree = buildSubtree(conv, id);
-		expect(subtree).toEqual([conv.messages[0], conv.messages[1]]);
-
-		// check zero
-		const id2 = conv.messages[0].id;
-		const subtree2 = buildSubtree(conv, id2);
-		expect(subtree2).toEqual([conv.messages[0]]);
-
-		//check full length
-		const id3 = conv.messages[conv.messages.length - 1].id;
-		const subtree3 = buildSubtree(conv, id3);
-		expect(subtree3).toEqual(conv.messages);
-	});
-
-	it("should throw an error if the message is not found", async () => {
-		const convId = await insertLinearBranchConversation();
-		const conv = await collections.conversations.findOne({ _id: new ObjectId(convId) });
-		if (!conv) throw new Error("Conversation not found");
-
-		const id = "not-a-real-id-test";
-
-		expect(() => buildSubtree(conv, id)).toThrow("Message not found");
-	});
-
-	it("should throw an error if the ancestor is not found", async () => {
-		const convId = await insertLinearBranchConversation();
-		const conv = await collections.conversations.findOne({ _id: new ObjectId(convId) });
-		if (!conv) throw new Error("Conversation not found");
-
-		const id = "1-1-1-1-2";
-
-		conv.messages[1].ancestors = ["not-a-real-id-test"];
-
-		expect(() => buildSubtree(conv, id)).toThrow("Ancestor not found");
-	});
-
-	it("should work on empty conversations", () => {
-		const conv = {
-			_id: new ObjectId(),
-			rootMessageId: undefined,
-			messages: [],
-		};
-
-		const subtree = buildSubtree(conv, "not-a-real-id-test");
-		expect(subtree).toEqual([]);
-	});
-
-	it("should work for conversation with subtrees", async () => {
-		const convId = await insertSideBranchesConversation();
-		const conv = await collections.conversations.findOne({ _id: new ObjectId(convId) });
-		if (!conv) throw new Error("Conversation not found");
-
-		const subtree = buildSubtree(conv, "1-1-1-1-2");
-		expect(subtree).toEqual([conv.messages[0], conv.messages[1]]);
-
-		const subtree2 = buildSubtree(conv, "1-1-1-1-4");
-		expect(subtree2).toEqual([
-			conv.messages[0],
-			conv.messages[1],
-			conv.messages[2],
-			conv.messages[3],
-		]);
-
-		const subtree3 = buildSubtree(conv, "1-1-1-1-6");
-		expect(subtree3).toEqual([conv.messages[0], conv.messages[4], conv.messages[5]]);
-
-		const subtree4 = buildSubtree(conv, "1-1-1-1-7");
-		expect(subtree4).toEqual([conv.messages[0], conv.messages[4], conv.messages[6]]);
-	});
-});
+import { collections } from "$lib/server/database";
+import { ObjectId } from "mongodb";
+import { describe, expect, it } from "vitest";
+
+import {
+	insertLegacyConversation,
+	insertLinearBranchConversation,
+	insertSideBranchesConversation,
+} from "./treeHelpers.spec";
+import { buildSubtree } from "./buildSubtree";
+
+describe("buildSubtree", () => {
+	it("a subtree in a legacy conversation should be just a slice", async () => {
+		const convId = await insertLegacyConversation();
+		const conv = await collections.conversations.findOne({ _id: new ObjectId(convId) });
+		if (!conv) throw new Error("Conversation not found");
+
+		// check middle
+		const id = conv.messages[2].id;
+		const subtree = buildSubtree(conv, id);
+		expect(subtree).toEqual(conv.messages.slice(0, 3));
+
+		// check zero
+		const id2 = conv.messages[0].id;
+		const subtree2 = buildSubtree(conv, id2);
+		expect(subtree2).toEqual(conv.messages.slice(0, 1));
+
+		//check full length
+		const id3 = conv.messages[conv.messages.length - 1].id;
+		const subtree3 = buildSubtree(conv, id3);
+		expect(subtree3).toEqual(conv.messages);
+	});
+
+	it("a subtree in a linear branch conversation should be the ancestors and the message", async () => {
+		const convId = await insertLinearBranchConversation();
+		const conv = await collections.conversations.findOne({ _id: new ObjectId(convId) });
+		if (!conv) throw new Error("Conversation not found");
+
+		// check middle
+		const id = conv.messages[1].id;
+		const subtree = buildSubtree(conv, id);
+		expect(subtree).toEqual([conv.messages[0], conv.messages[1]]);
+
+		// check zero
+		const id2 = conv.messages[0].id;
+		const subtree2 = buildSubtree(conv, id2);
+		expect(subtree2).toEqual([conv.messages[0]]);
+
+		//check full length
+		const id3 = conv.messages[conv.messages.length - 1].id;
+		const subtree3 = buildSubtree(conv, id3);
+		expect(subtree3).toEqual(conv.messages);
+	});
+
+	it("should throw an error if the message is not found", async () => {
+		const convId = await insertLinearBranchConversation();
+		const conv = await collections.conversations.findOne({ _id: new ObjectId(convId) });
+		if (!conv) throw new Error("Conversation not found");
+
+		const id = "not-a-real-id-test";
+
+		expect(() => buildSubtree(conv, id)).toThrow("Message not found");
+	});
+
+	it("should throw an error if the ancestor is not found", async () => {
+		const convId = await insertLinearBranchConversation();
+		const conv = await collections.conversations.findOne({ _id: new ObjectId(convId) });
+		if (!conv) throw new Error("Conversation not found");
+
+		const id = "1-1-1-1-2";
+
+		conv.messages[1].ancestors = ["not-a-real-id-test"];
+
+		expect(() => buildSubtree(conv, id)).toThrow("Ancestor not found");
+	});
+
+	it("should work on empty conversations", () => {
+		const conv = {
+			_id: new ObjectId(),
+			rootMessageId: undefined,
+			messages: [],
+		};
+
+		const subtree = buildSubtree(conv, "not-a-real-id-test");
+		expect(subtree).toEqual([]);
+	});
+
+	it("should work for conversation with subtrees", async () => {
+		const convId = await insertSideBranchesConversation();
+		const conv = await collections.conversations.findOne({ _id: new ObjectId(convId) });
+		if (!conv) throw new Error("Conversation not found");
+
+		const subtree = buildSubtree(conv, "1-1-1-1-2");
+		expect(subtree).toEqual([conv.messages[0], conv.messages[1]]);
+
+		const subtree2 = buildSubtree(conv, "1-1-1-1-4");
+		expect(subtree2).toEqual([
+			conv.messages[0],
+			conv.messages[1],
+			conv.messages[2],
+			conv.messages[3],
+		]);
+
+		const subtree3 = buildSubtree(conv, "1-1-1-1-6");
+		expect(subtree3).toEqual([conv.messages[0], conv.messages[4], conv.messages[5]]);
+
+		const subtree4 = buildSubtree(conv, "1-1-1-1-7");
+		expect(subtree4).toEqual([conv.messages[0], conv.messages[4], conv.messages[6]]);
+	});
+});

package/src/ruvocal/src/lib/utils/tree/buildSubtree.ts

@@ -1,24 +1,24 @@
-import type { Tree, TreeId, TreeNode } from "./tree";
-
-export function buildSubtree<T>(conv: Tree<T>, id: TreeId): TreeNode<T>[] {
-	if (!conv.rootMessageId) {
-		if (conv.messages.length === 0) return [];
-		// legacy conversation slice up to id
-		const index = conv.messages.findIndex((m) => m.id === id);
-		if (index === -1) throw new Error("Message not found");
-		return conv.messages.slice(0, index + 1);
-	} else {
-		// find the message with the right id then create the ancestor tree
-		const message = conv.messages.find((m) => m.id === id);
-		if (!message) throw new Error("Message not found");
-
-		return [
-			...(message.ancestors?.map((ancestorId) => {
-				const ancestor = conv.messages.find((m) => m.id === ancestorId);
-				if (!ancestor) throw new Error("Ancestor not found");
-				return ancestor;
-			}) ?? []),
-			message,
-		];
-	}
-}
+import type { Tree, TreeId, TreeNode } from "./tree";
+
+export function buildSubtree<T>(conv: Tree<T>, id: TreeId): TreeNode<T>[] {
+	if (!conv.rootMessageId) {
+		if (conv.messages.length === 0) return [];
+		// legacy conversation slice up to id
+		const index = conv.messages.findIndex((m) => m.id === id);
+		if (index === -1) throw new Error("Message not found");
+		return conv.messages.slice(0, index + 1);
+	} else {
+		// find the message with the right id then create the ancestor tree
+		const message = conv.messages.find((m) => m.id === id);
+		if (!message) throw new Error("Message not found");
+
+		return [
+			...(message.ancestors?.map((ancestorId) => {
+				const ancestor = conv.messages.find((m) => m.id === ancestorId);
+				if (!ancestor) throw new Error("Ancestor not found");
+				return ancestor;
+			}) ?? []),
+			message,
+		];
+	}
+}

package/src/ruvocal/src/lib/utils/tree/convertLegacyConversation.spec.ts

@@ -1,31 +1,31 @@
-import { collections } from "$lib/server/database";
-import { ObjectId } from "mongodb";
-import { describe, expect, it } from "vitest";
-
-import { convertLegacyConversation } from "./convertLegacyConversation";
-import { insertLegacyConversation } from "./treeHelpers.spec";
-
-describe("convertLegacyConversation", () => {
-	it("should convert a legacy conversation", async () => {
-		const convId = await insertLegacyConversation();
-		const conv = await collections.conversations.findOne({ _id: new ObjectId(convId) });
-		if (!conv) throw new Error("Conversation not found");
-
-		const newConv = convertLegacyConversation(conv);
-
-		expect(newConv.rootMessageId).toBe(newConv.messages[0].id);
-		expect(newConv.messages[0].ancestors).toEqual([]);
-		expect(newConv.messages[1].ancestors).toEqual([newConv.messages[0].id]);
-		expect(newConv.messages[0].children).toEqual([newConv.messages[1].id]);
-	});
-	it("should work on empty conversations", async () => {
-		const conv = {
-			_id: new ObjectId(),
-			rootMessageId: undefined,
-			messages: [],
-		};
-		const newConv = convertLegacyConversation(conv);
-		expect(newConv.rootMessageId).toBe(undefined);
-		expect(newConv.messages).toEqual([]);
-	});
-});
+import { collections } from "$lib/server/database";
+import { ObjectId } from "mongodb";
+import { describe, expect, it } from "vitest";
+
+import { convertLegacyConversation } from "./convertLegacyConversation";
+import { insertLegacyConversation } from "./treeHelpers.spec";
+
+describe("convertLegacyConversation", () => {
+	it("should convert a legacy conversation", async () => {
+		const convId = await insertLegacyConversation();
+		const conv = await collections.conversations.findOne({ _id: new ObjectId(convId) });
+		if (!conv) throw new Error("Conversation not found");
+
+		const newConv = convertLegacyConversation(conv);
+
+		expect(newConv.rootMessageId).toBe(newConv.messages[0].id);
+		expect(newConv.messages[0].ancestors).toEqual([]);
+		expect(newConv.messages[1].ancestors).toEqual([newConv.messages[0].id]);
+		expect(newConv.messages[0].children).toEqual([newConv.messages[1].id]);
+	});
+	it("should work on empty conversations", async () => {
+		const conv = {
+			_id: new ObjectId(),
+			rootMessageId: undefined,
+			messages: [],
+		};
+		const newConv = convertLegacyConversation(conv);
+		expect(newConv.rootMessageId).toBe(undefined);
+		expect(newConv.messages).toEqual([]);
+	});
+});

package/src/ruvocal/src/lib/utils/tree/convertLegacyConversation.ts

@@ -1,36 +1,36 @@
-import type { Conversation } from "$lib/types/Conversation";
-import type { Message } from "$lib/types/Message";
-import { v4 } from "uuid";
-
-export function convertLegacyConversation(
-	conv: Pick<Conversation, "messages" | "rootMessageId" | "preprompt">
-): Pick<Conversation, "messages" | "rootMessageId" | "preprompt"> {
-	if (conv.rootMessageId) return conv; // not a legacy conversation
-	if (conv.messages.length === 0) return conv; // empty conversation
-	const messages = [
-		{
-			from: "system",
-			content: conv.preprompt ?? "",
-			createdAt: new Date(),
-			updatedAt: new Date(),
-			id: v4(),
-		} satisfies Message,
-		...conv.messages,
-	];
-
-	const rootMessageId = messages[0].id;
-
-	const newMessages = messages.map((message, index) => {
-		return {
-			...message,
-			ancestors: messages.slice(0, index).map((m) => m.id),
-			children: index < messages.length - 1 ? [messages[index + 1].id] : [],
-		};
-	});
-
-	return {
-		...conv,
-		rootMessageId,
-		messages: newMessages,
-	};
-}
+import type { Conversation } from "$lib/types/Conversation";
+import type { Message } from "$lib/types/Message";
+import { v4 } from "uuid";
+
+export function convertLegacyConversation(
+	conv: Pick<Conversation, "messages" | "rootMessageId" | "preprompt">
+): Pick<Conversation, "messages" | "rootMessageId" | "preprompt"> {
+	if (conv.rootMessageId) return conv; // not a legacy conversation
+	if (conv.messages.length === 0) return conv; // empty conversation
+	const messages = [
+		{
+			from: "system",
+			content: conv.preprompt ?? "",
+			createdAt: new Date(),
+			updatedAt: new Date(),
+			id: v4(),
+		} satisfies Message,
+		...conv.messages,
+	];
+
+	const rootMessageId = messages[0].id;
+
+	const newMessages = messages.map((message, index) => {
+		return {
+			...message,
+			ancestors: messages.slice(0, index).map((m) => m.id),
+			children: index < messages.length - 1 ? [messages[index + 1].id] : [],
+		};
+	});
+
+	return {
+		...conv,
+		rootMessageId,
+		messages: newMessages,
+	};
+}

package/src/ruvocal/src/lib/utils/tree/isMessageId.spec.ts

@@ -1,15 +1,15 @@
-import { describe, expect, it } from "vitest";
-import { isMessageId } from "./isMessageId";
-import { v4 } from "uuid";
-
-describe("isMessageId", () => {
-	it("should return true for a valid message id", () => {
-		expect(isMessageId(v4())).toBe(true);
-	});
-	it("should return false for an invalid message id", () => {
-		expect(isMessageId("1-2-3-4")).toBe(false);
-	});
-	it("should return false for an empty string", () => {
-		expect(isMessageId("")).toBe(false);
-	});
-});
+import { describe, expect, it } from "vitest";
+import { isMessageId } from "./isMessageId";
+import { v4 } from "uuid";
+
+describe("isMessageId", () => {
+	it("should return true for a valid message id", () => {
+		expect(isMessageId(v4())).toBe(true);
+	});
+	it("should return false for an invalid message id", () => {
+		expect(isMessageId("1-2-3-4")).toBe(false);
+	});
+	it("should return false for an empty string", () => {
+		expect(isMessageId("")).toBe(false);
+	});
+});

package/src/ruvocal/src/lib/utils/tree/isMessageId.ts

@@ -1,5 +1,5 @@
-import type { Message } from "$lib/types/Message";
-
-export function isMessageId(id: string): id is Message["id"] {
-	return id.split("-").length === 5;
-}
+import type { Message } from "$lib/types/Message";
+
+export function isMessageId(id: string): id is Message["id"] {
+	return id.split("-").length === 5;
+}

package/src/ruvocal/src/lib/utils/tree/tree.d.ts

@@ -1,14 +1,14 @@
-export type TreeId = string;
-
-export type Tree<T> = {
-	rootMessageId?: TreeId;
-	messages: TreeNode<T>[];
-};
-
-export type TreeNode<T> = T & {
-	id: TreeId;
-	ancestors?: TreeId[];
-	children?: TreeId[];
-};
-
-export type NewNode<T> = Omit<TreeNode<T>, "id">;
+export type TreeId = string;
+
+export type Tree<T> = {
+	rootMessageId?: TreeId;
+	messages: TreeNode<T>[];
+};
+
+export type TreeNode<T> = T & {
+	id: TreeId;
+	ancestors?: TreeId[];
+	children?: TreeId[];
+};
+
+export type NewNode<T> = Omit<TreeNode<T>, "id">;