ruflo 3.6.30 → 3.7.0-alpha.10

package/src/ruvocal/src/routes/+layout.ts

@@ -1,91 +1,91 @@
-import { UrlDependency } from "$lib/types/UrlDependency";
-import type { ConvSidebar } from "$lib/types/ConvSidebar";
-import { useAPIClient, handleResponse } from "$lib/APIClient";
-import { getConfigManager } from "$lib/utils/PublicConfig.svelte";
-import type { GETModelsResponse, FeatureFlags } from "$lib/server/api/types";
-
-interface ConversationListItem {
-	_id: { toString(): string };
-	title: string;
-	updatedAt: Date | string;
-	model?: string;
-}
-
-interface UserInfo {
-	id: string;
-	username?: string;
-	avatarUrl?: string;
-	email?: string;
-	isAdmin: boolean;
-	isEarlyAccess: boolean;
-}
-
-interface SettingsResponse {
-	welcomeModalSeen: boolean;
-	welcomeModalSeenAt: Date | null;
-	shareConversationsWithModelAuthors: boolean;
-	activeModel: string;
-	streamingMode: "raw" | "smooth";
-	directPaste: boolean;
-	hapticsEnabled: boolean;
-	customPrompts: Record<string, string>;
-	multimodalOverrides: Record<string, boolean>;
-	toolsOverrides: Record<string, boolean>;
-	hidePromptExamples: Record<string, boolean>;
-	providerOverrides: Record<string, string>;
-	billingOrganization?: string;
-}
-
-export const load = async ({ depends, fetch, url }) => {
-	depends(UrlDependency.ConversationList);
-
-	const client = useAPIClient({ fetch, origin: url.origin });
-
-	const [settings, models, user, publicConfig, featureFlags, conversationsData] =
-		(await Promise.all([
-			client.user.settings.get().then(handleResponse),
-			client.models.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),
-		])) as [
-			SettingsResponse,
-			GETModelsResponse,
-			UserInfo | null,
-			Record<string, unknown>,
-			FeatureFlags,
-			{ conversations: ConversationListItem[]; hasMore: boolean },
-		];
-
-	const defaultModel = models[0];
-
-	const { conversations: rawConversations } = conversationsData;
-	const conversations = rawConversations.map((conv: ConversationListItem) => {
-		const trimmedTitle = conv.title.trim();
-
-		conv.title = trimmedTitle;
-
-		return {
-			id: conv._id.toString(),
-			title: conv.title,
-			model: conv.model ?? defaultModel?.id,
-			updatedAt: new Date(conv.updatedAt),
-		} satisfies ConvSidebar;
-	});
-
-	return {
-		conversations,
-		models,
-		oldModels: [],
-		user,
-		settings: {
-			...settings,
-			welcomeModalSeenAt: settings.welcomeModalSeenAt
-				? new Date(settings.welcomeModalSeenAt)
-				: null,
-		},
-		publicConfig: getConfigManager(publicConfig as Record<`PUBLIC_${string}`, string>),
-		...featureFlags,
-	};
-};
+import { UrlDependency } from "$lib/types/UrlDependency";
+import type { ConvSidebar } from "$lib/types/ConvSidebar";
+import { useAPIClient, handleResponse } from "$lib/APIClient";
+import { getConfigManager } from "$lib/utils/PublicConfig.svelte";
+import type { GETModelsResponse, FeatureFlags } from "$lib/server/api/types";
+
+interface ConversationListItem {
+	_id: { toString(): string };
+	title: string;
+	updatedAt: Date | string;
+	model?: string;
+}
+
+interface UserInfo {
+	id: string;
+	username?: string;
+	avatarUrl?: string;
+	email?: string;
+	isAdmin: boolean;
+	isEarlyAccess: boolean;
+}
+
+interface SettingsResponse {
+	welcomeModalSeen: boolean;
+	welcomeModalSeenAt: Date | null;
+	shareConversationsWithModelAuthors: boolean;
+	activeModel: string;
+	streamingMode: "raw" | "smooth";
+	directPaste: boolean;
+	hapticsEnabled: boolean;
+	customPrompts: Record<string, string>;
+	multimodalOverrides: Record<string, boolean>;
+	toolsOverrides: Record<string, boolean>;
+	hidePromptExamples: Record<string, boolean>;
+	providerOverrides: Record<string, string>;
+	billingOrganization?: string;
+}
+
+export const load = async ({ depends, fetch, url }) => {
+	depends(UrlDependency.ConversationList);
+
+	const client = useAPIClient({ fetch, origin: url.origin });
+
+	const [settings, models, user, publicConfig, featureFlags, conversationsData] =
+		(await Promise.all([
+			client.user.settings.get().then(handleResponse),
+			client.models.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),
+		])) as [
+			SettingsResponse,
+			GETModelsResponse,
+			UserInfo | null,
+			Record<string, unknown>,
+			FeatureFlags,
+			{ conversations: ConversationListItem[]; hasMore: boolean },
+		];
+
+	const defaultModel = models[0];
+
+	const { conversations: rawConversations } = conversationsData;
+	const conversations = rawConversations.map((conv: ConversationListItem) => {
+		const trimmedTitle = conv.title.trim();
+
+		conv.title = trimmedTitle;
+
+		return {
+			id: conv._id.toString(),
+			title: conv.title,
+			model: conv.model ?? defaultModel?.id,
+			updatedAt: new Date(conv.updatedAt),
+		} satisfies ConvSidebar;
+	});
+
+	return {
+		conversations,
+		models,
+		oldModels: [],
+		user,
+		settings: {
+			...settings,
+			welcomeModalSeenAt: settings.welcomeModalSeenAt
+				? new Date(settings.welcomeModalSeenAt)
+				: null,
+		},
+		publicConfig: getConfigManager(publicConfig as Record<`PUBLIC_${string}`, string>),
+		...featureFlags,
+	};
+};

