mirror of
https://github.com/danny-avila/LibreChat.git
synced 2025-09-22 08:12:00 +02:00

* ✨feat: OAuth for Actions * WIP: PoC flow state manager * refactor: Add identifier field to token model from action schema * chore: fix potential file type issues * ci: fix type issue with action metadata auth * fix: ensure FlowManagerOptions has a default ttl value * WIP: OAUTH actions * WIP: first pass OAuth Action * fix: standardize identifier usage in OAuth flow handling * fix: update token retrieval to include userId in query and use correct identifier * refacotr: update token retrieval to use userId for OAuth token query * feat: Tool Call Auth styling * fix: streamline token creation and add type field to token schema * refactor: cleanup OAuth flow by encrypting client credentials and ensuring oauth operations only run under condition * refactor: use encrypted credentials in OAuth callback * fix: update Token collection indexes to use expiresAt TTL index and not createdAt legacy index * refactor: enhance Token index cleanup by improving logging and removing redundant index creation logic * refactor: remove unused OAuth login route and related logic for improved clarity * refactor: replace fetch with axios for OAuth token exchange and improve error handling * refactor: better UX after authentication before oauth tool execution * refactor: implement cleanup handlers for FlowStateManager intervals to enhance resource management * refactor: encrypt OAuth tokens before storing and decrypt upon retrieval for enhanced security * refactor: enhance authentication success page with improved styling and countdown feature * refactor: add response_type parameter to OAuth redirect URI for improved compatibility * chore: update translation.json new localizations * chore: remove unused OGDialog import from OGDialogTemplate component * refactor: Actions Auth using new Dialog styling, use same component with Agents/Assistants * refactor: update removeNullishValues function to support removal of empty strings and adjust transform usage in schemas * chore: bump version of librechat-data-provider to 0.7.6991 * refactor: integrate removeNullishValues function to clean metadata before encryption in agent and assistant routes * refactor: update OAuth input fields to use 'password' type for better security * refactor: update localization placeholders for sign-in message to use double curly braces * refactor: add access_type parameter for offline access in createActionTool function * refactor: implement handleOAuthToken function for token management and encryption * feat: refresh token support * refactor: add default expiration for access token and error handling for missing token * feat: localizations for ActionAuth * refactor: set refresh token expiration to null to not expire if expiry never given * fix: prevent crash fromerror within async handleAbortError in AskController, EditController, and AgentController * feat: Action Callback URL * 🌍 i18n: Update translation.json with latest translations * refactor: handle errors in flow state checking to prevent unhandled promise rejections * fix: improve flow state concurrency to prevent multiple token creation calls * refactor: RequestExecutor to use separate axios instance * refactor: improve concurrency flows by keeping completed state until TTL expiry * refactor: increase TTL for flow state management and adjust monitoring interval * ci: mock axios instance creation in actions spec * feat: add Babel and Jest configuration files; implement FlowStateManager tests with concurrency handling * chore: add disableOAuth prop to ActionsAuth (not implemented for Assistants yet) --------- Co-authored-by: Danny Avila <danny@librechat.ai> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
147 lines
3.9 KiB
TypeScript
147 lines
3.9 KiB
TypeScript
import { z } from 'zod';
|
|
import * as s from './schemas';
|
|
|
|
export const bedrockInputSchema = s.tConversationSchema
|
|
.pick({
|
|
/* LibreChat params; optionType: 'conversation' */
|
|
modelLabel: true,
|
|
promptPrefix: true,
|
|
resendFiles: true,
|
|
iconURL: true,
|
|
greeting: true,
|
|
spec: true,
|
|
maxOutputTokens: true,
|
|
maxContextTokens: true,
|
|
artifacts: true,
|
|
/* Bedrock params; optionType: 'model' */
|
|
region: true,
|
|
system: true,
|
|
model: true,
|
|
maxTokens: true,
|
|
temperature: true,
|
|
topP: true,
|
|
stop: true,
|
|
/* Catch-all fields */
|
|
topK: true,
|
|
additionalModelRequestFields: true,
|
|
})
|
|
.transform((obj) => s.removeNullishValues(obj))
|
|
.catch(() => ({}));
|
|
|
|
export type BedrockConverseInput = z.infer<typeof bedrockInputSchema>;
|
|
|
|
export const bedrockInputParser = s.tConversationSchema
|
|
.pick({
|
|
/* LibreChat params; optionType: 'conversation' */
|
|
modelLabel: true,
|
|
promptPrefix: true,
|
|
resendFiles: true,
|
|
iconURL: true,
|
|
greeting: true,
|
|
spec: true,
|
|
artifacts: true,
|
|
maxOutputTokens: true,
|
|
maxContextTokens: true,
|
|
/* Bedrock params; optionType: 'model' */
|
|
region: true,
|
|
model: true,
|
|
maxTokens: true,
|
|
temperature: true,
|
|
topP: true,
|
|
stop: true,
|
|
/* Catch-all fields */
|
|
topK: true,
|
|
additionalModelRequestFields: true,
|
|
})
|
|
.catchall(z.any())
|
|
.transform((data) => {
|
|
const knownKeys = [
|
|
'modelLabel',
|
|
'promptPrefix',
|
|
'resendFiles',
|
|
'iconURL',
|
|
'greeting',
|
|
'spec',
|
|
'maxOutputTokens',
|
|
'artifacts',
|
|
'additionalModelRequestFields',
|
|
'region',
|
|
'model',
|
|
'maxTokens',
|
|
'temperature',
|
|
'topP',
|
|
'stop',
|
|
];
|
|
|
|
const additionalFields: Record<string, unknown> = {};
|
|
const typedData = data as Record<string, unknown>;
|
|
|
|
Object.entries(typedData).forEach(([key, value]) => {
|
|
if (!knownKeys.includes(key)) {
|
|
if (key === 'topK') {
|
|
additionalFields['top_k'] = value;
|
|
} else {
|
|
additionalFields[key] = value;
|
|
}
|
|
delete typedData[key];
|
|
}
|
|
});
|
|
|
|
if (Object.keys(additionalFields).length > 0) {
|
|
typedData.additionalModelRequestFields = {
|
|
...((typedData.additionalModelRequestFields as Record<string, unknown> | undefined) || {}),
|
|
...additionalFields,
|
|
};
|
|
}
|
|
|
|
if (typedData.maxOutputTokens !== undefined) {
|
|
typedData.maxTokens = typedData.maxOutputTokens;
|
|
} else if (typedData.maxTokens !== undefined) {
|
|
typedData.maxOutputTokens = typedData.maxTokens;
|
|
}
|
|
|
|
return s.removeNullishValues(typedData) as BedrockConverseInput;
|
|
})
|
|
.catch(() => ({}));
|
|
|
|
export const bedrockOutputParser = (data: Record<string, unknown>) => {
|
|
const knownKeys = [...Object.keys(s.tConversationSchema.shape), 'topK', 'top_k'];
|
|
const result: Record<string, unknown> = {};
|
|
|
|
// Extract known fields from the root level
|
|
Object.entries(data).forEach(([key, value]) => {
|
|
if (knownKeys.includes(key)) {
|
|
result[key] = value;
|
|
}
|
|
});
|
|
|
|
// Extract known fields from additionalModelRequestFields
|
|
if (
|
|
typeof data.additionalModelRequestFields === 'object' &&
|
|
data.additionalModelRequestFields !== null
|
|
) {
|
|
Object.entries(data.additionalModelRequestFields as Record<string, unknown>).forEach(
|
|
([key, value]) => {
|
|
if (knownKeys.includes(key)) {
|
|
if (key === 'top_k') {
|
|
result['topK'] = value;
|
|
} else {
|
|
result[key] = value;
|
|
}
|
|
}
|
|
},
|
|
);
|
|
}
|
|
|
|
// Handle maxTokens and maxOutputTokens
|
|
if (result.maxTokens !== undefined && result.maxOutputTokens === undefined) {
|
|
result.maxOutputTokens = result.maxTokens;
|
|
} else if (result.maxOutputTokens !== undefined && result.maxTokens === undefined) {
|
|
result.maxTokens = result.maxOutputTokens;
|
|
}
|
|
|
|
// Remove additionalModelRequestFields from the result
|
|
delete result.additionalModelRequestFields;
|
|
|
|
return result;
|
|
};
|