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

* refactor: Agent CodeFiles, abortUpload WIP * feat: code environment file upload * refactor: useLazyEffect * refactor: - Add `watch` from `useFormContext` to check if code execution is enabled - Disable file upload button if `agent_id` is not selected or code execution is disabled * WIP: primeCodeFiles; refactor: rename sessionId to session_id for uniformity * Refactor: Rename session_id to sessionId for uniformity in AuthService.js * chore: bump @librechat/agents to version 1.7.1 * WIP: prime code files * refactor: Update code env file upload method to use read stream * feat: reupload code env file if no longer active * refactor: isAssistantTool -> isEntityTool + address type issues * feat: execute code tool hook * refactor: Rename isPluginAuthenticated to checkPluginAuth in PluginController.js * refactor: Update PluginController.js to use AuthType constant for comparison * feat: verify tool authentication (execute_code) * feat: enter librechat_code_api_key * refactor: Remove unused imports in BookmarkForm.tsx * feat: authenticate code tool * refactor: Update Action.tsx to conditionally render the key and revoke key buttons * refactor(Code/Action): prevent uncheck-able 'Run Code' capability when key is revoked * refactor(Code/Action): Update Action.tsx to conditionally render the key and revoke key buttons * fix: agent file upload edge cases * chore: bump @librechat/agents * fix: custom endpoint providerValue icon * feat: ollama meta modal token values + context * feat: ollama agents * refactor: Update token models for Ollama models * chore: Comment out CodeForm * refactor: Update token models for Ollama and Meta models
204 lines
6.3 KiB
JavaScript
204 lines
6.3 KiB
JavaScript
const { Tools } = require('librechat-data-provider');
|
|
const {
|
|
EnvVar,
|
|
GraphEvents,
|
|
ToolEndHandler,
|
|
ChatModelStreamHandler,
|
|
} = require('@librechat/agents');
|
|
const { processCodeOutput } = require('~/server/services/Files/Code/process');
|
|
const { loadAuthValues } = require('~/app/clients/tools/util');
|
|
const { logger } = require('~/config');
|
|
|
|
/** @typedef {import('@librechat/agents').Graph} Graph */
|
|
/** @typedef {import('@librechat/agents').EventHandler} EventHandler */
|
|
/** @typedef {import('@librechat/agents').ModelEndData} ModelEndData */
|
|
/** @typedef {import('@librechat/agents').ToolEndData} ToolEndData */
|
|
/** @typedef {import('@librechat/agents').ToolEndCallback} ToolEndCallback */
|
|
/** @typedef {import('@librechat/agents').ChatModelStreamHandler} ChatModelStreamHandler */
|
|
/** @typedef {import('@librechat/agents').ContentAggregatorResult['aggregateContent']} ContentAggregator */
|
|
/** @typedef {import('@librechat/agents').GraphEvents} GraphEvents */
|
|
|
|
/**
|
|
* Sends message data in Server Sent Events format.
|
|
* @param {ServerResponse} res - The server response.
|
|
* @param {{ data: string | Record<string, unknown>, event?: string }} event - The message event.
|
|
* @param {string} event.event - The type of event.
|
|
* @param {string} event.data - The message to be sent.
|
|
*/
|
|
const sendEvent = (res, event) => {
|
|
if (typeof event.data === 'string' && event.data.length === 0) {
|
|
return;
|
|
}
|
|
res.write(`event: message\ndata: ${JSON.stringify(event)}\n\n`);
|
|
};
|
|
|
|
class ModelEndHandler {
|
|
/**
|
|
* @param {Array<UsageMetadata>} collectedUsage
|
|
*/
|
|
constructor(collectedUsage) {
|
|
if (!Array.isArray(collectedUsage)) {
|
|
throw new Error('collectedUsage must be an array');
|
|
}
|
|
this.collectedUsage = collectedUsage;
|
|
}
|
|
|
|
/**
|
|
* @param {string} event
|
|
* @param {ModelEndData | undefined} data
|
|
* @param {Record<string, unknown> | undefined} metadata
|
|
* @param {Graph} graph
|
|
* @returns
|
|
*/
|
|
handle(event, data, metadata, graph) {
|
|
if (!graph || !metadata) {
|
|
console.warn(`Graph or metadata not found in ${event} event`);
|
|
return;
|
|
}
|
|
|
|
const usage = data?.output?.usage_metadata;
|
|
|
|
if (usage) {
|
|
this.collectedUsage.push(usage);
|
|
}
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Get default handlers for stream events.
|
|
* @param {Object} options - The options object.
|
|
* @param {ServerResponse} options.res - The options object.
|
|
* @param {ContentAggregator} options.aggregateContent - The options object.
|
|
* @param {ToolEndCallback} options.toolEndCallback - Callback to use when tool ends.
|
|
* @param {Array<UsageMetadata>} options.collectedUsage - The list of collected usage metadata.
|
|
* @returns {Record<string, t.EventHandler>} The default handlers.
|
|
* @throws {Error} If the request is not found.
|
|
*/
|
|
function getDefaultHandlers({ res, aggregateContent, toolEndCallback, collectedUsage }) {
|
|
if (!res || !aggregateContent) {
|
|
throw new Error(
|
|
`[getDefaultHandlers] Missing required options: res: ${!res}, aggregateContent: ${!aggregateContent}`,
|
|
);
|
|
}
|
|
const handlers = {
|
|
[GraphEvents.CHAT_MODEL_END]: new ModelEndHandler(collectedUsage),
|
|
[GraphEvents.TOOL_END]: new ToolEndHandler(toolEndCallback),
|
|
[GraphEvents.CHAT_MODEL_STREAM]: new ChatModelStreamHandler(),
|
|
[GraphEvents.ON_RUN_STEP]: {
|
|
/**
|
|
* Handle ON_RUN_STEP event.
|
|
* @param {string} event - The event name.
|
|
* @param {StreamEventData} data - The event data.
|
|
*/
|
|
handle: (event, data) => {
|
|
sendEvent(res, { event, data });
|
|
aggregateContent({ event, data });
|
|
},
|
|
},
|
|
[GraphEvents.ON_RUN_STEP_DELTA]: {
|
|
/**
|
|
* Handle ON_RUN_STEP_DELTA event.
|
|
* @param {string} event - The event name.
|
|
* @param {StreamEventData} data - The event data.
|
|
*/
|
|
handle: (event, data) => {
|
|
sendEvent(res, { event, data });
|
|
aggregateContent({ event, data });
|
|
},
|
|
},
|
|
[GraphEvents.ON_RUN_STEP_COMPLETED]: {
|
|
/**
|
|
* Handle ON_RUN_STEP_COMPLETED event.
|
|
* @param {string} event - The event name.
|
|
* @param {StreamEventData & { result: ToolEndData }} data - The event data.
|
|
*/
|
|
handle: (event, data) => {
|
|
sendEvent(res, { event, data });
|
|
aggregateContent({ event, data });
|
|
},
|
|
},
|
|
[GraphEvents.ON_MESSAGE_DELTA]: {
|
|
/**
|
|
* Handle ON_MESSAGE_DELTA event.
|
|
* @param {string} event - The event name.
|
|
* @param {StreamEventData} data - The event data.
|
|
*/
|
|
handle: (event, data) => {
|
|
sendEvent(res, { event, data });
|
|
aggregateContent({ event, data });
|
|
},
|
|
},
|
|
};
|
|
|
|
return handlers;
|
|
}
|
|
|
|
/**
|
|
*
|
|
* @param {Object} params
|
|
* @param {ServerRequest} params.req
|
|
* @param {ServerResponse} params.res
|
|
* @param {Promise<MongoFile | { filename: string; filepath: string; expires: number;} | null>[]} params.artifactPromises
|
|
* @returns {ToolEndCallback} The tool end callback.
|
|
*/
|
|
function createToolEndCallback({ req, res, artifactPromises }) {
|
|
/**
|
|
* @type {ToolEndCallback}
|
|
*/
|
|
return async (data, metadata) => {
|
|
const output = data?.output;
|
|
if (!output) {
|
|
return;
|
|
}
|
|
|
|
if (output.name !== Tools.execute_code) {
|
|
return;
|
|
}
|
|
|
|
const { tool_call_id, artifact } = output;
|
|
if (!artifact.files) {
|
|
return;
|
|
}
|
|
|
|
for (const file of artifact.files) {
|
|
const { id, name } = file;
|
|
artifactPromises.push(
|
|
(async () => {
|
|
const result = await loadAuthValues({
|
|
userId: req.user.id,
|
|
authFields: [EnvVar.CODE_API_KEY],
|
|
});
|
|
const fileMetadata = await processCodeOutput({
|
|
req,
|
|
id,
|
|
name,
|
|
apiKey: result[EnvVar.CODE_API_KEY],
|
|
toolCallId: tool_call_id,
|
|
messageId: metadata.run_id,
|
|
session_id: artifact.session_id,
|
|
conversationId: metadata.thread_id,
|
|
});
|
|
if (!res.headersSent) {
|
|
return fileMetadata;
|
|
}
|
|
|
|
if (!fileMetadata) {
|
|
return null;
|
|
}
|
|
|
|
res.write(`event: attachment\ndata: ${JSON.stringify(fileMetadata)}\n\n`);
|
|
return fileMetadata;
|
|
})().catch((error) => {
|
|
logger.error('Error processing code output:', error);
|
|
return null;
|
|
}),
|
|
);
|
|
}
|
|
};
|
|
}
|
|
|
|
module.exports = {
|
|
sendEvent,
|
|
getDefaultHandlers,
|
|
createToolEndCallback,
|
|
};
|