mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-11-19 22:43:38 +00:00
🚚 feat: Route Attachments and Provision Tools Lazily (#15763)
This commit is contained in:
parent
e6376f6df4
commit
ec15075dc8
112 changed files with 12570 additions and 478 deletions
|
|
@ -173,6 +173,8 @@ jest.mock('@librechat/agents', () => ({
|
|||
}));
|
||||
|
||||
jest.mock('@librechat/api', () => ({
|
||||
/* Provisioning moved into this package; the controllers build the callback from it. */
|
||||
createProvisionFilesCallback: () => async () => {},
|
||||
createAgentExecutionContext: (context) => context,
|
||||
/** Grants both by default; the capability set is what these specs vary. */
|
||||
resolveToolRoleGrants: jest.fn(async () => ({ runCode: true, fileSearch: true })),
|
||||
|
|
|
|||
|
|
@ -196,6 +196,8 @@ jest.mock('@librechat/agents', () => ({
|
|||
}));
|
||||
|
||||
jest.mock('@librechat/api', () => ({
|
||||
/* Provisioning moved into this package; the controllers build the callback from it. */
|
||||
createProvisionFilesCallback: () => async () => {},
|
||||
createAgentExecutionContext: (context) => context,
|
||||
/** Grants both by default; the capability set is what these specs vary. */
|
||||
resolveToolRoleGrants: jest.fn(async () => ({ runCode: true, fileSearch: true })),
|
||||
|
|
|
|||
|
|
@ -92,6 +92,8 @@ const {
|
|||
resolveMemoryAvailability,
|
||||
enrichLoadedToolsWithAgentContext,
|
||||
} = require('~/server/services/Endpoints/agents/skillDeps');
|
||||
const { createProvisionFilesCallback } = require('~/server/services/Files/provisionCallback');
|
||||
const { checkSessionsAlive, loadCodeApiKey } = require('~/server/services/Files/provision');
|
||||
const { getModelsConfig } = require('~/server/controllers/ModelController');
|
||||
const { filterFilesByAgentAccess } = require('~/server/services/Files/permissions');
|
||||
const { resolveConfigServers } = require('~/server/services/MCP');
|
||||
|
|
@ -482,6 +484,9 @@ const executeOpenAIChatCompletion = async (envelope, { req, res }) => {
|
|||
updateFilesUsage: db.updateFilesUsage,
|
||||
getUserKeyValues: db.getUserKeyValues,
|
||||
getUserCodeFiles: db.getUserCodeFiles,
|
||||
getDeferredProvisionFiles: db.getDeferredProvisionFiles,
|
||||
checkSessionsAlive,
|
||||
loadCodeApiKey,
|
||||
getToolFilesByIds: db.getToolFilesByIds,
|
||||
getCodeGeneratedFiles: db.getCodeGeneratedFiles,
|
||||
listSkillsByAccess: skillDbMethods.listSkillsByAccess,
|
||||
|
|
@ -793,6 +798,11 @@ const executeOpenAIChatCompletion = async (envelope, { req, res }) => {
|
|||
agent never gains sandbox access even if the admin enabled the
|
||||
capability globally. */
|
||||
const toolExecuteOptions = {
|
||||
provisionFiles: createProvisionFilesCallback({
|
||||
req,
|
||||
agentToolContexts,
|
||||
resolvePrimaryAgentId: () => primaryConfig.id,
|
||||
}),
|
||||
loadTools: async (toolNames, agentId, _configurable, callerCapabilityProjection) => {
|
||||
const ctx =
|
||||
agentToolContexts.get(agentId) ?? agentToolContexts.get(primaryConfig.id) ?? {};
|
||||
|
|
|
|||
|
|
@ -107,6 +107,8 @@ const {
|
|||
resolveMemoryAvailability,
|
||||
enrichLoadedToolsWithAgentContext,
|
||||
} = require('~/server/services/Endpoints/agents/skillDeps');
|
||||
const { createProvisionFilesCallback } = require('~/server/services/Files/provisionCallback');
|
||||
const { checkSessionsAlive, loadCodeApiKey } = require('~/server/services/Files/provision');
|
||||
const { getModelsConfig } = require('~/server/controllers/ModelController');
|
||||
const { filterFilesByAgentAccess } = require('~/server/services/Files/permissions');
|
||||
const { resolveConfigServers, getAccessibleMcpServerNames } = require('~/server/services/MCP');
|
||||
|
|
@ -730,6 +732,9 @@ const executeResponse = async (envelope, { req, res }) => {
|
|||
updateFilesUsage: db.updateFilesUsage,
|
||||
getUserKeyValues: db.getUserKeyValues,
|
||||
getUserCodeFiles: db.getUserCodeFiles,
|
||||
getDeferredProvisionFiles: db.getDeferredProvisionFiles,
|
||||
checkSessionsAlive,
|
||||
loadCodeApiKey,
|
||||
getToolFilesByIds: db.getToolFilesByIds,
|
||||
getCodeGeneratedFiles: db.getCodeGeneratedFiles,
|
||||
listSkillsByAccess: skillDbMethods.listSkillsByAccess,
|
||||
|
|
@ -1134,6 +1139,11 @@ const executeResponse = async (envelope, { req, res }) => {
|
|||
|
||||
// Create tool execute options for event-driven tool execution
|
||||
const toolExecuteOptions = {
|
||||
provisionFiles: createProvisionFilesCallback({
|
||||
req,
|
||||
agentToolContexts,
|
||||
resolvePrimaryAgentId: () => primaryConfig.id,
|
||||
}),
|
||||
loadTools: async (toolNames, agentId, _configurable, callerCapabilityProjection) => {
|
||||
const ctx =
|
||||
agentToolContexts.get(agentId) ?? agentToolContexts.get(primaryConfig.id) ?? {};
|
||||
|
|
@ -1349,6 +1359,11 @@ const executeResponse = async (envelope, { req, res }) => {
|
|||
});
|
||||
|
||||
const toolExecuteOptions = {
|
||||
provisionFiles: createProvisionFilesCallback({
|
||||
req,
|
||||
agentToolContexts,
|
||||
resolvePrimaryAgentId: () => primaryConfig.id,
|
||||
}),
|
||||
loadTools: async (toolNames, agentId, _configurable, callerCapabilityProjection) => {
|
||||
const ctx =
|
||||
agentToolContexts.get(agentId) ?? agentToolContexts.get(primaryConfig.id) ?? {};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue