🔧 fix: Recognize azureAssistants Endpoint Config (#2824)

* fix bug: azureAssistants endpoint config

* refactor(assistants): make default value last

* refactor(AppService): make assistantsConfigSetup potentially undefined value last arg

* chore: Update JSDocs params assistants.js

* Update assistants.js

---------

Co-authored-by: 彭修照 <pengxiuzhao.uh@haier.com>
Co-authored-by: Danny Avila <danacordially@gmail.com>
This commit is contained in:
gjz 2024-05-23 11:17:52 +08:00 committed by GitHub
parent 6cf1c85363
commit a937650df6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions

View file

@ -78,6 +78,7 @@ const AppService = async (app) => {
if (config?.endpoints?.[EModelEndpoint.azureAssistants]) { if (config?.endpoints?.[EModelEndpoint.azureAssistants]) {
endpointLocals[EModelEndpoint.azureAssistants] = assistantsConfigSetup( endpointLocals[EModelEndpoint.azureAssistants] = assistantsConfigSetup(
config, config,
EModelEndpoint.azureAssistants,
endpointLocals[EModelEndpoint.azureAssistants], endpointLocals[EModelEndpoint.azureAssistants],
); );
} }
@ -85,6 +86,7 @@ const AppService = async (app) => {
if (config?.endpoints?.[EModelEndpoint.assistants]) { if (config?.endpoints?.[EModelEndpoint.assistants]) {
endpointLocals[EModelEndpoint.assistants] = assistantsConfigSetup( endpointLocals[EModelEndpoint.assistants] = assistantsConfigSetup(
config, config,
EModelEndpoint.assistants,
endpointLocals[EModelEndpoint.assistants], endpointLocals[EModelEndpoint.assistants],
); );
} }

View file

@ -20,16 +20,17 @@ function azureAssistantsDefaults() {
/** /**
* Sets up the Assistants configuration from the config (`librechat.yaml`) file. * Sets up the Assistants configuration from the config (`librechat.yaml`) file.
* @param {TCustomConfig} config - The loaded custom configuration. * @param {TCustomConfig} config - The loaded custom configuration.
* @param {Partial<TAssistantEndpoint>} [prevConfig] * @param {EModelEndpoint.assistants|EModelEndpoint.azureAssistants} assistantsEndpoint - The Assistants endpoint name.
* - The previously loaded assistants configuration from Azure OpenAI Assistants option. * - The previously loaded assistants configuration from Azure OpenAI Assistants option.
* @param {Partial<TAssistantEndpoint>} [prevConfig]
* @returns {Partial<TAssistantEndpoint>} The Assistants endpoint configuration. * @returns {Partial<TAssistantEndpoint>} The Assistants endpoint configuration.
*/ */
function assistantsConfigSetup(config, prevConfig = {}) { function assistantsConfigSetup(config, assistantsEndpoint, prevConfig = {}) {
const assistantsConfig = config.endpoints[EModelEndpoint.assistants]; const assistantsConfig = config.endpoints[assistantsEndpoint];
const parsedConfig = assistantEndpointSchema.parse(assistantsConfig); const parsedConfig = assistantEndpointSchema.parse(assistantsConfig);
if (assistantsConfig.supportedIds?.length && assistantsConfig.excludedIds?.length) { if (assistantsConfig.supportedIds?.length && assistantsConfig.excludedIds?.length) {
logger.warn( logger.warn(
`Both \`supportedIds\` and \`excludedIds\` are defined for the ${EModelEndpoint.assistants} endpoint; \`excludedIds\` field will be ignored.`, `Both \`supportedIds\` and \`excludedIds\` are defined for the ${assistantsEndpoint} endpoint; \`excludedIds\` field will be ignored.`,
); );
} }