michael/merlyn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* allow static defined prompt variables to be accessed by any authd user

* improve filtering logic and comments

---------

Co-authored-by: Timothy Carambat <rambat1010@gmail.com>
This commit is contained in:
Sean Hatfield 2025-07-02 08:09:42 -07:00 committed by GitHub
parent fc55baf69a
commit f3839b355c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/models/systemPromptVariables.js
View File

@ -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,
@ -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];
},
/**