openlayer 0.13.0 → 0.13.2

package/lib/integrations/bedrockAgentTracer.js

@@ -0,0 +1,252 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.traceBedrockAgent = void 0;
+// Make imports optional with try/catch
+let BedrockAgentRuntimeClient;
+let InvokeAgentCommand;
+let InvokeAgentCommandInput;
+let InvokeAgentCommandOutput;
+try {
+    const bedrockModule = require('@aws-sdk/client-bedrock-agent-runtime');
+    BedrockAgentRuntimeClient = bedrockModule.BedrockAgentRuntimeClient;
+    InvokeAgentCommand = bedrockModule.InvokeAgentCommand;
+    InvokeAgentCommandInput = bedrockModule.InvokeAgentCommandInput;
+    InvokeAgentCommandOutput = bedrockModule.InvokeAgentCommandOutput;
+}
+catch (error) {
+    // AWS SDK not available
+}
+const tracer_1 = require("../tracing/tracer.js");
+function traceBedrockAgent(client) {
+    if (!BedrockAgentRuntimeClient || !InvokeAgentCommand) {
+        throw new Error('AWS SDK for Bedrock Agent Runtime is not installed. Please install it with: npm install @aws-sdk/client-bedrock-agent-runtime');
+    }
+    const originalSend = client.send.bind(client);
+    client.send = async function (command, options) {
+        // Only trace InvokeAgentCommand
+        if (!(command instanceof InvokeAgentCommand)) {
+            return originalSend(command, options);
+        }
+        const startTime = performance.now();
+        const input = command.input;
+        try {
+            // Call the original send method
+            const response = await originalSend(command, options);
+            if (!response.completion) {
+                throw new Error('Completion is undefined');
+            }
+            // Create a traced async iterator that preserves the original
+            const tracedCompletion = createTracedCompletion(response.completion, input, startTime);
+            // Return the response with the traced completion
+            return {
+                ...response,
+                completion: tracedCompletion,
+            };
+        }
+        catch (error) {
+            console.error('Failed to trace the Bedrock agent invocation with Openlayer', error);
+            throw error;
+        }
+    };
+    return client;
+}
+exports.traceBedrockAgent = traceBedrockAgent;
+// Create a traced completion that collects data while yielding original events
+function createTracedCompletion(originalCompletion, input, startTime) {
+    return {
+        async *[Symbol.asyncIterator]() {
+            let firstTokenTime;
+            let totalTokens = 0;
+            let promptTokens = 0;
+            let completionTokens = 0;
+            let collectedOutput = '';
+            const rawOutputChunks = [];
+            let agentModel = null;
+            let citations = [];
+            let traceData = [];
+            let chunkCount = 0;
+            try {
+                for await (const chunkEvent of originalCompletion) {
+                    // Yield first - ensure user gets data immediately
+                    yield chunkEvent;
+                    // Then collect tracing data
+                    if (chunkCount === 0) {
+                        firstTokenTime = performance.now();
+                    }
+                    chunkCount++;
+                    // Handle chunk events
+                    if (chunkEvent.chunk) {
+                        const chunk = chunkEvent.chunk;
+                        rawOutputChunks.push(chunk);
+                        if (chunk.bytes) {
+                            const decodedResponse = new TextDecoder('utf-8').decode(chunk.bytes);
+                            collectedOutput += decodedResponse;
+                            completionTokens += 1;
+                        }
+                        if (chunk.attribution && chunk.attribution.citations) {
+                            citations.push(...chunk.attribution.citations);
+                        }
+                    }
+                    // Handle trace events
+                    if (chunkEvent.trace) {
+                        traceData.push(chunkEvent.trace);
+                        if (chunkEvent.trace.trace) {
+                            const trace = chunkEvent.trace.trace;
+                            // Extract tokens and model info
+                            if ('orchestrationTrace' in trace &&
+                                trace.orchestrationTrace?.modelInvocationOutput?.metadata?.usage) {
+                                const usage = trace.orchestrationTrace.modelInvocationOutput.metadata.usage;
+                                promptTokens += usage.inputTokens || 0;
+                                completionTokens += usage.outputTokens || 0;
+                            }
+                            if ('orchestrationTrace' in trace &&
+                                trace.orchestrationTrace?.modelInvocationInput?.foundationModel) {
+                                agentModel = trace.orchestrationTrace.modelInvocationInput.foundationModel;
+                            }
+                        }
+                    }
+                }
+                // After the stream is complete, send trace data
+                const endTime = performance.now();
+                totalTokens = promptTokens + completionTokens;
+                // Send trace data to Openlayer
+                const inputs = extractInputs(input, traceData);
+                const metadata = {
+                    agentId: input.agentId,
+                    agentAliasId: input.agentAliasId,
+                    sessionId: input.sessionId,
+                    timeToFirstToken: firstTokenTime ? firstTokenTime - startTime : null,
+                };
+                if (citations.length > 0) {
+                    metadata['citations'] = citations;
+                }
+                const reasoning = extractReasoning(traceData);
+                if (reasoning && reasoning.length > 0) {
+                    metadata['reasoning'] = reasoning;
+                }
+                if (input.sessionState) {
+                    metadata['sessionState'] = {
+                        hasSessionAttributes: !!input.sessionState.sessionAttributes,
+                        hasPromptSessionAttributes: !!input.sessionState.promptSessionAttributes,
+                        hasFiles: !!input.sessionState.files && input.sessionState.files.length > 0,
+                        hasKnowledgeBaseConfigurations: !!input.sessionState.knowledgeBaseConfigurations &&
+                            input.sessionState.knowledgeBaseConfigurations.length > 0,
+                    };
+                }
+                const traceStepData = {
+                    name: 'AWS Bedrock Agent Invocation',
+                    inputs: inputs,
+                    output: collectedOutput,
+                    latency: endTime - startTime,
+                    tokens: totalTokens > 0 ? totalTokens : null,
+                    promptTokens: promptTokens > 0 ? promptTokens : null,
+                    completionTokens: completionTokens > 0 ? completionTokens : null,
+                    model: agentModel || `${input.agentId}:${input.agentAliasId}`,
+                    modelParameters: extractModelParameters(input),
+                    rawOutput: JSON.stringify(rawOutputChunks, null, 2),
+                    metadata: metadata,
+                    provider: 'Bedrock',
+                };
+                (0, tracer_1.addChatCompletionStepToTrace)(traceStepData);
+            }
+            catch (error) {
+                console.error('Error in traced completion:', error);
+                // Don't rethrow - we don't want tracing errors to break the user's stream
+            }
+        },
+    };
+}
+function extractInputs(input, traceData) {
+    const inputs = {};
+    // Build the prompt in OpenAI-compatible format
+    const prompt = [];
+    // Add the main user message
+    if (input.inputText) {
+        prompt.push({
+            role: 'user',
+            content: input.inputText,
+        });
+    }
+    // Add conversation history if present
+    if (input.sessionState?.conversationHistory?.messages) {
+        for (const message of input.sessionState.conversationHistory.messages) {
+            const content = message.content ?
+                message.content.map((block) => ('text' in block ? block.text || '' : '')).join('')
+                : '';
+            const role = message.role || 'user';
+            prompt.unshift({
+                role: role,
+                content: content,
+            });
+        }
+    }
+    // Extract system prompt from trace data if available
+    const systemPrompt = extractSystemPrompt(traceData);
+    if (systemPrompt) {
+        prompt.unshift({
+            role: 'system',
+            content: systemPrompt,
+        });
+    }
+    inputs['prompt'] = prompt;
+    // Add additional context as separate fields
+    if (input.sessionState?.sessionAttributes) {
+        inputs['sessionAttributes'] = input.sessionState.sessionAttributes;
+    }
+    if (input.sessionState?.promptSessionAttributes) {
+        inputs['promptSessionAttributes'] = input.sessionState.promptSessionAttributes;
+    }
+    if (input.sessionState?.files && input.sessionState.files.length > 0) {
+        inputs['files'] = input.sessionState.files.map((file) => ({
+            name: file.name,
+            useCase: file.useCase,
+            sourceType: file.source?.sourceType,
+        }));
+    }
+    return inputs;
+}
+function extractSystemPrompt(traceData) {
+    for (const trace of traceData) {
+        if (trace.trace?.orchestrationTrace?.modelInvocationInput?.text) {
+            try {
+                const parsed = JSON.parse(trace.trace.orchestrationTrace.modelInvocationInput.text);
+                if (parsed.system) {
+                    return parsed.system;
+                }
+            }
+            catch (e) {
+                // If parsing fails, continue
+            }
+        }
+    }
+    return null;
+}
+function extractReasoning(traceData) {
+    const reasoning = [];
+    for (const trace of traceData) {
+        if (trace.trace?.orchestrationTrace?.rationale?.text) {
+            reasoning.push(trace.trace.orchestrationTrace.rationale.text);
+        }
+    }
+    return reasoning.length > 0 ? reasoning : undefined;
+}
+function extractModelParameters(input) {
+    const params = {};
+    if (input.enableTrace !== undefined) {
+        params['enableTrace'] = input.enableTrace;
+    }
+    if (input.endSession !== undefined) {
+        params['endSession'] = input.endSession;
+    }
+    if (input.bedrockModelConfigurations) {
+        params['bedrockModelConfigurations'] = input.bedrockModelConfigurations;
+    }
+    if (input.streamingConfigurations) {
+        params['streamingConfigurations'] = input.streamingConfigurations;
+    }
+    if (input.promptCreationConfigurations) {
+        params['promptCreationConfigurations'] = input.promptCreationConfigurations;
+    }
+    return params;
+}
+//# sourceMappingURL=bedrockAgentTracer.js.map

