mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-12-16 16:30:15 +01:00
* wip: first pass for azure endpoint schema * refactor: azure config to return groupMap and modelConfigMap * wip: naming and schema changes * refactor(errorsToString): move to data-provider * feat: rename to azureGroups, add additional tests, tests all expected outcomes, return errors * feat(AppService): load Azure groups * refactor(azure): use imported types, write `mapModelToAzureConfig` * refactor: move `extractEnvVariable` to data-provider * refactor(validateAzureGroups): throw on duplicate groups or models; feat(mapModelToAzureConfig): throw if env vars not present, add tests * refactor(AppService): ensure each model is properly configured on startup * refactor: deprecate azureOpenAI environment variables in favor of librechat.yaml config * feat: use helper functions to handle and order enabled/default endpoints; initialize azureOpenAI from config file * refactor: redefine types as well as load azureOpenAI models from config file * chore(ci): fix test description naming * feat(azureOpenAI): use validated model grouping for request authentication * chore: bump data-provider following rebase * chore: bump config file version noting significant changes * feat: add title options and switch azure configs for titling and vision requests * feat: enable azure plugins from config file * fix(ci): pass tests * chore(.env.example): mark `PLUGINS_USE_AZURE` as deprecated * fix(fetchModels): early return if apiKey not passed * chore: fix azure config typing * refactor(mapModelToAzureConfig): return baseURL and headers as well as azureOptions * feat(createLLM): use `azureOpenAIBasePath` * feat(parsers): resolveHeaders * refactor(extractBaseURL): handle invalid input * feat(OpenAIClient): handle headers and baseURL for azureConfig * fix(ci): pass `OpenAIClient` tests * chore: extract env var for azureOpenAI group config, baseURL * docs: azureOpenAI config setup docs * feat: safe check of potential conflicting env vars that map to unique placeholders * fix: reset apiKey when model switches from originally requested model (vision or title) * chore: linting * docs: CONFIG_PATH notes in custom_config.md
211 lines
6.4 KiB
TypeScript
211 lines
6.4 KiB
TypeScript
import type { ZodError } from 'zod';
|
|
import type {
|
|
TAzureGroups,
|
|
TAzureGroupMap,
|
|
TAzureModelGroupMap,
|
|
TValidatedAzureConfig,
|
|
} from '../src/config';
|
|
import { errorsToString, extractEnvVariable, envVarRegex } from '../src/parsers';
|
|
import { azureGroupConfigsSchema } from '../src/config';
|
|
|
|
export const deprecatedAzureVariables = [
|
|
/* "related to" precedes description text */
|
|
{ key: 'AZURE_OPENAI_DEFAULT_MODEL', description: 'setting a default model' },
|
|
{ key: 'AZURE_OPENAI_MODELS', description: 'setting models' },
|
|
{
|
|
key: 'AZURE_USE_MODEL_AS_DEPLOYMENT_NAME',
|
|
description: 'using model names as deployment names',
|
|
},
|
|
{ key: 'AZURE_API_KEY', description: 'setting a single Azure API key' },
|
|
{ key: 'AZURE_OPENAI_API_INSTANCE_NAME', description: 'setting a single Azure instance name' },
|
|
{
|
|
key: 'AZURE_OPENAI_API_DEPLOYMENT_NAME',
|
|
description: 'setting a single Azure deployment name',
|
|
},
|
|
{ key: 'AZURE_OPENAI_API_VERSION', description: 'setting a single Azure API version' },
|
|
{
|
|
key: 'AZURE_OPENAI_API_COMPLETIONS_DEPLOYMENT_NAME',
|
|
description: 'setting a single Azure completions deployment name',
|
|
},
|
|
{
|
|
key: 'AZURE_OPENAI_API_EMBEDDINGS_DEPLOYMENT_NAME',
|
|
description: 'setting a single Azure embeddings deployment name',
|
|
},
|
|
{
|
|
key: 'PLUGINS_USE_AZURE',
|
|
description: 'using Azure for Plugins',
|
|
},
|
|
];
|
|
|
|
export const conflictingAzureVariables = [
|
|
{
|
|
key: 'INSTANCE_NAME',
|
|
},
|
|
{
|
|
key: 'DEPLOYMENT_NAME',
|
|
},
|
|
];
|
|
|
|
export function validateAzureGroups(configs: TAzureGroups): TValidatedAzureConfig & {
|
|
isValid: boolean;
|
|
errors: (ZodError | string)[];
|
|
} {
|
|
let isValid = true;
|
|
const modelNames: string[] = [];
|
|
const modelGroupMap: TAzureModelGroupMap = {};
|
|
const groupMap: TAzureGroupMap = {};
|
|
const errors: (ZodError | string)[] = [];
|
|
|
|
const result = azureGroupConfigsSchema.safeParse(configs);
|
|
if (!result.success) {
|
|
isValid = false;
|
|
errors.push(errorsToString(result.error.errors));
|
|
} else {
|
|
for (const group of result.data) {
|
|
const {
|
|
group: groupName,
|
|
apiKey,
|
|
instanceName,
|
|
deploymentName,
|
|
version,
|
|
baseURL,
|
|
additionalHeaders,
|
|
models,
|
|
} = group;
|
|
|
|
if (groupMap[groupName]) {
|
|
errors.push(`Duplicate group name detected: "${groupName}". Group names must be unique.`);
|
|
return { isValid: false, modelNames, modelGroupMap, groupMap, errors };
|
|
}
|
|
|
|
groupMap[groupName] = {
|
|
apiKey,
|
|
instanceName,
|
|
deploymentName,
|
|
version,
|
|
baseURL,
|
|
additionalHeaders,
|
|
models,
|
|
};
|
|
|
|
for (const modelName in group.models) {
|
|
modelNames.push(modelName);
|
|
const model = group.models[modelName];
|
|
|
|
if (modelGroupMap[modelName]) {
|
|
errors.push(
|
|
`Duplicate model name detected: "${modelName}". Model names must be unique across groups.`,
|
|
);
|
|
return { isValid: false, modelNames, modelGroupMap, groupMap, errors };
|
|
}
|
|
|
|
if (typeof model === 'boolean') {
|
|
// For boolean models, check if group-level deploymentName and version are present.
|
|
if (!group.deploymentName || !group.version) {
|
|
errors.push(
|
|
`Model "${modelName}" in group "${groupName}" is missing a deploymentName or version.`,
|
|
);
|
|
return { isValid: false, modelNames, modelGroupMap, groupMap, errors };
|
|
}
|
|
|
|
modelGroupMap[modelName] = {
|
|
group: groupName,
|
|
};
|
|
} else {
|
|
// For object models, check if deploymentName and version are required but missing.
|
|
if (
|
|
(!model.deploymentName && !group.deploymentName) ||
|
|
(!model.version && !group.version)
|
|
) {
|
|
errors.push(
|
|
`Model "${modelName}" in group "${groupName}" is missing a required deploymentName or version.`,
|
|
);
|
|
return { isValid: false, modelNames, modelGroupMap, groupMap, errors };
|
|
}
|
|
|
|
modelGroupMap[modelName] = {
|
|
group: groupName,
|
|
// deploymentName: model.deploymentName || group.deploymentName,
|
|
// version: model.version || group.version,
|
|
};
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
return { isValid, modelNames, modelGroupMap, groupMap, errors };
|
|
}
|
|
|
|
type AzureOptions = {
|
|
azureOpenAIApiKey: string;
|
|
azureOpenAIApiInstanceName: string;
|
|
azureOpenAIApiDeploymentName: string;
|
|
azureOpenAIApiVersion: string;
|
|
};
|
|
|
|
type MappedAzureConfig = {
|
|
azureOptions: AzureOptions;
|
|
baseURL?: string;
|
|
headers?: Record<string, string>;
|
|
};
|
|
|
|
export function mapModelToAzureConfig({
|
|
modelName,
|
|
modelGroupMap,
|
|
groupMap,
|
|
}: Omit<TValidatedAzureConfig, 'modelNames'> & {
|
|
modelName: string;
|
|
}): MappedAzureConfig {
|
|
const modelConfig = modelGroupMap[modelName];
|
|
if (!modelConfig) {
|
|
throw new Error(`Model named "${modelName}" not found in configuration.`);
|
|
}
|
|
|
|
const groupConfig = groupMap[modelConfig.group];
|
|
if (!groupConfig) {
|
|
throw new Error(
|
|
`Group "${modelConfig.group}" for model "${modelName}" not found in configuration.`,
|
|
);
|
|
}
|
|
|
|
const modelDetails = groupConfig.models[modelName];
|
|
const deploymentName =
|
|
typeof modelDetails === 'object'
|
|
? modelDetails.deploymentName || groupConfig.deploymentName
|
|
: groupConfig.deploymentName;
|
|
const version =
|
|
typeof modelDetails === 'object'
|
|
? modelDetails.version || groupConfig.version
|
|
: groupConfig.version;
|
|
|
|
if (!deploymentName || !version) {
|
|
throw new Error(
|
|
`Model "${modelName}" in group "${modelConfig.group}" is missing a deploymentName ("${deploymentName}") or version ("${version}").`,
|
|
);
|
|
}
|
|
|
|
const azureOptions: AzureOptions = {
|
|
azureOpenAIApiKey: extractEnvVariable(groupConfig.apiKey),
|
|
azureOpenAIApiInstanceName: extractEnvVariable(groupConfig.instanceName),
|
|
azureOpenAIApiDeploymentName: extractEnvVariable(deploymentName),
|
|
azureOpenAIApiVersion: extractEnvVariable(version),
|
|
};
|
|
|
|
for (const value of Object.values(azureOptions)) {
|
|
if (typeof value === 'string' && envVarRegex.test(value)) {
|
|
throw new Error(`Azure configuration environment variable "${value}" was not found.`);
|
|
}
|
|
}
|
|
|
|
const result: MappedAzureConfig = { azureOptions };
|
|
|
|
if (groupConfig.baseURL) {
|
|
result.baseURL = extractEnvVariable(groupConfig.baseURL);
|
|
}
|
|
|
|
if (groupConfig.additionalHeaders) {
|
|
result.headers = groupConfig.additionalHeaders;
|
|
}
|
|
|
|
return result;
|
|
}
|