Commit Graph

6868 Commits

Author SHA1 Message Date
Anuraag Jain
08c0d7a9ec fix: merge conflicts 2023-12-30 13:00:21 +02:00
Anuraag Jain
613053e46c Merge branch 'refac/auth-middleware' of https://github.com/anuraagdjain/ollama-webui into refac/auth-middleware 2023-12-30 12:53:35 +02:00
Anuraag Jain
bdd153d8f5 refac: use dependencies to verify token
- feat: added new util to get the current user when needed. Middleware was adding authentication logic to all the routes. let's revisit if we can move the non-auth endpoints to a separate route.
- refac: update the routes to use new helpers for verification and retrieving user
- chore: added black for local formatting of py code
2023-12-30 12:53:33 +02:00
Timothy Jaeryang Baek
880f58e81a
Merge pull request #329 from ollama-webui/main
dev
2023-12-30 04:55:33 -05:00
Timothy Jaeryang Baek
7753851e51
Merge branch 'main' into fix-openai-settings 2023-12-30 03:27:13 -05:00
Timothy Jaeryang Baek
13881beedd
Merge pull request #328 from ollama-webui/shortcut-fix
fix: toggle settings shortcut fix
2023-12-30 03:26:35 -05:00
Timothy J. Baek
bf40695eb8 fix: toggle settings shortcut fix 2023-12-30 00:24:57 -08:00
Timothy Jaeryang Baek
0890b53e13
Merge pull request #327 from ollama-webui/delete-all-chat
feat: delete all user chats
2023-12-30 03:21:09 -05:00
Timothy J. Baek
d5dc36b2a9 feat: delete all user chats 2023-12-30 00:15:37 -08:00
Timothy Jaeryang Baek
ee8e7c300a
Merge pull request #326 from ollama-webui/messages-refac
feat: message components refac
2023-12-30 02:41:40 -05:00
Timothy J. Baek
7ffc1902a9 feat: toggle settings shortcut added 2023-12-29 23:35:08 -08:00
Timothy J. Baek
b916f1b07d feat: messages refac 2023-12-29 23:25:40 -08:00
Timothy J. Baek
f91a6b63d1 feat: message components refac 2023-12-29 23:03:48 -08:00
Timothy Jaeryang Baek
b919ac76af
Merge branch 'main' into fix-openai-settings 2023-12-29 21:05:49 -05:00
Timothy Jaeryang Baek
39b8e4430e
Merge branch 'main' into refac/auth-middleware 2023-12-29 12:45:46 -05:00
Timothy Jaeryang Baek
3ae1a5b14d
Merge pull request #325 from ollama-webui/doc-update
doc: important note update
2023-12-29 12:42:54 -05:00
Timothy J. Baek
78d095ad9d doc: important note update 2023-12-29 09:41:46 -08:00
Timothy Jaeryang Baek
c540b75c09
Merge pull request #324 from ollama-webui/doc-update
doc: troubleshooting
2023-12-29 12:31:45 -05:00
Timothy J. Baek
28a3d59955 feat: update troubleshooting messages 2023-12-29 09:29:54 -08:00
Timothy J. Baek
ec87a5e795 doc: troubleshooting update 2023-12-29 09:29:12 -08:00
Timothy J. Baek
36d2a589d2 doc: clarity 2023-12-29 09:05:43 -08:00
David Young
431b710e46 Settings were being referenced incorrectly and as a result, no settings were being sent to openai endpoint. Added num_predict slider in advanced UI. Also added seed, stop and max_tokens (uses num_predict) being sent to openai endpoint. 2023-12-29 16:09:59 +00:00
Timothy Jaeryang Baek
87f5e72eeb
Merge pull request #315 from ollama-webui/account-settings
feat: account settings
2023-12-29 03:33:28 -05:00
Timothy J. Baek
d5bc54b8f8 fix: update password 2023-12-29 00:31:23 -08:00
Timothy J. Baek
500f61b7ee chore: update password refac 2023-12-29 00:29:18 -08:00
Timothy J. Baek
d8bb19fd8a feat: change password frontend added 2023-12-29 00:26:47 -08:00
Timothy J. Baek
9bd48ffd93 feat: change password support 2023-12-29 00:12:30 -08:00
Timothy Jaeryang Baek
450b9b6aef
Merge branch 'main' into account-settings 2023-12-29 02:32:40 -05:00
Timothy J. Baek
136eb18fb0 feat: account settings 2023-12-28 23:32:25 -08:00
Timothy Jaeryang Baek
3fce09eb3d
Merge pull request #314 from ollama-webui/delete-user
feat: delete user
2023-12-29 02:30:57 -05:00
Timothy J. Baek
5b4bf45ad2 fix: delete auth with user 2023-12-28 23:24:51 -08:00
Timothy J. Baek
48cc2c5053 chore: delete user backend refac 2023-12-28 23:17:58 -08:00
Timothy J. Baek
7fade0bb2f feat: delete user button added to admin page 2023-12-28 23:12:58 -08:00
Timothy J. Baek
ad1cb5fc25 fix: disable admin self user delete 2023-12-28 23:07:46 -08:00
Timothy J. Baek
b61bb77950 feat: delete user backend support 2023-12-28 23:02:49 -08:00
Anuraag Jain
a01b112f7f feat(auth): add auth middleware
- refactored chat routes to use request.user instead of doing authentication in every route
2023-12-28 22:15:54 +02:00
Daniele Viti
d8aa169748
Merge pull request #2 from braveokafor/helm-node-selectors
Added nodeSelectors for allocating GPU nodePools in the cloud and configured volumes for WebUI
2023-12-28 20:23:00 +01:00
Timothy Jaeryang Baek
07fc6e4b11
Merge pull request #310 from ollama-webui/main
dev
2023-12-28 13:27:29 -05:00
Timothy Jaeryang Baek
8370465796
Merge pull request #308 from anuraagdjain/fix/model-saving
fix(model-selector): prevent saving empty default model
2023-12-28 13:22:24 -05:00
Anuraag Jain
22a8fa2f10 Merge branch 'fix/model-saving' of https://github.com/anuraagdjain/ollama-webui into fix/model-saving 2023-12-28 20:19:56 +02:00
Anuraag Jain
5ee58e1c79 revert: vite config, hmr works without it 2023-12-28 20:19:09 +02:00
Anuraag D Jain
1da6d23d5c
Merge branch 'main' into fix/model-saving 2023-12-28 20:10:46 +02:00
Timothy Jaeryang Baek
46f131cc7c
Merge pull request #309 from ollama-webui/https-fix
fix: api route issue over https
2023-12-28 12:59:58 -05:00
Timothy J. Baek
bdc131378f fix: trailing slash added to api routes 2023-12-28 09:55:54 -08:00
Timothy J. Baek
f70fadd70c fix: https connection issue 2023-12-28 09:52:30 -08:00
Anuraag Jain
4d3754980d fix(model-selector): prevent saving empty default model
- throw a toast error when user is trying to click on `set as default` without actually choosing the model(s).
- feat: added hmr for local development. use `npm run dev` and you get the hmr when debugging.
2023-12-28 18:06:17 +02:00
braveokafor
b42b2e7890 Added nodeSelectors for allocating GPU nodePools in the cloud and configured volumes for WebUI 2023-12-28 16:28:09 +01:00
Daniele Viti
2cf9166ece
Merge pull request #1 from qrkourier/helm-optional-ingress
let ingress be enabled by default
2023-12-28 12:42:00 +01:00
Timothy Jaeryang Baek
72524272f0
Merge pull request #304 from ollama-webui/keyboard-shortcut
feat: keyboard shortcuts
2023-12-28 05:48:11 -05:00
Timothy J. Baek
1f5bfe67a1 feat: keyboard shortcuts 2023-12-28 02:46:57 -08:00