refactor: api cleanup (#1849)

package-lock.json

@@ -104,6 +104,7 @@
 				"prettier-plugin-tailwindcss": "^0.6.11",
 				"prom-client": "^15.1.2",
 				"sade": "^1.8.1",
+				"superjson": "^2.2.2",
 				"svelte": "^5.33.3",
 				"svelte-check": "^4.0.0",
 				"svelte-gestures": "^5.1.3",
@@ -8601,6 +8602,22 @@
 			"integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==",
 			"license": "MIT"
 		},
+		"node_modules/copy-anything": {
+			"version": "3.0.5",
+			"resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-3.0.5.tgz",
+			"integrity": "sha512-yCEafptTtb4bk7GLEQoM8KVJpxAfdBJYaXyzQEgQQQgYrZiDp8SJmGKlYza6CYjEDNstAdNdKA3UuoULlEbS6w==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"is-what": "^4.1.8"
+			},
+			"engines": {
+				"node": ">=12.13"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mesqueeb"
+			}
+		},
 		"node_modules/cors": {
 			"version": "2.8.5",
 			"resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
@@ -11625,6 +11642,19 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/is-what": {
+			"version": "4.1.16",
+			"resolved": "https://registry.npmjs.org/is-what/-/is-what-4.1.16.tgz",
+			"integrity": "sha512-ZhMwEosbFJkA0YhFnNDgTM4ZxDRsS6HqTo7qsZM08fehyRYIYa0yHu5R6mgo1n/8MgaPBXiPimPD77baVFYg+A==",
+			"dev": true,
+			"license": "MIT",
+			"engines": {
+				"node": ">=12.13"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/mesqueeb"
+			}
+		},
 		"node_modules/isexe": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
@@ -17001,6 +17031,19 @@
 				"node": ">=16 || 14 >=14.17"
 			}
 		},
+		"node_modules/superjson": {
+			"version": "2.2.2",
+			"resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.2.tgz",
+			"integrity": "sha512-5JRxVqC8I8NuOUjzBbvVJAKNM8qoVuH0O77h4WInc/qC2q5IreqKxYwgkga3PfA22OayK2ikceb/B26dztPl+Q==",
+			"dev": true,
+			"license": "MIT",
+			"dependencies": {
+				"copy-anything": "^3.0.2"
+			},
+			"engines": {
+				"node": ">=16"
+			}
+		},
 		"node_modules/supports-color": {
 			"version": "7.2.0",
 			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",

package.json

@@ -60,6 +60,7 @@
 		"prettier-plugin-tailwindcss": "^0.6.11",
 		"prom-client": "^15.1.2",
 		"sade": "^1.8.1",
+		"superjson": "^2.2.2",
 		"svelte": "^5.33.3",
 		"svelte-check": "^4.0.0",
 		"svelte-gestures": "^5.1.3",

src/lib/APIClient.ts

@@ -2,6 +2,7 @@ import type { App } from "$api";
 import { base } from "$app/paths";
 import { treaty, type Treaty } from "@elysiajs/eden";
 import { browser } from "$app/environment";
+import superjson from "superjson";
 
 export function useAPIClient({ fetch }: { fetch?: Treaty.Config["fetcher"] } = {}) {
 	let url;
@@ -26,30 +27,26 @@ export function useAPIClient({ fetch }: { fetch?: Treaty.Config["fetcher"] } = {
 		url = `${window.location.origin}${base}/api/v2`;
 	}
 	const app = treaty<App>(url, { fetcher: fetch });
-
 	return app;
 }
 
-export function throwOnErrorNullable<T extends Record<number, unknown>>(
+export function handleResponse<T extends Record<number, unknown>>(
 	response: Treaty.TreatyResponse<T>
 ): T[200] {
 	if (response.error) {
 		throw new Error(JSON.stringify(response.error));
 	}
 
-	return response.data as T[200];
+	return superjson.parse(
+		typeof response.data === "string" ? response.data : JSON.stringify(response.data)
+	) as T[200];
 }
 
-export function throwOnError<T extends Record<number, unknown>>(
-	response: Treaty.TreatyResponse<T>
-): NonNullable<T[200]> {
-	if (response.error) {
-		throw new Error(JSON.stringify(response.error));
-	}
-
-	if (response.data === null) {
-		throw new Error("No data received on API call");
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type Success<T extends (...args: any) => any> =
+	Awaited<ReturnType<T>> extends {
+		data: infer D;
+		error: unknown;
 	}
-
-	return response.data as NonNullable<T[200]>;
-}
+		? D
+		: never;

src/lib/components/AssistantSettings.svelte

@@ -55,8 +55,8 @@
 	let inputMessage3 = $state(assistant?.exampleInputs[2] ?? "");
 	let inputMessage4 = $state(assistant?.exampleInputs[3] ?? "");
 
-	function resetErrors() {
-		errors = [];
+	function clearError(field: string) {
+		errors = errors.filter((e) => e.field !== field);
 	}
 
 	function onFilesChange(e: Event) {
@@ -70,7 +70,7 @@
 				return;
 			}
 			files = inputEl.files;
-			resetErrors();
+			clearError("avatar");
 			deleteExistingAvatar = false;
 		}
 	}
@@ -164,6 +164,7 @@
 				} else {
 					$error = response.statusText;
 				}
+				loading = false;
 			}
 		} else {
 			response = await fetch(`${base}/api/assistant`, {
@@ -181,6 +182,7 @@
 				} else {
 					$error = response.statusText;
 				}
+				loading = false;
 			}
 		}
 	}}
@@ -245,6 +247,7 @@
 								e.stopPropagation();
 								files = null;
 								deleteExistingAvatar = true;
+								clearError("avatar");
 							}}
 							class="mx-auto w-max text-center text-xs text-gray-600 hover:underline"
 						>
@@ -271,6 +274,7 @@
 					class="w-full rounded-lg border-2 border-gray-200 bg-gray-100 p-2"
 					placeholder="Assistant Name"
 					value={assistant?.name ?? ""}
+					oninput={() => clearError("name")}
 				/>
 				<p class="text-xs text-red-500">{getError("name")}</p>
 			</label>
