chore: rename Config/getAppConfig -> Config/app

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<StructuredTool[]>} - Array of image tools
  */
 async function createOpenAIImageTools(fields = {}) {
   /** @type {boolean} Used to initialize the Tool without necessary variables. */

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

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');
 
 /**

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');

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

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;

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');
 
 /**
  *

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,

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;
 

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

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

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');