@illuma-ai/agents 1.1.21 → 1.1.22

package/src/llm/bedrock/index.js

@@ -1,303 +0,0 @@
-/**
- * Optimized ChatBedrockConverse wrapper that fixes content block merging for
- * streaming responses and adds support for latest @langchain/aws features:
- *
- * - Prompt caching support for Bedrock Converse API (Illuma feature)
- * - Application Inference Profiles (PR #9129)
- * - Service Tiers (Priority/Standard/Flex) (PR #9785) - requires AWS SDK 3.966.0+
- *
- * Bedrock's `@langchain/aws` library does not include an `index` property on content
- * blocks (unlike Anthropic/OpenAI), which causes LangChain's `_mergeLists` to append
- * each streaming chunk as a separate array entry instead of merging by index.
- *
- * This wrapper takes full ownership of the stream by directly interfacing with the
- * AWS SDK client (`this.client`) and using custom handlers from `./utils/` that
- * include `contentBlockIndex` in response_metadata for every delta type. It then
- * promotes `contentBlockIndex` to an `index` property on each content block
- * (mirroring Anthropic's pattern) and strips it from metadata to avoid
- * `_mergeDicts` conflicts.
- *
- * When multiple content block types are present (e.g. reasoning + text), text deltas
- * are promoted from strings to array form with `index` so they merge correctly once
- * the accumulated content is already an array.
- *
- * PROMPT CACHING:
- * When promptCache: true is set, this wrapper adds cachePoint markers to the tools array
- * to enable Bedrock prompt caching for tool definitions. This allows tool schemas to be
- * cached and reused across requests, reducing latency and costs.
- *
- * CACHE TOKEN EXTRACTION:
- * Cache token extraction is handled in `./utils/message_outputs.ts` and added
- * to usage_metadata with input_token_details (cacheReadInputTokens/cacheWriteInputTokens).
- */
-import { ChatBedrockConverse } from '@langchain/aws';
-import { ConverseStreamCommand } from '@aws-sdk/client-bedrock-runtime';
-import { AIMessageChunk } from '@langchain/core/messages';
-import { ChatGenerationChunk } from '@langchain/core/outputs';
-import { convertToConverseMessages, handleConverseStreamContentBlockStart, handleConverseStreamContentBlockDelta, handleConverseStreamMetadata, } from './utils';
-export class IllumaBedrockConverse extends ChatBedrockConverse {
-    /** Enable Bedrock prompt caching for tool definitions */
-    promptCache;
-    /** Application Inference Profile ARN to use instead of model ID */
-    applicationInferenceProfile;
-    /** Service tier for model invocation */
-    serviceTier;
-    constructor(fields) {
-        super(fields);
-        this.promptCache = fields?.promptCache ?? false;
-        this.applicationInferenceProfile = fields?.applicationInferenceProfile;
-        this.serviceTier = fields?.serviceTier;
-        // Fix: Force supportsToolChoiceValues for Claude models
-        // The parent constructor checks `model.includes('claude-3')` but this fails when:
-        // 1. Using applicationInferenceProfile ARNs (arn:aws:bedrock:...)
-        // 2. Using different naming conventions (claude-4, claude-opus-4, etc.)
-        // We need to ensure tool_choice is properly set for withStructuredOutput to work
-        const modelName = (fields?.model ?? '').toLowerCase();
-        const profileName = (fields?.applicationInferenceProfile ?? '').toLowerCase();
-        const isClaudeModel = modelName.includes('claude') ||
-            modelName.includes('anthropic') ||
-            profileName.includes('claude') ||
-            profileName.includes('anthropic');
-        if (isClaudeModel && !this.supportsToolChoiceValues?.length) {
-            // Claude models support all tool choice values
-            this.supportsToolChoiceValues = ['auto', 'any', 'tool'];
-        }
-    }
-    static lc_name() {
-        return 'IllumaBedrockConverse';
-    }
-    /**
-     * Get the model ID to use for API calls.
-     * Returns applicationInferenceProfile if set, otherwise returns this.model.
-     */
-    getModelId() {
-        return this.applicationInferenceProfile ?? this.model;
-    }
-    /**
-     * Override invocationParams to:
-     * 1. Add cachePoint to tools when promptCache is enabled
-     * 2. Add serviceTier support
-     *
-     * CACHING STRATEGY: Separate cachePoints for core tools and MCP tools
-     * - Core tools (web_search, execute_code, etc.) are stable → cache first
-     * - MCP tools (have '_mcp_' in name) are dynamic → cache separately after
-     * - This allows core tools to stay cached when MCP selection changes
-     *
-     * NOTE: Only Claude models support cachePoint - Nova and other models will reject it.
-     */
-    invocationParams(options) {
-        const params = super.invocationParams(options);
-        // Add cachePoint to tools array if promptCache is enabled and tools exist
-        // Only Claude models support cachePoint - check model name
-        const modelId = this.model.toLowerCase();
-        const isClaudeModel = modelId.includes('claude') || modelId.includes('anthropic');
-        if (this.promptCache &&
-            isClaudeModel &&
-            params.toolConfig?.tools &&
-            Array.isArray(params.toolConfig.tools) &&
-            params.toolConfig.tools.length > 0) {
-            // Separate core tools from MCP tools
-            // MCP tools have '_mcp_' in their name (e.g., 'search_emails_mcp_Google-Workspace')
-            const coreTools = [];
-            const mcpTools = [];
-            for (const tool of params.toolConfig.tools) {
-                // Check if tool has a name property with '_mcp_' pattern
-                const toolName = tool.toolSpec?.name ?? '';
-                if (toolName.includes('_mcp_')) {
-                    mcpTools.push(tool);
-                }
-                else {
-                    coreTools.push(tool);
-                }
-            }
-            // Build tools array with strategic cachePoints:
-            // [CoreTool1, CoreTool2, cachePoint] + [MCPTool1, MCPTool2, cachePoint]
-            const toolsWithCache = [];
-            // Add core tools with cachePoint (if any)
-            if (coreTools.length > 0) {
-                toolsWithCache.push(...coreTools);
-                toolsWithCache.push({ cachePoint: { type: 'default' } });
-            }
-            // Add MCP tools with their own cachePoint (if any)
-            if (mcpTools.length > 0) {
-                toolsWithCache.push(...mcpTools);
-                toolsWithCache.push({ cachePoint: { type: 'default' } });
-            }
-            // If no tools at all (shouldn't happen but safety check)
-            if (toolsWithCache.length === 0) {
-                toolsWithCache.push({ cachePoint: { type: 'default' } });
-            }
-            params.toolConfig.tools = toolsWithCache;
-        }
-        // Add serviceTier support
-        const serviceTierType = options?.serviceTier ?? this.serviceTier;
-        return {
-            ...params,
-            serviceTier: serviceTierType ? { type: serviceTierType } : undefined,
-        };
-    }
-    /**
-     * Override _generateNonStreaming to use applicationInferenceProfile as modelId.
-     * Uses the same model-swapping pattern as streaming for consistency.
-     */
-    async _generateNonStreaming(messages, options, runManager) {
-        const originalModel = this.model;
-        if (this.applicationInferenceProfile != null &&
-            this.applicationInferenceProfile !== '') {
-            this.model = this.applicationInferenceProfile;
-        }
-        try {
-            return await super._generateNonStreaming(messages, options, runManager);
-        }
-        finally {
-            this.model = originalModel;
-        }
-    }
-    /**
-     * Own the stream end-to-end so we have direct access to every
-     * `contentBlockDelta.contentBlockIndex` from the AWS SDK.
-     *
-     * This replaces the parent's implementation which strips contentBlockIndex
-     * from text and reasoning deltas, making it impossible to merge correctly.
-     */
-    async *_streamResponseChunks(messages, options, runManager) {
-        const { converseMessages, converseSystem } = convertToConverseMessages(messages);
-        const params = this.invocationParams(options);
-        let { streamUsage } = this;
-        if (options.streamUsage !== undefined) {
-            streamUsage = options.streamUsage;
-        }
-        const modelId = this.getModelId();
-        const command = new ConverseStreamCommand({
-            modelId,
-            messages: converseMessages,
-            system: converseSystem,
-            ...params,
-        });
-        const response = await this.client.send(command, {
-            abortSignal: options.signal,
-        });
-        if (!response.stream) {
-            return;
-        }
-        const seenBlockIndices = new Set();
-        for await (const event of response.stream) {
-            if (event.contentBlockStart != null) {
-                const startChunk = handleConverseStreamContentBlockStart(event.contentBlockStart);
-                if (startChunk != null) {
-                    const idx = event.contentBlockStart.contentBlockIndex;
-                    if (idx != null) {
-                        seenBlockIndices.add(idx);
-                    }
-                    yield this.enrichChunk(startChunk, seenBlockIndices);
-                }
-            }
-            else if (event.contentBlockDelta != null) {
-                const deltaChunk = handleConverseStreamContentBlockDelta(event.contentBlockDelta);
-                const idx = event.contentBlockDelta.contentBlockIndex;
-                if (idx != null) {
-                    seenBlockIndices.add(idx);
-                }
-                yield this.enrichChunk(deltaChunk, seenBlockIndices);
-                await runManager?.handleLLMNewToken(deltaChunk.text, undefined, undefined, undefined, undefined, { chunk: deltaChunk });
-            }
-            else if (event.metadata != null) {
-                yield handleConverseStreamMetadata(event.metadata, { streamUsage });
-            }
-            else if (event.contentBlockStop != null) {
-                const stopIdx = event.contentBlockStop.contentBlockIndex;
-                if (stopIdx != null) {
-                    seenBlockIndices.add(stopIdx);
-                }
-            }
-            else {
-                yield new ChatGenerationChunk({
-                    text: '',
-                    message: new AIMessageChunk({
-                        content: '',
-                        response_metadata: event,
-                    }),
-                });
-            }
-        }
-    }
-    /**
-     * Inject `index` on content blocks for proper merge behaviour, then strip
-     * `contentBlockIndex` from response_metadata to prevent `_mergeDicts` conflicts.
-     *
-     * Text string content is promoted to array form only when the stream contains
-     * multiple content block indices (e.g. reasoning at index 0, text at index 1),
-     * ensuring text merges correctly with the already-array accumulated content.
-     */
-    enrichChunk(chunk, seenBlockIndices) {
-        const message = chunk.message;
-        if (!(message instanceof AIMessageChunk)) {
-            return chunk;
-        }
-        const metadata = message.response_metadata;
-        const blockIndex = this.extractContentBlockIndex(metadata);
-        const hasMetadataIndex = blockIndex != null;
-        let content = message.content;
-        let contentModified = false;
-        if (Array.isArray(content) && blockIndex != null) {
-            content = content.map((block) => typeof block === 'object' && !('index' in block)
-                ? { ...block, index: blockIndex }
-                : block);
-            contentModified = true;
-        }
-        else if (typeof content === 'string' &&
-            content !== '' &&
-            blockIndex != null &&
-            seenBlockIndices.size > 1) {
-            content = [{ type: 'text', text: content, index: blockIndex }];
-            contentModified = true;
-        }
-        if (!contentModified && !hasMetadataIndex) {
-            return chunk;
-        }
-        const cleanedMetadata = hasMetadataIndex
-            ? this.removeContentBlockIndex(metadata)
-            : metadata;
-        return new ChatGenerationChunk({
-            text: chunk.text,
-            message: new AIMessageChunk({
-                ...message,
-                content,
-                response_metadata: cleanedMetadata,
-            }),
-            generationInfo: chunk.generationInfo,
-        });
-    }
-    /**
-     * Extract `contentBlockIndex` from the top level of response_metadata.
-     * Our custom handlers always place it at the top level.
-     */
-    extractContentBlockIndex(metadata) {
-        if ('contentBlockIndex' in metadata &&
-            typeof metadata.contentBlockIndex === 'number') {
-            return metadata.contentBlockIndex;
-        }
-        return undefined;
-    }
-    removeContentBlockIndex(obj) {
-        if (obj === null || obj === undefined) {
-            return obj;
-        }
-        if (Array.isArray(obj)) {
-            return obj.map((item) => this.removeContentBlockIndex(item));
-        }
-        if (typeof obj === 'object') {
-            const cleaned = {};
-            for (const [key, value] of Object.entries(obj)) {
-                if (key !== 'contentBlockIndex') {
-                    cleaned[key] = this.removeContentBlockIndex(value);
-                }
-            }
-            return cleaned;
-        }
-        return obj;
-    }
-}
-/** @deprecated Use IllumaBedrockConverse. Alias kept for backward compatibility with existing imports. */
-export const CustomChatBedrockConverse = IllumaBedrockConverse;
-//# sourceMappingURL=index.js.map

package/src/llm/bedrock/types.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=types.js.map

package/src/llm/bedrock/utils/index.js

@@ -1,6 +0,0 @@
-/**
- * Bedrock Converse utility exports.
- */
-export { convertToConverseMessages, extractImageInfo, langchainReasoningBlockToBedrockReasoningBlock, concatenateLangchainReasoningBlocks, } from './message_inputs';
-export { convertConverseMessageToLangChainMessage, handleConverseStreamContentBlockStart, handleConverseStreamContentBlockDelta, handleConverseStreamMetadata, bedrockReasoningBlockToLangchainReasoningBlock, bedrockReasoningDeltaToLangchainPartialReasoningBlock, } from './message_outputs';
-//# sourceMappingURL=index.js.map