🧹 chore: Cleanup Logger and Utility Imports (#9935)

* 🧹 chore: Update logger imports to use @librechat/data-schemas across multiple files and remove unused sleep function from queue.js (#9930)

* chore: Replace local isEnabled utility with @librechat/api import across multiple files, update test files

* chore: Replace local logger import with @librechat/data-schemas logger in countTokens.js and fork.js

* chore: Update logs volume path in docker-compose.yml to correct directory

* chore: import order of isEnabled in static.js

api/server/controllers/ModelController.js

@@ -1,7 +1,7 @@
+const { logger } = require('@librechat/data-schemas');
 const { CacheKeys } = require('librechat-data-provider');
 const { loadDefaultModels, loadConfigModels } = require('~/server/services/Config');
 const { getLogStores } = require('~/cache');
-const { logger } = require('~/config');
 
 /**
  * @param {ServerRequest} req

api/server/controllers/auth/LoginController.js

@@ -1,6 +1,6 @@
+const { logger } = require('@librechat/data-schemas');
 const { generate2FATempToken } = require('~/server/services/twoFactorService');
 const { setAuthTokens } = require('~/server/services/AuthService');
-const { logger } = require('~/config');
 
 const loginController = async (req, res) => {
   try {

api/server/controllers/auth/LogoutController.js

@@ -1,8 +1,8 @@
 const cookies = require('cookie');
-const { getOpenIdConfig } = require('~/strategies');
+const { isEnabled } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
 const { logoutUser } = require('~/server/services/AuthService');
-const { isEnabled } = require('~/server/utils');
-const { logger } = require('~/config');
+const { getOpenIdConfig } = require('~/strategies');
 
 const logoutController = async (req, res) => {
   const refreshToken = req.headers.cookie ? cookies.parse(req.headers.cookie).refreshToken : null;

api/server/middleware/canDeleteAccount.js

@@ -1,6 +1,6 @@
+const { isEnabled } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
 const { SystemRoles } = require('librechat-data-provider');
-const { isEnabled } = require('~/server/utils');
-const { logger } = require('~/config');
 
 /**
  * Checks if the user can delete their account

api/server/middleware/checkBan.js

@@ -1,8 +1,9 @@
 const { Keyv } = require('keyv');
 const uap = require('ua-parser-js');
+const { isEnabled } = require('@librechat/api');
 const { logger } = require('@librechat/data-schemas');
 const { ViolationTypes } = require('librechat-data-provider');
-const { isEnabled, removePorts } = require('~/server/utils');
+const { removePorts } = require('~/server/utils');
 const keyvMongo = require('~/cache/keyvMongo');
 const denyRequest = require('./denyRequest');
 const { getLogStores } = require('~/cache');

api/server/middleware/checkPeoplePickerAccess.js

@@ -1,6 +1,6 @@
+const { logger } = require('@librechat/data-schemas');
 const { PrincipalType, PermissionTypes, Permissions } = require('librechat-data-provider');
 const { getRoleByName } = require('~/models/Role');
-const { logger } = require('~/config');
 
 /**
  * Middleware to check if user has permission to access people picker functionality

api/server/middleware/checkPeoplePickerAccess.spec.js

@@ -1,10 +1,11 @@
+const { logger } = require('@librechat/data-schemas');
 const { PrincipalType, PermissionTypes, Permissions } = require('librechat-data-provider');
 const { checkPeoplePickerAccess } = require('./checkPeoplePickerAccess');
 const { getRoleByName } = require('~/models/Role');
-const { logger } = require('~/config');
 
 jest.mock('~/models/Role');
-jest.mock('~/config', () => ({
+jest.mock('@librechat/data-schemas', () => ({
+  ...jest.requireActual('@librechat/data-schemas'),
   logger: {
     error: jest.fn(),
   },

api/server/middleware/concurrentLimiter.js

@@ -1,7 +1,7 @@
+const { isEnabled } = require('@librechat/api');
 const { Time, CacheKeys, ViolationTypes } = require('librechat-data-provider');
 const clearPendingReq = require('~/cache/clearPendingReq');
 const { logViolation, getLogStores } = require('~/cache');
-const { isEnabled } = require('~/server/utils');
 const denyRequest = require('./denyRequest');
 
 const {

api/server/middleware/logHeaders.js

@@ -1,4 +1,4 @@
-const { logger } = require('~/config');
+const { logger } = require('@librechat/data-schemas');
 
 /**
  * Middleware to log Forwarded Headers

api/server/middleware/moderateText.js

@@ -1,8 +1,8 @@
 const axios = require('axios');
+const { isEnabled } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
 const { ErrorTypes } = require('librechat-data-provider');
-const { isEnabled } = require('~/server/utils');
 const denyRequest = require('./denyRequest');
-const { logger } = require('~/config');
 
 async function moderateText(req, res, next) {
   if (!isEnabled(process.env.OPENAI_MODERATION)) {

api/server/middleware/optionalJwtAuth.js

@@ -1,6 +1,6 @@
 const cookies = require('cookie');
-const { isEnabled } = require('~/server/utils');
 const passport = require('passport');
+const { isEnabled } = require('@librechat/api');
 
 // This middleware does not require authentication,
 // but if the user is authenticated, it will set the user object.

api/server/middleware/requireJwtAuth.js

@@ -1,6 +1,6 @@
-const passport = require('passport');
 const cookies = require('cookie');
-const { isEnabled } = require('~/server/utils');
+const passport = require('passport');
+const { isEnabled } = require('@librechat/api');
 
 /**
  * Custom Middleware to handle JWT authentication, with support for OpenID token reuse

api/server/middleware/requireLocalAuth.js

@@ -1,5 +1,5 @@
 const passport = require('passport');
-const { logger } = require('~/config');
+const { logger } = require('@librechat/data-schemas');
 
 const requireLocalAuth = (req, res, next) => {
   passport.authenticate('local', (err, user, info) => {

api/server/middleware/validatePasswordReset.js

@@ -1,5 +1,5 @@
-const { isEnabled } = require('~/server/utils');
-const { logger } = require('~/config');
+const { isEnabled } = require('@librechat/api');
+const { logger } = require('@librechat/data-schemas');
 
 function validatePasswordReset(req, res, next) {
   if (isEnabled(process.env.ALLOW_PASSWORD_RESET)) {

api/server/middleware/validateRegistration.js

@@ -1,4 +1,4 @@
-const { isEnabled } = require('~/server/utils');
+const { isEnabled } = require('@librechat/api');
 
 function validateRegistration(req, res, next) {
   if (req.invite) {

api/server/routes/__tests__/ldap.spec.js

@@ -1,10 +1,13 @@
-const request = require('supertest');
 const express = require('express');
+const request = require('supertest');
+const { isEnabled } = require('@librechat/api');
 const { getLdapConfig } = require('~/server/services/Config/ldap');
-const { isEnabled } = require('~/server/utils');
 
 jest.mock('~/server/services/Config/ldap');
-jest.mock('~/server/utils');
+jest.mock('@librechat/api', () => ({
+  ...jest.requireActual('@librechat/api'),
+  isEnabled: jest.fn(),
+}));
 
 const app = express();
 

api/server/routes/agents/index.js

@@ -1,4 +1,5 @@
 const express = require('express');
+const { isEnabled } = require('@librechat/api');
 const {
   uaParser,
   checkBan,
@@ -8,7 +9,6 @@ const {
   concurrentLimiter,
   messageUserLimiter,
 } = require('~/server/middleware');
-const { isEnabled } = require('~/server/utils');
 const { v1 } = require('./v1');
 const chat = require('./chat');
 

api/server/routes/edit/index.js

@@ -1,19 +1,19 @@
+const { isEnabled } = require('@librechat/api');
+const { EModelEndpoint } = require('librechat-data-provider');
+const {
+  validateConvoAccess,
+  messageUserLimiter,
+  concurrentLimiter,
+  messageIpLimiter,
+  requireJwtAuth,
+  checkBan,
+  uaParser,
+} = require('~/server/middleware');
+const anthropic = require('./anthropic');
 const express = require('express');
 const openAI = require('./openAI');
 const custom = require('./custom');
 const google = require('./google');
-const anthropic = require('./anthropic');
-const { isEnabled } = require('~/server/utils');
-const { EModelEndpoint } = require('librechat-data-provider');
-const {
-  checkBan,
-  uaParser,
-  requireJwtAuth,
-  messageIpLimiter,
-  concurrentLimiter,
-  messageUserLimiter,
-  validateConvoAccess,
-} = require('~/server/middleware');
 
 const { LIMIT_CONCURRENT_MESSAGES, LIMIT_MESSAGE_IP, LIMIT_MESSAGE_USER } = process.env ?? {};
 

api/server/routes/files/files.js

@@ -1,6 +1,7 @@
 const fs = require('fs').promises;
 const express = require('express');
 const { EnvVar } = require('@librechat/agents');
+const { logger } = require('@librechat/data-schemas');
 const {
   Time,
   isUUID,
@@ -30,7 +31,6 @@ const { cleanFileName } = require('~/server/utils/files');
 const { getAssistant } = require('~/models/Assistant');
 const { getAgent } = require('~/models/Agent');
 const { getLogStores } = require('~/cache');
-const { logger } = require('~/config');
 const { Readable } = require('stream');
 
 const router = express.Router();

api/server/routes/files/speech/tts.js

@@ -1,9 +1,9 @@
 const multer = require('multer');
 const express = require('express');
+const { logger } = require('@librechat/data-schemas');
 const { CacheKeys } = require('librechat-data-provider');
 const { getVoices, streamAudio, textToSpeech } = require('~/server/services/Files/Audio');
 const { getLogStores } = require('~/cache');
-const { logger } = require('~/config');
 
 const router = express.Router();
 const upload = multer();

api/server/routes/presets.js

@@ -1,8 +1,8 @@
-const express = require('express');
 const crypto = require('crypto');
+const express = require('express');
+const { logger } = require('@librechat/data-schemas');
 const { getPresets, savePreset, deletePresets } = require('~/models');
 const requireJwtAuth = require('~/server/middleware/requireJwtAuth');
-const { logger } = require('~/config');
 
 const router = express.Router();
 router.use(requireJwtAuth);

api/server/routes/search.js

@@ -1,7 +1,7 @@
 const express = require('express');
 const { MeiliSearch } = require('meilisearch');
+const { isEnabled } = require('@librechat/api');
 const requireJwtAuth = require('~/server/middleware/requireJwtAuth');
-const { isEnabled } = require('~/server/utils');
 
 const router = express.Router();
 

api/server/routes/static.js

@@ -1,7 +1,7 @@
 const express = require('express');
+const { isEnabled } = require('@librechat/api');
 const staticCache = require('../utils/staticCache');
 const paths = require('~/config/paths');
-const { isEnabled } = require('~/server/utils');
 
 const skipGzipScan = !isEnabled(process.env.ENABLE_IMAGE_OUTPUT_GZIP_SCAN);
 

api/server/routes/tokenizer.js

@@ -1,8 +1,9 @@
 const express = require('express');
-const router = express.Router();
+const { logger } = require('@librechat/data-schemas');
 const requireJwtAuth = require('~/server/middleware/requireJwtAuth');
 const { countTokens } = require('~/server/utils');
-const { logger } = require('~/config');
+
+const router = express.Router();
 
 router.post('/', requireJwtAuth, async (req, res) => {
   try {

api/server/services/Config/ldap.js

@@ -1,4 +1,4 @@
-const { isEnabled } = require('~/server/utils');
+const { isEnabled } = require('@librechat/api');
 
 /** @returns {TStartupConfig['ldap'] | undefined} */
 const getLdapConfig = () => {

api/server/services/Endpoints/anthropic/title.js

@@ -1,6 +1,6 @@
+const { isEnabled } = require('@librechat/api');
 const { CacheKeys } = require('librechat-data-provider');
 const getLogStores = require('~/cache/getLogStores');
-const { isEnabled } = require('~/server/utils');
 const { saveConvo } = require('~/models');
 
 const addTitle = async (req, { text, response, client }) => {

api/server/services/Endpoints/assistants/title.js

@@ -1,7 +1,7 @@
+const { isEnabled } = require('@librechat/api');
 const { CacheKeys } = require('librechat-data-provider');
 const { saveConvo } = require('~/models/Conversation');
 const getLogStores = require('~/cache/getLogStores');
-const { isEnabled } = require('~/server/utils');
 
 const addTitle = async (req, { text, responseText, conversationId, client }) => {
   const { TITLE_CONVO = 'true' } = process.env ?? {};

api/server/services/Endpoints/openAI/title.js

@@ -1,6 +1,6 @@
+const { isEnabled } = require('@librechat/api');
 const { CacheKeys } = require('librechat-data-provider');
 const getLogStores = require('~/cache/getLogStores');
-const { isEnabled } = require('~/server/utils');
 const { saveConvo } = require('~/models');
 
 const addTitle = async (req, { text, response, client }) => {

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

@@ -3,7 +3,7 @@ const path = require('path');
 const mime = require('mime');
 const axios = require('axios');
 const fetch = require('node-fetch');
-const { logger } = require('~/config');
+const { logger } = require('@librechat/data-schemas');
 const { getAzureContainerClient } = require('./initialize');
 
 const defaultBasePath = 'images';

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

@@ -1,5 +1,5 @@
+const { logger } = require('@librechat/data-schemas');
 const { BlobServiceClient } = require('@azure/storage-blob');
-const { logger } = require('~/config');
 
 let blobServiceClient = null;
 let azureWarningLogged = false;

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

@@ -1,6 +1,6 @@
 const firebase = require('firebase/app');
 const { getStorage } = require('firebase/storage');
-const { logger } = require('~/config');
+const { logger } = require('@librechat/data-schemas');
 
 let i = 0;
 let firebaseApp = null;

api/server/services/Files/OpenAI/crud.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
+const { sleep } = require('@librechat/agents');
+const { logger } = require('@librechat/data-schemas');
 const { FilePurpose } = require('librechat-data-provider');
-const { sleep } = require('~/server/utils');
-const { logger } = require('~/config');
 
 /**
  * Uploads a file that can be used across various OpenAI services.

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

@@ -1,5 +1,6 @@
 const fs = require('fs');
 const fetch = require('node-fetch');
+const { logger } = require('@librechat/data-schemas');
 const { FileSources } = require('librechat-data-provider');
 const {
   PutObjectCommand,
@@ -9,7 +10,6 @@ const {
 } = require('@aws-sdk/client-s3');
 const { getSignedUrl } = require('@aws-sdk/s3-request-presigner');
 const { initializeS3 } = require('./initialize');
-const { logger } = require('~/config');
 
 const bucketName = process.env.AWS_BUCKET_NAME;
 const defaultBasePath = 'images';

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

@@ -1,5 +1,5 @@
 const { S3Client } = require('@aws-sdk/client-s3');
-const { logger } = require('~/config');
+const { logger } = require('@librechat/data-schemas');
 
 let s3 = null;
 

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

@@ -1,9 +1,9 @@
 const sharp = require('sharp');
 const fs = require('fs').promises;
 const fetch = require('node-fetch');
+const { logger } = require('@librechat/data-schemas');
 const { EImageOutputType } = require('librechat-data-provider');
 const { resizeAndConvert } = require('./resize');
-const { logger } = require('~/config');
 
 /**
  * Uploads an avatar image for a user. This function can handle various types of input (URL, Buffer, or File object),

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

@@ -1,9 +1,9 @@
 const fs = require('fs');
 const path = require('path');
 const sharp = require('sharp');
+const { logger } = require('@librechat/data-schemas');
 const { getStrategyFunctions } = require('../strategies');
 const { resizeImageBuffer } = require('./resize');
-const { logger } = require('~/config');
 
 /**
  * Converts an image file or buffer to target output type with specified resolution.

api/server/services/GraphTokenService.js

@@ -1,8 +1,8 @@
-const { getOpenIdConfig } = require('~/strategies/openidStrategy');
-const { logger } = require('~/config');
-const { CacheKeys } = require('librechat-data-provider');
-const getLogStores = require('~/cache/getLogStores');
 const client = require('openid-client');
+const { logger } = require('@librechat/data-schemas');
+const { CacheKeys } = require('librechat-data-provider');
+const { getOpenIdConfig } = require('~/strategies/openidStrategy');
+const getLogStores = require('~/cache/getLogStores');
 
 /**
  * Get Microsoft Graph API token using existing token exchange mechanism

api/server/services/Runs/RunManager.js

@@ -1,5 +1,5 @@
+const { logger } = require('@librechat/data-schemas');
 const { ToolCallTypes } = require('librechat-data-provider');
-const { logger } = require('~/config');
 
 /**
  * @typedef {import('openai').OpenAI} OpenAI

api/server/services/Runs/handle.js

@@ -1,9 +1,9 @@
+const { sleep } = require('@librechat/agents');
+const { logger } = require('@librechat/data-schemas');
 const { RunStatus, defaultOrderQuery, CacheKeys } = require('librechat-data-provider');
 const getLogStores = require('~/cache/getLogStores');
 const { retrieveRun } = require('./methods');
-const { sleep } = require('~/server/utils');
 const RunManager = require('./RunManager');
-const { logger } = require('~/config');
 
 async function withTimeout(promise, timeoutMs, timeoutMessage) {
   let timeoutHandle;

api/server/services/cleanup.js

@@ -1,5 +1,6 @@
-const { logger } = require('~/config');
+const { logger } = require('@librechat/data-schemas');
 const { deleteNullOrEmptyConversations } = require('~/models/Conversation');
+
 const cleanup = async () => {
   try {
     await deleteNullOrEmptyConversations();

api/server/utils/countTokens.js

@@ -1,7 +1,7 @@
 const { Tiktoken } = require('tiktoken/lite');
+const { logger } = require('@librechat/data-schemas');
 const p50k_base = require('tiktoken/encoders/p50k_base.json');
 const cl100k_base = require('tiktoken/encoders/cl100k_base.json');
-const logger = require('~/config/winston');
 
 /**
  * Counts the number of tokens in a given text using a specified encoding model.

api/server/utils/handleText.js

@@ -125,34 +125,6 @@ function formatAction(action) {
   return formattedAction;
 }
 
-/**
- * Checks if the given value is truthy by being either the boolean `true` or a string
- * that case-insensitively matches 'true'.
- *
- * @function
- * @param {string|boolean|null|undefined} value - The value to check.
- * @returns {boolean} Returns `true` if the value is the boolean `true` or a case-insensitive
- *                    match for the string 'true', otherwise returns `false`.
- * @example
- *
- * isEnabled("True");  // returns true
- * isEnabled("TRUE");  // returns true
- * isEnabled(true);    // returns true
- * isEnabled("false"); // returns false
- * isEnabled(false);   // returns false
- * isEnabled(null);    // returns false
- * isEnabled();        // returns false
- */
-function isEnabled(value) {
-  if (typeof value === 'boolean') {
-    return value;
-  }
-  if (typeof value === 'string') {
-    return value.toLowerCase().trim() === 'true';
-  }
-  return false;
-}
-
 /**
  * Checks if the provided value is 'user_provided'.
  *
@@ -207,7 +179,6 @@ function generateConfig(key, baseURL, endpoint) {
 }
 
 module.exports = {
-  isEnabled,
   handleText,
   formatSteps,
   escapeRegExp,

api/server/utils/import/fork.js

@@ -1,10 +1,10 @@
 const { v4: uuidv4 } = require('uuid');
+const { logger } = require('@librechat/data-schemas');
 const { EModelEndpoint, Constants, ForkOptions } = require('librechat-data-provider');
 const { createImportBatchBuilder } = require('./importBatchBuilder');
 const BaseClient = require('~/app/clients/BaseClient');
 const { getConvo } = require('~/models/Conversation');
 const { getMessages } = require('~/models/Message');
-const logger = require('~/config/winston');
 
 /**
  * Helper function to clone messages with proper parent-child relationships and timestamps

api/server/utils/import/importBatchBuilder.js

@@ -1,9 +1,9 @@
 const { v4: uuidv4 } = require('uuid');
+const { logger } = require('@librechat/data-schemas');
 const { EModelEndpoint, Constants, openAISettings } = require('librechat-data-provider');
 const { bulkIncrementTagCounts } = require('~/models/ConversationTag');
 const { bulkSaveConvos } = require('~/models/Conversation');
 const { bulkSaveMessages } = require('~/models/Message');
-const { logger } = require('~/config');
 
 /**
  * Factory function for creating an instance of ImportBatchBuilder.

api/server/utils/queue.js

@@ -53,17 +53,6 @@ function LB_QueueAsyncCall(asyncFunc, args, callback) {
   }
 }
 
-/**
- * Delays the execution for a specified number of milliseconds.
- *
- * @param {number} ms - The number of milliseconds to delay.
- * @return {Promise<void>} A promise that resolves after the specified delay.
- */
-function sleep(ms) {
-  return new Promise((resolve) => setTimeout(resolve, ms));
-}
-
 module.exports = {
-  sleep,
   LB_QueueAsyncCall,
 };