mesedi 0.2.0 → 0.6.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +57 -5
- package/dist/_errorClassesGenerated.d.ts +18 -0
- package/dist/_errorClassesGenerated.d.ts.map +1 -0
- package/dist/_errorClassesGenerated.js +24 -0
- package/dist/_errorClassesGenerated.js.map +1 -0
- package/dist/anthropic_integration.d.ts.map +1 -1
- package/dist/anthropic_integration.js +51 -10
- package/dist/anthropic_integration.js.map +1 -1
- package/dist/client.d.ts +26 -6
- package/dist/client.d.ts.map +1 -1
- package/dist/client.js +35 -7
- package/dist/client.js.map +1 -1
- package/dist/cohere_integration.d.ts +42 -0
- package/dist/cohere_integration.d.ts.map +1 -0
- package/dist/cohere_integration.js +456 -0
- package/dist/cohere_integration.js.map +1 -0
- package/dist/compress.d.ts +69 -0
- package/dist/compress.d.ts.map +1 -0
- package/dist/compress.js +75 -0
- package/dist/compress.js.map +1 -0
- package/dist/context.d.ts +11 -2
- package/dist/context.d.ts.map +1 -1
- package/dist/context.js +13 -3
- package/dist/context.js.map +1 -1
- package/dist/errors.d.ts +137 -0
- package/dist/errors.d.ts.map +1 -0
- package/dist/errors.js +462 -0
- package/dist/errors.js.map +1 -0
- package/dist/events.d.ts +13 -0
- package/dist/events.d.ts.map +1 -1
- package/dist/events.js +26 -1
- package/dist/events.js.map +1 -1
- package/dist/gemini_integration.d.ts +33 -0
- package/dist/gemini_integration.d.ts.map +1 -0
- package/dist/gemini_integration.js +334 -0
- package/dist/gemini_integration.js.map +1 -0
- package/dist/halt_stream.d.ts.map +1 -1
- package/dist/halt_stream.js +11 -1
- package/dist/halt_stream.js.map +1 -1
- package/dist/index.d.ts +15 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +9 -1
- package/dist/index.js.map +1 -1
- package/dist/integrations/langgraph.d.ts +99 -0
- package/dist/integrations/langgraph.d.ts.map +1 -0
- package/dist/integrations/langgraph.js +572 -0
- package/dist/integrations/langgraph.js.map +1 -0
- package/dist/integrations/mastra.d.ts +114 -0
- package/dist/integrations/mastra.d.ts.map +1 -0
- package/dist/integrations/mastra.js +354 -0
- package/dist/integrations/mastra.js.map +1 -0
- package/dist/integrations/openai_agents.d.ts +66 -0
- package/dist/integrations/openai_agents.d.ts.map +1 -0
- package/dist/integrations/openai_agents.js +243 -0
- package/dist/integrations/openai_agents.js.map +1 -0
- package/dist/integrations/promptfoo.d.ts +62 -0
- package/dist/integrations/promptfoo.d.ts.map +1 -0
- package/dist/integrations/promptfoo.js +76 -0
- package/dist/integrations/promptfoo.js.map +1 -0
- package/dist/integrations/ragas.d.ts +65 -0
- package/dist/integrations/ragas.d.ts.map +1 -0
- package/dist/integrations/ragas.js +78 -0
- package/dist/integrations/ragas.js.map +1 -0
- package/dist/integrations/vectara.d.ts +60 -0
- package/dist/integrations/vectara.d.ts.map +1 -0
- package/dist/integrations/vectara.js +59 -0
- package/dist/integrations/vectara.js.map +1 -0
- package/dist/observe.d.ts +355 -0
- package/dist/observe.d.ts.map +1 -1
- package/dist/observe.js +532 -0
- package/dist/observe.js.map +1 -1
- package/dist/ollama_integration.d.ts +126 -0
- package/dist/ollama_integration.d.ts.map +1 -0
- package/dist/ollama_integration.js +404 -0
- package/dist/ollama_integration.js.map +1 -0
- package/dist/openai_integration.d.ts +67 -0
- package/dist/openai_integration.d.ts.map +1 -0
- package/dist/openai_integration.js +574 -0
- package/dist/openai_integration.js.map +1 -0
- package/dist/tool.d.ts.map +1 -1
- package/dist/tool.js +189 -6
- package/dist/tool.js.map +1 -1
- package/dist/truncate.d.ts +84 -0
- package/dist/truncate.d.ts.map +1 -0
- package/dist/truncate.js +134 -0
- package/dist/truncate.js.map +1 -0
- package/dist/vertex_gemini_integration.d.ts +27 -0
- package/dist/vertex_gemini_integration.d.ts.map +1 -0
- package/dist/vertex_gemini_integration.js +229 -0
- package/dist/vertex_gemini_integration.js.map +1 -0
- package/dist/wrap.d.ts +36 -0
- package/dist/wrap.d.ts.map +1 -1
- package/dist/wrap.js +5 -2
- package/dist/wrap.js.map +1 -1
- package/package.json +27 -3
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Ollama SDK monkey-patch — auto-emit llm_call events for every
|
|
3
|
+
* `Ollama.chat()` call inside a wrap()'d execution.
|
|
4
|
+
*
|
|
5
|
+
* Mirrors instrumentOpenAI / instrumentAnthropic shape (same
|
|
6
|
+
* fail-open semantics, same payload contract, same idempotency
|
|
7
|
+
* guarantee), with Ollama-shape adjustments:
|
|
8
|
+
*
|
|
9
|
+
* - Token field names: prompt_eval_count / eval_count — translated
|
|
10
|
+
* to canonical input_tokens / output_tokens on payload.
|
|
11
|
+
* - Response text is `response.message.content` (not `choices[0]...`).
|
|
12
|
+
* - No API-key auth; customers point at localhost or a remote
|
|
13
|
+
* Ollama host. No throttling auto-emit in this sub-wave — for a
|
|
14
|
+
* local runtime there is no upstream rate-limit signal worth
|
|
15
|
+
* surfacing.
|
|
16
|
+
*
|
|
17
|
+
* Why a dedicated integration when Ollama exposes an OpenAI-
|
|
18
|
+
* compatible endpoint? Customers who chose Ollama for local
|
|
19
|
+
* inference also chose the native `ollama` npm package for its
|
|
20
|
+
* ergonomics. Forcing them to switch to the openai client just to
|
|
21
|
+
* be observable defeats the point.
|
|
22
|
+
*
|
|
23
|
+
* Patches one surface in this sub-wave:
|
|
24
|
+
* - ollama.Ollama.prototype.chat
|
|
25
|
+
*
|
|
26
|
+
* Out of scope (filed as follow-ups in the Ollama arc):
|
|
27
|
+
* - Streaming (stream: true returns AsyncIterable): observed via
|
|
28
|
+
* wrapStreamingResponse (Wave 2.5.8). Chunks pass through to the
|
|
29
|
+
* customer's `for await` loop unchanged; the llm_call event ships
|
|
30
|
+
* at stream-end with streaming=true in the payload. (The 2.5.1.a
|
|
31
|
+
* maybeWarnStreamingUnsupported helper is kept as dead code with
|
|
32
|
+
* a deprecation note for a future cleanup wave.)
|
|
33
|
+
* - Embeddings (ollama.embed)
|
|
34
|
+
* - Generate API (ollama.generate)
|
|
35
|
+
*
|
|
36
|
+
* Dependency injection: instrumentOllama accepts an optional
|
|
37
|
+
* ollamaClass parameter so this code path is testable without
|
|
38
|
+
* installing the actual `ollama` package.
|
|
39
|
+
*/
|
|
40
|
+
declare function maybeWarnStreamingUnsupported(): void;
|
|
41
|
+
export interface OllamaClassLike {
|
|
42
|
+
prototype: {
|
|
43
|
+
chat: (...args: any[]) => Promise<any>;
|
|
44
|
+
};
|
|
45
|
+
}
|
|
46
|
+
interface OllamaMessage {
|
|
47
|
+
role?: string;
|
|
48
|
+
content?: string | Array<{
|
|
49
|
+
type?: string;
|
|
50
|
+
text?: string;
|
|
51
|
+
}>;
|
|
52
|
+
}
|
|
53
|
+
interface OllamaChatResponse {
|
|
54
|
+
model?: string;
|
|
55
|
+
message?: {
|
|
56
|
+
role?: string;
|
|
57
|
+
content?: string;
|
|
58
|
+
};
|
|
59
|
+
prompt_eval_count?: number;
|
|
60
|
+
eval_count?: number;
|
|
61
|
+
done?: boolean;
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* Patch the Ollama SDK's chat method to emit llm_call events.
|
|
65
|
+
* Returns true if the class was patched (or already patched).
|
|
66
|
+
* Returns false if the class wasn't provided AND the ollama
|
|
67
|
+
* package isn't installed.
|
|
68
|
+
*/
|
|
69
|
+
export declare function instrumentOllama(ollamaClass?: OllamaClassLike): Promise<boolean>;
|
|
70
|
+
declare function extractFirstSystemMessage(messages: OllamaMessage[]): string;
|
|
71
|
+
declare function extractLastUserMessage(messages: OllamaMessage[]): string;
|
|
72
|
+
declare function contentToText(content: string | Array<{
|
|
73
|
+
type?: string;
|
|
74
|
+
text?: string;
|
|
75
|
+
}> | undefined): string;
|
|
76
|
+
declare function extractResponseFields(response: OllamaChatResponse): {
|
|
77
|
+
responseText: string;
|
|
78
|
+
inputTokens: number;
|
|
79
|
+
outputTokens: number;
|
|
80
|
+
};
|
|
81
|
+
declare function numberOrZero(value: unknown): number;
|
|
82
|
+
declare function truncate(s: string, limit: number): string;
|
|
83
|
+
/** One chunk yielded by the ollama client's streaming generator.
|
|
84
|
+
* Partial text on .message.content for non-final chunks; final
|
|
85
|
+
* chunk carries .prompt_eval_count + .eval_count + .done=true. */
|
|
86
|
+
interface OllamaChatChunk {
|
|
87
|
+
model?: string;
|
|
88
|
+
message?: {
|
|
89
|
+
role?: string;
|
|
90
|
+
content?: string;
|
|
91
|
+
};
|
|
92
|
+
done?: boolean;
|
|
93
|
+
prompt_eval_count?: number;
|
|
94
|
+
eval_count?: number;
|
|
95
|
+
}
|
|
96
|
+
/** Apply one streaming chunk to the wrapper's state. Defensive: any
|
|
97
|
+
* extraction failure degrades silently so a single malformed chunk
|
|
98
|
+
* does not break stream-level aggregation. */
|
|
99
|
+
declare function accumulateChunk(chunk: OllamaChatChunk, state: {
|
|
100
|
+
textParts: string[];
|
|
101
|
+
inputTokens: number;
|
|
102
|
+
outputTokens: number;
|
|
103
|
+
}): void;
|
|
104
|
+
export declare const _testing: {
|
|
105
|
+
PROVIDER: string;
|
|
106
|
+
extractFirstSystemMessage: typeof extractFirstSystemMessage;
|
|
107
|
+
extractLastUserMessage: typeof extractLastUserMessage;
|
|
108
|
+
contentToText: typeof contentToText;
|
|
109
|
+
extractResponseFields: typeof extractResponseFields;
|
|
110
|
+
numberOrZero: typeof numberOrZero;
|
|
111
|
+
truncate: typeof truncate;
|
|
112
|
+
/** Resets the one-time streaming-warning flag so tests can assert
|
|
113
|
+
* the warning fires on first stream call after a reset. Not part
|
|
114
|
+
* of the public API. */
|
|
115
|
+
resetStreamingWarningGuard: () => void;
|
|
116
|
+
/** The streaming-warning function itself, exposed so unit tests
|
|
117
|
+
* can verify the once-per-process contract without spinning up a
|
|
118
|
+
* full wrap() + chat() integration scaffold. Not part of the
|
|
119
|
+
* public API. */
|
|
120
|
+
maybeWarnStreamingUnsupported: typeof maybeWarnStreamingUnsupported;
|
|
121
|
+
/** Wave 2.5.8 — exposed for unit tests of the streaming chunk-
|
|
122
|
+
* aggregation logic. Not part of the public API. */
|
|
123
|
+
accumulateChunk: typeof accumulateChunk;
|
|
124
|
+
};
|
|
125
|
+
export {};
|
|
126
|
+
//# sourceMappingURL=ollama_integration.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ollama_integration.d.ts","sourceRoot":"","sources":["../src/ollama_integration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AA4BH,iBAAS,6BAA6B,IAAI,IAAI,CAU7C;AAED,MAAM,WAAW,eAAe;IAE9B,SAAS,EAAE;QAAE,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,CAAC;CACvD;AAID,UAAU,aAAa;IACrB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;CAC5D;AAMD,UAAU,kBAAkB;IAC1B,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9C,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,IAAI,CAAC,EAAE,OAAO,CAAC;CAChB;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CACpC,WAAW,CAAC,EAAE,eAAe,GAC5B,OAAO,CAAC,OAAO,CAAC,CA2BlB;AA+KD,iBAAS,yBAAyB,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,MAAM,CAMpE;AAED,iBAAS,sBAAsB,CAAC,QAAQ,EAAE,aAAa,EAAE,GAAG,MAAM,CAOjE;AAED,iBAAS,aAAa,CACpB,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,SAAS,GACpE,MAAM,CAQR;AAED,iBAAS,qBAAqB,CAAC,QAAQ,EAAE,kBAAkB,GAAG;IAC5D,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAKA;AAED,iBAAS,YAAY,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAO5C;AAED,iBAAS,QAAQ,CAAC,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CAIlD;AAMD;;kEAEkE;AAClE,UAAU,eAAe;IACvB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9C,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAgGD;;8CAE8C;AAC9C,iBAAS,eAAe,CACtB,KAAK,EAAE,eAAe,EACtB,KAAK,EAAE;IAAE,SAAS,EAAE,MAAM,EAAE,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,YAAY,EAAE,MAAM,CAAA;CAAE,GACxE,IAAI,CAaN;AAID,eAAO,MAAM,QAAQ;;;;;;;;IAQnB;;4BAEwB;sCACQ,IAAI;IAGpC;;;qBAGiB;;IAEjB;wDACoD;;CAErD,CAAC"}
|
|
@@ -0,0 +1,404 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Ollama SDK monkey-patch — auto-emit llm_call events for every
|
|
3
|
+
* `Ollama.chat()` call inside a wrap()'d execution.
|
|
4
|
+
*
|
|
5
|
+
* Mirrors instrumentOpenAI / instrumentAnthropic shape (same
|
|
6
|
+
* fail-open semantics, same payload contract, same idempotency
|
|
7
|
+
* guarantee), with Ollama-shape adjustments:
|
|
8
|
+
*
|
|
9
|
+
* - Token field names: prompt_eval_count / eval_count — translated
|
|
10
|
+
* to canonical input_tokens / output_tokens on payload.
|
|
11
|
+
* - Response text is `response.message.content` (not `choices[0]...`).
|
|
12
|
+
* - No API-key auth; customers point at localhost or a remote
|
|
13
|
+
* Ollama host. No throttling auto-emit in this sub-wave — for a
|
|
14
|
+
* local runtime there is no upstream rate-limit signal worth
|
|
15
|
+
* surfacing.
|
|
16
|
+
*
|
|
17
|
+
* Why a dedicated integration when Ollama exposes an OpenAI-
|
|
18
|
+
* compatible endpoint? Customers who chose Ollama for local
|
|
19
|
+
* inference also chose the native `ollama` npm package for its
|
|
20
|
+
* ergonomics. Forcing them to switch to the openai client just to
|
|
21
|
+
* be observable defeats the point.
|
|
22
|
+
*
|
|
23
|
+
* Patches one surface in this sub-wave:
|
|
24
|
+
* - ollama.Ollama.prototype.chat
|
|
25
|
+
*
|
|
26
|
+
* Out of scope (filed as follow-ups in the Ollama arc):
|
|
27
|
+
* - Streaming (stream: true returns AsyncIterable): observed via
|
|
28
|
+
* wrapStreamingResponse (Wave 2.5.8). Chunks pass through to the
|
|
29
|
+
* customer's `for await` loop unchanged; the llm_call event ships
|
|
30
|
+
* at stream-end with streaming=true in the payload. (The 2.5.1.a
|
|
31
|
+
* maybeWarnStreamingUnsupported helper is kept as dead code with
|
|
32
|
+
* a deprecation note for a future cleanup wave.)
|
|
33
|
+
* - Embeddings (ollama.embed)
|
|
34
|
+
* - Generate API (ollama.generate)
|
|
35
|
+
*
|
|
36
|
+
* Dependency injection: instrumentOllama accepts an optional
|
|
37
|
+
* ollamaClass parameter so this code path is testable without
|
|
38
|
+
* installing the actual `ollama` package.
|
|
39
|
+
*/
|
|
40
|
+
import { getClient } from "./client.js";
|
|
41
|
+
import { currentExecutionContext, newEventId } from "./context.js";
|
|
42
|
+
import { classifyOllamaException } from "./errors.js";
|
|
43
|
+
import { EventType, utcNowRfc3339 } from "./events.js";
|
|
44
|
+
const MAX_SYSTEM = 1000;
|
|
45
|
+
const MAX_USER_MSG = 1000;
|
|
46
|
+
const MAX_RESPONSE = 1000;
|
|
47
|
+
const MAX_EXC_MSG = 500;
|
|
48
|
+
/** Stable lowercase provider identifier shipped on every llm_call
|
|
49
|
+
* event. Backend's provider_incident detector clusters cross-tenant
|
|
50
|
+
* signals on (provider, error_class) — though for local runtimes the
|
|
51
|
+
* cross-tenant signal is necessarily quiet. */
|
|
52
|
+
const PROVIDER = "ollama";
|
|
53
|
+
const _patched = new WeakSet();
|
|
54
|
+
/** Wave 2.5.1.a — one-time guard for streaming calls. The
|
|
55
|
+
* chunk-aggregating wrapper for streaming responses ships in a
|
|
56
|
+
* follow-up sub-wave; until then, calls with stream: true emit NO
|
|
57
|
+
* llm_call event AND log a single console.info so customers
|
|
58
|
+
* understand why their streaming calls don't appear in the Mesedi
|
|
59
|
+
* dashboard. */
|
|
60
|
+
let _streamingWarningEmitted = false;
|
|
61
|
+
function maybeWarnStreamingUnsupported() {
|
|
62
|
+
if (_streamingWarningEmitted)
|
|
63
|
+
return;
|
|
64
|
+
_streamingWarningEmitted = true;
|
|
65
|
+
console.info("mesedi: instrumentOllama observed a chat({ stream: true }) call; " +
|
|
66
|
+
"the chunk-aggregating wrapper for streaming responses ships in " +
|
|
67
|
+
"a follow-up sub-wave, so no llm_call event will be recorded for " +
|
|
68
|
+
"streaming calls until then. Non-streaming calls are unaffected. " +
|
|
69
|
+
"Your stream still works; only Mesedi observation is deferred.");
|
|
70
|
+
}
|
|
71
|
+
/**
|
|
72
|
+
* Patch the Ollama SDK's chat method to emit llm_call events.
|
|
73
|
+
* Returns true if the class was patched (or already patched).
|
|
74
|
+
* Returns false if the class wasn't provided AND the ollama
|
|
75
|
+
* package isn't installed.
|
|
76
|
+
*/
|
|
77
|
+
export async function instrumentOllama(ollamaClass) {
|
|
78
|
+
let cls = ollamaClass;
|
|
79
|
+
if (!cls) {
|
|
80
|
+
try {
|
|
81
|
+
// Dynamic import so the mesedi SDK has no hard runtime
|
|
82
|
+
// dependency on `ollama`. The class lives at module.Ollama
|
|
83
|
+
// on the default export.
|
|
84
|
+
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
85
|
+
// @ts-ignore — package may not be installed; this is by design.
|
|
86
|
+
const mod = (await import("ollama"));
|
|
87
|
+
cls = mod?.Ollama ?? mod?.default?.Ollama;
|
|
88
|
+
}
|
|
89
|
+
catch {
|
|
90
|
+
console.warn("mesedi: ollama package not installed; instrumentOllama() is a no-op. " +
|
|
91
|
+
"Install with `npm install ollama` to enable, or pass the Ollama class explicitly.");
|
|
92
|
+
return false;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
if (!cls)
|
|
96
|
+
return false;
|
|
97
|
+
patchChat(cls);
|
|
98
|
+
return true;
|
|
99
|
+
}
|
|
100
|
+
function patchChat(cls) {
|
|
101
|
+
if (_patched.has(cls))
|
|
102
|
+
return;
|
|
103
|
+
const originalChat = cls.prototype.chat;
|
|
104
|
+
cls.prototype.chat = async function patchedChat(...args) {
|
|
105
|
+
const ctx = currentExecutionContext();
|
|
106
|
+
if (!ctx)
|
|
107
|
+
return originalChat.apply(this, args);
|
|
108
|
+
ctx.checkBudget();
|
|
109
|
+
if (ctx.budgetTracker)
|
|
110
|
+
ctx.budgetTracker.incrementSteps();
|
|
111
|
+
const client = getClient();
|
|
112
|
+
const sequence = ctx.nextSequence();
|
|
113
|
+
const eventId = newEventId();
|
|
114
|
+
const firstArg = (args[0] ?? {});
|
|
115
|
+
const model = firstArg.model ?? "unknown";
|
|
116
|
+
const messages = Array.isArray(firstArg.messages) ? firstArg.messages : [];
|
|
117
|
+
const systemText = extractFirstSystemMessage(messages);
|
|
118
|
+
const userMessage = extractLastUserMessage(messages);
|
|
119
|
+
// Wave 2.5.8 — chunk-aggregating wrapper for streaming calls
|
|
120
|
+
// (replaces the 2.5.1.a no-op). When stream:true, response is
|
|
121
|
+
// an AsyncIterable<OllamaChatChunk>; we wrap it so chunks pass
|
|
122
|
+
// through to the customer while accumulating response_text +
|
|
123
|
+
// token counts, then emit the llm_call event at stream-end.
|
|
124
|
+
const isStream = firstArg.stream === true;
|
|
125
|
+
const start = performance.now();
|
|
126
|
+
try {
|
|
127
|
+
const response = await originalChat.apply(this, args);
|
|
128
|
+
if (isStream) {
|
|
129
|
+
return wrapStreamingResponse({
|
|
130
|
+
inner: response,
|
|
131
|
+
client,
|
|
132
|
+
executionId: ctx.executionId,
|
|
133
|
+
eventId,
|
|
134
|
+
sequence,
|
|
135
|
+
model,
|
|
136
|
+
systemText,
|
|
137
|
+
userMessage,
|
|
138
|
+
start,
|
|
139
|
+
budgetTracker: ctx.budgetTracker ?? null,
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
const durationMs = Math.round(performance.now() - start);
|
|
143
|
+
const { responseText, inputTokens, outputTokens } = extractResponseFields(response);
|
|
144
|
+
if (ctx.budgetTracker) {
|
|
145
|
+
ctx.budgetTracker.addTokens(inputTokens, outputTokens);
|
|
146
|
+
}
|
|
147
|
+
client.submitEvent(buildOkEvent({
|
|
148
|
+
eventId,
|
|
149
|
+
executionId: ctx.executionId,
|
|
150
|
+
sequence,
|
|
151
|
+
durationMs,
|
|
152
|
+
model,
|
|
153
|
+
systemText,
|
|
154
|
+
userMessage,
|
|
155
|
+
responseText,
|
|
156
|
+
inputTokens,
|
|
157
|
+
outputTokens,
|
|
158
|
+
}));
|
|
159
|
+
return response;
|
|
160
|
+
}
|
|
161
|
+
catch (err) {
|
|
162
|
+
const durationMs = Math.round(performance.now() - start);
|
|
163
|
+
client.submitEvent(buildFailureEvent({
|
|
164
|
+
eventId,
|
|
165
|
+
executionId: ctx.executionId,
|
|
166
|
+
sequence,
|
|
167
|
+
durationMs,
|
|
168
|
+
model,
|
|
169
|
+
systemText,
|
|
170
|
+
userMessage,
|
|
171
|
+
err,
|
|
172
|
+
}));
|
|
173
|
+
// Wave 2.5.3 — intentional omission of the Wave 1.4
|
|
174
|
+
// _maybeEmitThrottlingEvent auto-emit call. The other four
|
|
175
|
+
// instrumentation modules call it here; instrumentOllama does
|
|
176
|
+
// not because Ollama is a local runtime — no per-minute rate
|
|
177
|
+
// limiting, no quota exhaustion. Wave 2.5.2 shipped a
|
|
178
|
+
// regression-guard test asserting classifyOllamaException
|
|
179
|
+
// NEVER returns RATE_LIMITED or QUOTA_EXHAUSTED, so this call
|
|
180
|
+
// would be guaranteed-dead code. instrument_throttling.test.ts
|
|
181
|
+
// contains a paired negative assertion that fails loudly if a
|
|
182
|
+
// future refactor adds the import without removing the guard.
|
|
183
|
+
throw err;
|
|
184
|
+
}
|
|
185
|
+
};
|
|
186
|
+
_patched.add(cls);
|
|
187
|
+
}
|
|
188
|
+
function buildOkEvent(a) {
|
|
189
|
+
return {
|
|
190
|
+
event_id: a.eventId,
|
|
191
|
+
execution_id: a.executionId,
|
|
192
|
+
event_type: EventType.LLM_CALL,
|
|
193
|
+
sequence: a.sequence,
|
|
194
|
+
timestamp: utcNowRfc3339(),
|
|
195
|
+
duration_ms: a.durationMs,
|
|
196
|
+
payload: {
|
|
197
|
+
provider: PROVIDER,
|
|
198
|
+
surface: "chat",
|
|
199
|
+
model: a.model,
|
|
200
|
+
system_prompt: truncate(a.systemText, MAX_SYSTEM),
|
|
201
|
+
user_message: truncate(a.userMessage, MAX_USER_MSG),
|
|
202
|
+
response_text: truncate(a.responseText, MAX_RESPONSE),
|
|
203
|
+
status: "ok",
|
|
204
|
+
input_tokens: a.inputTokens,
|
|
205
|
+
output_tokens: a.outputTokens,
|
|
206
|
+
},
|
|
207
|
+
};
|
|
208
|
+
}
|
|
209
|
+
function buildFailureEvent(a) {
|
|
210
|
+
const errObj = a.err;
|
|
211
|
+
const payload = {
|
|
212
|
+
provider: PROVIDER,
|
|
213
|
+
surface: "chat",
|
|
214
|
+
model: a.model,
|
|
215
|
+
system_prompt: truncate(a.systemText, MAX_SYSTEM),
|
|
216
|
+
user_message: truncate(a.userMessage, MAX_USER_MSG),
|
|
217
|
+
status: "failed",
|
|
218
|
+
error_class: classifyOllamaException(a.err),
|
|
219
|
+
exception_type: errObj?.name ?? "Error",
|
|
220
|
+
exception_message: truncate(String(errObj?.message ?? a.err), MAX_EXC_MSG),
|
|
221
|
+
};
|
|
222
|
+
if (typeof errObj?.status_code === "number") {
|
|
223
|
+
payload.http_status = errObj.status_code;
|
|
224
|
+
}
|
|
225
|
+
return {
|
|
226
|
+
event_id: a.eventId,
|
|
227
|
+
execution_id: a.executionId,
|
|
228
|
+
event_type: EventType.LLM_CALL,
|
|
229
|
+
sequence: a.sequence,
|
|
230
|
+
timestamp: utcNowRfc3339(),
|
|
231
|
+
duration_ms: a.durationMs,
|
|
232
|
+
payload,
|
|
233
|
+
};
|
|
234
|
+
}
|
|
235
|
+
function extractFirstSystemMessage(messages) {
|
|
236
|
+
for (const msg of messages) {
|
|
237
|
+
if (msg?.role !== "system")
|
|
238
|
+
continue;
|
|
239
|
+
return contentToText(msg.content);
|
|
240
|
+
}
|
|
241
|
+
return "";
|
|
242
|
+
}
|
|
243
|
+
function extractLastUserMessage(messages) {
|
|
244
|
+
for (let i = messages.length - 1; i >= 0; i--) {
|
|
245
|
+
const msg = messages[i];
|
|
246
|
+
if (msg?.role !== "user")
|
|
247
|
+
continue;
|
|
248
|
+
return contentToText(msg.content);
|
|
249
|
+
}
|
|
250
|
+
return "";
|
|
251
|
+
}
|
|
252
|
+
function contentToText(content) {
|
|
253
|
+
if (typeof content === "string")
|
|
254
|
+
return content;
|
|
255
|
+
if (Array.isArray(content)) {
|
|
256
|
+
return content
|
|
257
|
+
.map((b) => (typeof b?.text === "string" ? b.text : ""))
|
|
258
|
+
.join("\n");
|
|
259
|
+
}
|
|
260
|
+
return "";
|
|
261
|
+
}
|
|
262
|
+
function extractResponseFields(response) {
|
|
263
|
+
const responseText = response?.message?.content ?? "";
|
|
264
|
+
const inputTokens = numberOrZero(response?.prompt_eval_count);
|
|
265
|
+
const outputTokens = numberOrZero(response?.eval_count);
|
|
266
|
+
return { responseText, inputTokens, outputTokens };
|
|
267
|
+
}
|
|
268
|
+
function numberOrZero(value) {
|
|
269
|
+
if (typeof value === "number" && Number.isFinite(value))
|
|
270
|
+
return value;
|
|
271
|
+
if (typeof value === "string") {
|
|
272
|
+
const parsed = Number(value);
|
|
273
|
+
return Number.isFinite(parsed) ? parsed : 0;
|
|
274
|
+
}
|
|
275
|
+
return 0;
|
|
276
|
+
}
|
|
277
|
+
function truncate(s, limit) {
|
|
278
|
+
if (!s)
|
|
279
|
+
return "";
|
|
280
|
+
if (s.length <= limit)
|
|
281
|
+
return s;
|
|
282
|
+
return s.slice(0, limit) + "...[truncated]";
|
|
283
|
+
}
|
|
284
|
+
/** Wraps an Ollama AsyncIterable streaming response so chunks pass
|
|
285
|
+
* through to the customer while we accumulate response_text + tokens
|
|
286
|
+
* for the final llm_call event emission. The returned object is an
|
|
287
|
+
* AsyncIterable (Symbol.asyncIterator) the customer can `for await`
|
|
288
|
+
* over identically to the original response. */
|
|
289
|
+
function wrapStreamingResponse(args) {
|
|
290
|
+
const state = { textParts: [], inputTokens: 0, outputTokens: 0 };
|
|
291
|
+
let emitted = false;
|
|
292
|
+
const emitSuccess = () => {
|
|
293
|
+
if (emitted)
|
|
294
|
+
return;
|
|
295
|
+
emitted = true;
|
|
296
|
+
const durationMs = Math.round(performance.now() - args.start);
|
|
297
|
+
const responseText = state.textParts.join("");
|
|
298
|
+
if (args.budgetTracker) {
|
|
299
|
+
args.budgetTracker.addTokens(state.inputTokens, state.outputTokens);
|
|
300
|
+
}
|
|
301
|
+
args.client.submitEvent({
|
|
302
|
+
event_id: args.eventId,
|
|
303
|
+
execution_id: args.executionId,
|
|
304
|
+
event_type: EventType.LLM_CALL,
|
|
305
|
+
sequence: args.sequence,
|
|
306
|
+
timestamp: utcNowRfc3339(),
|
|
307
|
+
duration_ms: durationMs,
|
|
308
|
+
payload: {
|
|
309
|
+
provider: PROVIDER,
|
|
310
|
+
surface: "chat",
|
|
311
|
+
model: args.model,
|
|
312
|
+
system_prompt: truncate(args.systemText, MAX_SYSTEM),
|
|
313
|
+
user_message: truncate(args.userMessage, MAX_USER_MSG),
|
|
314
|
+
response_text: truncate(responseText, MAX_RESPONSE),
|
|
315
|
+
status: "ok",
|
|
316
|
+
input_tokens: state.inputTokens,
|
|
317
|
+
output_tokens: state.outputTokens,
|
|
318
|
+
streaming: true,
|
|
319
|
+
},
|
|
320
|
+
});
|
|
321
|
+
};
|
|
322
|
+
const emitFailure = (err) => {
|
|
323
|
+
if (emitted)
|
|
324
|
+
return;
|
|
325
|
+
emitted = true;
|
|
326
|
+
const durationMs = Math.round(performance.now() - args.start);
|
|
327
|
+
args.client.submitEvent(buildFailureEvent({
|
|
328
|
+
eventId: args.eventId,
|
|
329
|
+
executionId: args.executionId,
|
|
330
|
+
sequence: args.sequence,
|
|
331
|
+
durationMs,
|
|
332
|
+
model: args.model,
|
|
333
|
+
systemText: args.systemText,
|
|
334
|
+
userMessage: args.userMessage,
|
|
335
|
+
err,
|
|
336
|
+
}));
|
|
337
|
+
};
|
|
338
|
+
return {
|
|
339
|
+
[Symbol.asyncIterator]() {
|
|
340
|
+
const inner = args.inner[Symbol.asyncIterator]();
|
|
341
|
+
return {
|
|
342
|
+
async next() {
|
|
343
|
+
try {
|
|
344
|
+
const result = await inner.next();
|
|
345
|
+
if (result.done) {
|
|
346
|
+
emitSuccess();
|
|
347
|
+
return result;
|
|
348
|
+
}
|
|
349
|
+
accumulateChunk(result.value, state);
|
|
350
|
+
return result;
|
|
351
|
+
}
|
|
352
|
+
catch (err) {
|
|
353
|
+
emitFailure(err);
|
|
354
|
+
throw err;
|
|
355
|
+
}
|
|
356
|
+
},
|
|
357
|
+
};
|
|
358
|
+
},
|
|
359
|
+
};
|
|
360
|
+
}
|
|
361
|
+
/** Apply one streaming chunk to the wrapper's state. Defensive: any
|
|
362
|
+
* extraction failure degrades silently so a single malformed chunk
|
|
363
|
+
* does not break stream-level aggregation. */
|
|
364
|
+
function accumulateChunk(chunk, state) {
|
|
365
|
+
try {
|
|
366
|
+
const content = chunk?.message?.content;
|
|
367
|
+
if (typeof content === "string" && content.length > 0) {
|
|
368
|
+
state.textParts.push(content);
|
|
369
|
+
}
|
|
370
|
+
if (chunk?.done) {
|
|
371
|
+
state.inputTokens = numberOrZero(chunk.prompt_eval_count);
|
|
372
|
+
state.outputTokens = numberOrZero(chunk.eval_count);
|
|
373
|
+
}
|
|
374
|
+
}
|
|
375
|
+
catch {
|
|
376
|
+
// Swallow — one bad chunk shouldn't break stream-level aggregation.
|
|
377
|
+
}
|
|
378
|
+
}
|
|
379
|
+
// Exported helpers for unit tests. Not part of the public API; tests
|
|
380
|
+
// import these to verify field translation and message extraction.
|
|
381
|
+
export const _testing = {
|
|
382
|
+
PROVIDER,
|
|
383
|
+
extractFirstSystemMessage,
|
|
384
|
+
extractLastUserMessage,
|
|
385
|
+
contentToText,
|
|
386
|
+
extractResponseFields,
|
|
387
|
+
numberOrZero,
|
|
388
|
+
truncate,
|
|
389
|
+
/** Resets the one-time streaming-warning flag so tests can assert
|
|
390
|
+
* the warning fires on first stream call after a reset. Not part
|
|
391
|
+
* of the public API. */
|
|
392
|
+
resetStreamingWarningGuard: () => {
|
|
393
|
+
_streamingWarningEmitted = false;
|
|
394
|
+
},
|
|
395
|
+
/** The streaming-warning function itself, exposed so unit tests
|
|
396
|
+
* can verify the once-per-process contract without spinning up a
|
|
397
|
+
* full wrap() + chat() integration scaffold. Not part of the
|
|
398
|
+
* public API. */
|
|
399
|
+
maybeWarnStreamingUnsupported,
|
|
400
|
+
/** Wave 2.5.8 — exposed for unit tests of the streaming chunk-
|
|
401
|
+
* aggregation logic. Not part of the public API. */
|
|
402
|
+
accumulateChunk,
|
|
403
|
+
};
|
|
404
|
+
//# sourceMappingURL=ollama_integration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ollama_integration.js","sourceRoot":"","sources":["../src/ollama_integration.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* OpenAI SDK monkey-patch — auto-emit llm_call events for every
|
|
3
|
+
* chat.completions.create() and responses.create() call inside a
|
|
4
|
+
* wrap()'d execution.
|
|
5
|
+
*
|
|
6
|
+
* Mirrors instrumentAnthropic shape (same fail-open semantics, same
|
|
7
|
+
* canonical error vocabulary, same idempotency guarantee), with
|
|
8
|
+
* OpenAI-shape adjustments:
|
|
9
|
+
*
|
|
10
|
+
* - System prompt lives inside `messages` (role: "system"), not
|
|
11
|
+
* a separate `system=` parameter like Anthropic.
|
|
12
|
+
* - Response text is `choices[0].message.content` for chat
|
|
13
|
+
* completions, OR `output_text` for the Responses API.
|
|
14
|
+
* - Token names: `prompt_tokens` / `completion_tokens` for chat,
|
|
15
|
+
* `input_tokens` / `output_tokens` for Responses — both
|
|
16
|
+
* normalized to the canonical input_tokens/output_tokens on
|
|
17
|
+
* payload.
|
|
18
|
+
*
|
|
19
|
+
* Patches two surfaces:
|
|
20
|
+
* - openai.OpenAI.Chat.Completions.prototype.create
|
|
21
|
+
* - openai.OpenAI.Responses.prototype.create (openai>=4.50)
|
|
22
|
+
*
|
|
23
|
+
* Out of scope for v1 (filed as #271 follow-ups):
|
|
24
|
+
* - AsyncOpenAI patching gap shared with instrumentAnthropic
|
|
25
|
+
* - Streaming responses
|
|
26
|
+
* - Embeddings / image generation / audio endpoints
|
|
27
|
+
*
|
|
28
|
+
* Dependency injection: instrumentOpenAI accepts optional
|
|
29
|
+
* completionsClass + responsesClass arguments so this code path
|
|
30
|
+
* is testable without installing the actual openai package.
|
|
31
|
+
*/
|
|
32
|
+
export interface CompletionsClassLike {
|
|
33
|
+
prototype: {
|
|
34
|
+
create: (...args: any[]) => Promise<any>;
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
export interface ResponsesClassLike {
|
|
38
|
+
prototype: {
|
|
39
|
+
create: (...args: any[]) => Promise<any>;
|
|
40
|
+
};
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* Patch the OpenAI SDK's chat.completions.create and
|
|
44
|
+
* responses.create to emit llm_call events. Returns true if at
|
|
45
|
+
* least one surface was patched (or already patched on a prior
|
|
46
|
+
* call). Returns false if neither could be located AND the openai
|
|
47
|
+
* package isn't installed.
|
|
48
|
+
*/
|
|
49
|
+
export declare function instrumentOpenAI(completionsClass?: CompletionsClassLike, responsesClass?: ResponsesClassLike, opts?: {
|
|
50
|
+
embeddingsClass?: EndpointClassLike;
|
|
51
|
+
imagesClass?: EndpointClassLike;
|
|
52
|
+
audioTranscriptionsClass?: EndpointClassLike;
|
|
53
|
+
audioTranslationsClass?: EndpointClassLike;
|
|
54
|
+
audioSpeechClass?: EndpointClassLike;
|
|
55
|
+
}): Promise<boolean>;
|
|
56
|
+
interface EndpointClassLike {
|
|
57
|
+
prototype: {
|
|
58
|
+
create: (...args: any[]) => Promise<any>;
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
export declare const patchEmbeddings: (cls: EndpointClassLike) => void;
|
|
62
|
+
export declare const patchImages: (cls: EndpointClassLike) => void;
|
|
63
|
+
export declare const patchAudioTranscriptions: (cls: EndpointClassLike) => void;
|
|
64
|
+
export declare const patchAudioTranslations: (cls: EndpointClassLike) => void;
|
|
65
|
+
export declare const patchAudioSpeech: (cls: EndpointClassLike) => void;
|
|
66
|
+
export {};
|
|
67
|
+
//# sourceMappingURL=openai_integration.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"openai_integration.d.ts","sourceRoot":"","sources":["../src/openai_integration.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAyBH,MAAM,WAAW,oBAAoB;IAEnC,SAAS,EAAE;QAAE,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,CAAC;CACzD;AACD,MAAM,WAAW,kBAAkB;IAEjC,SAAS,EAAE;QAAE,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,CAAC;CACzD;AA2BD;;;;;;GAMG;AACH,wBAAsB,gBAAgB,CACpC,gBAAgB,CAAC,EAAE,oBAAoB,EACvC,cAAc,CAAC,EAAE,kBAAkB,EACnC,IAAI,CAAC,EAAE;IACL,eAAe,CAAC,EAAE,iBAAiB,CAAC;IACpC,WAAW,CAAC,EAAE,iBAAiB,CAAC;IAChC,wBAAwB,CAAC,EAAE,iBAAiB,CAAC;IAC7C,sBAAsB,CAAC,EAAE,iBAAiB,CAAC;IAC3C,gBAAgB,CAAC,EAAE,iBAAiB,CAAC;CACtC,GACA,OAAO,CAAC,OAAO,CAAC,CAqFlB;AAsUD,UAAU,iBAAiB;IAEzB,SAAS,EAAE;QAAE,MAAM,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAC,CAAA;KAAE,CAAC;CACzD;AAiJD,eAAO,MAAM,eAAe,QAnIlB,iBAAiB,KAAK,IAyI9B,CAAC;AAEH,eAAO,MAAM,WAAW,QA3Id,iBAAiB,KAAK,IAiJ9B,CAAC;AAEH,eAAO,MAAM,wBAAwB,QAnJ3B,iBAAiB,KAAK,IAyJ9B,CAAC;AAEH,eAAO,MAAM,sBAAsB,QA3JzB,iBAAiB,KAAK,IAiK9B,CAAC;AAEH,eAAO,MAAM,gBAAgB,QAnKnB,iBAAiB,KAAK,IAyK9B,CAAC"}
|