Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

dev #3669

Merged
merged 30 commits into from
Jul 6, 2024
Merged

dev #3669

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift click to select a range
4e433d9
wip: citations via __event_emitter__
michaelpoluektov Jul 3, 2024
f6dcffa
fix: pinned chat delete issue
tjbck Jul 4, 2024
8646460
refac
tjbck Jul 4, 2024
37a5d2c
Update db.py
tjbck Jul 4, 2024
8fe2a7b
fix
tjbck Jul 4, 2024
8b13755
Update auths.py
tjbck Jul 4, 2024
9a6cbaf
fix: user valves
tjbck Jul 4, 2024
740b6f5
fix: pull model
tjbck Jul 4, 2024
0527755
use data field
michaelpoluektov Jul 4, 2024
d20601d
feat: Add custom Collapsible component for collapsible content
ricky-davis Jul 4, 2024
2389c36
refactor: Update WebSearchResults.svelte to use new CollapsibleComponent
ricky-davis Jul 4, 2024
d5c0876
refactor: fixed new Collapsible Component to allow passed in classes
ricky-davis Jul 4, 2024
db58bb5
refactor: Removed dependency
ricky-davis Jul 4, 2024
78ba18a
refactor: Update Collapsible component to include dynamic margin for …
ricky-davis Jul 4, 2024
f611533
i18n: Update Chinese translation
KarlLee830 Jul 4, 2024
ca3f8e6
chore: format
ricky-davis Jul 4, 2024
55b7c30
simplify citation API
michaelpoluektov Jul 4, 2024
67c2ab0
fix: pipe custom model
tjbck Jul 4, 2024
8381346
enh: add sideways scrolling to settings tabs container
Peter-De-Ath Jul 5, 2024
45fae65
Merge pull request #3630 from KarlLee830/translate
tjbck Jul 5, 2024
8fd128e
i18n: Update Catalan Translation
Jul 5, 2024
983fe4b
refac
tjbck Jul 6, 2024
3928ac1
Merge pull request #3615 from michaelpoluektov/citations-event
tjbck Jul 6, 2024
89e6044
Merge pull request #3657 from aleixdorca/dev
tjbck Jul 6, 2024
c3c15cb
refac
tjbck Jul 6, 2024
70efbef
Merge pull request #3636 from Peter-De-Ath/add-scroll-to-settings-tabs
tjbck Jul 6, 2024
73899e1
refac
tjbck Jul 6, 2024
97a8491
Merge pull request #3631 from ricky-davis/CustomCollapsible
tjbck Jul 6, 2024
d60f066
Merge pull request #3668 from open-webui/dev
tjbck Jul 6, 2024
1436bb7
enh: handle peewee migration
tjbck Jul 6, 2024
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
Prev Previous commit
Next Next commit
fix: user valves
  • Loading branch information
@tjbck
tjbck committed Jul 4, 2024
commit 9a6cbafdef7a1a44c7e3ad914996204d07c4a77e
4 changes: 2 additions & 2 deletions backend/apps/webui/models/functions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 185,7 @@ def get_user_valves_by_id_and_user_id(
) -> Optional[dict]:
try:
user = Users.get_user_by_id(user_id)
user_settings = user.settings.model_dump()
user_settings = user.settings.model_dump() if user.settings else {}

# Check if user has "functions" and "valves" settings
if "functions" not in user_settings:
Expand All @@ -203,7 203,7 @@ def update_user_valves_by_id_and_user_id(
) -> Optional[dict]:
try:
user = Users.get_user_by_id(user_id)
user_settings = user.settings.model_dump()
user_settings = user.settings.model_dump() if user.settings else {}

# Check if user has "functions" and "valves" settings
if "functions" not in user_settings:
Expand Down
4 changes: 2 additions & 2 deletions backend/apps/webui/models/tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 141,7 @@ def get_user_valves_by_id_and_user_id(
) -> Optional[dict]:
try:
user = Users.get_user_by_id(user_id)
user_settings = user.settings.model_dump()
user_settings = user.settings.model_dump() if user.settings else {}

# Check if user has "tools" and "valves" settings
if "tools" not in user_settings:
Expand All @@ -159,7 159,7 @@ def update_user_valves_by_id_and_user_id(
) -> Optional[dict]:
try:
user = Users.get_user_by_id(user_id)
user_settings = user.settings.model_dump()
user_settings = user.settings.model_dump() if user.settings else {}

# Check if user has "tools" and "valves" settings
if "tools" not in user_settings:
Expand Down
Loading