package/lib/integrations/bedrockAgentTracer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bedrockAgentTracer.js","sourceRoot":"","sources":["../../src/lib/integrations/bedrockAgentTracer.ts"],"names":[],"mappings":"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"}

package/lib/integrations/bedrockAgentTracer.mjs

@@ -0,0 +1,248 @@
+// Make imports optional with try/catch
+let BedrockAgentRuntimeClient;
+let InvokeAgentCommand;
+let InvokeAgentCommandInput;
+let InvokeAgentCommandOutput;
+try {
+    const bedrockModule = require('@aws-sdk/client-bedrock-agent-runtime');
+    BedrockAgentRuntimeClient = bedrockModule.BedrockAgentRuntimeClient;
+    InvokeAgentCommand = bedrockModule.InvokeAgentCommand;
+    InvokeAgentCommandInput = bedrockModule.InvokeAgentCommandInput;
+    InvokeAgentCommandOutput = bedrockModule.InvokeAgentCommandOutput;
+}
+catch (error) {
+    // AWS SDK not available
+}
+import { addChatCompletionStepToTrace } from "../tracing/tracer.mjs";
+export function traceBedrockAgent(client) {
+    if (!BedrockAgentRuntimeClient || !InvokeAgentCommand) {
+        throw new Error('AWS SDK for Bedrock Agent Runtime is not installed. Please install it with: npm install @aws-sdk/client-bedrock-agent-runtime');
+    }
+    const originalSend = client.send.bind(client);
+    client.send = async function (command, options) {
+        // Only trace InvokeAgentCommand
+        if (!(command instanceof InvokeAgentCommand)) {
+            return originalSend(command, options);
+        }
+        const startTime = performance.now();
+        const input = command.input;
+        try {
+            // Call the original send method
+            const response = await originalSend(command, options);
+            if (!response.completion) {
+                throw new Error('Completion is undefined');
+            }
+            // Create a traced async iterator that preserves the original
+            const tracedCompletion = createTracedCompletion(response.completion, input, startTime);
+            // Return the response with the traced completion
+            return {
+                ...response,
+                completion: tracedCompletion,
+            };
+        }
+        catch (error) {
+            console.error('Failed to trace the Bedrock agent invocation with Openlayer', error);
+            throw error;
+        }
+    };
+    return client;
+}
+// Create a traced completion that collects data while yielding original events
+function createTracedCompletion(originalCompletion, input, startTime) {
+    return {
+        async *[Symbol.asyncIterator]() {
+            let firstTokenTime;
+            let totalTokens = 0;
+            let promptTokens = 0;
+            let completionTokens = 0;
+            let collectedOutput = '';
+            const rawOutputChunks = [];
+            let agentModel = null;
+            let citations = [];
+            let traceData = [];
+            let chunkCount = 0;
+            try {
+                for await (const chunkEvent of originalCompletion) {
+                    // Yield first - ensure user gets data immediately
+                    yield chunkEvent;
+                    // Then collect tracing data
+                    if (chunkCount === 0) {
+                        firstTokenTime = performance.now();
+                    }
+                    chunkCount++;
+                    // Handle chunk events
+                    if (chunkEvent.chunk) {
+                        const chunk = chunkEvent.chunk;
+                        rawOutputChunks.push(chunk);
+                        if (chunk.bytes) {
+                            const decodedResponse = new TextDecoder('utf-8').decode(chunk.bytes);
+                            collectedOutput += decodedResponse;
+                            completionTokens += 1;
+                        }
+                        if (chunk.attribution && chunk.attribution.citations) {
+                            citations.push(...chunk.attribution.citations);
+                        }
+                    }
+                    // Handle trace events
+                    if (chunkEvent.trace) {
+                        traceData.push(chunkEvent.trace);
+                        if (chunkEvent.trace.trace) {
+                            const trace = chunkEvent.trace.trace;
+                            // Extract tokens and model info
+                            if ('orchestrationTrace' in trace &&
+                                trace.orchestrationTrace?.modelInvocationOutput?.metadata?.usage) {
+                                const usage = trace.orchestrationTrace.modelInvocationOutput.metadata.usage;
+                                promptTokens += usage.inputTokens || 0;
+                                completionTokens += usage.outputTokens || 0;
+                            }
+                            if ('orchestrationTrace' in trace &&
+                                trace.orchestrationTrace?.modelInvocationInput?.foundationModel) {
+                                agentModel = trace.orchestrationTrace.modelInvocationInput.foundationModel;
+                            }
+                        }
+                    }
+                }
+                // After the stream is complete, send trace data
+                const endTime = performance.now();
+                totalTokens = promptTokens + completionTokens;
+                // Send trace data to Openlayer
+                const inputs = extractInputs(input, traceData);
+                const metadata = {
+                    agentId: input.agentId,
+                    agentAliasId: input.agentAliasId,
+                    sessionId: input.sessionId,
+                    timeToFirstToken: firstTokenTime ? firstTokenTime - startTime : null,
+                };
+                if (citations.length > 0) {
+                    metadata['citations'] = citations;
+                }
+                const reasoning = extractReasoning(traceData);
+                if (reasoning && reasoning.length > 0) {
+                    metadata['reasoning'] = reasoning;
+                }
+                if (input.sessionState) {
+                    metadata['sessionState'] = {
+                        hasSessionAttributes: !!input.sessionState.sessionAttributes,
+                        hasPromptSessionAttributes: !!input.sessionState.promptSessionAttributes,
+                        hasFiles: !!input.sessionState.files && input.sessionState.files.length > 0,
+                        hasKnowledgeBaseConfigurations: !!input.sessionState.knowledgeBaseConfigurations &&
+                            input.sessionState.knowledgeBaseConfigurations.length > 0,
+                    };
+                }
+                const traceStepData = {
+                    name: 'AWS Bedrock Agent Invocation',
+                    inputs: inputs,
+                    output: collectedOutput,
+                    latency: endTime - startTime,
+                    tokens: totalTokens > 0 ? totalTokens : null,
+                    promptTokens: promptTokens > 0 ? promptTokens : null,
+                    completionTokens: completionTokens > 0 ? completionTokens : null,
+                    model: agentModel || `${input.agentId}:${input.agentAliasId}`,
+                    modelParameters: extractModelParameters(input),
+                    rawOutput: JSON.stringify(rawOutputChunks, null, 2),
+                    metadata: metadata,
+                    provider: 'Bedrock',
+                };
+                addChatCompletionStepToTrace(traceStepData);
+            }
+            catch (error) {
+                console.error('Error in traced completion:', error);
+                // Don't rethrow - we don't want tracing errors to break the user's stream
+            }
+        },
+    };
+}
+function extractInputs(input, traceData) {
+    const inputs = {};
+    // Build the prompt in OpenAI-compatible format
+    const prompt = [];
+    // Add the main user message
+    if (input.inputText) {
+        prompt.push({
+            role: 'user',
+            content: input.inputText,
+        });
+    }
+    // Add conversation history if present
+    if (input.sessionState?.conversationHistory?.messages) {
+        for (const message of input.sessionState.conversationHistory.messages) {
+            const content = message.content ?
+                message.content.map((block) => ('text' in block ? block.text || '' : '')).join('')
+                : '';
+            const role = message.role || 'user';
+            prompt.unshift({
+                role: role,
+                content: content,
+            });
+        }
+    }
+    // Extract system prompt from trace data if available
+    const systemPrompt = extractSystemPrompt(traceData);
+    if (systemPrompt) {
+        prompt.unshift({
+            role: 'system',
+            content: systemPrompt,
+        });
+    }
+    inputs['prompt'] = prompt;
+    // Add additional context as separate fields
+    if (input.sessionState?.sessionAttributes) {
+        inputs['sessionAttributes'] = input.sessionState.sessionAttributes;
+    }
+    if (input.sessionState?.promptSessionAttributes) {
+        inputs['promptSessionAttributes'] = input.sessionState.promptSessionAttributes;
+    }
+    if (input.sessionState?.files && input.sessionState.files.length > 0) {
+        inputs['files'] = input.sessionState.files.map((file) => ({
+            name: file.name,
+            useCase: file.useCase,
+            sourceType: file.source?.sourceType,
+        }));
+    }
+    return inputs;
+}
+function extractSystemPrompt(traceData) {
+    for (const trace of traceData) {
+        if (trace.trace?.orchestrationTrace?.modelInvocationInput?.text) {
+            try {
+                const parsed = JSON.parse(trace.trace.orchestrationTrace.modelInvocationInput.text);
+                if (parsed.system) {
+                    return parsed.system;
+                }
+            }
+            catch (e) {
+                // If parsing fails, continue
+            }
+        }
+    }
+    return null;
+}
+function extractReasoning(traceData) {
+    const reasoning = [];
+    for (const trace of traceData) {
+        if (trace.trace?.orchestrationTrace?.rationale?.text) {
+            reasoning.push(trace.trace.orchestrationTrace.rationale.text);
+        }
+    }
+    return reasoning.length > 0 ? reasoning : undefined;
+}
+function extractModelParameters(input) {
+    const params = {};
+    if (input.enableTrace !== undefined) {
+        params['enableTrace'] = input.enableTrace;
+    }
+    if (input.endSession !== undefined) {
+        params['endSession'] = input.endSession;
+    }
+    if (input.bedrockModelConfigurations) {
+        params['bedrockModelConfigurations'] = input.bedrockModelConfigurations;
+    }
+    if (input.streamingConfigurations) {
+        params['streamingConfigurations'] = input.streamingConfigurations;
+    }
+    if (input.promptCreationConfigurations) {
+        params['promptCreationConfigurations'] = input.promptCreationConfigurations;
+    }
+    return params;
+}
+//# sourceMappingURL=bedrockAgentTracer.mjs.map

