🧹 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/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();