@@ -282,6 +286,7 @@
 					class="h-15 w-full rounded-lg border-2 border-gray-200 bg-gray-100 p-2"
 					placeholder="It knows everything about python"
 					value={assistant?.description ?? ""}
+					oninput={() => clearError("description")}
 				></textarea>
 				<p class="text-xs text-red-500">{getError("description")}</p>
 			</label>
@@ -293,6 +298,7 @@
 						name="modelId"
 						class="w-full rounded-lg border-2 border-gray-200 bg-gray-100 p-2"
 						bind:value={modelId}
+						onchange={() => clearError("modelId")}
 					>
 						{#each models.filter((model) => !model.unlisted) as model}
 							<option value={model.id}>{model.displayName}</option>
@@ -415,12 +421,14 @@
 						placeholder="Start Message 1"
 						bind:value={inputMessage1}
 						class="w-full rounded-lg border-2 border-gray-200 bg-gray-100 p-2"
+						oninput={() => clearError("inputMessage1")}
 					/>
 					<input
 						name="exampleInput2"
 						placeholder="Start Message 2"
 						bind:value={inputMessage2}
 						class="w-full rounded-lg border-2 border-gray-200 bg-gray-100 p-2"
+						oninput={() => clearError("inputMessage1")}
 					/>
 
 					<input
@@ -428,12 +436,14 @@
 						placeholder="Start Message 3"
 						bind:value={inputMessage3}
 						class="w-full rounded-lg border-2 border-gray-200 bg-gray-100 p-2"
+						oninput={() => clearError("inputMessage1")}
 					/>
 					<input
 						name="exampleInput4"
 						placeholder="Start Message 4"
 						bind:value={inputMessage4}
 						class="w-full rounded-lg border-2 border-gray-200 bg-gray-100 p-2"
+						oninput={() => clearError("inputMessage1")}
 					/>
 				</div>
 				<p class="text-xs text-red-500">{getError("inputMessage1")}</p>
@@ -524,6 +534,7 @@
 							class="w-full rounded-lg border-2 border-gray-200 bg-gray-100 p-2"
 							placeholder="wikipedia.org,bbc.com"
 							value={assistant?.rag?.allowedDomains?.join(",") ?? ""}
+							oninput={() => clearError("ragDomainList")}
 						/>
 						<p class="text-xs text-red-500">{getError("ragDomainList")}</p>
 					{/if}
@@ -550,6 +561,7 @@
 							class="w-full rounded-lg border-2 border-gray-200 bg-gray-100 p-2"
 							placeholder="https://raw.githubusercontent.com/huggingface/chat-ui/main/README.md"
 							value={assistant?.rag?.allowedLinks.join(",") ?? ""}
+							oninput={() => clearError("ragLinkList")}
 						/>
 						<p class="text-xs text-red-500">{getError("ragLinkList")}</p>
 					{/if}
@@ -605,6 +617,7 @@
 					class="min-h-[8lh] flex-1 rounded-lg border-2 border-gray-200 bg-gray-100 p-2 text-sm"
 					placeholder="You'll act as..."
 					bind:value={systemPrompt}
+					oninput={() => clearError("preprompt")}
 				></textarea>
 				{#if modelId}
 					{@const model = models.find((_model) => _model.id === modelId)}

src/lib/components/NavConversationItem.svelte

@@ -93,7 +93,7 @@
 				onclick={(e) => {
 					e.preventDefault();
 					confirmDelete = false;
-					dispatch("deleteConversation", conv.id);
+					dispatch("deleteConversation", conv.id.toString());
 				}}
 			>
 				<CarbonCheckmark
@@ -109,7 +109,7 @@
 					e.preventDefault();
 					const newTitle = prompt("Edit this conversation title:", conv.title);
 					if (!newTitle) return;
-					dispatch("editConversationTitle", { id: conv.id, title: newTitle });
+					dispatch("editConversationTitle", { id: conv.id.toString(), title: newTitle });
 				}}
 			>
 				<CarbonEdit class="text-xs text-gray-400 hover:text-gray-500 dark:hover:text-gray-300" />
@@ -122,7 +122,7 @@
 				onclick={(event) => {
 					event.preventDefault();
 					if (event.shiftKey) {
-						dispatch("deleteConversation", conv.id);
+						dispatch("deleteConversation", conv.id.toString());
 					} else {
 						confirmDelete = true;
 					}

src/lib/components/NavMenu.svelte

@@ -29,8 +29,7 @@
 	import { usePublicConfig } from "$lib/utils/PublicConfig.svelte";
 
 	import { isVirtualKeyboard } from "$lib/utils/isVirtualKeyboard";
-	import { useAPIClient, throwOnError } from "$lib/APIClient";
-	import { jsonSerialize } from "$lib/utils/serialize";
+	import { useAPIClient, handleResponse } from "$lib/APIClient";
 
 	const publicConfig = usePublicConfig();
 	const client = useAPIClient();
@@ -77,13 +76,8 @@
 					p,
 				},
 			})
