Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-17 08:50:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

👥 fix: Collaborative Check Flag for Shared Agent Files (#8516)

Browse source
This commit is contained in:
Ben Verhees 2025-07-17 16:42:57 +02:00 • committed by GitHub
parent 4b12ea327a
commit 0a169a1ff6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
api/models/File.js
View file

@ -21,7 +21,7 @@ const findFileById = async (file_id, options = {}) => {
* @param {string} agentId - The agent ID that might grant access * @param {string} agentId - The agent ID that might grant access
* @returns {Promise<Map<string, boolean>>} Map of fileId to access status * @returns {Promise<Map<string, boolean>>} Map of fileId to access status
*/ */
const hasAccessToFilesViaAgent = async (userId, fileIds, agentId) => { const hasAccessToFilesViaAgent = async (userId, fileIds, agentId, checkCollaborative = true) => {
const accessMap = new Map(); const accessMap = new Map();
// Initialize all files as no access // Initialize all files as no access
@ -55,11 +55,11 @@ const hasAccessToFilesViaAgent = async (userId, fileIds, agentId) => {
} }
// Agent is globally shared - check if it's collaborative // Agent is globally shared - check if it's collaborative
if (!agent.isCollaborative) { if (checkCollaborative && !agent.isCollaborative) {
return accessMap; return accessMap;
} }
// Agent is globally shared and collaborative - check which files are actually attached // Check which files are actually attached
const attachedFileIds = new Set(); const attachedFileIds = new Set();
if (agent.tool_resources) { if (agent.tool_resources) {
for (const [_resourceType, resource] of Object.entries(agent.tool_resources)) { for (const [_resourceType, resource] of Object.entries(agent.tool_resources)) {
@ -118,7 +118,12 @@ const getFiles = async (filter, _sortOptions, selectFields = { text: 0 }, option
// Batch check access for all non-owned files // Batch check access for all non-owned files
const fileIds = filesToCheck.map((f) => f.file_id); const fileIds = filesToCheck.map((f) => f.file_id);
const accessMap = await hasAccessToFilesViaAgent(options.userId, fileIds, options.agentId); const accessMap = await hasAccessToFilesViaAgent(
options.userId,
fileIds,
options.agentId,
false,
);
// Filter files based on access // Filter files based on access
const accessibleFiles = filesToCheck.filter((file) => accessMap.get(file.file_id)); const accessibleFiles = filesToCheck.filter((file) => accessMap.get(file.file_id));