@vibes.diy/call-ai-v2 12.2.7 → 12.2.9
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/package.json +2 -2
- package/sse-stream.d.ts +3 -3
- package/sse-stream.js +1 -1
- package/sse-stream.js.map +1 -1
- package/stats-stream.js +13 -5
- package/stats-stream.js.map +1 -1
- package/stats-stream.test.js +12 -0
- package/stats-stream.test.js.map +1 -1
- package/tool-call-wire.test.js +51 -0
- package/tool-call-wire.test.js.map +1 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vibes.diy/call-ai-v2",
|
|
3
|
-
"version": "12.2.
|
|
3
|
+
"version": "12.2.9",
|
|
4
4
|
"description": "",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "index.js",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"license": "Apache-2.0",
|
|
16
16
|
"dependencies": {
|
|
17
17
|
"@adviser/cement": "~0.5.34",
|
|
18
|
-
"@vibes.diy/identity": "^12.2.
|
|
18
|
+
"@vibes.diy/identity": "^12.2.9",
|
|
19
19
|
"arktype": "~2.2.3",
|
|
20
20
|
"cmd-ts": "~0.15.0",
|
|
21
21
|
"mime": "~4.1.0",
|
package/sse-stream.d.ts
CHANGED
|
@@ -22,7 +22,7 @@ export declare const SseChunk: import("arktype/internal/variants/object.ts").Obj
|
|
|
22
22
|
index: number;
|
|
23
23
|
delta: {
|
|
24
24
|
role?: string | undefined;
|
|
25
|
-
content?: string | undefined;
|
|
25
|
+
content?: string | null | undefined;
|
|
26
26
|
reasoning?: string | null | undefined;
|
|
27
27
|
reasoning_details?: unknown[] | undefined;
|
|
28
28
|
images?: {
|
|
@@ -72,7 +72,7 @@ export declare const SseLineMsg: import("arktype/internal/variants/object.ts").O
|
|
|
72
72
|
index: number;
|
|
73
73
|
delta: {
|
|
74
74
|
role?: string | undefined;
|
|
75
|
-
content?: string | undefined;
|
|
75
|
+
content?: string | null | undefined;
|
|
76
76
|
reasoning?: string | null | undefined;
|
|
77
77
|
reasoning_details?: unknown[] | undefined;
|
|
78
78
|
images?: {
|
|
@@ -152,7 +152,7 @@ export declare const SseStreamMsg: import("arktype/internal/variants/object.ts")
|
|
|
152
152
|
index: number;
|
|
153
153
|
delta: {
|
|
154
154
|
role?: string | undefined;
|
|
155
|
-
content?: string | undefined;
|
|
155
|
+
content?: string | null | undefined;
|
|
156
156
|
reasoning?: string | null | undefined;
|
|
157
157
|
reasoning_details?: unknown[] | undefined;
|
|
158
158
|
images?: {
|
package/sse-stream.js
CHANGED
package/sse-stream.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sse-stream.js","sourceRoot":"","sources":["../jsr/sse-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,WAAW,EAAiB,MAAM,kBAAkB,CAAC;AAClG,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAC;IAC3B,aAAa,EAAE,QAAQ;IACvB,iBAAiB,EAAE,QAAQ;IAC3B,YAAY,EAAE,QAAQ;CACvB,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAC;IAC3B,IAAI,EAAE,QAAQ;IACd,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,IAAI,CAAC;QACd,GAAG,EAAE,QAAQ;KACd,CAAC;CACH,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAC;IAC3B,EAAE,EAAE,QAAQ;IACZ,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,QAAQ;IACf,MAAM,EAAE,QAAQ;IAChB,OAAO,EAAE,QAAQ;IACjB,OAAO,EAAE,IAAI,CAAC;QACZ,KAAK,EAAE,QAAQ;QACf,KAAK,EAAE;YACL,OAAO,EAAE,QAAQ;
|
|
1
|
+
{"version":3,"file":"sse-stream.js","sourceRoot":"","sources":["../jsr/sse-stream.ts"],"names":[],"mappings":"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"}
|
package/stats-stream.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { exception2Result } from "@adviser/cement";
|
|
1
2
|
import { type } from "arktype";
|
|
2
3
|
import { CoercedDate } from "./types.js";
|
|
3
4
|
export const StatsCollectMsg = type({
|
|
@@ -9,24 +10,31 @@ export const isStatsCollect = (msg, streamId) => !(StatsCollectMsg(msg) instance
|
|
|
9
10
|
export function createStatsCollector(streamId, intervalMs = 1000) {
|
|
10
11
|
let intervalId;
|
|
11
12
|
let controller;
|
|
13
|
+
function stopCollecting() {
|
|
14
|
+
if (intervalId !== undefined) {
|
|
15
|
+
clearInterval(intervalId);
|
|
16
|
+
intervalId = undefined;
|
|
17
|
+
}
|
|
18
|
+
}
|
|
12
19
|
return new TransformStream({
|
|
13
20
|
start(ctrl) {
|
|
14
21
|
controller = ctrl;
|
|
15
22
|
intervalId = setInterval(() => {
|
|
16
|
-
controller?.enqueue({
|
|
23
|
+
const injected = exception2Result(() => controller?.enqueue({
|
|
17
24
|
type: "stats.collect",
|
|
18
25
|
streamId,
|
|
19
26
|
timestamp: new Date(),
|
|
20
|
-
});
|
|
27
|
+
}));
|
|
28
|
+
if (injected.isErr()) {
|
|
29
|
+
stopCollecting();
|
|
30
|
+
}
|
|
21
31
|
}, intervalMs);
|
|
22
32
|
},
|
|
23
33
|
transform(chunk, ctrl) {
|
|
24
34
|
ctrl.enqueue(chunk);
|
|
25
35
|
},
|
|
26
36
|
flush() {
|
|
27
|
-
|
|
28
|
-
clearInterval(intervalId);
|
|
29
|
-
}
|
|
37
|
+
stopCollecting();
|
|
30
38
|
controller?.enqueue({
|
|
31
39
|
type: "stats.collect",
|
|
32
40
|
streamId,
|
package/stats-stream.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stats-stream.js","sourceRoot":"","sources":["../jsr/stats-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;IAClC,IAAI,EAAE,iBAAiB;IACvB,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAY,EAAE,QAAiB,EAA0B,EAAE,CACxF,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAK,GAAuB,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;AAKlH,MAAM,UAAU,oBAAoB,CAAI,QAAgB,EAAE,UAAU,GAAG,IAAI;IACzE,IAAI,UAAsD,CAAC;IAC3D,IAAI,UAA6E,CAAC;IAElF,OAAO,IAAI,eAAe,CAAyB;QACjD,KAAK,CAAC,IAAI;YACR,UAAU,GAAG,IAAI,CAAC;YAClB,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"stats-stream.js","sourceRoot":"","sources":["../jsr/stats-stream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAGzC,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,CAAC;IAClC,IAAI,EAAE,iBAAiB;IACvB,QAAQ,EAAE,QAAQ;IAClB,SAAS,EAAE,WAAW;CACvB,CAAC,CAAC;AAIH,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAY,EAAE,QAAiB,EAA0B,EAAE,CACxF,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,QAAQ,IAAK,GAAuB,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC;AAKlH,MAAM,UAAU,oBAAoB,CAAI,QAAgB,EAAE,UAAU,GAAG,IAAI;IACzE,IAAI,UAAsD,CAAC;IAC3D,IAAI,UAA6E,CAAC;IAElF,SAAS,cAAc;QACrB,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;YAC7B,aAAa,CAAC,UAAU,CAAC,CAAC;YAC1B,UAAU,GAAG,SAAS,CAAC;QACzB,CAAC;IACH,CAAC;IAED,OAAO,IAAI,eAAe,CAAyB;QACjD,KAAK,CAAC,IAAI;YACR,UAAU,GAAG,IAAI,CAAC;YAClB,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;gBAM5B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,EAAE,CACrC,UAAU,EAAE,OAAO,CAAC;oBAClB,IAAI,EAAE,eAAe;oBACrB,QAAQ;oBACR,SAAS,EAAE,IAAI,IAAI,EAAE;iBACtB,CAAC,CACH,CAAC;gBACF,IAAI,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC;oBACrB,cAAc,EAAE,CAAC;gBACnB,CAAC;YACH,CAAC,EAAE,UAAU,CAAC,CAAC;QACjB,CAAC;QACD,SAAS,CAAC,KAAK,EAAE,IAAI;YACnB,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;QACD,KAAK;YACH,cAAc,EAAE,CAAC;YAEjB,UAAU,EAAE,OAAO,CAAC;gBAClB,IAAI,EAAE,eAAe;gBACrB,QAAQ;gBACR,SAAS,EAAE,IAAI,IAAI,EAAE;aACtB,CAAC,CAAC;QACL,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
package/stats-stream.test.js
CHANGED
|
@@ -71,6 +71,18 @@ describe("stats-stream", () => {
|
|
|
71
71
|
streamId: "test-stream",
|
|
72
72
|
});
|
|
73
73
|
});
|
|
74
|
+
it("stops the interval when the stream is cancelled instead of leaking it", async () => {
|
|
75
|
+
const collector = createStatsCollector("cancelled-stream", 100);
|
|
76
|
+
const input = new ReadableStream({
|
|
77
|
+
start(controller) {
|
|
78
|
+
controller.enqueue(new Uint8Array([1]));
|
|
79
|
+
},
|
|
80
|
+
});
|
|
81
|
+
const output = input.pipeThrough(collector);
|
|
82
|
+
await output.cancel("caller went away");
|
|
83
|
+
await vi.advanceTimersByTimeAsync(500);
|
|
84
|
+
expect(vi.getTimerCount()).toBe(0);
|
|
85
|
+
});
|
|
74
86
|
it("uses correct streamId in emitted messages", async () => {
|
|
75
87
|
const collector = createStatsCollector("my-unique-id", 10000);
|
|
76
88
|
const input = new ReadableStream({
|
package/stats-stream.test.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"stats-stream.test.js","sourceRoot":"","sources":["../jsr/stats-stream.test.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"stats-stream.test.js","sourceRoot":"","sources":["../jsr/stats-stream.test.ts"],"names":[],"mappings":"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"}
|
package/tool-call-wire.test.js
CHANGED
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { type } from "arktype";
|
|
2
3
|
import { AssistantToolCallMessage, LLMRequest, ToolResultMessage, isLLMRequest } from "./prompt-type.js";
|
|
4
|
+
import { SseChunk } from "./sse-stream.js";
|
|
3
5
|
describe("tool-call wire types", () => {
|
|
4
6
|
it("accepts fragmented OpenAI-compatible delta.tool_calls chunks", () => {
|
|
5
7
|
const first = {
|
|
@@ -73,4 +75,53 @@ describe("tool-call wire types", () => {
|
|
|
73
75
|
})).not.toBeInstanceOf(Error);
|
|
74
76
|
});
|
|
75
77
|
});
|
|
78
|
+
describe("tool-call chunks on the wire (runtime parse)", () => {
|
|
79
|
+
function toolCallChunk(content) {
|
|
80
|
+
return {
|
|
81
|
+
id: "chatcmpl-tool-null",
|
|
82
|
+
provider: "openai",
|
|
83
|
+
model: "test/model",
|
|
84
|
+
object: "chat.completion.chunk",
|
|
85
|
+
created: 1,
|
|
86
|
+
choices: [
|
|
87
|
+
{
|
|
88
|
+
index: 0,
|
|
89
|
+
delta: {
|
|
90
|
+
role: "assistant",
|
|
91
|
+
...(content === undefined ? {} : { content }),
|
|
92
|
+
tool_calls: [{ index: 0, id: "call-1", type: "function", function: { name: "list_files", arguments: "{}" } }],
|
|
93
|
+
},
|
|
94
|
+
finish_reason: null,
|
|
95
|
+
native_finish_reason: null,
|
|
96
|
+
},
|
|
97
|
+
],
|
|
98
|
+
};
|
|
99
|
+
}
|
|
100
|
+
it("accepts a tool-call chunk whose delta.content is null, keeping the tool call", () => {
|
|
101
|
+
const parsed = SseChunk(toolCallChunk(null));
|
|
102
|
+
expect(parsed instanceof type.errors, parsed instanceof type.errors ? parsed.summary : "").toBe(false);
|
|
103
|
+
const chunk = parsed;
|
|
104
|
+
expect(chunk.choices[0].delta.content).toBe(null);
|
|
105
|
+
expect(chunk.choices[0].delta.tool_calls).toEqual([
|
|
106
|
+
{ index: 0, id: "call-1", type: "function", function: { name: "list_files", arguments: "{}" } },
|
|
107
|
+
]);
|
|
108
|
+
});
|
|
109
|
+
it("still accepts the absent-content and string-content spellings", () => {
|
|
110
|
+
for (const content of [undefined, "let me look around"]) {
|
|
111
|
+
const parsed = SseChunk(toolCallChunk(content));
|
|
112
|
+
expect(parsed instanceof type.errors, parsed instanceof type.errors ? parsed.summary : "").toBe(false);
|
|
113
|
+
}
|
|
114
|
+
});
|
|
115
|
+
it("accepts a null-content chunk with no tool calls at all", () => {
|
|
116
|
+
const parsed = SseChunk({
|
|
117
|
+
id: "chatcmpl-1",
|
|
118
|
+
provider: "openai",
|
|
119
|
+
model: "test/model",
|
|
120
|
+
object: "chat.completion.chunk",
|
|
121
|
+
created: 1,
|
|
122
|
+
choices: [{ index: 0, delta: { role: "assistant", content: null }, finish_reason: null, native_finish_reason: null }],
|
|
123
|
+
});
|
|
124
|
+
expect(parsed instanceof type.errors).toBe(false);
|
|
125
|
+
});
|
|
126
|
+
});
|
|
76
127
|
//# sourceMappingURL=tool-call-wire.test.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tool-call-wire.test.js","sourceRoot":"","sources":["../jsr/tool-call-wire.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,wBAAwB,EAAE,UAAU,EAAiB,iBAAiB,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"tool-call-wire.test.js","sourceRoot":"","sources":["../jsr/tool-call-wire.test.ts"],"names":[],"mappings":"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"}
|