package/lib/integrations/bedrockAgentTracer.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"bedrockAgentTracer.mjs","sourceRoot":"","sources":["../../src/lib/integrations/bedrockAgentTracer.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "openlayer",
-  "version": "0.13.0",
+  "version": "0.13.2",
   "description": "The official TypeScript library for the Openlayer API",
   "author": "Openlayer <support@openlayer.com>",
   "types": "./index.d.ts",
@@ -13,6 +13,9 @@
     "**/*"
   ],
   "private": false,
+  "publishConfig": {
+    "access": "public"
+  },
   "scripts": {
     "test": "./scripts/test",
     "build": "./scripts/build",
@@ -22,6 +25,7 @@
     "fix": "./scripts/format"
   },
   "dependencies": {
+    "@aws-sdk/client-bedrock-agent-runtime": "^3.862.0",
     "@langchain/core": "^0.3.3",
     "@types/node": "^18.11.18",
     "@types/node-fetch": "^2.6.4",
@@ -43,10 +47,6 @@
     "./shims/web.js",
     "./shims/web.mjs"
   ],
-  "imports": {
-    "openlayer": ".",
-    "openlayer/*": "./src/*"
-  },
   "exports": {
     "./_shims/auto/*": {
       "deno": {

package/src/core.ts

@@ -299,10 +299,10 @@ export abstract class APIClient {
     return null;
   }
 
-  buildRequest<Req>(
+  async buildRequest<Req>(
     inputOptions: FinalRequestOptions<Req>,
     { retryCount = 0 }: { retryCount?: number } = {},
-  ): { req: RequestInit; url: string; timeout: number } {
+  ): Promise<{ req: RequestInit; url: string; timeout: number }> {
     const options = { ...inputOptions };
     const { method, path, query, defaultBaseURL, headers: headers = {} } = options;
 
@@ -450,7 +450,9 @@ export abstract class APIClient {
 
     await this.prepareOptions(options);
 
-    const { req, url, timeout } = this.buildRequest(options, { retryCount: maxRetries - retriesRemaining });
+    const { req, url, timeout } = await this.buildRequest(options, {
+      retryCount: maxRetries - retriesRemaining,
+    });
 
     await this.prepareRequest(req, { url, options });