Merge branch 'main' into feature/entra-id-azure-integration

api/server/services/Config/app.js

@@ -1,11 +1,25 @@
-const { logger } = require('@librechat/data-schemas');
 const { CacheKeys } = require('librechat-data-provider');
-const AppService = require('~/server/services/AppService');
+const { logger, AppService } = require('@librechat/data-schemas');
+const { loadAndFormatTools } = require('~/server/services/start/tools');
+const loadCustomConfig = require('./loadCustomConfig');
 const { setCachedTools } = require('./getCachedTools');
 const getLogStores = require('~/cache/getLogStores');
+const paths = require('~/config/paths');
 
 const BASE_CONFIG_KEY = '_BASE_';
 
+const loadBaseConfig = async () => {
+  /** @type {TCustomConfig} */
+  const config = (await loadCustomConfig()) ?? {};
+  /** @type {Record<string, FunctionTool>} */
+  const systemTools = loadAndFormatTools({
+    adminFilter: config.filteredTools,
+    adminIncluded: config.includedTools,
+    directory: paths.structuredTools,
+  });
+  return AppService({ config, paths, systemTools });
+};
+
 /**
  * Get the app configuration based on user context
  * @param {Object} [options]
@@ -29,7 +43,7 @@ async function getAppConfig(options = {}) {
   let baseConfig = await cache.get(BASE_CONFIG_KEY);
   if (!baseConfig) {
     logger.info('[getAppConfig] App configuration not initialized. Initializing AppService...');
-    baseConfig = await AppService();
+    baseConfig = await loadBaseConfig();
 
     if (!baseConfig) {
       throw new Error('Failed to initialize app configuration through AppService.');

api/server/services/Config/handleRateLimits.js

@@ -1,48 +0,0 @@
-const { RateLimitPrefix } = require('librechat-data-provider');
-
-/**
- *
- * @param {TCustomConfig['rateLimits'] | undefined} rateLimits
- */
-const handleRateLimits = (rateLimits) => {
-  if (!rateLimits) {
-    return;
-  }
-
-  const rateLimitKeys = {
-    fileUploads: RateLimitPrefix.FILE_UPLOAD,
-    conversationsImport: RateLimitPrefix.IMPORT,
-    tts: RateLimitPrefix.TTS,
-    stt: RateLimitPrefix.STT,
-  };
-
-  Object.entries(rateLimitKeys).forEach(([key, prefix]) => {
-    const rateLimit = rateLimits[key];
-    if (rateLimit) {
-      setRateLimitEnvVars(prefix, rateLimit);
-    }
-  });
-};
-
-/**
- * Set environment variables for rate limit configurations
- *
- * @param {string} prefix - Prefix for environment variable names
- * @param {object} rateLimit - Rate limit configuration object
- */
-const setRateLimitEnvVars = (prefix, rateLimit) => {
-  const envVarsMapping = {
-    ipMax: `${prefix}_IP_MAX`,
-    ipWindowInMinutes: `${prefix}_IP_WINDOW`,
-    userMax: `${prefix}_USER_MAX`,
-    userWindowInMinutes: `${prefix}_USER_WINDOW`,
-  };
-
-  Object.entries(envVarsMapping).forEach(([key, envVar]) => {
-    if (rateLimit[key] !== undefined) {
-      process.env[envVar] = rateLimit[key];
-    }
-  });
-};
-
-module.exports = handleRateLimits;

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/Config/loadCustomConfig.js

@@ -5,14 +5,12 @@ const keyBy = require('lodash/keyBy');
 const { loadYaml } = require('@librechat/api');
 const { logger } = require('@librechat/data-schemas');
 const {
-  CacheKeys,
   configSchema,
   paramSettings,
   EImageOutputType,
   agentParamSettings,
   validateSettingDefinitions,
 } = require('librechat-data-provider');
-const getLogStores = require('~/cache/getLogStores');
 
 const projectRoot = path.resolve(__dirname, '..', '..', '..', '..');
 const defaultConfigPath = path.resolve(projectRoot, 'librechat.yaml');
@@ -119,7 +117,6 @@ https://www.librechat.ai/docs/configuration/stt_tts`);
     .filter((endpoint) => endpoint.customParams)
     .forEach((endpoint) => parseCustomParams(endpoint.name, endpoint.customParams));
 
-
   if (result.data.modelSpecs) {
     customConfig.modelSpecs = result.data.modelSpecs;
   }