openlayer 0.15.1 → 0.16.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 CHANGED
@@ -1,5 +1,21 @@
1
1
  # Changelog
2
2
 
3
+ ## 0.16.0 (2025-08-23)
4
+
5
+ Full Changelog: [v0.15.2...v0.16.0](https://github.com/openlayer-ai/openlayer-ts/compare/v0.15.2...v0.16.0)
6
+
7
+ ### Features
8
+
9
+ * update pricing for traced bedrock clients ([ac0c7e6](https://github.com/openlayer-ai/openlayer-ts/commit/ac0c7e66c4fc29f1f735436ec899c70ae56b5c29))
10
+
11
+ ## 0.15.2 (2025-08-23)
12
+
13
+ Full Changelog: [v0.15.1...v0.15.2](https://github.com/openlayer-ai/openlayer-ts/compare/v0.15.1...v0.15.2)
14
+
15
+ ### Bug Fixes
16
+
17
+ * update config ([b9e0b91](https://github.com/openlayer-ai/openlayer-ts/commit/b9e0b91c64f69d41aedfe0f6ddf0107b953d922a))
18
+
3
19
  ## 0.15.1 (2025-08-22)
4
20
 
5
21
  Full Changelog: [v0.15.0...v0.15.1](https://github.com/openlayer-ai/openlayer-ts/compare/v0.15.0...v0.15.1)
package/lib/core/cli.d.ts CHANGED
@@ -12,7 +12,7 @@ export interface Config {
12
12
  outputColumnName: string;
13
13
  latencyColumnName?: string;
14
14
  costColumnName?: string;
15
- numOfTokensColumnName?: string;
15
+ numOfTokenColumnName?: string;
16
16
  }
17
17
  declare class CLIHandler {
18
18
  private run;
@@ -1 +1 @@
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"}
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,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AAED,cAAM,UAAU;IACd,OAAO,CAAC,GAAG,CAAmC;gBAElC,WAAW,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC;IAIlD,UAAU;IA4EjB,OAAO,CAAC,WAAW;CAcpB;AAED,eAAe,UAAU,CAAC"}
package/lib/core/cli.js CHANGED
@@ -55,26 +55,35 @@ class CLIHandler {
55
55
  const dataset = JSON.parse(rawData);
56
56
  // Process each item in the dataset dynamically
57
57
  Promise.all(dataset.map(async (item) => {
58
- const result = await this.run(item);
59
- // Merge the original item fields with the result
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;
58
+ try {
59
+ const result = await this.run(item);
60
+ // Merge the original item fields with the result
61
+ const traceData = (0, tracer_1.getCurrentTrace)() ?? undefined;
62
+ const postProcessedTrace = typeof traceData === 'undefined' || traceData === null ?
63
+ undefined
64
+ : (0, tracer_1.postProcessTrace)(traceData)?.traceData;
65
+ const output = {
66
+ ...item,
67
+ ...result.otherFields,
68
+ output: result.output,
69
+ steps: traceData?.toJSON(),
70
+ latency: postProcessedTrace?.latency,
71
+ cost: postProcessedTrace?.cost,
72
+ tokens: postProcessedTrace?.tokens,
73
+ metadata: {
74
+ ...(postProcessedTrace?.metadata ?? {}),
75
+ inputVariableNames: postProcessedTrace?.inputVariableNames,
76
+ },
77
+ };
78
+ return output;
79
+ }
80
+ catch (error) {
81
+ console.error('Error processing dataset: ', error);
82
+ return {
83
+ ...item,
84
+ error: error instanceof Error ? error.message : String(error),
85
+ };
86
+ }
78
87
  }))
79
88
  .then((results) => {
80
89
  /*
@@ -90,7 +99,7 @@ class CLIHandler {
90
99
  },
91
100
  ...(results.some((r) => typeof r.latency === 'number') ? { latencyColumnName: 'latency' } : {}),
92
101
  ...(results.some((r) => typeof r.cost === 'number') ? { costColumnName: 'cost' } : {}),
93
- ...(results.some((r) => typeof r.tokens === 'number') ? { numOfTokensColumnName: 'tokens' } : {}),
102
+ ...(results.some((r) => typeof r.tokens === 'number') ? { numOfTokenColumnName: 'tokens' } : {}),
94
103
  };
95
104
  this.writeOutput(results, outputDir, config);
96
105
  console.log('Results processing completed. Check console for output.');
@@ -100,17 +109,13 @@ class CLIHandler {
100
109
  });
101
110
  }
102
111
  writeOutput(results, outputDir, config) {
103
- const resolvedConfig = {
104
- metadata: { outputTimestamp: Date.now() },
105
- outputColumnName: 'output',
106
- };
107
112
  // Construct an output directory {outputDir}/{datasetName}/
108
113
  const outputDirPath = path.resolve(outputDir);
109
114
  fs.mkdirSync(outputDirPath, { recursive: true });
110
115
  const datasetPath = path.join(outputDirPath, 'dataset.json');
111
116
  const configPath = path.join(outputDirPath, 'config.json');
112
117
  fs.writeFileSync(datasetPath, JSON.stringify(results, null, 4), 'utf8');
113
- fs.writeFileSync(configPath, JSON.stringify(resolvedConfig, null, 4), 'utf8');
118
+ fs.writeFileSync(configPath, JSON.stringify(config, null, 4), 'utf8');
114
119
  console.info(`Output written to ${datasetPath}`);
115
120
  console.info(`Config written to ${configPath}`);
116
121
  }
@@ -1 +1 @@
1
- {"version":3,"file":"cli.js","sourceRoot":"","sources":["../../src/lib/core/cli.ts"],"names":[],"mappings":"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"}
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
@@ -30,26 +30,35 @@ class CLIHandler {
30
30
  const dataset = JSON.parse(rawData);
31
31
  // Process each item in the dataset dynamically
32
32
  Promise.all(dataset.map(async (item) => {
33
- const result = await this.run(item);
34
- // Merge the original item fields with the result
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;
33
+ try {
34
+ const result = await this.run(item);
35
+ // Merge the original item fields with the result
36
+ const traceData = getCurrentTrace() ?? undefined;
37
+ const postProcessedTrace = typeof traceData === 'undefined' || traceData === null ?
38
+ undefined
39
+ : postProcessTrace(traceData)?.traceData;
40
+ const output = {
41
+ ...item,
42
+ ...result.otherFields,
43
+ output: result.output,
44
+ steps: traceData?.toJSON(),
45
+ latency: postProcessedTrace?.latency,
46
+ cost: postProcessedTrace?.cost,
47
+ tokens: postProcessedTrace?.tokens,
48
+ metadata: {
49
+ ...(postProcessedTrace?.metadata ?? {}),
50
+ inputVariableNames: postProcessedTrace?.inputVariableNames,
51
+ },
52
+ };
53
+ return output;
54
+ }
55
+ catch (error) {
56
+ console.error('Error processing dataset: ', error);
57
+ return {
58
+ ...item,
59
+ error: error instanceof Error ? error.message : String(error),
60
+ };
61
+ }
53
62
  }))
54
63
  .then((results) => {
55
64
  /*
@@ -65,7 +74,7 @@ class CLIHandler {
65
74
  },
66
75
  ...(results.some((r) => typeof r.latency === 'number') ? { latencyColumnName: 'latency' } : {}),
67
76
  ...(results.some((r) => typeof r.cost === 'number') ? { costColumnName: 'cost' } : {}),
68
- ...(results.some((r) => typeof r.tokens === 'number') ? { numOfTokensColumnName: 'tokens' } : {}),
77
+ ...(results.some((r) => typeof r.tokens === 'number') ? { numOfTokenColumnName: 'tokens' } : {}),
69
78
  };
70
79
  this.writeOutput(results, outputDir, config);
71
80
  console.log('Results processing completed. Check console for output.');
@@ -75,17 +84,13 @@ class CLIHandler {
75
84
  });
76
85
  }
77
86
  writeOutput(results, outputDir, config) {
78
- const resolvedConfig = {
79
- metadata: { outputTimestamp: Date.now() },
80
- outputColumnName: 'output',
81
- };
82
87
  // Construct an output directory {outputDir}/{datasetName}/
83
88
  const outputDirPath = path.resolve(outputDir);
84
89
  fs.mkdirSync(outputDirPath, { recursive: true });
85
90
  const datasetPath = path.join(outputDirPath, 'dataset.json');
86
91
  const configPath = path.join(outputDirPath, 'config.json');
87
92
  fs.writeFileSync(datasetPath, JSON.stringify(results, null, 4), 'utf8');
88
- fs.writeFileSync(configPath, JSON.stringify(resolvedConfig, null, 4), 'utf8');
93
+ fs.writeFileSync(configPath, JSON.stringify(config, null, 4), 'utf8');
89
94
  console.info(`Output written to ${datasetPath}`);
90
95
  console.info(`Config written to ${configPath}`);
91
96
  }
@@ -1 +1 @@
1
- {"version":3,"file":"cli.mjs","sourceRoot":"","sources":["../../src/lib/core/cli.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cli.mjs","sourceRoot":"","sources":["../../src/lib/core/cli.ts"],"names":[],"mappings":"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"}
@@ -1,2 +1,3 @@
1
- export declare function traceBedrockAgent(client: any, openlayerInferencePipelineId?: string): any;
1
+ import { BedrockAgentRuntimeClient } from '@aws-sdk/client-bedrock-agent-runtime';
2
+ export declare function traceBedrockAgent(client: BedrockAgentRuntimeClient, openlayerInferencePipelineId?: string): BedrockAgentRuntimeClient;
2
3
  //# sourceMappingURL=bedrockAgentTracer.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"bedrockAgentTracer.d.ts","sourceRoot":"","sources":["../../src/lib/integrations/bedrockAgentTracer.ts"],"names":[],"mappings":"AAIA,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,GAAG,EAAE,4BAA4B,CAAC,EAAE,MAAM,GAAG,GAAG,CAgDzF"}
1
+ {"version":3,"file":"bedrockAgentTracer.d.ts","sourceRoot":"","sources":["../../src/lib/integrations/bedrockAgentTracer.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,yBAAyB,EAK1B,MAAM,uCAAuC,CAAC;AAG/C,wBAAgB,iBAAiB,CAC/B,MAAM,EAAE,yBAAyB,EACjC,4BAA4B,CAAC,EAAE,MAAM,GACpC,yBAAyB,CAqD3B"}