openlayer 0.13.12 → 0.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +16 -0
- package/lib/core/cli.d.ts +5 -2
- package/lib/core/cli.d.ts.map +1 -1
- package/lib/core/cli.js +34 -5
- package/lib/core/cli.js.map +1 -1
- package/lib/core/cli.mjs +34 -5
- package/lib/core/cli.mjs.map +1 -1
- package/lib/integrations/bedrockAgentTracer.d.ts.map +1 -1
- package/lib/integrations/bedrockAgentTracer.js +4 -13
- package/lib/integrations/bedrockAgentTracer.js.map +1 -1
- package/lib/integrations/bedrockAgentTracer.mjs +4 -13
- package/lib/integrations/bedrockAgentTracer.mjs.map +1 -1
- package/lib/tracing/tracer.d.ts +6 -0
- package/lib/tracing/tracer.d.ts.map +1 -1
- package/lib/tracing/tracer.js +6 -3
- package/lib/tracing/tracer.js.map +1 -1
- package/lib/tracing/tracer.mjs +5 -4
- package/lib/tracing/tracer.mjs.map +1 -1
- package/package.json +2 -1
- package/src/lib/core/cli.ts +54 -8
- package/src/lib/integrations/bedrockAgentTracer.ts +5 -16
- package/src/lib/tracing/tracer.ts +5 -4
- package/src/version.ts +1 -1
- package/version.d.ts +1 -1
- package/version.d.ts.map +1 -1
- package/version.js +1 -1
- package/version.js.map +1 -1
- package/version.mjs +1 -1
- package/version.mjs.map +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,21 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.14.0 (2025-08-22)
|
|
4
|
+
|
|
5
|
+
Full Changelog: [v0.13.13...v0.14.0](https://github.com/openlayer-ai/openlayer-ts/compare/v0.13.13...v0.14.0)
|
|
6
|
+
|
|
7
|
+
### Features
|
|
8
|
+
|
|
9
|
+
* enable tracing in development mode for TypeScript clients ([0da012d](https://github.com/openlayer-ai/openlayer-ts/commit/0da012dfaac7d979a44a64fe95dfb4a68e87f28c))
|
|
10
|
+
|
|
11
|
+
## 0.13.13 (2025-08-20)
|
|
12
|
+
|
|
13
|
+
Full Changelog: [v0.13.12...v0.13.13](https://github.com/openlayer-ai/openlayer-ts/compare/v0.13.12...v0.13.13)
|
|
14
|
+
|
|
15
|
+
### Chores
|
|
16
|
+
|
|
17
|
+
* remove redundant logs ([8882a70](https://github.com/openlayer-ai/openlayer-ts/commit/8882a70a5bb9e1cf88cb5b72b77dfe94ce4c97d3))
|
|
18
|
+
|
|
3
19
|
## 0.13.12 (2025-08-20)
|
|
4
20
|
|
|
5
21
|
Full Changelog: [v0.13.11...v0.13.12](https://github.com/openlayer-ai/openlayer-ts/compare/v0.13.11...v0.13.12)
|
package/lib/core/cli.d.ts
CHANGED
|
@@ -6,10 +6,13 @@ export interface RunReturn {
|
|
|
6
6
|
}
|
|
7
7
|
export interface Config {
|
|
8
8
|
inputVariableNames?: string[];
|
|
9
|
-
metadata
|
|
10
|
-
outputTimestamp
|
|
9
|
+
metadata?: {
|
|
10
|
+
outputTimestamp?: number;
|
|
11
11
|
};
|
|
12
12
|
outputColumnName: string;
|
|
13
|
+
latencyColumnName?: string;
|
|
14
|
+
costColumnName?: string;
|
|
15
|
+
numOfTokensColumnName?: string;
|
|
13
16
|
}
|
|
14
17
|
declare class CLIHandler {
|
|
15
18
|
private run;
|
package/lib/core/cli.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/lib/core/cli.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../src/lib/core/cli.ts"],"names":[],"mappings":"AAkBA,MAAM,WAAW,SAAS;IACxB,WAAW,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAA;KAAE,CAAC;IACpC,MAAM,EAAE,GAAG,CAAC;CACb;AAYD,MAAM,WAAW,MAAM;IACrB,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,QAAQ,CAAC,EAAE;QACT,eAAe,CAAC,EAAE,MAAM,CAAC;KAC1B,CAAC;IACF,gBAAgB,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qBAAqB,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,cAAM,UAAU;IACd,OAAO,CAAC,GAAG,CAAmC;gBAElC,WAAW,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC;IAIlD,UAAU;IAqEjB,OAAO,CAAC,WAAW;CAmBpB;AAED,eAAe,UAAU,CAAC"}
|
package/lib/core/cli.js
CHANGED
|
@@ -37,6 +37,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
37
37
|
const commander_1 = require("commander");
|
|
38
38
|
const fs = __importStar(require("fs"));
|
|
39
39
|
const path = __importStar(require("path"));
|
|
40
|
+
const tracer_1 = require("../tracing/tracer.js");
|
|
40
41
|
class CLIHandler {
|
|
41
42
|
constructor(runFunction) {
|
|
42
43
|
this.run = runFunction;
|
|
@@ -56,22 +57,50 @@ class CLIHandler {
|
|
|
56
57
|
Promise.all(dataset.map(async (item) => {
|
|
57
58
|
const result = await this.run(item);
|
|
58
59
|
// Merge the original item fields with the result
|
|
59
|
-
|
|
60
|
+
const traceData = (0, tracer_1.getCurrentTrace)() ?? undefined;
|
|
61
|
+
const postProcessedTrace = typeof traceData === 'undefined' || traceData === null ?
|
|
62
|
+
undefined
|
|
63
|
+
: (0, tracer_1.postProcessTrace)(traceData)?.traceData;
|
|
64
|
+
const output = {
|
|
65
|
+
...item,
|
|
66
|
+
...result.otherFields,
|
|
67
|
+
output: result.output,
|
|
68
|
+
steps: traceData?.toJSON(),
|
|
69
|
+
latency: postProcessedTrace?.latency,
|
|
70
|
+
cost: postProcessedTrace?.cost,
|
|
71
|
+
tokens: postProcessedTrace?.tokens,
|
|
72
|
+
metadata: {
|
|
73
|
+
...(postProcessedTrace?.metadata ?? {}),
|
|
74
|
+
inputVariableNames: postProcessedTrace?.inputVariableNames,
|
|
75
|
+
},
|
|
76
|
+
};
|
|
77
|
+
return output;
|
|
60
78
|
}))
|
|
61
79
|
.then((results) => {
|
|
62
80
|
/*
|
|
63
81
|
* Wait for all rows to be run
|
|
64
82
|
* Write results now to output dir or log to console
|
|
65
83
|
*/
|
|
66
|
-
|
|
84
|
+
const config = {
|
|
85
|
+
outputColumnName: 'output',
|
|
86
|
+
inputVariableNames: results[0]?.metadata?.['inputVariableNames'],
|
|
87
|
+
metadata: {
|
|
88
|
+
...(results[0]?.metadata ?? {}),
|
|
89
|
+
outputTimestamp: Date.now(),
|
|
90
|
+
},
|
|
91
|
+
...(results.some((r) => typeof r.latency === 'number') ? { latencyColumnName: 'latency' } : {}),
|
|
92
|
+
...(results.some((r) => typeof r.cost === 'number') ? { costColumnName: 'cost' } : {}),
|
|
93
|
+
...(results.some((r) => typeof r.tokens === 'number') ? { numOfTokensColumnName: 'tokens' } : {}),
|
|
94
|
+
};
|
|
95
|
+
this.writeOutput(results, outputDir, config);
|
|
67
96
|
console.log('Results processing completed. Check console for output.');
|
|
68
97
|
})
|
|
69
98
|
.catch((err) => {
|
|
70
99
|
console.error(`Error processing dataset: ${err}`);
|
|
71
100
|
});
|
|
72
101
|
}
|
|
73
|
-
writeOutput(results, outputDir) {
|
|
74
|
-
const
|
|
102
|
+
writeOutput(results, outputDir, config) {
|
|
103
|
+
const resolvedConfig = {
|
|
75
104
|
metadata: { outputTimestamp: Date.now() },
|
|
76
105
|
outputColumnName: 'output',
|
|
77
106
|
};
|
|
@@ -81,7 +110,7 @@ class CLIHandler {
|
|
|
81
110
|
const datasetPath = path.join(outputDirPath, 'dataset.json');
|
|
82
111
|
const configPath = path.join(outputDirPath, 'config.json');
|
|
83
112
|
fs.writeFileSync(datasetPath, JSON.stringify(results, null, 4), 'utf8');
|
|
84
|
-
fs.writeFileSync(configPath, JSON.stringify(
|
|
113
|
+
fs.writeFileSync(configPath, JSON.stringify(resolvedConfig, null, 4), 'utf8');
|
|
85
114
|
console.info(`Output written to ${datasetPath}`);
|
|
86
115
|
console.info(`Config written to ${configPath}`);
|
|
87
116
|
}
|
package/lib/core/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/lib/core/cli.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;GAUG;;;;;;;;;;;;;;;;;;;;;;;;;AAEH,yCAAoC;AACpC,uCAAyB;AACzB,2CAA6B;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/lib/core/cli.ts"],"names":[],"mappings":"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"}
|
package/lib/core/cli.mjs
CHANGED
|
@@ -12,6 +12,7 @@
|
|
|
12
12
|
import { program } from 'commander';
|
|
13
13
|
import * as fs from 'fs';
|
|
14
14
|
import * as path from 'path';
|
|
15
|
+
import { getCurrentTrace, postProcessTrace } from "../tracing/tracer.mjs";
|
|
15
16
|
class CLIHandler {
|
|
16
17
|
constructor(runFunction) {
|
|
17
18
|
this.run = runFunction;
|
|
@@ -31,22 +32,50 @@ class CLIHandler {
|
|
|
31
32
|
Promise.all(dataset.map(async (item) => {
|
|
32
33
|
const result = await this.run(item);
|
|
33
34
|
// Merge the original item fields with the result
|
|
34
|
-
|
|
35
|
+
const traceData = getCurrentTrace() ?? undefined;
|
|
36
|
+
const postProcessedTrace = typeof traceData === 'undefined' || traceData === null ?
|
|
37
|
+
undefined
|
|
38
|
+
: postProcessTrace(traceData)?.traceData;
|
|
39
|
+
const output = {
|
|
40
|
+
...item,
|
|
41
|
+
...result.otherFields,
|
|
42
|
+
output: result.output,
|
|
43
|
+
steps: traceData?.toJSON(),
|
|
44
|
+
latency: postProcessedTrace?.latency,
|
|
45
|
+
cost: postProcessedTrace?.cost,
|
|
46
|
+
tokens: postProcessedTrace?.tokens,
|
|
47
|
+
metadata: {
|
|
48
|
+
...(postProcessedTrace?.metadata ?? {}),
|
|
49
|
+
inputVariableNames: postProcessedTrace?.inputVariableNames,
|
|
50
|
+
},
|
|
51
|
+
};
|
|
52
|
+
return output;
|
|
35
53
|
}))
|
|
36
54
|
.then((results) => {
|
|
37
55
|
/*
|
|
38
56
|
* Wait for all rows to be run
|
|
39
57
|
* Write results now to output dir or log to console
|
|
40
58
|
*/
|
|
41
|
-
|
|
59
|
+
const config = {
|
|
60
|
+
outputColumnName: 'output',
|
|
61
|
+
inputVariableNames: results[0]?.metadata?.['inputVariableNames'],
|
|
62
|
+
metadata: {
|
|
63
|
+
...(results[0]?.metadata ?? {}),
|
|
64
|
+
outputTimestamp: Date.now(),
|
|
65
|
+
},
|
|
66
|
+
...(results.some((r) => typeof r.latency === 'number') ? { latencyColumnName: 'latency' } : {}),
|
|
67
|
+
...(results.some((r) => typeof r.cost === 'number') ? { costColumnName: 'cost' } : {}),
|
|
68
|
+
...(results.some((r) => typeof r.tokens === 'number') ? { numOfTokensColumnName: 'tokens' } : {}),
|
|
69
|
+
};
|
|
70
|
+
this.writeOutput(results, outputDir, config);
|
|
42
71
|
console.log('Results processing completed. Check console for output.');
|
|
43
72
|
})
|
|
44
73
|
.catch((err) => {
|
|
45
74
|
console.error(`Error processing dataset: ${err}`);
|
|
46
75
|
});
|
|
47
76
|
}
|
|
48
|
-
writeOutput(results, outputDir) {
|
|
49
|
-
const
|
|
77
|
+
writeOutput(results, outputDir, config) {
|
|
78
|
+
const resolvedConfig = {
|
|
50
79
|
metadata: { outputTimestamp: Date.now() },
|
|
51
80
|
outputColumnName: 'output',
|
|
52
81
|
};
|
|
@@ -56,7 +85,7 @@ class CLIHandler {
|
|
|
56
85
|
const datasetPath = path.join(outputDirPath, 'dataset.json');
|
|
57
86
|
const configPath = path.join(outputDirPath, 'config.json');
|
|
58
87
|
fs.writeFileSync(datasetPath, JSON.stringify(results, null, 4), 'utf8');
|
|
59
|
-
fs.writeFileSync(configPath, JSON.stringify(
|
|
88
|
+
fs.writeFileSync(configPath, JSON.stringify(resolvedConfig, null, 4), 'utf8');
|
|
60
89
|
console.info(`Output written to ${datasetPath}`);
|
|
61
90
|
console.info(`Config written to ${configPath}`);
|
|
62
91
|
}
|
package/lib/core/cli.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.mjs","sourceRoot":"","sources":["../../src/lib/core/cli.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;OAEI,EAAE,OAAO,EAAE,MAAM,WAAW;OAC5B,KAAK,EAAE,MAAM,IAAI;OACjB,KAAK,IAAI,MAAM,MAAM;
|
|
1
|
+
{"version":3,"file":"cli.mjs","sourceRoot":"","sources":["../../src/lib/core/cli.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bedrockAgentTracer.d.ts","sourceRoot":"","sources":["../../src/lib/integrations/bedrockAgentTracer.ts"],"names":[],"mappings":"AAuBA,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,GAAG,EACX,4BAA4B,CAAC,EAAE,MAAM,GACpC,GAAG,
|
|
1
|
+
{"version":3,"file":"bedrockAgentTracer.d.ts","sourceRoot":"","sources":["../../src/lib/integrations/bedrockAgentTracer.ts"],"names":[],"mappings":"AAuBA,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,GAAG,EACX,4BAA4B,CAAC,EAAE,MAAM,GACpC,GAAG,CAsDL"}
|
|
@@ -32,21 +32,12 @@ function traceBedrockAgent(client, openlayerInferencePipelineId) {
|
|
|
32
32
|
const hasInput = command?.input;
|
|
33
33
|
const hasAgentId = typeof command?.input?.agentId === 'string';
|
|
34
34
|
const hasInputText = typeof command?.input?.inputText === 'string';
|
|
35
|
-
console.debug('Bedrock command analysis:', {
|
|
36
|
-
command: command,
|
|
37
|
-
hasInput: hasInput,
|
|
38
|
-
hasAgentId: hasAgentId,
|
|
39
|
-
hasInputText: hasInputText,
|
|
40
|
-
constructorName: command?.constructor?.name,
|
|
41
|
-
input: command?.input,
|
|
42
|
-
});
|
|
43
35
|
// Check if this looks like an InvokeAgentCommand by checking for expected properties
|
|
44
36
|
const isInvokeAgentCommand = hasInput && hasAgentId && hasInputText;
|
|
45
37
|
if (!isInvokeAgentCommand) {
|
|
46
38
|
console.debug('Command is not an InvokeAgentCommand, passing through uninstrumented');
|
|
47
39
|
return originalSend(command, options);
|
|
48
40
|
}
|
|
49
|
-
console.debug('Command identified as InvokeAgentCommand, applying tracing');
|
|
50
41
|
const startTime = (0, performance_now_1.default)();
|
|
51
42
|
const input = command.input;
|
|
52
43
|
try {
|
|
@@ -85,12 +76,10 @@ function createTracedCompletion(originalCompletion, input, startTime, openlayerI
|
|
|
85
76
|
let citations = [];
|
|
86
77
|
let traceData = [];
|
|
87
78
|
let chunkCount = 0;
|
|
88
|
-
console.debug('Original completion:', JSON.stringify(originalCompletion, null, 2));
|
|
89
79
|
try {
|
|
90
80
|
for await (const chunkEvent of originalCompletion) {
|
|
91
81
|
// Yield first - ensure user gets data immediately
|
|
92
82
|
yield chunkEvent;
|
|
93
|
-
console.debug(JSON.stringify(chunkEvent, null, 2));
|
|
94
83
|
// Then collect tracing data
|
|
95
84
|
if (chunkCount === 0) {
|
|
96
85
|
firstTokenTime = (0, performance_now_1.default)();
|
|
@@ -101,9 +90,11 @@ function createTracedCompletion(originalCompletion, input, startTime, openlayerI
|
|
|
101
90
|
const chunk = chunkEvent.chunk;
|
|
102
91
|
rawOutputChunks.push(chunk);
|
|
103
92
|
if (chunk.bytes) {
|
|
104
|
-
|
|
93
|
+
// Convert the object-based bytes to a proper Uint8Array
|
|
94
|
+
const bytesObject = chunk.bytes;
|
|
95
|
+
const byteArray = new Uint8Array(Object.values(bytesObject));
|
|
96
|
+
const decodedResponse = new TextDecoder('utf-8').decode(byteArray);
|
|
105
97
|
collectedOutput += decodedResponse;
|
|
106
|
-
completionTokens += 1;
|
|
107
98
|
}
|
|
108
99
|
if (chunk.attribution && chunk.attribution.citations) {
|
|
109
100
|
citations.push(...chunk.attribution.citations);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bedrockAgentTracer.js","sourceRoot":"","sources":["../../src/lib/integrations/bedrockAgentTracer.ts"],"names":[],"mappings":";;;;;;AAAA,sEAA6C;AAE7C,uCAAuC;AACvC,IAAI,yBAA8B,CAAC;AACnC,IAAI,kBAAuB,CAAC;AAC5B,IAAI,uBAA4B,CAAC;AACjC,IAAI,wBAA6B,CAAC;AAElC,IAAI;IACF,MAAM,aAAa,GAAG,OAAO,CAAC,uCAAuC,CAAC,CAAC;IACvE,yBAAyB,GAAG,aAAa,CAAC,yBAAyB,CAAC;IACpE,kBAAkB,GAAG,aAAa,CAAC,kBAAkB,CAAC;IACtD,uBAAuB,GAAG,aAAa,CAAC,uBAAuB,CAAC;IAChE,wBAAwB,GAAG,aAAa,CAAC,wBAAwB,CAAC;CACnE;AAAC,OAAO,KAAK,EAAE;IACd,OAAO,CAAC,IAAI,CACV,wHAAwH,CACzH,CAAC;IACF,OAAO,CAAC,KAAK,CAAC,qDAAqD,EAAE,KAAK,CAAC,CAAC;CAC7E;AAED,iDAAiE;AAEjE,SAAgB,iBAAiB,CAC/B,MAAW,EACX,4BAAqC;IAErC,IAAI,CAAC,yBAAyB,IAAI,CAAC,kBAAkB,EAAE;QACrD,MAAM,IAAI,KAAK,CACb,+HAA+H,CAChI,CAAC;KACH;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9C,MAAM,CAAC,IAAI,GAAG,KAAK,WAAsB,OAAY,EAAE,OAAa;QAClE,4CAA4C;QAC5C,MAAM,QAAQ,GAAG,OAAO,EAAE,KAAK,CAAC;QAChC,MAAM,UAAU,GAAG,OAAO,OAAO,EAAE,KAAK,EAAE,OAAO,KAAK,QAAQ,CAAC;QAC/D,MAAM,YAAY,GAAG,OAAO,OAAO,EAAE,KAAK,EAAE,SAAS,KAAK,QAAQ,CAAC;QAEnE,
|
|
1
|
+
{"version":3,"file":"bedrockAgentTracer.js","sourceRoot":"","sources":["../../src/lib/integrations/bedrockAgentTracer.ts"],"names":[],"mappings":"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"}
|
|
@@ -26,21 +26,12 @@ export function traceBedrockAgent(client, openlayerInferencePipelineId) {
|
|
|
26
26
|
const hasInput = command?.input;
|
|
27
27
|
const hasAgentId = typeof command?.input?.agentId === 'string';
|
|
28
28
|
const hasInputText = typeof command?.input?.inputText === 'string';
|
|
29
|
-
console.debug('Bedrock command analysis:', {
|
|
30
|
-
command: command,
|
|
31
|
-
hasInput: hasInput,
|
|
32
|
-
hasAgentId: hasAgentId,
|
|
33
|
-
hasInputText: hasInputText,
|
|
34
|
-
constructorName: command?.constructor?.name,
|
|
35
|
-
input: command?.input,
|
|
36
|
-
});
|
|
37
29
|
// Check if this looks like an InvokeAgentCommand by checking for expected properties
|
|
38
30
|
const isInvokeAgentCommand = hasInput && hasAgentId && hasInputText;
|
|
39
31
|
if (!isInvokeAgentCommand) {
|
|
40
32
|
console.debug('Command is not an InvokeAgentCommand, passing through uninstrumented');
|
|
41
33
|
return originalSend(command, options);
|
|
42
34
|
}
|
|
43
|
-
console.debug('Command identified as InvokeAgentCommand, applying tracing');
|
|
44
35
|
const startTime = performanceNow();
|
|
45
36
|
const input = command.input;
|
|
46
37
|
try {
|
|
@@ -78,12 +69,10 @@ function createTracedCompletion(originalCompletion, input, startTime, openlayerI
|
|
|
78
69
|
let citations = [];
|
|
79
70
|
let traceData = [];
|
|
80
71
|
let chunkCount = 0;
|
|
81
|
-
console.debug('Original completion:', JSON.stringify(originalCompletion, null, 2));
|
|
82
72
|
try {
|
|
83
73
|
for await (const chunkEvent of originalCompletion) {
|
|
84
74
|
// Yield first - ensure user gets data immediately
|
|
85
75
|
yield chunkEvent;
|
|
86
|
-
console.debug(JSON.stringify(chunkEvent, null, 2));
|
|
87
76
|
// Then collect tracing data
|
|
88
77
|
if (chunkCount === 0) {
|
|
89
78
|
firstTokenTime = performanceNow();
|
|
@@ -94,9 +83,11 @@ function createTracedCompletion(originalCompletion, input, startTime, openlayerI
|
|
|
94
83
|
const chunk = chunkEvent.chunk;
|
|
95
84
|
rawOutputChunks.push(chunk);
|
|
96
85
|
if (chunk.bytes) {
|
|
97
|
-
|
|
86
|
+
// Convert the object-based bytes to a proper Uint8Array
|
|
87
|
+
const bytesObject = chunk.bytes;
|
|
88
|
+
const byteArray = new Uint8Array(Object.values(bytesObject));
|
|
89
|
+
const decodedResponse = new TextDecoder('utf-8').decode(byteArray);
|
|
98
90
|
collectedOutput += decodedResponse;
|
|
99
|
-
completionTokens += 1;
|
|
100
91
|
}
|
|
101
92
|
if (chunk.attribution && chunk.attribution.citations) {
|
|
102
93
|
citations.push(...chunk.attribution.citations);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bedrockAgentTracer.mjs","sourceRoot":"","sources":["../../src/lib/integrations/bedrockAgentTracer.ts"],"names":[],"mappings":"OAAO,cAAc,MAAM,iBAAiB;AAE5C,uCAAuC;AACvC,IAAI,yBAA8B,CAAC;AACnC,IAAI,kBAAuB,CAAC;AAC5B,IAAI,uBAA4B,CAAC;AACjC,IAAI,wBAA6B,CAAC;AAElC,IAAI;IACF,MAAM,aAAa,GAAG,OAAO,CAAC,uCAAuC,CAAC,CAAC;IACvE,yBAAyB,GAAG,aAAa,CAAC,yBAAyB,CAAC;IACpE,kBAAkB,GAAG,aAAa,CAAC,kBAAkB,CAAC;IACtD,uBAAuB,GAAG,aAAa,CAAC,uBAAuB,CAAC;IAChE,wBAAwB,GAAG,aAAa,CAAC,wBAAwB,CAAC;CACnE;AAAC,OAAO,KAAK,EAAE;IACd,OAAO,CAAC,IAAI,CACV,wHAAwH,CACzH,CAAC;IACF,OAAO,CAAC,KAAK,CAAC,qDAAqD,EAAE,KAAK,CAAC,CAAC;CAC7E;OAEM,EAAE,4BAA4B,EAAE;AAEvC,MAAM,UAAU,iBAAiB,CAC/B,MAAW,EACX,4BAAqC;IAErC,IAAI,CAAC,yBAAyB,IAAI,CAAC,kBAAkB,EAAE;QACrD,MAAM,IAAI,KAAK,CACb,+HAA+H,CAChI,CAAC;KACH;IAED,MAAM,YAAY,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE9C,MAAM,CAAC,IAAI,GAAG,KAAK,WAAsB,OAAY,EAAE,OAAa;QAClE,4CAA4C;QAC5C,MAAM,QAAQ,GAAG,OAAO,EAAE,KAAK,CAAC;QAChC,MAAM,UAAU,GAAG,OAAO,OAAO,EAAE,KAAK,EAAE,OAAO,KAAK,QAAQ,CAAC;QAC/D,MAAM,YAAY,GAAG,OAAO,OAAO,EAAE,KAAK,EAAE,SAAS,KAAK,QAAQ,CAAC;QAEnE,
|
|
1
|
+
{"version":3,"file":"bedrockAgentTracer.mjs","sourceRoot":"","sources":["../../src/lib/integrations/bedrockAgentTracer.ts"],"names":[],"mappings":"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"}
|
package/lib/tracing/tracer.d.ts
CHANGED
|
@@ -1,4 +1,6 @@
|
|
|
1
1
|
import { StepType } from "./enums.js";
|
|
2
|
+
import { Trace } from "./traces.js";
|
|
3
|
+
export declare function getCurrentTrace(): Trace | null;
|
|
2
4
|
declare function trace(fn: Function, stepType?: StepType, stepName?: string, openlayerInferencePipelineId?: string): Function;
|
|
3
5
|
export declare function addChatCompletionStepToTrace({ name, inputs, output, latency, tokens, promptTokens, completionTokens, model, modelParameters, rawOutput, metadata, provider, startTime, endTime, }: {
|
|
4
6
|
name: string;
|
|
@@ -16,5 +18,9 @@ export declare function addChatCompletionStepToTrace({ name, inputs, output, lat
|
|
|
16
18
|
startTime?: number | null;
|
|
17
19
|
endTime?: number | null;
|
|
18
20
|
}, openlayerInferencePipelineId?: string): void;
|
|
21
|
+
export declare function postProcessTrace(traceObj: Trace): {
|
|
22
|
+
traceData: any;
|
|
23
|
+
inputVariableNames: string[];
|
|
24
|
+
};
|
|
19
25
|
export default trace;
|
|
20
26
|
//# sourceMappingURL=tracer.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracer.d.ts","sourceRoot":"","sources":["../../src/lib/tracing/tracer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"tracer.d.ts","sourceRoot":"","sources":["../../src/lib/tracing/tracer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAWjC,wBAAgB,eAAe,IAAI,KAAK,GAAG,IAAI,CAE9C;AA2HD,iBAAS,KAAK,CACZ,EAAE,EAAE,QAAQ,EACZ,QAAQ,GAAE,QAA6B,EACvC,QAAQ,CAAC,EAAE,MAAM,EACjB,4BAA4B,CAAC,EAAE,MAAM,GACpC,QAAQ,CAkBV;AAED,wBAAgB,4BAA4B,CAC1C,EACE,IAAI,EACJ,MAAM,EACN,MAAM,EACN,OAAO,EACP,MAAa,EACb,YAAmB,EACnB,gBAAuB,EACvB,KAAY,EACZ,eAAsB,EACtB,SAAgB,EAChB,QAAa,EACb,QAAmB,EACnB,SAAgB,EAChB,OAAc,GACf,EAAE;IACD,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,GAAG,CAAC;IACZ,MAAM,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,gBAAgB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACjC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC;IAC7C,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,OAAO,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,EACD,4BAA4B,CAAC,EAAE,MAAM,QA2BtC;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,KAAK,GAAG;IAAE,SAAS,EAAE,GAAG,CAAC;IAAC,kBAAkB,EAAE,MAAM,EAAE,CAAA;CAAE,CAyBlG;AAED,eAAe,KAAK,CAAC"}
|
package/lib/tracing/tracer.js
CHANGED
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
5
5
|
};
|
|
6
6
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
exports.addChatCompletionStepToTrace = void 0;
|
|
7
|
+
exports.postProcessTrace = exports.addChatCompletionStepToTrace = exports.getCurrentTrace = void 0;
|
|
8
8
|
const index_1 = __importDefault(require("../../index.js"));
|
|
9
9
|
const enums_1 = require("./enums.js");
|
|
10
10
|
const steps_1 = require("./steps.js");
|
|
@@ -19,6 +19,7 @@ if (publish) {
|
|
|
19
19
|
function getCurrentTrace() {
|
|
20
20
|
return currentTrace;
|
|
21
21
|
}
|
|
22
|
+
exports.getCurrentTrace = getCurrentTrace;
|
|
22
23
|
function setCurrentTrace(trace) {
|
|
23
24
|
currentTrace = trace;
|
|
24
25
|
}
|
|
@@ -161,14 +162,16 @@ function postProcessTrace(traceObj) {
|
|
|
161
162
|
output: rootStep.output,
|
|
162
163
|
groundTruth: rootStep.groundTruth,
|
|
163
164
|
latency: rootStep.latency,
|
|
164
|
-
cost:
|
|
165
|
-
tokens:
|
|
165
|
+
cost: rootStep.cost,
|
|
166
|
+
tokens: rootStep.tokens,
|
|
166
167
|
steps: processed_steps,
|
|
168
|
+
metadata: rootStep.metadata,
|
|
167
169
|
};
|
|
168
170
|
if (input_variables) {
|
|
169
171
|
Object.assign(traceData, input_variables);
|
|
170
172
|
}
|
|
171
173
|
return { traceData, inputVariableNames };
|
|
172
174
|
}
|
|
175
|
+
exports.postProcessTrace = postProcessTrace;
|
|
173
176
|
exports.default = trace;
|
|
174
177
|
//# sourceMappingURL=tracer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracer.js","sourceRoot":"","sources":["../../src/lib/tracing/tracer.ts"],"names":[],"mappings":";AAAA,oBAAoB;;;;;;AAEpB,2DAAoC;AACpC,sCAAmC;AACnC,sCAAiE;AACjE,wCAAiC;AAEjC,IAAI,YAAY,GAAiB,IAAI,CAAC;AAEtC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,IAAI,MAAM,CAAC;AACnE,IAAI,MAAM,GAAqB,IAAI,CAAC;AACpC,IAAI,OAAO,EAAE;IACX,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACvC,MAAM,GAAG,IAAI,eAAS,EAAE,CAAC;CAC1B;AAED,
|
|
1
|
+
{"version":3,"file":"tracer.js","sourceRoot":"","sources":["../../src/lib/tracing/tracer.ts"],"names":[],"mappings":"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"}
|
package/lib/tracing/tracer.mjs
CHANGED
|
@@ -10,7 +10,7 @@ if (publish) {
|
|
|
10
10
|
console.debug('Publishing is enabled');
|
|
11
11
|
client = new Openlayer();
|
|
12
12
|
}
|
|
13
|
-
function getCurrentTrace() {
|
|
13
|
+
export function getCurrentTrace() {
|
|
14
14
|
return currentTrace;
|
|
15
15
|
}
|
|
16
16
|
function setCurrentTrace(trace) {
|
|
@@ -143,7 +143,7 @@ export function addChatCompletionStepToTrace({ name, inputs, output, latency, to
|
|
|
143
143
|
step.log({ inputs, output, metadata });
|
|
144
144
|
endStep();
|
|
145
145
|
}
|
|
146
|
-
function postProcessTrace(traceObj) {
|
|
146
|
+
export function postProcessTrace(traceObj) {
|
|
147
147
|
const rootStep = traceObj.steps[0];
|
|
148
148
|
const input_variables = rootStep.inputs;
|
|
149
149
|
const inputVariableNames = input_variables ? Object.keys(input_variables) : [];
|
|
@@ -154,9 +154,10 @@ function postProcessTrace(traceObj) {
|
|
|
154
154
|
output: rootStep.output,
|
|
155
155
|
groundTruth: rootStep.groundTruth,
|
|
156
156
|
latency: rootStep.latency,
|
|
157
|
-
cost:
|
|
158
|
-
tokens:
|
|
157
|
+
cost: rootStep.cost,
|
|
158
|
+
tokens: rootStep.tokens,
|
|
159
159
|
steps: processed_steps,
|
|
160
|
+
metadata: rootStep.metadata,
|
|
160
161
|
};
|
|
161
162
|
if (input_variables) {
|
|
162
163
|
Object.assign(traceData, input_variables);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracer.mjs","sourceRoot":"","sources":["../../src/lib/tracing/tracer.ts"],"names":[],"mappings":"AAAA,oBAAoB;OAEb,SAAS;OACT,EAAE,QAAQ,EAAE;OACZ,EAAE,kBAAkB,EAAQ,YAAY,EAAE;OAC1C,EAAE,KAAK,EAAE;AAEhB,IAAI,YAAY,GAAiB,IAAI,CAAC;AAEtC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,IAAI,MAAM,CAAC;AACnE,IAAI,MAAM,GAAqB,IAAI,CAAC;AACpC,IAAI,OAAO,EAAE;IACX,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACvC,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;CAC1B;AAED,
|
|
1
|
+
{"version":3,"file":"tracer.mjs","sourceRoot":"","sources":["../../src/lib/tracing/tracer.ts"],"names":[],"mappings":"AAAA,oBAAoB;OAEb,SAAS;OACT,EAAE,QAAQ,EAAE;OACZ,EAAE,kBAAkB,EAAQ,YAAY,EAAE;OAC1C,EAAE,KAAK,EAAE;AAEhB,IAAI,YAAY,GAAiB,IAAI,CAAC;AAEtC,MAAM,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC,2BAA2B,CAAC,IAAI,MAAM,CAAC;AACnE,IAAI,MAAM,GAAqB,IAAI,CAAC;AACpC,IAAI,OAAO,EAAE;IACX,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IACvC,MAAM,GAAG,IAAI,SAAS,EAAE,CAAC;CAC1B;AAED,MAAM,UAAU,eAAe;IAC7B,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,SAAS,eAAe,CAAC,KAAmB;IAC1C,YAAY,GAAG,KAAK,CAAC;AACvB,CAAC;AAED,gCAAgC;AAChC,MAAM,SAAS,GAAW,EAAE,CAAC;AAE7B,SAAS,UAAU,CACjB,IAAY,EACZ,WAAqB,QAAQ,CAAC,SAAS,EACvC,MAAY,EACZ,MAAY,EACZ,WAAuC,IAAI,EAC3C,SAAyB,EACzB,OAAuB,EACvB,4BAAqC;IAErC,QAAQ,GAAG,QAAQ,IAAI,EAAE,CAAC;IAC1B,IAAI,OAAa,CAAC;IAClB,IAAI,QAAQ,KAAK,QAAQ,CAAC,eAAe,EAAE;QACzC,OAAO,GAAG,IAAI,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;KACtF;SAAM;QACL,OAAO,GAAG,IAAI,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;KAChF;IAED,MAAM,mBAAmB,GAAG,4BAA4B,IAAI,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;IAE3G,MAAM,UAAU,GAAG,cAAc,EAAE,CAAC;IACpC,MAAM,UAAU,GAAG,UAAU,KAAK,IAAI,CAAC;IAEvC,IAAI,UAAU,EAAE;QACd,OAAO,CAAC,KAAK,CAAC,yBAAyB,CAAC,CAAC;QACzC,OAAO,CAAC,KAAK,CAAC,eAAe,IAAI,mBAAmB,CAAC,CAAC;QACtD,MAAM,YAAY,GAAG,IAAI,KAAK,EAAE,CAAC;QACjC,eAAe,CAAC,YAAY,CAAC,CAAC;QAC9B,YAAY,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KAC/B;SAAM;QACL,OAAO,CAAC,KAAK,CAAC,eAAe,IAAI,wBAAwB,UAAW,CAAC,IAAI,EAAE,CAAC,CAAC;QAC7E,YAAY,GAAG,eAAe,EAAG,CAAC;QAClC,UAAW,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;KACpC;IAED,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IAExB,MAAM,OAAO,GAAG,GAAG,EAAE;QACnB,SAAS,CAAC,GAAG,EAAE,CAAC,CAAC,yCAAyC;QAE1D,IAAI,UAAU,EAAE;YACd,OAAO,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;YACrC,MAAM,SAAS,GAAG,eAAe,EAAE,CAAC;YACpC,sDAAsD;YACtD,MAAM,EAAE,SAAS,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,GAAG,gBAAgB,CAAC,SAAU,CAAC,CAAC;YAE3F,IAAI,OAAO,IAAI,mBAAmB,EAAE;gBAClC,OAAO,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;gBAEjD,MAAO,CAAC,kBAAkB,CAAC,IAAI;qBAC5B,MAAM,CAAC,mBAAmB,EAAE;oBAC3B,MAAM,EAAE;wBACN,gBAAgB,EAAE,QAAQ;wBAC1B,kBAAkB,EAAE,kBAAkB;wBACtC,qBAAqB,EAAE,aAAa;wBACpC,iBAAiB,EAAE,SAAS;wBAC5B,cAAc,EAAE,MAAM;wBACtB,mBAAmB,EAAE,oBAAoB;wBACzC,qBAAqB,EAAE,aAAa;wBACpC,oBAAoB,EAAE,QAAQ;qBAC/B;oBACD,IAAI,EAAE,CAAC,kBAAkB,CAAC;iBAC3B,CAAC;qBACD,IAAI,CAAC,GAAG,EAAE;oBACT,OAAO,CAAC,KAAK,CAAC,0CAA0C,CAAC,CAAC;gBAC5D,CAAC,CAAC;qBACD,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;oBACf,OAAO,CAAC,KAAK,CAAC,sCAAsC,EAAE,KAAK,CAAC,CAAC;oBAC7D,OAAO,CAAC,KAAK,CACX,mCAAmC,EACnC,IAAI,CAAC,SAAS,CACZ;wBACE,UAAU,EAAE,mBAAmB;wBAC/B,kBAAkB;wBAClB,kBAAkB;qBACnB,EACD,IAAI,EACJ,CAAC,CACF,CACF,CAAC;gBACJ,CAAC,CAAC,CAAC;aACN;iBAAM;gBACL,IAAI,CAAC,OAAO,EAAE;oBACZ,OAAO,CAAC,KAAK,CAAC,wDAAwD,CAAC,CAAC;iBACzE;qBAAM,IAAI,CAAC,mBAAmB,EAAE;oBAC/B,OAAO,CAAC,IAAI,CAAC,oFAAoF,CAAC,CAAC;iBACpG;aACF;YAED,+BAA+B;YAC/B,eAAe,CAAC,IAAI,CAAC,CAAC;YACtB,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,uBAAuB;SAC9C;aAAM;YACL,OAAO,CAAC,KAAK,CAAC,eAAe,IAAI,EAAE,CAAC,CAAC;SACtC;IACH,CAAC,CAAC;IAEF,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,cAAc;IACrB,MAAM,WAAW,GAAG,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAClF,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,aAAa,CAAC,IAAc;IACnC,MAAM,cAAc,GAAG,kCAAkC,CAAC;IAC1D,MAAM,cAAc,GAAG,YAAY,CAAC;IACpC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC7F,OAAO,MAAM,IAAI,EAAE,CAAC;AACtB,CAAC;AAED,uEAAuE;AACvE,SAAS,KAAK,CACZ,EAAY,EACZ,WAAqB,QAAQ,CAAC,SAAS,EACvC,QAAiB,EACjB,4BAAqC;IAErC,OAAO,KAAK,WAAW,GAAG,IAAW;QACnC,MAAM,IAAI,GAAG,QAAQ,IAAI,EAAE,CAAC,IAAI,CAAC;QACjC,MAAM,UAAU,GAAG,aAAa,CAAC,EAAE,CAAC,CAAC;QACrC,MAAM,MAAM,GAAG,MAAM,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QACxF,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,4BAA4B,CAAC,CAAC;QAEvF,IAAI;YACF,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,CAAC;YACjC,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;YACrC,OAAO,MAAM,CAAC;SACf;QAAC,OAAO,KAAU,EAAE;YACnB,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YACzD,MAAM,KAAK,CAAC;SACb;gBAAS;YACR,OAAO,EAAE,CAAC;SACX;IACH,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,EACE,IAAI,EACJ,MAAM,EACN,MAAM,EACN,OAAO,EACP,MAAM,GAAG,IAAI,EACb,YAAY,GAAG,IAAI,EACnB,gBAAgB,GAAG,IAAI,EACvB,KAAK,GAAG,IAAI,EACZ,eAAe,GAAG,IAAI,EACtB,SAAS,GAAG,IAAI,EAChB,QAAQ,GAAG,EAAE,EACb,QAAQ,GAAG,QAAQ,EACnB,SAAS,GAAG,IAAI,EAChB,OAAO,GAAG,IAAI,GAgBf,EACD,4BAAqC;IAErC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,UAAU,CAChC,IAAI,EACJ,QAAQ,CAAC,eAAe,EACxB,MAAM,EACN,MAAM,EACN,QAAQ,EACR,SAAS,EACT,OAAO,EACP,4BAA4B,CAC7B,CAAC;IAEF,IAAI,IAAI,CAAC,QAAQ,KAAK,QAAQ,CAAC,eAAe,EAAE;QAC7C,IAA2B,CAAC,QAAQ,GAAG,QAAQ,CAAC;QAChD,IAA2B,CAAC,YAAY,GAAG,YAAY,CAAC;QACxD,IAA2B,CAAC,gBAAgB,GAAG,gBAAgB,CAAC;QAChE,IAA2B,CAAC,MAAM,GAAG,MAAM,CAAC;QAC5C,IAA2B,CAAC,KAAK,GAAG,KAAK,CAAC;QAC1C,IAA2B,CAAC,eAAe,GAAG,eAAe,CAAC;QAC9D,IAA2B,CAAC,SAAS,GAAG,SAAS,CAAC;KACpD;IAED,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAEvB,IAAI,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,CAAC,CAAC;IACvC,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,QAAe;IAC9C,MAAM,QAAQ,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAEnC,MAAM,eAAe,GAAG,QAAS,CAAC,MAAM,CAAC;IACzC,MAAM,kBAAkB,GAAG,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAE/E,MAAM,eAAe,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC;IAE1C,MAAM,SAAS,GAAG;QAChB,kBAAkB,EAAE,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC;QACjD,WAAW,EAAE,QAAS,CAAC,EAAE,CAAC,QAAQ,EAAE;QACpC,MAAM,EAAE,QAAS,CAAC,MAAM;QACxB,WAAW,EAAE,QAAS,CAAC,WAAW;QAClC,OAAO,EAAE,QAAS,CAAC,OAAO;QAC1B,IAAI,EAAG,QAAgC,CAAC,IAAI;QAC5C,MAAM,EAAG,QAAgC,CAAC,MAAM;QAChD,KAAK,EAAE,eAAe;QACtB,QAAQ,EAAE,QAAS,CAAC,QAAQ;KAC7B,CAAC;IAEF,IAAI,eAAe,EAAE;QACnB,MAAM,CAAC,MAAM,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;KAC3C;IAED,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,CAAC;AAC3C,CAAC;AAED,eAAe,KAAK,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "openlayer",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.14.0",
|
|
4
4
|
"description": "The official TypeScript library for the Openlayer API",
|
|
5
5
|
"author": "Openlayer <support@openlayer.com>",
|
|
6
6
|
"types": "./index.d.ts",
|
|
@@ -36,6 +36,7 @@
|
|
|
36
36
|
"formdata-node": "^4.3.2",
|
|
37
37
|
"node-fetch": "^2.7.0",
|
|
38
38
|
"openai": "^4.49.0",
|
|
39
|
+
"openlayer": "https://registry.npmjs.org/openlayer/-/openlayer-0.13.12.tgz",
|
|
39
40
|
"performance-now": "^2.1.0",
|
|
40
41
|
"uuid": "^9.0.1",
|
|
41
42
|
"web-streams-polyfill": "^3.2.1"
|
package/src/lib/core/cli.ts
CHANGED
|
@@ -13,6 +13,7 @@
|
|
|
13
13
|
import { program } from 'commander';
|
|
14
14
|
import * as fs from 'fs';
|
|
15
15
|
import * as path from 'path';
|
|
16
|
+
import { getCurrentTrace, postProcessTrace } from '../tracing/tracer';
|
|
16
17
|
|
|
17
18
|
// Define shared interfaces and utilities here
|
|
18
19
|
export interface RunReturn {
|
|
@@ -20,13 +21,25 @@ export interface RunReturn {
|
|
|
20
21
|
output: any;
|
|
21
22
|
}
|
|
22
23
|
|
|
24
|
+
interface Output {
|
|
25
|
+
output: any;
|
|
26
|
+
steps?: Array<Record<string, any>>;
|
|
27
|
+
latency?: number;
|
|
28
|
+
cost?: number;
|
|
29
|
+
tokens?: number;
|
|
30
|
+
metadata?: Record<string, any>;
|
|
31
|
+
}
|
|
32
|
+
|
|
23
33
|
// Define an interface for the configuration object
|
|
24
34
|
export interface Config {
|
|
25
35
|
inputVariableNames?: string[];
|
|
26
|
-
metadata
|
|
27
|
-
outputTimestamp
|
|
36
|
+
metadata?: {
|
|
37
|
+
outputTimestamp?: number;
|
|
28
38
|
};
|
|
29
39
|
outputColumnName: string;
|
|
40
|
+
latencyColumnName?: string;
|
|
41
|
+
costColumnName?: string;
|
|
42
|
+
numOfTokensColumnName?: string;
|
|
30
43
|
}
|
|
31
44
|
|
|
32
45
|
class CLIHandler {
|
|
@@ -52,11 +65,31 @@ class CLIHandler {
|
|
|
52
65
|
const dataset = JSON.parse(rawData);
|
|
53
66
|
|
|
54
67
|
// Process each item in the dataset dynamically
|
|
55
|
-
Promise.all(
|
|
68
|
+
Promise.all<Output>(
|
|
56
69
|
dataset.map(async (item: any) => {
|
|
57
70
|
const result = await this.run(item);
|
|
58
71
|
// Merge the original item fields with the result
|
|
59
|
-
|
|
72
|
+
const traceData = getCurrentTrace() ?? undefined;
|
|
73
|
+
const postProcessedTrace =
|
|
74
|
+
typeof traceData === 'undefined' || traceData === null ?
|
|
75
|
+
undefined
|
|
76
|
+
: postProcessTrace(traceData)?.traceData;
|
|
77
|
+
|
|
78
|
+
const output: Output = {
|
|
79
|
+
...item,
|
|
80
|
+
...result.otherFields,
|
|
81
|
+
output: result.output,
|
|
82
|
+
steps: traceData?.toJSON(),
|
|
83
|
+
latency: postProcessedTrace?.latency,
|
|
84
|
+
cost: postProcessedTrace?.cost,
|
|
85
|
+
tokens: postProcessedTrace?.tokens,
|
|
86
|
+
metadata: {
|
|
87
|
+
...(postProcessedTrace?.metadata ?? {}),
|
|
88
|
+
inputVariableNames: postProcessedTrace?.inputVariableNames,
|
|
89
|
+
},
|
|
90
|
+
};
|
|
91
|
+
|
|
92
|
+
return output;
|
|
60
93
|
}),
|
|
61
94
|
)
|
|
62
95
|
.then((results) => {
|
|
@@ -64,7 +97,20 @@ class CLIHandler {
|
|
|
64
97
|
* Wait for all rows to be run
|
|
65
98
|
* Write results now to output dir or log to console
|
|
66
99
|
*/
|
|
67
|
-
|
|
100
|
+
|
|
101
|
+
const config: Config = {
|
|
102
|
+
outputColumnName: 'output',
|
|
103
|
+
inputVariableNames: results[0]?.metadata?.['inputVariableNames'],
|
|
104
|
+
metadata: {
|
|
105
|
+
...(results[0]?.metadata ?? {}),
|
|
106
|
+
outputTimestamp: Date.now(),
|
|
107
|
+
},
|
|
108
|
+
...(results.some((r) => typeof r.latency === 'number') ? { latencyColumnName: 'latency' } : {}),
|
|
109
|
+
...(results.some((r) => typeof r.cost === 'number') ? { costColumnName: 'cost' } : {}),
|
|
110
|
+
...(results.some((r) => typeof r.tokens === 'number') ? { numOfTokensColumnName: 'tokens' } : {}),
|
|
111
|
+
};
|
|
112
|
+
|
|
113
|
+
this.writeOutput(results, outputDir, config);
|
|
68
114
|
console.log('Results processing completed. Check console for output.');
|
|
69
115
|
})
|
|
70
116
|
.catch((err) => {
|
|
@@ -72,8 +118,8 @@ class CLIHandler {
|
|
|
72
118
|
});
|
|
73
119
|
}
|
|
74
120
|
|
|
75
|
-
private writeOutput(results:
|
|
76
|
-
const
|
|
121
|
+
private writeOutput(results: Output[], outputDir: string, config?: Config) {
|
|
122
|
+
const resolvedConfig: Config = {
|
|
77
123
|
metadata: { outputTimestamp: Date.now() },
|
|
78
124
|
outputColumnName: 'output',
|
|
79
125
|
};
|
|
@@ -86,7 +132,7 @@ class CLIHandler {
|
|
|
86
132
|
const configPath = path.join(outputDirPath, 'config.json');
|
|
87
133
|
|
|
88
134
|
fs.writeFileSync(datasetPath, JSON.stringify(results, null, 4), 'utf8');
|
|
89
|
-
fs.writeFileSync(configPath, JSON.stringify(
|
|
135
|
+
fs.writeFileSync(configPath, JSON.stringify(resolvedConfig, null, 4), 'utf8');
|
|
90
136
|
|
|
91
137
|
console.info(`Output written to ${datasetPath}`);
|
|
92
138
|
console.info(`Config written to ${configPath}`);
|
|
@@ -39,15 +39,6 @@ export function traceBedrockAgent(
|
|
|
39
39
|
const hasAgentId = typeof command?.input?.agentId === 'string';
|
|
40
40
|
const hasInputText = typeof command?.input?.inputText === 'string';
|
|
41
41
|
|
|
42
|
-
console.debug('Bedrock command analysis:', {
|
|
43
|
-
command: command,
|
|
44
|
-
hasInput: hasInput,
|
|
45
|
-
hasAgentId: hasAgentId,
|
|
46
|
-
hasInputText: hasInputText,
|
|
47
|
-
constructorName: command?.constructor?.name,
|
|
48
|
-
input: command?.input,
|
|
49
|
-
});
|
|
50
|
-
|
|
51
42
|
// Check if this looks like an InvokeAgentCommand by checking for expected properties
|
|
52
43
|
const isInvokeAgentCommand = hasInput && hasAgentId && hasInputText;
|
|
53
44
|
|
|
@@ -55,7 +46,6 @@ export function traceBedrockAgent(
|
|
|
55
46
|
console.debug('Command is not an InvokeAgentCommand, passing through uninstrumented');
|
|
56
47
|
return originalSend(command, options);
|
|
57
48
|
}
|
|
58
|
-
console.debug('Command identified as InvokeAgentCommand, applying tracing');
|
|
59
49
|
|
|
60
50
|
const startTime = performanceNow();
|
|
61
51
|
const input = command.input;
|
|
@@ -110,19 +100,16 @@ function createTracedCompletion(
|
|
|
110
100
|
let traceData: any[] = [];
|
|
111
101
|
let chunkCount = 0;
|
|
112
102
|
|
|
113
|
-
console.debug('Original completion:', JSON.stringify(originalCompletion, null, 2));
|
|
114
|
-
|
|
115
103
|
try {
|
|
116
104
|
for await (const chunkEvent of originalCompletion) {
|
|
117
105
|
// Yield first - ensure user gets data immediately
|
|
118
106
|
yield chunkEvent;
|
|
119
107
|
|
|
120
|
-
console.debug(JSON.stringify(chunkEvent, null, 2));
|
|
121
|
-
|
|
122
108
|
// Then collect tracing data
|
|
123
109
|
if (chunkCount === 0) {
|
|
124
110
|
firstTokenTime = performanceNow();
|
|
125
111
|
}
|
|
112
|
+
|
|
126
113
|
chunkCount++;
|
|
127
114
|
|
|
128
115
|
// Handle chunk events
|
|
@@ -131,9 +118,11 @@ function createTracedCompletion(
|
|
|
131
118
|
rawOutputChunks.push(chunk);
|
|
132
119
|
|
|
133
120
|
if (chunk.bytes) {
|
|
134
|
-
|
|
121
|
+
// Convert the object-based bytes to a proper Uint8Array
|
|
122
|
+
const bytesObject = chunk.bytes;
|
|
123
|
+
const byteArray = new Uint8Array(Object.values(bytesObject));
|
|
124
|
+
const decodedResponse = new TextDecoder('utf-8').decode(byteArray);
|
|
135
125
|
collectedOutput += decodedResponse;
|
|
136
|
-
completionTokens += 1;
|
|
137
126
|
}
|
|
138
127
|
|
|
139
128
|
if (chunk.attribution && chunk.attribution.citations) {
|
|
@@ -14,7 +14,7 @@ if (publish) {
|
|
|
14
14
|
client = new Openlayer();
|
|
15
15
|
}
|
|
16
16
|
|
|
17
|
-
function getCurrentTrace(): Trace | null {
|
|
17
|
+
export function getCurrentTrace(): Trace | null {
|
|
18
18
|
return currentTrace;
|
|
19
19
|
}
|
|
20
20
|
|
|
@@ -225,7 +225,7 @@ export function addChatCompletionStepToTrace(
|
|
|
225
225
|
endStep();
|
|
226
226
|
}
|
|
227
227
|
|
|
228
|
-
function postProcessTrace(traceObj: Trace): { traceData: any; inputVariableNames: string[] } {
|
|
228
|
+
export function postProcessTrace(traceObj: Trace): { traceData: any; inputVariableNames: string[] } {
|
|
229
229
|
const rootStep = traceObj.steps[0];
|
|
230
230
|
|
|
231
231
|
const input_variables = rootStep!.inputs;
|
|
@@ -239,9 +239,10 @@ function postProcessTrace(traceObj: Trace): { traceData: any; inputVariableNames
|
|
|
239
239
|
output: rootStep!.output,
|
|
240
240
|
groundTruth: rootStep!.groundTruth,
|
|
241
241
|
latency: rootStep!.latency,
|
|
242
|
-
cost:
|
|
243
|
-
tokens:
|
|
242
|
+
cost: (rootStep as ChatCompletionStep)!.cost,
|
|
243
|
+
tokens: (rootStep as ChatCompletionStep)!.tokens,
|
|
244
244
|
steps: processed_steps,
|
|
245
|
+
metadata: rootStep!.metadata,
|
|
245
246
|
};
|
|
246
247
|
|
|
247
248
|
if (input_variables) {
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const VERSION = '0.
|
|
1
|
+
export const VERSION = '0.14.0'; // x-release-please-version
|
package/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "0.
|
|
1
|
+
export declare const VERSION = "0.14.0";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/version.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,WAAW,CAAC"}
|
package/version.js
CHANGED
package/version.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"version.js","sourceRoot":"","sources":["src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,OAAO,GAAG,QAAQ,CAAC,CAAC,2BAA2B"}
|
package/version.mjs
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = '0.
|
|
1
|
+
export const VERSION = '0.14.0'; // x-release-please-version
|
|
2
2
|
//# sourceMappingURL=version.mjs.map
|
package/version.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"version.mjs","sourceRoot":"","sources":["src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"version.mjs","sourceRoot":"","sources":["src/version.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,QAAQ,CAAC,CAAC,2BAA2B"}
|