-			.then(throwOnError)
-			.then(({ conversations }) =>
-				conversations.map((conv) => ({
-					...jsonSerialize(conv),
-					updatedAt: new Date(conv.updatedAt),
-				}))
-			)
+			.then(handleResponse)
+			.then((r) => r.conversations)
 			.catch(() => []);
 
 		if (newConvs.length === 0) {

src/lib/components/ToolBadge.svelte

@@ -2,7 +2,7 @@
 	import ToolLogo from "./ToolLogo.svelte";
 	import { base } from "$app/paths";
 	import { browser } from "$app/environment";
-	import { throwOnError, useAPIClient } from "$lib/APIClient";
+	import { handleResponse, useAPIClient } from "$lib/APIClient";
 
 	interface Props {
 		toolId: string;
@@ -17,7 +17,7 @@
 	class="relative flex items-center justify-center space-x-2 rounded border border-gray-300 bg-gray-200 px-2 py-1"
 >
 	{#if browser}
-		{#await client.tools({ id: toolId }).get().then(throwOnError) then value}
+		{#await client.tools({ id: toolId }).get().then(handleResponse) then value}
 			{#key value.color + value.icon}
 				<ToolLogo color={value.color} icon={value.icon} size="sm" />
 			{/key}

src/lib/components/chat/AssistantIntroduction.svelte

@@ -18,14 +18,13 @@
 	import { usePublicConfig } from "$lib/utils/PublicConfig.svelte";
 
 	import { page } from "$app/state";
-	import type { Serialize } from "$lib/utils/serialize";
 
 	const publicConfig = usePublicConfig();
 
 	interface Props {
 		models: Model[];
 		assistant: Pick<
-			Serialize<Assistant>,
+			Assistant,
 			| "avatar"
 			| "name"
 			| "rag"

src/lib/components/chat/ChatInput.svelte

@@ -23,7 +23,6 @@
 	import { captureScreen } from "$lib/utils/screenshot";
 	import IconScreenshot from "../icons/IconScreenshot.svelte";
 	import { loginModalOpen } from "$lib/stores/loginModal";
-	import type { Serialize } from "$lib/utils/serialize";
 
 	import { isVirtualKeyboard } from "$lib/utils/isVirtualKeyboard";
 	interface Props {
@@ -33,7 +32,7 @@
 		placeholder?: string;
 		loading?: boolean;
 		disabled?: boolean;
-		assistant?: Serialize<Assistant> | undefined;
+		assistant?: Assistant | undefined;
 		modelHasTools?: boolean;
 		modelIsMultimodal?: boolean;
 		children?: import("svelte").Snippet;

src/lib/components/chat/ChatWindow.svelte

@@ -37,7 +37,6 @@
 	import { cubicInOut } from "svelte/easing";
 	import type { ToolFront } from "$lib/types/Tool";
 	import { loginModalOpen } from "$lib/stores/loginModal";
-	import type { Serialize } from "$lib/utils/serialize";
 	import { beforeNavigate } from "$app/navigation";
 	import { isVirtualKeyboard } from "$lib/utils/isVirtualKeyboard";
 
@@ -49,7 +48,7 @@
 		shared?: boolean;
 		currentModel: Model;
 		models: Model[];
-		assistant?: Serialize<Assistant> | undefined;
+		assistant?: Assistant | undefined;
 		preprompt?: string | undefined;
 		files?: File[];
 	}

src/lib/components/chat/Search.svelte

@@ -7,11 +7,7 @@
 </script>
 
 <script lang="ts">
-	import { base } from "$app/paths";
-
 	import { debounce } from "$lib/utils/debounce";
-
-	import type { GETSearchEndpointReturn } from "../../../routes/api/conversations/search/+server";
 	import NavConversationItem from "../NavConversationItem.svelte";
 	import { titles } from "../NavMenu.svelte";
 	import { beforeNavigate } from "$app/navigation";
@@ -19,6 +15,9 @@
 	import CarbonClose from "~icons/carbon/close";
 	import { fly } from "svelte/transition";
 	import InfiniteScroll from "../InfiniteScroll.svelte";
+	import { handleResponse, useAPIClient, type Success } from "$lib/APIClient";
+
+	const client = useAPIClient();
 
 	let searchContainer: HTMLDivElement | undefined = $state(undefined);
 	let inputElement: HTMLInputElement | undefined = $state(undefined);
@@ -29,7 +28,7 @@
 
 	let pending: boolean = $state(false);
 
-	let conversations: GETSearchEndpointReturn = $state([]);
+	let conversations: NonNullable<Success<typeof client.conversations.search.get>> = $state([]);
 
 	let page: number = $state(0);
 
@@ -75,19 +74,14 @@
 	};
 
 	async function handleVisible(v: string) {
-		const newConvs = await fetch(`${base}/api/conversations/search?q=${v}&p=${page++}`)
-			.then(async (r) => {
-				if (r.ok) {
-					return await r.json().then((conversations) =>
-						conversations.map((conv: GETSearchEndpointReturn[number]) => ({
-							...conv,
-							updatedAt: new Date(conv.updatedAt),
-						}))
-					);
-				} else {
-					return [];
-				}
+		const newConvs = await client.conversations.search
+			.get({
+				query: {
+					q: v,
+					p: page++,
+				},
 			})
+			.then(handleResponse)
 			.catch(() => []);
 
 		if (newConvs.length === 0) {

src/lib/server/api/index.ts

@@ -11,9 +11,14 @@ import { base } from "$app/paths";
 import { swagger } from "@elysiajs/swagger";
 import { config } from "$lib/server/config";
 
+import superjson from "superjson";
+
 const prefix = `${base}/api/v2` as unknown as "";
 
 export const app = new Elysia({ prefix })
+	.mapResponse(({ response }) => {
+		return new Response(superjson.stringify(response));
+	})
 	.use(
 		swagger({
 			documentation: {

src/lib/server/api/routes/groups/assistants.ts

@@ -7,19 +7,8 @@ import { SortKey, type Assistant } from "$lib/types/Assistant";
 import type { User } from "$lib/types/User";
 import { ReviewStatus } from "$lib/types/Review";
 import { generateQueryTokens } from "$lib/utils/searchTokens";
-import { jsonSerialize, type Serialize } from "$lib/utils/serialize";
 import { config } from "$lib/server/config";
 
-export type GETAssistantsSearchResponse = {
-	assistants: Array<Serialize<Assistant>>;
-	selectedModel: string;
-	numTotalItems: number;
-	numItemsPerPage: number;
-	query: string | null;
-	sort: SortKey;
-	showUnfeatured: boolean;
-};
-
 const NUM_PER_PAGE = 24;
 
 export const assistantGroup = new Elysia().use(authPlugin).group("/assistants", (app) => {
@@ -95,7 +84,7 @@ export const assistantGroup = new Elysia().use(authPlugin).group("/assistants",
 				const numTotalItems = await collections.assistants.countDocuments(filter);
 
 				return {
-					assistants: jsonSerialize(assistants),
+					assistants,
 					selectedModel: modelId ?? "",
 					numTotalItems,
 					numItemsPerPage: NUM_PER_PAGE,

src/lib/server/api/routes/groups/conversations.ts

@@ -6,8 +6,10 @@ import { authCondition } from "$lib/server/auth";
 import { models } from "$lib/server/models";
 import { convertLegacyConversation } from "$lib/utils/tree/convertLegacyConversation";
 import type { Conversation } from "$lib/types/Conversation";
-import { jsonSerialize } from "$lib/utils/serialize";
+
 import { CONV_NUM_PER_PAGE } from "$lib/constants/pagination";
+import pkg from "natural";
+const { PorterStemmer } = pkg;
 
 export const conversationGroup = new Elysia().use(authPlugin).group("/conversations", (app) => {
 	return app
@@ -64,6 +66,252 @@ export const conversationGroup = new Elysia().use(authPlugin).group("/conversati
 			});
 			return res.deletedCount;
 		})
+		.get(
+			"/search",
+			async ({ locals, query }) => {
+				const searchQuery = query.q;
+				const p = query.p ?? 0;
+
+				if (!searchQuery || searchQuery.length < 3) {
+					return [];
+				}
+
+				if (!locals.user?._id && !locals.sessionId) {
+					throw new Error("Must have a valid session or user");
+				}
+
+				const convs = await collections.conversations
+					.find({
+						sessionId: undefined,
+						...authCondition(locals),
+						$text: { $search: searchQuery },
+					})
+					.sort({
+						updatedAt: -1, // Sort by date updated in descending order
+					})
+					.project<
+						Pick<
+							Conversation,
+							"_id" | "title" | "updatedAt" | "model" | "assistantId" | "messages" | "userId"
+						>
+					>({
+						title: 1,
+						updatedAt: 1,
+						model: 1,
+						assistantId: 1,
+						messages: 1,
+						userId: 1,
+					})
+					.skip(p * 5)
+					.limit(5)
+					.toArray()
+					.then((convs) =>
+						convs.map((conv) => {
+							let matchedContent = "";
+							let matchedText = "";
+
+							// Find the best match using stemming to handle MongoDB's text search behavior
+							let bestMatch = null;
+							let bestMatchLength = 0;
+
+							// Simple function to find the best match in content
+							const findBestMatch = (
+								content: string,
+								query: string
+							): { start: number; end: number; text: string } | null => {
+								const contentLower = content.toLowerCase();
+								const queryLower = query.toLowerCase();
+
+								// Try exact word boundary match first
+								const wordRegex = new RegExp(
+									`\\b${queryLower.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\b`,
+									"gi"
+								);
+								const wordMatch = wordRegex.exec(content);
+								if (wordMatch) {
+									return {
+										start: wordMatch.index,
+										end: wordMatch.index + wordMatch[0].length - 1,
+										text: wordMatch[0],
+									};
+								}
+
+								// Try simple substring match
+								const index = contentLower.indexOf(queryLower);
+								if (index !== -1) {
+									return {
+										start: index,
+										end: index + queryLower.length - 1,
+										text: content.substring(index, index + queryLower.length),
+									};
+								}
+
+								return null;
+							};
+
+							// Create search variations
+							const searchVariations = [searchQuery.toLowerCase()];
+
+							// Add stemmed variations
+							try {
+								const stemmed = PorterStemmer.stem(searchQuery.toLowerCase());
+								if (stemmed !== searchQuery.toLowerCase()) {
+									searchVariations.push(stemmed);
+								}
+
+								// Find actual words in conversations that stem to the same root
+								for (const message of conv.messages) {
+									if (message.content) {
+										const words = message.content.toLowerCase().match(/\b\w+\b/g) || [];
+										words.forEach((word: string) => {
+											if (
+												PorterStemmer.stem(word) === stemmed &&
+												!searchVariations.includes(word)
+											) {
+												searchVariations.push(word);
+											}
+										});
+									}
+								}
+							} catch (e) {
+								console.warn("Stemming failed for:", searchQuery, e);
+							}
+
+							// Add simple variations
+							const query = searchQuery.toLowerCase();
+							if (query.endsWith("s") && query.length > 3) {
+								searchVariations.push(query.slice(0, -1));
+							} else if (!query.endsWith("s")) {
+								searchVariations.push(query + "s");
+							}
+
+							// Search through all messages for the best match
+							for (const message of conv.messages) {
+								if (!message.content) continue;
+
+								// Try each variation in order of preference
+								for (const variation of searchVariations) {
+									const match = findBestMatch(message.content, variation);
+									if (match) {
+										const isExactQuery = variation === searchQuery.toLowerCase();
+										const priority = isExactQuery ? 1000 : match.text.length;
+
+										if (priority > bestMatchLength) {
+											bestMatch = {
+												content: message.content,
+												matchStart: match.start,
+												matchEnd: match.end,
+												matchedText: match.text,
+											};
+											bestMatchLength = priority;
+
+											// If we found exact query match, we're done
+											if (isExactQuery) break;
+										}
+									}
+								}
+
+								// Stop if we found an exact match
+								if (bestMatchLength >= 1000) break;
+							}
+
+							if (bestMatch) {
+								const { content, matchStart, matchEnd } = bestMatch;
+								matchedText = bestMatch.matchedText;
+
+								// Create centered context around the match
+								const maxContextLength = 160; // Maximum length of actual content (no padding)
+								const matchLength = matchEnd - matchStart + 1;
+
+								// Calculate context window - don't exceed maxContextLength even if content is longer
+								const availableForContext =
+									Math.min(maxContextLength, content.length) - matchLength;
+								const contextPerSide = Math.floor(availableForContext / 2);
+
+								// Calculate snippet boundaries to center the match within maxContextLength
+								let snippetStart = Math.max(0, matchStart - contextPerSide);
+								let snippetEnd = Math.min(
+									content.length,
+									matchStart + matchLength + contextPerSide
+								);
+
+								// Ensure we don't exceed maxContextLength
+								if (snippetEnd - snippetStart > maxContextLength) {
+									if (matchStart - contextPerSide < 0) {
+										// Match is near start, extend end but limit to maxContextLength
+										snippetEnd = Math.min(content.length, snippetStart + maxContextLength);
+									} else {
+										// Match is not near start, limit to maxContextLength from match start
+										snippetEnd = Math.min(content.length, snippetStart + maxContextLength);
+									}
+								}
+
+								// Adjust to word boundaries if possible (but don't move more than 15 chars)
+								const originalStart = snippetStart;
+								const originalEnd = snippetEnd;
+
+								while (
+									snippetStart > 0 &&
+									content[snippetStart] !== " " &&
+									content[snippetStart] !== "\n" &&
+									originalStart - snippetStart < 15
+								) {
+									snippetStart--;
+								}
+								while (
+									snippetEnd < content.length &&
+									content[snippetEnd] !== " " &&
+									content[snippetEnd] !== "\n" &&
+									snippetEnd - originalEnd < 15
+								) {
+									snippetEnd++;
+								}
+
+								// Extract the content
+								let extractedContent = content.substring(snippetStart, snippetEnd).trim();
+								// Add ellipsis indicators only
+								if (snippetStart > 0) {
+									extractedContent = "..." + extractedContent;
+								}
+								if (snippetEnd < content.length) {
+									extractedContent = extractedContent + "...";
+								}
+
+								matchedContent = extractedContent;
+							} else {
+								// Fallback: use beginning of the first message if no match found
+								const firstMessage = conv.messages[0];
+								if (firstMessage?.content) {
+									const content = firstMessage.content;
+									matchedContent =
+										content.length > 200 ? content.substring(0, 200) + "..." : content;
+									matchedText = searchQuery; // Fallback to search query
+								}
+							}
+
+							return {
+								_id: conv._id,
+								id: conv._id,
+								title: conv.title,
+								content: matchedContent,
+								matchedText,
+								updatedAt: conv.updatedAt,
+								model: conv.model,
+								assistantId: conv.assistantId,
+								modelTools: models.find((m) => m.id == conv.model)?.tools ?? false,
+							};
+						})
+					);
+
+				return convs;
+			},
+			{
+				query: t.Object({
+					q: t.String(),
+					p: t.Optional(t.Number()),
+				}),
+			}
+		)
 		.group(
 			"/:id",
 			{
@@ -126,18 +374,16 @@ export const conversationGroup = new Elysia().use(authPlugin).group("/conversati
 						return { conversation: convertedConv };
 					})
 					.get("", async ({ conversation }) => {
-						return jsonSerialize({
+						return {
 							messages: conversation.messages,
 							title: conversation.title,
 							model: conversation.model,
 							preprompt: conversation.preprompt,
 							rootMessageId: conversation.rootMessageId,
 							assistant: conversation.assistantId
-								? jsonSerialize(
-										(await collections.assistants.findOne({
-											_id: new ObjectId(conversation.assistantId),
-										})) ?? undefined
-									)
+								? ((await collections.assistants.findOne({
+										_id: new ObjectId(conversation.assistantId),
+									})) ?? undefined)
 								: undefined,
 							id: conversation._id.toString(),
 							updatedAt: conversation.updatedAt,
@@ -145,7 +391,7 @@ export const conversationGroup = new Elysia().use(authPlugin).group("/conversati
 							assistantId: conversation.assistantId,
 							modelTools: models.find((m) => m.id == conversation.model)?.tools ?? false,
 							shared: conversation.shared,
-						});
+						};
 					})
 					.post("", () => {
 						// todo: post new message

src/lib/server/api/routes/groups/tools.ts

@@ -4,27 +4,16 @@ import { ReviewStatus } from "$lib/types/Review";
 import { toolFromConfigs } from "$lib/server/tools";
 import { collections } from "$lib/server/database";
 import { ObjectId, type Filter } from "mongodb";
-import type { CommunityToolDB, ConfigTool, ToolFront, ToolInputFile } from "$lib/types/Tool";
+import type { CommunityToolDB, ToolFront, ToolInputFile } from "$lib/types/Tool";
 import { MetricsServer } from "$lib/server/metrics";
 import { authCondition } from "$lib/server/auth";
 import { SortKey } from "$lib/types/Assistant";
 import type { User } from "$lib/types/User";
 import { generateQueryTokens, generateSearchTokens } from "$lib/utils/searchTokens";
-import { jsonSerialize, type Serialize } from "$lib/utils/serialize";
 import { config } from "$lib/server/config";
 
 const NUM_PER_PAGE = 16;
 
-export type GETToolsResponse = Array<ToolFront>;
-export type GETToolsSearchResponse = {
-	tools: Array<Serialize<ConfigTool | CommunityToolDB>>;
-	numTotalItems: number;
-	numItemsPerPage: number;
-	query: string | null;
-	sort: SortKey;
-	showUnfeatured: boolean;
-};
-
 export const toolGroup = new Elysia().use(authPlugin).group("/tools", (app) => {
 	return app
 		.get("/active", async ({ locals }) => {
@@ -154,13 +143,13 @@ export const toolGroup = new Elysia().use(authPlugin).group("/tools", (app) => {
 					(await collections.tools.countDocuments(filter)) + toolFromConfigs.length;
 
 				return {
-					tools: jsonSerialize(tools),
+					tools,
 					numTotalItems,
 					numItemsPerPage: NUM_PER_PAGE,
 					query: search,
 					sort,
 					showUnfeatured,
-				} satisfies GETToolsSearchResponse;
+				};
 			},
 			{
 				query: t.Object({

src/lib/server/api/routes/groups/user.ts

@@ -8,7 +8,6 @@ import { DEFAULT_SETTINGS, type SettingsEditable } from "$lib/types/Settings";
 import { toolFromConfigs } from "$lib/server/tools";
 import { ObjectId } from "mongodb";
 import { z } from "zod";
-import { jsonSerialize } from "$lib/utils/serialize";
 
 export const userGroup = new Elysia()
 	.use(authPlugin)
@@ -149,8 +148,7 @@ export const userGroup = new Elysia()
 					.find({
 						createdBy: locals.user?._id ?? locals.sessionId,
 					})
-					.toArray()
-					.then((el) => el.map((el) => jsonSerialize(el)));
+					.toArray();
 				return reports;
 			})
 			.get("/assistant/active", async ({ locals }) => {

src/lib/types/ConvSidebar.ts

@@ -1,8 +1,10 @@
+import type { ObjectId } from "bson";
+
 export interface ConvSidebar {
-	id: string;
+	id: ObjectId | string;
 	title: string;
 	updatedAt: Date;
 	model?: string;
-	assistantId?: string;
+	assistantId?: ObjectId | string;
 	avatarUrl?: string | Promise<string | undefined>;
 }

src/lib/utils/fetchJSON.ts

@@ -1,12 +1,10 @@
-import type { Serialize } from "./serialize";
-
 export async function fetchJSON<T>(
 	url: string,
 	options?: {
 		fetch?: typeof window.fetch;
 		allowNull?: boolean;
 	}
-): Promise<Serialize<T>> {
+): Promise<T> {
 	const response = await (options?.fetch ?? fetch)(url);
 	if (!response.ok) {
 		throw new Error(`Failed to fetch ${url}: ${response.status} ${response.statusText}`);
@@ -16,7 +14,7 @@ export async function fetchJSON<T>(
 	const text = await response.text();
 	if (!text || text.trim() === "") {
 		if (options?.allowNull) {
-			return null as Serialize<T>;
+			return null as T;
 		}
 		throw new Error(`Received empty response from ${url} but allowNull is not set to true`);
 	}

src/lib/utils/serialize.ts

@@ -1,13 +0,0 @@
-import type { ObjectId } from "mongodb";
-
-export type Serialize<T> = T extends ObjectId | Date
-	? string
-	: T extends Array<infer U>
-		? Array<Serialize<U>>
-		: T extends object
-			? { [K in keyof T]: Serialize<T[K]> }
-			: T;
-
-export function jsonSerialize<T>(data: T): Serialize<T> {
-	return JSON.parse(JSON.stringify(data)) as Serialize<T>;
-}

src/routes/+layout.ts

@@ -1,7 +1,6 @@
 import { UrlDependency } from "$lib/types/UrlDependency";
 import type { ConvSidebar } from "$lib/types/ConvSidebar";
-import { jsonSerialize } from "../lib/utils/serialize";
-import { useAPIClient, throwOnError, throwOnErrorNullable } from "$lib/APIClient";
+import { useAPIClient, handleResponse } from "$lib/APIClient";
 import { getConfigManager } from "$lib/utils/PublicConfig.svelte";
 
 export const load = async ({ depends, fetch }) => {
@@ -21,16 +20,16 @@ export const load = async ({ depends, fetch }) => {
 		featureFlags,
 		conversationsData,
 	] = await Promise.all([
-		client.user.settings.get().then(throwOnError),
-		client.models.get().then(throwOnError),
-		client.user.assistants.get().then(throwOnError),
-		client.models.old.get().then(throwOnError),
-		client.tools.active.get().then(throwOnError),
-		client.tools.count.get().then(throwOnError),
-		client.user.get().then(throwOnErrorNullable),
-		client["public-config"].get().then(throwOnError),
-		client["feature-flags"].get().then(throwOnError),
-		client.conversations.get({ query: { p: 0 } }).then(throwOnError),
+		client.user.settings.get().then(handleResponse),
+		client.models.get().then(handleResponse),
+		client.user.assistants.get().then(handleResponse),
+		client.models.old.get().then(handleResponse),
+		client.tools.active.get().then(handleResponse),
+		client.tools.count.get().then(handleResponse),
+		client.user.get().then(handleResponse),
+		client["public-config"].get().then(handleResponse),
+		client["feature-flags"].get().then(handleResponse),
+		client.conversations.get({ query: { p: 0 } }).then(handleResponse),
 	]);
 
 	const defaultModel = models[0];
@@ -57,9 +56,9 @@ export const load = async ({ depends, fetch }) => {
 						avatarUrl: client
 							.assistants({ id: conv.assistantId.toString() })
 							.get()
-							.then(throwOnErrorNullable)
+							.then(handleResponse)
 							.then((assistant) => {
-								if (!assistant.avatar) {
+								if (!assistant || !assistant.avatar) {
 									return undefined;
 								}
 								return `/settings/assistants/${conv.assistantId}/avatar.jpg?hash=${assistant.avatar}`;
@@ -76,8 +75,7 @@ export const load = async ({ depends, fetch }) => {
 			? await client
 					.assistants({ id: settings?.activeModel })
 					.get()
-					.then(throwOnErrorNullable)
-					.then(jsonSerialize)
+					.then(handleResponse)
 					.catch(() => undefined)
 			: undefined,
 		assistants,

src/routes/api/conversations/search/+server.ts

@@ -1,240 +0,0 @@
-import { authCondition } from "$lib/server/auth";
-import { collections } from "$lib/server/database";
-import { models } from "$lib/server/models";
-import type { RequestHandler } from "@sveltejs/kit";
-import pkg from "natural";
-const { PorterStemmer } = pkg;
-
-export type GETSearchEndpointReturn = Array<{
-	id: string;
-	title: string;
-	content: string;
-	matchedText: string;
-	updatedAt: Date;
-	model: string;
-	assistantId?: string;
-	mdoelTools?: boolean;
-}>;
-
-export const GET: RequestHandler = async ({ locals, url }) => {
-	const searchQuery = url.searchParams.get("q");
-	const p = parseInt(url.searchParams.get("p") ?? "0");
-
-	if (!searchQuery || searchQuery.length < 3) {
-		return Response.json([]);
-	}
-
-	if (locals.user?._id || locals.sessionId) {
-		const convs = await collections.conversations
-			.find({
-				sessionId: undefined,
-				...authCondition(locals),
-				$text: { $search: searchQuery },
-			})
-			.sort({
-				updatedAt: -1, // Sort by date updated in descending order
-			})
-			.project({
-				title: 1,
-				updatedAt: 1,
-				model: 1,
-				assistantId: 1,
-				messages: 1,
-				userId: 1,
-			})
-			.skip(p * 5)
-			.limit(5)
-			.toArray()
-			.then((convs) =>
-				convs.map((conv) => {
-					let matchedContent = "";
-					let matchedText = "";
-
-					// Find the best match using stemming to handle MongoDB's text search behavior
-					let bestMatch = null;
-					let bestMatchLength = 0;
-
-					// Simple function to find the best match in content
-					const findBestMatch = (
-						content: string,
-						query: string
-					): { start: number; end: number; text: string } | null => {
-						const contentLower = content.toLowerCase();
-						const queryLower = query.toLowerCase();
-
-						// Try exact word boundary match first
-						const wordRegex = new RegExp(
-							`\\b${queryLower.replace(/[.*+?^${}()|[\]\\]/g, "\\$&")}\\b`,
-							"gi"
-						);
-						const wordMatch = wordRegex.exec(content);
-						if (wordMatch) {
-							return {
-								start: wordMatch.index,
-								end: wordMatch.index + wordMatch[0].length - 1,
-								text: wordMatch[0],
-							};
-						}
-
-						// Try simple substring match
-						const index = contentLower.indexOf(queryLower);
-						if (index !== -1) {
-							return {
-								start: index,
-								end: index + queryLower.length - 1,
-								text: content.substring(index, index + queryLower.length),
-							};
-						}
-
-						return null;
-					};
-
-					// Create search variations
-					const searchVariations = [searchQuery.toLowerCase()];
-
-					// Add stemmed variations
-					try {
-						const stemmed = PorterStemmer.stem(searchQuery.toLowerCase());
-						if (stemmed !== searchQuery.toLowerCase()) {
-							searchVariations.push(stemmed);
-						}
-
-						// Find actual words in conversations that stem to the same root
-						for (const message of conv.messages) {
-							if (message.content) {
-								const words = message.content.toLowerCase().match(/\b\w+\b/g) || [];
-								words.forEach((word: string) => {
-									if (PorterStemmer.stem(word) === stemmed && !searchVariations.includes(word)) {
-										searchVariations.push(word);
-									}
-								});
-							}
-						}
-					} catch (e) {
-						console.warn("Stemming failed for:", searchQuery, e);
-					}
-
-					// Add simple variations
-					const query = searchQuery.toLowerCase();
-					if (query.endsWith("s") && query.length > 3) {
-						searchVariations.push(query.slice(0, -1));
-					} else if (!query.endsWith("s")) {
-						searchVariations.push(query + "s");
-					}
-
-					// Search through all messages for the best match
-					for (const message of conv.messages) {
-						if (!message.content) continue;
-
-						// Try each variation in order of preference
-						for (const variation of searchVariations) {
-							const match = findBestMatch(message.content, variation);
-							if (match) {
-								const isExactQuery = variation === searchQuery.toLowerCase();
-								const priority = isExactQuery ? 1000 : match.text.length;
-
-								if (priority > bestMatchLength) {
-									bestMatch = {
-										content: message.content,
-										matchStart: match.start,
-										matchEnd: match.end,
-										matchedText: match.text,
-									};
-									bestMatchLength = priority;
-
-									// If we found exact query match, we're done
-									if (isExactQuery) break;
-								}
-							}
-						}
-
-						// Stop if we found an exact match
-						if (bestMatchLength >= 1000) break;
-					}
-
-					if (bestMatch) {
-						const { content, matchStart, matchEnd } = bestMatch;
-						matchedText = bestMatch.matchedText;
-
-						// Create centered context around the match
-						const maxContextLength = 160; // Maximum length of actual content (no padding)
-						const matchLength = matchEnd - matchStart + 1;
-
-						// Calculate context window - don't exceed maxContextLength even if content is longer
-						const availableForContext = Math.min(maxContextLength, content.length) - matchLength;
-						const contextPerSide = Math.floor(availableForContext / 2);
-
-						// Calculate snippet boundaries to center the match within maxContextLength
-						let snippetStart = Math.max(0, matchStart - contextPerSide);
-						let snippetEnd = Math.min(content.length, matchStart + matchLength + contextPerSide);
-
-						// Ensure we don't exceed maxContextLength
-						if (snippetEnd - snippetStart > maxContextLength) {
-							if (matchStart - contextPerSide < 0) {
-								// Match is near start, extend end but limit to maxContextLength
-								snippetEnd = Math.min(content.length, snippetStart + maxContextLength);
-							} else {
-								// Match is not near start, limit to maxContextLength from match start
-								snippetEnd = Math.min(content.length, snippetStart + maxContextLength);
-							}
-						}
-
-						// Adjust to word boundaries if possible (but don't move more than 15 chars)
-						const originalStart = snippetStart;
-						const originalEnd = snippetEnd;
-
-						while (
-							snippetStart > 0 &&
-							content[snippetStart] !== " " &&
-							content[snippetStart] !== "\n" &&
-							originalStart - snippetStart < 15
-						) {
-							snippetStart--;
-						}
-						while (
-							snippetEnd < content.length &&
-							content[snippetEnd] !== " " &&
-							content[snippetEnd] !== "\n" &&
-							snippetEnd - originalEnd < 15
-						) {
-							snippetEnd++;
-						}
-
-						// Extract the content
-						let extractedContent = content.substring(snippetStart, snippetEnd).trim();
-						// Add ellipsis indicators only
-						if (snippetStart > 0) {
-							extractedContent = "..." + extractedContent;
-						}
-						if (snippetEnd < content.length) {
-							extractedContent = extractedContent + "...";
-						}
-
-						matchedContent = extractedContent;
-					} else {
-						// Fallback: use beginning of the first message if no match found
-						const firstMessage = conv.messages[0];
-						if (firstMessage?.content) {
-							const content = firstMessage.content;
-							matchedContent = content.length > 200 ? content.substring(0, 200) + "..." : content;
-							matchedText = searchQuery; // Fallback to search query
-						}
-					}
-
-					return {
-						_id: conv._id,
-						id: conv._id,
-						title: conv.title,
-						content: matchedContent,
-						matchedText,
-						updatedAt: conv.updatedAt,
-						model: conv.model,
-						assistantId: conv.assistantId,
-						modelTools: models.find((m) => m.id == conv.model)?.tools ?? false,
-					};
-				})
-			);
-		return Response.json(convs as GETSearchEndpointReturn);
-	}
-	return Response.json([]);
-};

src/routes/assistant/[assistantId]/+page.ts

@@ -1,14 +1,9 @@
-import { useAPIClient, throwOnError } from "$lib/APIClient";
-import { jsonSerialize } from "$lib/utils/serialize";
+import { useAPIClient, handleResponse } from "$lib/APIClient";
 
 export async function load({ fetch, params }) {
 	const client = useAPIClient({ fetch });
 
-	const data = client
-		.assistants({ id: params.assistantId })
-		.get()
-		.then(throwOnError)
-		.then(jsonSerialize);
+	const data = client.assistants({ id: params.assistantId }).get().then(handleResponse);
 
 	await client.assistants({ id: params.assistantId }).follow.post();
 

src/routes/assistants/+page.ts

@@ -1,11 +1,11 @@
-import { useAPIClient, throwOnError } from "$lib/APIClient";
+import { useAPIClient, handleResponse } from "$lib/APIClient";
 
 export const load = async ({ url, fetch }) => {
 	const client = useAPIClient({ fetch });
 
 	const data = client.assistants.search
 		.get({ query: Object.fromEntries(url.searchParams.entries()) })
-		.then(throwOnError);
+		.then(handleResponse);
 
 	return data;
 };

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

@@ -1,4 +1,4 @@
-import { useAPIClient, throwOnError } from "$lib/APIClient";
+import { useAPIClient, handleResponse } from "$lib/APIClient";
 import { UrlDependency } from "$lib/types/UrlDependency";
 import { redirect } from "@sveltejs/kit";
 
@@ -8,7 +8,7 @@ export const load = async ({ params, depends, fetch }) => {
 	const client = useAPIClient({ fetch });
 
 	try {
-		return await client.conversations({ id: params.id }).get().then(throwOnError);
+		return await client.conversations({ id: params.id }).get().then(handleResponse);
 	} catch {
 		redirect(302, "/");
 	}

src/routes/settings/(nav)/+layout.svelte

@@ -18,7 +18,7 @@
 	import { debounce } from "$lib/utils/debounce";
 
 	import { fly } from "svelte/transition";
-	import { throwOnError, useAPIClient } from "$lib/APIClient";
+	import { handleResponse, useAPIClient } from "$lib/APIClient";
 
 	interface Props {
 		data: LayoutData;
@@ -255,7 +255,7 @@
 											id: assistant._id,
 										})
 										.follow.delete()
-										.then(throwOnError)
+										.then(handleResponse)
 										.then(() => {
 											if (assistant._id.toString() === page.params.assistantId) {
 												goto(`${base}/settings`, { invalidateAll: true });

src/routes/settings/(nav)/assistants/[assistantId]/edit/+page.svelte

@@ -12,13 +12,4 @@
 	let assistant = data.assistants.find((el) => el._id.toString() === page.params.assistantId);
 </script>
 
-<AssistantSettings
-	assistant={assistant
-		? {
-				...assistant,
-				updatedAt: new Date(assistant.updatedAt),
-				createdAt: new Date(assistant.createdAt),
-			}
-		: undefined}
-	models={data.models}
-/>
+<AssistantSettings {assistant} models={data.models} />

src/routes/settings/+layout.ts

@@ -1,14 +1,16 @@
-import { useAPIClient, throwOnError } from "$lib/APIClient";
+import { useAPIClient, handleResponse } from "$lib/APIClient";
 
 export const load = async ({ parent, fetch }) => {
 	const client = useAPIClient({ fetch });
 
-	const reports = await client.user.reports.get().then(throwOnError);
+	const reports = await client.user.reports.get().then(handleResponse);
 
 	return {
 		assistants: (await parent().then((data) => data.assistants)).map((el) => ({
 			...el,
-			reported: reports.some((r) => r.contentId === el._id && r.object === "assistant"),
+			reported: reports.some(
+				(r) => r.contentId.toString() === el._id.toString() && r.object === "assistant"
+			),
 		})),
 	};
 };

src/routes/tools/+page.ts

@@ -1,9 +1,9 @@
-import { throwOnError, useAPIClient } from "$lib/APIClient";
+import { handleResponse, useAPIClient } from "$lib/APIClient";
 
 export const load = async ({ url, fetch }) => {
 	const client = useAPIClient({ fetch });
 
 	return client.tools.search
 		.get({ query: Object.fromEntries(url.searchParams.entries()) })
-		.then(throwOnError);
+		.then(handleResponse);
 };

src/routes/tools/ToolEdit.svelte

@@ -15,7 +15,7 @@
 
 	import CarbonInformation from "~icons/carbon/information";
 	import { page } from "$app/state";
-	import { throwOnError, useAPIClient } from "$lib/APIClient";
+	import { handleResponse, useAPIClient } from "$lib/APIClient";
 
 	interface Props {
 		tool?: CommunityToolEditable | undefined;
@@ -76,7 +76,7 @@
 					space: editableTool.baseUrl,
 				},
 			})
-			.then(throwOnError);
+			.then(handleResponse);
 
 		const newInputs = api.named_endpoints[editableTool.endpoint].parameters.map((param, idx) => {
 			if (tool?.inputs[idx]?.name === param.parameter_name) {
@@ -328,7 +328,7 @@
 				{/if}
 
 				{#if editableTool.baseUrl}
-					{#await client["spaces-config"].get({ query: { space: spaceUrl } }).then(throwOnError)}
+					{#await client["spaces-config"].get({ query: { space: spaceUrl } }).then(handleResponse)}
 						<p class="text-sm text-gray-500">Loading...</p>
 					{:then api}
 						<div class="flex flex-row flex-wrap gap-4">

src/routes/tools/[toolId]/+layout.ts

@@ -1,5 +1,4 @@
-import { useAPIClient, throwOnError } from "$lib/APIClient";
-import { jsonSerialize } from "$lib/utils/serialize";
+import { useAPIClient, handleResponse } from "$lib/APIClient";
 
 export const load = async ({ params, fetch }) => {
 	const client = useAPIClient({ fetch });
@@ -9,8 +8,7 @@ export const load = async ({ params, fetch }) => {
 			id: params.toolId,
 		})
 		.get()
-		.then(throwOnError)
-		.then(jsonSerialize);
+		.then(handleResponse);
 
 	return { tool: await data };
 };