@agentica/vector-selector 0.38.0 → 0.40.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/lib/extract_query.js +6 -2
- package/lib/extract_query.js.map +1 -1
- package/lib/index.mjs +12 -3
- package/lib/index.mjs.map +1 -1
- package/lib/select.js +6 -2
- package/lib/select.js.map +1 -1
- package/package.json +3 -3
- package/src/extract_query.ts +7 -2
- package/src/select.ts +6 -2
package/lib/extract_query.js
CHANGED
|
@@ -38,8 +38,12 @@ function extractQuery(ctx) {
|
|
|
38
38
|
tool_choice: "required",
|
|
39
39
|
tools: [tools_1.Tools.extract_query],
|
|
40
40
|
});
|
|
41
|
-
const
|
|
42
|
-
|
|
41
|
+
const completion = yield (() => __awaiter(this, void 0, void 0, function* () {
|
|
42
|
+
if (completionStream.type === "none-stream") {
|
|
43
|
+
return completionStream.value;
|
|
44
|
+
}
|
|
45
|
+
return core_1.utils.ChatGptCompletionMessageUtil.merge(yield core_1.utils.StreamUtil.readAll(completionStream.value));
|
|
46
|
+
}))();
|
|
43
47
|
const queries = (_c = (_b = (_a = completion.choices[0]) === null || _a === void 0 ? void 0 : _a.message.tool_calls) === null || _b === void 0 ? void 0 : _b.filter(tc => tc.type === "function").flatMap((v) => {
|
|
44
48
|
const arg = JSON.parse(v.function.arguments);
|
|
45
49
|
if (!Array.isArray(arg.query_list)) {
|
package/lib/extract_query.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract_query.js","sourceRoot":"","sources":["../src/extract_query.ts"],"names":[],"mappings":";;;;;;;;;;;AAOA,
|
|
1
|
+
{"version":3,"file":"extract_query.js","sourceRoot":"","sources":["../src/extract_query.ts"],"names":[],"mappings":";;;;;;;;;;;AAOA,oCA2CC;AA/CD,yCAAgD;AAEhD,mCAAgC;AAEhC,SAAsB,YAAY,CAAC,GAAoB;;;QACrD,MAAM,gBAAgB,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE;YACnD,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE;wBACP,qIAAqI;wBACrI,gFAAgF;wBAChF,wEAAwE;wBACxE,4IAA4I;wBAC5I,kCAAkC;qBACnC,CAAC,IAAI,CAAC,IAAI,CAAC;iBACb;gBACD,GAAG,GAAG,CAAC,SAAS;qBACb,GAAG,CAAC,cAAO,CAAC,aAAa,CAAC;qBAC1B,IAAI,EAAE;gBACT;oBACE,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,cAAO,CAAC,wBAAwB,CAAC;iBACnE;aACF;YACD,WAAW,EAAE,UAAU;YAEvB,KAAK,EAAE,CAAC,aAAK,CAAC,aAAa,CAAC;SAC7B,CAAC,CAAC;QAEH,MAAM,UAAU,GAAG,MAAM,CAAC,GAAS,EAAE;YACnC,IAAI,gBAAgB,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;gBAC5C,OAAO,gBAAgB,CAAC,KAAK,CAAC;YAChC,CAAC;YACD,OAAO,YAAK,CAAC,4BAA4B,CAAC,KAAK,CAAC,MAAM,YAAK,CAAC,UAAU,CAAC,OAAO,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1G,CAAC,CAAA,CAAC,EAAE,CAAC;QAEL,MAAM,OAAO,GAAG,MAAA,MAAA,MAAA,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,0CAAE,OAAO,CAAC,UAAU,0CAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,UAAU,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YAC5G,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAwE,CAAC;YACpH,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE,CAAC;gBACnC,OAAO,EAAE,CAAC;YACZ,CAAC;YAED,OAAO,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC1C,CAAC,CAAC,mCAAI,EAAE,CAAC;QAET,OAAO,OAAO,CAAC;IACjB,CAAC;CAAA"}
|
package/lib/index.mjs
CHANGED
|
@@ -79,8 +79,12 @@ async function extractQuery(ctx) {
|
|
|
79
79
|
tool_choice: "required",
|
|
80
80
|
tools: [ Tools.extract_query ]
|
|
81
81
|
});
|
|
82
|
-
const
|
|
83
|
-
|
|
82
|
+
const completion = await (async () => {
|
|
83
|
+
if (completionStream.type === "none-stream") {
|
|
84
|
+
return completionStream.value;
|
|
85
|
+
}
|
|
86
|
+
return utils.ChatGptCompletionMessageUtil.merge(await utils.StreamUtil.readAll(completionStream.value));
|
|
87
|
+
})();
|
|
84
88
|
const queries = completion.choices[0]?.message.tool_calls?.filter((tc => tc.type === "function")).flatMap((v => {
|
|
85
89
|
const arg = JSON.parse(v.function.arguments);
|
|
86
90
|
if (!Array.isArray(arg.query_list)) {
|
|
@@ -125,7 +129,12 @@ async function selectFunction(props) {
|
|
|
125
129
|
}
|
|
126
130
|
},
|
|
127
131
|
tools: [ Tools.select_functions ]
|
|
128
|
-
}).then((async v =>
|
|
132
|
+
}).then((async v => {
|
|
133
|
+
if (v.type === "none-stream") {
|
|
134
|
+
return v.value;
|
|
135
|
+
}
|
|
136
|
+
return utils.ChatGptCompletionMessageUtil.merge(await utils.StreamUtil.readAll(v.value));
|
|
137
|
+
}));
|
|
129
138
|
const toolCalls = selectCompletion.choices.filter((v => v.message.tool_calls != null));
|
|
130
139
|
if (toolCalls.length === 0) {
|
|
131
140
|
selectCompletion.choices.forEach((v => {
|
package/lib/index.mjs.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.mjs","sources":["../src/tools.ts","../src/extract_query.ts","../src/select.ts","../src/utils.ts","../src/index.ts"],"sourcesContent":[null,null,null,null,null],"names":["Tools","extract_query","type","function","name","description","parameters","properties","query_list","items","reason","query","required","select_functions","function_list","function_name","async","extractQuery","ctx","completionStream","request","messages","role","content","join","histories","map","factory","decodeHistory","flat","prompt","contents","decodeUserMessageContent","tool_choice","tools","
|
|
1
|
+
{"version":3,"file":"index.mjs","sources":["../src/tools.ts","../src/extract_query.ts","../src/select.ts","../src/utils.ts","../src/index.ts"],"sourcesContent":[null,null,null,null,null],"names":["Tools","extract_query","type","function","name","description","parameters","properties","query_list","items","reason","query","required","select_functions","function_list","function_name","async","extractQuery","ctx","completionStream","request","messages","role","content","join","histories","map","factory","decodeHistory","flat","prompt","contents","decodeUserMessageContent","tool_choice","tools","completion","value","utils","ChatGptCompletionMessageUtil","merge","StreamUtil","readAll","queries","choices","message","tool_calls","filter","tc","flatMap","v","arg","JSON","parse","arguments","Array","isArray","selectFunction","props","toolList","prevFailures","restRetry","selectCompletion","AgenticaDefaultPrompt","write","config","id","stringify","tool_call_id","systemPrompt","select","AgenticaSystemPrompt","SELECT","emendMessages","then","toolCalls","length","forEach","event","createAssistantMessageEvent","stream","toAsyncGenerator","done","get","dispatch","catch","failures","reduce","acc","cur","errors","push","path","expected","idx","validation","data","feedback","Error","operation","operations","undefined","selection","createOperationSelection","stack","createSelectEvent","f","uniqBy","array","selector","seen","Set","item","key","has","add","BootAgenticaVectorSelector","isEmbedded","setEmbedded","useEmbeddedContext","searchTool","embedContext","strategy","selectorExecute","Promise","all","res","op","protocol","method","tags","arr","set"],"mappings":"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"}
|
package/lib/select.js
CHANGED
|
@@ -65,8 +65,12 @@ function selectFunction(props) {
|
|
|
65
65
|
// parallel_tool_calls: false,
|
|
66
66
|
tools: [tools_1.Tools.select_functions],
|
|
67
67
|
})
|
|
68
|
-
.then((v) => __awaiter(this, void 0, void 0, function* () {
|
|
69
|
-
|
|
68
|
+
.then((v) => __awaiter(this, void 0, void 0, function* () {
|
|
69
|
+
if (v.type === "none-stream") {
|
|
70
|
+
return v.value;
|
|
71
|
+
}
|
|
72
|
+
return core_1.utils.ChatGptCompletionMessageUtil.merge(yield core_1.utils.StreamUtil.readAll(v.value));
|
|
73
|
+
}));
|
|
70
74
|
const toolCalls = selectCompletion.choices
|
|
71
75
|
.filter(v => v.message.tool_calls != null);
|
|
72
76
|
if (toolCalls.length === 0) {
|
package/lib/select.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"select.js","sourceRoot":"","sources":["../src/select.ts"],"names":[],"mappings":";;;;;;;;;;;AAeA,
|
|
1
|
+
{"version":3,"file":"select.js","sourceRoot":"","sources":["../src/select.ts"],"names":[],"mappings":";;;;;;;;;;;AAeA,wCAoKC;AAjLD,yCAA6F;AAE7F,mCAAgC;AAWhC,SAAsB,cAAc,CAAC,KAKpC;;;QACC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,YAAY,GAAG,EAAE,EAAE,SAAS,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC;QAClE,MAAM,gBAAgB,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE;YACnD,QAAQ,EAAE;gBACR;oBACE,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,4BAAqB,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC;iBACjD;gBACD;oBACE,IAAI,EAAE,WAAW;oBACjB,UAAU,EAAE;wBACV;4BACE,IAAI,EAAE,UAAU;4BAChB,EAAE,EAAE,iBAAiB;4BACrB,QAAQ,EAAE;gCACR,IAAI,EAAE,iBAAiB;gCACvB,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;6BAC9B;yBACF;qBACF;iBACF;gBACD;oBACE,IAAI,EAAE,MAAM;oBACZ,YAAY,EAAE,iBAAiB;oBAC/B,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;iBAClC;gBACD,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,cAAO,CAAC,aAAa,CAAC;gBAC/C;oBACE,IAAI,EAAE,MAAM;oBACZ,OAAO,EAAE,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,cAAO,CAAC,wBAAwB,CAAC;iBACnE;gBACD;oBACE,IAAI,EAAE,QAAQ;oBACd,OAAO,EAAE,GAAG,MAAA,MAAA,MAAA,MAAA,GAAG,CAAC,MAAM,0CAAE,YAAY,0CAAE,MAAM,mDAAG,GAAG,CAAC,SAAS,CAAC,mCAC1D,2BAAoB,CAAC,MAAM;;;;;SAK7B;iBACF;gBACD,GAAG,aAAa,CAAC,YAAY,CAAC;aAC/B;YACD,WAAW,EAAE;gBACX,IAAI,EAAE,UAAU;gBAChB,QAAQ,EAAE;oBACR,IAAI,EAAE,kBAAkB;iBACzB;aACF;YACD,8BAA8B;YAC9B,KAAK,EAAE,CAAC,aAAK,CAAC,gBAAgB,CAAC;SAChC,CAAC;aACC,IAAI,CAAC,CAAO,CAAC,EAAE,EAAE;YAChB,IAAI,CAAC,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;gBAC7B,OAAO,CAAC,CAAC,KAAK,CAAC;YACjB,CAAC;YACD,OAAO,YAAK,CAAC,4BAA4B,CAAC,KAAK,CAAC,MAAM,YAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;QAC3F,CAAC,CAAA,CAAC,CAAC;QAEL,MAAM,SAAS,GAAG,gBAAgB,CAAC,OAAO;aACvC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,UAAU,IAAI,IAAI,CAAC,CAAC;QAE7C,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,gBAAgB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;gBACrC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,IAAI,IAAI,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,KAAK,EAAE,EAAE,CAAC;oBAC1D,MAAM,KAAK,GAAkC,cAAO,CAAC,2BAA2B,CAAC;wBAC/E,MAAM,EAAE,YAAK,CAAC,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;wBACjD,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI;wBAChB,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAiB;wBACtC,IAAI,EAAE,GAAS,EAAE,gDAAC,OAAC,CAAC,CAAC,OAAO,CAAC,OAAkB,CAAA,GAAA;qBAChD,CAAC,CAAC;oBACH,KAAK,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;gBAC3C,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;QAED,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAa,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;;YACzD,MAAA,GAAG,CAAC,OAAO,CAAC,UAAU,0CAAE,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,UAAU,EAAE,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;gBAC1E,MAAM,MAAM,GAAa,EAAE,CAAC;gBAC5B,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAyD,CAAC;gBACtG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;oBACxB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;wBACzB,IAAI,EAAE,QAAQ;wBACd,QAAQ,EAAE,OAAO;wBACjB,KAAK,EAAE,GAAG;qBACX,CAAC,CAAC,CAAC;oBACJ,OAAO;gBACT,CAAC;gBACD,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE;oBACrB,IAAI,CAAC,CAAC,MAAM,IAAI,IAAI,IAAI,OAAO,CAAC,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;wBACrD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;4BACzB,IAAI,EAAE,WAAW,GAAG,UAAU;4BAC9B,QAAQ,EAAE,QAAQ;4BAClB,KAAK,EAAE,CAAC,CAAC,MAAM;yBAChB,CAAC,CAAC,CAAC;oBACN,CAAC;oBAED,IAAI,CAAC,CAAC,aAAa,IAAI,IAAI,IAAI,OAAO,CAAC,CAAC,aAAa,KAAK,QAAQ,EAAE,CAAC;wBACnE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC;4BACzB,IAAI,EAAE,WAAW,GAAG,iBAAiB;4BACrC,QAAQ,EAAE,QAAQ;4BAClB,KAAK,EAAE,CAAC,CAAC,aAAa;yBACvB,CAAC,CAAC,CAAC;oBACN,CAAC;gBACH,CAAC,CAAC,CAAC;gBAEH,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBACxB,GAAG,CAAC,IAAI,CAAC;wBACP,EAAE,EAAE,EAAE,CAAC,EAAE;wBACT,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI;wBACtB,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE;qBACpD,CAAC,CAAC;gBACL,CAAC;YACH,CAAC,CAAC,CAAC;YACH,OAAO,GAAG,CAAC;QACb,CAAC,EAAE,EAAE,CAAC,CAAC;QAEP,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,QAAQ,GAAG,CAAC,GAAG,YAAY,EAAE,GAAG,QAAQ,CAAC,CAAC;YAChD,IAAI,SAAS,KAAK,CAAC,EAAE,CAAC;gBACpB,MAAM,IAAI,KAAK,CAAC,mCAAmC,SAAS,aAAa,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACvG,CAAC;YAED,OAAO,cAAc,CAAC;gBACpB,GAAG;gBACH,QAAQ;gBACR,YAAY,EAAE,QAAQ;gBACtB,SAAS,EAAE,SAAS,GAAG,CAAC;aACzB,CAAC,CAAC;QACL,CAAC;QAED,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACtB,CAAC,CAAC,OAAO,CAAC,UAAW,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE;gBACxE,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAK3C,CAAC;gBACF,GAAG,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;oBAC9B,MAAM,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC;oBAE3D,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;wBAC5B,OAAO;oBACT,CAAC;oBACD,MAAM,SAAS,GACX,cAAO,CAAC,wBAAwB,CAAC;wBACjC,MAAM,EAAE,CAAC,CAAC,MAAM;wBAChB,SAAS;qBACV,CAAC,CAAC;oBACL,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC1B,KAAK,GAAG,CAAC,QAAQ,CACf,cAAO,CAAC,iBAAiB,CAAC;wBACxB,SAAS;qBACV,CAAC,CACH,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;gBACpB,CAAC,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC;CAAA;AAED,SAAS,aAAa,CAAC,QAAoB;IACzC,OAAO,QAAQ;SACZ,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;QACZ;YACE,IAAI,EAAE,WAAW;YACjB,UAAU,EAAE;gBACV;oBACE,IAAI,EAAE,UAAU;oBAChB,EAAE,EAAE,CAAC,CAAC,EAAE;oBACR,QAAQ,EAAE;wBACR,IAAI,EAAE,CAAC,CAAC,IAAI;wBACZ,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;qBAC7C;iBACF;aACF;SACF;QACD;YACE,IAAI,EAAE,MAAM;YACZ,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC;YAC5C,YAAY,EAAE,CAAC,CAAC,EAAE;SACnB;QACD;YACE,IAAI,EAAE,QAAQ;YACd,OAAO,EAAE;gBACP,wDAAwD;gBACxD,EAAE;gBACF,0CAA0C;aAC3C,CAAC,IAAI,CAAC,IAAI,CAAC;SACb;KACF,CAAoD,CAAC;AAC1D,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@agentica/vector-selector",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.40.0",
|
|
4
4
|
"author": "Wrtn Technologies",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"homepage": "https://wrtnlabs.io",
|
|
@@ -47,7 +47,7 @@
|
|
|
47
47
|
"src"
|
|
48
48
|
],
|
|
49
49
|
"peerDependencies": {
|
|
50
|
-
"@agentica/core": "^0.
|
|
50
|
+
"@agentica/core": "^0.40.0"
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
53
|
"@noble/hashes": "^1.8.0",
|
|
@@ -69,7 +69,7 @@
|
|
|
69
69
|
"type-fest": "^4.37.0",
|
|
70
70
|
"typescript": "~5.9.3",
|
|
71
71
|
"vitest": "^3.0.9",
|
|
72
|
-
"@agentica/core": "^0.
|
|
72
|
+
"@agentica/core": "^0.40.0"
|
|
73
73
|
},
|
|
74
74
|
"scripts": {
|
|
75
75
|
"build": "tsc -p ./tsconfig.build.json && rollup -c",
|
package/src/extract_query.ts
CHANGED
|
@@ -31,8 +31,13 @@ export async function extractQuery(ctx: AgenticaContext) {
|
|
|
31
31
|
tools: [Tools.extract_query],
|
|
32
32
|
});
|
|
33
33
|
|
|
34
|
-
const
|
|
35
|
-
|
|
34
|
+
const completion = await (async () => {
|
|
35
|
+
if (completionStream.type === "none-stream") {
|
|
36
|
+
return completionStream.value;
|
|
37
|
+
}
|
|
38
|
+
return utils.ChatGptCompletionMessageUtil.merge(await utils.StreamUtil.readAll(completionStream.value));
|
|
39
|
+
})();
|
|
40
|
+
|
|
36
41
|
const queries = completion.choices[0]?.message.tool_calls?.filter(tc => tc.type === "function").flatMap((v) => {
|
|
37
42
|
const arg = JSON.parse(v.function.arguments) as Partial<FromSchema<typeof Tools.extract_query.function.parameters>>;
|
|
38
43
|
if (!Array.isArray(arg.query_list)) {
|
package/src/select.ts
CHANGED
|
@@ -70,8 +70,12 @@ export async function selectFunction(props: {
|
|
|
70
70
|
// parallel_tool_calls: false,
|
|
71
71
|
tools: [Tools.select_functions],
|
|
72
72
|
})
|
|
73
|
-
.then(async v =>
|
|
74
|
-
|
|
73
|
+
.then(async (v) => {
|
|
74
|
+
if (v.type === "none-stream") {
|
|
75
|
+
return v.value;
|
|
76
|
+
}
|
|
77
|
+
return utils.ChatGptCompletionMessageUtil.merge(await utils.StreamUtil.readAll(v.value));
|
|
78
|
+
});
|
|
75
79
|
|
|
76
80
|
const toolCalls = selectCompletion.choices
|
|
77
81
|
.filter(v => v.message.tool_calls != null);
|