package/src/ruvocal/src/routes/+page.svelte

@@ -1,168 +1,168 @@
-<script lang="ts">
-	import { goto, replaceState } from "$app/navigation";
-	import { base } from "$app/paths";
-	import { page } from "$app/state";
-	import { usePublicConfig } from "$lib/utils/PublicConfig.svelte";
-
-	const publicConfig = usePublicConfig();
-
-	import ChatWindow from "$lib/components/chat/ChatWindow.svelte";
-	import { ERROR_MESSAGES, error } from "$lib/stores/errors";
-	import { pendingMessage } from "$lib/stores/pendingMessage";
-	import { useSettingsStore } from "$lib/stores/settings.js";
-	import { findCurrentModel } from "$lib/utils/models";
-	import { sanitizeUrlParam } from "$lib/utils/urlParams";
-	import { onMount, tick } from "svelte";
-	import { loading } from "$lib/stores/loading.js";
-	import { loadAttachmentsFromUrls } from "$lib/utils/loadAttachmentsFromUrls";
-	import { requireAuthUser } from "$lib/utils/auth";
-
-	let { data } = $props();
-
-	let hasModels = $derived(Boolean(data.models?.length));
-	let files: File[] = $state([]);
-	let draft = $state("");
-
-	const settings = useSettingsStore();
-
-	async function createConversation(message: string) {
-		try {
-			$loading = true;
-
-			// check if $settings.activeModel is a valid model
-			// else check if it's an assistant, and use that model
-			// else use the first model
-
-			const validModels = data.models.map((model) => model.id);
-
-			let model;
-			if (validModels.includes($settings.activeModel)) {
-				model = $settings.activeModel;
-			} else {
-				model = data.models[0].id;
-			}
-			const res = await fetch(`${base}/conversation`, {
-				method: "POST",
-				headers: {
-					"Content-Type": "application/json",
-				},
-				body: JSON.stringify({
-					model,
-					preprompt: $settings.customPrompts[$settings.activeModel],
-				}),
-			});
-
-			if (!res.ok) {
-				let errorMessage = ERROR_MESSAGES.default;
-				try {
-					const json = await res.json();
-					errorMessage = json.message || errorMessage;
-				} catch {
-					// Response wasn't JSON (e.g., HTML error page)
-					if (res.status === 401) {
-						errorMessage = "Authentication required";
-					}
-				}
-				error.set(errorMessage);
-				console.error("Error while creating conversation: ", errorMessage);
-				return;
-			}
-
-			const { conversationId } = await res.json();
-
-			// Ugly hack to use a store as temp storage, feel free to improve ^^
-			pendingMessage.set({
-				content: message,
-				files,
-			});
-
-			// invalidateAll to update list of conversations
-			await goto(`${base}/conversation/${conversationId}`, { invalidateAll: true });
-		} catch (err) {
-			error.set((err as Error).message || ERROR_MESSAGES.default);
-			console.error(err);
-		} finally {
-			$loading = false;
-		}
-	}
-
-	onMount(async () => {
-		try {
-			// Check if auth is required before processing any query params
-			const hasQ = page.url.searchParams.has("q");
-			const hasPrompt = page.url.searchParams.has("prompt");
-			const hasAttachments = page.url.searchParams.has("attachments");
-
-			if ((hasQ || hasPrompt || hasAttachments) && requireAuthUser()) {
-				return; // Redirecting to login, will return to this URL after
-			}
-
-			// Handle attachments parameter first
-			if (hasAttachments) {
-				const result = await loadAttachmentsFromUrls(page.url.searchParams);
-				files = result.files;
-
-				// Show errors if any
-				if (result.errors.length > 0) {
-					console.error("Failed to load some attachments:", result.errors);
-					error.set(
-						`Failed to load ${result.errors.length} attachment(s). Check console for details.`
-					);
-				}
-
-				// Clean up URL
-				const url = new URL(page.url);
-				url.searchParams.delete("attachments");
-				history.replaceState({}, "", url);
-			}
-
-			const query = sanitizeUrlParam(page.url.searchParams.get("q"));
-			if (query) {
-				void createConversation(query);
-				const url = new URL(page.url);
-				url.searchParams.delete("q");
-				tick().then(() => {
-					replaceState(url, page.state);
-				});
-				return;
-			}
-
-			const promptQuery = sanitizeUrlParam(page.url.searchParams.get("prompt"));
-			if (promptQuery && !draft) {
-				draft = promptQuery;
-				const url = new URL(page.url);
-				url.searchParams.delete("prompt");
-				tick().then(() => {
-					replaceState(url, page.state);
-				});
-			}
-		} catch (err) {
-			console.error("Failed to process URL parameters:", err);
-		}
-	});
-
-	let currentModel = $derived(findCurrentModel(data.models, data.oldModels, $settings.activeModel));
-</script>
-
-<svelte:head>
-	<title>{publicConfig.PUBLIC_APP_NAME}</title>
-</svelte:head>
-
-{#if hasModels}
-	<ChatWindow
-		onmessage={(message) => createConversation(message)}
-		loading={$loading}
-		{currentModel}
-		models={data.models}
-		bind:files
-		bind:draft
-	/>
-{:else}
-	<div class="mx-auto my-20 max-w-xl rounded-xl border p-6 text-center dark:border-gray-700">
-		<h2 class="mb-2 text-xl font-semibold">No models available</h2>
-		<p class="text-gray-600 dark:text-gray-300">
-			No chat models are configured. Set `OPENAI_BASE_URL` and ensure the server can reach the
-			endpoint, then reload. If unset, the app defaults to the Hugging Face router.
-		</p>
-	</div>
-{/if}
+<script lang="ts">
+	import { goto, replaceState } from "$app/navigation";
+	import { base } from "$app/paths";
+	import { page } from "$app/state";
+	import { usePublicConfig } from "$lib/utils/PublicConfig.svelte";
+
+	const publicConfig = usePublicConfig();
+
+	import ChatWindow from "$lib/components/chat/ChatWindow.svelte";
+	import { ERROR_MESSAGES, error } from "$lib/stores/errors";
+	import { pendingMessage } from "$lib/stores/pendingMessage";
+	import { useSettingsStore } from "$lib/stores/settings.js";
+	import { findCurrentModel } from "$lib/utils/models";
+	import { sanitizeUrlParam } from "$lib/utils/urlParams";
+	import { onMount, tick } from "svelte";
+	import { loading } from "$lib/stores/loading.js";
+	import { loadAttachmentsFromUrls } from "$lib/utils/loadAttachmentsFromUrls";
+	import { requireAuthUser } from "$lib/utils/auth";
+
+	let { data } = $props();
+
+	let hasModels = $derived(Boolean(data.models?.length));
+	let files: File[] = $state([]);
+	let draft = $state("");
+
+	const settings = useSettingsStore();
+
+	async function createConversation(message: string) {
+		try {
+			$loading = true;
+
+			// check if $settings.activeModel is a valid model
+			// else check if it's an assistant, and use that model
+			// else use the first model
+
+			const validModels = data.models.map((model) => model.id);
+
+			let model;
+			if (validModels.includes($settings.activeModel)) {
+				model = $settings.activeModel;
+			} else {
+				model = data.models[0].id;
+			}
+			const res = await fetch(`${base}/conversation`, {
+				method: "POST",
+				headers: {
+					"Content-Type": "application/json",
+				},
+				body: JSON.stringify({
+					model,
+					preprompt: $settings.customPrompts[$settings.activeModel],
+				}),
+			});
+
+			if (!res.ok) {
+				let errorMessage = ERROR_MESSAGES.default;
+				try {
+					const json = await res.json();
+					errorMessage = json.message || errorMessage;
+				} catch {
+					// Response wasn't JSON (e.g., HTML error page)
+					if (res.status === 401) {
+						errorMessage = "Authentication required";
+					}
+				}
+				error.set(errorMessage);
+				console.error("Error while creating conversation: ", errorMessage);
+				return;
+			}
+
+			const { conversationId } = await res.json();
+
+			// Ugly hack to use a store as temp storage, feel free to improve ^^
+			pendingMessage.set({
+				content: message,
+				files,
+			});
+
+			// invalidateAll to update list of conversations
+			await goto(`${base}/conversation/${conversationId}`, { invalidateAll: true });
+		} catch (err) {
+			error.set((err as Error).message || ERROR_MESSAGES.default);
+			console.error(err);
+		} finally {
+			$loading = false;
+		}
+	}
+
+	onMount(async () => {
+		try {
+			// Check if auth is required before processing any query params
+			const hasQ = page.url.searchParams.has("q");
+			const hasPrompt = page.url.searchParams.has("prompt");
+			const hasAttachments = page.url.searchParams.has("attachments");
+
+			if ((hasQ || hasPrompt || hasAttachments) && requireAuthUser()) {
+				return; // Redirecting to login, will return to this URL after
+			}
+
+			// Handle attachments parameter first
+			if (hasAttachments) {
+				const result = await loadAttachmentsFromUrls(page.url.searchParams);
+				files = result.files;
+
+				// Show errors if any
+				if (result.errors.length > 0) {
+					console.error("Failed to load some attachments:", result.errors);
+					error.set(
+						`Failed to load ${result.errors.length} attachment(s). Check console for details.`
+					);
+				}
+
+				// Clean up URL
+				const url = new URL(page.url);
+				url.searchParams.delete("attachments");
+				history.replaceState({}, "", url);
+			}
+
+			const query = sanitizeUrlParam(page.url.searchParams.get("q"));
+			if (query) {
+				void createConversation(query);
+				const url = new URL(page.url);
+				url.searchParams.delete("q");
+				tick().then(() => {
+					replaceState(url, page.state);
+				});
+				return;
+			}
+
+			const promptQuery = sanitizeUrlParam(page.url.searchParams.get("prompt"));
+			if (promptQuery && !draft) {
+				draft = promptQuery;
+				const url = new URL(page.url);
+				url.searchParams.delete("prompt");
+				tick().then(() => {
+					replaceState(url, page.state);
+				});
+			}
+		} catch (err) {
+			console.error("Failed to process URL parameters:", err);
+		}
+	});
+
+	let currentModel = $derived(findCurrentModel(data.models, data.oldModels, $settings.activeModel));
+</script>
+
+<svelte:head>
+	<title>{publicConfig.PUBLIC_APP_NAME}</title>
+</svelte:head>
+
+{#if hasModels}
+	<ChatWindow
+		onmessage={(message) => createConversation(message)}
+		loading={$loading}
+		{currentModel}
+		models={data.models}
+		bind:files
+		bind:draft
+	/>
+{:else}
+	<div class="mx-auto my-20 max-w-xl rounded-xl border p-6 text-center dark:border-gray-700">
+		<h2 class="mb-2 text-xl font-semibold">No models available</h2>
+		<p class="text-gray-600 dark:text-gray-300">
+			No chat models are configured. Set `OPENAI_BASE_URL` and ensure the server can reach the
+			endpoint, then reload. If unset, the app defaults to the Hugging Face router.
+		</p>
+	</div>
+{/if}

package/src/ruvocal/src/routes/.well-known/oauth-cimd/+server.ts

@@ -1,37 +1,37 @@
-import { base } from "$app/paths";
-import { OIDConfig } from "$lib/server/auth";
-import { config } from "$lib/server/config";
-
-/**
- * See https://datatracker.ietf.org/doc/draft-ietf-oauth-client-id-metadata-document/
- */
-export const GET = ({ url }) => {
-	if (!OIDConfig.CLIENT_ID) {
-		return new Response("Client ID not found", { status: 404 });
-	}
-	if (OIDConfig.CLIENT_ID !== "__CIMD__") {
-		return new Response(
-			`Client ID is manually set to something other than '__CIMD__': ${OIDConfig.CLIENT_ID}`,
-			{
-				status: 404,
-			}
-		);
-	}
-	return new Response(
-		JSON.stringify({
-			client_id: new URL(url, config.PUBLIC_ORIGIN || url.origin).toString(),
-			client_name: config.PUBLIC_APP_NAME,
-			client_uri: `${config.PUBLIC_ORIGIN || url.origin}${base}`,
-			redirect_uris: [
-				new URL(`${base}/login/callback`, config.PUBLIC_ORIGIN || url.origin).toString(),
-			],
-			token_endpoint_auth_method: "none",
-			scopes: OIDConfig.SCOPES,
-		}),
-		{
-			headers: {
-				"Content-Type": "application/json",
-			},
-		}
-	);
-};
+import { base } from "$app/paths";
+import { OIDConfig } from "$lib/server/auth";
+import { config } from "$lib/server/config";
+
+/**
+ * See https://datatracker.ietf.org/doc/draft-ietf-oauth-client-id-metadata-document/
+ */
+export const GET = ({ url }) => {
+	if (!OIDConfig.CLIENT_ID) {
+		return new Response("Client ID not found", { status: 404 });
+	}
+	if (OIDConfig.CLIENT_ID !== "__CIMD__") {
+		return new Response(
+			`Client ID is manually set to something other than '__CIMD__': ${OIDConfig.CLIENT_ID}`,
+			{
+				status: 404,
+			}
+		);
+	}
+	return new Response(
+		JSON.stringify({
+			client_id: new URL(url, config.PUBLIC_ORIGIN || url.origin).toString(),
+			client_name: config.PUBLIC_APP_NAME,
+			client_uri: `${config.PUBLIC_ORIGIN || url.origin}${base}`,
+			redirect_uris: [
+				new URL(`${base}/login/callback`, config.PUBLIC_ORIGIN || url.origin).toString(),
+			],
+			token_endpoint_auth_method: "none",
+			scopes: OIDConfig.SCOPES,
+		}),
+		{
+			headers: {
+				"Content-Type": "application/json",
+			},
+		}
+	);
+};

package/src/ruvocal/src/routes/__debug/openai/+server.ts

@@ -1,21 +1,21 @@
-import { json } from "@sveltejs/kit";
-import { config } from "$lib/server/config";
-const DEFAULT_OPENAI_BASE = "https://router.huggingface.co/v1";
-
-export async function GET() {
-	const base = (config.OPENAI_BASE_URL || DEFAULT_OPENAI_BASE).replace(/\/$/, "");
-	try {
-		const res = await fetch(`${base}/models`);
-		const text = await res.text();
-		let length: number | null = null;
-		try {
-			const parsed = JSON.parse(text);
-			length = Array.isArray(parsed?.data) ? parsed.data.length : null;
-		} catch (_err) {
-			length = null; // ignore parse errors
-		}
-		return json({ base, status: res.status, ok: res.ok, length, sample: text.slice(0, 1000) });
-	} catch (e) {
-		return json({ base, error: String(e) });
-	}
-}
+import { json } from "@sveltejs/kit";
+import { config } from "$lib/server/config";
+const DEFAULT_OPENAI_BASE = "https://router.huggingface.co/v1";
+
+export async function GET() {
+	const base = (config.OPENAI_BASE_URL || DEFAULT_OPENAI_BASE).replace(/\/$/, "");
+	try {
+		const res = await fetch(`${base}/models`);
+		const text = await res.text();
+		let length: number | null = null;
+		try {
+			const parsed = JSON.parse(text);
+			length = Array.isArray(parsed?.data) ? parsed.data.length : null;
+		} catch (_err) {
+			length = null; // ignore parse errors
+		}
+		return json({ base, status: res.status, ok: res.ok, length, sample: text.slice(0, 1000) });
+	} catch (e) {
+		return json({ base, error: String(e) });
+	}
+}