refactor: implement custom endpoints configuration and streamline endpoint loading logic

packages/api/src/endpoints/custom/config.ts

@@ -0,0 +1,56 @@
+import { EModelEndpoint, extractEnvVariable } from 'librechat-data-provider';
+import type { TCustomEndpoints, TEndpoint, TConfig } from 'librechat-data-provider';
+import type { TCustomEndpointsConfig } from '~/types/endpoints';
+import { isUserProvided, normalizeEndpointName } from '~/utils';
+
+/**
+ * Load config endpoints from the cached configuration object
+ * @param customEndpointsConfig - The configuration object
+ */
+export function loadCustomEndpointsConfig(
+  customEndpoints?: TCustomEndpoints,
+): TCustomEndpointsConfig | undefined {
+  if (!customEndpoints) {
+    return;
+  }
+
+  const customEndpointsConfig: TCustomEndpointsConfig = {};
+
+  if (Array.isArray(customEndpoints)) {
+    const filteredEndpoints = customEndpoints.filter(
+      (endpoint) =>
+        endpoint.baseURL &&
+        endpoint.apiKey &&
+        endpoint.name &&
+        endpoint.models &&
+        (endpoint.models.fetch || endpoint.models.default),
+    );
+
+    for (let i = 0; i < filteredEndpoints.length; i++) {
+      const endpoint = filteredEndpoints[i] as TEndpoint;
+      const {
+        baseURL,
+        apiKey,
+        name: configName,
+        iconURL,
+        modelDisplayLabel,
+        customParams,
+      } = endpoint;
+      const name = normalizeEndpointName(configName);
+
+      const resolvedApiKey = extractEnvVariable(apiKey ?? '');
+      const resolvedBaseURL = extractEnvVariable(baseURL ?? '');
+
+      customEndpointsConfig[name] = {
+        type: EModelEndpoint.custom,
+        userProvide: isUserProvided(resolvedApiKey),
+        userProvideURL: isUserProvided(resolvedBaseURL),
+        customParams: customParams as TConfig['customParams'],
+        modelDisplayLabel,
+        iconURL,
+      };
+    }
+  }
+
+  return customEndpointsConfig;
+}

packages/api/src/endpoints/custom/index.ts

@@ -0,0 +1 @@
+export * from './config';

packages/api/src/endpoints/index.ts

@@ -1,2 +1,3 @@
+export * from './custom';
 export * from './google';
 export * from './openai';

packages/api/src/types/config.ts

@@ -6,6 +6,7 @@ import type {
   TMemoryConfig,
   EModelEndpoint,
   TAgentsEndpoint,
+  TCustomEndpoints,
   TAssistantEndpoint,
 } from 'librechat-data-provider';
 
@@ -78,9 +79,9 @@ export interface AppConfig {
     azureAssistants?: TAssistantEndpoint;
     /** Agents endpoint configuration */
     [EModelEndpoint.agents]?: TAgentsEndpoint;
+    /** Custom endpoints configuration */
+    [EModelEndpoint.custom]?: TCustomEndpoints;
     /** Global endpoint configuration */
     all?: TEndpoint;
-    /** Any additional endpoint configurations */
-    [key: string]: unknown;
   };
 }

packages/api/src/types/endpoints.ts

@@ -0,0 +1,3 @@
+import type { TConfig } from 'librechat-data-provider';
+
+export type TCustomEndpointsConfig = Partial<{ [key: string]: Omit<TConfig, 'order'> }>;

packages/api/src/types/index.ts

@@ -1,6 +1,7 @@
 export * from './config';
 export * from './azure';
 export * from './balance';
+export * from './endpoints';
 export * from './events';
 export * from './error';
 export * from './google';

packages/data-provider/src/config.ts

@@ -300,6 +300,7 @@ export const endpointSchema = baseEndpointSchema.merge(
     }),
     summarize: z.boolean().optional(),
     summaryModel: z.string().optional(),
+    iconURL: z.string().optional(),
     forcePrompt: z.boolean().optional(),
     modelDisplayLabel: z.string().optional(),
     headers: z.record(z.any()).optional(),
@@ -789,6 +790,8 @@ export const memorySchema = z.object({
 
 export type TMemoryConfig = z.infer<typeof memorySchema>;
 
+const customEndpointsSchema = z.array(endpointSchema.partial()).optional();
+
 export const configSchema = z.object({
   version: z.string(),
   cache: z.boolean().default(true),
@@ -837,7 +840,7 @@ export const configSchema = z.object({
       [EModelEndpoint.azureAssistants]: assistantEndpointSchema.optional(),
       [EModelEndpoint.assistants]: assistantEndpointSchema.optional(),
       [EModelEndpoint.agents]: agentsEndpointSchema.optional(),
-      [EModelEndpoint.custom]: z.array(endpointSchema.partial()).optional(),
+      [EModelEndpoint.custom]: customEndpointsSchema.optional(),
       [EModelEndpoint.bedrock]: baseEndpointSchema.optional(),
     })
     .strict()
@@ -850,6 +853,7 @@ export const configSchema = z.object({
 export const getConfigDefaults = () => getSchemaDefaults(configSchema);
 
 export type TCustomConfig = z.infer<typeof configSchema>;
+export type TCustomEndpoints = z.infer<typeof customEndpointsSchema>;
 
 export type TProviderSchema =
   | z.infer<typeof ttsOpenaiSchema>