openlayer 0.15.1 → 0.15.2
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 +8 -0
- package/lib/core/cli.d.ts.map +1 -1
- package/lib/core/cli.js +30 -25
- package/lib/core/cli.js.map +1 -1
- package/lib/core/cli.mjs +30 -25
- package/lib/core/cli.mjs.map +1 -1
- package/package.json +1 -1
- package/src/lib/core/cli.ts +32 -30
- package/src/version.ts +1 -1
- package/version.d.ts +1 -1
- package/version.js +1 -1
- package/version.mjs +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.15.2 (2025-08-23)
|
|
4
|
+
|
|
5
|
+
Full Changelog: [v0.15.1...v0.15.2](https://github.com/openlayer-ai/openlayer-ts/compare/v0.15.1...v0.15.2)
|
|
6
|
+
|
|
7
|
+
### Bug Fixes
|
|
8
|
+
|
|
9
|
+
* update config ([b9e0b91](https://github.com/openlayer-ai/openlayer-ts/commit/b9e0b91c64f69d41aedfe0f6ddf0107b953d922a))
|
|
10
|
+
|
|
3
11
|
## 0.15.1 (2025-08-22)
|
|
4
12
|
|
|
5
13
|
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.map
CHANGED
|
@@ -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;
|
|
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;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
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
undefined
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
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
|
/*
|
|
@@ -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(
|
|
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
|
}
|
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;AAC7B,iDAAsE;AA6BtE,MAAM,UAAU;IAGd,YAAY,WAA6C;QACvD,IAAI,CAAC,GAAG,GAAG,WAAW,CAAC;IACzB,CAAC;IAEM,UAAU;QACf,mBAAO;aACJ,cAAc,CAAC,uBAAuB,EAAE,qBAAqB,CAAC;aAC9D,cAAc,CAAC,qBAAqB,EAAE,4BAA4B,CAAC,CAAC;QAEvE,mBAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE5B,MAAM,OAAO,GAAG,mBAAO,CAAC,IAAI,EAAE,CAAC;QAC/B,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QAE3C,eAAe;QACf,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEpC,+CAA+C;QAC/C,OAAO,CAAC,GAAG,CACT,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAS,EAAE,EAAE;YAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;
|
|
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
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
undefined
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
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
|
/*
|
|
@@ -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(
|
|
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
|
}
|
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;OACrB,EAAE,eAAe,EAAE,gBAAgB,EAAE;AA6B5C,MAAM,UAAU;IAGd,YAAY,WAA6C;QACvD,IAAI,CAAC,GAAG,GAAG,WAAW,CAAC;IACzB,CAAC;IAEM,UAAU;QACf,OAAO;aACJ,cAAc,CAAC,uBAAuB,EAAE,qBAAqB,CAAC;aAC9D,cAAc,CAAC,qBAAqB,EAAE,4BAA4B,CAAC,CAAC;QAEvE,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAE5B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;QAC/B,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;QAE3C,eAAe;QACf,MAAM,eAAe,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC;QAClD,MAAM,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,eAAe,EAAE,MAAM,CAAC,CAAC;QACzD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAEpC,+CAA+C;QAC/C,OAAO,CAAC,GAAG,CACT,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,IAAS,EAAE,EAAE;YAC9B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.mjs","sourceRoot":"","sources":["../../src/lib/core/cli.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/src/lib/core/cli.ts
CHANGED
|
@@ -67,29 +67,37 @@ class CLIHandler {
|
|
|
67
67
|
// Process each item in the dataset dynamically
|
|
68
68
|
Promise.all<Output>(
|
|
69
69
|
dataset.map(async (item: any) => {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
undefined
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
70
|
+
try {
|
|
71
|
+
const result = await this.run(item);
|
|
72
|
+
// Merge the original item fields with the result
|
|
73
|
+
const traceData = getCurrentTrace() ?? undefined;
|
|
74
|
+
const postProcessedTrace =
|
|
75
|
+
typeof traceData === 'undefined' || traceData === null ?
|
|
76
|
+
undefined
|
|
77
|
+
: postProcessTrace(traceData)?.traceData;
|
|
78
|
+
|
|
79
|
+
const output: Output = {
|
|
80
|
+
...item,
|
|
81
|
+
...result.otherFields,
|
|
82
|
+
output: result.output,
|
|
83
|
+
steps: traceData?.toJSON(),
|
|
84
|
+
latency: postProcessedTrace?.latency,
|
|
85
|
+
cost: postProcessedTrace?.cost,
|
|
86
|
+
tokens: postProcessedTrace?.tokens,
|
|
87
|
+
metadata: {
|
|
88
|
+
...(postProcessedTrace?.metadata ?? {}),
|
|
89
|
+
inputVariableNames: postProcessedTrace?.inputVariableNames,
|
|
90
|
+
},
|
|
91
|
+
};
|
|
92
|
+
|
|
93
|
+
return output;
|
|
94
|
+
} catch (error) {
|
|
95
|
+
console.error('Error processing dataset: ', error);
|
|
96
|
+
return {
|
|
97
|
+
...item,
|
|
98
|
+
error: error instanceof Error ? error.message : String(error),
|
|
99
|
+
};
|
|
100
|
+
}
|
|
93
101
|
}),
|
|
94
102
|
)
|
|
95
103
|
.then((results) => {
|
|
@@ -97,7 +105,6 @@ class CLIHandler {
|
|
|
97
105
|
* Wait for all rows to be run
|
|
98
106
|
* Write results now to output dir or log to console
|
|
99
107
|
*/
|
|
100
|
-
|
|
101
108
|
const config: Config = {
|
|
102
109
|
outputColumnName: 'output',
|
|
103
110
|
inputVariableNames: results[0]?.metadata?.['inputVariableNames'],
|
|
@@ -119,11 +126,6 @@ class CLIHandler {
|
|
|
119
126
|
}
|
|
120
127
|
|
|
121
128
|
private writeOutput(results: Output[], outputDir: string, config?: Config) {
|
|
122
|
-
const resolvedConfig: Config = {
|
|
123
|
-
metadata: { outputTimestamp: Date.now() },
|
|
124
|
-
outputColumnName: 'output',
|
|
125
|
-
};
|
|
126
|
-
|
|
127
129
|
// Construct an output directory {outputDir}/{datasetName}/
|
|
128
130
|
const outputDirPath = path.resolve(outputDir);
|
|
129
131
|
fs.mkdirSync(outputDirPath, { recursive: true });
|
|
@@ -132,7 +134,7 @@ class CLIHandler {
|
|
|
132
134
|
const configPath = path.join(outputDirPath, 'config.json');
|
|
133
135
|
|
|
134
136
|
fs.writeFileSync(datasetPath, JSON.stringify(results, null, 4), 'utf8');
|
|
135
|
-
fs.writeFileSync(configPath, JSON.stringify(
|
|
137
|
+
fs.writeFileSync(configPath, JSON.stringify(config, null, 4), 'utf8');
|
|
136
138
|
|
|
137
139
|
console.info(`Output written to ${datasetPath}`);
|
|
138
140
|
console.info(`Config written to ${configPath}`);
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const VERSION = '0.15.
|
|
1
|
+
export const VERSION = '0.15.2'; // x-release-please-version
|
package/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "0.15.
|
|
1
|
+
export declare const VERSION = "0.15.2";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/version.js
CHANGED
package/version.mjs
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = '0.15.
|
|
1
|
+
export const VERSION = '0.15.2'; // x-release-please-version
|
|
2
2
|
//# sourceMappingURL=version.mjs.map
|