WIP: first pass, massive refactor of model imports

api/server/controllers/AuthController.js

@@ -1,7 +1,8 @@
 const cookies = require('cookie');
 const jwt = require('jsonwebtoken');
+const mongoose = require('mongoose');
 const openIdClient = require('openid-client');
-const { User, Session, logger } = require('@librechat/data-schemas');
+const { logger } = require('@librechat/data-schemas');
 const {
   registerUser,
   resetPassword,
@@ -12,6 +13,9 @@ const {
 const { getOpenIdConfig } = require('~/strategies');
 const { isEnabled } = require('~/server/utils');
 
+const Session = mongoose.models.Session;
+const User = mongoose.models.User;
+
 const registrationController = async (req, res) => {
   try {
     const response = await registerUser(req.body);

api/server/controllers/Balance.js

@@ -1,4 +1,7 @@
-const { Balance } = require('@librechat/data-schemas');
+const mongoose = require('mongoose');
+
+const Balance = mongoose.models.Balance;
+
 async function balanceController(req, res) {
   const balanceData = await Balance.findOne(
     { user: req.user.id },

api/server/controllers/TwoFactorController.js

@@ -1,4 +1,5 @@
-const { User, logger } = require('@librechat/data-schemas');
+const mongoose = require('mongoose');
+const { logger } = require('@librechat/data-schemas');
 const {
   generateTOTPSecret,
   generateBackupCodes,
@@ -9,6 +10,8 @@ const {
 const { encryptV3 } = require('~/server/utils/crypto');
 const safeAppTitle = (process.env.APP_TITLE || 'LibreChat').replace(/\s+/g, '');
 
+const User = mongoose.models.User;
+
 /**
  * Enable 2FA for the user by generating a new TOTP secret and backup codes.
  * The secret is encrypted and stored, and 2FA is marked as disabled until confirmed.

api/server/controllers/UserController.js

@@ -4,7 +4,8 @@ const {
   webSearchKeys,
   extractWebSearchEnvVars,
 } = require('librechat-data-provider');
-const { User, Session, Transaction, Balance, logger } = require('@librechat/data-schemas');
+const mongoose = require('mongoose');
+const { logger } = require('@librechat/data-schemas');
 const { getFiles, deleteFiles, deleteConvos, deletePresets, deleteMessages } = require('~/models');
 const { updateUserPluginAuth, deleteUserPluginAuth } = require('~/server/services/PluginService');
 const { updateUserPluginsService, deleteUserKey } = require('~/server/services/UserService');
@@ -14,6 +15,11 @@ const { processDeleteRequest } = require('~/server/services/Files/process');
 const { deleteAllSharedLinks } = require('~/models/Share');
 const { deleteToolCalls } = require('~/models/ToolCall');
 
+const Transaction = mongoose.models.Transaction;
+const Session = mongoose.models.Session;
+const Balance = mongoose.models.Balance;
+const User = mongoose.models.User;
+
 const getUserController = async (req, res) => {
   /** @type {MongoUser} */
   const userData = req.user.toObject != null ? req.user.toObject() : { ...req.user };

api/server/controllers/auth/TwoFactorAuthController.js

@@ -1,11 +1,14 @@
 const jwt = require('jsonwebtoken');
+const mongoose = require('mongoose');
 const {
   verifyTOTP,
   verifyBackupCode,
   getTOTPSecret,
 } = require('~/server/services/twoFactorService');
 const { setAuthTokens } = require('~/server/services/AuthService');
-const { User, logger } = require('@librechat/data-schemas');
+const { logger } = require('@librechat/data-schemas');
+
+const User = mongoose.models.User;
 
 /**
  * Verifies the 2FA code during login using a temporary token.

api/server/middleware/checkBan.js

@@ -1,11 +1,14 @@
 const { Keyv } = require('keyv');
 const uap = require('ua-parser-js');
+const mongoose = require('mongoose');
+const { logger } = require('@librechat/data-schemas');
 const { ViolationTypes } = require('librechat-data-provider');
 const { isEnabled, removePorts } = require('~/server/utils');
 const keyvMongo = require('~/cache/keyvMongo');
 const denyRequest = require('./denyRequest');
 const { getLogStores } = require('~/cache');
-const { User, logger } = require('@librechat/data-schemas');
+
+const User = mongoose.models.User;
 
 const banCache = new Keyv({ store: keyvMongo, namespace: ViolationTypes.BAN, ttl: 0 });
 const message = 'Your account has been temporarily banned due to violations of our service.';

api/server/middleware/checkInviteUser.js

@@ -1,5 +1,5 @@
-const { deleteTokens } = require('@librechat/data-schemas');
 const { getInvite } = require('~/models/inviteUser');
+const { deleteTokens } = require('~/models');
 
 async function checkInviteUser(req, res, next) {
   const token = req.body.token;

api/server/middleware/setBalanceConfig.js

@@ -1,6 +1,9 @@
-const { Balance, logger } = require('@librechat/data-schemas');
+const mongoose = require('mongoose');
+const { logger } = require('@librechat/data-schemas');
 const { getBalanceConfig } = require('~/server/services/Config');
 
+const Balance = mongoose.models.Balance;
+
 /**
  * Middleware to synchronize user balance settings with current balance configuration.
  * @function

api/server/routes/messages.js

@@ -1,6 +1,7 @@
 const express = require('express');
+const mongoose = require('mongoose');
+const { logger } = require('@librechat/data-schemas');
 const { ContentTypes } = require('librechat-data-provider');
-const { Message, logger } = require('@librechat/data-schemas');
 const {
   saveConvo,
   saveMessage,
@@ -15,6 +16,8 @@ const { cleanUpPrimaryKeyValue } = require('~/lib/utils/misc');
 const { getConvosQueried } = require('~/models/Conversation');
 const { countTokens } = require('~/server/utils');
 
+const Message = mongoose.models.Message;
+
 const router = express.Router();
 router.use(requireJwtAuth);
 

api/server/services/ActionService.js

@@ -1,7 +1,6 @@
 const jwt = require('jsonwebtoken');
 const { nanoid } = require('nanoid');
 const { tool } = require('@langchain/core/tools');
-const { findToken } = require('@librechat/data-schemas');
 const { GraphEvents, sleep } = require('@librechat/agents');
 const {
   Time,
@@ -20,7 +19,7 @@ const { getActions, deleteActions } = require('~/models/Action');
 const { deleteAssistant } = require('~/models/Assistant');
 const { logAxiosError } = require('~/utils');
 const { getLogStores } = require('~/cache');
-const db = require('~/lib/db/connectDb');
+const { findToken } = require('~/models');
 
 const JWT_SECRET = process.env.JWT_SECRET;
 const toolNameRegex = /^[a-zA-Z0-9_-]+$/;

api/server/services/AuthService.js

@@ -1,5 +1,6 @@
 const bcrypt = require('bcryptjs');
 const { webcrypto } = require('node:crypto');
+const { SystemRoles, errorsToString } = require('librechat-data-provider');
 const {
   findUser,
   createUser,
@@ -15,8 +16,7 @@ const {
   generateToken,
   deleteUserById,
   generateRefreshToken,
-} = require('@librechat/data-schemas');
-const { SystemRoles, errorsToString } = require('librechat-data-provider');
+} = require('~/models');
 const { isEnabled, checkEmailConfig, sendEmail } = require('~/server/utils');
 const { isEmailDomainAllowed } = require('~/server/services/domains');
 const { getBalanceConfig } = require('~/server/services/Config');

api/server/services/Files/Azure/images.js

@@ -1,9 +1,9 @@
 const fs = require('fs');
 const path = require('path');
 const sharp = require('sharp');
-const { updateUser, logger } = require('@librechat/data-schemas');
+const { logger } = require('@librechat/data-schemas');
 const { resizeImageBuffer } = require('../images/resize');
-const { updateFile } = require('~/models/File');
+const { updateUser, updateFile } = require('~/models');
 const { saveBufferToAzure } = require('./crud');
 
 /**

api/server/services/Files/Firebase/images.js

@@ -1,10 +1,10 @@
 const fs = require('fs');
 const path = require('path');
 const sharp = require('sharp');
+const { logger } = require('@librechat/data-schemas');
 const { resizeImageBuffer } = require('../images/resize');
+const { updateUser, updateFile } = require('~/models');
 const { saveBufferToFirebase } = require('./crud');
-const { updateFile } = require('~/models/File');
-const { logger, updateUser } = require('@librechat/data-schemas');
 
 /**
  * Converts an image file to the target format. The function first resizes the image based on the specified

api/server/services/Files/Local/images.js

@@ -1,9 +1,8 @@
 const fs = require('fs');
 const path = require('path');
 const sharp = require('sharp');
-const { updateUser } = require('@librechat/data-schemas');
 const { resizeImageBuffer } = require('../images/resize');
-const { updateFile } = require('~/models/File');
+const { updateUser, updateFile } = require('~/models');
 
 /**
  * Converts an image file to the target format. The function first resizes the image based on the specified

api/server/services/Files/S3/images.js

@@ -1,9 +1,9 @@
 const fs = require('fs');
 const path = require('path');
 const sharp = require('sharp');
-const { logger, updateUser } = require('@librechat/data-schemas');
+const { logger } = require('@librechat/data-schemas');
 const { resizeImageBuffer } = require('../images/resize');
-const { updateFile } = require('~/models/File');
+const { updateUser, updateFile } = require('~/models');
 const { saveBufferToS3 } = require('./crud');
 
 const defaultBasePath = 'images';

api/server/services/PluginService.js

@@ -1,7 +1,9 @@
-const { PluginAuth } = require('@librechat/data-schemas');
+const mongoose = require('mongoose');
 const { encrypt, decrypt } = require('~/server/utils/');
 const { logger } = require('~/config');
 
+const PluginAuth = mongoose.models.PluginAuth;
+
 /**
  * Asynchronously retrieves and decrypts the authentication value for a user's plugin, based on a specified authentication field.
  *

api/server/services/UserService.js

@@ -1,6 +1,10 @@
+const mongoose = require('mongoose');
+const { logger } = require('@librechat/data-schemas');
 const { ErrorTypes } = require('librechat-data-provider');
-const { Key, logger, updateUser } = require('@librechat/data-schemas');
 const { encrypt, decrypt } = require('~/server/utils/crypto');
+const { updateUser } = require('~/models');
+
+const Key = mongoose.models.Key;
 
 /**
  * Updates the plugins for a user based on the action specified (install/uninstall).

api/server/services/twoFactorService.js

@@ -1,7 +1,9 @@
+const mongoose = require('mongoose');
 const { webcrypto } = require('node:crypto');
-const { User } = require('@librechat/data-schemas');
 const { hashBackupCode, decryptV3, decryptV2 } = require('~/server/utils/crypto');
 
+const User = mongoose.models.User;
+
 // Base32 alphabet for TOTP secret encoding.
 const BASE32_ALPHABET = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ234567';