From 0b5816d1beafd2b7f6a9fc27eb4db8317d7fc0a2 Mon Sep 17 00:00:00 2001 From: Danny Avila Date: Sun, 17 Aug 2025 22:45:32 -0400 Subject: [PATCH] chore: rename `Config/getAppConfig` -> `Config/app` --- api/app/clients/tools/structured/OpenAIImageTools.js | 6 +++--- api/server/middleware/assistants/validate.js | 2 +- api/server/middleware/assistants/validateAuthor.js | 2 +- api/server/middleware/buildEndpointOption.js | 2 +- api/server/middleware/spec/validateImages.spec.js | 4 ++-- api/server/middleware/validateImageRequest.js | 4 ++-- api/server/services/Config/{getAppConfig.js => app.js} | 0 api/server/services/Config/getEndpointsConfig.js | 2 +- api/server/services/Config/index.js | 4 ++-- api/server/services/Config/loadAsyncEndpoints.js | 2 +- api/server/services/Config/loadConfigEndpoints.js | 2 +- api/server/services/Config/loadConfigModels.js | 2 +- api/server/services/Config/loadConfigModels.spec.js | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) rename api/server/services/Config/{getAppConfig.js => app.js} (100%) diff --git a/api/app/clients/tools/structured/OpenAIImageTools.js b/api/app/clients/tools/structured/OpenAIImageTools.js index d68a2e47e4..f33a58e105 100644 --- a/api/app/clients/tools/structured/OpenAIImageTools.js +++ b/api/app/clients/tools/structured/OpenAIImageTools.js @@ -9,8 +9,8 @@ const { logAxiosError } = require('@librechat/api'); const { logger } = require('@librechat/data-schemas'); const { ContentTypes, EImageOutputType } = require('librechat-data-provider'); const { getStrategyFunctions } = require('~/server/services/Files/strategies'); -const { getAppConfig } = require('~/server/services/Config'); -const { extractBaseURL } = require('~/utils'); +const { getAppConfig } = require('~/server/services/Config/app'); +const extractBaseURL = require('~/utils/extractBaseURL'); const { getFiles } = require('~/models/File'); /** Default descriptions for image generation tool */ @@ -122,7 +122,7 @@ function createAbortHandler() { * @param {string} fields.IMAGE_GEN_OAI_API_KEY - The OpenAI API key * @param {boolean} [fields.override] - Whether to override the API key check, necessary for app initialization * @param {MongoFile[]} [fields.imageFiles] - The images to be used for editing - * @returns {Array} - Array of image tools + * @returns {Promise} - Array of image tools */ async function createOpenAIImageTools(fields = {}) { /** @type {boolean} Used to initialize the Tool without necessary variables. */ diff --git a/api/server/middleware/assistants/validate.js b/api/server/middleware/assistants/validate.js index 832a3699bf..5bc3552434 100644 --- a/api/server/middleware/assistants/validate.js +++ b/api/server/middleware/assistants/validate.js @@ -1,6 +1,6 @@ const { v4 } = require('uuid'); const { handleAbortError } = require('~/server/middleware/abortMiddleware'); -const { getAppConfig } = require('~/server/services/Config/getAppConfig'); +const { getAppConfig } = require('~/server/services/Config/app'); /** * Checks if the assistant is supported or excluded diff --git a/api/server/middleware/assistants/validateAuthor.js b/api/server/middleware/assistants/validateAuthor.js index cf6dfb7a72..fa943ca316 100644 --- a/api/server/middleware/assistants/validateAuthor.js +++ b/api/server/middleware/assistants/validateAuthor.js @@ -1,5 +1,5 @@ const { SystemRoles } = require('librechat-data-provider'); -const { getAppConfig } = require('~/server/services/Config/getAppConfig'); +const { getAppConfig } = require('~/server/services/Config/app'); const { getAssistant } = require('~/models/Assistant'); /** diff --git a/api/server/middleware/buildEndpointOption.js b/api/server/middleware/buildEndpointOption.js index 8a9af7925f..0654f6b885 100644 --- a/api/server/middleware/buildEndpointOption.js +++ b/api/server/middleware/buildEndpointOption.js @@ -7,10 +7,10 @@ const { parseCompactConvo, } = require('librechat-data-provider'); const azureAssistants = require('~/server/services/Endpoints/azureAssistants'); -const { getAppConfig } = require('~/server/services/Config/getAppConfig'); const assistants = require('~/server/services/Endpoints/assistants'); const { processFiles } = require('~/server/services/Files/process'); const anthropic = require('~/server/services/Endpoints/anthropic'); +const { getAppConfig } = require('~/server/services/Config/app'); const bedrock = require('~/server/services/Endpoints/bedrock'); const openAI = require('~/server/services/Endpoints/openAI'); const agents = require('~/server/services/Endpoints/agents'); diff --git a/api/server/middleware/spec/validateImages.spec.js b/api/server/middleware/spec/validateImages.spec.js index 7411b5aec5..a2321534fb 100644 --- a/api/server/middleware/spec/validateImages.spec.js +++ b/api/server/middleware/spec/validateImages.spec.js @@ -1,14 +1,14 @@ const jwt = require('jsonwebtoken'); const validateImageRequest = require('~/server/middleware/validateImageRequest'); -jest.mock('~/server/services/Config/getAppConfig', () => ({ +jest.mock('~/server/services/Config/app', () => ({ getAppConfig: jest.fn(), })); describe('validateImageRequest middleware', () => { let req, res, next; const validObjectId = '65cfb246f7ecadb8b1e8036b'; - const { getAppConfig } = require('~/server/services/Config/getAppConfig'); + const { getAppConfig } = require('~/server/services/Config/app'); beforeEach(() => { jest.clearAllMocks(); diff --git a/api/server/middleware/validateImageRequest.js b/api/server/middleware/validateImageRequest.js index d71a294383..41c258c46d 100644 --- a/api/server/middleware/validateImageRequest.js +++ b/api/server/middleware/validateImageRequest.js @@ -1,7 +1,7 @@ const cookies = require('cookie'); const jwt = require('jsonwebtoken'); -const { getAppConfig } = require('~/server/services/Config/getAppConfig'); -const { logger } = require('~/config'); +const { logger } = require('@librechat/data-schemas'); +const { getAppConfig } = require('~/server/services/Config/app'); const OBJECT_ID_LENGTH = 24; const OBJECT_ID_PATTERN = /^[0-9a-f]{24}$/i; diff --git a/api/server/services/Config/getAppConfig.js b/api/server/services/Config/app.js similarity index 100% rename from api/server/services/Config/getAppConfig.js rename to api/server/services/Config/app.js diff --git a/api/server/services/Config/getEndpointsConfig.js b/api/server/services/Config/getEndpointsConfig.js index 790cb7806c..da93de487d 100644 --- a/api/server/services/Config/getEndpointsConfig.js +++ b/api/server/services/Config/getEndpointsConfig.js @@ -8,7 +8,7 @@ const { const loadDefaultEndpointsConfig = require('./loadDefaultEConfig'); const loadConfigEndpoints = require('./loadConfigEndpoints'); const getLogStores = require('~/cache/getLogStores'); -const { getAppConfig } = require('./getAppConfig'); +const { getAppConfig } = require('./app'); /** * diff --git a/api/server/services/Config/index.js b/api/server/services/Config/index.js index 67c071661d..efb4d19a88 100644 --- a/api/server/services/Config/index.js +++ b/api/server/services/Config/index.js @@ -1,4 +1,4 @@ -const getAppConfig = require('./getAppConfig'); +const appConfig = require('./app'); const { config } = require('./EndpointService'); const getCachedTools = require('./getCachedTools'); const getCustomConfig = require('./getCustomConfig'); @@ -16,7 +16,7 @@ module.exports = { loadDefaultModels, loadOverrideConfig, loadAsyncEndpoints, - ...getAppConfig, + ...appConfig, ...getCachedTools, ...getCustomConfig, ...getEndpointsConfig, diff --git a/api/server/services/Config/loadAsyncEndpoints.js b/api/server/services/Config/loadAsyncEndpoints.js index 7e7be83c7e..88af40459c 100644 --- a/api/server/services/Config/loadAsyncEndpoints.js +++ b/api/server/services/Config/loadAsyncEndpoints.js @@ -2,8 +2,8 @@ const path = require('path'); const { logger } = require('@librechat/data-schemas'); const { loadServiceKey, isUserProvided } = require('@librechat/api'); const { EModelEndpoint } = require('librechat-data-provider'); -const { getAppConfig } = require('./getAppConfig'); const { config } = require('./EndpointService'); +const { getAppConfig } = require('./app'); const { openAIApiKey, azureOpenAIApiKey, useAzurePlugins, userProvidedOpenAI, googleKey } = config; diff --git a/api/server/services/Config/loadConfigEndpoints.js b/api/server/services/Config/loadConfigEndpoints.js index 05ea55c161..fca770e2ed 100644 --- a/api/server/services/Config/loadConfigEndpoints.js +++ b/api/server/services/Config/loadConfigEndpoints.js @@ -1,7 +1,7 @@ const { EModelEndpoint, extractEnvVariable } = require('librechat-data-provider'); const { isUserProvided, normalizeEndpointName } = require('~/server/utils'); const { getCustomConfig } = require('./getCustomConfig'); -const { getAppConfig } = require('./getAppConfig'); +const { getAppConfig } = require('./app'); /** * Load config endpoints from the cached configuration object diff --git a/api/server/services/Config/loadConfigModels.js b/api/server/services/Config/loadConfigModels.js index f1c9630e9b..895e0129b2 100644 --- a/api/server/services/Config/loadConfigModels.js +++ b/api/server/services/Config/loadConfigModels.js @@ -2,7 +2,7 @@ const { EModelEndpoint, extractEnvVariable } = require('librechat-data-provider' const { isUserProvided, normalizeEndpointName } = require('~/server/utils'); const { fetchModels } = require('~/server/services/ModelService'); const { getCustomConfig } = require('./getCustomConfig'); -const { getAppConfig } = require('./getAppConfig'); +const { getAppConfig } = require('./app'); /** * Load config endpoints from the cached configuration object diff --git a/api/server/services/Config/loadConfigModels.spec.js b/api/server/services/Config/loadConfigModels.spec.js index f0fbcfed1a..4bdd313743 100644 --- a/api/server/services/Config/loadConfigModels.spec.js +++ b/api/server/services/Config/loadConfigModels.spec.js @@ -1,7 +1,7 @@ const { fetchModels } = require('~/server/services/ModelService'); const { getCustomConfig } = require('./getCustomConfig'); -const { getAppConfig } = require('./getAppConfig'); const loadConfigModels = require('./loadConfigModels'); +const { getAppConfig } = require('./app'); jest.mock('~/server/services/ModelService'); jest.mock('./getCustomConfig');