@ax-llm/ax 10.0.16 → 10.0.18
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/ai/google-gemini/api.js +15 -12
- package/ai/google-gemini/api.js.map +1 -1
- package/ai/google-gemini/types.d.ts +10 -8
- package/cjs/ai/google-gemini/api.js +15 -12
- package/cjs/ai/google-gemini/api.js.map +1 -1
- package/cjs/ai/google-gemini/types.d.ts +10 -8
- package/cjs/dsp/extract.js +14 -8
- package/cjs/dsp/extract.js.map +1 -1
- package/cjs/dsp/functions.js +13 -23
- package/cjs/dsp/functions.js.map +1 -1
- package/cjs/dsp/generate.d.ts +0 -2
- package/cjs/dsp/generate.js +13 -47
- package/cjs/dsp/generate.js.map +1 -1
- package/cjs/dsp/program.d.ts +4 -2
- package/cjs/dsp/program.js.map +1 -1
- package/cjs/dsp/prompt.d.ts +4 -3
- package/cjs/dsp/prompt.js +69 -60
- package/cjs/dsp/prompt.js.map +1 -1
- package/cjs/prompts/agent.d.ts +0 -1
- package/cjs/prompts/agent.js +6 -9
- package/cjs/prompts/agent.js.map +1 -1
- package/cjs/prompts/index.d.ts +0 -1
- package/cjs/prompts/index.js +0 -1
- package/cjs/prompts/index.js.map +1 -1
- package/dsp/extract.js +14 -8
- package/dsp/extract.js.map +1 -1
- package/dsp/functions.js +13 -23
- package/dsp/functions.js.map +1 -1
- package/dsp/generate.d.ts +0 -2
- package/dsp/generate.js +13 -46
- package/dsp/generate.js.map +1 -1
- package/dsp/program.d.ts +4 -2
- package/dsp/program.js.map +1 -1
- package/dsp/prompt.d.ts +4 -3
- package/dsp/prompt.js +67 -59
- package/dsp/prompt.js.map +1 -1
- package/package.json +1 -1
- package/prompts/agent.d.ts +0 -1
- package/prompts/agent.js +7 -10
- package/prompts/agent.js.map +1 -1
- package/prompts/index.d.ts +0 -1
- package/prompts/index.js +0 -1
- package/prompts/index.js.map +1 -1
- package/cjs/prompts/react.d.ts +0 -7
- package/cjs/prompts/react.js +0 -30
- package/cjs/prompts/react.js.map +0 -1
- package/prompts/react.d.ts +0 -7
- package/prompts/react.js +0 -26
- package/prompts/react.js.map +0 -1
package/ai/google-gemini/api.js
CHANGED
|
@@ -192,30 +192,33 @@ export class AxAIGoogleGemini extends AxBaseAI {
|
|
|
192
192
|
});
|
|
193
193
|
let tools = [];
|
|
194
194
|
if (req.functions && req.functions.length > 0) {
|
|
195
|
-
tools.push({
|
|
195
|
+
tools.push({ function_declarations: req.functions });
|
|
196
196
|
}
|
|
197
197
|
if (this.options?.codeExecution) {
|
|
198
|
-
tools.push({
|
|
198
|
+
tools.push({ code_execution: {} });
|
|
199
199
|
}
|
|
200
200
|
if (this.options?.googleSearchRetrieval) {
|
|
201
201
|
tools.push({
|
|
202
|
-
|
|
202
|
+
google_search_retrieval: {
|
|
203
|
+
dynamic_retrieval_config: this.options.googleSearchRetrieval
|
|
204
|
+
}
|
|
203
205
|
});
|
|
204
206
|
}
|
|
205
207
|
if (tools.length === 0) {
|
|
206
208
|
tools = undefined;
|
|
207
209
|
}
|
|
208
|
-
|
|
210
|
+
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
211
|
+
let tool_config;
|
|
209
212
|
if (req.functionCall) {
|
|
210
213
|
if (req.functionCall === 'none') {
|
|
211
|
-
|
|
214
|
+
tool_config = { function_calling_config: { mode: 'NONE' } };
|
|
212
215
|
}
|
|
213
216
|
else if (req.functionCall === 'auto') {
|
|
214
|
-
|
|
217
|
+
tool_config = { function_calling_config: { mode: 'AUTO' } };
|
|
215
218
|
}
|
|
216
219
|
else if (req.functionCall === 'required') {
|
|
217
|
-
|
|
218
|
-
|
|
220
|
+
tool_config = {
|
|
221
|
+
function_calling_config: { mode: 'ANY' }
|
|
219
222
|
};
|
|
220
223
|
}
|
|
221
224
|
else {
|
|
@@ -224,14 +227,14 @@ export class AxAIGoogleGemini extends AxBaseAI {
|
|
|
224
227
|
allowedFunctionNames: [req.functionCall.function.name]
|
|
225
228
|
}
|
|
226
229
|
: {};
|
|
227
|
-
|
|
228
|
-
|
|
230
|
+
tool_config = {
|
|
231
|
+
function_calling_config: { mode: 'ANY' },
|
|
229
232
|
...allowedFunctionNames
|
|
230
233
|
};
|
|
231
234
|
}
|
|
232
235
|
}
|
|
233
236
|
else if (tools && tools.length > 0) {
|
|
234
|
-
|
|
237
|
+
tool_config = { function_calling_config: { mode: 'AUTO' } };
|
|
235
238
|
}
|
|
236
239
|
const generationConfig = {
|
|
237
240
|
maxOutputTokens: req.modelConfig?.maxTokens ?? this.config.maxTokens,
|
|
@@ -245,7 +248,7 @@ export class AxAIGoogleGemini extends AxBaseAI {
|
|
|
245
248
|
const reqValue = {
|
|
246
249
|
contents,
|
|
247
250
|
tools,
|
|
248
|
-
|
|
251
|
+
tool_config,
|
|
249
252
|
systemInstruction,
|
|
250
253
|
generationConfig,
|
|
251
254
|
safetySettings
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../ai/google-gemini/api.ts"],"names":[],"mappings":"AACA,OAAO,EACL,QAAQ,EACR,qBAAqB,EACrB,6BAA6B,EAC9B,MAAM,YAAY,CAAC;AAYpB,OAAO,EAAE,uBAAuB,EAAE,MAAM,WAAW,CAAC;AACpD,OAAO,EAOL,0BAA0B,EAC1B,qBAAqB,EACrB,8BAA8B,EAE9B,+BAA+B,EAChC,MAAM,YAAY,CAAC;AAEpB,MAAM,cAAc,GAAmC;IACrD;QACE,QAAQ,EAAE,8BAA8B,CAAC,sBAAsB;QAC/D,SAAS,EAAE,+BAA+B,CAAC,SAAS;KACrD;IACD;QACE,QAAQ,EAAE,8BAA8B,CAAC,sBAAsB;QAC/D,SAAS,EAAE,+BAA+B,CAAC,SAAS;KACrD;IACD;QACE,QAAQ,EAAE,8BAA8B,CAAC,4BAA4B;QACrE,SAAS,EAAE,+BAA+B,CAAC,SAAS;KACrD;IACD;QACE,QAAQ,EAAE,8BAA8B,CAAC,4BAA4B;QACrE,SAAS,EAAE,+BAA+B,CAAC,SAAS;KACrD;CACF,CAAC;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,6BAA6B,GAAG,GAA2B,EAAE,CACxE,eAAe,CAAC;IACd,KAAK,EAAE,qBAAqB,CAAC,WAAW;IACxC,UAAU,EAAE,0BAA0B,CAAC,gBAAgB;IACvD,cAAc;IACd,GAAG,qBAAqB,EAAE;CAC3B,CAAC,CAAC;AAEL,MAAM,CAAC,MAAM,qCAAqC,GAChD,GAA2B,EAAE,CAC3B,eAAe,CAAC;IACd,KAAK,EAAE,qBAAqB,CAAC,aAAa;IAC1C,UAAU,EAAE,0BAA0B,CAAC,gBAAgB;IACvD,cAAc;IACd,GAAG,6BAA6B,EAAE;CACnC,CAAC,CAAC;AAuBP;;;GAGG;AACH,MAAM,OAAO,gBAAiB,SAAQ,QAMrC;IACS,OAAO,CAAmC;IAC1C,MAAM,CAAyB;IAC/B,MAAM,CAAS;IACf,QAAQ,CAAU;IAE1B,YAAY,EACV,MAAM,EACN,SAAS,EACT,MAAM,EACN,MAAM,EACN,OAAO,EACP,QAAQ,EACqC;QAC7C,IAAI,CAAC,MAAM,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;QACrD,CAAC;QAED,MAAM,QAAQ,GAAG,SAAS,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS,CAAC;QAEjE,IAAI,MAAM,CAAC;QACX,IAAI,OAAO,CAAC;QAEZ,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,GAAG,WAAW,MAAM,0CAA0C,SAAS,cAAc,MAAM,qBAAqB,CAAC;YACvH,OAAO,GAAG,EAAE,aAAa,EAAE,UAAU,MAAM,EAAE,EAAE,CAAC;QAClD,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,kDAAkD,CAAC;YAC5D,OAAO,GAAG,EAAE,CAAC;QACf,CAAC;QAED,MAAM,OAAO,GAAG;YACd,GAAG,6BAA6B,EAAE;YAClC,GAAG,MAAM;SACV,CAAC;QAEF,KAAK,CAAC;YACJ,IAAI,EAAE,gBAAgB;YACtB,MAAM;YACN,OAAO;YACP,SAAS,EAAE,uBAAuB;YAClC,MAAM,EAAE;gBACN,KAAK,EAAE,OAAO,CAAC,KAA8B;gBAC7C,UAAU,EAAE,OAAO,CAAC,UAAwC;aAC7D;YACD,OAAO;YACP,UAAU,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE;YAChD,QAAQ;SACT,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC;QACtB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEQ,cAAc;QACrB,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;QACxB,OAAO;YACL,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,IAAI,EAAE,MAAM,CAAC,IAAI;YACjB,IAAI,EAAE,MAAM,CAAC,IAAI;SACD,CAAC;IACrB,CAAC;IAEQ,eAAe,GAAG,CACzB,GAAoC,EACA,EAAE;QACtC,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;QACxB,MAAM,MAAM,GAAG,GAAG,CAAC,WAAW,EAAE,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAE7D,IAAI,CAAC,GAAG,CAAC,UAAU,IAAI,GAAG,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnD,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,SAAS,GAAG;YAChB,IAAI,EAAE,MAAM;gBACV,CAAC,CAAC,WAAW,KAAK,gCAAgC;gBAClD,CAAC,CAAC,WAAW,KAAK,kBAAkB;SACvC,CAAC;QAEF,IAAI,IAAI,CAAC,QAAQ,KAAK,KAAK,EAAE,CAAC;YAC5B,MAAM,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;YAC9B,SAAS,CAAC,IAAI,IAAI,GAAG,EAAE,OAAO,IAAI,CAAC,MAAM,EAAE,CAAC;QAC9C,CAAC;QAED,MAAM,aAAa,GAAG,GAAG,CAAC,UAAU;aACjC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC;aAClC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;QAEzB,MAAM,iBAAiB,GACrB,aAAa,CAAC,MAAM,GAAG,CAAC;YACtB,CAAC,CAAC;gBACE,IAAI,EAAE,MAAe;gBACrB,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;aAC3C;YACH,CAAC,CAAC,SAAS,CAAC;QAEhB,MAAM,QAAQ,GAA4C,GAAG,CAAC,UAAU;aACrE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC;aAClC,GAAG,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE;YACd,QAAQ,GAAG,CAAC,IAAI,EAAE,CAAC;gBACjB,KAAK,MAAM,CAAC,CAAC,CAAC;oBACZ,MAAM,KAAK,GAGE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;wBACrC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;4BACvB,QAAQ,CAAC,CAAC,IAAI,EAAE,CAAC;gCACf,KAAK,MAAM;oCACT,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;gCAC1B,KAAK,OAAO;oCACV,OAAO;wCACL,UAAU,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,EAAE;qCACpD,CAAC;gCACJ;oCACE,MAAM,IAAI,KAAK,CACb,kDAAkD,CAAC,GAAG,CACvD,CAAC;4BACN,CAAC;wBACH,CAAC,CAAC;wBACJ,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;oBAC5B,OAAO;wBACL,IAAI,EAAE,MAAe;wBACrB,KAAK;qBACN,CAAC;gBACJ,CAAC;gBAED,KAAK,WAAW,CAAC,CAAC,CAAC;oBACjB,IAAI,KAAK,GAGI,EAAE,CAAC;oBAEhB,IAAI,GAAG,CAAC,aAAa,EAAE,CAAC;wBACtB,KAAK,GAAG,GAAG,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;4BAClC,MAAM,IAAI,GACR,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,KAAK,QAAQ;gCACnC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;gCAC/B,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC;4BACxB,OAAO;gCACL,YAAY,EAAE;oCACZ,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,IAAI;oCACrB,IAAI,EAAE,IAAI;iCACX;6BACF,CAAC;wBACJ,CAAC,CAAC,CAAC;wBAEH,IAAI,CAAC,KAAK,EAAE,CAAC;4BACX,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;wBAC5C,CAAC;wBAED,OAAO;4BACL,IAAI,EAAE,OAAgB;4BACtB,KAAK;yBACN,CAAC;oBACJ,CAAC;oBAED,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;wBACjB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;oBAChD,CAAC;oBAED,KAAK,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;oBAChC,OAAO;wBACL,IAAI,EAAE,OAAgB;wBACtB,KAAK;qBACN,CAAC;gBACJ,CAAC;gBAED,KAAK,UAAU,CAAC,CAAC,CAAC;oBAChB,IAAI,CAAC,CAAC,YAAY,IAAI,GAAG,CAAC,EAAE,CAAC;wBAC3B,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,GAAG,CAAC,CAAC;oBACnE,CAAC;oBACD,MAAM,KAAK,GAGE;wBACX;4BACE,gBAAgB,EAAE;gCAChB,IAAI,EAAE,GAAG,CAAC,UAAU;gCACpB,QAAQ,EAAE,EAAE,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE;6BACjC;yBACF;qBACF,CAAC;oBAEF,OAAO;wBACL,IAAI,EAAE,UAAmB;wBACzB,KAAK;qBACN,CAAC;gBACJ,CAAC;gBAED;oBACE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;YACpC,CAAC;QACH,CAAC,CAAC,CAAC;QAEL,IAAI,KAAK,GAAqD,EAAE,CAAC;QAEjE,IAAI,GAAG,CAAC,SAAS,IAAI,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9C,KAAK,CAAC,IAAI,CAAC,EAAE,
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../ai/google-gemini/api.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,18 +63,20 @@ export type AxAIGoogleGeminiToolFunctionDeclaration = {
|
|
|
63
63
|
parameters?: object;
|
|
64
64
|
};
|
|
65
65
|
export type AxAIGoogleGeminiToolGoogleSearchRetrieval = {
|
|
66
|
-
|
|
67
|
-
|
|
66
|
+
dynamic_retrieval_config: {
|
|
67
|
+
mode?: 'MODE_DYNAMIC';
|
|
68
|
+
dynamic_threshold?: number;
|
|
69
|
+
};
|
|
68
70
|
};
|
|
69
71
|
export type AxAIGoogleGeminiTool = {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
72
|
+
function_declarations?: AxAIGoogleGeminiToolFunctionDeclaration[];
|
|
73
|
+
code_execution?: object;
|
|
74
|
+
google_search_retrieval?: AxAIGoogleGeminiToolGoogleSearchRetrieval;
|
|
73
75
|
};
|
|
74
76
|
export type AxAIGoogleGeminiToolConfig = {
|
|
75
|
-
|
|
77
|
+
function_calling_config: {
|
|
76
78
|
mode: 'ANY' | 'NONE' | 'AUTO';
|
|
77
|
-
|
|
79
|
+
allowed_function_names?: string[];
|
|
78
80
|
};
|
|
79
81
|
};
|
|
80
82
|
export type AxAIGoogleGeminiGenerationConfig = {
|
|
@@ -92,7 +94,7 @@ export type AxAIGoogleGeminiSafetySettings = {
|
|
|
92
94
|
export type AxAIGoogleGeminiChatRequest = {
|
|
93
95
|
contents: AxAIGoogleGeminiContent[];
|
|
94
96
|
tools?: AxAIGoogleGeminiTool[];
|
|
95
|
-
|
|
97
|
+
tool_config?: AxAIGoogleGeminiToolConfig;
|
|
96
98
|
systemInstruction?: AxAIGoogleGeminiContent;
|
|
97
99
|
generationConfig: AxAIGoogleGeminiGenerationConfig;
|
|
98
100
|
safetySettings?: AxAIGoogleGeminiSafetySettings;
|
|
@@ -197,30 +197,33 @@ class AxAIGoogleGemini extends base_js_1.AxBaseAI {
|
|
|
197
197
|
});
|
|
198
198
|
let tools = [];
|
|
199
199
|
if (req.functions && req.functions.length > 0) {
|
|
200
|
-
tools.push({
|
|
200
|
+
tools.push({ function_declarations: req.functions });
|
|
201
201
|
}
|
|
202
202
|
if (this.options?.codeExecution) {
|
|
203
|
-
tools.push({
|
|
203
|
+
tools.push({ code_execution: {} });
|
|
204
204
|
}
|
|
205
205
|
if (this.options?.googleSearchRetrieval) {
|
|
206
206
|
tools.push({
|
|
207
|
-
|
|
207
|
+
google_search_retrieval: {
|
|
208
|
+
dynamic_retrieval_config: this.options.googleSearchRetrieval
|
|
209
|
+
}
|
|
208
210
|
});
|
|
209
211
|
}
|
|
210
212
|
if (tools.length === 0) {
|
|
211
213
|
tools = undefined;
|
|
212
214
|
}
|
|
213
|
-
|
|
215
|
+
// eslint-disable-next-line @typescript-eslint/naming-convention
|
|
216
|
+
let tool_config;
|
|
214
217
|
if (req.functionCall) {
|
|
215
218
|
if (req.functionCall === 'none') {
|
|
216
|
-
|
|
219
|
+
tool_config = { function_calling_config: { mode: 'NONE' } };
|
|
217
220
|
}
|
|
218
221
|
else if (req.functionCall === 'auto') {
|
|
219
|
-
|
|
222
|
+
tool_config = { function_calling_config: { mode: 'AUTO' } };
|
|
220
223
|
}
|
|
221
224
|
else if (req.functionCall === 'required') {
|
|
222
|
-
|
|
223
|
-
|
|
225
|
+
tool_config = {
|
|
226
|
+
function_calling_config: { mode: 'ANY' }
|
|
224
227
|
};
|
|
225
228
|
}
|
|
226
229
|
else {
|
|
@@ -229,14 +232,14 @@ class AxAIGoogleGemini extends base_js_1.AxBaseAI {
|
|
|
229
232
|
allowedFunctionNames: [req.functionCall.function.name]
|
|
230
233
|
}
|
|
231
234
|
: {};
|
|
232
|
-
|
|
233
|
-
|
|
235
|
+
tool_config = {
|
|
236
|
+
function_calling_config: { mode: 'ANY' },
|
|
234
237
|
...allowedFunctionNames
|
|
235
238
|
};
|
|
236
239
|
}
|
|
237
240
|
}
|
|
238
241
|
else if (tools && tools.length > 0) {
|
|
239
|
-
|
|
242
|
+
tool_config = { function_calling_config: { mode: 'AUTO' } };
|
|
240
243
|
}
|
|
241
244
|
const generationConfig = {
|
|
242
245
|
maxOutputTokens: req.modelConfig?.maxTokens ?? this.config.maxTokens,
|
|
@@ -250,7 +253,7 @@ class AxAIGoogleGemini extends base_js_1.AxBaseAI {
|
|
|
250
253
|
const reqValue = {
|
|
251
254
|
contents,
|
|
252
255
|
tools,
|
|
253
|
-
|
|
256
|
+
tool_config,
|
|
254
257
|
systemInstruction,
|
|
255
258
|
generationConfig,
|
|
256
259
|
safetySettings
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../ai/google-gemini/api.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../../ai/google-gemini/api.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,18 +63,20 @@ export type AxAIGoogleGeminiToolFunctionDeclaration = {
|
|
|
63
63
|
parameters?: object;
|
|
64
64
|
};
|
|
65
65
|
export type AxAIGoogleGeminiToolGoogleSearchRetrieval = {
|
|
66
|
-
|
|
67
|
-
|
|
66
|
+
dynamic_retrieval_config: {
|
|
67
|
+
mode?: 'MODE_DYNAMIC';
|
|
68
|
+
dynamic_threshold?: number;
|
|
69
|
+
};
|
|
68
70
|
};
|
|
69
71
|
export type AxAIGoogleGeminiTool = {
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
72
|
+
function_declarations?: AxAIGoogleGeminiToolFunctionDeclaration[];
|
|
73
|
+
code_execution?: object;
|
|
74
|
+
google_search_retrieval?: AxAIGoogleGeminiToolGoogleSearchRetrieval;
|
|
73
75
|
};
|
|
74
76
|
export type AxAIGoogleGeminiToolConfig = {
|
|
75
|
-
|
|
77
|
+
function_calling_config: {
|
|
76
78
|
mode: 'ANY' | 'NONE' | 'AUTO';
|
|
77
|
-
|
|
79
|
+
allowed_function_names?: string[];
|
|
78
80
|
};
|
|
79
81
|
};
|
|
80
82
|
export type AxAIGoogleGeminiGenerationConfig = {
|
|
@@ -92,7 +94,7 @@ export type AxAIGoogleGeminiSafetySettings = {
|
|
|
92
94
|
export type AxAIGoogleGeminiChatRequest = {
|
|
93
95
|
contents: AxAIGoogleGeminiContent[];
|
|
94
96
|
tools?: AxAIGoogleGeminiTool[];
|
|
95
|
-
|
|
97
|
+
tool_config?: AxAIGoogleGeminiToolConfig;
|
|
96
98
|
systemInstruction?: AxAIGoogleGeminiContent;
|
|
97
99
|
generationConfig: AxAIGoogleGeminiGenerationConfig;
|
|
98
100
|
safetySettings?: AxAIGoogleGeminiSafetySettings;
|
package/cjs/dsp/extract.js
CHANGED
|
@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
7
7
|
exports.extractBlock = exports.ValidationError = exports.streamingExtractFinalValue = exports.streamingExtractValues = exports.extractValues = void 0;
|
|
8
8
|
const json5_1 = __importDefault(require("json5"));
|
|
9
9
|
const datetime_js_1 = require("./datetime.js");
|
|
10
|
+
const prompt_js_1 = require("./prompt.js");
|
|
10
11
|
const extractValues = (sig, values, content) => {
|
|
11
12
|
const xstate = { s: -1 };
|
|
12
13
|
(0, exports.streamingExtractValues)(sig, values, xstate, content);
|
|
@@ -158,16 +159,21 @@ class ValidationError extends Error {
|
|
|
158
159
|
getFixingInstructions = () => {
|
|
159
160
|
const f = this.field;
|
|
160
161
|
const extraFields = [
|
|
162
|
+
// {
|
|
163
|
+
// name: `past_${f.name}`,
|
|
164
|
+
// title: `Past ${f.title}`,
|
|
165
|
+
// description: this.value
|
|
166
|
+
// },
|
|
161
167
|
{
|
|
162
|
-
name: `
|
|
163
|
-
title: `
|
|
164
|
-
description: this.value
|
|
165
|
-
},
|
|
166
|
-
{
|
|
167
|
-
name: 'instructions',
|
|
168
|
-
title: 'Instructions',
|
|
169
|
-
description: this.message
|
|
168
|
+
name: `invalidField`,
|
|
169
|
+
title: `Invalid Field`,
|
|
170
|
+
description: `The field \`${f.title}\` is invalid. Got value: \`${this.value}\`, expected ${(0, prompt_js_1.toFieldType)(f.type)}`
|
|
170
171
|
}
|
|
172
|
+
// {
|
|
173
|
+
// name: 'instructions',
|
|
174
|
+
// title: 'Instructions',
|
|
175
|
+
// description: this.message
|
|
176
|
+
// }
|
|
171
177
|
];
|
|
172
178
|
return extraFields;
|
|
173
179
|
};
|
package/cjs/dsp/extract.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../dsp/extract.ts"],"names":[],"mappings":";AAAA,yDAAyD;;;;;;AAEzD,kDAA0B;AAE1B,+CAA+E;
|
|
1
|
+
{"version":3,"file":"extract.js","sourceRoot":"","sources":["../../../dsp/extract.ts"],"names":[],"mappings":"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"}
|
package/cjs/dsp/functions.js
CHANGED
|
@@ -103,29 +103,19 @@ function parseFunctionCalls(ai, functionCalls, values, model) {
|
|
|
103
103
|
if (!functionCalls || functionCalls.length === 0) {
|
|
104
104
|
return;
|
|
105
105
|
}
|
|
106
|
-
if (ai.getFeatures(model).functions) {
|
|
107
|
-
|
|
108
|
-
id: f.id,
|
|
109
|
-
name: f.function.name,
|
|
110
|
-
args: f.function.params
|
|
111
|
-
}));
|
|
112
|
-
// for (const [i, f] of funcs.entries()) {
|
|
113
|
-
// values['functionName' + i] = f.name;
|
|
114
|
-
// values['functionArguments' + i] =
|
|
115
|
-
// typeof f.args === 'object' ? JSON.stringify(f.args) : f.args;
|
|
116
|
-
// }
|
|
117
|
-
return funcs;
|
|
118
|
-
}
|
|
119
|
-
else if (values['functionName']) {
|
|
120
|
-
const { functionName, functionArguments } = values;
|
|
121
|
-
delete values['functionName'];
|
|
122
|
-
delete values['functionArguments'];
|
|
123
|
-
return [
|
|
124
|
-
{
|
|
125
|
-
name: functionName,
|
|
126
|
-
args: functionArguments
|
|
127
|
-
}
|
|
128
|
-
];
|
|
106
|
+
if (!ai.getFeatures(model).functions) {
|
|
107
|
+
throw new Error('Functions are not supported by the AI service');
|
|
129
108
|
}
|
|
109
|
+
const funcs = functionCalls.map((f) => ({
|
|
110
|
+
id: f.id,
|
|
111
|
+
name: f.function.name,
|
|
112
|
+
args: f.function.params
|
|
113
|
+
}));
|
|
114
|
+
// for (const [i, f] of funcs.entries()) {
|
|
115
|
+
// values['functionName' + i] = f.name;
|
|
116
|
+
// values['functionArguments' + i] =
|
|
117
|
+
// typeof f.args === 'object' ? JSON.stringify(f.args) : f.args;
|
|
118
|
+
// }
|
|
119
|
+
return funcs;
|
|
130
120
|
}
|
|
131
121
|
//# sourceMappingURL=functions.js.map
|
package/cjs/dsp/functions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"functions.js","sourceRoot":"","sources":["../../../dsp/functions.ts"],"names":[],"mappings":";;;;;;AAkKA,
|
|
1
|
+
{"version":3,"file":"functions.js","sourceRoot":"","sources":["../../../dsp/functions.ts"],"names":[],"mappings":"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"}
|
package/cjs/dsp/generate.d.ts
CHANGED
|
@@ -29,7 +29,6 @@ export type AxGenerateResult<OUT extends AxGenOut> = OUT & {
|
|
|
29
29
|
export interface AxResponseHandlerArgs<T> {
|
|
30
30
|
ai: Readonly<AxAIService>;
|
|
31
31
|
model?: string;
|
|
32
|
-
sig: Readonly<AxSignature>;
|
|
33
32
|
res: T;
|
|
34
33
|
usageInfo: {
|
|
35
34
|
ai: string;
|
|
@@ -48,7 +47,6 @@ export declare class AxGen<IN extends AxGenIn = AxGenIn, OUT extends AxGenerateR
|
|
|
48
47
|
private functions?;
|
|
49
48
|
private functionsExecuted;
|
|
50
49
|
constructor(signature: Readonly<AxSignature | string>, options?: Readonly<AxGenOptions>);
|
|
51
|
-
private updateSigForFunctions;
|
|
52
50
|
addAssert: (fn: AxAssertion["fn"], message?: string, optional?: boolean) => void;
|
|
53
51
|
addStreamingAssert: (fieldName: string, fn: AxStreamingAssertion["fn"], message?: string, optional?: boolean) => void;
|
|
54
52
|
private forwardSendRequest;
|
package/cjs/dsp/generate.js
CHANGED
|
@@ -10,7 +10,6 @@ const extract_js_1 = require("./extract.js");
|
|
|
10
10
|
const functions_js_1 = require("./functions.js");
|
|
11
11
|
const program_js_1 = require("./program.js");
|
|
12
12
|
const prompt_js_1 = require("./prompt.js");
|
|
13
|
-
const sig_js_1 = require("./sig.js");
|
|
14
13
|
class AxGen extends program_js_1.AxProgramWithSignature {
|
|
15
14
|
pt;
|
|
16
15
|
asserts;
|
|
@@ -21,7 +20,7 @@ class AxGen extends program_js_1.AxProgramWithSignature {
|
|
|
21
20
|
constructor(signature, options) {
|
|
22
21
|
super(signature, { description: options?.description });
|
|
23
22
|
this.options = options;
|
|
24
|
-
this.pt = new (options?.promptTemplate ?? prompt_js_1.AxPromptTemplate)(this.signature);
|
|
23
|
+
this.pt = new (options?.promptTemplate ?? prompt_js_1.AxPromptTemplate)(this.signature, options?.functions);
|
|
25
24
|
this.asserts = this.options?.asserts ?? [];
|
|
26
25
|
this.streamingAsserts = this.options?.streamingAsserts ?? [];
|
|
27
26
|
this.usage = [];
|
|
@@ -29,47 +28,18 @@ class AxGen extends program_js_1.AxProgramWithSignature {
|
|
|
29
28
|
this.functions = (0, functions_js_1.parseFunctions)(options.functions);
|
|
30
29
|
}
|
|
31
30
|
}
|
|
32
|
-
updateSigForFunctions = (ai, model) => {
|
|
33
|
-
// AI supports function calling natively so
|
|
34
|
-
// no need to add fields for function call
|
|
35
|
-
if (ai.getFeatures(model).functions) {
|
|
36
|
-
return;
|
|
37
|
-
}
|
|
38
|
-
const sig = new sig_js_1.AxSignature(this.signature);
|
|
39
|
-
// These are the fields for the function call only needed when the underlying LLM API does not support function calling natively in the API.
|
|
40
|
-
sig.addOutputField({
|
|
41
|
-
name: 'functionName',
|
|
42
|
-
description: 'Name of function to call',
|
|
43
|
-
isOptional: true
|
|
44
|
-
});
|
|
45
|
-
sig.addOutputField({
|
|
46
|
-
name: 'functionArguments',
|
|
47
|
-
description: 'Arguments of function to call',
|
|
48
|
-
isOptional: true
|
|
49
|
-
});
|
|
50
|
-
return sig;
|
|
51
|
-
};
|
|
52
31
|
addAssert = (fn, message, optional) => {
|
|
53
32
|
this.asserts.push({ fn, message, optional });
|
|
54
33
|
};
|
|
55
34
|
addStreamingAssert = (fieldName, fn, message, optional) => {
|
|
56
35
|
this.streamingAsserts.push({ fieldName, fn, message, optional });
|
|
57
36
|
};
|
|
58
|
-
async forwardSendRequest({ mem, sessionId, traceId, ai, modelConfig
|
|
37
|
+
async forwardSendRequest({ mem, sessionId, traceId, ai, modelConfig, stream, model, rateLimiter, functions, functionCall: _functionCall }) {
|
|
59
38
|
const chatPrompt = mem?.history(sessionId) ?? [];
|
|
60
39
|
if (chatPrompt.length === 0) {
|
|
61
40
|
throw new Error('No chat prompt found');
|
|
62
41
|
}
|
|
63
42
|
const functionCall = _functionCall ?? this.options?.functionCall;
|
|
64
|
-
const hasJSON = this.signature
|
|
65
|
-
.getOutputFields()
|
|
66
|
-
.some((f) => f?.type?.name === 'json' || f?.type?.isArray);
|
|
67
|
-
const modelConfig = mc
|
|
68
|
-
? {
|
|
69
|
-
...mc,
|
|
70
|
-
...(hasJSON ? { outputFormat: 'json_object' } : {})
|
|
71
|
-
}
|
|
72
|
-
: undefined;
|
|
73
43
|
const res = await ai.chat({
|
|
74
44
|
chatPrompt,
|
|
75
45
|
functions,
|
|
@@ -84,7 +54,7 @@ class AxGen extends program_js_1.AxProgramWithSignature {
|
|
|
84
54
|
});
|
|
85
55
|
return res;
|
|
86
56
|
}
|
|
87
|
-
async forwardCore({
|
|
57
|
+
async forwardCore({ mem, sessionId, traceId, ai, modelConfig, model, rateLimiter, stream, functions, functionCall }) {
|
|
88
58
|
const usageInfo = {
|
|
89
59
|
ai: ai.getName(),
|
|
90
60
|
model: ai.getModelInfo().name
|
|
@@ -105,7 +75,6 @@ class AxGen extends program_js_1.AxProgramWithSignature {
|
|
|
105
75
|
return (await this.processSteamingResponse({
|
|
106
76
|
ai,
|
|
107
77
|
model,
|
|
108
|
-
sig,
|
|
109
78
|
res,
|
|
110
79
|
usageInfo,
|
|
111
80
|
mem,
|
|
@@ -117,7 +86,6 @@ class AxGen extends program_js_1.AxProgramWithSignature {
|
|
|
117
86
|
return (await this.processResponse({
|
|
118
87
|
ai,
|
|
119
88
|
model,
|
|
120
|
-
sig,
|
|
121
89
|
res,
|
|
122
90
|
usageInfo,
|
|
123
91
|
mem,
|
|
@@ -126,7 +94,7 @@ class AxGen extends program_js_1.AxProgramWithSignature {
|
|
|
126
94
|
functions
|
|
127
95
|
}));
|
|
128
96
|
}
|
|
129
|
-
async processSteamingResponse({ ai,
|
|
97
|
+
async processSteamingResponse({ ai, model, res, usageInfo, mem, sessionId, traceId, functions }) {
|
|
130
98
|
const functionCalls = [];
|
|
131
99
|
const values = {};
|
|
132
100
|
const xstate = { s: -1 };
|
|
@@ -140,7 +108,7 @@ class AxGen extends program_js_1.AxProgramWithSignature {
|
|
|
140
108
|
content += result.content;
|
|
141
109
|
mem.updateResult({ name: result.name, content }, sessionId);
|
|
142
110
|
(0, asserts_js_1.assertStreamingAssertions)(this.streamingAsserts, values, xstate, content);
|
|
143
|
-
(0, extract_js_1.streamingExtractValues)(
|
|
111
|
+
(0, extract_js_1.streamingExtractValues)(this.signature, values, xstate, content);
|
|
144
112
|
(0, asserts_js_1.assertAssertions)(this.asserts, values);
|
|
145
113
|
}
|
|
146
114
|
if (result.functionCalls) {
|
|
@@ -191,18 +159,18 @@ class AxGen extends program_js_1.AxProgramWithSignature {
|
|
|
191
159
|
}
|
|
192
160
|
return { ...values };
|
|
193
161
|
}
|
|
194
|
-
async _forward(ai,
|
|
162
|
+
async _forward(ai, values, options, span) {
|
|
195
163
|
const stopFunction = (options?.stopFunction ?? this.options?.stopFunction)?.toLowerCase();
|
|
196
|
-
const maxRetries = options?.maxRetries ?? this.options?.maxRetries ??
|
|
164
|
+
const maxRetries = options?.maxRetries ?? this.options?.maxRetries ?? 15;
|
|
197
165
|
const maxSteps = options?.maxSteps ?? this.options?.maxSteps ?? 10;
|
|
198
166
|
const mem = options?.mem ?? this.options?.mem ?? new index_js_1.AxMemory();
|
|
199
167
|
const modelConfig = mergeAxModelConfigs(ai.getModelConfig(), options?.modelConfig ?? {});
|
|
200
168
|
const canStream = ai.getFeatures(options?.model).streaming;
|
|
201
169
|
const stream = options?.stream ?? this.options?.stream ?? modelConfig.stream ?? true;
|
|
202
170
|
let err;
|
|
203
|
-
if (
|
|
171
|
+
if (options?.functions && options?.functions.length > 0) {
|
|
204
172
|
const promptTemplate = this.options?.promptTemplate ?? prompt_js_1.AxPromptTemplate;
|
|
205
|
-
this.pt = new promptTemplate(
|
|
173
|
+
this.pt = new promptTemplate(this.signature, options.functions);
|
|
206
174
|
}
|
|
207
175
|
const prompt = this.pt.render(values, {
|
|
208
176
|
examples: this.examples,
|
|
@@ -214,7 +182,6 @@ class AxGen extends program_js_1.AxProgramWithSignature {
|
|
|
214
182
|
try {
|
|
215
183
|
const output = await this.forwardCore({
|
|
216
184
|
ai,
|
|
217
|
-
sig,
|
|
218
185
|
mem,
|
|
219
186
|
sessionId: options?.sessionId,
|
|
220
187
|
traceId: options?.traceId,
|
|
@@ -234,7 +201,7 @@ class AxGen extends program_js_1.AxProgramWithSignature {
|
|
|
234
201
|
}
|
|
235
202
|
}
|
|
236
203
|
if (!stopFunctionExecuted) {
|
|
237
|
-
(0, asserts_js_1.assertRequiredFields)(
|
|
204
|
+
(0, asserts_js_1.assertRequiredFields)(this.signature, output);
|
|
238
205
|
}
|
|
239
206
|
this.trace = { ...values, ...output };
|
|
240
207
|
return output;
|
|
@@ -271,28 +238,27 @@ class AxGen extends program_js_1.AxProgramWithSignature {
|
|
|
271
238
|
throw new Error(`Max steps reached: ${maxSteps}`);
|
|
272
239
|
}
|
|
273
240
|
async forward(ai, values, options) {
|
|
274
|
-
const sig = this.updateSigForFunctions(ai, options?.model) ?? this.signature;
|
|
275
241
|
const tracer = this.options?.tracer ?? options?.tracer;
|
|
276
242
|
let functions = this.functions;
|
|
277
243
|
if (options?.functions) {
|
|
278
244
|
functions = (0, functions_js_1.parseFunctions)(options.functions, this.functions);
|
|
279
245
|
}
|
|
280
246
|
if (!tracer) {
|
|
281
|
-
return await this._forward(ai,
|
|
247
|
+
return await this._forward(ai, values, {
|
|
282
248
|
...options,
|
|
283
249
|
functions
|
|
284
250
|
});
|
|
285
251
|
}
|
|
286
252
|
const funcNames = functions?.map((f) => f.name).join(',');
|
|
287
253
|
const attributes = {
|
|
288
|
-
['generate.signature']:
|
|
254
|
+
['generate.signature']: this.signature.toString(),
|
|
289
255
|
['generate.functions']: funcNames ?? ''
|
|
290
256
|
};
|
|
291
257
|
return await tracer.startActiveSpan('Generate', {
|
|
292
258
|
kind: index_js_2.AxSpanKind.SERVER,
|
|
293
259
|
attributes
|
|
294
260
|
}, async (span) => {
|
|
295
|
-
const res = this._forward(ai,
|
|
261
|
+
const res = this._forward(ai, values, options, span);
|
|
296
262
|
span.end();
|
|
297
263
|
return res;
|
|
298
264
|
});
|