@ax-llm/ax 10.0.4 → 10.0.6
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
CHANGED
|
@@ -126,28 +126,31 @@ export class AxAIGoogleGemini extends AxBaseAI {
|
|
|
126
126
|
};
|
|
127
127
|
}
|
|
128
128
|
case 'assistant': {
|
|
129
|
-
|
|
130
|
-
|
|
129
|
+
let parts = [];
|
|
130
|
+
if (msg.functionCalls) {
|
|
131
|
+
parts = msg.functionCalls.map((f) => {
|
|
132
|
+
const args = typeof f.function.params === 'string'
|
|
133
|
+
? JSON.parse(f.function.params)
|
|
134
|
+
: f.function.params;
|
|
135
|
+
return {
|
|
136
|
+
functionCall: {
|
|
137
|
+
name: f.function.name,
|
|
138
|
+
args: args
|
|
139
|
+
}
|
|
140
|
+
};
|
|
141
|
+
});
|
|
142
|
+
if (!parts) {
|
|
143
|
+
throw new Error('Function call is empty');
|
|
144
|
+
}
|
|
131
145
|
return {
|
|
132
146
|
role: 'model',
|
|
133
147
|
parts
|
|
134
148
|
};
|
|
135
149
|
}
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
parts =
|
|
139
|
-
msg.functionCalls?.map((f) => {
|
|
140
|
-
const args = typeof f.function.params === 'string'
|
|
141
|
-
? JSON.parse(f.function.params)
|
|
142
|
-
: f.function.params;
|
|
143
|
-
return {
|
|
144
|
-
functionCall: {
|
|
145
|
-
name: f.function.name,
|
|
146
|
-
args: args
|
|
147
|
-
}
|
|
148
|
-
};
|
|
149
|
-
}) ?? [];
|
|
150
|
+
if (!msg.content) {
|
|
151
|
+
throw new Error('Assistant content is empty');
|
|
150
152
|
}
|
|
153
|
+
parts = [{ text: msg.content }];
|
|
151
154
|
return {
|
|
152
155
|
role: 'model',
|
|
153
156
|
parts
|
|
@@ -176,10 +179,10 @@ export class AxAIGoogleGemini extends AxBaseAI {
|
|
|
176
179
|
});
|
|
177
180
|
let tools = [];
|
|
178
181
|
if (req.functions && req.functions.length > 0) {
|
|
179
|
-
tools.push({
|
|
182
|
+
tools.push({ function_declarations: req.functions });
|
|
180
183
|
}
|
|
181
184
|
if (this.options?.codeExecution) {
|
|
182
|
-
tools.push({
|
|
185
|
+
tools.push({ code_execution: {} });
|
|
183
186
|
}
|
|
184
187
|
if (tools.length === 0) {
|
|
185
188
|
tools = undefined;
|
|
@@ -260,6 +263,9 @@ export class AxAIGoogleGemini extends AxBaseAI {
|
|
|
260
263
|
case 'RECITATION':
|
|
261
264
|
throw new Error('Finish reason: RECITATION');
|
|
262
265
|
}
|
|
266
|
+
if (!candidate.content.parts) {
|
|
267
|
+
return result;
|
|
268
|
+
}
|
|
263
269
|
for (const part of candidate.content.parts) {
|
|
264
270
|
if ('text' in part) {
|
|
265
271
|
result.content = part.text;
|
|
@@ -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,8 +63,8 @@ export type AxAIGoogleGeminiToolFunctionDeclaration = {
|
|
|
63
63
|
parameters?: object;
|
|
64
64
|
};
|
|
65
65
|
export type AxAIGoogleGeminiTool = {
|
|
66
|
-
|
|
67
|
-
|
|
66
|
+
function_declarations?: AxAIGoogleGeminiToolFunctionDeclaration[];
|
|
67
|
+
code_execution?: object;
|
|
68
68
|
};
|
|
69
69
|
export type AxAIGoogleGeminiToolConfig = {
|
|
70
70
|
function_calling_config: {
|
|
@@ -131,28 +131,31 @@ class AxAIGoogleGemini extends base_js_1.AxBaseAI {
|
|
|
131
131
|
};
|
|
132
132
|
}
|
|
133
133
|
case 'assistant': {
|
|
134
|
-
|
|
135
|
-
|
|
134
|
+
let parts = [];
|
|
135
|
+
if (msg.functionCalls) {
|
|
136
|
+
parts = msg.functionCalls.map((f) => {
|
|
137
|
+
const args = typeof f.function.params === 'string'
|
|
138
|
+
? JSON.parse(f.function.params)
|
|
139
|
+
: f.function.params;
|
|
140
|
+
return {
|
|
141
|
+
functionCall: {
|
|
142
|
+
name: f.function.name,
|
|
143
|
+
args: args
|
|
144
|
+
}
|
|
145
|
+
};
|
|
146
|
+
});
|
|
147
|
+
if (!parts) {
|
|
148
|
+
throw new Error('Function call is empty');
|
|
149
|
+
}
|
|
136
150
|
return {
|
|
137
151
|
role: 'model',
|
|
138
152
|
parts
|
|
139
153
|
};
|
|
140
154
|
}
|
|
141
|
-
|
|
142
|
-
|
|
143
|
-
parts =
|
|
144
|
-
msg.functionCalls?.map((f) => {
|
|
145
|
-
const args = typeof f.function.params === 'string'
|
|
146
|
-
? JSON.parse(f.function.params)
|
|
147
|
-
: f.function.params;
|
|
148
|
-
return {
|
|
149
|
-
functionCall: {
|
|
150
|
-
name: f.function.name,
|
|
151
|
-
args: args
|
|
152
|
-
}
|
|
153
|
-
};
|
|
154
|
-
}) ?? [];
|
|
155
|
+
if (!msg.content) {
|
|
156
|
+
throw new Error('Assistant content is empty');
|
|
155
157
|
}
|
|
158
|
+
parts = [{ text: msg.content }];
|
|
156
159
|
return {
|
|
157
160
|
role: 'model',
|
|
158
161
|
parts
|
|
@@ -181,10 +184,10 @@ class AxAIGoogleGemini extends base_js_1.AxBaseAI {
|
|
|
181
184
|
});
|
|
182
185
|
let tools = [];
|
|
183
186
|
if (req.functions && req.functions.length > 0) {
|
|
184
|
-
tools.push({
|
|
187
|
+
tools.push({ function_declarations: req.functions });
|
|
185
188
|
}
|
|
186
189
|
if (this.options?.codeExecution) {
|
|
187
|
-
tools.push({
|
|
190
|
+
tools.push({ code_execution: {} });
|
|
188
191
|
}
|
|
189
192
|
if (tools.length === 0) {
|
|
190
193
|
tools = undefined;
|
|
@@ -265,6 +268,9 @@ class AxAIGoogleGemini extends base_js_1.AxBaseAI {
|
|
|
265
268
|
case 'RECITATION':
|
|
266
269
|
throw new Error('Finish reason: RECITATION');
|
|
267
270
|
}
|
|
271
|
+
if (!candidate.content.parts) {
|
|
272
|
+
return result;
|
|
273
|
+
}
|
|
268
274
|
for (const part of candidate.content.parts) {
|
|
269
275
|
if ('text' in part) {
|
|
270
276
|
result.content = part.text;
|
|
@@ -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":";;;AACA,wCAIoB;AAYpB,uCAAoD;AACpD,yCAYoB;AAEpB,MAAM,cAAc,GAAmC;IACrD;QACE,QAAQ,EAAE,yCAA8B,CAAC,sBAAsB;QAC/D,SAAS,EAAE,0CAA+B,CAAC,SAAS;KACrD;IACD;QACE,QAAQ,EAAE,yCAA8B,CAAC,sBAAsB;QAC/D,SAAS,EAAE,0CAA+B,CAAC,SAAS;KACrD;IACD;QACE,QAAQ,EAAE,yCAA8B,CAAC,4BAA4B;QACrE,SAAS,EAAE,0CAA+B,CAAC,SAAS;KACrD;IACD;QACE,QAAQ,EAAE,yCAA8B,CAAC,4BAA4B;QACrE,SAAS,EAAE,0CAA+B,CAAC,SAAS;KACrD;CACF,CAAC;AAEF;;;GAGG;AACI,MAAM,6BAA6B,GAAG,GAA2B,EAAE,CACxE,eAAe,CAAC;IACd,KAAK,EAAE,gCAAqB,CAAC,WAAW;IACxC,UAAU,EAAE,qCAA0B,CAAC,gBAAgB;IACvD,cAAc;IACd,GAAG,IAAA,+BAAqB,GAAE;CAC3B,CAAC,CAAC;AANQ,QAAA,6BAA6B,iCAMrC;AAEE,MAAM,qCAAqC,GAChD,GAA2B,EAAE,CAC3B,eAAe,CAAC;IACd,KAAK,EAAE,gCAAqB,CAAC,aAAa;IAC1C,UAAU,EAAE,qCAA0B,CAAC,gBAAgB;IACvD,cAAc;IACd,GAAG,IAAA,uCAA6B,GAAE;CACnC,CAAC,CAAC;AAPM,QAAA,qCAAqC,yCAO3C;AAeP;;;GAGG;AACH,MAAa,gBAAiB,SAAQ,kBAMrC;IACS,OAAO,CAAmC;IAC1C,MAAM,CAAyB;IAC/B,MAAM,CAAS;IAEvB,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,IAAI,MAAM,GAAG,kDAAkD,CAAC;QAEhE,IAAI,SAAS,IAAI,MAAM,EAAE,CAAC;YACxB,MAAM,GAAG,gBAAgB,MAAM,0CAA0C,SAAS,wCAAwC,CAAC;QAC7H,CAAC;QAED,MAAM,OAAO,GAAG;YACd,GAAG,IAAA,qCAA6B,GAAE;YAClC,GAAG,MAAM;SACV,CAAC;QAEF,KAAK,CAAC;YACJ,IAAI,EAAE,gBAAgB;YACtB,MAAM;YACN,OAAO,EAAE,EAAE;YACX,SAAS,EAAE,iCAAuB;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;IACvB,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,sCAAsC,IAAI,CAAC,MAAM,EAAE;gBACrE,CAAC,CAAC,WAAW,KAAK,wBAAwB,IAAI,CAAC,MAAM,EAAE;SAC1D,CAAC;QAEF,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,qBAAqB,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;QACvD,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,EAAE,aAAa,EAAE,CAAC;YAChC,KAAK,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,EAAE,EAAE,CAAC,CAAC;QACrC,CAAC;QAED,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvB,KAAK,GAAG,SAAS,CAAC;QACpB,CAAC;QAED,gEAAgE;QAChE,IAAI,WAAW,CAAC;QAChB,IAAI,GAAG,CAAC,YAAY,EAAE,CAAC;YACrB,IAAI,GAAG,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;gBAChC,WAAW,GAAG,EAAE,uBAAuB,EAAE,EAAE,IAAI,EAAE,MAAe,EAAE,EAAE,CAAC;YACvE,CAAC;iBAAM,IAAI,GAAG,CAAC,YAAY,KAAK,MAAM,EAAE,CAAC;gBACvC,WAAW,GAAG,EAAE,uBAAuB,EAAE,EAAE,IAAI,EAAE,MAAe,EAAE,EAAE,CAAC;YACvE,CAAC;iBAAM,IAAI,GAAG,CAAC,YAAY,KAAK,UAAU,EAAE,CAAC;gBAC3C,WAAW,GAAG;oBACZ,uBAAuB,EAAE,EAAE,IAAI,EAAE,KAAc,EAAE;iBAClD,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,WAAW,GAAG;oBACZ,uBAAuB,EAAE;wBACvB,IAAI,EAAE,KAAc;wBACpB,sBAAsB,EAAE,CAAC,GAAG,CAAC,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC;qBACzD;iBACF,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,gBAAgB,GAAG;YACvB,eAAe,EAAE,GAAG,CAAC,WAAW,EAAE,SAAS,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS;YACpE,WAAW,EAAE,GAAG,CAAC,WAAW,EAAE,WAAW,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW;YACpE,IAAI,EAAE,GAAG,CAAC,WAAW,EAAE,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI;YAC/C,IAAI,EAAE,GAAG,CAAC,WAAW,EAAE,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI;YAC/C,cAAc,EAAE,CAAC;YACjB,aAAa,EAAE,GAAG,CAAC,WAAW,EAAE,aAAa,IAAI,IAAI,CAAC,MAAM,CAAC,aAAa;SAC3E,CAAC;QAEF,MAAM,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC;QAElD,MAAM,QAAQ,GAAgC;YAC5C,QAAQ;YACR,KAAK;YACL,WAAW;YACX,iBAAiB;YACjB,gBAAgB;YAChB,cAAc;SACf,CAAC;QAEF,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC/B,CAAC,CAAC;IAEO,gBAAgB,GAAG,CAC1B,GAAqC,EACK,EAAE;QAC5C,MAAM,KAAK,GAAG,GAAG,CAAC,UAAU,CAAC;QAE7B,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACzC,CAAC;QAED,IAAI,CAAC,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzC,MAAM,IAAI,KAAK,CAAC,sBAAsB,CAAC,CAAC;QAC1C,CAAC;QAED,MAAM,SAAS,GAAG;YAChB,IAAI,EAAE,WAAW,KAAK,2BAA2B,IAAI,CAAC,MAAM,EAAE;SAC/D,CAAC;QAEF,MAAM,QAAQ,GAAsC;YAClD,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBACjC,KAAK,EAAE,SAAS,GAAG,KAAK;gBACxB,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE;aAC/B,CAAC,CAAC;SACJ,CAAC;QAEF,OAAO,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC/B,CAAC,CAAC;IAEO,gBAAgB,GAAG,CAC1B,IAA4C,EAC5B,EAAE;QAClB,MAAM,OAAO,GAA2B,IAAI,CAAC,UAAU,EAAE,GAAG,CAC1D,CAAC,SAAS,EAAE,EAAE;YACZ,MAAM,MAAM,GAAyB,EAAE,CAAC;YAExC,QAAQ,SAAS,CAAC,YAAY,EAAE,CAAC;gBAC/B,KAAK,YAAY;oBACf,MAAM,CAAC,YAAY,GAAG,QAAQ,CAAC;oBAC/B,MAAM;gBACR,KAAK,MAAM;oBACT,MAAM,CAAC,YAAY,GAAG,MAAM,CAAC;oBAC7B,MAAM;gBACR,KAAK,QAAQ;oBACX,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBAC3C,KAAK,YAAY;oBACf,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;YACjD,CAAC;YAED,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBAC7B,OAAO,MAAM,CAAC;YAChB,CAAC;YAED,KAAK,MAAM,IAAI,IAAI,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBAC3C,IAAI,MAAM,IAAI,IAAI,EAAE,CAAC;oBACnB,MAAM,CAAC,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;oBAC3B,SAAS;gBACX,CAAC;gBACD,IAAI,cAAc,IAAI,IAAI,EAAE,CAAC;oBAC3B,MAAM,CAAC,aAAa,GAAG;wBACrB;4BACE,EAAE,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI;4BAC1B,IAAI,EAAE,UAAU;4BAChB,QAAQ,EAAE;gCACR,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI;gCAC5B,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI;6BAC/B;yBACF;qBACF,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,OAAO,MAAM,CAAC;QAChB,CAAC,CACF,CAAC;QAEF,IAAI,UAAoC,CAAC;QACzC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,UAAU,GAAG;gBACX,WAAW,EAAE,IAAI,CAAC,aAAa,CAAC,eAAe;gBAC/C,YAAY,EAAE,IAAI,CAAC,aAAa,CAAC,gBAAgB;gBACjD,gBAAgB,EAAE,IAAI,CAAC,aAAa,CAAC,oBAAoB;aAC1D,CAAC;QACJ,CAAC;QACD,OAAO;YACL,OAAO;YACP,UAAU;SACX,CAAC;IACJ,CAAC,CAAC;IAEO,sBAAsB,GAAG,CAChC,IAAiD,EACjC,EAAE;QAClB,OAAO,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC,CAAC;IAEO,iBAAiB,GAAG,CAC3B,IAAkD,EACjC,EAAE;QACnB,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAExE,OAAO;YACL,UAAU;SACX,CAAC;IACJ,CAAC,CAAC;CACH;AA5VD,4CA4VC"}
|
|
@@ -63,8 +63,8 @@ export type AxAIGoogleGeminiToolFunctionDeclaration = {
|
|
|
63
63
|
parameters?: object;
|
|
64
64
|
};
|
|
65
65
|
export type AxAIGoogleGeminiTool = {
|
|
66
|
-
|
|
67
|
-
|
|
66
|
+
function_declarations?: AxAIGoogleGeminiToolFunctionDeclaration[];
|
|
67
|
+
code_execution?: object;
|
|
68
68
|
};
|
|
69
69
|
export type AxAIGoogleGeminiToolConfig = {
|
|
70
70
|
function_calling_config: {
|