@ax-llm/ax 10.0.5 → 10.0.7
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.d.ts +8 -3
- package/ai/google-gemini/api.js +26 -18
- package/ai/google-gemini/api.js.map +1 -1
- package/ai/google-gemini/types.d.ts +7 -2
- package/cjs/ai/google-gemini/api.d.ts +8 -3
- package/cjs/ai/google-gemini/api.js +26 -18
- package/cjs/ai/google-gemini/api.js.map +1 -1
- package/cjs/ai/google-gemini/types.d.ts +7 -2
- package/cjs/dsp/sig.d.ts +1 -1
- package/cjs/dsp/sig.js +7 -0
- package/cjs/dsp/sig.js.map +1 -1
- package/dsp/sig.d.ts +1 -1
- package/dsp/sig.js +7 -0
- package/dsp/sig.js.map +1 -1
- package/package.json +1 -1
|
@@ -8,15 +8,20 @@ import { type AxAIGoogleGeminiBatchEmbedRequest, type AxAIGoogleGeminiBatchEmbed
|
|
|
8
8
|
*/
|
|
9
9
|
export declare const axAIGoogleGeminiDefaultConfig: () => AxAIGoogleGeminiConfig;
|
|
10
10
|
export declare const axAIGoogleGeminiDefaultCreativeConfig: () => AxAIGoogleGeminiConfig;
|
|
11
|
+
export interface AxAIGoogleGeminiOptionsTools {
|
|
12
|
+
codeExecution?: boolean;
|
|
13
|
+
googleSearchRetrieval?: {
|
|
14
|
+
mode?: 'MODE_DYNAMIC';
|
|
15
|
+
dynamicThreshold?: number;
|
|
16
|
+
};
|
|
17
|
+
}
|
|
11
18
|
export interface AxAIGoogleGeminiArgs {
|
|
12
19
|
name: 'google-gemini';
|
|
13
20
|
apiKey: string;
|
|
14
21
|
projectId?: string;
|
|
15
22
|
region?: string;
|
|
16
23
|
config?: Readonly<Partial<AxAIGoogleGeminiConfig>>;
|
|
17
|
-
options?: Readonly<AxAIServiceOptions &
|
|
18
|
-
codeExecution?: boolean;
|
|
19
|
-
}>;
|
|
24
|
+
options?: Readonly<AxAIServiceOptions & AxAIGoogleGeminiOptionsTools>;
|
|
20
25
|
modelMap?: Record<string, AxAIGoogleGeminiModel | AxAIGoogleGeminiEmbedModel | string>;
|
|
21
26
|
}
|
|
22
27
|
/**
|
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,15 @@ 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: {} });
|
|
186
|
+
}
|
|
187
|
+
if (this.options?.googleSearchRetrieval) {
|
|
188
|
+
tools.push({
|
|
189
|
+
google_search_retrieval: this.options.googleSearchRetrieval
|
|
190
|
+
});
|
|
183
191
|
}
|
|
184
192
|
if (tools.length === 0) {
|
|
185
193
|
tools = undefined;
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"api.js","sourceRoot":"","sources":["../../../ai/google-gemini/api.ts"],"names":[],"mappings":"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"}
|
|
@@ -62,9 +62,14 @@ export type AxAIGoogleGeminiToolFunctionDeclaration = {
|
|
|
62
62
|
description?: string;
|
|
63
63
|
parameters?: object;
|
|
64
64
|
};
|
|
65
|
+
export type AxAIGoogleGeminiToolGoogleSearchRetrieval = {
|
|
66
|
+
mode?: 'MODE_DYNAMIC';
|
|
67
|
+
dynamic_threshold?: number;
|
|
68
|
+
};
|
|
65
69
|
export type AxAIGoogleGeminiTool = {
|
|
66
|
-
|
|
67
|
-
|
|
70
|
+
function_declarations?: AxAIGoogleGeminiToolFunctionDeclaration[];
|
|
71
|
+
code_execution?: object;
|
|
72
|
+
google_search_retrieval?: AxAIGoogleGeminiToolGoogleSearchRetrieval;
|
|
68
73
|
};
|
|
69
74
|
export type AxAIGoogleGeminiToolConfig = {
|
|
70
75
|
function_calling_config: {
|
|
@@ -8,15 +8,20 @@ import { type AxAIGoogleGeminiBatchEmbedRequest, type AxAIGoogleGeminiBatchEmbed
|
|
|
8
8
|
*/
|
|
9
9
|
export declare const axAIGoogleGeminiDefaultConfig: () => AxAIGoogleGeminiConfig;
|
|
10
10
|
export declare const axAIGoogleGeminiDefaultCreativeConfig: () => AxAIGoogleGeminiConfig;
|
|
11
|
+
export interface AxAIGoogleGeminiOptionsTools {
|
|
12
|
+
codeExecution?: boolean;
|
|
13
|
+
googleSearchRetrieval?: {
|
|
14
|
+
mode?: 'MODE_DYNAMIC';
|
|
15
|
+
dynamicThreshold?: number;
|
|
16
|
+
};
|
|
17
|
+
}
|
|
11
18
|
export interface AxAIGoogleGeminiArgs {
|
|
12
19
|
name: 'google-gemini';
|
|
13
20
|
apiKey: string;
|
|
14
21
|
projectId?: string;
|
|
15
22
|
region?: string;
|
|
16
23
|
config?: Readonly<Partial<AxAIGoogleGeminiConfig>>;
|
|
17
|
-
options?: Readonly<AxAIServiceOptions &
|
|
18
|
-
codeExecution?: boolean;
|
|
19
|
-
}>;
|
|
24
|
+
options?: Readonly<AxAIServiceOptions & AxAIGoogleGeminiOptionsTools>;
|
|
20
25
|
modelMap?: Record<string, AxAIGoogleGeminiModel | AxAIGoogleGeminiEmbedModel | string>;
|
|
21
26
|
}
|
|
22
27
|
/**
|
|
@@ -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,15 @@ 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: {} });
|
|
191
|
+
}
|
|
192
|
+
if (this.options?.googleSearchRetrieval) {
|
|
193
|
+
tools.push({
|
|
194
|
+
google_search_retrieval: this.options.googleSearchRetrieval
|
|
195
|
+
});
|
|
188
196
|
}
|
|
189
197
|
if (tools.length === 0) {
|
|
190
198
|
tools = undefined;
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAuBP;;;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,IAAI,CAAC,OAAO,EAAE,qBAAqB,EAAE,CAAC;YACxC,KAAK,CAAC,IAAI,CAAC;gBACT,uBAAuB,EAAE,IAAI,CAAC,OAAO,CAAC,qBAAqB;aAC5D,CAAC,CAAC;QACL,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;AAlWD,4CAkWC"}
|
|
@@ -62,9 +62,14 @@ export type AxAIGoogleGeminiToolFunctionDeclaration = {
|
|
|
62
62
|
description?: string;
|
|
63
63
|
parameters?: object;
|
|
64
64
|
};
|
|
65
|
+
export type AxAIGoogleGeminiToolGoogleSearchRetrieval = {
|
|
66
|
+
mode?: 'MODE_DYNAMIC';
|
|
67
|
+
dynamic_threshold?: number;
|
|
68
|
+
};
|
|
65
69
|
export type AxAIGoogleGeminiTool = {
|
|
66
|
-
|
|
67
|
-
|
|
70
|
+
function_declarations?: AxAIGoogleGeminiToolFunctionDeclaration[];
|
|
71
|
+
code_execution?: object;
|
|
72
|
+
google_search_retrieval?: AxAIGoogleGeminiToolGoogleSearchRetrieval;
|
|
68
73
|
};
|
|
69
74
|
export type AxAIGoogleGeminiToolConfig = {
|
|
70
75
|
function_calling_config: {
|
package/cjs/dsp/sig.d.ts
CHANGED
|
@@ -19,7 +19,7 @@ export declare class AxSignature {
|
|
|
19
19
|
private outputFields;
|
|
20
20
|
private sigHash;
|
|
21
21
|
private sigString;
|
|
22
|
-
constructor(signature
|
|
22
|
+
constructor(signature?: Readonly<AxSignature | string>);
|
|
23
23
|
private parseParsedField;
|
|
24
24
|
private parseField;
|
|
25
25
|
setDescription: (desc: string) => void;
|
package/cjs/dsp/sig.js
CHANGED
|
@@ -10,6 +10,13 @@ class AxSignature {
|
|
|
10
10
|
sigHash;
|
|
11
11
|
sigString;
|
|
12
12
|
constructor(signature) {
|
|
13
|
+
if (!signature) {
|
|
14
|
+
this.inputFields = [];
|
|
15
|
+
this.outputFields = [];
|
|
16
|
+
this.sigHash = '';
|
|
17
|
+
this.sigString = '';
|
|
18
|
+
return;
|
|
19
|
+
}
|
|
13
20
|
if (typeof signature === 'string') {
|
|
14
21
|
let sig;
|
|
15
22
|
try {
|
package/cjs/dsp/sig.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sig.js","sourceRoot":"","sources":["../../../dsp/sig.ts"],"names":[],"mappings":";;;AAAA,mCAAoC;AAIpC,2CAKqB;AAwBrB,MAAa,WAAW;IACd,WAAW,CAAU;IACrB,WAAW,CAAa;IACxB,YAAY,CAAa;IAEzB,OAAO,CAAS;IAChB,SAAS,CAAS;IAE1B,YAAY,
|
|
1
|
+
{"version":3,"file":"sig.js","sourceRoot":"","sources":["../../../dsp/sig.ts"],"names":[],"mappings":"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"}
|
package/dsp/sig.d.ts
CHANGED
|
@@ -19,7 +19,7 @@ export declare class AxSignature {
|
|
|
19
19
|
private outputFields;
|
|
20
20
|
private sigHash;
|
|
21
21
|
private sigString;
|
|
22
|
-
constructor(signature
|
|
22
|
+
constructor(signature?: Readonly<AxSignature | string>);
|
|
23
23
|
private parseParsedField;
|
|
24
24
|
private parseField;
|
|
25
25
|
setDescription: (desc: string) => void;
|
package/dsp/sig.js
CHANGED
|
@@ -7,6 +7,13 @@ export class AxSignature {
|
|
|
7
7
|
sigHash;
|
|
8
8
|
sigString;
|
|
9
9
|
constructor(signature) {
|
|
10
|
+
if (!signature) {
|
|
11
|
+
this.inputFields = [];
|
|
12
|
+
this.outputFields = [];
|
|
13
|
+
this.sigHash = '';
|
|
14
|
+
this.sigString = '';
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
10
17
|
if (typeof signature === 'string') {
|
|
11
18
|
let sig;
|
|
12
19
|
try {
|
package/dsp/sig.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sig.js","sourceRoot":"","sources":["../../dsp/sig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAIpC,OAAO,EAIL,cAAc,EACf,MAAM,aAAa,CAAC;AAwBrB,MAAM,OAAO,WAAW;IACd,WAAW,CAAU;IACrB,WAAW,CAAa;IACxB,YAAY,CAAa;IAEzB,OAAO,CAAS;IAChB,SAAS,CAAS;IAE1B,YAAY,
|
|
1
|
+
{"version":3,"file":"sig.js","sourceRoot":"","sources":["../../dsp/sig.ts"],"names":[],"mappings":"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"}
|