mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-02-20 01:18:10 +01:00
📦 refactor: Consolidate DB models, encapsulating Mongoose usage in data-schemas (#11830)
* chore: move database model methods to /packages/data-schemas * chore: add TypeScript ESLint rule to warn on unused variables * refactor: model imports to streamline access - Consolidated model imports across various files to improve code organization and reduce redundancy. - Updated imports for models such as Assistant, Message, Conversation, and others to a unified import path. - Adjusted middleware and service files to reflect the new import structure, ensuring functionality remains intact. - Enhanced test files to align with the new import paths, maintaining test coverage and integrity. * chore: migrate database models to packages/data-schemas and refactor all direct Mongoose Model usage outside of data-schemas * test: update agent model mocks in unit tests - Added `getAgent` mock to `client.test.js` to enhance test coverage for agent-related functionality. - Removed redundant `getAgent` and `getAgents` mocks from `openai.spec.js` and `responses.unit.spec.js` to streamline test setup and reduce duplication. - Ensured consistency in agent mock implementations across test files. * fix: update types in data-schemas * refactor: enhance type definitions in transaction and spending methods - Updated type definitions in `checkBalance.ts` to use specific request and response types. - Refined `spendTokens.ts` to utilize a new `SpendTxData` interface for better clarity and type safety. - Improved transaction handling in `transaction.ts` by introducing `TransactionResult` and `TxData` interfaces, ensuring consistent data structures across methods. - Adjusted unit tests in `transaction.spec.ts` to accommodate new type definitions and enhance robustness. * refactor: streamline model imports and enhance code organization - Consolidated model imports across various controllers and services to a unified import path, improving code clarity and reducing redundancy. - Updated multiple files to reflect the new import structure, ensuring all functionalities remain intact. - Enhanced overall code organization by removing duplicate import statements and optimizing the usage of model methods. * feat: implement loadAddedAgent and refactor agent loading logic - Introduced `loadAddedAgent` function to handle loading agents from added conversations, supporting multi-convo parallel execution. - Created a new `load.ts` file to encapsulate agent loading functionalities, including `loadEphemeralAgent` and `loadAgent`. - Updated the `index.ts` file to export the new `load` module instead of the deprecated `loadAgent`. - Enhanced type definitions and improved error handling in the agent loading process. - Adjusted unit tests to reflect changes in the agent loading structure and ensure comprehensive coverage. * refactor: enhance balance handling with new update interface - Introduced `IBalanceUpdate` interface to streamline balance update operations across the codebase. - Updated `upsertBalanceFields` method signatures in `balance.ts`, `transaction.ts`, and related tests to utilize the new interface for improved type safety. - Adjusted type imports in `balance.spec.ts` to include `IBalanceUpdate`, ensuring consistency in balance management functionalities. - Enhanced overall code clarity and maintainability by refining type definitions related to balance operations. * feat: add unit tests for loadAgent functionality and enhance agent loading logic - Introduced comprehensive unit tests for the `loadAgent` function, covering various scenarios including null and empty agent IDs, loading of ephemeral agents, and permission checks. - Enhanced the `initializeClient` function by moving `getConvoFiles` to the correct position in the database method exports, ensuring proper functionality. - Improved test coverage for agent loading, including handling of non-existent agents and user permissions. * chore: reorder memory method exports for consistency - Moved `deleteAllUserMemories` to the correct position in the exported memory methods, ensuring a consistent and logical order of method exports in `memory.ts`.
This commit is contained in:
Danny Avila
parent
a85e99ff45
commit
a6fb257bcf
182 changed files with 8548 additions and 8105 deletions
|
|
@ -31,20 +31,14 @@ jest.mock('@librechat/data-schemas', () => ({
|
|||
})),
|
||||
}));
|
||||
|
||||
jest.mock('~/models/Conversation', () => ({
|
||||
jest.mock('~/models', () => ({
|
||||
getConvosByCursor: jest.fn(),
|
||||
getConvo: jest.fn(),
|
||||
deleteConvos: jest.fn(),
|
||||
saveConvo: jest.fn(),
|
||||
}));
|
||||
|
||||
jest.mock('~/models/ToolCall', () => ({
|
||||
deleteToolCalls: jest.fn(),
|
||||
}));
|
||||
|
||||
jest.mock('~/models', () => ({
|
||||
deleteAllSharedLinks: jest.fn(),
|
||||
deleteConvoSharedLink: jest.fn(),
|
||||
deleteToolCalls: jest.fn(),
|
||||
}));
|
||||
|
||||
jest.mock('~/server/middleware/requireJwtAuth', () => (req, res, next) => next());
|
||||
|
|
@ -108,9 +102,13 @@ jest.mock('~/server/services/Endpoints/assistants', () => ({
|
|||
describe('Convos Routes', () => {
|
||||
let app;
|
||||
let convosRouter;
|
||||
const { deleteAllSharedLinks, deleteConvoSharedLink } = require('~/models');
|
||||
const { deleteConvos, saveConvo } = require('~/models/Conversation');
|
||||
const { deleteToolCalls } = require('~/models/ToolCall');
|
||||
const {
|
||||
deleteAllSharedLinks,
|
||||
deleteConvoSharedLink,
|
||||
deleteToolCalls,
|
||||
deleteConvos,
|
||||
saveConvo,
|
||||
} = require('~/models');
|
||||
|
||||
beforeAll(() => {
|
||||
convosRouter = require('../convos');
|
||||
|
|
@ -520,7 +518,7 @@ describe('Convos Routes', () => {
|
|||
expect(response.status).toBe(200);
|
||||
expect(response.body).toEqual(mockArchivedConvo);
|
||||
expect(saveConvo).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ user: { id: 'test-user-123' } }),
|
||||
expect.objectContaining({ userId: 'test-user-123' }),
|
||||
{ conversationId: mockConversationId, isArchived: true },
|
||||
{ context: `POST /api/convos/archive ${mockConversationId}` },
|
||||
);
|
||||
|
|
@ -549,7 +547,7 @@ describe('Convos Routes', () => {
|
|||
expect(response.status).toBe(200);
|
||||
expect(response.body).toEqual(mockUnarchivedConvo);
|
||||
expect(saveConvo).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ user: { id: 'test-user-123' } }),
|
||||
expect.objectContaining({ userId: 'test-user-123' }),
|
||||
{ conversationId: mockConversationId, isArchived: false },
|
||||
{ context: `POST /api/convos/archive ${mockConversationId}` },
|
||||
);
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ const { v4: uuidv4 } = require('uuid');
|
|||
const { createMethods } = require('@librechat/data-schemas');
|
||||
const { MongoMemoryServer } = require('mongodb-memory-server');
|
||||
const { ResourceType, PermissionBits } = require('librechat-data-provider');
|
||||
const { createAgent } = require('~/models/Agent');
|
||||
const { createAgent } = require('~/models');
|
||||
|
||||
/**
|
||||
* Mock the PermissionsController to isolate route testing
|
||||
|
|
|
|||
|
|
@ -11,15 +11,16 @@ const {
|
|||
} = require('@librechat/api');
|
||||
const { loginController } = require('~/server/controllers/auth/LoginController');
|
||||
const { createOAuthHandler } = require('~/server/controllers/auth/oauth');
|
||||
const { findBalanceByUser, upsertBalanceFields } = require('~/models');
|
||||
const { getAppConfig } = require('~/server/services/Config');
|
||||
const getLogStores = require('~/cache/getLogStores');
|
||||
const { getOpenIdConfig } = require('~/strategies');
|
||||
const middleware = require('~/server/middleware');
|
||||
const { Balance } = require('~/db/models');
|
||||
|
||||
const setBalanceConfig = createSetBalanceConfig({
|
||||
getAppConfig,
|
||||
Balance,
|
||||
findBalanceByUser,
|
||||
upsertBalanceFields,
|
||||
});
|
||||
|
||||
const router = express.Router();
|
||||
|
|
|
|||
|
|
@ -14,17 +14,15 @@ const {
|
|||
} = require('librechat-data-provider');
|
||||
const { encryptMetadata, domainParser } = require('~/server/services/ActionService');
|
||||
const { findAccessibleResources } = require('~/server/services/PermissionService');
|
||||
const { getAgent, updateAgent, getListAgentsByAccess } = require('~/models/Agent');
|
||||
const { updateAction, getActions, deleteAction } = require('~/models/Action');
|
||||
const db = require('~/models');
|
||||
const { canAccessAgentResource } = require('~/server/middleware');
|
||||
const { getRoleByName } = require('~/models/Role');
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
const checkAgentCreate = generateCheckAccess({
|
||||
permissionType: PermissionTypes.AGENTS,
|
||||
permissions: [Permissions.USE, Permissions.CREATE],
|
||||
getRoleByName,
|
||||
getRoleByName: db.getRoleByName,
|
||||
});
|
||||
|
||||
/**
|
||||
|
|
@ -43,13 +41,15 @@ router.get('/', async (req, res) => {
|
|||
requiredPermissions: PermissionBits.EDIT,
|
||||
});
|
||||
|
||||
const agentsResponse = await getListAgentsByAccess({
|
||||
const agentsResponse = await db.getListAgentsByAccess({
|
||||
accessibleIds: editableAgentObjectIds,
|
||||
});
|
||||
|
||||
const editableAgentIds = agentsResponse.data.map((agent) => agent.id);
|
||||
const actions =
|
||||
editableAgentIds.length > 0 ? await getActions({ agent_id: { $in: editableAgentIds } }) : [];
|
||||
editableAgentIds.length > 0
|
||||
? await db.getActions({ agent_id: { $in: editableAgentIds } })
|
||||
: [];
|
||||
|
||||
res.json(actions);
|
||||
} catch (error) {
|
||||
|
|
@ -130,9 +130,9 @@ router.post(
|
|||
const initialPromises = [];
|
||||
|
||||
// Permissions already validated by middleware - load agent directly
|
||||
initialPromises.push(getAgent({ id: agent_id }));
|
||||
initialPromises.push(db.getAgent({ id: agent_id }));
|
||||
if (_action_id) {
|
||||
initialPromises.push(getActions({ action_id }, true));
|
||||
initialPromises.push(db.getActions({ action_id }, true));
|
||||
}
|
||||
|
||||
/** @type {[Agent, [Action|undefined]]} */
|
||||
|
|
@ -167,7 +167,7 @@ router.post(
|
|||
.concat(functions.map((tool) => `${tool.function.name}${actionDelimiter}${domain}`));
|
||||
|
||||
// Force version update since actions are changing
|
||||
const updatedAgent = await updateAgent(
|
||||
const updatedAgent = await db.updateAgent(
|
||||
{ id: agent_id },
|
||||
{ tools, actions },
|
||||
{
|
||||
|
|
@ -184,7 +184,7 @@ router.post(
|
|||
}
|
||||
|
||||
/** @type {[Action]} */
|
||||
const updatedAction = await updateAction({ action_id }, actionUpdateData);
|
||||
const updatedAction = await db.updateAction({ action_id }, actionUpdateData);
|
||||
|
||||
const sensitiveFields = ['api_key', 'oauth_client_id', 'oauth_client_secret'];
|
||||
for (let field of sensitiveFields) {
|
||||
|
|
@ -221,7 +221,7 @@ router.delete(
|
|||
const { agent_id, action_id } = req.params;
|
||||
|
||||
// Permissions already validated by middleware - load agent directly
|
||||
const agent = await getAgent({ id: agent_id });
|
||||
const agent = await db.getAgent({ id: agent_id });
|
||||
if (!agent) {
|
||||
return res.status(404).json({ message: 'Agent not found for deleting action' });
|
||||
}
|
||||
|
|
@ -246,12 +246,12 @@ router.delete(
|
|||
const updatedTools = tools.filter((tool) => !(tool && tool.includes(domain)));
|
||||
|
||||
// Force version update since actions are being removed
|
||||
await updateAgent(
|
||||
await db.updateAgent(
|
||||
{ id: agent_id },
|
||||
{ tools: updatedTools, actions: updatedActions },
|
||||
{ updatingUserId: req.user.id, forceVersion: true },
|
||||
);
|
||||
await deleteAction({ action_id });
|
||||
await db.deleteAction({ action_id });
|
||||
res.status(200).json({ message: 'Action deleted successfully' });
|
||||
} catch (error) {
|
||||
const message = 'Trouble deleting the Agent Action';
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ const {
|
|||
const { initializeClient } = require('~/server/services/Endpoints/agents');
|
||||
const AgentController = require('~/server/controllers/agents/request');
|
||||
const addTitle = require('~/server/services/Endpoints/agents/title');
|
||||
const { getRoleByName } = require('~/models/Role');
|
||||
const { getRoleByName } = require('~/models');
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@ const {
|
|||
messageUserLimiter,
|
||||
} = require('~/server/middleware');
|
||||
const { saveMessage } = require('~/models');
|
||||
const openai = require('./openai');
|
||||
const responses = require('./responses');
|
||||
const openai = require('./openai');
|
||||
const { v1 } = require('./v1');
|
||||
const chat = require('./chat');
|
||||
|
||||
|
|
@ -253,9 +253,15 @@ router.post('/chat/abort', async (req, res) => {
|
|||
};
|
||||
|
||||
try {
|
||||
await saveMessage(req, responseMessage, {
|
||||
context: 'api/server/routes/agents/index.js - abort endpoint',
|
||||
});
|
||||
await saveMessage(
|
||||
{
|
||||
userId: req?.user?.id,
|
||||
isTemporary: req?.body?.isTemporary,
|
||||
interfaceConfig: req?.config?.interfaceConfig,
|
||||
},
|
||||
responseMessage,
|
||||
{ context: 'api/server/routes/agents/index.js - abort endpoint' },
|
||||
);
|
||||
logger.debug(`[AgentStream] Saved partial response for: ${jobStreamId}`);
|
||||
} catch (saveError) {
|
||||
logger.error(`[AgentStream] Failed to save partial response: ${saveError.message}`);
|
||||
|
|
|
|||
|
|
@ -29,26 +29,24 @@ const {
|
|||
GetModelController,
|
||||
} = require('~/server/controllers/agents/openai');
|
||||
const { getEffectivePermissions } = require('~/server/services/PermissionService');
|
||||
const { validateAgentApiKey, findUser } = require('~/models');
|
||||
const { configMiddleware } = require('~/server/middleware');
|
||||
const { getRoleByName } = require('~/models/Role');
|
||||
const { getAgent } = require('~/models/Agent');
|
||||
const db = require('~/models');
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
const requireApiKeyAuth = createRequireApiKeyAuth({
|
||||
validateAgentApiKey,
|
||||
findUser,
|
||||
validateAgentApiKey: db.validateAgentApiKey,
|
||||
findUser: db.findUser,
|
||||
});
|
||||
|
||||
const checkRemoteAgentsFeature = generateCheckAccess({
|
||||
permissionType: PermissionTypes.REMOTE_AGENTS,
|
||||
permissions: [Permissions.USE],
|
||||
getRoleByName,
|
||||
getRoleByName: db.getRoleByName,
|
||||
});
|
||||
|
||||
const checkAgentPermission = createCheckRemoteAgentAccess({
|
||||
getAgent,
|
||||
getAgent: db.getAgent,
|
||||
getEffectivePermissions,
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -32,26 +32,24 @@ const {
|
|||
listModels,
|
||||
} = require('~/server/controllers/agents/responses');
|
||||
const { getEffectivePermissions } = require('~/server/services/PermissionService');
|
||||
const { validateAgentApiKey, findUser } = require('~/models');
|
||||
const { configMiddleware } = require('~/server/middleware');
|
||||
const { getRoleByName } = require('~/models/Role');
|
||||
const { getAgent } = require('~/models/Agent');
|
||||
const db = require('~/models');
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
const requireApiKeyAuth = createRequireApiKeyAuth({
|
||||
validateAgentApiKey,
|
||||
findUser,
|
||||
validateAgentApiKey: db.validateAgentApiKey,
|
||||
findUser: db.findUser,
|
||||
});
|
||||
|
||||
const checkRemoteAgentsFeature = generateCheckAccess({
|
||||
permissionType: PermissionTypes.REMOTE_AGENTS,
|
||||
permissions: [Permissions.USE],
|
||||
getRoleByName,
|
||||
getRoleByName: db.getRoleByName,
|
||||
});
|
||||
|
||||
const checkAgentPermission = createCheckRemoteAgentAccess({
|
||||
getAgent,
|
||||
getAgent: db.getAgent,
|
||||
getEffectivePermissions,
|
||||
});
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ const { generateCheckAccess } = require('@librechat/api');
|
|||
const { PermissionTypes, Permissions, PermissionBits } = require('librechat-data-provider');
|
||||
const { requireJwtAuth, configMiddleware, canAccessAgentResource } = require('~/server/middleware');
|
||||
const v1 = require('~/server/controllers/agents/v1');
|
||||
const { getRoleByName } = require('~/models/Role');
|
||||
const { getRoleByName } = require('~/models');
|
||||
const actions = require('./actions');
|
||||
const tools = require('./tools');
|
||||
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@ const {
|
|||
createAgentApiKey,
|
||||
deleteAgentApiKey,
|
||||
listAgentApiKeys,
|
||||
getRoleByName,
|
||||
} = require('~/models');
|
||||
const { requireJwtAuth } = require('~/server/middleware');
|
||||
const { getRoleByName } = require('~/models/Role');
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,7 @@ const { isActionDomainAllowed } = require('@librechat/api');
|
|||
const { actionDelimiter, EModelEndpoint, removeNullishValues } = require('librechat-data-provider');
|
||||
const { encryptMetadata, domainParser } = require('~/server/services/ActionService');
|
||||
const { getOpenAIClient } = require('~/server/controllers/assistants/helpers');
|
||||
const { updateAction, getActions, deleteAction } = require('~/models/Action');
|
||||
const { updateAssistantDoc, getAssistant } = require('~/models/Assistant');
|
||||
const db = require('~/models');
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
|
|
@ -51,9 +50,9 @@ router.post('/:assistant_id', async (req, res) => {
|
|||
|
||||
const { openai } = await getOpenAIClient({ req, res });
|
||||
|
||||
initialPromises.push(getAssistant({ assistant_id }));
|
||||
initialPromises.push(db.getAssistant({ assistant_id }));
|
||||
initialPromises.push(openai.beta.assistants.retrieve(assistant_id));
|
||||
!!_action_id && initialPromises.push(getActions({ action_id }, true));
|
||||
!!_action_id && initialPromises.push(db.getActions({ action_id }, true));
|
||||
|
||||
/** @type {[AssistantDocument, Assistant, [Action|undefined]]} */
|
||||
const [assistant_data, assistant, actions_result] = await Promise.all(initialPromises);
|
||||
|
|
@ -109,7 +108,7 @@ router.post('/:assistant_id', async (req, res) => {
|
|||
if (!assistant_data) {
|
||||
assistantUpdateData.user = req.user.id;
|
||||
}
|
||||
promises.push(updateAssistantDoc({ assistant_id }, assistantUpdateData));
|
||||
promises.push(db.updateAssistantDoc({ assistant_id }, assistantUpdateData));
|
||||
|
||||
// Only update user field for new actions
|
||||
const actionUpdateData = { metadata, assistant_id };
|
||||
|
|
@ -117,7 +116,7 @@ router.post('/:assistant_id', async (req, res) => {
|
|||
// For new actions, use the assistant owner's user ID
|
||||
actionUpdateData.user = assistant_user || req.user.id;
|
||||
}
|
||||
promises.push(updateAction({ action_id }, actionUpdateData));
|
||||
promises.push(db.updateAction({ action_id }, actionUpdateData));
|
||||
|
||||
/** @type {[AssistantDocument, Action]} */
|
||||
let [assistantDocument, updatedAction] = await Promise.all(promises);
|
||||
|
|
@ -159,7 +158,7 @@ router.delete('/:assistant_id/:action_id/:model', async (req, res) => {
|
|||
const { openai } = await getOpenAIClient({ req, res });
|
||||
|
||||
const initialPromises = [];
|
||||
initialPromises.push(getAssistant({ assistant_id }));
|
||||
initialPromises.push(db.getAssistant({ assistant_id }));
|
||||
initialPromises.push(openai.beta.assistants.retrieve(assistant_id));
|
||||
|
||||
/** @type {[AssistantDocument, Assistant]} */
|
||||
|
|
@ -195,8 +194,8 @@ router.delete('/:assistant_id/:action_id/:model', async (req, res) => {
|
|||
if (!assistant_data) {
|
||||
assistantUpdateData.user = req.user.id;
|
||||
}
|
||||
promises.push(updateAssistantDoc({ assistant_id }, assistantUpdateData));
|
||||
promises.push(deleteAction({ action_id }));
|
||||
promises.push(db.updateAssistantDoc({ assistant_id }, assistantUpdateData));
|
||||
promises.push(db.deleteAction({ action_id }));
|
||||
|
||||
await Promise.all(promises);
|
||||
res.status(200).json({ message: 'Action deleted successfully' });
|
||||
|
|
|
|||
|
|
@ -17,13 +17,14 @@ const {
|
|||
const { verify2FAWithTempToken } = require('~/server/controllers/auth/TwoFactorAuthController');
|
||||
const { logoutController } = require('~/server/controllers/auth/LogoutController');
|
||||
const { loginController } = require('~/server/controllers/auth/LoginController');
|
||||
const { findBalanceByUser, upsertBalanceFields } = require('~/models');
|
||||
const { getAppConfig } = require('~/server/services/Config');
|
||||
const middleware = require('~/server/middleware');
|
||||
const { Balance } = require('~/db/models');
|
||||
|
||||
const setBalanceConfig = createSetBalanceConfig({
|
||||
getAppConfig,
|
||||
Balance,
|
||||
findBalanceByUser,
|
||||
upsertBalanceFields,
|
||||
});
|
||||
|
||||
const router = express.Router();
|
||||
|
|
|
|||
|
|
@ -1,13 +1,15 @@
|
|||
const express = require('express');
|
||||
|
||||
const { getBanner } = require('~/models/Banner');
|
||||
const { logger } = require('@librechat/data-schemas');
|
||||
const optionalJwtAuth = require('~/server/middleware/optionalJwtAuth');
|
||||
const { getBanner } = require('~/models');
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
router.get('/', optionalJwtAuth, async (req, res) => {
|
||||
try {
|
||||
res.status(200).send(await getBanner(req.user));
|
||||
} catch (error) {
|
||||
logger.error('[getBanner] Error getting banner', error);
|
||||
res.status(500).json({ message: 'Error getting banner' });
|
||||
}
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
const express = require('express');
|
||||
const router = express.Router();
|
||||
const { requireJwtAuth } = require('~/server/middleware');
|
||||
const { getCategories } = require('~/models/Categories');
|
||||
const { getCategories } = require('~/models');
|
||||
|
||||
router.get('/', requireJwtAuth, async (req, res) => {
|
||||
try {
|
||||
|
|
|
|||
|
|
@ -10,14 +10,12 @@ const {
|
|||
createForkLimiters,
|
||||
configMiddleware,
|
||||
} = require('~/server/middleware');
|
||||
const { getConvosByCursor, deleteConvos, getConvo, saveConvo } = require('~/models/Conversation');
|
||||
const { forkConversation, duplicateConversation } = require('~/server/utils/import/fork');
|
||||
const { storage, importFileFilter } = require('~/server/routes/files/multer');
|
||||
const { deleteAllSharedLinks, deleteConvoSharedLink } = require('~/models');
|
||||
const requireJwtAuth = require('~/server/middleware/requireJwtAuth');
|
||||
const { importConversations } = require('~/server/utils/import');
|
||||
const { deleteToolCalls } = require('~/models/ToolCall');
|
||||
const getLogStores = require('~/cache/getLogStores');
|
||||
const db = require('~/models');
|
||||
|
||||
const assistantClients = {
|
||||
[EModelEndpoint.azureAssistants]: require('~/server/services/Endpoints/azureAssistants'),
|
||||
|
|
@ -41,7 +39,7 @@ router.get('/', async (req, res) => {
|
|||
}
|
||||
|
||||
try {
|
||||
const result = await getConvosByCursor(req.user.id, {
|
||||
const result = await db.getConvosByCursor(req.user.id, {
|
||||
cursor,
|
||||
limit,
|
||||
isArchived,
|
||||
|
|
@ -59,7 +57,7 @@ router.get('/', async (req, res) => {
|
|||
|
||||
router.get('/:conversationId', async (req, res) => {
|
||||
const { conversationId } = req.params;
|
||||
const convo = await getConvo(req.user.id, conversationId);
|
||||
const convo = await db.getConvo(req.user.id, conversationId);
|
||||
|
||||
if (convo) {
|
||||
res.status(200).json(convo);
|
||||
|
|
@ -128,10 +126,10 @@ router.delete('/', async (req, res) => {
|
|||
}
|
||||
|
||||
try {
|
||||
const dbResponse = await deleteConvos(req.user.id, filter);
|
||||
const dbResponse = await db.deleteConvos(req.user.id, filter);
|
||||
if (filter.conversationId) {
|
||||
await deleteToolCalls(req.user.id, filter.conversationId);
|
||||
await deleteConvoSharedLink(req.user.id, filter.conversationId);
|
||||
await db.deleteToolCalls(req.user.id, filter.conversationId);
|
||||
await db.deleteConvoSharedLink(req.user.id, filter.conversationId);
|
||||
}
|
||||
res.status(201).json(dbResponse);
|
||||
} catch (error) {
|
||||
|
|
@ -142,9 +140,9 @@ router.delete('/', async (req, res) => {
|
|||
|
||||
router.delete('/all', async (req, res) => {
|
||||
try {
|
||||
const dbResponse = await deleteConvos(req.user.id, {});
|
||||
await deleteToolCalls(req.user.id);
|
||||
await deleteAllSharedLinks(req.user.id);
|
||||
const dbResponse = await db.deleteConvos(req.user.id, {});
|
||||
await db.deleteToolCalls(req.user.id);
|
||||
await db.deleteAllSharedLinks(req.user.id);
|
||||
res.status(201).json(dbResponse);
|
||||
} catch (error) {
|
||||
logger.error('Error clearing conversations', error);
|
||||
|
|
@ -171,8 +169,12 @@ router.post('/archive', validateConvoAccess, async (req, res) => {
|
|||
}
|
||||
|
||||
try {
|
||||
const dbResponse = await saveConvo(
|
||||
req,
|
||||
const dbResponse = await db.saveConvo(
|
||||
{
|
||||
userId: req?.user?.id,
|
||||
isTemporary: req?.body?.isTemporary,
|
||||
interfaceConfig: req?.config?.interfaceConfig,
|
||||
},
|
||||
{ conversationId, isArchived },
|
||||
{ context: `POST /api/convos/archive ${conversationId}` },
|
||||
);
|
||||
|
|
@ -211,8 +213,12 @@ router.post('/update', validateConvoAccess, async (req, res) => {
|
|||
const sanitizedTitle = title.trim().slice(0, MAX_CONVO_TITLE_LENGTH);
|
||||
|
||||
try {
|
||||
const dbResponse = await saveConvo(
|
||||
req,
|
||||
const dbResponse = await db.saveConvo(
|
||||
{
|
||||
userId: req?.user?.id,
|
||||
isTemporary: req?.body?.isTemporary,
|
||||
interfaceConfig: req?.config?.interfaceConfig,
|
||||
},
|
||||
{ conversationId, title: sanitizedTitle },
|
||||
{ context: `POST /api/convos/update ${conversationId}` },
|
||||
);
|
||||
|
|
|
|||
|
|
@ -10,8 +10,7 @@ const {
|
|||
ResourceType,
|
||||
PrincipalType,
|
||||
} = require('librechat-data-provider');
|
||||
const { createAgent } = require('~/models/Agent');
|
||||
const { createFile } = require('~/models');
|
||||
const { createAgent, createFile } = require('~/models');
|
||||
|
||||
// Only mock the external dependencies that we don't want to test
|
||||
jest.mock('~/server/services/Files/process', () => ({
|
||||
|
|
|
|||
|
|
@ -27,25 +27,23 @@ const { checkPermission } = require('~/server/services/PermissionService');
|
|||
const { loadAuthValues } = require('~/server/services/Tools/credentials');
|
||||
const { refreshS3FileUrls } = require('~/server/services/Files/S3/crud');
|
||||
const { hasAccessToFilesViaAgent } = require('~/server/services/Files');
|
||||
const { getFiles, batchUpdateFiles } = require('~/models');
|
||||
const { cleanFileName } = require('~/server/utils/files');
|
||||
const { getAssistant } = require('~/models/Assistant');
|
||||
const { getAgent } = require('~/models/Agent');
|
||||
const { getLogStores } = require('~/cache');
|
||||
const { Readable } = require('stream');
|
||||
const db = require('~/models');
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
router.get('/', async (req, res) => {
|
||||
try {
|
||||
const appConfig = req.config;
|
||||
const files = await getFiles({ user: req.user.id });
|
||||
const files = await db.getFiles({ user: req.user.id });
|
||||
if (appConfig.fileStrategy === FileSources.s3) {
|
||||
try {
|
||||
const cache = getLogStores(CacheKeys.S3_EXPIRY_INTERVAL);
|
||||
const alreadyChecked = await cache.get(req.user.id);
|
||||
if (!alreadyChecked) {
|
||||
await refreshS3FileUrls(files, batchUpdateFiles);
|
||||
await refreshS3FileUrls(files, db.batchUpdateFiles);
|
||||
await cache.set(req.user.id, true, Time.THIRTY_MINUTES);
|
||||
}
|
||||
} catch (error) {
|
||||
|
|
@ -74,7 +72,7 @@ router.get('/agent/:agent_id', async (req, res) => {
|
|||
return res.status(400).json({ error: 'Agent ID is required' });
|
||||
}
|
||||
|
||||
const agent = await getAgent({ id: agent_id });
|
||||
const agent = await db.getAgent({ id: agent_id });
|
||||
if (!agent) {
|
||||
return res.status(200).json([]);
|
||||
}
|
||||
|
|
@ -106,7 +104,7 @@ router.get('/agent/:agent_id', async (req, res) => {
|
|||
return res.status(200).json([]);
|
||||
}
|
||||
|
||||
const files = await getFiles({ file_id: { $in: agentFileIds } }, null, { text: 0 });
|
||||
const files = await db.getFiles({ file_id: { $in: agentFileIds } }, null, { text: 0 });
|
||||
|
||||
res.status(200).json(files);
|
||||
} catch (error) {
|
||||
|
|
@ -151,7 +149,7 @@ router.delete('/', async (req, res) => {
|
|||
}
|
||||
|
||||
const fileIds = files.map((file) => file.file_id);
|
||||
const dbFiles = await getFiles({ file_id: { $in: fileIds } });
|
||||
const dbFiles = await db.getFiles({ file_id: { $in: fileIds } });
|
||||
|
||||
const ownedFiles = [];
|
||||
const nonOwnedFiles = [];
|
||||
|
|
@ -209,7 +207,7 @@ router.delete('/', async (req, res) => {
|
|||
|
||||
/* Handle agent unlinking even if no valid files to delete */
|
||||
if (req.body.agent_id && req.body.tool_resource && dbFiles.length === 0) {
|
||||
const agent = await getAgent({
|
||||
const agent = await db.getAgent({
|
||||
id: req.body.agent_id,
|
||||
});
|
||||
|
||||
|
|
@ -223,7 +221,7 @@ router.delete('/', async (req, res) => {
|
|||
|
||||
/* Handle assistant unlinking even if no valid files to delete */
|
||||
if (req.body.assistant_id && req.body.tool_resource && dbFiles.length === 0) {
|
||||
const assistant = await getAssistant({
|
||||
const assistant = await db.getAssistant({
|
||||
id: req.body.assistant_id,
|
||||
});
|
||||
|
||||
|
|
@ -393,7 +391,7 @@ router.post('/', async (req, res) => {
|
|||
|
||||
/** Admin users bypass permission checks */
|
||||
if (req.user.role !== SystemRoles.ADMIN) {
|
||||
const agent = await getAgent({ id: metadata.agent_id });
|
||||
const agent = await db.getAgent({ id: metadata.agent_id });
|
||||
|
||||
if (!agent) {
|
||||
return res.status(404).json({
|
||||
|
|
|
|||
|
|
@ -10,8 +10,7 @@ const {
|
|||
AccessRoleIds,
|
||||
PrincipalType,
|
||||
} = require('librechat-data-provider');
|
||||
const { createAgent } = require('~/models/Agent');
|
||||
const { createFile } = require('~/models');
|
||||
const { createAgent, createFile } = require('~/models');
|
||||
|
||||
// Only mock the external dependencies that we don't want to test
|
||||
jest.mock('~/server/services/Files/process', () => ({
|
||||
|
|
|
|||
|
|
@ -37,13 +37,11 @@ const {
|
|||
} = require('~/config');
|
||||
const { getMCPSetupData, getServerConnectionStatus } = require('~/server/services/MCP');
|
||||
const { requireJwtAuth, canAccessMCPServerResource } = require('~/server/middleware');
|
||||
const { findToken, updateToken, createToken, deleteTokens } = require('~/models');
|
||||
const { getUserPluginAuthValue } = require('~/server/services/PluginService');
|
||||
const { updateMCPServerTools } = require('~/server/services/Config/mcp');
|
||||
const { reinitMCPServer } = require('~/server/services/Tools/mcp');
|
||||
const { findPluginAuthsByKeys } = require('~/models');
|
||||
const { getRoleByName } = require('~/models/Role');
|
||||
const { getLogStores } = require('~/cache');
|
||||
const db = require('~/models');
|
||||
|
||||
const router = Router();
|
||||
|
||||
|
|
@ -206,9 +204,9 @@ router.get('/:serverName/oauth/callback', async (req, res) => {
|
|||
userId: flowState.userId,
|
||||
serverName,
|
||||
tokens,
|
||||
createToken,
|
||||
updateToken,
|
||||
findToken,
|
||||
createToken: db.createToken,
|
||||
updateToken: db.updateToken,
|
||||
findToken: db.findToken,
|
||||
clientInfo: flowState.clientInfo,
|
||||
metadata: flowState.metadata,
|
||||
});
|
||||
|
|
@ -246,10 +244,10 @@ router.get('/:serverName/oauth/callback', async (req, res) => {
|
|||
serverName,
|
||||
flowManager,
|
||||
tokenMethods: {
|
||||
findToken,
|
||||
updateToken,
|
||||
createToken,
|
||||
deleteTokens,
|
||||
findToken: db.findToken,
|
||||
updateToken: db.updateToken,
|
||||
createToken: db.createToken,
|
||||
deleteTokens: db.deleteTokens,
|
||||
},
|
||||
});
|
||||
|
||||
|
|
@ -466,7 +464,7 @@ router.post('/:serverName/reinitialize', requireJwtAuth, setOAuthSession, async
|
|||
userMCPAuthMap = await getUserMCPAuthMap({
|
||||
userId: user.id,
|
||||
servers: [serverName],
|
||||
findPluginAuthsByKeys,
|
||||
findPluginAuthsByKeys: db.findPluginAuthsByKeys,
|
||||
});
|
||||
}
|
||||
|
||||
|
|
@ -666,13 +664,13 @@ MCP Server CRUD Routes (User-Managed MCP Servers)
|
|||
const checkMCPUsePermissions = generateCheckAccess({
|
||||
permissionType: PermissionTypes.MCP_SERVERS,
|
||||
permissions: [Permissions.USE],
|
||||
getRoleByName,
|
||||
getRoleByName: db.getRoleByName,
|
||||
});
|
||||
|
||||
const checkMCPCreate = generateCheckAccess({
|
||||
permissionType: PermissionTypes.MCP_SERVERS,
|
||||
permissions: [Permissions.USE, Permissions.CREATE],
|
||||
getRoleByName,
|
||||
getRoleByName: db.getRoleByName,
|
||||
});
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -4,12 +4,12 @@ const { PermissionTypes, Permissions } = require('librechat-data-provider');
|
|||
const {
|
||||
getAllUserMemories,
|
||||
toggleUserMemories,
|
||||
getRoleByName,
|
||||
createMemory,
|
||||
deleteMemory,
|
||||
setMemory,
|
||||
} = require('~/models');
|
||||
const { requireJwtAuth, configMiddleware } = require('~/server/middleware');
|
||||
const { getRoleByName } = require('~/models/Role');
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
|
|
|
|||
|
|
@ -3,18 +3,9 @@ const { v4: uuidv4 } = require('uuid');
|
|||
const { logger } = require('@librechat/data-schemas');
|
||||
const { ContentTypes } = require('librechat-data-provider');
|
||||
const { unescapeLaTeX, countTokens } = require('@librechat/api');
|
||||
const {
|
||||
saveConvo,
|
||||
getMessage,
|
||||
saveMessage,
|
||||
getMessages,
|
||||
updateMessage,
|
||||
deleteMessages,
|
||||
} = require('~/models');
|
||||
const { findAllArtifacts, replaceArtifactContent } = require('~/server/services/Artifacts/update');
|
||||
const { requireJwtAuth, validateMessageReq } = require('~/server/middleware');
|
||||
const { getConvosQueried } = require('~/models/Conversation');
|
||||
const { Message } = require('~/db/models');
|
||||
const db = require('~/models');
|
||||
|
||||
const router = express.Router();
|
||||
router.use(requireJwtAuth);
|
||||
|
|
@ -40,34 +31,19 @@ router.get('/', async (req, res) => {
|
|||
const sortOrder = sortDirection === 'asc' ? 1 : -1;
|
||||
|
||||
if (conversationId && messageId) {
|
||||
const message = await Message.findOne({
|
||||
conversationId,
|
||||
messageId,
|
||||
user: user,
|
||||
}).lean();
|
||||
response = { messages: message ? [message] : [], nextCursor: null };
|
||||
const messages = await db.getMessages({ conversationId, messageId, user });
|
||||
response = { messages: messages?.length ? [messages[0]] : [], nextCursor: null };
|
||||
} else if (conversationId) {
|
||||
const filter = { conversationId, user: user };
|
||||
if (cursor) {
|
||||
filter[sortField] = sortOrder === 1 ? { $gt: cursor } : { $lt: cursor };
|
||||
}
|
||||
const messages = await Message.find(filter)
|
||||
.sort({ [sortField]: sortOrder })
|
||||
.limit(pageSize + 1)
|
||||
.lean();
|
||||
let nextCursor = null;
|
||||
if (messages.length > pageSize) {
|
||||
messages.pop(); // Remove extra item used to detect next page
|
||||
// Create cursor from the last RETURNED item (not the popped one)
|
||||
nextCursor = messages[messages.length - 1][sortField];
|
||||
}
|
||||
response = { messages, nextCursor };
|
||||
response = await db.getMessagesByCursor(
|
||||
{ conversationId, user },
|
||||
{ sortField, sortOrder, limit: pageSize, cursor },
|
||||
);
|
||||
} else if (search) {
|
||||
const searchResults = await Message.meiliSearch(search, { filter: `user = "${user}"` }, true);
|
||||
const searchResults = await db.searchMessages(search, { filter: `user = "${user}"` }, true);
|
||||
|
||||
const messages = searchResults.hits || [];
|
||||
|
||||
const result = await getConvosQueried(req.user.id, messages, cursor);
|
||||
const result = await db.getConvosQueried(req.user.id, messages, cursor);
|
||||
|
||||
const messageIds = [];
|
||||
const cleanedMessages = [];
|
||||
|
|
@ -79,7 +55,7 @@ router.get('/', async (req, res) => {
|
|||
}
|
||||
}
|
||||
|
||||
const dbMessages = await getMessages({
|
||||
const dbMessages = await db.getMessages({
|
||||
user,
|
||||
messageId: { $in: messageIds },
|
||||
});
|
||||
|
|
@ -136,7 +112,7 @@ router.post('/branch', async (req, res) => {
|
|||
return res.status(400).json({ error: 'messageId and agentId are required' });
|
||||
}
|
||||
|
||||
const sourceMessage = await getMessage({ user: userId, messageId });
|
||||
const sourceMessage = await db.getMessage({ user: userId, messageId });
|
||||
if (!sourceMessage) {
|
||||
return res.status(404).json({ error: 'Source message not found' });
|
||||
}
|
||||
|
|
@ -187,9 +163,15 @@ router.post('/branch', async (req, res) => {
|
|||
user: userId,
|
||||
};
|
||||
|
||||
const savedMessage = await saveMessage(req, newMessage, {
|
||||
context: 'POST /api/messages/branch',
|
||||
});
|
||||
const savedMessage = await db.saveMessage(
|
||||
{
|
||||
userId: req?.user?.id,
|
||||
isTemporary: req?.body?.isTemporary,
|
||||
interfaceConfig: req?.config?.interfaceConfig,
|
||||
},
|
||||
newMessage,
|
||||
{ context: 'POST /api/messages/branch' },
|
||||
);
|
||||
|
||||
if (!savedMessage) {
|
||||
return res.status(500).json({ error: 'Failed to save branch message' });
|
||||
|
|
@ -211,7 +193,7 @@ router.post('/artifact/:messageId', async (req, res) => {
|
|||
return res.status(400).json({ error: 'Invalid request parameters' });
|
||||
}
|
||||
|
||||
const message = await getMessage({ user: req.user.id, messageId });
|
||||
const message = await db.getMessage({ user: req.user.id, messageId });
|
||||
if (!message) {
|
||||
return res.status(404).json({ error: 'Message not found' });
|
||||
}
|
||||
|
|
@ -256,8 +238,12 @@ router.post('/artifact/:messageId', async (req, res) => {
|
|||
return res.status(400).json({ error: 'Original content not found in target artifact' });
|
||||
}
|
||||
|
||||
const savedMessage = await saveMessage(
|
||||
req,
|
||||
const savedMessage = await db.saveMessage(
|
||||
{
|
||||
userId: req?.user?.id,
|
||||
isTemporary: req?.body?.isTemporary,
|
||||
interfaceConfig: req?.config?.interfaceConfig,
|
||||
},
|
||||
{
|
||||
messageId,
|
||||
conversationId: message.conversationId,
|
||||
|
|
@ -283,7 +269,7 @@ router.post('/artifact/:messageId', async (req, res) => {
|
|||
router.get('/:conversationId', validateMessageReq, async (req, res) => {
|
||||
try {
|
||||
const { conversationId } = req.params;
|
||||
const messages = await getMessages({ conversationId }, '-_id -__v -user');
|
||||
const messages = await db.getMessages({ conversationId }, '-_id -__v -user');
|
||||
res.status(200).json(messages);
|
||||
} catch (error) {
|
||||
logger.error('Error fetching messages:', error);
|
||||
|
|
@ -294,15 +280,20 @@ router.get('/:conversationId', validateMessageReq, async (req, res) => {
|
|||
router.post('/:conversationId', validateMessageReq, async (req, res) => {
|
||||
try {
|
||||
const message = req.body;
|
||||
const savedMessage = await saveMessage(
|
||||
req,
|
||||
const reqCtx = {
|
||||
userId: req?.user?.id,
|
||||
isTemporary: req?.body?.isTemporary,
|
||||
interfaceConfig: req?.config?.interfaceConfig,
|
||||
};
|
||||
const savedMessage = await db.saveMessage(
|
||||
reqCtx,
|
||||
{ ...message, user: req.user.id },
|
||||
{ context: 'POST /api/messages/:conversationId' },
|
||||
);
|
||||
if (!savedMessage) {
|
||||
return res.status(400).json({ error: 'Message not saved' });
|
||||
}
|
||||
await saveConvo(req, savedMessage, { context: 'POST /api/messages/:conversationId' });
|
||||
await db.saveConvo(reqCtx, savedMessage, { context: 'POST /api/messages/:conversationId' });
|
||||
res.status(201).json(savedMessage);
|
||||
} catch (error) {
|
||||
logger.error('Error saving message:', error);
|
||||
|
|
@ -313,7 +304,7 @@ router.post('/:conversationId', validateMessageReq, async (req, res) => {
|
|||
router.get('/:conversationId/:messageId', validateMessageReq, async (req, res) => {
|
||||
try {
|
||||
const { conversationId, messageId } = req.params;
|
||||
const message = await getMessages({ conversationId, messageId }, '-_id -__v -user');
|
||||
const message = await db.getMessages({ conversationId, messageId }, '-_id -__v -user');
|
||||
if (!message) {
|
||||
return res.status(404).json({ error: 'Message not found' });
|
||||
}
|
||||
|
|
@ -331,7 +322,7 @@ router.put('/:conversationId/:messageId', validateMessageReq, async (req, res) =
|
|||
|
||||
if (index === undefined) {
|
||||
const tokenCount = await countTokens(text, model);
|
||||
const result = await updateMessage(req, { messageId, text, tokenCount });
|
||||
const result = await db.updateMessage(req?.user?.id, { messageId, text, tokenCount });
|
||||
return res.status(200).json(result);
|
||||
}
|
||||
|
||||
|
|
@ -339,7 +330,9 @@ router.put('/:conversationId/:messageId', validateMessageReq, async (req, res) =
|
|||
return res.status(400).json({ error: 'Invalid index' });
|
||||
}
|
||||
|
||||
const message = (await getMessages({ conversationId, messageId }, 'content tokenCount'))?.[0];
|
||||
const message = (
|
||||
await db.getMessages({ conversationId, messageId }, 'content tokenCount')
|
||||
)?.[0];
|
||||
if (!message) {
|
||||
return res.status(404).json({ error: 'Message not found' });
|
||||
}
|
||||
|
|
@ -369,7 +362,11 @@ router.put('/:conversationId/:messageId', validateMessageReq, async (req, res) =
|
|||
tokenCount = Math.max(0, tokenCount - oldTokenCount) + newTokenCount;
|
||||
}
|
||||
|
||||
const result = await updateMessage(req, { messageId, content: updatedContent, tokenCount });
|
||||
const result = await db.updateMessage(req?.user?.id, {
|
||||
messageId,
|
||||
content: updatedContent,
|
||||
tokenCount,
|
||||
});
|
||||
return res.status(200).json(result);
|
||||
} catch (error) {
|
||||
logger.error('Error updating message:', error);
|
||||
|
|
@ -382,8 +379,8 @@ router.put('/:conversationId/:messageId/feedback', validateMessageReq, async (re
|
|||
const { conversationId, messageId } = req.params;
|
||||
const { feedback } = req.body;
|
||||
|
||||
const updatedMessage = await updateMessage(
|
||||
req,
|
||||
const updatedMessage = await db.updateMessage(
|
||||
req?.user?.id,
|
||||
{
|
||||
messageId,
|
||||
feedback: feedback || null,
|
||||
|
|
@ -405,7 +402,7 @@ router.put('/:conversationId/:messageId/feedback', validateMessageReq, async (re
|
|||
router.delete('/:conversationId/:messageId', validateMessageReq, async (req, res) => {
|
||||
try {
|
||||
const { messageId } = req.params;
|
||||
await deleteMessages({ messageId });
|
||||
await db.deleteMessages({ messageId });
|
||||
res.status(204).send();
|
||||
} catch (error) {
|
||||
logger.error('Error deleting message:', error);
|
||||
|
|
|
|||
|
|
@ -7,12 +7,13 @@ const { ErrorTypes } = require('librechat-data-provider');
|
|||
const { createSetBalanceConfig } = require('@librechat/api');
|
||||
const { checkDomainAllowed, loginLimiter, logHeaders } = require('~/server/middleware');
|
||||
const { createOAuthHandler } = require('~/server/controllers/auth/oauth');
|
||||
const { findBalanceByUser, upsertBalanceFields } = require('~/models');
|
||||
const { getAppConfig } = require('~/server/services/Config');
|
||||
const { Balance } = require('~/db/models');
|
||||
|
||||
const setBalanceConfig = createSetBalanceConfig({
|
||||
getAppConfig,
|
||||
Balance,
|
||||
findBalanceByUser,
|
||||
upsertBalanceFields,
|
||||
});
|
||||
|
||||
const router = express.Router();
|
||||
|
|
|
|||
|
|
@ -25,11 +25,12 @@ const {
|
|||
deletePromptGroup,
|
||||
createPromptGroup,
|
||||
getPromptGroup,
|
||||
getRoleByName,
|
||||
deletePrompt,
|
||||
getPrompts,
|
||||
savePrompt,
|
||||
getPrompt,
|
||||
} = require('~/models/Prompt');
|
||||
} = require('~/models');
|
||||
const {
|
||||
canAccessPromptGroupResource,
|
||||
canAccessPromptViaGroup,
|
||||
|
|
@ -41,7 +42,6 @@ const {
|
|||
findAccessibleResources,
|
||||
grantPermission,
|
||||
} = require('~/server/services/PermissionService');
|
||||
const { getRoleByName } = require('~/models/Role');
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
|
|
|
|||
|
|
@ -16,9 +16,22 @@ jest.mock('~/server/services/Config', () => ({
|
|||
getCachedTools: jest.fn().mockResolvedValue({}),
|
||||
}));
|
||||
|
||||
jest.mock('~/models/Role', () => ({
|
||||
getRoleByName: jest.fn(),
|
||||
}));
|
||||
jest.mock('~/models', () => {
|
||||
const mongoose = require('mongoose');
|
||||
const { createMethods } = require('@librechat/data-schemas');
|
||||
const methods = createMethods(mongoose, {
|
||||
removeAllPermissions: async ({ resourceType, resourceId }) => {
|
||||
const AclEntry = mongoose.models.AclEntry;
|
||||
if (AclEntry) {
|
||||
await AclEntry.deleteMany({ resourceType, resourceId });
|
||||
}
|
||||
},
|
||||
});
|
||||
return {
|
||||
...methods,
|
||||
getRoleByName: jest.fn(),
|
||||
};
|
||||
});
|
||||
|
||||
jest.mock('~/server/middleware', () => ({
|
||||
requireJwtAuth: (req, res, next) => next(),
|
||||
|
|
@ -153,7 +166,7 @@ async function setupTestData() {
|
|||
};
|
||||
|
||||
// Mock getRoleByName
|
||||
const { getRoleByName } = require('~/models/Role');
|
||||
const { getRoleByName } = require('~/models');
|
||||
getRoleByName.mockImplementation((roleName) => {
|
||||
switch (roleName) {
|
||||
case SystemRoles.USER:
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@ const {
|
|||
remoteAgentsPermissionsSchema,
|
||||
} = require('librechat-data-provider');
|
||||
const { checkAdmin, requireJwtAuth } = require('~/server/middleware');
|
||||
const { updateRoleByName, getRoleByName } = require('~/models/Role');
|
||||
const { updateRoleByName, getRoleByName } = require('~/models');
|
||||
|
||||
const router = express.Router();
|
||||
router.use(requireJwtAuth);
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@ const {
|
|||
createConversationTag,
|
||||
deleteConversationTag,
|
||||
getConversationTags,
|
||||
} = require('~/models/ConversationTag');
|
||||
getRoleByName,
|
||||
} = require('~/models');
|
||||
const { requireJwtAuth } = require('~/server/middleware');
|
||||
const { getRoleByName } = require('~/models/Role');
|
||||
|
||||
const router = express.Router();
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue