@ax-llm/ax 9.0.7 → 9.0.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/build/module/src/ai/anthropic/api.js +63 -22
- package/build/module/src/ai/anthropic/api.js.map +1 -1
- package/build/module/src/ai/anthropic/types.d.ts +25 -6
- package/build/module/src/ai/base.js +41 -21
- package/build/module/src/ai/base.js.map +1 -1
- package/build/module/src/ai/cohere/api.d.ts +1 -1
- package/build/module/src/ai/cohere/api.js +102 -50
- package/build/module/src/ai/cohere/api.js.map +1 -1
- package/build/module/src/ai/cohere/types.d.ts +32 -15
- package/build/module/src/ai/google-gemini/api.js +14 -18
- package/build/module/src/ai/google-gemini/api.js.map +1 -1
- package/build/module/src/ai/huggingface/api.js +25 -1
- package/build/module/src/ai/huggingface/api.js.map +1 -1
- package/build/module/src/ai/openai/api.js +18 -22
- package/build/module/src/ai/openai/api.js.map +1 -1
- package/build/module/src/ai/types.d.ts +1 -2
- package/build/module/src/ai/util.d.ts +3 -4
- package/build/module/src/ai/util.js +1 -53
- package/build/module/src/ai/util.js.map +1 -1
- package/build/module/src/dsp/generate.js +39 -50
- package/build/module/src/dsp/generate.js.map +1 -1
- package/build/module/src/examples/food-search.js +14 -3
- package/build/module/src/examples/food-search.js.map +1 -1
- package/build/module/src/funcs/functions.js +10 -7
- package/build/module/src/funcs/functions.js.map +1 -1
- package/build/module/src/mem/memory.js +5 -2
- package/build/module/src/mem/memory.js.map +1 -1
- package/package.json +3 -2
|
@@ -4,7 +4,7 @@ import { AxFunctionProcessor } from '../funcs/functions.js';
|
|
|
4
4
|
import { AxMemory } from '../mem/index.js';
|
|
5
5
|
import { AxSpanKind } from '../trace/index.js';
|
|
6
6
|
import { assertAssertions, assertRequiredFields, assertStreamingAssertions, AxAssertionError } from './asserts.js';
|
|
7
|
-
import { extractValues,
|
|
7
|
+
import { extractValues, streamingExtractValues, ValidationError } from './extract.js';
|
|
8
8
|
import { AxProgram } from './program.js';
|
|
9
9
|
import { AxPromptTemplate } from './prompt.js';
|
|
10
10
|
import { AxSignature } from './sig.js';
|
|
@@ -141,31 +141,50 @@ export class AxGenerate extends AxProgram {
|
|
|
141
141
|
const functionCalls = [];
|
|
142
142
|
const values = {};
|
|
143
143
|
const xstate = { s: -1 };
|
|
144
|
-
const fstate = { lastId: '' };
|
|
145
144
|
let content = '';
|
|
146
145
|
for await (const v of res) {
|
|
147
|
-
const result
|
|
148
|
-
|
|
149
|
-
|
|
146
|
+
for (const result of v.results ?? []) {
|
|
147
|
+
if (v.modelUsage) {
|
|
148
|
+
this.usage.push({ ...usageInfo, ...v.modelUsage });
|
|
149
|
+
}
|
|
150
|
+
if (result.content) {
|
|
151
|
+
content += result.content;
|
|
152
|
+
mem.updateResult({ name: result.name, content }, sessionId);
|
|
153
|
+
assertStreamingAssertions(this.streamingAsserts, values, xstate, content);
|
|
154
|
+
streamingExtractValues(this.signature, values, xstate, content);
|
|
155
|
+
assertAssertions(this.asserts, values);
|
|
156
|
+
}
|
|
157
|
+
if (result.functionCalls) {
|
|
158
|
+
mergeFunctionCalls(functionCalls, result.functionCalls);
|
|
159
|
+
mem.updateResult({ name: result.name, content, functionCalls }, sessionId);
|
|
160
|
+
}
|
|
161
|
+
if (result.finishReason === 'length') {
|
|
162
|
+
throw new Error('Max tokens reached before completion');
|
|
163
|
+
}
|
|
150
164
|
}
|
|
151
|
-
|
|
152
|
-
|
|
165
|
+
}
|
|
166
|
+
const funcs = parseFunctions(this.ai, functionCalls, values);
|
|
167
|
+
if (funcs) {
|
|
168
|
+
await this.processFunctions(funcs, mem, sessionId, traceId);
|
|
169
|
+
}
|
|
170
|
+
// streamingExtractFinalValue(values, xstate, content);
|
|
171
|
+
// assertAssertions(this.asserts, values);
|
|
172
|
+
return { ...values };
|
|
173
|
+
}
|
|
174
|
+
async processResponse({ res, usageInfo, mem, sessionId, traceId }) {
|
|
175
|
+
const values = {};
|
|
176
|
+
for (const result of res.results ?? []) {
|
|
177
|
+
if (res.modelUsage) {
|
|
178
|
+
this.usage.push({ ...usageInfo, ...res.modelUsage });
|
|
153
179
|
}
|
|
180
|
+
mem.addResult(result, sessionId);
|
|
154
181
|
if (result.content) {
|
|
155
|
-
|
|
156
|
-
mem.updateResult({ name: result.name, content, functionCalls }, sessionId);
|
|
157
|
-
assertStreamingAssertions(this.streamingAsserts, values, xstate, content);
|
|
158
|
-
streamingExtractValues(this.signature, values, xstate, content);
|
|
182
|
+
extractValues(this.signature, values, result.content);
|
|
159
183
|
assertAssertions(this.asserts, values);
|
|
160
184
|
}
|
|
161
185
|
if (result.functionCalls) {
|
|
162
|
-
const
|
|
163
|
-
let funcs;
|
|
164
|
-
if (fc) {
|
|
165
|
-
funcs = parseFunctions(this.ai, [fc], values);
|
|
166
|
-
}
|
|
186
|
+
const funcs = parseFunctions(this.ai, result.functionCalls, values);
|
|
167
187
|
if (funcs) {
|
|
168
|
-
mem.updateResult({ name: result.name, content, functionCalls }, sessionId);
|
|
169
188
|
await this.processFunctions(funcs, mem, sessionId, traceId);
|
|
170
189
|
}
|
|
171
190
|
}
|
|
@@ -173,33 +192,6 @@ export class AxGenerate extends AxProgram {
|
|
|
173
192
|
throw new Error('Max tokens reached before completion');
|
|
174
193
|
}
|
|
175
194
|
}
|
|
176
|
-
streamingExtractFinalValue(values, xstate, content);
|
|
177
|
-
assertAssertions(this.asserts, values);
|
|
178
|
-
return { ...values };
|
|
179
|
-
}
|
|
180
|
-
async processResponse({ res, usageInfo, mem, sessionId, traceId }) {
|
|
181
|
-
const values = {};
|
|
182
|
-
const result = res.results?.at(0);
|
|
183
|
-
if (!result) {
|
|
184
|
-
throw new Error('No result found');
|
|
185
|
-
}
|
|
186
|
-
if (res.modelUsage) {
|
|
187
|
-
this.usage.push({ ...usageInfo, ...res.modelUsage });
|
|
188
|
-
}
|
|
189
|
-
mem.addResult(result, sessionId);
|
|
190
|
-
if (result.content) {
|
|
191
|
-
extractValues(this.signature, values, result.content);
|
|
192
|
-
assertAssertions(this.asserts, values);
|
|
193
|
-
}
|
|
194
|
-
if (result.functionCalls) {
|
|
195
|
-
const funcs = parseFunctions(this.ai, result.functionCalls, values);
|
|
196
|
-
if (funcs) {
|
|
197
|
-
await this.processFunctions(funcs, mem, sessionId, traceId);
|
|
198
|
-
}
|
|
199
|
-
}
|
|
200
|
-
if (result.finishReason === 'length') {
|
|
201
|
-
throw new Error('Max tokens reached before completion');
|
|
202
|
-
}
|
|
203
195
|
return { ...values };
|
|
204
196
|
}
|
|
205
197
|
async _forward(values, options, span) {
|
|
@@ -231,11 +223,8 @@ export class AxGenerate extends AxProgram {
|
|
|
231
223
|
stream,
|
|
232
224
|
maxSteps: options?.maxSteps
|
|
233
225
|
});
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
// return output;
|
|
237
|
-
// }
|
|
238
|
-
if (Object.keys(output).length > 0) {
|
|
226
|
+
const lastMemItem = mem.getLast(sessionId);
|
|
227
|
+
if (lastMemItem?.role !== 'function') {
|
|
239
228
|
assertRequiredFields(this.signature, output);
|
|
240
229
|
return output;
|
|
241
230
|
}
|
|
@@ -302,7 +291,7 @@ export class AxGenerate extends AxProgram {
|
|
|
302
291
|
mem.add([
|
|
303
292
|
{
|
|
304
293
|
role: 'function',
|
|
305
|
-
|
|
294
|
+
result: fres.result ?? '',
|
|
306
295
|
functionId: fres.id
|
|
307
296
|
}
|
|
308
297
|
], sessionId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/dsp/generate.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/dsp/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -92,7 +92,6 @@ const functions = [
|
|
|
92
92
|
units: {
|
|
93
93
|
type: 'string',
|
|
94
94
|
enum: ['imperial', 'metric'],
|
|
95
|
-
default: 'imperial',
|
|
96
95
|
description: 'units to use'
|
|
97
96
|
}
|
|
98
97
|
},
|
|
@@ -112,7 +111,6 @@ const functions = [
|
|
|
112
111
|
},
|
|
113
112
|
outdoor: {
|
|
114
113
|
type: 'boolean',
|
|
115
|
-
default: false,
|
|
116
114
|
description: 'outdoor seating'
|
|
117
115
|
},
|
|
118
116
|
cuisine: { type: 'string', description: 'cuisine type' },
|
|
@@ -128,11 +126,24 @@ const functions = [
|
|
|
128
126
|
];
|
|
129
127
|
const customerQuery = "Give me an ideas for lunch today in San Francisco. I like sushi but I don't want to spend too much or other options are fine as well. Also if its a nice day I'd rather sit outside.";
|
|
130
128
|
const sig = new AxSignature(`customerQuery:string -> restaurant:string, priceRange:string "use $ signs to indicate price range"`);
|
|
129
|
+
// const ai = new AxAI({
|
|
130
|
+
// name: 'cohere',
|
|
131
|
+
// apiKey: process.env.COHERE_APIKEY as string
|
|
132
|
+
// });
|
|
133
|
+
// const ai = new AxAI({
|
|
134
|
+
// name: 'google-gemini',
|
|
135
|
+
// apiKey: process.env.GOOGLE_APIKEY as string
|
|
136
|
+
// });
|
|
131
137
|
const ai = new AxAI({
|
|
132
138
|
name: 'openai',
|
|
133
139
|
apiKey: process.env.OPENAI_APIKEY
|
|
134
140
|
});
|
|
141
|
+
// const ai = new AxAI({
|
|
142
|
+
// name: 'anthropic',
|
|
143
|
+
// apiKey: process.env.ANTHROPIC_APIKEY as string
|
|
144
|
+
// });
|
|
145
|
+
// ai.setOptions({ debug: true });
|
|
135
146
|
const gen = new AxReAct(ai, sig, { functions });
|
|
136
|
-
const res = await gen.forward({ customerQuery }, { stream:
|
|
147
|
+
const res = await gen.forward({ customerQuery }, { stream: false });
|
|
137
148
|
console.log('>', res);
|
|
138
149
|
//# sourceMappingURL=food-search.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"food-search.js","sourceRoot":"","sources":["../../../../src/examples/food-search.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"food-search.js","sourceRoot":"","sources":["../../../../src/examples/food-search.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAmB,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAE1E,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;AAEzC,MAAM,OAAO,GAAG;IACd,WAAW,EAAE,KAAK;IAClB,WAAW,EAAE,WAAW;IACxB,UAAU,EAAE,GAAG;IACf,QAAQ,EAAE,EAAE;CACb,CAAC;AAEF,MAAM,MAAM,GAAG;IACb,WAAW,EAAE,KAAK;IAClB,WAAW,EAAE,QAAQ;IACrB,UAAU,EAAE,IAAI;IAChB,QAAQ,EAAE,EAAE;CACb,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,EAAE,QAAQ,EAAkC,EAAE,EAAE;IAClE,MAAM,IAAI,GAAG;QACX;YACE,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;SACzC;QACD;YACE,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;SACzC;KACF,CAAC;IAEF,OAAO,IAAI;SACR,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,WAAW,EAAE,CAAC;SAChD,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CAAC,EACpB,QAAQ,EAMR,EAAE,EAAE;IACJ,MAAM,IAAI,GAAG;QACX;YACE,IAAI,EAAE,iBAAiB;YACvB,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,QAAQ;YACjB,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,QAAQ;YACrB,eAAe,EAAE,IAAI;SACtB;QACD;YACE,IAAI,EAAE,kBAAkB;YACxB,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,OAAO;YAChB,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,IAAI;YACjB,eAAe,EAAE,IAAI;SACtB;QACD;YACE,IAAI,EAAE,YAAY;YAClB,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,SAAS;YAClB,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,IAAI;YACjB,eAAe,EAAE,IAAI;SACtB;QACD;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,OAAO;YAChB,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,MAAM;YACnB,eAAe,EAAE,IAAI;SACtB;QACD;YACE,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,QAAQ;YACjB,MAAM,EAAE,GAAG;YACX,WAAW,EAAE,KAAK;YAClB,eAAe,EAAE,IAAI;SACtB;KACF,CAAC;IAEF,OAAO,IAAI;SACR,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,EAAE,WAAW,EAAE,CAAC;SACjD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACb,OAAO,CAAC,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC;IACrD,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,wCAAwC;AACxC,MAAM,SAAS,GAAiB;IAC9B;QACE,IAAI,EAAE,mBAAmB;QACzB,WAAW,EAAE,wCAAwC;QACrD,IAAI,EAAE,UAAU;QAChB,UAAU,EAAE;YACV,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,QAAQ,EAAE;oBACR,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,6BAA6B;iBAC3C;gBACD,KAAK,EAAE;oBACL,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC;oBAC5B,WAAW,EAAE,cAAc;iBAC5B;aACF;YACD,QAAQ,EAAE,CAAC,UAAU,CAAC;SACvB;KACF;IACD;QACE,IAAI,EAAE,iBAAiB;QACvB,WAAW,EAAE,gCAAgC;QAC7C,IAAI,EAAE,YAAY;QAClB,UAAU,EAAE;YACV,IAAI,EAAE,QAAQ;YACd,UAAU,EAAE;gBACV,QAAQ,EAAE;oBACR,IAAI,EAAE,QAAQ;oBACd,WAAW,EAAE,iCAAiC;iBAC/C;gBACD,OAAO,EAAE;oBACP,IAAI,EAAE,SAAS;oBACf,WAAW,EAAE,iBAAiB;iBAC/B;gBACD,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE;gBACxD,UAAU,EAAE;oBACV,IAAI,EAAE,QAAQ;oBACd,IAAI,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,CAAC;oBAChC,WAAW,EAAE,aAAa;iBAC3B;aACF;YACD,QAAQ,EAAE,CAAC,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,YAAY,CAAC;SAC3D;KACF;CACF,CAAC;AAEF,MAAM,aAAa,GACjB,sLAAsL,CAAC;AAEzL,MAAM,GAAG,GAAG,IAAI,WAAW,CACzB,qGAAqG,CACtG,CAAC;AAEF,wBAAwB;AACxB,oBAAoB;AACpB,gDAAgD;AAChD,MAAM;AAEN,wBAAwB;AACxB,2BAA2B;AAC3B,gDAAgD;AAChD,MAAM;AAEN,MAAM,EAAE,GAAG,IAAI,IAAI,CAAC;IAClB,IAAI,EAAE,QAAQ;IACd,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,aAAuB;CAC5C,CAAC,CAAC;AAEH,wBAAwB;AACxB,uBAAuB;AACvB,mDAAmD;AACnD,MAAM;AAEN,kCAAkC;AAElC,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,SAAS,EAAE,CAAC,CAAC;AAChD,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,OAAO,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAC;AAEpE,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC"}
|
|
@@ -10,11 +10,14 @@ export class AxFunctionProcessor {
|
|
|
10
10
|
}
|
|
11
11
|
executeFunction = async (fnSpec, func, options) => {
|
|
12
12
|
if (!fnSpec.func) {
|
|
13
|
-
throw new Error(`
|
|
13
|
+
throw new Error(`Function handler for ${fnSpec.name} not implemented`);
|
|
14
14
|
}
|
|
15
|
-
let
|
|
16
|
-
if (func.args && func.args.length > 0) {
|
|
17
|
-
|
|
15
|
+
let args;
|
|
16
|
+
if (typeof func.args === 'string' && func.args.length > 0) {
|
|
17
|
+
args = JSON5.parse(func.args);
|
|
18
|
+
}
|
|
19
|
+
else {
|
|
20
|
+
args = func.args;
|
|
18
21
|
}
|
|
19
22
|
if (!fnSpec.parameters) {
|
|
20
23
|
const res = fnSpec.func.length === 1
|
|
@@ -26,8 +29,8 @@ export class AxFunctionProcessor {
|
|
|
26
29
|
};
|
|
27
30
|
}
|
|
28
31
|
const res = fnSpec.func.length === 2
|
|
29
|
-
? await fnSpec.func(
|
|
30
|
-
: await fnSpec.func(
|
|
32
|
+
? await fnSpec.func(args, options)
|
|
33
|
+
: await fnSpec.func(args);
|
|
31
34
|
return {
|
|
32
35
|
id: func.id,
|
|
33
36
|
name: func.name,
|
|
@@ -38,7 +41,7 @@ export class AxFunctionProcessor {
|
|
|
38
41
|
execute = async (func, options) => {
|
|
39
42
|
const fnSpec = this.funcList.find((v) => v.name.localeCompare(func.name) === 0);
|
|
40
43
|
if (!fnSpec) {
|
|
41
|
-
throw new Error(`
|
|
44
|
+
throw new Error(`Function not found: ` + func.name);
|
|
42
45
|
}
|
|
43
46
|
if (!fnSpec.func) {
|
|
44
47
|
throw new Error('No handler for function: ' + func.name);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functions.js","sourceRoot":"","sources":["../../../../src/funcs/functions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAI1B,OAAO,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAgBrD,MAAM,OAAO,mBAAmB;IACtB,QAAQ,CAAwB;IAExC,YAAY,QAA+B;QACzC,QAAQ;aACL,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC;aAC3B,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,UAAW,CAAC,CAAC,CAAC;QACrD,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEO,eAAe,GAAG,KAAK,EAC7B,MAA4B,EAC5B,IAA0C,EAC1C,OAA4C,EACnB,EAAE;QAC3B,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"functions.js","sourceRoot":"","sources":["../../../../src/funcs/functions.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,11 +24,14 @@ export class AxMemory {
|
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
addResult({ content, name, functionCalls }, sessionId) {
|
|
27
|
+
if (!content && (!functionCalls || functionCalls.length === 0)) {
|
|
28
|
+
return;
|
|
29
|
+
}
|
|
27
30
|
this.add({ content, name, role: 'assistant', functionCalls }, sessionId);
|
|
28
31
|
}
|
|
29
32
|
updateResult({ content, name, functionCalls }, sessionId) {
|
|
30
|
-
const
|
|
31
|
-
const lastItem =
|
|
33
|
+
const items = this.get(sessionId);
|
|
34
|
+
const lastItem = items.at(-1);
|
|
32
35
|
if (!lastItem || lastItem.role !== 'assistant') {
|
|
33
36
|
this.addResult({ content, name, functionCalls }, sessionId);
|
|
34
37
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../../src/mem/memory.ts"],"names":[],"mappings":"AAMA,MAAM,OAAO,QAAQ;IACX,IAAI,GAAgC,EAAE,CAAC;IACvC,KAAK,GAAG,IAAI,GAAG,EAAuC,CAAC;IACvD,KAAK,CAAS;IAEtB,YAAY,KAAK,GAAG,EAAE;QACpB,IAAI,KAAK,IAAI,CAAC,EAAE,CAAC;YACf,MAAM,KAAK,CAAC,wCAAwC,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;IACrB,CAAC;IAED,GAAG,CACD,KAEC,EACD,SAAkB;QAElB,MAAM,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC9B,IAAI,CAAC,GAAG,CAAC,CAAC;QAEV,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QACxC,CAAC;aAAM,CAAC;YACN,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC;gBACT,GAAG,eAAe,CAAC,KAAK,CAAC;aACQ,CAAC,CAAC;QACvC,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;YAC1B,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,GAAG,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC;IACH,CAAC;IAED,SAAS,CACP,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAkC,EAChE,SAAkB;QAElB,IAAI,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,WAAW,EAAE,aAAa,EAAE,EAAE,SAAS,CAAC,CAAC;IAC3E,CAAC;IAED,YAAY,CACV,EAAE,OAAO,EAAE,IAAI,EAAE,aAAa,EAAkC,EAChE,SAAkB;QAElB,MAAM,
|
|
1
|
+
{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../../../src/mem/memory.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ax-llm/ax",
|
|
3
|
-
"version": "9.0.
|
|
3
|
+
"version": "9.0.9",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "The best library to work with LLMs",
|
|
6
6
|
"typings": "build/module/src/index.d.ts",
|
|
@@ -35,7 +35,8 @@
|
|
|
35
35
|
"doc:publish": "gh-pages -m \"[ci skip] Updates\" -d docs",
|
|
36
36
|
"version": "standard-version",
|
|
37
37
|
"prepare": "run-s test",
|
|
38
|
-
"release": "
|
|
38
|
+
"release": "release-it --no-npm",
|
|
39
|
+
"git-cz": "npx git-cz",
|
|
39
40
|
"tsx": "node --env-file=.env --import=tsx"
|
|
40
41
|
},
|
|
41
42
|
"engines": {
|