mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-01-13 14:08:51 +01:00
* WIP: code ptc
* refactor: tool classification and calling logic
* 🔧 fix: Update @librechat/agents dependency to version 3.0.68
* chore: import order and correct renamed tool name for tool search
* refactor: streamline tool classification logic for local and programmatic tools
* feat: add per-tool configuration options for agents, including deferred loading and allowed callers
- Introduced `tool_options` in agent forms to manage tool behavior.
- Updated tool classification logic to prioritize agent-level configurations.
- Enhanced UI components to support tool deferral functionality.
- Added localization strings for new tool options and actions.
* feat: enhance agent schema with per-tool options for configuration
- Added `tool_options` schema to support per-tool configurations, including `defer_loading` and `allowed_callers`.
- Updated agent data model to incorporate new tool options, ensuring flexibility in tool behavior management.
- Modified type definitions to reflect the new `tool_options` structure for agents.
* feat: add tool_options parameter to loadTools and initializeAgent for enhanced agent configuration
* chore: update @librechat/agents dependency to version 3.0.71 and enhance agent tool loading logic
- Updated the @librechat/agents package to version 3.0.71 across multiple files.
- Added support for handling deferred loading of tools in agent initialization and execution processes.
- Improved the extraction of discovered tools from message history to optimize tool loading behavior.
* chore: update @librechat/agents dependency to version 3.0.72
* chore: update @librechat/agents dependency to version 3.0.75
* refactor: simplify tool defer loading logic in MCPTool component
- Removed local state management for deferred tools, relying on form state instead.
- Updated related functions to directly use form values for checking and toggling defer loading.
- Cleaned up code by eliminating unnecessary optimistic updates and local state dependencies.
* chore: remove deprecated localization strings for tool deferral in translation.json
- Eliminated unused strings related to deferred loading descriptions in the English translation file.
- Streamlined localization to reflect recent changes in tool loading logic.
* refactor: improve tool defer loading handling in MCPTool component
- Enhanced the logic for managing deferred loading of tools by simplifying the update process for tool options.
- Ensured that the state reflects the correct loading behavior based on the new deferred loading conditions.
- Cleaned up the code to remove unnecessary complexity in handling tool options.
* refactor: update agent mocks in callbacks test to use actual implementations
- Modified the agent mocks in the callbacks test to include actual implementations from the @librechat/agents module.
- This change enhances the accuracy of the tests by ensuring they reflect the real behavior of the agent functions.
228 lines
7.1 KiB
TypeScript
228 lines
7.1 KiB
TypeScript
import {
|
|
Tools,
|
|
Constants,
|
|
ContentTypes,
|
|
ToolCallTypes,
|
|
imageGenTools,
|
|
isImageVisionTool,
|
|
} from 'librechat-data-provider';
|
|
import { memo } from 'react';
|
|
import type { TMessageContentParts, TAttachment } from 'librechat-data-provider';
|
|
import { OpenAIImageGen, EmptyText, Reasoning, ExecuteCode, AgentUpdate, Text } from './Parts';
|
|
import { ErrorMessage } from './MessageContent';
|
|
import RetrievalCall from './RetrievalCall';
|
|
import AgentHandoff from './AgentHandoff';
|
|
import CodeAnalyze from './CodeAnalyze';
|
|
import Container from './Container';
|
|
import WebSearch from './WebSearch';
|
|
import ToolCall from './ToolCall';
|
|
import ImageGen from './ImageGen';
|
|
import Image from './Image';
|
|
|
|
type PartProps = {
|
|
part?: TMessageContentParts;
|
|
isLast?: boolean;
|
|
isSubmitting: boolean;
|
|
showCursor: boolean;
|
|
isCreatedByUser: boolean;
|
|
attachments?: TAttachment[];
|
|
};
|
|
|
|
const Part = memo(
|
|
({ part, isSubmitting, attachments, isLast, showCursor, isCreatedByUser }: PartProps) => {
|
|
if (!part) {
|
|
return null;
|
|
}
|
|
|
|
if (part.type === ContentTypes.ERROR) {
|
|
return (
|
|
<ErrorMessage
|
|
text={
|
|
part[ContentTypes.ERROR] ??
|
|
(typeof part[ContentTypes.TEXT] === 'string'
|
|
? part[ContentTypes.TEXT]
|
|
: part.text?.value) ??
|
|
''
|
|
}
|
|
className="my-2"
|
|
/>
|
|
);
|
|
} else if (part.type === ContentTypes.AGENT_UPDATE) {
|
|
return (
|
|
<>
|
|
<AgentUpdate currentAgentId={part[ContentTypes.AGENT_UPDATE]?.agentId} />
|
|
{isLast && showCursor && (
|
|
<Container>
|
|
<EmptyText />
|
|
</Container>
|
|
)}
|
|
</>
|
|
);
|
|
} else if (part.type === ContentTypes.TEXT) {
|
|
const text = typeof part.text === 'string' ? part.text : part.text?.value;
|
|
|
|
if (typeof text !== 'string') {
|
|
return null;
|
|
}
|
|
if (part.tool_call_ids != null && !text) {
|
|
return null;
|
|
}
|
|
/** Skip rendering if text is only whitespace to avoid empty Container */
|
|
if (!isLast && text.length > 0 && /^\s*$/.test(text)) {
|
|
return null;
|
|
}
|
|
return (
|
|
<Container>
|
|
<Text text={text} isCreatedByUser={isCreatedByUser} showCursor={showCursor} />
|
|
</Container>
|
|
);
|
|
} else if (part.type === ContentTypes.THINK) {
|
|
const reasoning = typeof part.think === 'string' ? part.think : part.think?.value;
|
|
if (typeof reasoning !== 'string') {
|
|
return null;
|
|
}
|
|
return <Reasoning reasoning={reasoning} isLast={isLast ?? false} />;
|
|
} else if (part.type === ContentTypes.TOOL_CALL) {
|
|
const toolCall = part[ContentTypes.TOOL_CALL];
|
|
|
|
if (!toolCall) {
|
|
return null;
|
|
}
|
|
|
|
const isToolCall =
|
|
'args' in toolCall && (!toolCall.type || toolCall.type === ToolCallTypes.TOOL_CALL);
|
|
if (
|
|
isToolCall &&
|
|
(toolCall.name === Tools.execute_code ||
|
|
toolCall.name === Constants.PROGRAMMATIC_TOOL_CALLING)
|
|
) {
|
|
return (
|
|
<ExecuteCode
|
|
attachments={attachments}
|
|
isSubmitting={isSubmitting}
|
|
output={toolCall.output ?? ''}
|
|
initialProgress={toolCall.progress ?? 0.1}
|
|
args={typeof toolCall.args === 'string' ? toolCall.args : ''}
|
|
/>
|
|
);
|
|
} else if (
|
|
isToolCall &&
|
|
(toolCall.name === 'image_gen_oai' ||
|
|
toolCall.name === 'image_edit_oai' ||
|
|
toolCall.name === 'gemini_image_gen')
|
|
) {
|
|
return (
|
|
<OpenAIImageGen
|
|
initialProgress={toolCall.progress ?? 0.1}
|
|
isSubmitting={isSubmitting}
|
|
toolName={toolCall.name}
|
|
args={typeof toolCall.args === 'string' ? toolCall.args : ''}
|
|
output={toolCall.output ?? ''}
|
|
attachments={attachments}
|
|
/>
|
|
);
|
|
} else if (isToolCall && toolCall.name === Tools.web_search) {
|
|
return (
|
|
<WebSearch
|
|
output={toolCall.output ?? ''}
|
|
initialProgress={toolCall.progress ?? 0.1}
|
|
isSubmitting={isSubmitting}
|
|
attachments={attachments}
|
|
isLast={isLast}
|
|
/>
|
|
);
|
|
} else if (isToolCall && toolCall.name?.startsWith(Constants.LC_TRANSFER_TO_)) {
|
|
return (
|
|
<AgentHandoff
|
|
args={toolCall.args ?? ''}
|
|
name={toolCall.name || ''}
|
|
output={toolCall.output ?? ''}
|
|
/>
|
|
);
|
|
} else if (isToolCall) {
|
|
return (
|
|
<ToolCall
|
|
args={toolCall.args ?? ''}
|
|
name={toolCall.name || ''}
|
|
output={toolCall.output ?? ''}
|
|
initialProgress={toolCall.progress ?? 0.1}
|
|
isSubmitting={isSubmitting}
|
|
attachments={attachments}
|
|
auth={toolCall.auth}
|
|
expires_at={toolCall.expires_at}
|
|
isLast={isLast}
|
|
/>
|
|
);
|
|
} else if (toolCall.type === ToolCallTypes.CODE_INTERPRETER) {
|
|
const code_interpreter = toolCall[ToolCallTypes.CODE_INTERPRETER];
|
|
return (
|
|
<CodeAnalyze
|
|
initialProgress={toolCall.progress ?? 0.1}
|
|
code={code_interpreter.input}
|
|
outputs={code_interpreter.outputs ?? []}
|
|
/>
|
|
);
|
|
} else if (
|
|
toolCall.type === ToolCallTypes.RETRIEVAL ||
|
|
toolCall.type === ToolCallTypes.FILE_SEARCH
|
|
) {
|
|
return (
|
|
<RetrievalCall initialProgress={toolCall.progress ?? 0.1} isSubmitting={isSubmitting} />
|
|
);
|
|
} else if (
|
|
toolCall.type === ToolCallTypes.FUNCTION &&
|
|
ToolCallTypes.FUNCTION in toolCall &&
|
|
imageGenTools.has(toolCall.function.name)
|
|
) {
|
|
return (
|
|
<ImageGen
|
|
initialProgress={toolCall.progress ?? 0.1}
|
|
args={toolCall.function.arguments as string}
|
|
/>
|
|
);
|
|
} else if (toolCall.type === ToolCallTypes.FUNCTION && ToolCallTypes.FUNCTION in toolCall) {
|
|
if (isImageVisionTool(toolCall)) {
|
|
if (isSubmitting && showCursor) {
|
|
return (
|
|
<Container>
|
|
<Text text={''} isCreatedByUser={isCreatedByUser} showCursor={showCursor} />
|
|
</Container>
|
|
);
|
|
}
|
|
return null;
|
|
}
|
|
|
|
return (
|
|
<ToolCall
|
|
initialProgress={toolCall.progress ?? 0.1}
|
|
isSubmitting={isSubmitting}
|
|
args={toolCall.function.arguments as string}
|
|
name={toolCall.function.name}
|
|
output={toolCall.function.output}
|
|
isLast={isLast}
|
|
/>
|
|
);
|
|
}
|
|
} else if (part.type === ContentTypes.IMAGE_FILE) {
|
|
const imageFile = part[ContentTypes.IMAGE_FILE];
|
|
const height = imageFile.height ?? 1920;
|
|
const width = imageFile.width ?? 1080;
|
|
return (
|
|
<Image
|
|
imagePath={imageFile.filepath}
|
|
height={height}
|
|
width={width}
|
|
altText={imageFile.filename ?? 'Uploaded Image'}
|
|
placeholderDimensions={{
|
|
height: height + 'px',
|
|
width: width + 'px',
|
|
}}
|
|
/>
|
|
);
|
|
}
|
|
|
|
return null;
|
|
},
|
|
);
|
|
|
|
export default Part;
|