refactor: Centralize type definitions

allozaur · allozaur · commit 3cde1714262a · 2025-08-07T00:04:26.000+02:00
Simplifies type definitions by consolidating them into a single `app.d.ts` file.
diff --git a/tools/server/webui/.env.example b/tools/server/webui/.env.example
@@ -1 +1 @@
-VITE_BASE_URL=http://localhost:8080
+VITE_BASE_URL = "http://localhost:8080"
diff --git a/tools/server/webui/src/app.d.ts b/tools/server/webui/src/app.d.ts
@@ -2,13 +2,39 @@
 // for information about these interfaces
 
 // Import chat types from dedicated module
+
+import type {
+	ApiChatCompletionRequest,
+	ApiChatCompletionResponse,
+	ApiChatCompletionStreamChunk,
+	ApiChatMessageData,
+	ApiChatMessageContentPart,
+	ApiLlamaCppServerProps,
+} from '$lib/types/api';
+
 import type {
-	ChatMessageData,
-	ChatCompletionRequest,
-	ChatCompletionResponse,
-	ChatCompletionStreamChunk
+	ChatMessageType,
+	ChatRole,
+	ChatUploadedFile,
 } from '$lib/types/chat';
 
+import type {
+	DatabaseAppSettings,
+	DatabaseConversation,
+	DatabaseMessage,
+	DatabaseMessageExtra,
+	DatabaseMessageExtraAudioFile,
+	DatabaseMessageExtraImageFile,
+	DatabaseMessageExtraTextFile,
+	DatabaseMessageExtraPdfFile,
+} from '$lib/types/database';
+
+import type {
+	SettingsConfigValue,
+	SettingsFieldConfig,
+	SettingsConfigType,
+} from '$lib/types/settings';
+
 declare global {
 	// namespace App {
 	// interface Error {}
@@ -18,10 +44,27 @@ declare global {
 	// interface Platform {}
 	// }
 
-	export type {
+	export {
+		ApiChatCompletionRequest,
+		ApiChatCompletionResponse,
+		ApiChatCompletionStreamChunk,
+		ApiChatMessageData,
+		ApiChatMessageContentPart,
+		ApiLlamaCppServerProps,
 		ChatMessageData,
-		ChatCompletionRequest,
-		ChatCompletionResponse,
-		ChatCompletionStreamChunk
-	};
+		ChatMessageType,
+		ChatRole,
+		ChatUploadedFile,
+		DatabaseAppSettings,
+		DatabaseConversation,
+		DatabaseMessage,
+		DatabaseMessageExtra,
+		DatabaseMessageExtraAudioFile,
+		DatabaseMessageExtraImageFile,
+		DatabaseMessageExtraTextFile,
+		DatabaseMessageExtraPdfFile,
+		SettingsConfigValue,
+		SettingsFieldConfig,
+		SettingsConfigType,
+	}
 }
diff --git a/tools/server/webui/src/lib/app.d.ts b/tools/server/webui/src/lib/app.d.ts
diff --git a/tools/server/webui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentPreviewDialog.svelte b/tools/server/webui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentPreviewDialog.svelte
@@ -1,8 +1,6 @@
 <script lang="ts">
 	import * as Dialog from '$lib/components/ui/dialog';
 	import { FileText, Image, Music, FileIcon } from '@lucide/svelte';
-	import type { DatabaseMessageExtra } from '$lib/types/database.d.ts';
-	import type { ChatUploadedFile } from '$lib/types/chat.d.ts';
 
 	interface Props {
 		open: boolean;
diff --git a/tools/server/webui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList.svelte b/tools/server/webui/src/lib/components/app/chat/ChatAttachments/ChatAttachmentsList.svelte
@@ -1,8 +1,6 @@
 <script lang="ts">
 	import { ChatAttachmentImagePreview, ChatAttachmentFilePreview } from '$lib/components/app';
 	import ChatAttachmentPreviewDialog from './ChatAttachmentPreviewDialog.svelte';
-	import type { ChatUploadedFile } from '$lib/types/chat.d.ts';
-	import type { DatabaseMessageExtra } from '$lib/types/database.d.ts';
 
 	interface Props {
 		class?: string;
diff --git a/tools/server/webui/src/lib/components/app/chat/ChatForm/ChatForm.svelte b/tools/server/webui/src/lib/components/app/chat/ChatForm/ChatForm.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-	import type { ChatUploadedFile } from '$lib/types/chat.d.ts';
 	import { ChatAttachmentsList } from '$lib/components/app';
 	import { ChatFormActionButtons, ChatFormFileInput, ChatFormHelperText, ChatFormTextarea } from '$lib/components/app';
 	import { inputClasses } from '$lib/constants/input-classes';
diff --git a/tools/server/webui/src/lib/components/app/chat/ChatMessages/ChatMessage.svelte b/tools/server/webui/src/lib/components/app/chat/ChatMessages/ChatMessage.svelte
@@ -4,8 +4,6 @@
 	import { Button } from '$lib/components/ui/button';
 	import { ChatAttachmentsList, ChatMessageThinkingBlock, MarkdownContent } from '$lib/components/app';
 	import { Tooltip, TooltipContent, TooltipTrigger } from '$lib/components/ui/tooltip';
-	import type { ChatRole } from '$lib/types/chat';
-	import type { DatabaseMessage } from '$lib/types/database';
 	import { copyToClipboard } from '$lib/utils/copy';
 	import { parseThinkingContent } from '$lib/utils/thinking';
 
diff --git a/tools/server/webui/src/lib/components/app/chat/ChatMessages/ChatMessages.svelte b/tools/server/webui/src/lib/components/app/chat/ChatMessages/ChatMessages.svelte
@@ -1,5 +1,4 @@
 <script lang="ts">
-	import type { DatabaseMessage } from '$lib/types/database';
 	import { updateMessage, regenerateMessage } from '$lib/stores/chat.svelte';
 	import { ChatMessage } from '$lib/components/app';
 
diff --git a/tools/server/webui/src/lib/components/app/chat/ChatScreen/ChatScreen.svelte b/tools/server/webui/src/lib/components/app/chat/ChatScreen/ChatScreen.svelte
@@ -11,8 +11,6 @@
 	import { onMount } from 'svelte';
 	import { fade, fly, slide } from 'svelte/transition';
 	import { Upload } from '@lucide/svelte';
-	import type { ChatUploadedFile } from '$lib/types/chat.d.ts';
-	import type { DatabaseMessageExtra } from '$lib/types/database.d.ts';
 	import {
 		convertPDFToText,
 		isLikelyTextFile,
diff --git a/tools/server/webui/src/lib/components/app/chat/ChatSettings/ChatSettingsDialog.svelte b/tools/server/webui/src/lib/components/app/chat/ChatSettings/ChatSettingsDialog.svelte
@@ -12,7 +12,6 @@
 		updateMultipleConfig,
 		resetConfig
 	} from '$lib/stores/settings.svelte';
-	import { type SettingsConfigType, type FieldConfig } from '$lib/types/settings';
 
 	interface Props {
 		onOpenChange?: (open: boolean) => void;
@@ -52,7 +51,7 @@
 	const settingSections: Array<{
 		title: string;
 		icon: any;
-		fields: FieldConfig[];
+		fields: SettingsFieldConfig[];
 	}> = [
 		{
 			title: 'General',
diff --git a/tools/server/webui/src/lib/components/app/chat/ChatSidebar/ChatSidebarConversationItem.svelte b/tools/server/webui/src/lib/components/app/chat/ChatSidebar/ChatSidebarConversationItem.svelte
@@ -2,7 +2,6 @@
 	import * as AlertDialog from '$lib/components/ui/alert-dialog';
 	import * as DropdownMenu from '$lib/components/ui/dropdown-menu';
 	import { Trash2, Pencil, MoreHorizontal } from '@lucide/svelte';
-	import type { DatabaseConversation } from '$lib/types/database';
 
 	interface Props {
 		conversation: DatabaseConversation;
diff --git a/tools/server/webui/src/lib/services/chat.ts b/tools/server/webui/src/lib/services/chat.ts
@@ -1,20 +1,3 @@
-import type {
-	ApiChatMessageContentPart,
-	ApiChatMessageData,
-	ApiChatCompletionRequest,
-	ApiChatCompletionStreamChunk,
-	ApiChatCompletionResponse,
-	ApiLlamaCppServerProps
-} from '$lib/types/api';
-
-import type {
-	DatabaseMessage,
-	DatabaseMessageExtra,
-	DatabaseMessageExtraImageFile,
-	DatabaseMessageExtraTextFile,
-	DatabaseMessageExtraPdfFile
-} from '$lib/types/database'
-
 export class ChatService {
 	private baseUrl: string;
 	private abortController: AbortController | null = null;
diff --git a/tools/server/webui/src/lib/services/database.ts b/tools/server/webui/src/lib/services/database.ts
@@ -1,4 +1,3 @@
-import type { DatabaseConversation, DatabaseMessage, DatabaseAppSettings } from '$lib/types/database';
 import { db } from '$lib/stores/database';
 
 export class DatabaseService {
diff --git a/tools/server/webui/src/lib/stores/chat.svelte.ts b/tools/server/webui/src/lib/stores/chat.svelte.ts
@@ -1,12 +1,11 @@
 import { ChatService } from '$lib/services/chat';
 import { DatabaseService } from '$lib/services';
-import type { DatabaseConversation, DatabaseMessage, DatabaseMessageExtra } from '$lib/types/database';
 import { goto } from '$app/navigation';
 import { browser } from '$app/environment';
 import { extractPartialThinking } from '$lib/utils/thinking';
 import { wouldExceedContextLength } from '$lib/utils/token-estimation';
 import { serverStore } from '$lib/stores/server.svelte';
-import type { ChatMessageType, ChatRole } from '$lib/app';
+import { config } from '$lib/stores/settings.svelte';
 
 class ChatStore {
 	activeConversation = $state<DatabaseConversation | null>(null);
diff --git a/tools/server/webui/src/lib/stores/database.ts b/tools/server/webui/src/lib/stores/database.ts
@@ -1,5 +1,4 @@
 import Dexie, { type EntityTable } from 'dexie';
-import type { DatabaseConversation, DatabaseMessage, DatabaseAppSettings } from '$lib/types/database';
 
 class LlamacppDatabase extends Dexie {
 	conversations!: EntityTable<DatabaseConversation, 'id'>;
diff --git a/tools/server/webui/src/lib/stores/server.svelte.ts b/tools/server/webui/src/lib/stores/server.svelte.ts
@@ -1,5 +1,4 @@
 import { ChatService } from '$lib/services/chat';
-import type { ApiLlamaCppServerProps } from '$lib/types/api';
 
 /**
  * Server properties store
diff --git a/tools/server/webui/src/lib/stores/settings.svelte.ts b/tools/server/webui/src/lib/stores/settings.svelte.ts
@@ -5,7 +5,6 @@
 
 import { browser } from '$app/environment';
 import { SETTING_CONFIG_DEFAULT } from '$lib/constants/settings-config';
-import { type SettingsConfigType } from '$lib/types/settings.d';
 
 class SettingsStore {
 	config = $state<SettingsConfigType>({ ...SETTING_CONFIG_DEFAULT });
diff --git a/tools/server/webui/src/lib/types/api.d.ts b/tools/server/webui/src/lib/types/api.d.ts
@@ -96,8 +96,31 @@ export interface ApiChatCompletionRequest {
 		content: string | ApiChatMessageContentPart[];
 	}>;
 	stream?: boolean;
+	// Generation parameters
 	temperature?: number;
 	max_tokens?: number;
+	// Sampling parameters
+	dynatemp_range?: number;
+	dynatemp_exponent?: number;
+	top_k?: number;
+	top_p?: number;
+	min_p?: number;
+	xtc_probability?: number;
+	xtc_threshold?: number;
+	typical_p?: number;
+	// Penalty parameters
+	repeat_last_n?: number;
+	repeat_penalty?: number;
+	presence_penalty?: number;
+	frequency_penalty?: number;
+	dry_multiplier?: number;
+	dry_base?: number;
+	dry_allowed_length?: number;
+	dry_penalty_last_n?: number;
+	// Sampler configuration
+	samplers?: string[];
+	// Custom parameters (JSON string)
+	custom?: any;
 }
 
 export interface ApiChatCompletionStreamChunk {
diff --git a/tools/server/webui/src/lib/types/settings.d.ts b/tools/server/webui/src/lib/types/settings.d.ts
@@ -1,14 +1,14 @@
 import type { SETTING_CONFIG_DEFAULT } from "$lib/constants/settings-config";
 
-export type ConfigValue = string | number | boolean;
+export type SettingsConfigValue = string | number | boolean;
 
-export interface FieldConfig {
+export interface SettingsFieldConfig {
 	key: string;
 	label: string;
 	type: 'input' | 'textarea' | 'checkbox';
 	help?: string;
 }
 
 export type SettingsConfigType = typeof SETTING_CONFIG_DEFAULT & {
-	[key: string]: string | number | boolean;
+	[key: string]: SettingsConfigValue;
 };
diff --git a/tools/server/webui/src/lib/utils/token-estimation.ts b/tools/server/webui/src/lib/utils/token-estimation.ts
@@ -2,9 +2,6 @@
  * Token estimation utilities for context length validation
  */
 
-import type { DatabaseMessage, DatabaseMessageExtra } from '$lib/types/database';
-import type { ApiChatMessageData } from '$lib/types/api';
-
 /**
  * Rough token estimation based on character count
  * Uses a conservative estimate of ~4 characters per token for most languages
diff --git a/tools/server/webui/src/stories/ChatSidebarConversationItem.stories.svelte b/tools/server/webui/src/stories/ChatSidebarConversationItem.stories.svelte
@@ -1,7 +1,6 @@
 <script module lang="ts">
 	import { defineMeta } from '@storybook/addon-svelte-csf';
 	import { ChatSidebarConversationItem } from '$lib/components/app';
-	import type { DatabaseConversation } from '$lib/types/database';
 
 	const { Story } = defineMeta({
 		title: 'Components/ChatSidebar/ChatSidebarConversationItem',

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-VITE_BASE_URL=http://localhost:8080`
	`1`	`+VITE_BASE_URL = "http://localhost:8080"`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<script lang="ts">`
`2`		`- import type { ChatUploadedFile } from '$lib/types/chat.d.ts';`
`3`	`2`	`import { ChatAttachmentsList } from '$lib/components/app';`
`4`	`3`	`import { ChatFormActionButtons, ChatFormFileInput, ChatFormHelperText, ChatFormTextarea } from '$lib/components/app';`
`5`	`4`	`import { inputClasses } from '$lib/constants/input-classes';`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`<script lang="ts">`
`2`		`- import type { DatabaseMessage } from '$lib/types/database';`
`3`	`2`	`import { updateMessage, regenerateMessage } from '$lib/stores/chat.svelte';`
`4`	`3`	`import { ChatMessage } from '$lib/components/app';`
`5`	`4`