mirror of
https://github.com/danny-avila/LibreChat.git
synced 2026-11-17 05:20:55 +00:00
🥧 fix: Reserve Execution Time in Workspace Admission (#16421)
* 🥧 fix: Reserve Execution Time in Workspace Admission * 🥧 fix: Pass Workspace Admission Static Checks --------- Co-authored-by: Lia <lia@librechat.ai>
This commit is contained in:
parent
8ec632ff0e
commit
bf91d2b59c
12 changed files with 656 additions and 47 deletions
|
|
@ -1,5 +1,6 @@
|
|||
import { logger } from '@librechat/data-schemas';
|
||||
import { tool } from '@librechat/agents/langchain/tools';
|
||||
import { CODE_ENVIRONMENT_REQUEST_TIMEOUT_HARD_MAX_MS } from 'librechat-data-provider';
|
||||
import {
|
||||
BashExecutionToolDefinition,
|
||||
BashToolOutputReferencesGuide,
|
||||
|
|
@ -140,6 +141,21 @@ export function resolveAttachedWorkspaceQueueWaitMs(
|
|||
return Math.min(WORKSPACE_QUEUE_MAX_WAIT_MS, configured);
|
||||
}
|
||||
|
||||
export function resolveAttachedWorkspaceRequestTimeoutMs(
|
||||
configSchema?: CodeEnvironmentUserConfigSchema,
|
||||
): number | undefined {
|
||||
const configured = configSchema?.limits?.maxRequestTimeoutMs;
|
||||
if (
|
||||
configured == null ||
|
||||
!Number.isSafeInteger(configured) ||
|
||||
configured < 1 ||
|
||||
configured > CODE_ENVIRONMENT_REQUEST_TIMEOUT_HARD_MAX_MS
|
||||
) {
|
||||
return undefined;
|
||||
}
|
||||
return configured;
|
||||
}
|
||||
|
||||
export function buildAttachedWorkspaceBashSchema(
|
||||
maxTimeoutMs: number = WORKSPACE_COMMAND_DEFAULT_TIMEOUT_MS,
|
||||
environment?: CodeWorkspaceDescriptor['environment'],
|
||||
|
|
@ -286,6 +302,7 @@ export function createAttachedWorkspaceBashTool({
|
|||
gitIdentity,
|
||||
maxTimeoutMs = WORKSPACE_COMMAND_DEFAULT_TIMEOUT_MS,
|
||||
maxQueueWaitMs,
|
||||
maxRequestTimeoutMs,
|
||||
fetchImpl,
|
||||
}: {
|
||||
baseUrl: string;
|
||||
|
|
@ -296,8 +313,10 @@ export function createAttachedWorkspaceBashTool({
|
|||
gitIdentity?: AgentGitIdentity | null;
|
||||
/** Effective admin/upstream ceiling already intersected with the protocol hard cap. */
|
||||
maxTimeoutMs?: number;
|
||||
/** Deployment admission budget; omitted keeps the built-in default. */
|
||||
/** Retry horizon across typed queue expirations, not an admission budget. */
|
||||
maxQueueWaitMs?: number;
|
||||
/** Verified total HTTP budget; omission keeps the legacy per-attempt timeout. */
|
||||
maxRequestTimeoutMs?: number;
|
||||
fetchImpl?: CodeBridgeFetch;
|
||||
}): DynamicStructuredTool {
|
||||
const effectiveMaxTimeoutMs = normalizeAttachedWorkspaceCommandTimeoutMax(maxTimeoutMs);
|
||||
|
|
@ -376,6 +395,7 @@ export function createAttachedWorkspaceBashTool({
|
|||
signal,
|
||||
fetchImpl,
|
||||
...(maxQueueWaitMs == null ? {} : { maxQueueWaitMs }),
|
||||
...(maxRequestTimeoutMs == null ? {} : { maxRequestTimeoutMs }),
|
||||
});
|
||||
if (result.operation !== 'execute_command') {
|
||||
throw new Error('Attached workspace returned an unexpected command result.');
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue