2024-04-19 12:05:39 -04:00
|
|
|
const {
|
|
|
|
EModelEndpoint,
|
|
|
|
validateAzureGroups,
|
|
|
|
mapModelToAzureConfig,
|
|
|
|
} = require('librechat-data-provider');
|
|
|
|
const { logger } = require('~/config');
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Sets up the Azure OpenAI configuration from the config (`librechat.yaml`) file.
|
|
|
|
* @param {TCustomConfig} config - The loaded custom configuration.
|
|
|
|
* @returns {TAzureConfig} The Azure OpenAI configuration.
|
|
|
|
*/
|
|
|
|
function azureConfigSetup(config) {
|
|
|
|
const { groups, ...azureConfiguration } = config.endpoints[EModelEndpoint.azureOpenAI];
|
|
|
|
/** @type {TAzureConfigValidationResult} */
|
|
|
|
const { isValid, modelNames, modelGroupMap, groupMap, errors } = validateAzureGroups(groups);
|
|
|
|
|
|
|
|
if (!isValid) {
|
|
|
|
const errorString = errors.join('\n');
|
|
|
|
const errorMessage = 'Invalid Azure OpenAI configuration:\n' + errorString;
|
|
|
|
logger.error(errorMessage);
|
|
|
|
throw new Error(errorMessage);
|
|
|
|
}
|
|
|
|
|
|
|
|
const assistantModels = [];
|
|
|
|
const assistantGroups = new Set();
|
|
|
|
for (const modelName of modelNames) {
|
|
|
|
mapModelToAzureConfig({ modelName, modelGroupMap, groupMap });
|
|
|
|
const groupName = modelGroupMap?.[modelName]?.group;
|
|
|
|
const modelGroup = groupMap?.[groupName];
|
|
|
|
let supportsAssistants = modelGroup?.assistants || modelGroup?.[modelName]?.assistants;
|
|
|
|
if (supportsAssistants) {
|
|
|
|
assistantModels.push(modelName);
|
|
|
|
!assistantGroups.has(groupName) && assistantGroups.add(groupName);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (azureConfiguration.assistants && assistantModels.length === 0) {
|
|
|
|
throw new Error(
|
|
|
|
'No Azure models are configured to support assistants. Please remove the `assistants` field or configure at least one model to support assistants.',
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
🤖 feat: OpenAI Assistants v2 (initial support) (#2781)
* 🤖 Assistants V2 Support: Part 1
- Separated Azure Assistants to its own endpoint
- File Search / Vector Store integration is incomplete, but can toggle and use storage from playground
- Code Interpreter resource files can be added but not deleted
- GPT-4o is supported
- Many improvements to the Assistants Endpoint overall
data-provider v2 changes
copy existing route as v1
chore: rename new endpoint to reduce comparison operations and add new azure filesource
api: add azureAssistants part 1
force use of version for assistants/assistantsAzure
chore: switch name back to azureAssistants
refactor type version: string | number
Ensure assistants endpoints have version set
fix: isArchived type issue in ConversationListParams
refactor: update assistants mutations/queries with endpoint/version definitions, update Assistants Map structure
chore: FilePreview component ExtendedFile type assertion
feat: isAssistantsEndpoint helper
chore: remove unused useGenerations
chore(buildTree): type issue
chore(Advanced): type issue (unused component, maybe in future)
first pass for multi-assistant endpoint rewrite
fix(listAssistants): pass params correctly
feat: list separate assistants by endpoint
fix(useTextarea): access assistantMap correctly
fix: assistant endpoint switching, resetting ID
fix: broken during rewrite, selecting assistant mention
fix: set/invalidate assistants endpoint query data correctly
feat: Fix issue with assistant ID not being reset correctly
getOpenAIClient helper function
feat: add toast for assistant deletion
fix: assistants delete right after create issue for azure
fix: assistant patching
refactor: actions to use getOpenAIClient
refactor: consolidate logic into helpers file
fix: issue where conversation data was not initially available
v1 chat support
refactor(spendTokens): only early return if completionTokens isNaN
fix(OpenAIClient): ensure spendTokens has all necessary params
refactor: route/controller logic
fix(assistants/initializeClient): use defaultHeaders field
fix: sanitize default operation id
chore: bump openai package
first pass v2 action service
feat: retroactive domain parsing for actions added via v1
feat: delete db records of actions/assistants on openai assistant deletion
chore: remove vision tools from v2 assistants
feat: v2 upload and delete assistant vision images
WIP first pass, thread attachments
fix: show assistant vision files (save local/firebase copy)
v2 image continue
fix: annotations
fix: refine annotations
show analyze as error if is no longer submitting before progress reaches 1 and show file_search as retrieval tool
fix: abort run, undefined endpoint issue
refactor: consolidate capabilities logic and anticipate versioning
frontend version 2 changes
fix: query selection and filter
add endpoint to unknown filepath
add file ids to resource, deleting in progress
enable/disable file search
remove version log
* 🤖 Assistants V2 Support: Part 2
🎹 fix: Autocompletion Chrome Bug on Action API Key Input
chore: remove `useOriginNavigate`
chore: set correct OpenAI Storage Source
fix: azure file deletions, instantiate clients by source for deletion
update code interpret files info
feat: deleteResourceFileId
chore: increase poll interval as azure easily rate limits
fix: openai file deletions, TODO: evaluate rejected deletion settled promises to determine which to delete from db records
file source icons
update table file filters
chore: file search info and versioning
fix: retrieval update with necessary tool_resources if specified
fix(useMentions): add optional chaining in case listMap value is undefined
fix: force assistant avatar roundedness
fix: azure assistants, check correct flag
chore: bump data-provider
* fix: merge conflict
* ci: fix backend tests due to new updates
* chore: update .env.example
* meilisearch improvements
* localization updates
* chore: update comparisons
* feat: add additional metadata: endpoint, author ID
* chore: azureAssistants ENDPOINTS exclusion warning
2024-05-19 12:56:55 -04:00
|
|
|
if (
|
|
|
|
azureConfiguration.assistants &&
|
|
|
|
process.env.ENDPOINTS &&
|
|
|
|
!process.env.ENDPOINTS.includes(EModelEndpoint.azureAssistants)
|
|
|
|
) {
|
|
|
|
logger.warn(
|
|
|
|
`Azure Assistants are configured, but the endpoint will not be accessible as it's not included in the ENDPOINTS environment variable.
|
|
|
|
Please add the value "${EModelEndpoint.azureAssistants}" to the ENDPOINTS list if expected.`,
|
|
|
|
);
|
|
|
|
}
|
|
|
|
|
2024-04-19 12:05:39 -04:00
|
|
|
return {
|
|
|
|
modelNames,
|
|
|
|
modelGroupMap,
|
|
|
|
groupMap,
|
|
|
|
assistantModels,
|
|
|
|
assistantGroups: Array.from(assistantGroups),
|
|
|
|
...azureConfiguration,
|
|
|
|
};
|
|
|
|
}
|
|
|
|
|
|
|
|
module.exports = { azureConfigSetup };
|