refactor(db): streamline model imports and remove unused model exports

- Removed the export of models from the database connection module to simplify the structure.
- Updated various files to import models directly from the new centralized models module.
- Ensured consistency across the codebase by replacing mongoose model references with the new import paths.
This commit is contained in:
Danny Avila 2025-05-30 13:13:10 -04:00
parent eb368fcb70
commit 20ad7d52f3
No known key found for this signature in database
GPG key ID: BF31EEB2C5CA0956
46 changed files with 61 additions and 66 deletions

View file

@ -1,5 +1,5 @@
const mongoose = require('mongoose');
const Action = mongoose.models.Action;
const Action = require('~/db/models').Action;
/**
* Update an action with new data without overwriting existing properties,

View file

@ -14,7 +14,7 @@ const {
const getLogStores = require('~/cache/getLogStores');
const { getActions } = require('./Action');
const Agent = mongoose.models.Agent;
const Agent = require('~/db/models').Agent;
/**
* Create an agent with the provided data.

View file

@ -21,7 +21,7 @@ const {
removeAgentResourceFiles,
} = require('./Agent');
const Agent = mongoose.models.Agent;
const Agent = require('~/db/models').Agent;
describe('Agent Resource File Operations', () => {
let mongoServer;

View file

@ -1,5 +1,5 @@
const mongoose = require('mongoose');
const Assistant = mongoose.models.Assistant;
const Assistant = require('~/db/models').Assistant;
/**
* Update an assistant with new data without overwriting existing properties,

View file

@ -1,7 +1,7 @@
const mongoose = require('mongoose');
const { logger } = require('@librechat/data-schemas');
const Banner = mongoose.models.Banner;
const Banner = require('~/db/models').Banner;
/**
* Retrieves the current active banner.

View file

@ -2,7 +2,7 @@ const mongoose = require('mongoose');
const { logger } = require('@librechat/data-schemas');
const { getMessages, deleteMessages } = require('./Message');
const Conversation = mongoose.models.Conversation;
const Conversation = require('~/db/models').Conversation;
/**
* Searches for a conversation by conversationId and returns a lean document with only conversationId and user.

View file

@ -1,8 +1,8 @@
const mongoose = require('mongoose');
const { logger } = require('@librechat/data-schemas');
const ConversationTag = mongoose.models.ConversationTag;
const Conversation = mongoose.models.Conversation;
const ConversationTag = require('~/db/models').ConversationTag;
const Conversation = require('~/db/models').Conversation;
/**
* Retrieves all conversation tags for a user.

View file

@ -2,7 +2,7 @@ const mongoose = require('mongoose');
const { logger } = require('@librechat/data-schemas');
const { EToolResources } = require('librechat-data-provider');
const File = mongoose.models.File;
const File = require('~/db/models').File;
/**
* Finds a file by its file_id with additional query options.

View file

@ -2,7 +2,7 @@ const { z } = require('zod');
const mongoose = require('mongoose');
const { logger } = require('@librechat/data-schemas');
const Message = mongoose.models.Message;
const Message = require('~/db/models').Message;
const idSchema = z.string().uuid();
/**

View file

@ -1,7 +1,7 @@
const mongoose = require('mongoose');
const { logger } = require('@librechat/data-schemas');
const Preset = mongoose.models.Preset;
const Preset = require('~/db/models').Preset;
const getPreset = async (user, presetId) => {
try {

View file

@ -1,7 +1,7 @@
const mongoose = require('mongoose');
const { GLOBAL_PROJECT_NAME } = require('librechat-data-provider').Constants;
const Project = mongoose.models.Project;
const Project = require('~/db/models').Project;
/**
* Retrieve a project by ID and convert the found project document to a plain object.

View file

@ -10,8 +10,8 @@ const {
} = require('./Project');
const { escapeRegExp } = require('~/server/utils');
const PromptGroup = mongoose.models.PromptGroup;
const Prompt = mongoose.models.Prompt;
const PromptGroup = require('~/db/models').PromptGroup;
const Prompt = require('~/db/models').Prompt;
/**
* Create a pipeline for the aggregation to get prompt groups

View file

@ -10,7 +10,7 @@ const mongoose = require('mongoose');
const { logger } = require('@librechat/data-schemas');
const getLogStores = require('~/cache/getLogStores');
const Role = mongoose.models.Role;
const Role = require('~/db/models').Role;
/**
* Retrieve a role by name and convert the found role document to a plain object.

View file

@ -9,7 +9,7 @@ const {
const { getRoleByName, updateAccessPermissions, initializeRoles } = require('~/models/Role');
const getLogStores = require('~/cache/getLogStores');
const Role = mongoose.models.Role;
const Role = require('~/db/models').Role;
// Mock the cache
jest.mock('~/cache/getLogStores', () =>

View file

@ -4,8 +4,8 @@ const { Constants } = require('librechat-data-provider');
const { logger } = require('@librechat/data-schemas');
const { getMessages } = require('./Message');
const Conversation = mongoose.models.Conversation;
const SharedLink = mongoose.models.SharedLink;
const Conversation = require('~/db/models').Conversation;
const SharedLink = require('~/db/models').SharedLink;
class ShareServiceError extends Error {
constructor(message, code) {

View file

@ -1,7 +1,7 @@
const mongoose = require('mongoose');
const { encryptV2 } = require('~/server/utils/crypto');
const Token = mongoose.models.Token;
const Token = require('~/db/models').Token;
/**
* Handles the OAuth token by creating or updating the token.

View file

@ -1,6 +1,6 @@
const mongoose = require('mongoose');
const ToolCall = mongoose.models.ToolCall;
const ToolCall = require('~/db/models').ToolCall;
/**
* Create a new tool call

View file

@ -3,8 +3,8 @@ const { logger } = require('@librechat/data-schemas');
const { getBalanceConfig } = require('~/server/services/Config');
const { getMultiplier, getCacheMultiplier } = require('./tx');
const Transaction = mongoose.models.Transaction;
const Balance = mongoose.models.Balance;
const Transaction = require('~/db/models').Transaction;
const Balance = require('~/db/models').Balance;
const cancelRate = 1.15;

View file

@ -4,7 +4,7 @@ const { spendTokens, spendStructuredTokens } = require('./spendTokens');
const { getBalanceConfig } = require('~/server/services/Config');
const { getMultiplier, getCacheMultiplier } = require('./tx');
const { createTransaction } = require('./Transaction');
const Balance = mongoose.models.Balance;
const Balance = require('~/db/models').Balance;
// Mock the custom config module so we can control the balance flag.
jest.mock('~/server/services/Config');

View file

@ -5,7 +5,7 @@ const { createAutoRefillTransaction } = require('./Transaction');
const { logViolation } = require('~/cache');
const { getMultiplier } = require('./tx');
const Balance = mongoose.models.Balance;
const Balance = require('~/db/models').Balance;
function isInvalidDate(date) {
return isNaN(date);

View file

@ -2,7 +2,7 @@ const mongoose = require('mongoose');
const { MongoMemoryServer } = require('mongodb-memory-server');
const { getMessages, bulkSaveMessages } = require('./Message');
const Message = mongoose.models.Message;
const Message = require('~/db/models').Message;
// Original version of buildTree function
function buildTree({ messages, fileMap }) {

View file

@ -2,7 +2,7 @@ const mongoose = require('mongoose');
const { logger } = require('@librechat/data-schemas');
const { getRandomValues, hashToken } = require('~/server/utils/crypto');
const Token = mongoose.models.Token;
const Token = require('~/db/models').Token;
/**
* @module inviteUser

View file

@ -1,5 +1,4 @@
const { logger } = require('~/config');
const db = require('db/connect');
const { createTransaction, createStructuredTransaction } = require('./Transaction');
/**
* Creates up to two transactions to record the spending of tokens.

View file

@ -2,8 +2,8 @@ const mongoose = require('mongoose');
const { MongoMemoryServer } = require('mongodb-memory-server');
const { spendTokens, spendStructuredTokens } = require('./spendTokens');
const { createTransaction, createAutoRefillTransaction } = require('./Transaction');
const Transaction = mongoose.models.Transaction;
const Balance = mongoose.models.Balance;
const Transaction = require('~/db/models').Transaction;
const Balance = require('~/db/models').Balance;
// Mock the logger to prevent console output during tests
jest.mock('~/config', () => ({