🔄 chore: Consolidate agent model imports across middleware and tests from rebase

- Updated imports for `createAgent` and `getAgent` to streamline access from a unified `~/models` path.
- Enhanced test files to reflect the new import structure, ensuring consistency and maintainability across the codebase.
- Improved clarity by removing redundant imports and aligning with the latest model updates.
This commit is contained in:
Danny Avila 2026-03-16 08:26:55 -04:00
parent a0fed6173c
commit dd72b7b17e
No known key found for this signature in database
GPG key ID: BF31EEB2C5CA0956
5 changed files with 7 additions and 7 deletions

View file

@ -8,7 +8,7 @@ const {
const { MongoMemoryServer } = require('mongodb-memory-server');
const { canAccessAgentFromBody } = require('./canAccessAgentFromBody');
const { User, Role, AclEntry } = require('~/db/models');
const { createAgent } = require('~/models/Agent');
const { createAgent } = require('~/models');
describe('canAccessAgentFromBody middleware', () => {
let mongoServer;

View file

@ -10,7 +10,7 @@ const {
ResourceType,
PrincipalType,
} = require('librechat-data-provider');
const { createAgent } = require('~/models/Agent');
const { createAgent } = require('~/models');
jest.mock('~/server/services/Files/process', () => ({
processAgentFileUpload: jest.fn().mockImplementation(async ({ res }) => {

View file

@ -10,7 +10,7 @@ const {
filterFile,
} = require('~/server/services/Files/process');
const { checkPermission } = require('~/server/services/PermissionService');
const { getAgent } = require('~/models/Agent');
const db = require('~/models');
const router = express.Router();
@ -29,7 +29,7 @@ router.post('/', async (req, res) => {
req,
res,
metadata,
getAgent,
getAgent: db.getAgent,
checkPermission,
});
if (denied) {

View file

@ -58,8 +58,8 @@ jest.mock('~/cache', () => ({
}));
const { initializeClient } = require('./initialize');
const { createAgent } = require('~/models/Agent');
const { User, AclEntry } = require('~/db/models');
const { createAgent } = require('~/models');
const PRIMARY_ID = 'agent_primary';
const TARGET_ID = 'agent_target';

View file

@ -6,14 +6,14 @@ jest.mock('~/server/services/PermissionService', () => ({
checkPermission: jest.fn(),
}));
jest.mock('~/models/Agent', () => ({
jest.mock('~/models', () => ({
getAgent: jest.fn(),
}));
const { logger } = require('@librechat/data-schemas');
const { Constants, PermissionBits, ResourceType } = require('librechat-data-provider');
const { checkPermission } = require('~/server/services/PermissionService');
const { getAgent } = require('~/models/Agent');
const { getAgent } = require('~/models');
const { filterFilesByAgentAccess, hasAccessToFilesViaAgent } = require('./permissions');
const AUTHOR_ID = 'author-user-id';