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

* 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 commitf8067e91d4
. * Revert "refactor: dynamic form elements using react-hook-form Controllers" This reverts commit2150c4815d
. * 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
133 lines
4.2 KiB
JavaScript
133 lines
4.2 KiB
JavaScript
// const {
|
|
// ErrorTypes,
|
|
// EModelEndpoint,
|
|
// resolveHeaders,
|
|
// mapModelToAzureConfig,
|
|
// } = require('librechat-data-provider');
|
|
// const { getUserKeyValues, checkUserKeyExpiry } = require('~/server/services/UserService');
|
|
// const { isEnabled, isUserProvided } = require('~/server/utils');
|
|
// const { getAzureCredentials } = require('~/utils');
|
|
// const { OpenAIClient } = require('~/app');
|
|
|
|
const { z } = require('zod');
|
|
const { tool } = require('@langchain/core/tools');
|
|
const { createContentAggregator } = require('@librechat/agents');
|
|
const {
|
|
EModelEndpoint,
|
|
providerEndpointMap,
|
|
getResponseSender,
|
|
} = require('librechat-data-provider');
|
|
const { getDefaultHandlers } = require('~/server/controllers/agents/callbacks');
|
|
// for testing purposes
|
|
// const createTavilySearchTool = require('~/app/clients/tools/structured/TavilySearch');
|
|
const initAnthropic = require('~/server/services/Endpoints/anthropic/initializeClient');
|
|
const initOpenAI = require('~/server/services/Endpoints/openAI/initializeClient');
|
|
const { loadAgentTools } = require('~/server/services/ToolService');
|
|
const AgentClient = require('~/server/controllers/agents/client');
|
|
const { getModelMaxTokens } = require('~/utils');
|
|
|
|
/* For testing errors */
|
|
const _getWeather = tool(
|
|
async ({ location }) => {
|
|
if (location === 'SAN FRANCISCO') {
|
|
return 'It\'s 60 degrees and foggy';
|
|
} else if (location.toLowerCase() === 'san francisco') {
|
|
throw new Error('Input queries must be all capitals');
|
|
} else {
|
|
throw new Error('Invalid input.');
|
|
}
|
|
},
|
|
{
|
|
name: 'get_weather',
|
|
description: 'Call to get the current weather',
|
|
schema: z.object({
|
|
location: z.string(),
|
|
}),
|
|
},
|
|
);
|
|
|
|
const providerConfigMap = {
|
|
[EModelEndpoint.openAI]: initOpenAI,
|
|
[EModelEndpoint.azureOpenAI]: initOpenAI,
|
|
[EModelEndpoint.anthropic]: initAnthropic,
|
|
};
|
|
|
|
const initializeClient = async ({ req, res, endpointOption }) => {
|
|
if (!endpointOption) {
|
|
throw new Error('Endpoint option not provided');
|
|
}
|
|
|
|
// TODO: use endpointOption to determine options/modelOptions
|
|
const { contentParts, aggregateContent } = createContentAggregator();
|
|
const eventHandlers = getDefaultHandlers({ res, aggregateContent });
|
|
|
|
// const tools = [createTavilySearchTool()];
|
|
// const tools = [_getWeather];
|
|
// const tool_calls = [{ name: 'getPeople_action_swapi---dev' }];
|
|
// const tool_calls = [{ name: 'dalle' }];
|
|
// const tool_calls = [{ name: 'getItmOptions_action_YWlhcGkzLn' }];
|
|
// const tool_calls = [{ name: 'tavily_search_results_json' }];
|
|
// const tool_calls = [
|
|
// { name: 'searchListings_action_emlsbG93NT' },
|
|
// { name: 'searchAddress_action_emlsbG93NT' },
|
|
// { name: 'searchMLS_action_emlsbG93NT' },
|
|
// { name: 'searchCoordinates_action_emlsbG93NT' },
|
|
// { name: 'searchUrl_action_emlsbG93NT' },
|
|
// { name: 'getPropertyDetails_action_emlsbG93NT' },
|
|
// ];
|
|
|
|
if (!endpointOption.agent) {
|
|
throw new Error('No agent promise provided');
|
|
}
|
|
|
|
/** @type {Agent} */
|
|
const agent = await endpointOption.agent;
|
|
const { tools, toolMap } = await loadAgentTools({
|
|
req,
|
|
tools: agent.tools,
|
|
agent_id: agent.id,
|
|
// openAIApiKey: process.env.OPENAI_API_KEY,
|
|
});
|
|
|
|
let modelOptions = { model: agent.model };
|
|
const getOptions = providerConfigMap[agent.provider];
|
|
if (!getOptions) {
|
|
throw new Error(`Provider ${agent.provider} not supported`);
|
|
}
|
|
|
|
// TODO: pass-in override settings that are specific to current run
|
|
endpointOption.model_parameters.model = agent.model;
|
|
const options = await getOptions({
|
|
req,
|
|
res,
|
|
endpointOption,
|
|
optionsOnly: true,
|
|
overrideEndpoint: agent.provider,
|
|
overrideModel: agent.model,
|
|
});
|
|
modelOptions = Object.assign(modelOptions, options.llmConfig);
|
|
|
|
const sender = getResponseSender({
|
|
...endpointOption,
|
|
model: endpointOption.model_parameters.model,
|
|
});
|
|
|
|
const client = new AgentClient({
|
|
req,
|
|
agent,
|
|
tools,
|
|
sender,
|
|
toolMap,
|
|
contentParts,
|
|
modelOptions,
|
|
eventHandlers,
|
|
endpoint: EModelEndpoint.agents,
|
|
configOptions: options.configOptions,
|
|
maxContextTokens:
|
|
agent.max_context_tokens ??
|
|
getModelMaxTokens(modelOptions.model, providerEndpointMap[agent.provider]),
|
|
});
|
|
return { client };
|
|
};
|
|
|
|
module.exports = { initializeClient };
|