From ea7d4ec6eab3d1aac43d6d98e8df81f17e4f64b4 Mon Sep 17 00:00:00 2001 From: Timothy Jaeryang Baek Date: Wed, 22 Jan 2025 11:56:39 -0800 Subject: [PATCH 1/8] refac: styling --- src/lib/components/common/Collapsible.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/components/common/Collapsible.svelte b/src/lib/components/common/Collapsible.svelte index 5ccc8ffc23..e6e980ea4a 100644 --- a/src/lib/components/common/Collapsible.svelte +++ b/src/lib/components/common/Collapsible.svelte @@ -37,13 +37,13 @@ }} >
- {#if attributes?.done !== 'true'} + {#if attributes?.done && attributes?.done !== 'true'}
From aaf97b85dc68eaf48cd25961369991a1fa1595cd Mon Sep 17 00:00:00 2001 From: Timothy Jaeryang Baek Date: Wed, 22 Jan 2025 12:07:04 -0800 Subject: [PATCH 2/8] enh: reasoning_effort param support for openai --- backend/open_webui/utils/middleware.py | 4 ++ backend/open_webui/utils/payload.py | 1 + .../Settings/Advanced/AdvancedParams.svelte | 44 ++++++++++++++++++- 3 files changed, 48 insertions(+), 1 deletion(-) diff --git a/backend/open_webui/utils/middleware.py b/backend/open_webui/utils/middleware.py index 5d15f62fc0..a2af6ded92 100644 --- a/backend/open_webui/utils/middleware.py +++ b/backend/open_webui/utils/middleware.py @@ -671,6 +671,10 @@ def apply_params_to_form_data(form_data, model): if "frequency_penalty" in params: form_data["frequency_penalty"] = params["frequency_penalty"] + + if "reasoning_effort" in params: + form_data["reasoning_effort"] = params["reasoning_effort"] + return form_data diff --git a/backend/open_webui/utils/payload.py b/backend/open_webui/utils/payload.py index fdc62f79fe..13f98ee019 100644 --- a/backend/open_webui/utils/payload.py +++ b/backend/open_webui/utils/payload.py @@ -47,6 +47,7 @@ def apply_model_params_to_body_openai(params: dict, form_data: dict) -> dict: "top_p": float, "max_tokens": int, "frequency_penalty": float, + "reasoning_effort": str, "seed": lambda x: x, "stop": lambda x: [bytes(s, "utf-8").decode("unicode_escape") for s in x], } diff --git a/src/lib/components/chat/Settings/Advanced/AdvancedParams.svelte b/src/lib/components/chat/Settings/Advanced/AdvancedParams.svelte index 97c54acc3a..5af8af5b27 100644 --- a/src/lib/components/chat/Settings/Advanced/AdvancedParams.svelte +++ b/src/lib/components/chat/Settings/Advanced/AdvancedParams.svelte @@ -15,6 +15,7 @@ seed: null, stop: null, temperature: null, + reasoning_effort: null, frequency_penalty: null, repeat_last_n: null, mirostat: null, @@ -158,7 +159,7 @@
+
+ +
+
+ {$i18n.t('Reasoning Effort')} +
+ +
+ + + {#if (params?.reasoning_effort ?? null) !== null} +
+
+ +
+
+ {/if} +
+
Date: Wed, 22 Jan 2025 12:08:08 -0800 Subject: [PATCH 3/8] refac: wording --- .../components/chat/Settings/Advanced/AdvancedParams.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/components/chat/Settings/Advanced/AdvancedParams.svelte b/src/lib/components/chat/Settings/Advanced/AdvancedParams.svelte index 5af8af5b27..a56ccab33c 100644 --- a/src/lib/components/chat/Settings/Advanced/AdvancedParams.svelte +++ b/src/lib/components/chat/Settings/Advanced/AdvancedParams.svelte @@ -227,7 +227,9 @@
From 419005a578b4b0acef25d9b82cd4623c5b3fd305 Mon Sep 17 00:00:00 2001 From: Timothy Jaeryang Baek Date: Wed, 22 Jan 2025 12:19:01 -0800 Subject: [PATCH 4/8] refac: manage ollama --- .../Models/Manage/ManageOllama.svelte | 37 +++++++++++-------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/src/lib/components/admin/Settings/Models/Manage/ManageOllama.svelte b/src/lib/components/admin/Settings/Models/Manage/ManageOllama.svelte index 7c939595a7..80665865a7 100644 --- a/src/lib/components/admin/Settings/Models/Manage/ManageOllama.svelte +++ b/src/lib/components/admin/Settings/Models/Manage/ManageOllama.svelte @@ -44,8 +44,8 @@ let modelTag = ''; let createModelLoading = false; - let createModelTag = ''; - let createModelContent = ''; + let createModelObject = {}; + let createModelDigest = ''; let createModelPullProgress = null; @@ -427,12 +427,8 @@ const createModelHandler = async () => { createModelLoading = true; - const res = await createModel( - localStorage.token, - createModelTag, - createModelContent, - urlIdx - ).catch((error) => { + + const res = await createModel(localStorage.token, createModelObject, urlIdx).catch((error) => { toast.error(`${error}`); return null; }); @@ -496,18 +492,21 @@ createModelLoading = false; - createModelTag = ''; - createModelContent = ''; + createModelObject = {}; createModelDigest = ''; createModelPullProgress = null; }; const init = async () => { loading = true; - ollamaModels = await getOllamaModels(localStorage.token, urlIdx); + ollamaModels = await getOllamaModels(localStorage.token, urlIdx).catch((error) => { + toast.error(`${error}`); + return null; + }); - console.log(ollamaModels); - loading = false; + if (ollamaModels) { + loading = false; + } }; $: if (urlIdx !== null) { @@ -747,12 +746,12 @@ placeholder={$i18n.t('Enter model tag (e.g. {{modelTag}})', { modelTag: 'my-modelfile' })} - bind:value={createModelTag} + bind:value={createModelObject.model} disabled={createModelLoading} />