θΏ™ζ˜―indexlocζδΎ›ηš„ζœεŠ‘οΌŒδΈθ¦θΎ“ε…₯任何密码
Skip to content

Allow static defined prompt variables to be accessed by any authorized user #4086

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

Merged
merged 4 commits into from
Jul 2, 2025
Merged

Allow static defined prompt variables to be accessed by any authorized user #4086

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6493477
allow static defined prompt variables to be accessed by any authd user
shatfield4 Jul 2, 2025
f1ff7e8
Merge branch 'master' into 4081-bug-system-prompts-not-visible-to-oth…
timothycarambat Jul 2, 2025
5289ea2
improve filtering logic and comments
timothycarambat Jul 2, 2025
54c3b66
Merge branch '4081-bug-system-prompts-not-visible-to-other-admins-or-…
timothycarambat Jul 2, 2025
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
18 changes: 9 additions & 9 deletions server/models/systemPromptVariables.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,14 @@ const SystemPromptVariables = {
/**
* Retrieves all system prompt variables with dynamic variables as well
* as user defined variables
* @param {number|null} userId - the user ID to filter variables by
* @param {number|null} userId - the current user ID (determines if in multi-user mode)
* @returns {Promise<SystemPromptVariable[]>}
*/
getAll: async function (userId = null) {
const dbVariables = await prisma.system_prompt_variables.findMany({
where: userId ? { userId: Number(userId) } : {},
});

const formattedDbVars = dbVariables.map((v) => ({
// All user-defined system variables are available to everyone globally since only admins can create them.
const userDefinedSystemVariables =
await prisma.system_prompt_variables.findMany();
const formattedDbVars = userDefinedSystemVariables.map((v) => ({
id: v.id,
key: v.key,
value: v.value,
Expand All @@ -109,12 +108,13 @@ const SystemPromptVariables = {
userId: v.userId,
}));

// If userId is not provided, filter the default variables to only include non-multiUserRequired ones
const filteredSystemVars = !userId
// If userId is not provided, filter the default variables to only include non-multiUserRequired variables
// since we wont be able to dynamically inject user-related content.
const defaultSystemVariables = !userId
? this.DEFAULT_VARIABLES.filter((v) => !v.multiUserRequired)
: this.DEFAULT_VARIABLES;

return [...filteredSystemVars, ...formattedDbVars];
return [...defaultSystemVariables, ...formattedDbVars];
},

/**
Expand Down