openlayer 0.13.13 → 0.14.1
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 +35 -5
- package/lib/core/cli.js.map +1 -1
- package/lib/core/cli.mjs +35 -5
- package/lib/core/cli.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 +11 -6
- package/lib/tracing/tracer.js.map +1 -1
- package/lib/tracing/tracer.mjs +10 -7
- package/lib/tracing/tracer.mjs.map +1 -1
- package/package.json +1 -2
- package/src/lib/core/cli.ts +56 -8
- package/src/lib/tracing/tracer.ts +10 -7
- 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.1 (2025-08-22)
|
|
4
|
+
|
|
5
|
+
Full Changelog: [v0.14.0...v0.14.1](https://github.com/openlayer-ai/openlayer-ts/compare/v0.14.0...v0.14.1)
|
|
6
|
+
|
|
7
|
+
### Chores
|
|
8
|
+
|
|
9
|
+
* debug dev mode traces ([34b60af](https://github.com/openlayer-ai/openlayer-ts/commit/34b60afcdcd049522cd68d92ea26ea10703d5759))
|
|
10
|
+
|
|
11
|
+
## 0.14.0 (2025-08-22)
|
|
12
|
+
|
|
13
|
+
Full Changelog: [v0.13.13...v0.14.0](https://github.com/openlayer-ai/openlayer-ts/compare/v0.13.13...v0.14.0)
|
|
14
|
+
|
|
15
|
+
### Features
|
|
16
|
+
|
|
17
|
+
* enable tracing in development mode for TypeScript clients ([0da012d](https://github.com/openlayer-ai/openlayer-ts/commit/0da012dfaac7d979a44a64fe95dfb4a68e87f28c))
|
|
18
|
+
|
|
3
19
|
## 0.13.13 (2025-08-20)
|
|
4
20
|
|
|
5
21
|
Full Changelog: [v0.13.12...v0.13.13](https://github.com/openlayer-ai/openlayer-ts/compare/v0.13.12...v0.13.13)
|
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;IAuEjB,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,51 @@ 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
|
+
console.log('Adding trace to dataset: ', traceData?.toJSON());
|
|
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;
|
|
60
79
|
}))
|
|
61
80
|
.then((results) => {
|
|
62
81
|
/*
|
|
63
82
|
* Wait for all rows to be run
|
|
64
83
|
* Write results now to output dir or log to console
|
|
65
84
|
*/
|
|
66
|
-
|
|
85
|
+
const config = {
|
|
86
|
+
outputColumnName: 'output',
|
|
87
|
+
inputVariableNames: results[0]?.metadata?.['inputVariableNames'],
|
|
88
|
+
metadata: {
|
|
89
|
+
...(results[0]?.metadata ?? {}),
|
|
90
|
+
outputTimestamp: Date.now(),
|
|
91
|
+
},
|
|
92
|
+
...(results.some((r) => typeof r.latency === 'number') ? { latencyColumnName: 'latency' } : {}),
|
|
93
|
+
...(results.some((r) => typeof r.cost === 'number') ? { costColumnName: 'cost' } : {}),
|
|
94
|
+
...(results.some((r) => typeof r.tokens === 'number') ? { numOfTokensColumnName: 'tokens' } : {}),
|
|
95
|
+
};
|
|
96
|
+
this.writeOutput(results, outputDir, config);
|
|
67
97
|
console.log('Results processing completed. Check console for output.');
|
|
68
98
|
})
|
|
69
99
|
.catch((err) => {
|
|
70
100
|
console.error(`Error processing dataset: ${err}`);
|
|
71
101
|
});
|
|
72
102
|
}
|
|
73
|
-
writeOutput(results, outputDir) {
|
|
74
|
-
const
|
|
103
|
+
writeOutput(results, outputDir, config) {
|
|
104
|
+
const resolvedConfig = {
|
|
75
105
|
metadata: { outputTimestamp: Date.now() },
|
|
76
106
|
outputColumnName: 'output',
|
|
77
107
|
};
|
|
@@ -81,7 +111,7 @@ class CLIHandler {
|
|
|
81
111
|
const datasetPath = path.join(outputDirPath, 'dataset.json');
|
|
82
112
|
const configPath = path.join(outputDirPath, 'config.json');
|
|
83
113
|
fs.writeFileSync(datasetPath, JSON.stringify(results, null, 4), 'utf8');
|
|
84
|
-
fs.writeFileSync(configPath, JSON.stringify(
|
|
114
|
+
fs.writeFileSync(configPath, JSON.stringify(resolvedConfig, null, 4), 'utf8');
|
|
85
115
|
console.info(`Output written to ${datasetPath}`);
|
|
86
116
|
console.info(`Config written to ${configPath}`);
|
|
87
117
|
}
|
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,51 @@ 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
|
+
console.log('Adding trace to dataset: ', traceData?.toJSON());
|
|
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;
|
|
35
54
|
}))
|
|
36
55
|
.then((results) => {
|
|
37
56
|
/*
|
|
38
57
|
* Wait for all rows to be run
|
|
39
58
|
* Write results now to output dir or log to console
|
|
40
59
|
*/
|
|
41
|
-
|
|
60
|
+
const config = {
|
|
61
|
+
outputColumnName: 'output',
|
|
62
|
+
inputVariableNames: results[0]?.metadata?.['inputVariableNames'],
|
|
63
|
+
metadata: {
|
|
64
|
+
...(results[0]?.metadata ?? {}),
|
|
65
|
+
outputTimestamp: Date.now(),
|
|
66
|
+
},
|
|
67
|
+
...(results.some((r) => typeof r.latency === 'number') ? { latencyColumnName: 'latency' } : {}),
|
|
68
|
+
...(results.some((r) => typeof r.cost === 'number') ? { costColumnName: 'cost' } : {}),
|
|
69
|
+
...(results.some((r) => typeof r.tokens === 'number') ? { numOfTokensColumnName: 'tokens' } : {}),
|
|
70
|
+
};
|
|
71
|
+
this.writeOutput(results, outputDir, config);
|
|
42
72
|
console.log('Results processing completed. Check console for output.');
|
|
43
73
|
})
|
|
44
74
|
.catch((err) => {
|
|
45
75
|
console.error(`Error processing dataset: ${err}`);
|
|
46
76
|
});
|
|
47
77
|
}
|
|
48
|
-
writeOutput(results, outputDir) {
|
|
49
|
-
const
|
|
78
|
+
writeOutput(results, outputDir, config) {
|
|
79
|
+
const resolvedConfig = {
|
|
50
80
|
metadata: { outputTimestamp: Date.now() },
|
|
51
81
|
outputColumnName: 'output',
|
|
52
82
|
};
|
|
@@ -56,7 +86,7 @@ class CLIHandler {
|
|
|
56
86
|
const datasetPath = path.join(outputDirPath, 'dataset.json');
|
|
57
87
|
const configPath = path.join(outputDirPath, 'config.json');
|
|
58
88
|
fs.writeFileSync(datasetPath, JSON.stringify(results, null, 4), 'utf8');
|
|
59
|
-
fs.writeFileSync(configPath, JSON.stringify(
|
|
89
|
+
fs.writeFileSync(configPath, JSON.stringify(resolvedConfig, null, 4), 'utf8');
|
|
60
90
|
console.info(`Output written to ${datasetPath}`);
|
|
61
91
|
console.info(`Config written to ${configPath}`);
|
|
62
92
|
}
|
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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"}
|
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;AA6HD,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
|
}
|
|
@@ -40,6 +41,7 @@ function createStep(name, stepType = enums_1.StepType.USER_CALL, inputs, output,
|
|
|
40
41
|
console.debug('Starting a new trace...');
|
|
41
42
|
console.debug(`Adding step ${name} as the root step`);
|
|
42
43
|
const currentTrace = new traces_1.Trace();
|
|
44
|
+
console.log('setting current trace', currentTrace);
|
|
43
45
|
setCurrentTrace(currentTrace);
|
|
44
46
|
currentTrace.addStep(newStep);
|
|
45
47
|
}
|
|
@@ -92,9 +94,10 @@ function createStep(name, stepType = enums_1.StepType.USER_CALL, inputs, output,
|
|
|
92
94
|
console.warn('Trace upload skipped: OPENLAYER_INFERENCE_PIPELINE_ID environment variable not set');
|
|
93
95
|
}
|
|
94
96
|
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
97
|
+
console.log('AOEUAOEUAOEU', traceData?.toJSON());
|
|
98
|
+
// // Reset the entire trace state
|
|
99
|
+
// setCurrentTrace(null);
|
|
100
|
+
// stepStack.length = 0; // Clear the step stack
|
|
98
101
|
}
|
|
99
102
|
else {
|
|
100
103
|
console.debug(`Ending step ${name}`);
|
|
@@ -161,14 +164,16 @@ function postProcessTrace(traceObj) {
|
|
|
161
164
|
output: rootStep.output,
|
|
162
165
|
groundTruth: rootStep.groundTruth,
|
|
163
166
|
latency: rootStep.latency,
|
|
164
|
-
cost:
|
|
165
|
-
tokens:
|
|
167
|
+
cost: rootStep.cost,
|
|
168
|
+
tokens: rootStep.tokens,
|
|
166
169
|
steps: processed_steps,
|
|
170
|
+
metadata: rootStep.metadata,
|
|
167
171
|
};
|
|
168
172
|
if (input_variables) {
|
|
169
173
|
Object.assign(traceData, input_variables);
|
|
170
174
|
}
|
|
171
175
|
return { traceData, inputVariableNames };
|
|
172
176
|
}
|
|
177
|
+
exports.postProcessTrace = postProcessTrace;
|
|
173
178
|
exports.default = trace;
|
|
174
179
|
//# 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":";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,SAAgB,eAAe;IAC7B,OAAO,YAAY,CAAC;AACtB,CAAC;AAFD,0CAEC;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,gBAAQ,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,gBAAQ,CAAC,eAAe,EAAE;QACzC,OAAO,GAAG,IAAI,0BAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC;KACtF;SAAM;QACL,OAAO,GAAG,IAAI,oBAAY,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,cAAK,EAAE,CAAC;QACjC,OAAO,CAAC,GAAG,CAAC,uBAAuB,EAAE,YAAY,CAAC,CAAA;QAClD,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,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,CAAA;YAChD,kCAAkC;YAClC,yBAAyB;YACzB,gDAAgD;SACjD;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,gBAAQ,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,SAAgB,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,gBAAQ,CAAC,eAAe,EACxB,MAAM,EACN,MAAM,EACN,QAAQ,EACR,SAAS,EACT,OAAO,EACP,4BAA4B,CAC7B,CAAC;IAEF,IAAI,IAAI,CAAC,QAAQ,KAAK,gBAAQ,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;AA3DD,oEA2DC;AAED,SAAgB,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;AAzBD,4CAyBC;AAED,kBAAe,KAAK,CAAC"}
|
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) {
|
|
@@ -34,6 +34,7 @@ function createStep(name, stepType = StepType.USER_CALL, inputs, output, metadat
|
|
|
34
34
|
console.debug('Starting a new trace...');
|
|
35
35
|
console.debug(`Adding step ${name} as the root step`);
|
|
36
36
|
const currentTrace = new Trace();
|
|
37
|
+
console.log('setting current trace', currentTrace);
|
|
37
38
|
setCurrentTrace(currentTrace);
|
|
38
39
|
currentTrace.addStep(newStep);
|
|
39
40
|
}
|
|
@@ -86,9 +87,10 @@ function createStep(name, stepType = StepType.USER_CALL, inputs, output, metadat
|
|
|
86
87
|
console.warn('Trace upload skipped: OPENLAYER_INFERENCE_PIPELINE_ID environment variable not set');
|
|
87
88
|
}
|
|
88
89
|
}
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
90
|
+
console.log('AOEUAOEUAOEU', traceData?.toJSON());
|
|
91
|
+
// // Reset the entire trace state
|
|
92
|
+
// setCurrentTrace(null);
|
|
93
|
+
// stepStack.length = 0; // Clear the step stack
|
|
92
94
|
}
|
|
93
95
|
else {
|
|
94
96
|
console.debug(`Ending step ${name}`);
|
|
@@ -143,7 +145,7 @@ export function addChatCompletionStepToTrace({ name, inputs, output, latency, to
|
|
|
143
145
|
step.log({ inputs, output, metadata });
|
|
144
146
|
endStep();
|
|
145
147
|
}
|
|
146
|
-
function postProcessTrace(traceObj) {
|
|
148
|
+
export function postProcessTrace(traceObj) {
|
|
147
149
|
const rootStep = traceObj.steps[0];
|
|
148
150
|
const input_variables = rootStep.inputs;
|
|
149
151
|
const inputVariableNames = input_variables ? Object.keys(input_variables) : [];
|
|
@@ -154,9 +156,10 @@ function postProcessTrace(traceObj) {
|
|
|
154
156
|
output: rootStep.output,
|
|
155
157
|
groundTruth: rootStep.groundTruth,
|
|
156
158
|
latency: rootStep.latency,
|
|
157
|
-
cost:
|
|
158
|
-
tokens:
|
|
159
|
+
cost: rootStep.cost,
|
|
160
|
+
tokens: rootStep.tokens,
|
|
159
161
|
steps: processed_steps,
|
|
162
|
+
metadata: rootStep.metadata,
|
|
160
163
|
};
|
|
161
164
|
if (input_variables) {
|
|
162
165
|
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":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "openlayer",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.14.1",
|
|
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,7 +36,6 @@
|
|
|
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",
|
|
40
39
|
"performance-now": "^2.1.0",
|
|
41
40
|
"uuid": "^9.0.1",
|
|
42
41
|
"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,33 @@ 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
|
+
console.log('Adding trace to dataset: ', traceData?.toJSON());
|
|
79
|
+
|
|
80
|
+
const output: Output = {
|
|
81
|
+
...item,
|
|
82
|
+
...result.otherFields,
|
|
83
|
+
output: result.output,
|
|
84
|
+
steps: traceData?.toJSON(),
|
|
85
|
+
latency: postProcessedTrace?.latency,
|
|
86
|
+
cost: postProcessedTrace?.cost,
|
|
87
|
+
tokens: postProcessedTrace?.tokens,
|
|
88
|
+
metadata: {
|
|
89
|
+
...(postProcessedTrace?.metadata ?? {}),
|
|
90
|
+
inputVariableNames: postProcessedTrace?.inputVariableNames,
|
|
91
|
+
},
|
|
92
|
+
};
|
|
93
|
+
|
|
94
|
+
return output;
|
|
60
95
|
}),
|
|
61
96
|
)
|
|
62
97
|
.then((results) => {
|
|
@@ -64,7 +99,20 @@ class CLIHandler {
|
|
|
64
99
|
* Wait for all rows to be run
|
|
65
100
|
* Write results now to output dir or log to console
|
|
66
101
|
*/
|
|
67
|
-
|
|
102
|
+
|
|
103
|
+
const config: Config = {
|
|
104
|
+
outputColumnName: 'output',
|
|
105
|
+
inputVariableNames: results[0]?.metadata?.['inputVariableNames'],
|
|
106
|
+
metadata: {
|
|
107
|
+
...(results[0]?.metadata ?? {}),
|
|
108
|
+
outputTimestamp: Date.now(),
|
|
109
|
+
},
|
|
110
|
+
...(results.some((r) => typeof r.latency === 'number') ? { latencyColumnName: 'latency' } : {}),
|
|
111
|
+
...(results.some((r) => typeof r.cost === 'number') ? { costColumnName: 'cost' } : {}),
|
|
112
|
+
...(results.some((r) => typeof r.tokens === 'number') ? { numOfTokensColumnName: 'tokens' } : {}),
|
|
113
|
+
};
|
|
114
|
+
|
|
115
|
+
this.writeOutput(results, outputDir, config);
|
|
68
116
|
console.log('Results processing completed. Check console for output.');
|
|
69
117
|
})
|
|
70
118
|
.catch((err) => {
|
|
@@ -72,8 +120,8 @@ class CLIHandler {
|
|
|
72
120
|
});
|
|
73
121
|
}
|
|
74
122
|
|
|
75
|
-
private writeOutput(results:
|
|
76
|
-
const
|
|
123
|
+
private writeOutput(results: Output[], outputDir: string, config?: Config) {
|
|
124
|
+
const resolvedConfig: Config = {
|
|
77
125
|
metadata: { outputTimestamp: Date.now() },
|
|
78
126
|
outputColumnName: 'output',
|
|
79
127
|
};
|
|
@@ -86,7 +134,7 @@ class CLIHandler {
|
|
|
86
134
|
const configPath = path.join(outputDirPath, 'config.json');
|
|
87
135
|
|
|
88
136
|
fs.writeFileSync(datasetPath, JSON.stringify(results, null, 4), 'utf8');
|
|
89
|
-
fs.writeFileSync(configPath, JSON.stringify(
|
|
137
|
+
fs.writeFileSync(configPath, JSON.stringify(resolvedConfig, null, 4), 'utf8');
|
|
90
138
|
|
|
91
139
|
console.info(`Output written to ${datasetPath}`);
|
|
92
140
|
console.info(`Config written to ${configPath}`);
|
|
@@ -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
|
|
|
@@ -52,6 +52,7 @@ function createStep(
|
|
|
52
52
|
console.debug('Starting a new trace...');
|
|
53
53
|
console.debug(`Adding step ${name} as the root step`);
|
|
54
54
|
const currentTrace = new Trace();
|
|
55
|
+
console.log('setting current trace', currentTrace)
|
|
55
56
|
setCurrentTrace(currentTrace);
|
|
56
57
|
currentTrace.addStep(newStep);
|
|
57
58
|
} else {
|
|
@@ -114,9 +115,10 @@ function createStep(
|
|
|
114
115
|
}
|
|
115
116
|
}
|
|
116
117
|
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
118
|
+
console.log('AOEUAOEUAOEU', traceData?.toJSON())
|
|
119
|
+
// // Reset the entire trace state
|
|
120
|
+
// setCurrentTrace(null);
|
|
121
|
+
// stepStack.length = 0; // Clear the step stack
|
|
120
122
|
} else {
|
|
121
123
|
console.debug(`Ending step ${name}`);
|
|
122
124
|
}
|
|
@@ -225,7 +227,7 @@ export function addChatCompletionStepToTrace(
|
|
|
225
227
|
endStep();
|
|
226
228
|
}
|
|
227
229
|
|
|
228
|
-
function postProcessTrace(traceObj: Trace): { traceData: any; inputVariableNames: string[] } {
|
|
230
|
+
export function postProcessTrace(traceObj: Trace): { traceData: any; inputVariableNames: string[] } {
|
|
229
231
|
const rootStep = traceObj.steps[0];
|
|
230
232
|
|
|
231
233
|
const input_variables = rootStep!.inputs;
|
|
@@ -239,9 +241,10 @@ function postProcessTrace(traceObj: Trace): { traceData: any; inputVariableNames
|
|
|
239
241
|
output: rootStep!.output,
|
|
240
242
|
groundTruth: rootStep!.groundTruth,
|
|
241
243
|
latency: rootStep!.latency,
|
|
242
|
-
cost:
|
|
243
|
-
tokens:
|
|
244
|
+
cost: (rootStep as ChatCompletionStep)!.cost,
|
|
245
|
+
tokens: (rootStep as ChatCompletionStep)!.tokens,
|
|
244
246
|
steps: processed_steps,
|
|
247
|
+
metadata: rootStep!.metadata,
|
|
245
248
|
};
|
|
246
249
|
|
|
247
250
|
if (input_variables) {
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const VERSION = '0.
|
|
1
|
+
export const VERSION = '0.14.1'; // 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.1";
|
|
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.1'; // 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"}
|