Commit Graph

290 Commits

Author SHA1 Message Date
ferret99gt
5701d6d333 Change the opt dictionary to a mappings dictionary with appropriate casts
This is to bring consistency with apply_model_params_to_body_openai. Both now use a mapping dictionary then call and return apply_model_params_to_body directly.
2025-02-19 09:30:16 -05:00
ferret99gt
fa885c3346 Update remapping logic
We copy the params from from the original key to the new key, then delete it. This is to ensure Ollama only gets valid options.

(Add a comment as well)
2025-02-19 09:25:47 -05:00
ferret99gt
a4249a6351 Remove remapping of frequency_penalty to repeat_penalty
1) Ollama natively supports frequency_penalty, so this is not necessary.
2) Repeat_penalty is being added to Open WebUI in PR #10016, allowing Ollama users to pick which penalty methods they want.
2025-02-19 09:24:38 -05:00
ferret99gt
877d21a029 Move parameter remapping above the opt dictionary.
This is so that any remappings are handled before options are handled by apply_model_params_to_body
2025-02-19 09:23:33 -05:00
ferret99gt
6b2ba73701 Remove tfs_z
See https://github.com/ollama/ollama/blob/main/docs/api.md#request-8

tfs_z was removed from Llama.cpp and Ollama in January 2025.
2025-02-19 09:21:36 -05:00
ferret99gt
cee08e316d Update Ollama request option list with full supported options
See https://github.com/ollama/ollama/blob/main/docs/api.md#request-8

This adds the full suite of supported Ollama options.
2025-02-19 09:21:05 -05:00
Timothy Jaeryang Baek
1764170307 refac 2025-02-17 21:34:06 -08: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
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
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
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
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
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