highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-06-19 12:30:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Input shortcut fix in multi tenant case (#3768)

Browse Source 
* validated fix

* nit

* k
This commit is contained in:
pablonyx 2025-01-24 12:40:08 -08:00 committed by GitHub
parent 5d6a18f358
commit 9b19990764
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
backend/onyx/db/input_prompt.py
View File

@ -193,13 +193,13 @@ def fetch_input_prompts_by_user(
""" """
Returns all prompts belonging to the user or public prompts, Returns all prompts belonging to the user or public prompts,
excluding those the user has specifically disabled. excluding those the user has specifically disabled.
Also, if `user_id` is None and AUTH_TYPE is DISABLED, then all prompts are returned.
""" """
# Start with a basic query for InputPrompt
query = select(InputPrompt) query = select(InputPrompt)
# If we have a user, left join to InputPrompt__User so we can check "disabled"
if user_id is not None: if user_id is not None:
# If we have a user, left join to InputPrompt__User to check "disabled"
IPU = aliased(InputPrompt__User) IPU = aliased(InputPrompt__User)
query = query.join( query = query.join(
IPU, IPU,
@ -208,25 +208,30 @@ def fetch_input_prompts_by_user(
) )
# Exclude disabled prompts # Exclude disabled prompts
# i.e. keep only those where (IPU.disabled is NULL or False)
query = query.where(or_(IPU.disabled.is_(None), IPU.disabled.is_(False))) query = query.where(or_(IPU.disabled.is_(None), IPU.disabled.is_(False)))
if include_public: if include_public:
# user-owned or public # Return both user-owned and public prompts
query = query.where( query = query.where(
(InputPrompt.user_id == user_id) | (InputPrompt.is_public) or_(
InputPrompt.user_id == user_id,
InputPrompt.is_public,
)
) )
else: else:
# only user-owned prompts # Return only user-owned prompts
query = query.where(InputPrompt.user_id == user_id) query = query.where(InputPrompt.user_id == user_id)
# If no user is logged in, get all prompts (public and private) else:
if user_id is None and AUTH_TYPE == AuthType.DISABLED: # user_id is None
query = query.where(True) # type: ignore if AUTH_TYPE == AuthType.DISABLED:
# If auth is disabled, return all prompts
query = query.where(True) # type: ignore
elif include_public:
# Anonymous usage
query = query.where(InputPrompt.is_public)
# If no user is logged in but we want to include public prompts # Default to returning all prompts
elif include_public:
query = query.where(InputPrompt.is_public)
if active is not None: if active is not None:
query = query.where(InputPrompt.active == active) query = query.where(InputPrompt.active == active)