bikky 0.3.3 → 0.3.6
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/README.md +26 -6
- package/dist/cli.js +26 -6
- package/dist/cli.js.map +1 -1
- package/dist/config.d.ts +22 -0
- package/dist/config.d.ts.map +1 -1
- package/dist/config.js +255 -3
- package/dist/config.js.map +1 -1
- package/dist/config.test.d.ts +3 -2
- package/dist/config.test.d.ts.map +1 -1
- package/dist/config.test.js +95 -6
- package/dist/config.test.js.map +1 -1
- package/dist/daemon/capture-policy.d.ts +4 -4
- package/dist/daemon/capture-policy.d.ts.map +1 -1
- package/dist/daemon/capture-policy.js +8 -17
- package/dist/daemon/capture-policy.js.map +1 -1
- package/dist/daemon/capture-policy.test.js +2 -2
- package/dist/daemon/capture-policy.test.js.map +1 -1
- package/dist/daemon/consolidation.d.ts +4 -1
- package/dist/daemon/consolidation.d.ts.map +1 -1
- package/dist/daemon/consolidation.js +18 -4
- package/dist/daemon/consolidation.js.map +1 -1
- package/dist/daemon/entity-typing.d.ts +42 -0
- package/dist/daemon/entity-typing.d.ts.map +1 -0
- package/dist/daemon/entity-typing.js +295 -0
- package/dist/daemon/entity-typing.js.map +1 -0
- package/dist/daemon/entity-typing.test.d.ts +2 -0
- package/dist/daemon/entity-typing.test.d.ts.map +1 -0
- package/dist/daemon/entity-typing.test.js +50 -0
- package/dist/daemon/entity-typing.test.js.map +1 -0
- package/dist/daemon/episode-summary.d.ts +4 -8
- package/dist/daemon/episode-summary.d.ts.map +1 -1
- package/dist/daemon/episode-summary.js +52 -18
- package/dist/daemon/episode-summary.js.map +1 -1
- package/dist/daemon/episode-summary.test.js +10 -7
- package/dist/daemon/episode-summary.test.js.map +1 -1
- package/dist/daemon/extraction-quality.test.d.ts +2 -0
- package/dist/daemon/extraction-quality.test.d.ts.map +1 -0
- package/dist/daemon/extraction-quality.test.js +283 -0
- package/dist/daemon/extraction-quality.test.js.map +1 -0
- package/dist/daemon/extraction-rules.d.ts +131 -0
- package/dist/daemon/extraction-rules.d.ts.map +1 -0
- package/dist/daemon/extraction-rules.js +321 -0
- package/dist/daemon/extraction-rules.js.map +1 -0
- package/dist/daemon/extraction-rules.test.d.ts +2 -0
- package/dist/daemon/extraction-rules.test.d.ts.map +1 -0
- package/dist/daemon/extraction-rules.test.js +183 -0
- package/dist/daemon/extraction-rules.test.js.map +1 -0
- package/dist/daemon/extraction.d.ts +19 -1
- package/dist/daemon/extraction.d.ts.map +1 -1
- package/dist/daemon/extraction.js +183 -26
- package/dist/daemon/extraction.js.map +1 -1
- package/dist/daemon/extraction.test.js +96 -2
- package/dist/daemon/extraction.test.js.map +1 -1
- package/dist/daemon/loop.d.ts.map +1 -1
- package/dist/daemon/loop.js +22 -0
- package/dist/daemon/loop.js.map +1 -1
- package/dist/daemon/loop.test.d.ts +2 -0
- package/dist/daemon/loop.test.d.ts.map +1 -0
- package/dist/daemon/loop.test.js +85 -0
- package/dist/daemon/loop.test.js.map +1 -0
- package/dist/daemon/maintenance-state.d.ts +36 -0
- package/dist/daemon/maintenance-state.d.ts.map +1 -0
- package/dist/daemon/maintenance-state.js +95 -0
- package/dist/daemon/maintenance-state.js.map +1 -0
- package/dist/daemon/maintenance-state.test.d.ts +2 -0
- package/dist/daemon/maintenance-state.test.d.ts.map +1 -0
- package/dist/daemon/maintenance-state.test.js +56 -0
- package/dist/daemon/maintenance-state.test.js.map +1 -0
- package/dist/daemon/qdrant.d.ts +37 -1
- package/dist/daemon/qdrant.d.ts.map +1 -1
- package/dist/daemon/qdrant.js +107 -12
- package/dist/daemon/qdrant.js.map +1 -1
- package/dist/daemon/qdrant.test.js +57 -1
- package/dist/daemon/qdrant.test.js.map +1 -1
- package/dist/daemon/relations-vocab.d.ts +44 -0
- package/dist/daemon/relations-vocab.d.ts.map +1 -0
- package/dist/daemon/relations-vocab.js +168 -0
- package/dist/daemon/relations-vocab.js.map +1 -0
- package/dist/daemon/relations-vocab.test.d.ts +2 -0
- package/dist/daemon/relations-vocab.test.d.ts.map +1 -0
- package/dist/daemon/relations-vocab.test.js +69 -0
- package/dist/daemon/relations-vocab.test.js.map +1 -0
- package/dist/daemon/relations.d.ts +49 -34
- package/dist/daemon/relations.d.ts.map +1 -1
- package/dist/daemon/relations.js +249 -153
- package/dist/daemon/relations.js.map +1 -1
- package/dist/daemon/relations.test.d.ts +2 -0
- package/dist/daemon/relations.test.d.ts.map +1 -0
- package/dist/daemon/relations.test.js +36 -0
- package/dist/daemon/relations.test.js.map +1 -0
- package/dist/daemon/session-index.d.ts +1 -8
- package/dist/daemon/session-index.d.ts.map +1 -1
- package/dist/daemon/session-index.js +8 -10
- package/dist/daemon/session-index.js.map +1 -1
- package/dist/daemon/session-index.test.js +15 -9
- package/dist/daemon/session-index.test.js.map +1 -1
- package/dist/daemon/session-summary.d.ts +1 -8
- package/dist/daemon/session-summary.d.ts.map +1 -1
- package/dist/daemon/session-summary.js +17 -12
- package/dist/daemon/session-summary.js.map +1 -1
- package/dist/daemon/session-summary.test.js +5 -3
- package/dist/daemon/session-summary.test.js.map +1 -1
- package/dist/daemon/watcher-health.d.ts +20 -0
- package/dist/daemon/watcher-health.d.ts.map +1 -0
- package/dist/daemon/watcher-health.js +78 -0
- package/dist/daemon/watcher-health.js.map +1 -0
- package/dist/daemon/watcher-health.test.d.ts +5 -0
- package/dist/daemon/watcher-health.test.d.ts.map +1 -0
- package/dist/daemon/watcher-health.test.js +96 -0
- package/dist/daemon/watcher-health.test.js.map +1 -0
- package/dist/daemon/watcher.test.d.ts +3 -2
- package/dist/daemon/watcher.test.d.ts.map +1 -1
- package/dist/daemon/watcher.test.js +9 -19
- package/dist/daemon/watcher.test.js.map +1 -1
- package/dist/daemon/workstream-resolver.d.ts +76 -0
- package/dist/daemon/workstream-resolver.d.ts.map +1 -0
- package/dist/daemon/workstream-resolver.js +180 -0
- package/dist/daemon/workstream-resolver.js.map +1 -0
- package/dist/daemon/workstream-resolver.test.d.ts +2 -0
- package/dist/daemon/workstream-resolver.test.d.ts.map +1 -0
- package/dist/daemon/workstream-resolver.test.js +128 -0
- package/dist/daemon/workstream-resolver.test.js.map +1 -0
- package/dist/daemon/workstream-summary.d.ts +1 -8
- package/dist/daemon/workstream-summary.d.ts.map +1 -1
- package/dist/daemon/workstream-summary.js +22 -14
- package/dist/daemon/workstream-summary.js.map +1 -1
- package/dist/daemon/workstream-summary.test.js +9 -6
- package/dist/daemon/workstream-summary.test.js.map +1 -1
- package/dist/lib/qdrant-client.d.ts +34 -0
- package/dist/lib/qdrant-client.d.ts.map +1 -1
- package/dist/lib/qdrant-client.js +54 -0
- package/dist/lib/qdrant-client.js.map +1 -1
- package/dist/lib/qdrant-client.test.js +49 -1
- package/dist/lib/qdrant-client.test.js.map +1 -1
- package/dist/llm/inference/index.d.ts +2 -1
- package/dist/llm/inference/index.d.ts.map +1 -1
- package/dist/llm/inference/index.js +37 -2
- package/dist/llm/inference/index.js.map +1 -1
- package/dist/llm/inference/index.test.js +44 -3
- package/dist/llm/inference/index.test.js.map +1 -1
- package/dist/llm/inference/providers/bedrock.d.ts +23 -0
- package/dist/llm/inference/providers/bedrock.d.ts.map +1 -1
- package/dist/llm/inference/providers/bedrock.js +10 -1
- package/dist/llm/inference/providers/bedrock.js.map +1 -1
- package/dist/llm/inference/providers/bedrock.test.js +49 -2
- package/dist/llm/inference/providers/bedrock.test.js.map +1 -1
- package/dist/llm/inference/providers/ollama.d.ts.map +1 -1
- package/dist/llm/inference/providers/ollama.js +7 -1
- package/dist/llm/inference/providers/ollama.js.map +1 -1
- package/dist/llm/inference/providers/openai.d.ts.map +1 -1
- package/dist/llm/inference/providers/openai.js +7 -1
- package/dist/llm/inference/providers/openai.js.map +1 -1
- package/dist/llm/inference/providers/openai.test.js +38 -2
- package/dist/llm/inference/providers/openai.test.js.map +1 -1
- package/dist/llm/inference/providers/portkey.d.ts.map +1 -1
- package/dist/llm/inference/providers/portkey.js +7 -1
- package/dist/llm/inference/providers/portkey.js.map +1 -1
- package/dist/llm/inference/types.d.ts +15 -0
- package/dist/llm/inference/types.d.ts.map +1 -1
- package/dist/llm/telemetry.d.ts +8 -1
- package/dist/llm/telemetry.d.ts.map +1 -1
- package/dist/llm/telemetry.js.map +1 -1
- package/dist/mcp/helpers.d.ts.map +1 -1
- package/dist/mcp/helpers.js +17 -2
- package/dist/mcp/helpers.js.map +1 -1
- package/dist/mcp/taxonomy.d.ts +6 -18
- package/dist/mcp/taxonomy.d.ts.map +1 -1
- package/dist/mcp/taxonomy.js +15 -25
- package/dist/mcp/taxonomy.js.map +1 -1
- package/dist/mcp/taxonomy.test.js +23 -7
- package/dist/mcp/taxonomy.test.js.map +1 -1
- package/dist/mcp/tools.d.ts.map +1 -1
- package/dist/mcp/tools.js +355 -17
- package/dist/mcp/tools.js.map +1 -1
- package/dist/mcp/tools.test.js +279 -5
- package/dist/mcp/tools.test.js.map +1 -1
- package/dist/privacy/redaction.d.ts +21 -0
- package/dist/privacy/redaction.d.ts.map +1 -0
- package/dist/privacy/redaction.js +83 -0
- package/dist/privacy/redaction.js.map +1 -0
- package/dist/privacy/redaction.test.d.ts +2 -0
- package/dist/privacy/redaction.test.d.ts.map +1 -0
- package/dist/privacy/redaction.test.js +51 -0
- package/dist/privacy/redaction.test.js.map +1 -0
- package/dist/prompts/distill.d.ts.map +1 -1
- package/dist/prompts/distill.js +3 -2
- package/dist/prompts/distill.js.map +1 -1
- package/dist/prompts/entity-typing.d.ts +18 -0
- package/dist/prompts/entity-typing.d.ts.map +1 -0
- package/dist/prompts/entity-typing.js +60 -0
- package/dist/prompts/entity-typing.js.map +1 -0
- package/dist/prompts/episode-summary.d.ts.map +1 -1
- package/dist/prompts/episode-summary.js +17 -3
- package/dist/prompts/episode-summary.js.map +1 -1
- package/dist/prompts/extraction.d.ts.map +1 -1
- package/dist/prompts/extraction.js +114 -5
- package/dist/prompts/extraction.js.map +1 -1
- package/dist/prompts/index.d.ts +1 -0
- package/dist/prompts/index.d.ts.map +1 -1
- package/dist/prompts/index.js +1 -0
- package/dist/prompts/index.js.map +1 -1
- package/dist/prompts/relations.d.ts.map +1 -1
- package/dist/prompts/relations.js +72 -4
- package/dist/prompts/relations.js.map +1 -1
- package/dist/render.d.ts.map +1 -1
- package/dist/render.js +7 -1
- package/dist/render.js.map +1 -1
- package/dist/render.test.js +3 -2
- package/dist/render.test.js.map +1 -1
- package/dist/status.d.ts +94 -0
- package/dist/status.d.ts.map +1 -0
- package/dist/status.js +378 -0
- package/dist/status.js.map +1 -0
- package/dist/status.test.d.ts +5 -0
- package/dist/status.test.d.ts.map +1 -0
- package/dist/status.test.js +203 -0
- package/dist/status.test.js.map +1 -0
- package/package.json +1 -1
|
@@ -4,7 +4,10 @@
|
|
|
4
4
|
*/
|
|
5
5
|
import { describe, it, beforeEach, afterEach } from "node:test";
|
|
6
6
|
import assert from "node:assert/strict";
|
|
7
|
-
import
|
|
7
|
+
import fs from "node:fs";
|
|
8
|
+
import path from "node:path";
|
|
9
|
+
import os from "node:os";
|
|
10
|
+
import { initLLM, chatCompletion, getInferenceConfig, registerInferenceProvider, _resetInference, _recordInferenceUsage, } from "./index.js";
|
|
8
11
|
import { listInferenceProviders, _resetInferenceRegistry, } from "./registry.js";
|
|
9
12
|
describe("initLLM — resolution", () => {
|
|
10
13
|
beforeEach(() => _resetInference());
|
|
@@ -57,25 +60,37 @@ describe("getInferenceConfig", () => {
|
|
|
57
60
|
describe("chatCompletion — dispatch + fallback", () => {
|
|
58
61
|
let snapshot;
|
|
59
62
|
let calls;
|
|
63
|
+
let telemetryDir;
|
|
64
|
+
let telemetryFile;
|
|
60
65
|
beforeEach(() => {
|
|
61
66
|
snapshot = listInferenceProviders();
|
|
62
67
|
_resetInferenceRegistry();
|
|
63
68
|
_resetInference();
|
|
64
69
|
calls = [];
|
|
70
|
+
telemetryDir = fs.mkdtempSync(path.join(os.tmpdir(), "bikky-inference-telemetry-"));
|
|
71
|
+
telemetryFile = path.join(telemetryDir, "llm.jsonl");
|
|
72
|
+
process.env.BIKKY_LLM_LOG = telemetryFile;
|
|
65
73
|
});
|
|
66
74
|
afterEach(() => {
|
|
67
75
|
_resetInferenceRegistry();
|
|
68
76
|
_resetInference();
|
|
69
77
|
for (const p of snapshot)
|
|
70
78
|
registerInferenceProvider(p);
|
|
79
|
+
delete process.env.BIKKY_LLM_LOG;
|
|
80
|
+
fs.rmSync(telemetryDir, { recursive: true, force: true });
|
|
71
81
|
});
|
|
72
|
-
function fakeProvider(name, result) {
|
|
82
|
+
function fakeProvider(name, result, usage) {
|
|
73
83
|
return {
|
|
74
84
|
name,
|
|
75
85
|
label: name,
|
|
76
86
|
browserCompatible: false,
|
|
77
87
|
defaults: { model: `${name}-model` },
|
|
78
|
-
async chat() {
|
|
88
|
+
async chat() {
|
|
89
|
+
calls.push(name);
|
|
90
|
+
if (usage)
|
|
91
|
+
_recordInferenceUsage(usage);
|
|
92
|
+
return result;
|
|
93
|
+
},
|
|
79
94
|
};
|
|
80
95
|
}
|
|
81
96
|
it("returns the primary's result when it succeeds", async () => {
|
|
@@ -85,6 +100,32 @@ describe("chatCompletion — dispatch + fallback", () => {
|
|
|
85
100
|
assert.strictEqual(out, "primary-said-hi");
|
|
86
101
|
assert.deepStrictEqual(calls, ["primary"]);
|
|
87
102
|
});
|
|
103
|
+
it("writes telemetry with prompt context and actual usage when provided", async () => {
|
|
104
|
+
registerInferenceProvider(fakeProvider("primary", "primary-said-hi", {
|
|
105
|
+
input_tokens: 11,
|
|
106
|
+
output_tokens: 7,
|
|
107
|
+
total_tokens: 18,
|
|
108
|
+
request_id: "req-1",
|
|
109
|
+
}));
|
|
110
|
+
initLLM({ config: { provider: "primary" } });
|
|
111
|
+
const out = await chatCompletion({
|
|
112
|
+
promptName: "test-prompt@1",
|
|
113
|
+
messages: [{ role: "user", content: "hi" }],
|
|
114
|
+
telemetry: { subsystem: "unit-test", session_id: "session-1", workstream_key: "workstream-1", trigger: "test" },
|
|
115
|
+
});
|
|
116
|
+
assert.strictEqual(out, "primary-said-hi");
|
|
117
|
+
const lines = fs.readFileSync(telemetryFile, "utf-8").trim().split("\n");
|
|
118
|
+
assert.equal(lines.length, 1);
|
|
119
|
+
const record = JSON.parse(lines[0]);
|
|
120
|
+
assert.equal(record.prompt, "test-prompt@1");
|
|
121
|
+
assert.equal(record.subsystem, "unit-test");
|
|
122
|
+
assert.equal(record.session_id, "session-1");
|
|
123
|
+
assert.equal(record.workstream_key, "workstream-1");
|
|
124
|
+
assert.equal(record.tokens_in_actual, 11);
|
|
125
|
+
assert.equal(record.tokens_out_actual, 7);
|
|
126
|
+
assert.equal(record.tokens_total_actual, 18);
|
|
127
|
+
assert.equal(record.request_id, "req-1");
|
|
128
|
+
});
|
|
88
129
|
it("falls back to the configured fallback when primary returns null", async () => {
|
|
89
130
|
registerInferenceProvider(fakeProvider("primary", null));
|
|
90
131
|
registerInferenceProvider(fakeProvider("backup", "backup-said-hi"));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/llm/inference/index.test.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,MAAM,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/llm/inference/index.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,30 @@
|
|
|
12
12
|
* matching the contract used by the HTTP-based providers.
|
|
13
13
|
*/
|
|
14
14
|
import type { InferenceProvider } from "../types.js";
|
|
15
|
+
export interface BedrockSdk {
|
|
16
|
+
client: {
|
|
17
|
+
send(cmd: unknown): Promise<{
|
|
18
|
+
output?: {
|
|
19
|
+
message?: {
|
|
20
|
+
content?: Array<{
|
|
21
|
+
text?: string;
|
|
22
|
+
}>;
|
|
23
|
+
};
|
|
24
|
+
};
|
|
25
|
+
usage?: {
|
|
26
|
+
inputTokens?: number;
|
|
27
|
+
outputTokens?: number;
|
|
28
|
+
totalTokens?: number;
|
|
29
|
+
};
|
|
30
|
+
$metadata?: {
|
|
31
|
+
requestId?: string;
|
|
32
|
+
};
|
|
33
|
+
}>;
|
|
34
|
+
};
|
|
35
|
+
ConverseCommand: new (input: any) => unknown;
|
|
36
|
+
}
|
|
15
37
|
/** Test-only: drop the cached SDK so tests can swap or reset it. */
|
|
16
38
|
export declare function _resetBedrockInferenceClient(): void;
|
|
39
|
+
export declare function _setBedrockInferenceClientForTest(next: BedrockSdk): void;
|
|
17
40
|
export declare const bedrockInferenceProvider: InferenceProvider;
|
|
18
41
|
//# sourceMappingURL=bedrock.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bedrock.d.ts","sourceRoot":"","sources":["../../../../src/llm/inference/providers/bedrock.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EACV,iBAAiB,EAKlB,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"bedrock.d.ts","sourceRoot":"","sources":["../../../../src/llm/inference/providers/bedrock.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,KAAK,EACV,iBAAiB,EAKlB,MAAM,aAAa,CAAC;AAcrB,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE;QAAE,IAAI,CAAC,GAAG,EAAE,OAAO,GAAG,OAAO,CAAC;YACpC,MAAM,CAAC,EAAE;gBAAE,OAAO,CAAC,EAAE;oBAAE,OAAO,CAAC,EAAE,KAAK,CAAC;wBAAE,IAAI,CAAC,EAAE,MAAM,CAAA;qBAAE,CAAC,CAAA;iBAAE,CAAA;aAAE,CAAC;YAC9D,KAAK,CAAC,EAAE;gBAAE,WAAW,CAAC,EAAE,MAAM,CAAC;gBAAC,YAAY,CAAC,EAAE,MAAM,CAAC;gBAAC,WAAW,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC;YAC9E,SAAS,CAAC,EAAE;gBAAE,SAAS,CAAC,EAAE,MAAM,CAAA;aAAE,CAAC;SACpC,CAAC,CAAA;KAAE,CAAC;IAIL,eAAe,EAAE,KAAK,KAAK,EAAE,GAAG,KAAK,OAAO,CAAC;CAC9C;AA6CD,oEAAoE;AACpE,wBAAgB,4BAA4B,IAAI,IAAI,CAEnD;AAED,wBAAgB,iCAAiC,CAAC,IAAI,EAAE,UAAU,GAAG,IAAI,CAExE;AAED,eAAO,MAAM,wBAAwB,EAAE,iBAoDtC,CAAC"}
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
*/
|
|
14
14
|
import { registerInferenceProvider } from "../registry.js";
|
|
15
15
|
import { classifyHttpStatus, LlmAuthError, LlmBadRequestError, LlmRateLimitError, LlmTransientError, LlmUnknownError, } from "../../errors.js";
|
|
16
|
-
import { _recordInferenceError } from "../index.js";
|
|
16
|
+
import { _recordInferenceError, _recordInferenceUsage } from "../index.js";
|
|
17
17
|
let sdk = null;
|
|
18
18
|
async function ensureSdk(cfg) {
|
|
19
19
|
if (sdk)
|
|
@@ -55,6 +55,9 @@ function translateSdkError(err, model) {
|
|
|
55
55
|
export function _resetBedrockInferenceClient() {
|
|
56
56
|
sdk = null;
|
|
57
57
|
}
|
|
58
|
+
export function _setBedrockInferenceClientForTest(next) {
|
|
59
|
+
sdk = next;
|
|
60
|
+
}
|
|
58
61
|
export const bedrockInferenceProvider = {
|
|
59
62
|
name: "bedrock",
|
|
60
63
|
label: "AWS Bedrock (Converse)",
|
|
@@ -89,6 +92,12 @@ export const bedrockInferenceProvider = {
|
|
|
89
92
|
});
|
|
90
93
|
const resp = await client.send(command);
|
|
91
94
|
_recordInferenceError(null);
|
|
95
|
+
_recordInferenceUsage({
|
|
96
|
+
input_tokens: resp.usage?.inputTokens,
|
|
97
|
+
output_tokens: resp.usage?.outputTokens,
|
|
98
|
+
total_tokens: resp.usage?.totalTokens,
|
|
99
|
+
request_id: resp.$metadata?.requestId,
|
|
100
|
+
});
|
|
92
101
|
const content = resp.output?.message?.content;
|
|
93
102
|
const textBlock = content?.find((c) => "text" in c);
|
|
94
103
|
return (textBlock?.text ?? "").trim() || null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bedrock.js","sourceRoot":"","sources":["../../../../src/llm/inference/providers/bedrock.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AASH,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EACL,kBAAkB,EAClB,YAAY,EACZ,kBAAkB,EAClB,iBAAiB,EACjB,iBAAiB,EACjB,eAAe,GAGhB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"bedrock.js","sourceRoot":"","sources":["../../../../src/llm/inference/providers/bedrock.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,26 @@
|
|
|
1
|
-
import { describe, it } from "node:test";
|
|
1
|
+
import { describe, it, beforeEach, afterEach } from "node:test";
|
|
2
2
|
import assert from "node:assert/strict";
|
|
3
|
-
import
|
|
3
|
+
import fs from "node:fs";
|
|
4
|
+
import path from "node:path";
|
|
5
|
+
import os from "node:os";
|
|
6
|
+
import { bedrockInferenceProvider, _resetBedrockInferenceClient, _setBedrockInferenceClientForTest } from "./bedrock.js";
|
|
7
|
+
import { chatCompletion, initLLM, _resetInference } from "../index.js";
|
|
4
8
|
describe("bedrock inference provider — metadata", () => {
|
|
9
|
+
let telemetryDir;
|
|
10
|
+
let telemetryFile;
|
|
11
|
+
beforeEach(() => {
|
|
12
|
+
telemetryDir = fs.mkdtempSync(path.join(os.tmpdir(), "bikky-bedrock-telemetry-"));
|
|
13
|
+
telemetryFile = path.join(telemetryDir, "llm.jsonl");
|
|
14
|
+
process.env.BIKKY_LLM_LOG = telemetryFile;
|
|
15
|
+
_resetInference();
|
|
16
|
+
_resetBedrockInferenceClient();
|
|
17
|
+
});
|
|
18
|
+
afterEach(() => {
|
|
19
|
+
delete process.env.BIKKY_LLM_LOG;
|
|
20
|
+
fs.rmSync(telemetryDir, { recursive: true, force: true });
|
|
21
|
+
_resetInference();
|
|
22
|
+
_resetBedrockInferenceClient();
|
|
23
|
+
});
|
|
5
24
|
it("declares the correct name + label", () => {
|
|
6
25
|
assert.strictEqual(bedrockInferenceProvider.name, "bedrock");
|
|
7
26
|
assert.strictEqual(bedrockInferenceProvider.label, "AWS Bedrock (Converse)");
|
|
@@ -17,5 +36,33 @@ describe("bedrock inference provider — metadata", () => {
|
|
|
17
36
|
assert.strictEqual(typeof bedrockInferenceProvider.chat, "function");
|
|
18
37
|
assert.strictEqual(typeof _resetBedrockInferenceClient, "function");
|
|
19
38
|
});
|
|
39
|
+
it("exposes Bedrock Converse usage metadata through chatCompletion telemetry", async () => {
|
|
40
|
+
_setBedrockInferenceClientForTest({
|
|
41
|
+
client: {
|
|
42
|
+
async send() {
|
|
43
|
+
return {
|
|
44
|
+
output: { message: { content: [{ text: " ok " }] } },
|
|
45
|
+
usage: { inputTokens: 20, outputTokens: 5, totalTokens: 25 },
|
|
46
|
+
$metadata: { requestId: "bedrock-request-1" },
|
|
47
|
+
};
|
|
48
|
+
},
|
|
49
|
+
},
|
|
50
|
+
ConverseCommand: class {
|
|
51
|
+
constructor(_input) { }
|
|
52
|
+
},
|
|
53
|
+
});
|
|
54
|
+
initLLM({ config: { provider: "bedrock", model: "test-model" } });
|
|
55
|
+
const out = await chatCompletion({
|
|
56
|
+
promptName: "bedrock-test@1",
|
|
57
|
+
messages: [{ role: "user", content: "x" }],
|
|
58
|
+
telemetry: { subsystem: "unit-test" },
|
|
59
|
+
});
|
|
60
|
+
assert.equal(out, "ok");
|
|
61
|
+
const record = JSON.parse(fs.readFileSync(telemetryFile, "utf-8").trim());
|
|
62
|
+
assert.equal(record.tokens_in_actual, 20);
|
|
63
|
+
assert.equal(record.tokens_out_actual, 5);
|
|
64
|
+
assert.equal(record.tokens_total_actual, 25);
|
|
65
|
+
assert.equal(record.request_id, "bedrock-request-1");
|
|
66
|
+
});
|
|
20
67
|
});
|
|
21
68
|
//# sourceMappingURL=bedrock.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bedrock.test.js","sourceRoot":"","sources":["../../../../src/llm/inference/providers/bedrock.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"bedrock.test.js","sourceRoot":"","sources":["../../../../src/llm/inference/providers/bedrock.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../../../src/llm/inference/providers/ollama.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,iBAAiB,EAIlB,MAAM,aAAa,CAAC;AAQrB,eAAO,MAAM,uBAAuB,EAAE,
|
|
1
|
+
{"version":3,"file":"ollama.d.ts","sourceRoot":"","sources":["../../../../src/llm/inference/providers/ollama.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,KAAK,EACV,iBAAiB,EAIlB,MAAM,aAAa,CAAC;AAQrB,eAAO,MAAM,uBAAuB,EAAE,iBA2DrC,CAAC"}
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
import { registerInferenceProvider } from "../registry.js";
|
|
7
7
|
import { resilientFetch } from "../../fetch.js";
|
|
8
8
|
import { LlmHttpError } from "../../errors.js";
|
|
9
|
-
import { _recordInferenceError } from "../index.js";
|
|
9
|
+
import { _recordInferenceError, _recordInferenceUsage } from "../index.js";
|
|
10
10
|
const RETRY_CAP_MS = 5_000;
|
|
11
11
|
export const ollamaInferenceProvider = {
|
|
12
12
|
name: "ollama",
|
|
@@ -45,6 +45,12 @@ export const ollamaInferenceProvider = {
|
|
|
45
45
|
});
|
|
46
46
|
const data = (await resp.json());
|
|
47
47
|
_recordInferenceError(null);
|
|
48
|
+
_recordInferenceUsage({
|
|
49
|
+
input_tokens: data.usage?.prompt_tokens,
|
|
50
|
+
output_tokens: data.usage?.completion_tokens,
|
|
51
|
+
total_tokens: data.usage?.total_tokens,
|
|
52
|
+
request_id: data.id,
|
|
53
|
+
});
|
|
48
54
|
return data.choices?.[0]?.message?.content?.trim() ?? null;
|
|
49
55
|
}
|
|
50
56
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../../../../src/llm/inference/providers/ollama.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAQH,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"ollama.js","sourceRoot":"","sources":["../../../../src/llm/inference/providers/ollama.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../../../src/llm/inference/providers/openai.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EACV,iBAAiB,EAIlB,MAAM,aAAa,CAAC;AAYrB,eAAO,MAAM,uBAAuB,EAAE,
|
|
1
|
+
{"version":3,"file":"openai.d.ts","sourceRoot":"","sources":["../../../../src/llm/inference/providers/openai.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EACV,iBAAiB,EAIlB,MAAM,aAAa,CAAC;AAYrB,eAAO,MAAM,uBAAuB,EAAE,iBAkErC,CAAC"}
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
import { registerInferenceProvider } from "../registry.js";
|
|
10
10
|
import { resilientFetch } from "../../fetch.js";
|
|
11
11
|
import { LlmAuthError, LlmHttpError, } from "../../errors.js";
|
|
12
|
-
import { _recordInferenceError } from "../index.js";
|
|
12
|
+
import { _recordInferenceError, _recordInferenceUsage } from "../index.js";
|
|
13
13
|
const RETRY_CAP_MS = 5_000;
|
|
14
14
|
export const openaiInferenceProvider = {
|
|
15
15
|
name: "openai",
|
|
@@ -55,6 +55,12 @@ export const openaiInferenceProvider = {
|
|
|
55
55
|
});
|
|
56
56
|
const data = (await resp.json());
|
|
57
57
|
_recordInferenceError(null);
|
|
58
|
+
_recordInferenceUsage({
|
|
59
|
+
input_tokens: data.usage?.prompt_tokens,
|
|
60
|
+
output_tokens: data.usage?.completion_tokens,
|
|
61
|
+
total_tokens: data.usage?.total_tokens,
|
|
62
|
+
request_id: data.id,
|
|
63
|
+
});
|
|
58
64
|
return data.choices?.[0]?.message?.content?.trim() ?? null;
|
|
59
65
|
}
|
|
60
66
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../../../src/llm/inference/providers/openai.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAQH,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EACL,YAAY,EACZ,YAAY,GAEb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"openai.js","sourceRoot":"","sources":["../../../../src/llm/inference/providers/openai.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,10 @@
|
|
|
1
1
|
import { describe, it, beforeEach, afterEach } from "node:test";
|
|
2
2
|
import assert from "node:assert/strict";
|
|
3
|
+
import fs from "node:fs";
|
|
4
|
+
import path from "node:path";
|
|
5
|
+
import os from "node:os";
|
|
3
6
|
import { openaiInferenceProvider } from "./openai.js";
|
|
7
|
+
import { chatCompletion, initLLM, _resetInference } from "../index.js";
|
|
4
8
|
const cfg = {
|
|
5
9
|
provider: "openai",
|
|
6
10
|
model: "gpt-4.1-mini",
|
|
@@ -15,8 +19,21 @@ const cfg = {
|
|
|
15
19
|
const log = () => { };
|
|
16
20
|
describe("openai inference provider", () => {
|
|
17
21
|
const realFetch = globalThis.fetch;
|
|
18
|
-
|
|
19
|
-
|
|
22
|
+
let telemetryDir;
|
|
23
|
+
let telemetryFile;
|
|
24
|
+
beforeEach(() => {
|
|
25
|
+
globalThis.fetch = realFetch;
|
|
26
|
+
telemetryDir = fs.mkdtempSync(path.join(os.tmpdir(), "bikky-openai-telemetry-"));
|
|
27
|
+
telemetryFile = path.join(telemetryDir, "llm.jsonl");
|
|
28
|
+
process.env.BIKKY_LLM_LOG = telemetryFile;
|
|
29
|
+
_resetInference();
|
|
30
|
+
});
|
|
31
|
+
afterEach(() => {
|
|
32
|
+
globalThis.fetch = realFetch;
|
|
33
|
+
delete process.env.BIKKY_LLM_LOG;
|
|
34
|
+
fs.rmSync(telemetryDir, { recursive: true, force: true });
|
|
35
|
+
_resetInference();
|
|
36
|
+
});
|
|
20
37
|
it("sends bearer auth header and forwards json_schema response_format unchanged", async () => {
|
|
21
38
|
let captured = null;
|
|
22
39
|
globalThis.fetch = (async (_url, init) => {
|
|
@@ -42,5 +59,24 @@ describe("openai inference provider", () => {
|
|
|
42
59
|
const out = await openaiInferenceProvider.chat({ messages: [{ role: "user", content: "x" }] }, cfg, log);
|
|
43
60
|
assert.strictEqual(out, null);
|
|
44
61
|
});
|
|
62
|
+
it("exposes OpenAI usage metadata through chatCompletion telemetry", async () => {
|
|
63
|
+
globalThis.fetch = (async () => new Response(JSON.stringify({
|
|
64
|
+
id: "chatcmpl-1",
|
|
65
|
+
choices: [{ message: { content: "ok" } }],
|
|
66
|
+
usage: { prompt_tokens: 12, completion_tokens: 4, total_tokens: 16 },
|
|
67
|
+
}), { status: 200 }));
|
|
68
|
+
initLLM({ config: { provider: "openai", apiKey: "sk-test", retries: 0 } });
|
|
69
|
+
const out = await chatCompletion({
|
|
70
|
+
promptName: "openai-test@1",
|
|
71
|
+
messages: [{ role: "user", content: "x" }],
|
|
72
|
+
telemetry: { subsystem: "unit-test" },
|
|
73
|
+
});
|
|
74
|
+
assert.equal(out, "ok");
|
|
75
|
+
const record = JSON.parse(fs.readFileSync(telemetryFile, "utf-8").trim());
|
|
76
|
+
assert.equal(record.tokens_in_actual, 12);
|
|
77
|
+
assert.equal(record.tokens_out_actual, 4);
|
|
78
|
+
assert.equal(record.tokens_total_actual, 16);
|
|
79
|
+
assert.equal(record.request_id, "chatcmpl-1");
|
|
80
|
+
});
|
|
45
81
|
});
|
|
46
82
|
//# sourceMappingURL=openai.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"openai.test.js","sourceRoot":"","sources":["../../../../src/llm/inference/providers/openai.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,MAAM,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"openai.test.js","sourceRoot":"","sources":["../../../../src/llm/inference/providers/openai.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAChE,OAAO,MAAM,MAAM,oBAAoB,CAAC;AACxC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAEzB,OAAO,EAAE,uBAAuB,EAAE,MAAM,aAAa,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAGvE,MAAM,GAAG,GAA4B;IACnC,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,cAAc;IACrB,OAAO,EAAE,wBAAwB;IACjC,MAAM,EAAE,SAAS;IACjB,QAAQ,EAAE,IAAI;IACd,KAAK,EAAE,EAAE;IACT,SAAS,EAAE,KAAK;IAChB,OAAO,EAAE,CAAC;IACV,gBAAgB,EAAE,EAAE;CACrB,CAAC;AAEF,MAAM,GAAG,GAAG,GAAG,EAAE,GAAE,CAAC,CAAC;AAErB,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC;IACnC,IAAI,YAAoB,CAAC;IACzB,IAAI,aAAqB,CAAC;IAE1B,UAAU,CAAC,GAAG,EAAE;QACd,UAAU,CAAC,KAAK,GAAG,SAAS,CAAC;QAC7B,YAAY,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,yBAAyB,CAAC,CAAC,CAAC;QACjF,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QACrD,OAAO,CAAC,GAAG,CAAC,aAAa,GAAG,aAAa,CAAC;QAC1C,eAAe,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IACH,SAAS,CAAC,GAAG,EAAE;QACb,UAAU,CAAC,KAAK,GAAG,SAAS,CAAC;QAC7B,OAAO,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;QACjC,EAAE,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC1D,eAAe,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,6EAA6E,EAAE,KAAK,IAAI,EAAE;QAC3F,IAAI,QAAQ,GAAuB,IAAI,CAAC;QACxC,UAAU,CAAC,KAAK,GAAG,CAAC,KAAK,EAAE,IAAY,EAAE,IAAiB,EAAE,EAAE;YAC5D,QAAQ,GAAG,IAAI,CAAC;YAChB,OAAO,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QACtG,CAAC,CAA4B,CAAC;QAE9B,MAAM,uBAAuB,CAAC,IAAI,CAAC;YACjC,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;YAC1C,eAAe,EAAE,EAAE,IAAI,EAAE,aAAa,EAAE,WAAW,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE;SACjG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QAEb,MAAM,IAAI,GAAG,QAAkC,CAAC;QAChD,MAAM,OAAO,GAAG,IAAI,CAAC,OAAiC,CAAC;QACvD,MAAM,CAAC,WAAW,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,gBAAgB,CAAC,CAAC;QAC/D,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAc,CAAC,CAAC;QAC7C,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4CAA4C,EAAE,KAAK,IAAI,EAAE;QAC1D,MAAM,GAAG,GAAG,MAAM,uBAAuB,CAAC,IAAI,CAC5C,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,EAC9C,EAAE,GAAG,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,GAAG,CAAC,CAAC;QACjC,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,UAAU,CAAC,KAAK,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAA4B,CAAC;QAClG,MAAM,GAAG,GAAG,MAAM,uBAAuB,CAAC,IAAI,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;QACzG,MAAM,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;QAC9E,UAAU,CAAC,KAAK,GAAG,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC;YAC1D,EAAE,EAAE,YAAY;YAChB,OAAO,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC;YACzC,KAAK,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,iBAAiB,EAAE,CAAC,EAAE,YAAY,EAAE,EAAE,EAAE;SACrE,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAA4B,CAAC;QAEjD,OAAO,CAAC,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;QAC3E,MAAM,GAAG,GAAG,MAAM,cAAc,CAAC;YAC/B,UAAU,EAAE,eAAe;YAC3B,QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC;YAC1C,SAAS,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE;SACtC,CAAC,CAAC;QAEH,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACxB,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC,IAAI,EAAE,CAA4B,CAAC;QACrG,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,gBAAgB,EAAE,EAAE,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC;QAC1C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;QAC7C,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portkey.d.ts","sourceRoot":"","sources":["../../../../src/llm/inference/providers/portkey.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EACV,iBAAiB,EAIlB,MAAM,aAAa,CAAC;AAYrB,eAAO,MAAM,wBAAwB,EAAE,
|
|
1
|
+
{"version":3,"file":"portkey.d.ts","sourceRoot":"","sources":["../../../../src/llm/inference/providers/portkey.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,KAAK,EACV,iBAAiB,EAIlB,MAAM,aAAa,CAAC;AAYrB,eAAO,MAAM,wBAAwB,EAAE,iBAsEtC,CAAC"}
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
import { registerInferenceProvider } from "../registry.js";
|
|
12
12
|
import { resilientFetch } from "../../fetch.js";
|
|
13
13
|
import { LlmAuthError, LlmHttpError, } from "../../errors.js";
|
|
14
|
-
import { _recordInferenceError } from "../index.js";
|
|
14
|
+
import { _recordInferenceError, _recordInferenceUsage } from "../index.js";
|
|
15
15
|
const RETRY_CAP_MS = 5_000;
|
|
16
16
|
export const portkeyInferenceProvider = {
|
|
17
17
|
name: "portkey",
|
|
@@ -62,6 +62,12 @@ export const portkeyInferenceProvider = {
|
|
|
62
62
|
});
|
|
63
63
|
const data = (await resp.json());
|
|
64
64
|
_recordInferenceError(null);
|
|
65
|
+
_recordInferenceUsage({
|
|
66
|
+
input_tokens: data.usage?.prompt_tokens,
|
|
67
|
+
output_tokens: data.usage?.completion_tokens,
|
|
68
|
+
total_tokens: data.usage?.total_tokens,
|
|
69
|
+
request_id: data.id,
|
|
70
|
+
});
|
|
65
71
|
return data.choices?.[0]?.message?.content?.trim() ?? null;
|
|
66
72
|
}
|
|
67
73
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"portkey.js","sourceRoot":"","sources":["../../../../src/llm/inference/providers/portkey.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAQH,OAAO,EAAE,yBAAyB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EACL,YAAY,EACZ,YAAY,GAEb,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"portkey.js","sourceRoot":"","sources":["../../../../src/llm/inference/providers/portkey.ts"],"names":[],"mappings":"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"}
|
|
@@ -45,6 +45,21 @@ export interface ChatCompletionOpts {
|
|
|
45
45
|
temperature?: number;
|
|
46
46
|
max_tokens?: number;
|
|
47
47
|
response_format?: ResponseFormat;
|
|
48
|
+
/** id@version prompt stamp from the prompt registry, used for telemetry. */
|
|
49
|
+
promptName?: string;
|
|
50
|
+
telemetry?: ChatCompletionTelemetryContext;
|
|
51
|
+
}
|
|
52
|
+
export interface ChatCompletionTelemetryContext {
|
|
53
|
+
subsystem?: string;
|
|
54
|
+
session_id?: string;
|
|
55
|
+
workstream_key?: string;
|
|
56
|
+
trigger?: string;
|
|
57
|
+
}
|
|
58
|
+
export interface ChatCompletionUsage {
|
|
59
|
+
input_tokens?: number;
|
|
60
|
+
output_tokens?: number;
|
|
61
|
+
total_tokens?: number;
|
|
62
|
+
request_id?: string;
|
|
48
63
|
}
|
|
49
64
|
export interface InferenceProvider {
|
|
50
65
|
/** Stable identifier used in config (lowercase). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/llm/inference/types.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,MAAM,WAAW,uBAAuB;IACtC,mDAAmD;IACnD,QAAQ,EAAE,MAAM,CAAC;IACjB,+CAA+C;IAC/C,KAAK,EAAE,MAAM,CAAC;IACd,8DAA8D;IAC9D,OAAO,EAAE,MAAM,CAAC;IAChB,wDAAwD;IACxD,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,yEAAyE;IACzE,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,2EAA2E;IAC3E,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAC1C,qFAAqF;IACrF,SAAS,EAAE,MAAM,CAAC;IAClB,4DAA4D;IAC5D,OAAO,EAAE,MAAM,CAAC;IAChB,oEAAoE;IACpE,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,GACvB;IAAE,IAAI,EAAE,aAAa,CAAC;IAAC,WAAW,EAAE,cAAc,CAAA;CAAE,CAAC;AAEzD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/llm/inference/types.ts"],"names":[],"mappings":"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"}
|
package/dist/llm/telemetry.d.ts
CHANGED
|
@@ -11,11 +11,18 @@ export interface LLMTelemetryRecord {
|
|
|
11
11
|
ts: string;
|
|
12
12
|
prompt: string;
|
|
13
13
|
model: string;
|
|
14
|
-
provider:
|
|
14
|
+
provider: string;
|
|
15
|
+
subsystem?: string;
|
|
16
|
+
session_id?: string;
|
|
17
|
+
workstream_key?: string;
|
|
18
|
+
trigger?: string;
|
|
15
19
|
ok: boolean;
|
|
16
20
|
latency_ms: number;
|
|
17
21
|
tokens_in_est: number;
|
|
18
22
|
tokens_out_est: number;
|
|
23
|
+
tokens_in_actual?: number;
|
|
24
|
+
tokens_out_actual?: number;
|
|
25
|
+
tokens_total_actual?: number;
|
|
19
26
|
error?: string;
|
|
20
27
|
request_id?: string;
|
|
21
28
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/llm/telemetry.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAOH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAKxC,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"telemetry.d.ts","sourceRoot":"","sources":["../../src/llm/telemetry.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAOH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAKxC,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,EAAE,EAAE,OAAO,CAAC;IACZ,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAQD,8EAA8E;AAC9E,eAAO,MAAM,cAAc,GAAI,MAAM,MAAM,KAAG,MAAoC,CAAC;AAGnF,wBAAsB,cAAc,CAAC,MAAM,EAAE,kBAAkB,EAAE,GAAG,EAAE,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAkB1F"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/llm/telemetry.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAIzB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;AAC5E,MAAM,iBAAiB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"telemetry.js","sourceRoot":"","sources":["../../src/llm/telemetry.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,QAAQ,IAAI,EAAE,EAAE,MAAM,SAAS,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,MAAM,SAAS,CAAC;AAIzB,MAAM,YAAY,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC;AAC5E,MAAM,iBAAiB,GAAG,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC;AAsB3C,MAAM,OAAO,GAAG,GAAW,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,aAAa,IAAI,YAAY,CAAC;AACxE,MAAM,QAAQ,GAAG,GAAW,EAAE;IAC5B,MAAM,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC;IAC9C,OAAO,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC;AAC7E,CAAC,CAAC;AAEF,8EAA8E;AAC9E,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAY,EAAU,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;AAEnF,IAAI,MAAM,GAAG,KAAK,CAAC;AACnB,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,MAA0B,EAAE,GAAU;IACzE,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IACvB,IAAI,CAAC;QACH,MAAM,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QACxD,IAAI,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC;YACrB,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACjC,IAAI,IAAI,CAAC,IAAI,GAAG,QAAQ,EAAE,EAAE,CAAC;gBAC3B,MAAM,OAAO,GAAG,GAAG,IAAI,IAAI,CAAC;gBAC5B,MAAM,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YACjD,CAAC;QACH,CAAC;QACD,MAAM,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,MAAM,CAAC,CAAC;IACnE,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QACX,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,GAAG,IAAI,CAAC;YACd,GAAG,CAAC,MAAM,EAAE,2BAA4B,CAAW,CAAC,OAAO,EAAE,CAAC,CAAC;QACjE,CAAC;IACH,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/mcp/helpers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAOvF,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAGrE;AAMD,kFAAkF;AAClF,wBAAgB,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,CAGzE;AAED,yFAAyF;AACzF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAEzE;
|
|
1
|
+
{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../src/mcp/helpers.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAGH,OAAO,KAAK,EAAE,WAAW,EAAE,YAAY,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAOvF,wBAAgB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,CAGrE;AAMD,kFAAkF;AAClF,wBAAgB,SAAS,CAAC,YAAY,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,GAAG,MAAM,CAGzE;AAED,yFAAyF;AACzF,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,GAAG,SAAS,CAEzE;AAkBD;;;GAGG;AACH,wBAAgB,0BAA0B,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAevE;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAKlE;AAED,8DAA8D;AAC9D,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,CAEtE;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAO/D;AAED,yEAAyE;AACzE,wBAAgB,OAAO,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAErD;AAMD,eAAO,MAAM,4BAA4B,UAAgB,CAAC;AAE1D,yDAAyD;AACzD,wBAAgB,WAAW,CAAC,MAAM,GAAE,YAAiB,GAAG,YAAY,GAAG,SAAS,CA6F/E;AAMD,+DAA+D;AAC/D,wBAAgB,UAAU,CAAC,KAAK,EAAE,WAAW,GAAG,MAAM,CAgCrD"}
|
package/dist/mcp/helpers.js
CHANGED
|
@@ -28,18 +28,33 @@ export function lastActivityDate(payload) {
|
|
|
28
28
|
// ---------------------------------------------------------------------------
|
|
29
29
|
// Scoring functions (all computed at read time, never mutate stored data)
|
|
30
30
|
// ---------------------------------------------------------------------------
|
|
31
|
+
/**
|
|
32
|
+
* Multiplier on the per-category half-life when a fact carries a volatility
|
|
33
|
+
* label. Transient/ephemeral facts decay much faster than the category default.
|
|
34
|
+
* Stable/evolving (and undefined) leave the half-life unchanged.
|
|
35
|
+
*/
|
|
36
|
+
const VOLATILITY_HALF_LIFE_MULTIPLIER = {
|
|
37
|
+
stable: 1.0,
|
|
38
|
+
evolving: 1.0,
|
|
39
|
+
transient: 0.25,
|
|
40
|
+
ephemeral: 0.1,
|
|
41
|
+
};
|
|
31
42
|
/**
|
|
32
43
|
* Compute effective confidence using exponential decay.
|
|
33
44
|
* Categories with null half-life (session_summary, distilled) don't decay.
|
|
34
45
|
*/
|
|
35
46
|
export function computeEffectiveConfidence(payload) {
|
|
36
|
-
const
|
|
47
|
+
const baseHalfLife = getDecayHalfLife({
|
|
37
48
|
category: payload.category,
|
|
38
49
|
domain: payload.domain,
|
|
39
50
|
kind: payload.kind,
|
|
40
51
|
});
|
|
41
|
-
if (
|
|
52
|
+
if (baseHalfLife === null || baseHalfLife === undefined)
|
|
42
53
|
return payload.confidence;
|
|
54
|
+
const volatilityMultiplier = payload.volatility && VOLATILITY_HALF_LIFE_MULTIPLIER[payload.volatility] !== undefined
|
|
55
|
+
? VOLATILITY_HALF_LIFE_MULTIPLIER[payload.volatility]
|
|
56
|
+
: 1.0;
|
|
57
|
+
const halfLife = baseHalfLife * volatilityMultiplier;
|
|
43
58
|
const days = daysSince(lastActivityDate(payload));
|
|
44
59
|
const decayFactor = Math.pow(0.5, days / halfLife);
|
|
45
60
|
return Math.round(payload.confidence * decayFactor * 100) / 100;
|