🪨 feat: AWS Bedrock support (#3935)

* feat: Add BedrockIcon component to SVG library * feat: EModelEndpoint.bedrock * feat: first pass, bedrock chat. note: AgentClient is returning `agents` as conversation.endpoint * fix: declare endpoint in initialization step * chore: Update @librechat/agents dependency to version 1.4.5 * feat: backend content aggregation for agents/bedrock * feat: abort agent requests * feat: AWS Bedrock icons * WIP: agent provider schema parsing * chore: Update EditIcon props type * refactor(useGenerationsByLatest): make agents and bedrock editable * refactor: non-assistant message content, parts * fix: Bedrock response `sender` * fix: use endpointOption.model_parameters not endpointOption.modelOptions * fix: types for step handler * refactor: Update Agents.ToolCallDelta type * refactor: Remove unnecessary assignment of parentMessageId in AskController * refactor: remove unnecessary assignment of parentMessageId (agent request handler) * fix(bedrock/agents): message regeneration * refactor: dynamic form elements using react-hook-form Controllers * fix: agent icons/labels for messages * fix: agent actions * fix: use of new dynamic tags causing application crash * refactor: dynamic settings touch-ups * refactor: update Slider component to allow custom track class name * refactor: update DynamicSlider component styles * refactor: use Constants value for GLOBAL_PROJECT_NAME (enum) * feat: agent share global methods/controllers * fix: agents query * fix: `getResponseModel` * fix: share prompt a11y issue * refactor: update SharePrompt dialog theme styles * refactor: explicit typing for SharePrompt * feat: add agent roles/permissions * chore: update @librechat/agents dependency to version 1.4.7 for tool_call_ids edge case * fix(Anthropic): messages.X.content.Y.tool_use.input: Input should be a valid dictionary * fix: handle text parts with tool_call_ids and empty text * fix: role initialization * refactor: don't make instructions required * refactor: improve typing of Text part * fix: setShowStopButton for agents route * chore: remove params for now * fix: add streamBuffer and streamRate to help prevent 'Overloaded' errors from Anthropic API * refactor: remove console.log statement in ContentRender component * chore: typing, rename Context to Delete Button * chore(DeleteButton): logging * refactor(Action): make accessible * style(Action): improve a11y again * refactor: remove use/mention of mongoose sessions * feat: first pass, sharing agents * feat: visual indicator for global agent, remove author when serving to non-author * wip: params * chore: fix typing issues * fix(schemas): typing * refactor: improve accessibility of ListCard component and fix console React warning * wip: reset templates for non-legacy new convos * Revert "wip: params" This reverts commit f8067e91d4. * Revert "refactor: dynamic form elements using react-hook-form Controllers" This reverts commit 2150c4815d. * fix(Parameters): types and parameter effect update to only update local state to parameters * refactor: optimize useDebouncedInput hook for better performance * feat: first pass, anthropic bedrock params * chore: paramEndpoints check for endpointType too * fix: maxTokens to use coerceNumber.optional(), * feat: extra chat model params * chore: reduce code repetition * refactor: improve preset title handling in SaveAsPresetDialog component * refactor: improve preset handling in HeaderOptions component * chore: improve typing, replace legacy dialog for SaveAsPresetDialog * feat: save as preset from parameters panel * fix: multi-search in select dropdown when using Option type * refactor: update default showDefault value to false in Dynamic components * feat: Bedrock presets settings * chore: config, fix agents schema, update config version * refactor: update AWS region variable name in bedrock options endpoint to BEDROCK_AWS_DEFAULT_REGION * refactor: update baseEndpointSchema in config.ts to include baseURL property * refactor: update createRun function to include req parameter and set streamRate based on provider * feat: availableRegions via config * refactor: remove unused demo agent controller file * WIP: title * Update @librechat/agents to version 1.5.0 * chore: addTitle.js to handle empty responseText * feat: support images and titles * feat: context token updates * Refactor BaseClient test to use expect.objectContaining * refactor: add model select, remove header options params, move side panel params below prompts * chore: update models list, catch title error * feat: model service for bedrock models (env) * chore: Remove verbose debug log in AgentClient class following stream * feat(bedrock): track token spend; fix: token rates, value key mapping for AWS models * refactor: handle streamRate in `handleLLMNewToken` callback * chore: AWS Bedrock example config in `.env.example` * refactor: Rename bedrockMeta to bedrockGeneral in settings.ts and use for AI21 and Amazon Bedrock providers * refactor: Update `.env.example` with AWS Bedrock model IDs URL and additional notes * feat: titleModel support for bedrock * refactor: Update `.env.example` with additional notes for AWS Bedrock model IDs
2026-01-25 19:56:13 +01:00 · 2024-09-09 12:06:59 -04:00 · 2024-09-09 12:06:59 -04:00 · d59b62174f
commit d59b62174f
parent 8c14360263
134 changed files with 3684 additions and 1213 deletions
--- a/packages/data-provider/src/bedrock.ts
+++ b/packages/data-provider/src/bedrock.ts
@ -0,0 +1,144 @@
+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,
+    /* 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(s.removeNullishValues)
+  .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,
+    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',
+      '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;
+};