Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/lib/server/api/routes/groups/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ export const userGroup = new Elysia()

customPrompts: settings?.customPrompts ?? {},
multimodalOverrides: settings?.multimodalOverrides ?? {},
modelParameters: settings?.modelParameters ?? DEFAULT_SETTINGS.modelParameters,
};
})
.post("/settings", async ({ locals, request }) => {
Expand Down
2 changes: 1 addition & 1 deletion src/lib/server/endpoints/openai/endpointOai.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export const endpointOAIParametersSchema = z.object({
"image/jpeg",
],
preferredMimeType: "image/jpeg",
maxSizeInMB: 3,
maxSizeInMB: 1,
maxWidth: 1024,
maxHeight: 1024,
}),
Expand Down
10 changes: 9 additions & 1 deletion src/lib/server/textGeneration/generate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,25 @@ export async function* generate(
conv,
messages,
assistant,
userModelParameters,
promptedAt,
forceMultimodal,
locals,
abortController,
}: GenerateContext,
preprompt?: string
): AsyncIterable<MessageUpdate> {
// Merge parameters with priority: model defaults < user settings < assistant settings
// (model.parameters is merged in the endpoint itself)
const mergedGenerateSettings = {
...userModelParameters,
...assistant?.generateSettings,
};

const stream = await endpoint({
messages,
preprompt,
generateSettings: assistant?.generateSettings,
generateSettings: mergedGenerateSettings,
// Allow user-level override to force multimodal
isMultimodal: (forceMultimodal ?? false) || model.multimodal,
conversationId: conv._id,
Expand Down
3 changes: 3 additions & 0 deletions src/lib/server/textGeneration/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,16 @@ import type { Endpoint } from "../endpoints/endpoints";
import type { Conversation } from "$lib/types/Conversation";
import type { Message } from "$lib/types/Message";
import type { Assistant } from "$lib/types/Assistant";
import type { Model } from "$lib/types/Model";

export interface TextGenerationContext {
model: ProcessedModel;
endpoint: Endpoint;
conv: Conversation;
messages: Message[];
assistant?: Pick<Assistant, "dynamicPrompt" | "generateSettings">;
/** User's per-model parameter overrides from settings */
userModelParameters?: Partial<Model["parameters"]>;
promptedAt: Date;
ip: string;
username?: string;
Expand Down
14 changes: 10 additions & 4 deletions src/lib/stores/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { browser } from "$app/environment";
import { invalidate } from "$app/navigation";
import { base } from "$app/paths";
import { UrlDependency } from "$lib/types/UrlDependency";
import type { ModelParameterOverrides } from "$lib/types/Settings";
import { getContext, setContext } from "svelte";
import { type Writable, writable, get } from "svelte/store";

Expand All @@ -12,6 +13,7 @@ type SettingsStore = {
activeModel: string;
customPrompts: Record<string, string>;
multimodalOverrides: Record<string, boolean>;
modelParameters: Record<string, ModelParameterOverrides>;
recentlySaved: boolean;
disableStream: boolean;
directPaste: boolean;
Expand All @@ -32,7 +34,11 @@ export function useSettingsStore() {
}

export function createSettingsStore(initialValue: Omit<SettingsStore, "recentlySaved">) {
const baseStore = writable({ ...initialValue, recentlySaved: false });
const baseStore = writable({
...initialValue,
modelParameters: initialValue.modelParameters ?? {},
recentlySaved: false,
});

let timeoutId: NodeJS.Timeout;
let showSavedOnNextSync = false;
Expand Down Expand Up @@ -83,22 +89,22 @@ export function createSettingsStore(initialValue: Omit<SettingsStore, "recentlyS
value: string | boolean
) {
const currentStore = get(baseStore);
const currentNestedObject = currentStore[key] as Record<string, string | boolean>;
const currentNestedObject = currentStore[key] as Record<string, string | boolean> | undefined;

// Only initialize if undefined
if (currentNestedObject?.[nestedKey] !== undefined) {
return;
}

// Update the store
const newNestedObject = {
const newNestedObject: Record<string, string | boolean> = {
...(currentNestedObject || {}),
[nestedKey]: value,
};

baseStore.update((s) => ({
...s,
[key]: newNestedObject,
[key]: newNestedObject as SettingsStore[K],
}));

// Save to server (debounced) - note: we don't set showSavedOnNextSync
Expand Down
15 changes: 15 additions & 0 deletions src/lib/types/Settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@ import { defaultModel } from "$lib/server/models";
import type { Timestamps } from "./Timestamps";
import type { User } from "./User";

/**
* Per-model parameter overrides (Tier 1: most commonly customized)
*/
export interface ModelParameterOverrides {
temperature?: number;
max_tokens?: number;
}

export interface Settings extends Timestamps {
userId?: User["_id"];
sessionId?: string;
Expand All @@ -27,6 +35,12 @@ export interface Settings extends Timestamps {
*/
hidePromptExamples?: Record<string, boolean>;

/**
* Per-model parameter customization (temperature, max_tokens, etc.)
* Empty/undefined values fall back to model defaults.
*/
modelParameters?: Record<string, ModelParameterOverrides>;

disableStream: boolean;
directPaste: boolean;
}
Expand All @@ -39,6 +53,7 @@ export const DEFAULT_SETTINGS = {
customPrompts: {},
multimodalOverrides: {},
hidePromptExamples: {},
modelParameters: {},
disableStream: false,
directPaste: false,
} satisfies SettingsEditable;
11 changes: 10 additions & 1 deletion src/routes/+layout.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,16 @@

{#if publicConfig.PUBLIC_PLAUSIBLE_SCRIPT_URL}
<script>
window.plausible=window.plausible||function(){(plausible.q=plausible.q||[]).push(arguments)},plausible.init=plausible.init||function(i){plausible.o=i||{}};
(window.plausible =
window.plausible ||
function () {
(plausible.q = plausible.q || []).push(arguments);
}),
(plausible.init =
plausible.init ||
function (i) {
plausible.o = i || {};
});
plausible.init();
</script>
{/if}
Expand Down
15 changes: 6 additions & 9 deletions src/routes/conversation/[id]/+server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -355,10 +355,7 @@ export async function POST({ request, locals, params, getClientAddress }) {
metrics.model.tokenCountTotal.inc(metricsLabels);

if (!firstTokenObserved) {
metrics.model.timeToFirstToken.observe(
metricsLabels,
now - promptedAt.getTime()
);
metrics.model.timeToFirstToken.observe(metricsLabels, now - promptedAt.getTime());
firstTokenObserved = true;
}

Expand Down Expand Up @@ -468,21 +465,21 @@ export async function POST({ request, locals, params, getClientAddress }) {
const initialMessageContent = messageToWriteTo.content;

try {
// Fetch user settings once for both multimodal and parameters
const userSettings = await collections.settings.findOne(authCondition(locals));

const ctx: TextGenerationContext = {
model,
endpoint: await model.getEndpoint(),
conv,
messages: messagesForPrompt,
assistant: undefined,
userModelParameters: userSettings?.modelParameters?.[model.id],
promptedAt,
ip: getClientAddress(),
username: locals.user?.username,
// Force-enable multimodal if user settings say so for this model
forceMultimodal: Boolean(
(await collections.settings.findOne(authCondition(locals)))?.multimodalOverrides?.[
model.id
]
),
forceMultimodal: Boolean(userSettings?.multimodalOverrides?.[model.id]),
locals,
abortController: ctrl,
};
Expand Down
12 changes: 10 additions & 2 deletions src/routes/settings/(nav)/+layout.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@
import { useSettingsStore } from "$lib/stores/settings";
import IconOmni from "$lib/components/icons/IconOmni.svelte";
import CarbonClose from "~icons/carbon/close";
import CarbonTextLongParagraph from "~icons/carbon/text-long-paragraph";
import CarbonChat from "~icons/carbon/chat";
import CarbonChevronLeft from "~icons/carbon/chevron-left";
import CarbonView from "~icons/carbon/view";
import CarbonToolsAlt from "~icons/carbon/tools-alt";
import IconGear from "~icons/bi/gear-fill";

import type { LayoutData } from "../$types";
Expand Down Expand Up @@ -185,8 +186,15 @@
{/if}

{#if $settings.customPrompts?.[model.id]}
<CarbonTextLongParagraph
<CarbonChat
class="size-6 rounded-md border border-gray-300 p-1 text-gray-800 dark:border-gray-600 dark:text-gray-200"
alt="Using a custom System Prompt"
/>
{/if}
{#if $settings.modelParameters?.[model.id] && Object.keys($settings.modelParameters[model.id]).length > 0}
<CarbonToolsAlt
class="size-6 rounded-md border border-gray-300 p-1 text-gray-800 dark:border-gray-600 dark:text-gray-200"
alt="Using custom model paramaters"
/>
{/if}
{#if model.id === $settings.activeModel}
Expand Down
8 changes: 8 additions & 0 deletions src/routes/settings/(nav)/+server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ export async function POST({ request, locals }) {
activeModel: z.string().default(DEFAULT_SETTINGS.activeModel),
customPrompts: z.record(z.string()).default({}),
multimodalOverrides: z.record(z.boolean()).default({}),
modelParameters: z
.record(
z.object({
temperature: z.number().min(0).max(2).optional(),
max_tokens: z.number().int().positive().optional(),
})
)
.default({}),
disableStream: z.boolean().default(false),
directPaste: z.boolean().default(false),
hidePromptExamples: z.record(z.boolean()).default({}),
Expand Down
Loading