ferret99gt
57b01cf8fb
Fix for system prompt setting
...
1) Ollama supports sending the system prompt as a parameter, not as an option. (See https://github.com/ollama/ollama/blob/main/docs/api.md#request-8 ) However, it is in the options dictionary and needs moved to the payload dictionary.
2) After moving the system parameter from ollama_options to ollama_payload, delete it from ollama_options. This is to prevent Ollama throwing a warning about invalid options.
2025-02-19 08:55:11 -05:00
ferret99gt
fea169a9c0
Core fix for num_predict not working.
...
1) max_tokens was being looked for in openai_payload, but is present in openai_payload['options'], so is never found.
2) After copying the value for max_tokens to num_predict, delete max_tokens from the dictionary. This is to prevent Ollama throwing a warning about invalid option (max_tokens)
2025-02-19 08:52:34 -05:00
ferret99gt
adde37394b
Remove parameters that map directly, as they are part of options
...
1) This may be legacy code?
2) All three of these parameters, temperature, top_p and seed, are found in openai_payload["options"], not openai_payload. They do not need remapped any longer.
2025-02-19 08:44:59 -05:00
ferret99gt
aea8977d05
Remove mapping of max_completion_tokens
...
1) max_completion_tokens is being looked for in openai_payload, but would be located in openai_payload['options'], so is never found. (This applies to the prior two commits as well).
2) max_completion_tokens is not sent from the frontend, only max_tokens. It does not appear in AdvancedParams.svelte.
2b) Openai.py does use max_completion_tokens, but for o1,o3 models and converts it from max_tokens.
2025-02-19 08:39:33 -05:00
ferret99gt
e6919c3242
Remove mapping of frequency_penalty to repeat_penalty
...
1) Ollama natively supports frequency_penalty.
2) repeat_penaltywas added to Open Webui in PR #10016 and is not merged to main yet at this time. Once both changes go live, Ollama users can freely choose between frequency/presence penalty, or repeat penalty, as they choose.
2025-02-19 08:33:29 -05:00
ferret99gt
a560f789e4
Remove mapping of presence_penalty to new_topix_penalty
...
1) Ollama natively supports presence_penalty.
2) new_topic_penalty is not a valid option in Ollama. (See https://github.com/ollama/ollama/blob/main/docs/api.md#request-8 )
3) Presence_penalty was added to Open Webui in PR #10016 and is not merged to main yet at this time.
2025-02-19 08:31:57 -05:00
Timothy Jaeryang Baek
9ca4727573
enh: web search behaviour
2025-02-18 21:29:27 -08:00
Timothy Jaeryang Baek
81715f6553
enh: RAG full context mode
2025-02-18 21:14:58 -08:00
Timothy Jaeryang Baek
1bbecd46c8
Merge pull request #10052 from roryeckel/playwright
...
Support Playwright RAG Web Loader: Revised
2025-02-18 19:57:48 -08:00
Timothy Jaeryang Baek
d0114e0703
fix: temp chat issue
2025-02-18 09:57:12 -08:00
Timothy Jaeryang Baek
1764170307
refac
2025-02-17 21:34:06 -08:00
Rory
10e0c81de9
Merge remote-tracking branch 'upstream/dev' into playwright
...
# Conflicts:
# backend/open_webui/retrieval/web/utils.py
# backend/open_webui/routers/retrieval.py
2025-02-17 21:53:39 -06:00
Timothy Jaeryang Baek
93731e4ca9
fix: temp chat message continue
2025-02-17 18:40:40 -08:00
Timothy Jaeryang Baek
ca0b7217d2
enh: full context web search
2025-02-17 18:14:26 -08:00
Timothy Jaeryang Baek
a5fa1cd835
Merge pull request #10209 from i-infra/iinf/fix-for-openrouter
...
[fix] no unambiguous indexing on "owned_by" - fix OpenRouter.ai
2025-02-17 15:24:21 -08:00
Timothy Jaeryang Baek
82189066e8
refac
2025-02-16 18:35:09 -08:00
Timothy Jaeryang Baek
63cf80a456
refac
2025-02-16 00:11:18 -08:00
Timothy Jaeryang Baek
19c340d3fb
refac: pipelines
2025-02-15 22:25:18 -08:00
Rory
66c2acc08d
Merge branch 'dev' into playwright
2025-02-15 22:14:16 -06:00
Timothy Jaeryang Baek
bbda717b69
refac: citations
2025-02-15 17:24:29 -08:00
i-infra
5e3742f899
and one last edit
2025-02-15 19:42:58 -05:00
i-infra
fb12ee3f52
fix exception where openrouter doesn't populate - no longer index without fallback
2025-02-15 19:41:41 -05:00
Rory
4da220c513
Merge remote-tracking branch 'upstream/dev' into playwright
...
# Conflicts:
# backend/open_webui/config.py
# backend/open_webui/main.py
# backend/open_webui/retrieval/web/utils.py
# backend/open_webui/routers/retrieval.py
# backend/open_webui/utils/middleware.py
# pyproject.toml
2025-02-14 20:48:22 -06:00
Yimi81
ceef600223
support async load for websearch
2025-02-14 07:05:10 +00:00
Timothy Jaeryang Baek
da757069de
refac
2025-02-13 17:06:55 -08:00
Timothy Jaeryang Baek
e1435501aa
fix
2025-02-13 15:17:41 -08:00
Timothy Jaeryang Baek
68519d6ca7
enh: multiple tool calls support
2025-02-13 14:50:46 -08:00
Timothy Jaeryang Baek
f20b7c2f33
fix: user direct connections
2025-02-13 14:21:34 -08:00
Didier FOURNOUT
06062568c7
black formatting
2025-02-13 16:12:46 +00:00
Didier FOURNOUT
6d62e71c34
Add x-Open-Webui headers for ollama + more for openai
2025-02-13 15:29:26 +00:00
Samuel
e98f859a14
format
2025-02-13 12:19:24 +00:00
Samuel
86074cff6c
fix: re-enable tool use when sending tool output
2025-02-13 12:18:21 +00:00
Timothy Jaeryang Baek
6acda2e6ec
refac: code interpreter
2025-02-13 00:40:04 -08:00
Timothy Jaeryang Baek
6d899b80d0
refac: direct connections
2025-02-13 00:34:45 -08:00
Timothy Jaeryang Baek
eb568695e7
chore: format
2025-02-13 00:13:33 -08:00
Timothy Jaeryang Baek
a1dc2664c2
refac
2025-02-12 23:49:00 -08:00
Timothy Jaeryang Baek
c0dfafca70
Merge pull request #9844 from Seniorsimo/bug-9773
...
Fix - Added support for API tool_calls when stream false
2025-02-12 23:37:24 -08:00
Timothy Jaeryang Baek
83e5db7be7
refac
2025-02-12 23:26:47 -08:00
Timothy Jaeryang Baek
2b7f9d14d0
refac
2025-02-12 23:21:16 -08:00
Timothy Jaeryang Baek
c83e68282d
feat: direct connections integration
2025-02-12 22:56:33 -08:00
Simone
b0ade6c04c
Fixed typo
2025-02-13 07:04:02 +01:00
Rory
40d4db97e6
Merge remote-tracking branch 'upstream/dev' into playwright
2025-02-12 22:32:44 -06:00
Simone
7dc000a6b9
added support for API tool_calls if stream false
2025-02-12 09:11:26 +01:00
Timothy Jaeryang Baek
f916fbba56
enh: custom code interpreter prompt
2025-02-11 21:36:16 -08:00
Timothy Jaeryang Baek
16bae8f33a
refac
2025-02-10 13:53:16 -08:00
Timothy Jaeryang Baek
a273cba0fb
refac: code intepreter
2025-02-10 13:12:05 -08:00
Timothy Jaeryang Baek
0f12c4d14f
fix: ollama tool calling
...
Co-Authored-By: Simone <6941100+seniorsimo@users.noreply.github.com>
2025-02-10 12:18:49 -08:00
Timothy Jaeryang Baek
293f64353d
Merge pull request #9751 from pseudorm/bug/user-signup/fix-oauth-username-claim-has-no-effect
...
Fix: Setting OAUTH_USERNAME_CLAIM has no effect on username for user during oauth signup
2025-02-10 11:26:56 -08:00
Timothy Jaeryang Baek
63a5ee3adb
refac
2025-02-10 11:25:38 -08:00
pseudorm
336d1d95c5
Merge branch 'dev' into bug/user-signup/fix-oauth-username-claim-has-no-effect
2025-02-10 22:00:20 +08:00
chester.cheng
1b6e12a255
add warning
2025-02-10 20:49:55 +08:00
chester.cheng
db0a12f9f1
check name is none
2025-02-10 20:36:01 +08:00
Timothy Jaeryang Baek
f9c5819314
enh: code interpreter jupyter support
2025-02-10 02:25:02 -08:00
Timothy Jaeryang Baek
60095598ec
chore: format
2025-02-09 22:20:47 -08:00
Timothy Jaeryang Baek
de2026b5cc
Merge pull request #9733 from rragundez/patch-ssrf
...
Prevent SSRF and HTML injection
2025-02-09 22:15:03 -08:00
Rory
2c711d8365
Merge remote-tracking branch 'upstream/dev' into playwright
...
# Conflicts:
# backend/requirements.txt
2025-02-09 23:52:21 -06:00
Rodrigo Agundez
167c8bf00d
Prevent SSRF and HTML injection
2025-02-10 10:35:10 +08:00
Timothy Jaeryang Baek
9be8bea6f4
fix: filter
2025-02-08 01:07:05 -08:00
Timothy Jaeryang Baek
ee0152c1fa
Merge pull request #9634 from zoupingshi/dev
...
chore: fix some typos
2025-02-07 23:07:25 -08:00
Timothy Jaeryang Baek
79c0b45543
Merge pull request #9631 from XingjianXie/remove_inlet_outlet_duplication
...
Refactor common code between inlet and outlet
2025-02-07 22:57:49 -08:00
Timothy Jaeryang Baek
3dde2f67cf
refac
2025-02-07 22:57:39 -08:00
Timothy Jaeryang Baek
dee07a6260
Merge pull request #9629 from rragundez/handle-no-picture
...
Handle no picture when retrieving from Microsoft EntraID
2025-02-07 22:52:35 -08:00
Timothy Jaeryang Baek
6862081d6b
Merge pull request #9641 from SentinalMax/bugfix/GGUF-upload-issue
...
Fix: GGUF model upload instability
2025-02-07 22:51:44 -08:00
SentinalMax
95aaacfeb4
fixed GGUF model upload instability
2025-02-07 22:52:24 -06:00
zoupingshi
d39a274ef8
chore: fix some typos
...
Signed-off-by: zoupingshi <hangfachang@outlook.com>
2025-02-08 12:14:01 +08:00
Rodrigo Agundez
546ef6ab42
Check is response is OK from retrieve the picture if not then default
2025-02-08 09:49:16 +09:00
Timothy Jaeryang Baek
4271b652a5
Merge pull request #9619 from XingjianXie/fix_after_tag
...
Fix tag_content_handler issue
2025-02-07 14:42:14 -08:00
Timothy Jaeryang Baek
febc5d392f
Merge pull request #9620 from tarmst/add-oauth-debug-logs
...
feat: Adding debug logs for oauth role & group management
2025-02-07 14:41:43 -08:00
Xingjian Xie
c56bedc5ff
Fix tag_content_handler issue: after_tag should be remove from the current content_blocks
2025-02-07 20:15:54 +00:00
tarmst
85912d726e
Adding debug logs for oauth role & group management
2025-02-07 19:53:25 +00:00
Timothy Jaeryang Baek
8a54df1ed2
Merge pull request #9516 from cloudron-io/oauth_username
...
oidc: pick up username correctly
2025-02-07 11:18:53 -08:00
Mistrick
94f56db5ee
fix max seed for comfyui
2025-02-08 01:10:18 +07:00
Xingjian Xie
89669a21fc
Refactor common code between inlet and outlet
2025-02-06 23:07:47 +00:00
Girish Ramakrishnan
8215aa36d0
oidc: pick up username correctly
2025-02-06 17:59:16 +01:00
Rory
74b971b888
refac: clean up solution for correcting code_interpreter backticks
2025-02-05 23:38:35 -06:00
Rory
c676303a55
enh: automatically remove incorrect backticks before code_interpreter tags
2025-02-05 23:26:13 -06:00
D. MacAlpine
34b62e71cc
fix: check for email claim before skipping userinfo endpoint
2025-02-05 21:31:55 -05:00
Rory
ec6fe9939b
Merge remote-tracking branch 'upstream/dev' into playwright
2025-02-05 17:47:58 -06:00
Timothy Jaeryang Baek
7ba717d171
refac: system prompt template
2025-02-05 14:35:18 -08:00
Timothy Jaeryang Baek
d9f17225ef
refac
2025-02-05 14:26:09 -08:00
Timothy Jaeryang Baek
1e67956db9
refac
2025-02-05 14:20:51 -08:00
Timothy Jaeryang Baek
648878782b
refac: response parse
2025-02-05 14:10:53 -08:00
Timothy Jaeryang Baek
ff84c120f5
fix: api usage
2025-02-05 13:18:17 -08:00
Timothy Jaeryang Baek
13c7d96515
refac
2025-02-05 02:38:05 -08:00
Timothy Jaeryang Baek
90cd6f272f
fix: tag support
2025-02-05 02:33:40 -08:00
Timothy Jaeryang Baek
c36c63f1e8
fix: <think> tag
2025-02-05 02:10:28 -08:00
Timothy Jaeryang Baek
cce1762cb8
refac: tool calling
2025-02-05 01:03:16 -08:00
Timothy Jaeryang Baek
e41a2682f5
chore: format
2025-02-05 00:07:45 -08:00
Timothy Jaeryang Baek
f6f8c08cb0
Merge pull request #9068 from df-cgdm/main
...
**feat** Add user related headers when calling an external embedding api
2025-02-05 00:05:44 -08:00
Timothy Jaeryang Baek
c778345e84
refac
2025-02-05 00:01:24 -08:00
Timothy Jaeryang Baek
2b0af33274
refac
2025-02-04 23:48:01 -08:00
Timothy Jaeryang Baek
e349e26cd8
refac
2025-02-04 23:20:09 -08:00
Timothy Jaeryang Baek
314b674f32
feat: native tool calling support
2025-02-04 23:05:14 -08:00
Timothy Jaeryang Baek
7766a08b70
refac: ollama tool calls
2025-02-04 21:42:49 -08:00
Timothy Jaeryang Baek
c5a9cfacf1
refac
2025-02-04 21:20:03 -08:00
Timothy Jaeryang Baek
8d520eeecd
fix: ollama native tool calling
2025-02-04 21:08:26 -08:00
Timothy Jaeryang Baek
e7da506add
refac: middleware
2025-02-04 21:01:53 -08:00
Timothy Jaeryang Baek
23df351239
refac: ollama tool calling support
...
Co-Authored-By: smonux <85928277+smonux@users.noreply.github.com>
2025-02-04 19:22:08 -08:00
Timothy Jaeryang Baek
ec9be0d20d
feat: native tool calling frontend
2025-02-04 19:14:59 -08:00
Timothy Jaeryang Baek
6ee924924e
refac: code interpreter
2025-02-04 18:33:22 -08:00
