mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-15 23:15:30 +01:00
🔧 fix: Remove Bedrock Config Transform introduced in #9931 (#10628)
Some checks failed
Docker Dev Branch Images Build / build (Dockerfile, lc-dev, node) (push) Has been cancelled
Docker Dev Branch Images Build / build (Dockerfile.multi, lc-dev-api, api-build) (push) Has been cancelled
Publish `@librechat/client` to NPM / build-and-publish (push) Has been cancelled
Publish `librechat-data-provider` to NPM / build (push) Has been cancelled
Publish `@librechat/data-schemas` to NPM / build-and-publish (push) Has been cancelled
Docker Dev Images Build / build (Dockerfile, librechat-dev, node) (push) Has been cancelled
Docker Dev Images Build / build (Dockerfile.multi, librechat-dev-api, api-build) (push) Has been cancelled
Sync Locize Translations & Create Translation PR / Sync Translation Keys with Locize (push) Has been cancelled
Publish `librechat-data-provider` to NPM / publish-npm (push) Has been cancelled
Sync Locize Translations & Create Translation PR / Create Translation PR on Version Published (push) Has been cancelled
Some checks failed
Docker Dev Branch Images Build / build (Dockerfile, lc-dev, node) (push) Has been cancelled
Docker Dev Branch Images Build / build (Dockerfile.multi, lc-dev-api, api-build) (push) Has been cancelled
Publish `@librechat/client` to NPM / build-and-publish (push) Has been cancelled
Publish `librechat-data-provider` to NPM / build (push) Has been cancelled
Publish `@librechat/data-schemas` to NPM / build-and-publish (push) Has been cancelled
Docker Dev Images Build / build (Dockerfile, librechat-dev, node) (push) Has been cancelled
Docker Dev Images Build / build (Dockerfile.multi, librechat-dev-api, api-build) (push) Has been cancelled
Sync Locize Translations & Create Translation PR / Sync Translation Keys with Locize (push) Has been cancelled
Publish `librechat-data-provider` to NPM / publish-npm (push) Has been cancelled
Sync Locize Translations & Create Translation PR / Create Translation PR on Version Published (push) Has been cancelled
* fix: Header and Environment Variable Handling Bug from #9931 * refactor: Remove warning log for missing tokens in extractOpenIDTokenInfo function * feat: Enhance resolveNestedObject function for improved placeholder processing - Added a new function `resolveNestedObject` to recursively process nested objects, replacing placeholders in string values while preserving the original structure. - Updated `createTestUser` to use `IUser` type and modified user ID generation. - Added comprehensive unit tests for `resolveNestedObject` to cover various scenarios, including nested structures, arrays, and custom user variables. - Improved type handling in `processMCPEnv` to ensure correct processing of mixed numeric and placeholder values. * refactor: Remove unnecessary manipulation of Bedrock options introduced in #9931 - Eliminated the resolveHeaders function call from the getOptions method in options.js, as it was no longer necessary for processing additional model request fields. - This change simplifies the code and improves maintainability.
This commit is contained in:
parent
03955bd5cf
commit
35319c1354
4 changed files with 690 additions and 21 deletions
|
|
@ -78,7 +78,8 @@ function processUserPlaceholders(value: string, user?: IUser): string {
|
|||
|
||||
for (const field of ALLOWED_USER_FIELDS) {
|
||||
const placeholder = `{{LIBRECHAT_USER_${field.toUpperCase()}}}`;
|
||||
if (!value.includes(placeholder)) {
|
||||
|
||||
if (typeof value !== 'string' || !value.includes(placeholder)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -111,6 +112,11 @@ function processUserPlaceholders(value: string, user?: IUser): string {
|
|||
* @returns The processed string with placeholders replaced
|
||||
*/
|
||||
function processBodyPlaceholders(value: string, body: RequestBody): string {
|
||||
// Type guard: ensure value is a string
|
||||
if (typeof value !== 'string') {
|
||||
return value;
|
||||
}
|
||||
|
||||
for (const field of ALLOWED_BODY_FIELDS) {
|
||||
const placeholder = `{{LIBRECHAT_BODY_${field.toUpperCase()}}}`;
|
||||
if (!value.includes(placeholder)) {
|
||||
|
|
@ -144,6 +150,11 @@ function processSingleValue({
|
|||
user?: IUser;
|
||||
body?: RequestBody;
|
||||
}): string {
|
||||
// Type guard: ensure we're working with a string
|
||||
if (typeof originalValue !== 'string') {
|
||||
return String(originalValue);
|
||||
}
|
||||
|
||||
let value = originalValue;
|
||||
|
||||
if (customUserVars) {
|
||||
|
|
@ -243,6 +254,74 @@ export function processMCPEnv(params: {
|
|||
return newObj;
|
||||
}
|
||||
|
||||
/**
|
||||
* Recursively processes a value, replacing placeholders in strings while preserving structure
|
||||
* @param value - The value to process (can be string, number, boolean, array, object, etc.)
|
||||
* @param options - Processing options
|
||||
* @returns The processed value with the same structure
|
||||
*/
|
||||
function processValue(
|
||||
value: unknown,
|
||||
options: {
|
||||
customUserVars?: Record<string, string>;
|
||||
user?: IUser;
|
||||
body?: RequestBody;
|
||||
},
|
||||
): unknown {
|
||||
if (typeof value === 'string') {
|
||||
return processSingleValue({
|
||||
originalValue: value,
|
||||
customUserVars: options.customUserVars,
|
||||
user: options.user,
|
||||
body: options.body,
|
||||
});
|
||||
}
|
||||
|
||||
if (Array.isArray(value)) {
|
||||
return value.map((item) => processValue(item, options));
|
||||
}
|
||||
|
||||
if (value !== null && typeof value === 'object') {
|
||||
const processed: Record<string, unknown> = {};
|
||||
for (const [key, val] of Object.entries(value)) {
|
||||
processed[key] = processValue(val, options);
|
||||
}
|
||||
return processed;
|
||||
}
|
||||
|
||||
return value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Recursively resolves placeholders in a nested object structure while preserving types.
|
||||
* Only processes string values - leaves numbers, booleans, arrays, and nested objects intact.
|
||||
*
|
||||
* @param options - Configuration object
|
||||
* @param options.obj - The object to process
|
||||
* @param options.user - Optional user object for replacing user field placeholders
|
||||
* @param options.body - Optional request body object for replacing body field placeholders
|
||||
* @param options.customUserVars - Optional custom user variables to replace placeholders
|
||||
* @returns The processed object with placeholders replaced in string values
|
||||
*/
|
||||
export function resolveNestedObject<T = unknown>(options?: {
|
||||
obj: T | undefined;
|
||||
user?: Partial<IUser> | { id: string };
|
||||
body?: RequestBody;
|
||||
customUserVars?: Record<string, string>;
|
||||
}): T {
|
||||
const { obj, user, body, customUserVars } = options ?? {};
|
||||
|
||||
if (!obj) {
|
||||
return obj as T;
|
||||
}
|
||||
|
||||
return processValue(obj, {
|
||||
customUserVars,
|
||||
user: user as IUser,
|
||||
body,
|
||||
}) as T;
|
||||
}
|
||||
|
||||
/**
|
||||
* Resolves header values by replacing user placeholders, body variables, custom variables, and environment variables.
|
||||
*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue