Andreas/LibreChat
1
0
Fork 0
mirror of https://github.com/danny-avila/LibreChat.git synced 2025-12-25 12:48:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🪨 feat: AWS Bedrock support (#3935)

Browse source 
* 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
This commit is contained in:
Danny Avila 2024-09-09 12:06:59 -04:00 • committed by GitHub
parent 8c14360263
commit d59b62174f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
134 changed files with 3684 additions and 1213 deletions
Download patch file Download diff file Expand all files Collapse all files

36
client/src/utils/buildDefaultConvo.ts
View file

@ -9,19 +9,17 @@ import getLocalStorageItems from './getLocalStorageItems';
const buildDefaultConvo = ({
conversation,
endpoint,
endpoint = null,
models,
lastConversationSetup,
}: {
conversation: TConversation;
endpoint: EModelEndpoint;
endpoint: EModelEndpoint | null;
models: string[];
// TODO: fix this type as we should allow undefined
lastConversationSetup: TConversation;
}) => {
const { lastSelectedModel, lastSelectedTools, lastBingSettings } = getLocalStorageItems();
const { jailbreak, toneStyle } = lastBingSettings;
const endpointType = lastConversationSetup?.endpointType ?? conversation?.endpointType;
lastConversationSetup: TConversation | null;
}): TConversation => {
const { lastSelectedModel, lastSelectedTools } = getLocalStorageItems();
const endpointType = lastConversationSetup?.endpointType ?? conversation.endpointType;
if (!endpoint) {
return {
@ -32,10 +30,10 @@ const buildDefaultConvo = ({
}
const availableModels = models;
const model = lastConversationSetup?.model ?? lastSelectedModel?.[endpoint];
const secondaryModel =
const model = lastConversationSetup?.model ?? lastSelectedModel?.[endpoint] ?? '';
const secondaryModel: string | null =
endpoint === EModelEndpoint.gptPlugins
? lastConversationSetup?.agentOptions?.model ?? lastSelectedModel?.secondaryModel
? lastConversationSetup?.agentOptions?.model ?? lastSelectedModel?.secondaryModel ?? null
: null;
let possibleModels: string[], secondaryModels: string[];
@ -46,7 +44,7 @@ const buildDefaultConvo = ({
possibleModels = [...availableModels];
}
if (secondaryModel && availableModels.includes(secondaryModel)) {
if (secondaryModel != null && secondaryModel !== '' && availableModels.includes(secondaryModel)) {
secondaryModels = [secondaryModel, ...availableModels];
} else {
secondaryModels = [...availableModels];
@ -70,18 +68,20 @@ const buildDefaultConvo = ({
};
// Ensures assistant_id is always defined
if (isAssistantsEndpoint(endpoint) && !defaultConvo.assistant_id && convo.assistant_id) {
defaultConvo.assistant_id = convo.assistant_id;
const assistantId = convo?.assistant_id ?? '';
const defaultAssistantId = lastConversationSetup?.assistant_id ?? '';
if (isAssistantsEndpoint(endpoint) && !defaultAssistantId && assistantId) {
defaultConvo.assistant_id = assistantId;
}
// Ensures agent_id is always defined
if (isAgentsEndpoint(endpoint) && !defaultConvo.agent_id && convo.agent_id) {
defaultConvo.agent_id = convo.agent_id;
const agentId = convo?.agent_id ?? '';
const defaultAgentId = lastConversationSetup?.agent_id ?? '';
if (isAgentsEndpoint(endpoint) && !defaultAgentId && agentId) {
defaultConvo.agent_id = agentId;
}
defaultConvo.tools = lastConversationSetup?.tools ?? lastSelectedTools ?? defaultConvo.tools;
defaultConvo.jailbreak = jailbreak ?? defaultConvo.jailbreak;
defaultConvo.toneStyle = toneStyle ?? defaultConvo.toneStyle;
return defaultConvo;
};

21
client/src/utils/forms.ts → client/src/utils/forms.tsx
View file

@ -1,3 +1,4 @@
import { EarthIcon } from 'lucide-react';
import { alternateName } from 'librechat-data-provider';
import type { Agent, TFile } from 'librechat-data-provider';
import type { DropdownValueSetter, TAgentOption } from '~/common';
@ -39,14 +40,22 @@ export const createProviderOption = (provider: string) => ({
type FileTuple = [string, Partial<TFile>];
type FileList = Array<FileTuple>;
export const processAgentOption = (
_agent?: Agent,
fileMap?: Record<string, TFile>,
): TAgentOption => {
export const processAgentOption = ({
agent: _agent,
fileMap,
instanceProjectId,
}: {
agent?: Agent;
fileMap?: Record<string, TFile | undefined>;
instanceProjectId?: string;
}): TAgentOption => {
const isGlobal =
(instanceProjectId != null && _agent?.projectIds?.includes(instanceProjectId)) ?? false;
const agent: TAgentOption = {
...(_agent ?? ({} as Agent)),
label: _agent?.name ?? '',
value: _agent?.id ?? '',
icon: isGlobal ? <EarthIcon className="icon-md text-green-400" /> : null,
// files: _agent?.file_ids ? ([] as FileList) : undefined,
// code_files: _agent?.tool_resources?.code_interpreter?.file_ids
// ? ([] as FileList)
@ -58,7 +67,7 @@ export const processAgentOption = (
}
const handleFile = (file_id: string, list?: FileList) => {
const file = fileMap?.[file_id];
const file = fileMap[file_id];
if (file) {
list?.push([file_id, file]);
} else {
@ -82,7 +91,7 @@ export const processAgentOption = (
}
if (agent.code_files && _agent?.tool_resources?.code_interpreter?.file_ids) {
_agent.tool_resources?.code_interpreter?.file_ids?.forEach((file_id) =>
_agent.tool_resources.code_interpreter.file_ids.forEach((file_id) =>
handleFile(file_id, agent.code_files),
);
}

21
client/src/utils/getLocalStorageItems.ts
View file

@ -1,24 +1,25 @@
import { LocalStorageKeys } from 'librechat-data-provider';
import { LocalStorageKeys, TConversation } from 'librechat-data-provider';
export default function getLocalStorageItems() {
const items = {
lastSelectedModel: localStorage.getItem(LocalStorageKeys.LAST_MODEL),
lastSelectedTools: localStorage.getItem(LocalStorageKeys.LAST_TOOLS),
lastBingSettings: localStorage.getItem(LocalStorageKeys.LAST_BING),
lastConversationSetup: localStorage.getItem(LocalStorageKeys.LAST_CONVO_SETUP + '_0'),
lastSelectedModel: localStorage.getItem(LocalStorageKeys.LAST_MODEL) ?? '',
lastSelectedTools: localStorage.getItem(LocalStorageKeys.LAST_TOOLS) ?? '',
lastConversationSetup: localStorage.getItem(LocalStorageKeys.LAST_CONVO_SETUP + '_0') ?? '',
};
const lastSelectedModel = items.lastSelectedModel ? JSON.parse(items.lastSelectedModel) : {};
const lastSelectedTools = items.lastSelectedTools ? JSON.parse(items.lastSelectedTools) : [];
const lastBingSettings = items.lastBingSettings ? JSON.parse(items.lastBingSettings) : {};
const lastSelectedModel = items.lastSelectedModel
? (JSON.parse(items.lastSelectedModel) as Record<string, string | undefined> | null)
: {};
const lastSelectedTools = items.lastSelectedTools
? (JSON.parse(items.lastSelectedTools) as string[] | null)
: [];
const lastConversationSetup = items.lastConversationSetup
? JSON.parse(items.lastConversationSetup)
? (JSON.parse(items.lastConversationSetup) as Partial<TConversation> | null)
: {};
return {
lastSelectedModel,
lastSelectedTools,
lastBingSettings,
lastConversationSetup,
};
}