@vibes.diy/call-ai-v2 13.1.13 → 13.1.15
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/delta-stream.d.ts +4 -1
- package/delta-stream.js +29 -1
- package/delta-stream.js.map +1 -1
- package/package.json +2 -2
- package/tool-args-forward.test.d.ts +1 -0
- package/tool-args-forward.test.js +105 -0
- package/tool-args-forward.test.js.map +1 -0
package/delta-stream.d.ts
CHANGED
|
@@ -143,4 +143,7 @@ export declare const isDeltaStats: (msg: unknown, streamId?: string) => msg is D
|
|
|
143
143
|
export declare const isDeltaMsg: (msg: unknown, streamId?: string) => msg is DeltaStreamMsg;
|
|
144
144
|
export declare const isDeltaUsage: (msg: unknown, streamId?: string) => msg is DeltaUsageMsg;
|
|
145
145
|
export declare const isDeltaImage: (msg: unknown, streamId?: string) => msg is DeltaImageMsg;
|
|
146
|
-
export declare function
|
|
146
|
+
export declare function isForcedToolChoice(v: unknown): boolean;
|
|
147
|
+
export declare function createDeltaStream(filterStreamId: string, createId: () => string, opts?: {
|
|
148
|
+
readonly forwardForcedToolArgs?: boolean;
|
|
149
|
+
}): TransformStream<SseStreamMsg | DeltaStreamMsg | StatsCollectMsg, DeltaStreamMsg>;
|
package/delta-stream.js
CHANGED
|
@@ -64,7 +64,15 @@ export const isDeltaStats = (msg, streamId) => !(DeltaStatsMsg(msg) instanceof t
|
|
|
64
64
|
export const isDeltaMsg = (msg, streamId) => !(DeltaStreamMsg(msg) instanceof type.errors) && (!streamId || msg.streamId === streamId);
|
|
65
65
|
export const isDeltaUsage = (msg, streamId) => !(DeltaUsageMsg(msg) instanceof type.errors) && (!streamId || msg.streamId === streamId);
|
|
66
66
|
export const isDeltaImage = (msg, streamId) => !(DeltaImageMsg(msg) instanceof type.errors) && (!streamId || msg.streamId === streamId);
|
|
67
|
-
export function
|
|
67
|
+
export function isForcedToolChoice(v) {
|
|
68
|
+
if (typeof v !== "object" || v === null)
|
|
69
|
+
return false;
|
|
70
|
+
if (v.type !== "function")
|
|
71
|
+
return false;
|
|
72
|
+
const fn = v.function;
|
|
73
|
+
return typeof fn?.name === "string" && fn.name.length > 0;
|
|
74
|
+
}
|
|
75
|
+
export function createDeltaStream(filterStreamId, createId, opts) {
|
|
68
76
|
let started = false;
|
|
69
77
|
let deltaSeq = 0;
|
|
70
78
|
let deltaUsages = 0;
|
|
@@ -121,6 +129,26 @@ export function createDeltaStream(filterStreamId, createId) {
|
|
|
121
129
|
timestamp: new Date(),
|
|
122
130
|
});
|
|
123
131
|
}
|
|
132
|
+
if (opts?.forwardForcedToolArgs === true) {
|
|
133
|
+
const toolCalls = choice?.delta?.tool_calls;
|
|
134
|
+
if (Array.isArray(toolCalls)) {
|
|
135
|
+
for (const tc of toolCalls) {
|
|
136
|
+
const args = tc?.function?.arguments;
|
|
137
|
+
if (typeof args === "string" && args.length > 0) {
|
|
138
|
+
totalChars += args.length;
|
|
139
|
+
controller.enqueue({
|
|
140
|
+
type: "delta.line",
|
|
141
|
+
streamId: filterStreamId,
|
|
142
|
+
index: choice.index,
|
|
143
|
+
choiceSeq,
|
|
144
|
+
content: args,
|
|
145
|
+
deltaSeq: deltaSeq++,
|
|
146
|
+
timestamp: new Date(),
|
|
147
|
+
});
|
|
148
|
+
}
|
|
149
|
+
}
|
|
150
|
+
}
|
|
151
|
+
}
|
|
124
152
|
const images = choice?.delta?.images;
|
|
125
153
|
if (Array.isArray(images)) {
|
|
126
154
|
images.forEach((img, imageSeq) => {
|
package/delta-stream.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delta-stream.js","sourceRoot":"","sources":["../jsr/delta-stream.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"delta-stream.js","sourceRoot":"","sources":["../jsr/delta-stream.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vibes.diy/call-ai-v2",
|
|
3
|
-
"version": "13.1.
|
|
3
|
+
"version": "13.1.15",
|
|
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": "^13.1.
|
|
18
|
+
"@vibes.diy/identity": "^13.1.15",
|
|
19
19
|
"arktype": "~2.2.3",
|
|
20
20
|
"cmd-ts": "~0.15.0",
|
|
21
21
|
"mime": "~4.1.0",
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { createDeltaStream, isDeltaLine, isForcedToolChoice } from "./delta-stream.js";
|
|
3
|
+
function sseLine(streamId, delta) {
|
|
4
|
+
return {
|
|
5
|
+
type: "sse.line",
|
|
6
|
+
streamId,
|
|
7
|
+
chunkNr: 0,
|
|
8
|
+
timestamp: new Date(),
|
|
9
|
+
chunk: {
|
|
10
|
+
id: "chatcmpl-tool-args",
|
|
11
|
+
provider: "openai",
|
|
12
|
+
model: "test/model",
|
|
13
|
+
object: "chat.completion.chunk",
|
|
14
|
+
created: 1,
|
|
15
|
+
choices: [
|
|
16
|
+
{
|
|
17
|
+
index: 0,
|
|
18
|
+
delta: { role: "assistant", ...delta },
|
|
19
|
+
finish_reason: null,
|
|
20
|
+
native_finish_reason: null,
|
|
21
|
+
},
|
|
22
|
+
],
|
|
23
|
+
},
|
|
24
|
+
};
|
|
25
|
+
}
|
|
26
|
+
async function collect(msgs, opts) {
|
|
27
|
+
const ts = createDeltaStream("s1", () => "id", opts);
|
|
28
|
+
const out = [];
|
|
29
|
+
const writer = ts.writable.getWriter();
|
|
30
|
+
const readP = (async () => {
|
|
31
|
+
const reader = ts.readable.getReader();
|
|
32
|
+
for (;;) {
|
|
33
|
+
const { done, value } = await reader.read();
|
|
34
|
+
if (done)
|
|
35
|
+
break;
|
|
36
|
+
if (isDeltaLine(value))
|
|
37
|
+
out.push(value);
|
|
38
|
+
}
|
|
39
|
+
})();
|
|
40
|
+
for (const m of msgs)
|
|
41
|
+
await writer.write(m);
|
|
42
|
+
await writer.close();
|
|
43
|
+
await readP;
|
|
44
|
+
return out;
|
|
45
|
+
}
|
|
46
|
+
const toolChunk = (args) => ({
|
|
47
|
+
content: null,
|
|
48
|
+
tool_calls: [{ index: 0, id: "call-1", type: "function", function: { name: "structured_output", arguments: args } }],
|
|
49
|
+
});
|
|
50
|
+
describe("forwardForcedToolArgs", () => {
|
|
51
|
+
it("control: the fixture really is a valid sse.line (plain content forwards with the option off)", async () => {
|
|
52
|
+
const lines = await collect([sseLine("s1", { content: "hello" })]);
|
|
53
|
+
expect(lines.map((l) => l.content)).toEqual(["hello"]);
|
|
54
|
+
});
|
|
55
|
+
it("OFF (default): tool-call argument deltas produce no delta.line", async () => {
|
|
56
|
+
const lines = await collect([sseLine("s1", toolChunk('{"a":'))]);
|
|
57
|
+
expect(lines).toHaveLength(0);
|
|
58
|
+
});
|
|
59
|
+
it("ON: argument fragments stream as delta.line content, in order", async () => {
|
|
60
|
+
const lines = await collect([sseLine("s1", toolChunk('{"a":')), sseLine("s1", toolChunk("1}"))], {
|
|
61
|
+
forwardForcedToolArgs: true,
|
|
62
|
+
});
|
|
63
|
+
expect(lines.map((l) => l.content).join("")).toBe('{"a":1}');
|
|
64
|
+
});
|
|
65
|
+
it("ON: plain content deltas still forward unchanged", async () => {
|
|
66
|
+
const lines = await collect([sseLine("s1", { content: "hello" })], { forwardForcedToolArgs: true });
|
|
67
|
+
expect(lines.map((l) => l.content)).toEqual(["hello"]);
|
|
68
|
+
});
|
|
69
|
+
it("ON: a mixed chunk emits content BEFORE its tool-call args", async () => {
|
|
70
|
+
const lines = await collect([sseLine("s1", { ...toolChunk('{"a":1}'), content: "preamble" })], {
|
|
71
|
+
forwardForcedToolArgs: true,
|
|
72
|
+
});
|
|
73
|
+
expect(lines.map((l) => l.content)).toEqual(["preamble", '{"a":1}']);
|
|
74
|
+
});
|
|
75
|
+
it("ON: two tool_calls entries in one chunk both forward, in array order", async () => {
|
|
76
|
+
const twoCalls = {
|
|
77
|
+
content: null,
|
|
78
|
+
tool_calls: [
|
|
79
|
+
{ index: 0, id: "call-1", type: "function", function: { name: "structured_output", arguments: "first" } },
|
|
80
|
+
{ index: 1, id: "call-2", type: "function", function: { name: "structured_output", arguments: "second" } },
|
|
81
|
+
],
|
|
82
|
+
};
|
|
83
|
+
const lines = await collect([sseLine("s1", twoCalls)], { forwardForcedToolArgs: true });
|
|
84
|
+
expect(lines.map((l) => l.content)).toEqual(["first", "second"]);
|
|
85
|
+
});
|
|
86
|
+
it("ON: an empty-string content beside args emits no phantom line", async () => {
|
|
87
|
+
const lines = await collect([sseLine("s1", { ...toolChunk('{"a":1}'), content: "" })], {
|
|
88
|
+
forwardForcedToolArgs: true,
|
|
89
|
+
});
|
|
90
|
+
expect(lines.map((l) => l.content)).toEqual(['{"a":1}']);
|
|
91
|
+
});
|
|
92
|
+
});
|
|
93
|
+
describe("isForcedToolChoice", () => {
|
|
94
|
+
it("true only for the forced-function object shape", () => {
|
|
95
|
+
expect(isForcedToolChoice({ type: "function", function: { name: "structured_output" } })).toBe(true);
|
|
96
|
+
expect(isForcedToolChoice("auto")).toBe(false);
|
|
97
|
+
expect(isForcedToolChoice(undefined)).toBe(false);
|
|
98
|
+
expect(isForcedToolChoice({ type: "function", function: {} })).toBe(false);
|
|
99
|
+
expect(isForcedToolChoice(null)).toBe(false);
|
|
100
|
+
expect(isForcedToolChoice({ type: "tool", function: { name: "x" } })).toBe(false);
|
|
101
|
+
expect(isForcedToolChoice({ function: { name: "x" } })).toBe(false);
|
|
102
|
+
expect(isForcedToolChoice("required")).toBe(false);
|
|
103
|
+
});
|
|
104
|
+
});
|
|
105
|
+
//# sourceMappingURL=tool-args-forward.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tool-args-forward.test.js","sourceRoot":"","sources":["../jsr/tool-args-forward.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,kBAAkB,EAAqB,MAAM,mBAAmB,CAAC;AAM1G,SAAS,OAAO,CAAC,QAAgB,EAAE,KAA8B;IAC/D,OAAO;QACL,IAAI,EAAE,UAAU;QAChB,QAAQ;QACR,OAAO,EAAE,CAAC;QACV,SAAS,EAAE,IAAI,IAAI,EAAE;QACrB,KAAK,EAAE;YACL,EAAE,EAAE,oBAAoB;YACxB,QAAQ,EAAE,QAAQ;YAClB,KAAK,EAAE,YAAY;YACnB,MAAM,EAAE,uBAAuB;YAC/B,OAAO,EAAE,CAAC;YACV,OAAO,EAAE;gBACP;oBACE,KAAK,EAAE,CAAC;oBACR,KAAK,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,KAAK,EAAE;oBACtC,aAAa,EAAE,IAAI;oBACnB,oBAAoB,EAAE,IAAI;iBAC3B;aACF;SACF;KACyB,CAAC;AAC/B,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,IAAoB,EAAE,IAA0C;IACrF,MAAM,EAAE,GAAG,iBAAiB,CAAC,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACrD,MAAM,GAAG,GAAmB,EAAE,CAAC;IAC/B,MAAM,MAAM,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,CAAC,KAAK,IAAI,EAAE;QACxB,MAAM,MAAM,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,CAAC;QACvC,SAAS,CAAC;YACR,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAC;YAC5C,IAAI,IAAI;gBAAE,MAAM;YAChB,IAAI,WAAW,CAAC,KAAK,CAAC;gBAAE,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1C,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IACL,KAAK,MAAM,CAAC,IAAI,IAAI;QAAE,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAC5C,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACrB,MAAM,KAAK,CAAC;IACZ,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC;IACnC,OAAO,EAAE,IAAI;IACb,UAAU,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,CAAC;CACrH,CAAC,CAAC;AAEH,QAAQ,CAAC,uBAAuB,EAAE,GAAG,EAAE;IACrC,EAAE,CAAC,8FAA8F,EAAE,KAAK,IAAI,EAAE;QAC5G,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QACnE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;QAC9E,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QACjE,MAAM,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IAChC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;QAC7E,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE;YAC/F,qBAAqB,EAAE,IAAI;SAC5B,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC/D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;QAChE,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC;QACpG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;IACzD,CAAC,CAAC,CAAC;IAOH,EAAE,CAAC,2DAA2D,EAAE,KAAK,IAAI,EAAE;QACzE,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE;YAC7F,qBAAqB,EAAE,IAAI;SAC5B,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC,CAAC;IACvE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;QACpF,MAAM,QAAQ,GAAG;YACf,OAAO,EAAE,IAAI;YACb,UAAU,EAAE;gBACV,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE;gBACzG,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,SAAS,EAAE,QAAQ,EAAE,EAAE;aAC3G;SACF,CAAC;QACF,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC,EAAE,EAAE,qBAAqB,EAAE,IAAI,EAAE,CAAC,CAAC;QACxF,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC;IACnE,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;QAC7E,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,SAAS,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE;YACrF,qBAAqB,EAAE,IAAI;SAC5B,CAAC,CAAC;QACH,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAC3D,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,gDAAgD,EAAE,GAAG,EAAE;QACxD,MAAM,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,mBAAmB,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACrG,MAAM,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC/C,MAAM,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAClD,MAAM,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3E,MAAM,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAE7C,MAAM,CAAC,kBAAkB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAIlF,MAAM,CAAC,kBAAkB,CAAC,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAGpE,MAAM,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|