mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-17 16:05:32 +01:00
* fix: agent initialization, add `collectedUsage` handling * style: improve side panel styling * refactor(loadAgent): Optimize order agent project ID retrieval * feat: code execution * fix: typing issues * feat: ExecuteCode content part * refactor: use local state for default collapsed state of analysis content parts * fix: code parsing in ExecuteCode component * chore: bump agents package, export loadAuthValues * refactor: Update handleTools.js to use EnvVar for code execution tool authentication * WIP * feat: download code outputs * fix(useEventHandlers): type issues * feat: backend handling for code outputs * Refactor: Remove console.log statement in Part.tsx * refactor: add attachments to TMessage/messageSchema * WIP: prelim handling for code outputs * feat: attachments rendering * refactor: improve attachments rendering * fix: attachments, nullish edge case, handle attachments from event stream, bump agents package * fix filename download * fix: tool assignment for 'run code' on agent creation * fix: image handling by adding attachments * refactor: prevent agent creation without provider/model * refactor: remove unnecessary space in agent creation success message * refactor: select first model if selecting provider from empty on form * fix: Agent avatar bug * fix: `defaultAgentFormValues` causing boolean typing issue and typeerror * fix: capabilities counting as tools, causing duplication of them * fix: formatted messages edge case where consecutive content text type parts with the latter having tool_call_ids would cause consecutive AI messages to be created. furthermore, content could not be an array for tool_use messages (anthropic limitation) * chore: bump @librechat/agents dependency to version 1.6.9 * feat: bedrock agents * feat: new Agents icon * feat: agent titling * feat: agent landing * refactor: allow sharing agent globally only if user is admin or author * feat: initial AgentPanelSkeleton * feat: AgentPanelSkeleton * feat: collaborative agents * chore: add potential authorName as part of schema * chore: Remove unnecessary console.log statement * WIP: agent model parameters * chore: ToolsDialog typing and tool related localization chnages * refactor: update tool instance type (latest langchain class), and rename google tool to 'google' proper * chore: add back tools * feat: Agent knowledge files upload * refactor: better verbiage for disabled knowledge * chore: debug logs for file deletions * chore: debug logs for file deletions * feat: upload/delete agent knowledge/file-search files * feat: file search UI for agents * feat: first pass, file search tool * chore: update default agent capabilities and info
255 lines
7.8 KiB
TypeScript
255 lines
7.8 KiB
TypeScript
import {
|
|
EModelEndpoint,
|
|
defaultEndpoints,
|
|
modularEndpoints,
|
|
LocalStorageKeys,
|
|
isAgentsEndpoint,
|
|
isAssistantsEndpoint,
|
|
} from 'librechat-data-provider';
|
|
import type * as t from 'librechat-data-provider';
|
|
import type { LocalizeFunction } from '~/common';
|
|
|
|
export const getAssistantName = ({
|
|
name = '',
|
|
localize,
|
|
}: {
|
|
name?: string;
|
|
localize: LocalizeFunction;
|
|
}) => {
|
|
if (name && name.length > 0) {
|
|
return name;
|
|
} else {
|
|
return localize('com_ui_assistant');
|
|
}
|
|
};
|
|
|
|
export const getEndpointsFilter = (endpointsConfig: t.TEndpointsConfig) => {
|
|
const filter: Record<string, boolean> = {};
|
|
if (!endpointsConfig) {
|
|
return filter;
|
|
}
|
|
for (const key of Object.keys(endpointsConfig)) {
|
|
filter[key] = !!endpointsConfig[key];
|
|
}
|
|
return filter;
|
|
};
|
|
|
|
export const getAvailableEndpoints = (
|
|
filter: Record<string, boolean>,
|
|
endpointsConfig: t.TEndpointsConfig,
|
|
) => {
|
|
const defaultSet = new Set(defaultEndpoints);
|
|
const availableEndpoints: EModelEndpoint[] = [];
|
|
|
|
for (const endpoint in endpointsConfig) {
|
|
// Check if endpoint is in the filter or its type is in defaultEndpoints
|
|
if (
|
|
filter[endpoint] ||
|
|
(endpointsConfig[endpoint]?.type &&
|
|
defaultSet.has(endpointsConfig[endpoint]?.type as EModelEndpoint))
|
|
) {
|
|
availableEndpoints.push(endpoint as EModelEndpoint);
|
|
}
|
|
}
|
|
|
|
return availableEndpoints;
|
|
};
|
|
|
|
/** Get the specified field from the endpoint config */
|
|
export function getEndpointField<K extends keyof t.TConfig>(
|
|
endpointsConfig: t.TEndpointsConfig | undefined,
|
|
endpoint: EModelEndpoint | string | null | undefined,
|
|
property: K,
|
|
): t.TConfig[K] | undefined {
|
|
if (!endpointsConfig || endpoint === null || endpoint === undefined) {
|
|
return undefined;
|
|
}
|
|
|
|
const config = endpointsConfig[endpoint];
|
|
if (!config) {
|
|
return undefined;
|
|
}
|
|
|
|
return config[property];
|
|
}
|
|
|
|
export function mapEndpoints(endpointsConfig: t.TEndpointsConfig) {
|
|
const filter = getEndpointsFilter(endpointsConfig);
|
|
return getAvailableEndpoints(filter, endpointsConfig).sort(
|
|
(a, b) => (endpointsConfig?.[a]?.order ?? 0) - (endpointsConfig?.[b]?.order ?? 0),
|
|
);
|
|
}
|
|
|
|
const firstLocalConvoKey = LocalStorageKeys.LAST_CONVO_SETUP + '_0';
|
|
|
|
/**
|
|
* Ensures the last selected model stays up to date, as conversation may
|
|
* update without updating last convo setup when same endpoint */
|
|
export function updateLastSelectedModel({
|
|
endpoint,
|
|
model,
|
|
}: {
|
|
endpoint: string;
|
|
model: string | undefined;
|
|
}) {
|
|
if (!model) {
|
|
return;
|
|
}
|
|
const lastConversationSetup = JSON.parse(localStorage.getItem(firstLocalConvoKey) || '{}');
|
|
|
|
if (lastConversationSetup.endpoint === endpoint) {
|
|
lastConversationSetup.model = model;
|
|
localStorage.setItem(firstLocalConvoKey, JSON.stringify(lastConversationSetup));
|
|
}
|
|
|
|
const lastSelectedModels = JSON.parse(localStorage.getItem(LocalStorageKeys.LAST_MODEL) || '{}');
|
|
lastSelectedModels[endpoint] = model;
|
|
localStorage.setItem(LocalStorageKeys.LAST_MODEL, JSON.stringify(lastSelectedModels));
|
|
}
|
|
|
|
interface ConversationInitParams {
|
|
conversation: t.TConversation | null;
|
|
newEndpoint: EModelEndpoint | string | null;
|
|
endpointsConfig: t.TEndpointsConfig;
|
|
modularChat?: boolean;
|
|
}
|
|
|
|
interface InitiatedTemplateResult {
|
|
template: Partial<t.TPreset>;
|
|
shouldSwitch: boolean;
|
|
isExistingConversation: boolean;
|
|
isCurrentModular: boolean;
|
|
isNewModular: boolean;
|
|
newEndpointType: EModelEndpoint | undefined;
|
|
}
|
|
|
|
/** Get the conditional logic for switching conversations */
|
|
export function getConvoSwitchLogic(params: ConversationInitParams): InitiatedTemplateResult {
|
|
const { conversation, newEndpoint, endpointsConfig, modularChat = false } = params;
|
|
|
|
const currentEndpoint = conversation?.endpoint;
|
|
const template: Partial<t.TPreset> = {
|
|
...conversation,
|
|
endpoint: newEndpoint,
|
|
conversationId: 'new',
|
|
};
|
|
|
|
const isAssistantSwitch =
|
|
isAssistantsEndpoint(newEndpoint) &&
|
|
isAssistantsEndpoint(currentEndpoint) &&
|
|
currentEndpoint === newEndpoint;
|
|
|
|
const conversationId = conversation?.conversationId ?? '';
|
|
const isExistingConversation = !!(conversationId && conversationId !== 'new');
|
|
|
|
const currentEndpointType =
|
|
getEndpointField(endpointsConfig, currentEndpoint, 'type') ?? currentEndpoint;
|
|
const newEndpointType =
|
|
getEndpointField(endpointsConfig, newEndpoint, 'type') ??
|
|
(newEndpoint as EModelEndpoint | undefined);
|
|
|
|
const hasEndpoint = modularEndpoints.has(currentEndpoint ?? '');
|
|
const hasCurrentEndpointType = modularEndpoints.has(currentEndpointType ?? '');
|
|
const isCurrentModular = hasEndpoint || hasCurrentEndpointType || isAssistantSwitch;
|
|
|
|
const hasNewEndpoint = modularEndpoints.has(newEndpoint ?? '');
|
|
const hasNewEndpointType = modularEndpoints.has(newEndpointType ?? '');
|
|
const isNewModular = hasNewEndpoint || hasNewEndpointType || isAssistantSwitch;
|
|
|
|
const endpointsMatch = currentEndpoint === newEndpoint;
|
|
const shouldSwitch = endpointsMatch || modularChat || isAssistantSwitch;
|
|
|
|
return {
|
|
template,
|
|
shouldSwitch,
|
|
isExistingConversation,
|
|
isCurrentModular,
|
|
newEndpointType,
|
|
isNewModular,
|
|
};
|
|
}
|
|
|
|
/** Gets the default spec by order.
|
|
*
|
|
* First, the admin defined default, then last selected spec, followed by first spec
|
|
*/
|
|
export function getDefaultModelSpec(modelSpecs?: t.TModelSpec[]) {
|
|
const defaultSpec = modelSpecs?.find((spec) => spec.default);
|
|
const lastSelectedSpecName = localStorage.getItem(LocalStorageKeys.LAST_SPEC);
|
|
const lastSelectedSpec = modelSpecs?.find((spec) => spec.name === lastSelectedSpecName);
|
|
return defaultSpec || lastSelectedSpec || modelSpecs?.[0];
|
|
}
|
|
|
|
/** Gets the default spec iconURL by order or definition.
|
|
*
|
|
* First, the admin defined default, then last selected spec, followed by first spec
|
|
*/
|
|
export function getModelSpecIconURL(modelSpec: t.TModelSpec) {
|
|
return modelSpec.iconURL ?? modelSpec.preset.iconURL ?? modelSpec.preset.endpoint ?? '';
|
|
}
|
|
|
|
/** Gets the default frontend-facing endpoint, dependent on iconURL definition.
|
|
*
|
|
* If the iconURL is defined in the endpoint config, use it, otherwise use the endpoint
|
|
*/
|
|
export function getIconEndpoint({
|
|
endpointsConfig,
|
|
iconURL,
|
|
endpoint,
|
|
}: {
|
|
endpointsConfig: t.TEndpointsConfig | undefined;
|
|
iconURL: string | undefined;
|
|
endpoint: string | null | undefined;
|
|
}) {
|
|
return (endpointsConfig?.[iconURL ?? ''] ? iconURL ?? endpoint : endpoint) ?? '';
|
|
}
|
|
|
|
/** Gets the key to use for the default endpoint iconURL, as defined by the custom config */
|
|
export function getIconKey({
|
|
endpoint,
|
|
endpointType: _eType,
|
|
endpointsConfig,
|
|
endpointIconURL: iconURL,
|
|
}: {
|
|
endpoint?: string | null;
|
|
endpointsConfig?: t.TEndpointsConfig | undefined;
|
|
endpointType?: string | null;
|
|
endpointIconURL?: string;
|
|
}) {
|
|
const endpointType = _eType ?? getEndpointField(endpointsConfig, endpoint, 'type') ?? '';
|
|
const endpointIconURL = iconURL ?? getEndpointField(endpointsConfig, endpoint, 'iconURL') ?? '';
|
|
if (endpointIconURL && EModelEndpoint[endpointIconURL] != null) {
|
|
return endpointIconURL;
|
|
}
|
|
return endpointType ? 'unknown' : endpoint ?? 'unknown';
|
|
}
|
|
|
|
export const getEntity = ({
|
|
endpoint,
|
|
assistant_id,
|
|
agent_id,
|
|
agentsMap,
|
|
assistantMap,
|
|
}: {
|
|
endpoint: EModelEndpoint | string | null | undefined;
|
|
assistant_id: string | undefined;
|
|
agent_id: string | undefined;
|
|
agentsMap: t.TAgentsMap | undefined;
|
|
assistantMap: t.TAssistantsMap | undefined;
|
|
}): {
|
|
entity: t.Agent | t.Assistant | undefined | null;
|
|
isAgent: boolean;
|
|
isAssistant: boolean;
|
|
} => {
|
|
const isAgent = isAgentsEndpoint(endpoint);
|
|
const isAssistant = isAssistantsEndpoint(endpoint);
|
|
|
|
if (isAgent) {
|
|
const agent = agentsMap?.[agent_id ?? ''];
|
|
return { entity: agent, isAgent, isAssistant };
|
|
} else if (isAssistant) {
|
|
const assistant = assistantMap?.[endpoint ?? '']?.[assistant_id ?? ''];
|
|
return { entity: assistant, isAgent, isAssistant };
|
|
}
|
|
return { entity: null, isAgent, isAssistant };
|
|
};
|