donobu 3.2.1 → 3.2.3
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/dist/assets/generated/version +1 -1
- package/dist/cli/playwright-json-to-markdown.js +2 -2
- package/dist/cli/playwright-json-to-markdown.js.map +1 -1
- package/dist/clients/DonobuGptClient.d.ts.map +1 -1
- package/dist/clients/DonobuGptClient.js +20 -3
- package/dist/clients/DonobuGptClient.js.map +1 -1
- package/dist/clients/GoogleGenerativeAiGptClient.d.ts +7 -7
- package/dist/clients/GoogleGenerativeAiGptClient.d.ts.map +1 -1
- package/dist/clients/GoogleGenerativeAiGptClient.js +40 -39
- package/dist/clients/GoogleGenerativeAiGptClient.js.map +1 -1
- package/dist/clients/GoogleVertexGptClient.d.ts +0 -7
- package/dist/clients/GoogleVertexGptClient.d.ts.map +1 -1
- package/dist/clients/GoogleVertexGptClient.js +4 -40
- package/dist/clients/GoogleVertexGptClient.js.map +1 -1
- package/dist/esm/assets/generated/version +1 -1
- package/dist/esm/cli/playwright-json-to-markdown.js +2 -2
- package/dist/esm/cli/playwright-json-to-markdown.js.map +1 -1
- package/dist/esm/clients/DonobuGptClient.d.ts.map +1 -1
- package/dist/esm/clients/DonobuGptClient.js +20 -3
- package/dist/esm/clients/DonobuGptClient.js.map +1 -1
- package/dist/esm/clients/GoogleGenerativeAiGptClient.d.ts +7 -7
- package/dist/esm/clients/GoogleGenerativeAiGptClient.d.ts.map +1 -1
- package/dist/esm/clients/GoogleGenerativeAiGptClient.js +40 -39
- package/dist/esm/clients/GoogleGenerativeAiGptClient.js.map +1 -1
- package/dist/esm/clients/GoogleVertexGptClient.d.ts +0 -7
- package/dist/esm/clients/GoogleVertexGptClient.d.ts.map +1 -1
- package/dist/esm/clients/GoogleVertexGptClient.js +4 -40
- package/dist/esm/clients/GoogleVertexGptClient.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
1435
|
|
@@ -163,7 +163,7 @@ function generateMarkdown(jsonData) {
|
|
|
163
163
|
const objective = (objectiveAnnotation.description || 'No objective provided').replace(/```/g, '\\`\\`\\`'); // escape triple backticks
|
|
164
164
|
markdown += `**Objective**:\n\`\`\`\n${objective}\n\`\`\`\n`;
|
|
165
165
|
}
|
|
166
|
-
markdown +=
|
|
166
|
+
markdown += `\n---\n\n`;
|
|
167
167
|
return;
|
|
168
168
|
}
|
|
169
169
|
const annotations = test.annotations ?? [];
|
|
@@ -217,7 +217,7 @@ function generateMarkdown(jsonData) {
|
|
|
217
217
|
}
|
|
218
218
|
markdown += `</details>\n\n`;
|
|
219
219
|
}
|
|
220
|
-
markdown +=
|
|
220
|
+
markdown += `\n---\n\n`;
|
|
221
221
|
});
|
|
222
222
|
});
|
|
223
223
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playwright-json-to-markdown.js","sourceRoot":"","sources":["../../src/cli/playwright-json-to-markdown.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"playwright-json-to-markdown.js","sourceRoot":"","sources":["../../src/cli/playwright-json-to-markdown.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DonobuGptClient.d.ts","sourceRoot":"","sources":["../../src/clients/DonobuGptClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"DonobuGptClient.d.ts","sourceRoot":"","sources":["../../src/clients/DonobuGptClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAsB,MAAM,aAAa,CAAC;AAI5D;;GAEG;AACH,qBAAa,eAAgB,SAAQ,SAAS;IAC5C,OAAO,CAAC,MAAM,CAAC,eAAe,CACqC;IACnE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkB;gBAExB,qBAAqB,EAAE,qBAAqB;IAYlD,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxD,UAAU,CACrB,QAAQ,EAAE,UAAU,EAAE,EACtB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,gBAAgB,CAAC;IAIf,mBAAmB,CAAC,CAAC,EAChC,QAAQ,EAAE,UAAU,EAAE,EACtB,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EACrB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;IA0BzB,YAAY,CACvB,QAAQ,EAAE,UAAU,EAAE,EACtB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,wBAAwB,CAAC;CAmBrC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DonobuGptClient = void 0;
|
|
4
|
+
const v4_1 = require("zod/v4");
|
|
4
5
|
const GptClient_1 = require("./GptClient");
|
|
5
6
|
const OpenAiGptClient_1 = require("./OpenAiGptClient");
|
|
7
|
+
const GoogleGenerativeAiGptClient_1 = require("./GoogleGenerativeAiGptClient");
|
|
6
8
|
/**
|
|
7
9
|
* A GPT client implemented using the Donobu API.
|
|
8
10
|
*/
|
|
@@ -28,7 +30,10 @@ class DonobuGptClient extends GptClient_1.GptClient {
|
|
|
28
30
|
{
|
|
29
31
|
name: 'output',
|
|
30
32
|
description: 'The schema of the expected response structure.',
|
|
31
|
-
inputSchema:
|
|
33
|
+
inputSchema: v4_1.z.preprocess((data) => {
|
|
34
|
+
(0, GoogleGenerativeAiGptClient_1.fixAssertFields)(data);
|
|
35
|
+
return data;
|
|
36
|
+
}, zodSchema),
|
|
32
37
|
},
|
|
33
38
|
], options);
|
|
34
39
|
const toolCall = resp.proposedToolCalls.at(0);
|
|
@@ -40,9 +45,21 @@ class DonobuGptClient extends GptClient_1.GptClient {
|
|
|
40
45
|
};
|
|
41
46
|
}
|
|
42
47
|
async getToolCalls(messages, tools, options) {
|
|
43
|
-
|
|
48
|
+
const preprocessedTools = tools.map((tool) => ({
|
|
49
|
+
name: tool.name,
|
|
50
|
+
description: tool.description,
|
|
51
|
+
inputSchema: v4_1.z.preprocess((data) => {
|
|
52
|
+
(0, GoogleGenerativeAiGptClient_1.fixAssertFields)(data);
|
|
53
|
+
return data;
|
|
54
|
+
}, tool.inputSchema),
|
|
55
|
+
}));
|
|
56
|
+
const resp = await this.delegate.getToolCalls(messages, preprocessedTools, options);
|
|
57
|
+
resp.proposedToolCalls.forEach((t) => {
|
|
58
|
+
(0, GoogleGenerativeAiGptClient_1.fixAssertFields)(t.parameters);
|
|
59
|
+
});
|
|
60
|
+
return resp;
|
|
44
61
|
}
|
|
45
62
|
}
|
|
46
63
|
exports.DonobuGptClient = DonobuGptClient;
|
|
47
|
-
DonobuGptClient.DEFAULT_API_URL = 'https://donobu-api-73193699649.us-central1.run.app';
|
|
64
|
+
DonobuGptClient.DEFAULT_API_URL = 'https://donobu-prd-api-service-73193699649.us-central1.run.app';
|
|
48
65
|
//# sourceMappingURL=DonobuGptClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DonobuGptClient.js","sourceRoot":"","sources":["../../src/clients/DonobuGptClient.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"DonobuGptClient.js","sourceRoot":"","sources":["../../src/clients/DonobuGptClient.ts"],"names":[],"mappings":";;;AACA,+BAA2B;AAU3B,2CAA4D;AAC5D,uDAAoD;AACpD,+EAAgE;AAEhE;;GAEG;AACH,MAAa,eAAgB,SAAQ,qBAAS;IAK5C,YAAmB,qBAA4C;QAC7D,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,IAAI,iCAAe,CACjC;YACE,IAAI,EAAE,QAAQ;YACd,SAAS,EAAE,EAAE;YACb,MAAM,EAAE,qBAAqB,CAAC,MAAM;SACrC,EACD,eAAe,CAAC,eAAe,CAChC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,QAAmC;QACnD,OAAO;IACT,CAAC;IAEM,KAAK,CAAC,UAAU,CACrB,QAAsB,EACtB,OAAkC;QAElC,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAC9B,QAAsB,EACtB,SAAqB,EACrB,OAAkC;QAElC,kFAAkF;QAClF,oDAAoD;QACpD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,CAC3C,QAAQ,EACR;YACE;gBACE,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,gDAAgD;gBAC7D,WAAW,EAAE,MAAC,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE;oBACjC,IAAA,6CAAe,EAAC,IAAI,CAAC,CAAC;oBACtB,OAAO,IAAI,CAAC;gBACd,CAAC,EAAE,SAAS,CAAC;aACd;SACF,EACD,OAAO,CACR,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9C,OAAO;YACL,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,IAAI,EAAE,mBAAmB;YACzB,MAAM,EAAE,IAAA,8BAAkB,EAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC;SAC5D,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,YAAY,CACvB,QAAsB,EACtB,KAAmB,EACnB,OAAkC;QAElC,MAAM,iBAAiB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7C,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,WAAW,EAAE,MAAC,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE;gBACjC,IAAA,6CAAe,EAAC,IAAI,CAAC,CAAC;gBACtB,OAAO,IAAI,CAAC;YACd,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC;SACrB,CAAC,CAAwB,CAAC;QAC3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,CAC3C,QAAQ,EACR,iBAAiB,EACjB,OAAO,CACR,CAAC;QACF,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACnC,IAAA,6CAAe,EAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;;AAhFH,0CAiFC;AAhFgB,+BAAe,GAC5B,gEAAgE,CAAC"}
|
|
@@ -22,12 +22,12 @@ export declare class GoogleGenerativeAiGptClient extends GptClient {
|
|
|
22
22
|
getToolCalls(messages: GptMessage[], tools: ToolOption[], options?: {
|
|
23
23
|
signal?: AbortSignal;
|
|
24
24
|
}): Promise<ProposedToolCallsMessage>;
|
|
25
|
-
/**
|
|
26
|
-
* Fix the "assert1" field issue in tool call parameters (Gemini has severe
|
|
27
|
-
* troubles trying to say the word "assert" on its own... really).
|
|
28
|
-
*
|
|
29
|
-
* Recursively search and replace any field containing "assert1" with "assert"
|
|
30
|
-
*/
|
|
31
|
-
private static fixAssertFields;
|
|
32
25
|
}
|
|
26
|
+
/**
|
|
27
|
+
* Fix the "assert1" field issue in tool call parameters (Gemini has severe
|
|
28
|
+
* troubles trying to say the word "assert" on its own... really).
|
|
29
|
+
*
|
|
30
|
+
* Recursively search and replace any field containing "assert1" with "assert"
|
|
31
|
+
*/
|
|
32
|
+
export declare function fixAssertFields(obj: unknown): void;
|
|
33
33
|
//# sourceMappingURL=GoogleGenerativeAiGptClient.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoogleGenerativeAiGptClient.d.ts","sourceRoot":"","sources":["../../src/clients/GoogleGenerativeAiGptClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAE3B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC;;;GAGG;AACH,qBAAa,2BAA4B,SAAQ,SAAS;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAY;gBAElB,MAAM,EAAE,wBAAwB;IAStC,IAAI,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvD,UAAU,CACrB,QAAQ,EAAE,UAAU,EAAE,EACtB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,gBAAgB,CAAC;IAOf,mBAAmB,CAAC,CAAC,EAChC,QAAQ,EAAE,UAAU,EAAE,EACtB,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EACzB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAazB,YAAY,CACvB,QAAQ,EAAE,UAAU,EAAE,EACtB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"GoogleGenerativeAiGptClient.d.ts","sourceRoot":"","sources":["../../src/clients/GoogleGenerativeAiGptClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAE3B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC;;;GAGG;AACH,qBAAa,2BAA4B,SAAQ,SAAS;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAY;gBAElB,MAAM,EAAE,wBAAwB;IAStC,IAAI,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvD,UAAU,CACrB,QAAQ,EAAE,UAAU,EAAE,EACtB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,gBAAgB,CAAC;IAOf,mBAAmB,CAAC,CAAC,EAChC,QAAQ,EAAE,UAAU,EAAE,EACtB,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EACzB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAazB,YAAY,CACvB,QAAQ,EAAE,UAAU,EAAE,EACtB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,wBAAwB,CAAC;CAmBrC;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAoClD"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.GoogleGenerativeAiGptClient = void 0;
|
|
4
|
+
exports.fixAssertFields = fixAssertFields;
|
|
4
5
|
const google_1 = require("@ai-sdk/google");
|
|
5
6
|
const v4_1 = require("zod/v4");
|
|
6
7
|
const MiscUtils_1 = require("../utils/MiscUtils");
|
|
@@ -27,7 +28,7 @@ class GoogleGenerativeAiGptClient extends GptClient_1.GptClient {
|
|
|
27
28
|
}
|
|
28
29
|
async getStructuredOutput(messages, zodSchema, options) {
|
|
29
30
|
const preprocessedSchema = v4_1.z.preprocess((data) => {
|
|
30
|
-
|
|
31
|
+
fixAssertFields(data);
|
|
31
32
|
return data;
|
|
32
33
|
}, zodSchema);
|
|
33
34
|
const resp = await this.delegate.getStructuredOutput(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), preprocessedSchema, options);
|
|
@@ -38,53 +39,53 @@ class GoogleGenerativeAiGptClient extends GptClient_1.GptClient {
|
|
|
38
39
|
name: tool.name,
|
|
39
40
|
description: tool.description,
|
|
40
41
|
inputSchema: v4_1.z.preprocess((data) => {
|
|
41
|
-
|
|
42
|
+
fixAssertFields(data);
|
|
42
43
|
return data;
|
|
43
44
|
}, tool.inputSchema),
|
|
44
45
|
}));
|
|
45
46
|
const resp = await this.delegate.getToolCalls(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), preprocessedTools, options);
|
|
46
47
|
resp.proposedToolCalls.forEach((t) => {
|
|
47
|
-
|
|
48
|
+
fixAssertFields(t.parameters);
|
|
48
49
|
});
|
|
49
50
|
return resp;
|
|
50
51
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
52
|
+
}
|
|
53
|
+
exports.GoogleGenerativeAiGptClient = GoogleGenerativeAiGptClient;
|
|
54
|
+
/**
|
|
55
|
+
* Fix the "assert1" field issue in tool call parameters (Gemini has severe
|
|
56
|
+
* troubles trying to say the word "assert" on its own... really).
|
|
57
|
+
*
|
|
58
|
+
* Recursively search and replace any field containing "assert1" with "assert"
|
|
59
|
+
*/
|
|
60
|
+
function fixAssertFields(obj) {
|
|
61
|
+
if (!obj || typeof obj !== 'object') {
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
if (Array.isArray(obj)) {
|
|
65
|
+
obj.forEach((item) => fixAssertFields(item));
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
const objRecord = obj;
|
|
69
|
+
// Check each property name for keys containing "assert1"
|
|
70
|
+
const keys = Object.keys(objRecord);
|
|
71
|
+
const keysToRename = [];
|
|
72
|
+
keys.forEach((key) => {
|
|
73
|
+
// If the key contains "assert1", prepare to rename it
|
|
74
|
+
if (key.includes('assert1')) {
|
|
75
|
+
// Create the new key by replacing all instances of "assert1" with "assert"
|
|
76
|
+
const newKey = key.replace(/assert1/g, 'assert');
|
|
77
|
+
keysToRename.push({ oldKey: key, newKey });
|
|
60
78
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
79
|
+
// Recursively process nested objects
|
|
80
|
+
if (objRecord[key] && typeof objRecord[key] === 'object') {
|
|
81
|
+
fixAssertFields(objRecord[key]);
|
|
64
82
|
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
const
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
// Create the new key by replacing all instances of "assert1" with "assert"
|
|
73
|
-
const newKey = key.replace(/assert1/g, 'assert');
|
|
74
|
-
keysToRename.push({ oldKey: key, newKey });
|
|
75
|
-
}
|
|
76
|
-
// Recursively process nested objects
|
|
77
|
-
if (objRecord[key] && typeof objRecord[key] === 'object') {
|
|
78
|
-
GoogleGenerativeAiGptClient.fixAssertFields(objRecord[key]);
|
|
79
|
-
}
|
|
80
|
-
});
|
|
81
|
-
// Apply all renames after iterating to avoid modifying the object during iteration
|
|
82
|
-
keysToRename.forEach(({ oldKey, newKey }) => {
|
|
83
|
-
const value = objRecord[oldKey];
|
|
84
|
-
delete objRecord[oldKey];
|
|
85
|
-
objRecord[newKey] = value;
|
|
86
|
-
});
|
|
87
|
-
}
|
|
83
|
+
});
|
|
84
|
+
// Apply all renames after iterating to avoid modifying the object during iteration
|
|
85
|
+
keysToRename.forEach(({ oldKey, newKey }) => {
|
|
86
|
+
const value = objRecord[oldKey];
|
|
87
|
+
delete objRecord[oldKey];
|
|
88
|
+
objRecord[newKey] = value;
|
|
89
|
+
});
|
|
88
90
|
}
|
|
89
|
-
exports.GoogleGenerativeAiGptClient = GoogleGenerativeAiGptClient;
|
|
90
91
|
//# sourceMappingURL=GoogleGenerativeAiGptClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoogleGenerativeAiGptClient.js","sourceRoot":"","sources":["../../src/clients/GoogleGenerativeAiGptClient.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"GoogleGenerativeAiGptClient.js","sourceRoot":"","sources":["../../src/clients/GoogleGenerativeAiGptClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,12 +22,5 @@ export declare class GoogleVertexGptClient extends GptClient {
|
|
|
22
22
|
getToolCalls(messages: GptMessage[], tools: ToolOption[], options?: {
|
|
23
23
|
signal?: AbortSignal;
|
|
24
24
|
}): Promise<ProposedToolCallsMessage>;
|
|
25
|
-
/**
|
|
26
|
-
* Fix the "assert1" field issue in tool call parameters (Gemini has severe
|
|
27
|
-
* troubles trying to say the word "assert" on its own... really).
|
|
28
|
-
*
|
|
29
|
-
* Recursively search and replace any field containing "assert1" with "assert"
|
|
30
|
-
*/
|
|
31
|
-
private static fixAssertFields;
|
|
32
25
|
}
|
|
33
26
|
//# sourceMappingURL=GoogleVertexGptClient.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoogleVertexGptClient.d.ts","sourceRoot":"","sources":["../../src/clients/GoogleVertexGptClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAG3B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"GoogleVertexGptClient.d.ts","sourceRoot":"","sources":["../../src/clients/GoogleVertexGptClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAG3B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAIxC;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,SAAS;IAClD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAY;gBAElB,MAAM,EAAE,kBAAkB;IAqBhC,IAAI,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvD,UAAU,CACrB,QAAQ,EAAE,UAAU,EAAE,EACtB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,gBAAgB,CAAC;IAOf,mBAAmB,CAAC,CAAC,EAChC,QAAQ,EAAE,UAAU,EAAE,EACtB,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EACzB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAazB,YAAY,CACvB,QAAQ,EAAE,UAAU,EAAE,EACtB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,wBAAwB,CAAC;CAmBrC"}
|
|
@@ -7,6 +7,7 @@ const GptPlatformAuthenticationFailedException_1 = require("../exceptions/GptPla
|
|
|
7
7
|
const MiscUtils_1 = require("../utils/MiscUtils");
|
|
8
8
|
const GptClient_1 = require("./GptClient");
|
|
9
9
|
const VercelAiGptClient_1 = require("./VercelAiGptClient");
|
|
10
|
+
const GoogleGenerativeAiGptClient_1 = require("./GoogleGenerativeAiGptClient");
|
|
10
11
|
/**
|
|
11
12
|
* Implementation using the Google Vertex API
|
|
12
13
|
* @see https://ai-sdk.dev/providers/ai-sdk-providers/google-vertex
|
|
@@ -35,7 +36,7 @@ class GoogleVertexGptClient extends GptClient_1.GptClient {
|
|
|
35
36
|
}
|
|
36
37
|
async getStructuredOutput(messages, zodSchema, options) {
|
|
37
38
|
const preprocessedSchema = v4_1.z.preprocess((data) => {
|
|
38
|
-
|
|
39
|
+
(0, GoogleGenerativeAiGptClient_1.fixAssertFields)(data);
|
|
39
40
|
return data;
|
|
40
41
|
}, zodSchema);
|
|
41
42
|
const resp = await this.delegate.getStructuredOutput(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), preprocessedSchema, options);
|
|
@@ -46,53 +47,16 @@ class GoogleVertexGptClient extends GptClient_1.GptClient {
|
|
|
46
47
|
name: tool.name,
|
|
47
48
|
description: tool.description,
|
|
48
49
|
inputSchema: v4_1.z.preprocess((data) => {
|
|
49
|
-
|
|
50
|
+
(0, GoogleGenerativeAiGptClient_1.fixAssertFields)(data);
|
|
50
51
|
return data;
|
|
51
52
|
}, tool.inputSchema),
|
|
52
53
|
}));
|
|
53
54
|
const resp = await this.delegate.getToolCalls(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), preprocessedTools, options);
|
|
54
55
|
resp.proposedToolCalls.forEach((t) => {
|
|
55
|
-
|
|
56
|
+
(0, GoogleGenerativeAiGptClient_1.fixAssertFields)(t.parameters);
|
|
56
57
|
});
|
|
57
58
|
return resp;
|
|
58
59
|
}
|
|
59
|
-
/**
|
|
60
|
-
* Fix the "assert1" field issue in tool call parameters (Gemini has severe
|
|
61
|
-
* troubles trying to say the word "assert" on its own... really).
|
|
62
|
-
*
|
|
63
|
-
* Recursively search and replace any field containing "assert1" with "assert"
|
|
64
|
-
*/
|
|
65
|
-
static fixAssertFields(obj) {
|
|
66
|
-
if (!obj || typeof obj !== 'object') {
|
|
67
|
-
return;
|
|
68
|
-
}
|
|
69
|
-
if (Array.isArray(obj)) {
|
|
70
|
-
obj.forEach((item) => GoogleVertexGptClient.fixAssertFields(item));
|
|
71
|
-
return;
|
|
72
|
-
}
|
|
73
|
-
const objRecord = obj;
|
|
74
|
-
// Check each property name for keys containing "assert1"
|
|
75
|
-
const keys = Object.keys(objRecord);
|
|
76
|
-
const keysToRename = [];
|
|
77
|
-
keys.forEach((key) => {
|
|
78
|
-
// If the key contains "assert1", prepare to rename it
|
|
79
|
-
if (key.includes('assert1')) {
|
|
80
|
-
// Create the new key by replacing all instances of "assert1" with "assert"
|
|
81
|
-
const newKey = key.replace(/assert1/g, 'assert');
|
|
82
|
-
keysToRename.push({ oldKey: key, newKey });
|
|
83
|
-
}
|
|
84
|
-
// Recursively process nested objects
|
|
85
|
-
if (objRecord[key] && typeof objRecord[key] === 'object') {
|
|
86
|
-
GoogleVertexGptClient.fixAssertFields(objRecord[key]);
|
|
87
|
-
}
|
|
88
|
-
});
|
|
89
|
-
// Apply all renames after iterating to avoid modifying the object during iteration
|
|
90
|
-
keysToRename.forEach(({ oldKey, newKey }) => {
|
|
91
|
-
const value = objRecord[oldKey];
|
|
92
|
-
delete objRecord[oldKey];
|
|
93
|
-
objRecord[newKey] = value;
|
|
94
|
-
});
|
|
95
|
-
}
|
|
96
60
|
}
|
|
97
61
|
exports.GoogleVertexGptClient = GoogleVertexGptClient;
|
|
98
62
|
//# sourceMappingURL=GoogleVertexGptClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoogleVertexGptClient.js","sourceRoot":"","sources":["../../src/clients/GoogleVertexGptClient.ts"],"names":[],"mappings":";;;AAAA,yDAAqD;AACrD,+BAA2B;AAE3B,qHAAkH;AAQlH,kDAA+C;AAE/C,2CAAwC;AACxC,2DAAwD;
|
|
1
|
+
{"version":3,"file":"GoogleVertexGptClient.js","sourceRoot":"","sources":["../../src/clients/GoogleVertexGptClient.ts"],"names":[],"mappings":";;;AAAA,yDAAqD;AACrD,+BAA2B;AAE3B,qHAAkH;AAQlH,kDAA+C;AAE/C,2CAAwC;AACxC,2DAAwD;AACxD,+EAAgE;AAEhE;;;GAGG;AACH,MAAa,qBAAsB,SAAQ,qBAAS;IAGlD,YAAmB,MAA0B;QAC3C,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAA,4BAAY,EAAC,MAAM,CAAC,CAAC;YACpC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACvC,IAAI,CAAC,QAAQ,GAAG,IAAI,qCAAiB,CAAC,KAAK,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,KAAK,GAAG,CAAU,CAAC;YAEzB,IAAI,KAAK,CAAC,IAAI,IAAI,qBAAqB,EAAE,CAAC;gBACxC,MAAM,IAAI,mFAAwC,CAChD,MAAM,CAAC,IAAI,EACX,KAAK,CAAC,OAAO,CACd,CAAC;YACJ,CAAC;YAED,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,OAAkC;QAClD,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAEM,KAAK,CAAC,UAAU,CACrB,QAAsB,EACtB,OAAkC;QAElC,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAC7B,qBAAS,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAC7C,OAAO,CACR,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAC9B,QAAsB,EACtB,SAAyB,EACzB,OAAkC;QAElC,MAAM,kBAAkB,GAAG,MAAC,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE;YAC/C,IAAA,6CAAe,EAAC,IAAI,CAAC,CAAC;YACtB,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,SAAS,CAAC,CAAC;QACd,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAClD,qBAAS,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAC7C,kBAAkB,EAClB,OAAO,CACR,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,YAAY,CACvB,QAAsB,EACtB,KAAmB,EACnB,OAAkC;QAElC,MAAM,iBAAiB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7C,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,WAAW,EAAE,MAAC,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE;gBACjC,IAAA,6CAAe,EAAC,IAAI,CAAC,CAAC;gBACtB,OAAO,IAAI,CAAC;YACd,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC;SACrB,CAAC,CAAwB,CAAC;QAC3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,CAC3C,qBAAS,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAC7C,iBAAiB,EACjB,OAAO,CACR,CAAC;QACF,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACnC,IAAA,6CAAe,EAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA9ED,sDA8EC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
|
|
1
|
+
1435
|
|
@@ -163,7 +163,7 @@ function generateMarkdown(jsonData) {
|
|
|
163
163
|
const objective = (objectiveAnnotation.description || 'No objective provided').replace(/```/g, '\\`\\`\\`'); // escape triple backticks
|
|
164
164
|
markdown += `**Objective**:\n\`\`\`\n${objective}\n\`\`\`\n`;
|
|
165
165
|
}
|
|
166
|
-
markdown +=
|
|
166
|
+
markdown += `\n---\n\n`;
|
|
167
167
|
return;
|
|
168
168
|
}
|
|
169
169
|
const annotations = test.annotations ?? [];
|
|
@@ -217,7 +217,7 @@ function generateMarkdown(jsonData) {
|
|
|
217
217
|
}
|
|
218
218
|
markdown += `</details>\n\n`;
|
|
219
219
|
}
|
|
220
|
-
markdown +=
|
|
220
|
+
markdown += `\n---\n\n`;
|
|
221
221
|
});
|
|
222
222
|
});
|
|
223
223
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"playwright-json-to-markdown.js","sourceRoot":"","sources":["../../../src/cli/playwright-json-to-markdown.ts"],"names":[],"mappings":";;AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;;AAEH,2BAAkC;AAElC,SAAS,cAAc,CAAC,GAAW;IACjC,OAAO,GAAG,CAAC,OAAO,CAChB,6EAA6E,EAC7E,EAAE,CACH,CAAC;AACJ,CAAC;AAED,gDAAgD;AAChD,SAAS,cAAc,CAAC,EAAU;IAChC,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;QACd,OAAO,GAAG,EAAE,IAAI,CAAC;IACnB,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IACtC,IAAI,OAAO,GAAG,EAAE,EAAE,CAAC;QACjB,OAAO,GAAG,OAAO,GAAG,CAAC;IACvB,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;IACzC,MAAM,gBAAgB,GAAG,OAAO,GAAG,EAAE,CAAC;IACtC,OAAO,GAAG,OAAO,KAAK,gBAAgB,GAAG,CAAC;AAC5C,CAAC;AAED,wCAAwC;AACxC,SAAS,SAAS;IAChB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACnD,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,kBAAkB;IAChE,CAAC;AACH,CAAC;AAED,mCAAmC;AACnC,SAAS,gBAAgB,CAAC,QAAa;IACrC,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IAC5B,uBAAuB;IACvB,IAAI,QAAQ,GAAG,8BAA8B,CAAC;IAC9C,IAAI,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,EAAE,CAAC;QAC1C,QAAQ,IAAI,iFAAiF,CAAC;IAChG,CAAC;IAED,gBAAgB;IAChB,QAAQ,IAAI,gBAAgB,CAAC;IAC7B,+CAA+C;IAC/C,QAAQ,IAAI,2FAA2F,CAAC;IACxG,QAAQ,IAAI,qCAAqC,CAAC;IAClD,+BAA+B;IAC/B,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,IAAI,eAAe,GAAG,CAAC,CAAC;IACxB,IAAI,aAAa,GAAG,CAAC,CAAC;IAEtB,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;QAC5B,sCAAsC;QACtC,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,UAAU,GAAG,CAAC,CAAC;QAEnB,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CACrC,CAAC,KAAa,EAAE,IAAS,EAAE,EAAE,CAC3B,KAAK;YACL,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,SAAiB,EAAE,IAAS,EAAE,EAAE;gBACjD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnD,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;gBAC3C,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,CACpC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CACrC,CAAC;gBACF,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,KAAK,QAAQ,CAAC;gBACpD,MAAM,YAAY,GAAG,aAAa,IAAI,YAAY,CAAC;gBAEnD,IACE,IAAI,CAAC,MAAM,KAAK,SAAS;oBACzB,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,EACtC,CAAC;oBACD,OAAO,EAAE,CAAC;gBACZ,CAAC;qBAAM,IAAI,MAAM,EAAE,CAAC;oBAClB,IAAI,YAAY,EAAE,CAAC;wBACjB,UAAU,EAAE,CAAC;oBACf,CAAC;yBAAM,CAAC;wBACN,QAAQ,MAAM,CAAC,MAAM,EAAE,CAAC;4BACtB,KAAK,QAAQ;gCACX,MAAM,EAAE,CAAC;gCACT,MAAM;4BACR,KAAK,QAAQ;gCACX,MAAM,EAAE,CAAC;gCACT,MAAM;4BACR,KAAK,UAAU;gCACb,QAAQ,EAAE,CAAC;gCACX,MAAM;4BACR,KAAK,SAAS;gCACZ,OAAO,EAAE,CAAC;gCACV,MAAM;4BACR,KAAK,aAAa;gCAChB,WAAW,EAAE,CAAC;gCACd,MAAM;wBACV,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,OAAO,SAAS,GAAG,CAAC,MAAM,EAAE,QAAQ,IAAI,CAAC,CAAC,CAAC;YAC7C,CAAC,EAAE,CAAC,CAAC,EACP,CAAC,CACF,CAAC;QAEF,gBAAgB;QAChB,WAAW,IAAI,MAAM,CAAC;QACtB,WAAW,IAAI,MAAM,CAAC;QACtB,aAAa,IAAI,QAAQ,CAAC;QAC1B,YAAY,IAAI,OAAO,CAAC;QACxB,gBAAgB,IAAI,WAAW,CAAC;QAChC,eAAe,IAAI,UAAU,CAAC;QAC9B,aAAa,IAAI,YAAY,CAAC;QAE9B,QAAQ,IAAI,KAAK,KAAK,CAAC,IAAI,MAAM,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,UAAU,CAAC,CAAC,CAAC,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,QAAQ,CAAC,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,WAAW,CAAC,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC;IACzS,CAAC,CAAC,CAAC;IAEH,iBAAiB;IACjB,QAAQ,IAAI,mBAAmB,WAAW,GAAG,IAAI,UAAU,eAAe,GAAG,QAAQ,UAAU,WAAW,GAAG,IAAI,UAAU,aAAa,GAAG,IAAI,UAAU,YAAY,GAAG,KAAK,UAAU,gBAAgB,GAAG,IAAI,UAAU,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC;IAE9P,QAAQ,IAAI,IAAI,CAAC;IAEjB,iCAAiC;IACjC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;QAC5B,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC;QAC5B,QAAQ,IAAI,MAAM,QAAQ,MAAM,CAAC;QAEjC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,EAAE;YAChC,QAAQ,IAAI,OAAO,IAAI,CAAC,KAAK,MAAM,CAAC;YAEpC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,EAAE;gBAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEnD,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;oBACtE,QAAQ,IAAI,4BAA4B,CAAC;oBACzC,QAAQ,IAAI,uBAAuB,CAAC;oBACpC,MAAM,mBAAmB,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAChD,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CACnC,CAAC;oBACF,IAAI,mBAAmB,EAAE,CAAC;wBACxB,MAAM,SAAS,GAAG,CAChB,mBAAmB,CAAC,WAAW,IAAI,uBAAuB,CAC3D,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,0BAA0B;wBAC1D,QAAQ,IAAI,2BAA2B,SAAS,YAAY,CAAC;oBAC/D,CAAC;oBACD,QAAQ,IAAI,
|
|
1
|
+
{"version":3,"file":"playwright-json-to-markdown.js","sourceRoot":"","sources":["../../../src/cli/playwright-json-to-markdown.ts"],"names":[],"mappings":";;AAEA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;;AAEH,2BAAkC;AAElC,SAAS,cAAc,CAAC,GAAW;IACjC,OAAO,GAAG,CAAC,OAAO,CAChB,6EAA6E,EAC7E,EAAE,CACH,CAAC;AACJ,CAAC;AAED,gDAAgD;AAChD,SAAS,cAAc,CAAC,EAAU;IAChC,IAAI,EAAE,GAAG,IAAI,EAAE,CAAC;QACd,OAAO,GAAG,EAAE,IAAI,CAAC;IACnB,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,GAAG,IAAI,CAAC,CAAC;IACtC,IAAI,OAAO,GAAG,EAAE,EAAE,CAAC;QACjB,OAAO,GAAG,OAAO,GAAG,CAAC;IACvB,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,EAAE,CAAC,CAAC;IACzC,MAAM,gBAAgB,GAAG,OAAO,GAAG,EAAE,CAAC;IACtC,OAAO,GAAG,OAAO,KAAK,gBAAgB,GAAG,CAAC;AAC5C,CAAC;AAED,wCAAwC;AACxC,SAAS,SAAS;IAChB,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACnC,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACpB,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IACnD,CAAC;SAAM,CAAC;QACN,OAAO,IAAI,CAAC,KAAK,CAAC,IAAA,iBAAY,EAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,kBAAkB;IAChE,CAAC;AACH,CAAC;AAED,mCAAmC;AACnC,SAAS,gBAAgB,CAAC,QAAa;IACrC,MAAM,EAAE,MAAM,EAAE,GAAG,QAAQ,CAAC;IAC5B,uBAAuB;IACvB,IAAI,QAAQ,GAAG,8BAA8B,CAAC;IAC9C,IAAI,QAAQ,CAAC,QAAQ,EAAE,kBAAkB,EAAE,CAAC;QAC1C,QAAQ,IAAI,iFAAiF,CAAC;IAChG,CAAC;IAED,gBAAgB;IAChB,QAAQ,IAAI,gBAAgB,CAAC;IAC7B,+CAA+C;IAC/C,QAAQ,IAAI,2FAA2F,CAAC;IACxG,QAAQ,IAAI,qCAAqC,CAAC;IAClD,+BAA+B;IAC/B,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,WAAW,GAAG,CAAC,CAAC;IACpB,IAAI,aAAa,GAAG,CAAC,CAAC;IACtB,IAAI,YAAY,GAAG,CAAC,CAAC;IACrB,IAAI,gBAAgB,GAAG,CAAC,CAAC;IACzB,IAAI,eAAe,GAAG,CAAC,CAAC;IACxB,IAAI,aAAa,GAAG,CAAC,CAAC;IAEtB,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;QAC5B,sCAAsC;QACtC,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,MAAM,GAAG,CAAC,CAAC;QACf,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,IAAI,OAAO,GAAG,CAAC,CAAC;QAChB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,UAAU,GAAG,CAAC,CAAC;QAEnB,MAAM,YAAY,GAAG,KAAK,CAAC,KAAK,CAAC,MAAM,CACrC,CAAC,KAAa,EAAE,IAAS,EAAE,EAAE,CAC3B,KAAK;YACL,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,SAAiB,EAAE,IAAS,EAAE,EAAE;gBACjD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnD,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;gBAC3C,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,CACpC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CACrC,CAAC;gBACF,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,KAAK,QAAQ,CAAC;gBACpD,MAAM,YAAY,GAAG,aAAa,IAAI,YAAY,CAAC;gBAEnD,IACE,IAAI,CAAC,MAAM,KAAK,SAAS;oBACzB,CAAC,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,EACtC,CAAC;oBACD,OAAO,EAAE,CAAC;gBACZ,CAAC;qBAAM,IAAI,MAAM,EAAE,CAAC;oBAClB,IAAI,YAAY,EAAE,CAAC;wBACjB,UAAU,EAAE,CAAC;oBACf,CAAC;yBAAM,CAAC;wBACN,QAAQ,MAAM,CAAC,MAAM,EAAE,CAAC;4BACtB,KAAK,QAAQ;gCACX,MAAM,EAAE,CAAC;gCACT,MAAM;4BACR,KAAK,QAAQ;gCACX,MAAM,EAAE,CAAC;gCACT,MAAM;4BACR,KAAK,UAAU;gCACb,QAAQ,EAAE,CAAC;gCACX,MAAM;4BACR,KAAK,SAAS;gCACZ,OAAO,EAAE,CAAC;gCACV,MAAM;4BACR,KAAK,aAAa;gCAChB,WAAW,EAAE,CAAC;gCACd,MAAM;wBACV,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,OAAO,SAAS,GAAG,CAAC,MAAM,EAAE,QAAQ,IAAI,CAAC,CAAC,CAAC;YAC7C,CAAC,EAAE,CAAC,CAAC,EACP,CAAC,CACF,CAAC;QAEF,gBAAgB;QAChB,WAAW,IAAI,MAAM,CAAC;QACtB,WAAW,IAAI,MAAM,CAAC;QACtB,aAAa,IAAI,QAAQ,CAAC;QAC1B,YAAY,IAAI,OAAO,CAAC;QACxB,gBAAgB,IAAI,WAAW,CAAC;QAChC,eAAe,IAAI,UAAU,CAAC;QAC9B,aAAa,IAAI,YAAY,CAAC;QAE9B,QAAQ,IAAI,KAAK,KAAK,CAAC,IAAI,MAAM,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,UAAU,CAAC,CAAC,CAAC,UAAU,GAAG,QAAQ,CAAC,CAAC,CAAC,EAAE,MAAM,MAAM,CAAC,CAAC,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,QAAQ,CAAC,CAAC,CAAC,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,WAAW,CAAC,CAAC,CAAC,WAAW,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,MAAM,cAAc,CAAC,YAAY,CAAC,MAAM,CAAC;IACzS,CAAC,CAAC,CAAC;IAEH,iBAAiB;IACjB,QAAQ,IAAI,mBAAmB,WAAW,GAAG,IAAI,UAAU,eAAe,GAAG,QAAQ,UAAU,WAAW,GAAG,IAAI,UAAU,aAAa,GAAG,IAAI,UAAU,YAAY,GAAG,KAAK,UAAU,gBAAgB,GAAG,IAAI,UAAU,cAAc,CAAC,aAAa,CAAC,QAAQ,CAAC;IAE9P,QAAQ,IAAI,IAAI,CAAC;IAEjB,iCAAiC;IACjC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAU,EAAE,EAAE;QAC5B,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC;QAC5B,QAAQ,IAAI,MAAM,QAAQ,MAAM,CAAC;QAEjC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,EAAE;YAChC,QAAQ,IAAI,OAAO,IAAI,CAAC,KAAK,MAAM,CAAC;YAEpC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAS,EAAE,EAAE;gBAC/B,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;gBAEnD,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;oBACtE,QAAQ,IAAI,4BAA4B,CAAC;oBACzC,QAAQ,IAAI,uBAAuB,CAAC;oBACpC,MAAM,mBAAmB,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAChD,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CACnC,CAAC;oBACF,IAAI,mBAAmB,EAAE,CAAC;wBACxB,MAAM,SAAS,GAAG,CAChB,mBAAmB,CAAC,WAAW,IAAI,uBAAuB,CAC3D,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,0BAA0B;wBAC1D,QAAQ,IAAI,2BAA2B,SAAS,YAAY,CAAC;oBAC/D,CAAC;oBACD,QAAQ,IAAI,WAAW,CAAC;oBACxB,OAAO;gBACT,CAAC;gBAED,MAAM,WAAW,GAAG,IAAI,CAAC,WAAW,IAAI,EAAE,CAAC;gBAC3C,MAAM,aAAa,GAAG,WAAW,CAAC,IAAI,CACpC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,aAAa,CACrC,CAAC;gBACF,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,KAAK,QAAQ,CAAC;gBACpD,MAAM,YAAY,GAAG,aAAa,IAAI,YAAY,CAAC;gBAEnD,sEAAsE;gBACtE,IAAI,MAAc,CAAC;gBACnB,IAAI,YAAY,EAAE,CAAC;oBACjB,MAAM,GAAG,cAAc,CAAC;gBAC1B,CAAC;qBAAM,CAAC;oBACN,QAAQ,MAAM,CAAC,MAAM,EAAE,CAAC;wBACtB,KAAK,QAAQ;4BACX,MAAM,GAAG,UAAU,CAAC;4BACpB,MAAM;wBACR,KAAK,QAAQ;4BACX,MAAM,GAAG,UAAU,CAAC;4BACpB,MAAM;wBACR,KAAK,UAAU;4BACb,MAAM,GAAG,aAAa,CAAC;4BACvB,MAAM;wBACR,KAAK,SAAS;4BACZ,MAAM,GAAG,YAAY,CAAC;4BACtB,MAAM;wBACR,KAAK,aAAa;4BAChB,MAAM,GAAG,eAAe,CAAC;4BACzB,MAAM;wBACR;4BACE,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,IAAI,SAAS,EAAE,CAAC;oBAChD,CAAC;gBACH,CAAC;gBAED,MAAM,QAAQ,GAAG,cAAc,CAAC,MAAM,CAAC,QAAQ,IAAI,CAAC,CAAC,CAAC;gBAEtD,QAAQ,IAAI,eAAe,MAAM,MAAM,CAAC;gBACxC,QAAQ,IAAI,iBAAiB,QAAQ,MAAM,CAAC;gBAC5C,IAAI,YAAY,EAAE,CAAC;oBACjB,QAAQ,IAAI,qGAAqG,CAAC;gBACpH,CAAC;gBACD,MAAM,mBAAmB,GAAG,IAAI,CAAC,WAAW,EAAE,IAAI,CAChD,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,WAAW,CACnC,CAAC;gBACF,IAAI,mBAAmB,EAAE,CAAC;oBACxB,MAAM,SAAS,GAAG,CAChB,mBAAmB,CAAC,WAAW,IAAI,uBAAuB,CAC3D,CAAC,OAAO,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC,0BAA0B;oBAC1D,QAAQ,IAAI,2BAA2B,SAAS,YAAY,CAAC;gBAC/D,CAAC;gBAED,mCAAmC;gBACnC,IAAI,MAAM,CAAC,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;oBAC/C,QAAQ,IAAI,sDAAsD,CAAC;oBACnE,QAAQ,IAAI,WAAW,MAAM,CAAC,KAAK,CAAC,OAAO,IAAI,4BAA4B,cAAc,CAAC;oBAE1F,oCAAoC;oBACpC,IAAI,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;wBACzB,QAAQ,IAAI,8BAA8B,cAAc,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,CAAC;oBAC/F,CAAC;oBAED,QAAQ,IAAI,gBAAgB,CAAC;gBAC/B,CAAC;gBAED,QAAQ,IAAI,WAAW,CAAC;YAC1B,CAAC,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IACE,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,EAAE,iBAAiB,CAAC;QACnD,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAC9C,CAAC;QACD,QAAQ,IAAI,2BAA2B,CAAC;QACxC,QAAQ,CAAC,QAAQ,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,KAAa,EAAE,EAAE;YAC5D,QAAQ,IAAI,WAAW,KAAK,IAAI,CAAC;QACnC,CAAC,CAAC,CAAC;QACH,QAAQ,IAAI,IAAI,CAAC;IACnB,CAAC;IAED,uBAAuB;IACvB,QAAQ,IAAI,wBAAwB,IAAI,IAAI,EAAE,CAAC,cAAc,EAAE,eAAe,CAAC;IAE/E,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,iBAAiB;AACjB,IAAI,CAAC;IACH,MAAM,QAAQ,GAAG,SAAS,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,gBAAgB,CAAC,QAAQ,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AACxB,CAAC;AAAC,OAAO,KAAK,EAAE,CAAC;IACf,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAG,KAAa,CAAC,OAAO,CAAC,CAAC;IACjE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAClB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DonobuGptClient.d.ts","sourceRoot":"","sources":["../../../src/clients/DonobuGptClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"DonobuGptClient.d.ts","sourceRoot":"","sources":["../../../src/clients/DonobuGptClient.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAC;AAGtC,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAsB,MAAM,aAAa,CAAC;AAI5D;;GAEG;AACH,qBAAa,eAAgB,SAAQ,SAAS;IAC5C,OAAO,CAAC,MAAM,CAAC,eAAe,CACqC;IACnE,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkB;gBAExB,qBAAqB,EAAE,qBAAqB;IAYlD,IAAI,CAAC,QAAQ,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxD,UAAU,CACrB,QAAQ,EAAE,UAAU,EAAE,EACtB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,gBAAgB,CAAC;IAIf,mBAAmB,CAAC,CAAC,EAChC,QAAQ,EAAE,UAAU,EAAE,EACtB,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EACrB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;IA0BzB,YAAY,CACvB,QAAQ,EAAE,UAAU,EAAE,EACtB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,wBAAwB,CAAC;CAmBrC"}
|
|
@@ -1,8 +1,10 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.DonobuGptClient = void 0;
|
|
4
|
+
const v4_1 = require("zod/v4");
|
|
4
5
|
const GptClient_1 = require("./GptClient");
|
|
5
6
|
const OpenAiGptClient_1 = require("./OpenAiGptClient");
|
|
7
|
+
const GoogleGenerativeAiGptClient_1 = require("./GoogleGenerativeAiGptClient");
|
|
6
8
|
/**
|
|
7
9
|
* A GPT client implemented using the Donobu API.
|
|
8
10
|
*/
|
|
@@ -28,7 +30,10 @@ class DonobuGptClient extends GptClient_1.GptClient {
|
|
|
28
30
|
{
|
|
29
31
|
name: 'output',
|
|
30
32
|
description: 'The schema of the expected response structure.',
|
|
31
|
-
inputSchema:
|
|
33
|
+
inputSchema: v4_1.z.preprocess((data) => {
|
|
34
|
+
(0, GoogleGenerativeAiGptClient_1.fixAssertFields)(data);
|
|
35
|
+
return data;
|
|
36
|
+
}, zodSchema),
|
|
32
37
|
},
|
|
33
38
|
], options);
|
|
34
39
|
const toolCall = resp.proposedToolCalls.at(0);
|
|
@@ -40,9 +45,21 @@ class DonobuGptClient extends GptClient_1.GptClient {
|
|
|
40
45
|
};
|
|
41
46
|
}
|
|
42
47
|
async getToolCalls(messages, tools, options) {
|
|
43
|
-
|
|
48
|
+
const preprocessedTools = tools.map((tool) => ({
|
|
49
|
+
name: tool.name,
|
|
50
|
+
description: tool.description,
|
|
51
|
+
inputSchema: v4_1.z.preprocess((data) => {
|
|
52
|
+
(0, GoogleGenerativeAiGptClient_1.fixAssertFields)(data);
|
|
53
|
+
return data;
|
|
54
|
+
}, tool.inputSchema),
|
|
55
|
+
}));
|
|
56
|
+
const resp = await this.delegate.getToolCalls(messages, preprocessedTools, options);
|
|
57
|
+
resp.proposedToolCalls.forEach((t) => {
|
|
58
|
+
(0, GoogleGenerativeAiGptClient_1.fixAssertFields)(t.parameters);
|
|
59
|
+
});
|
|
60
|
+
return resp;
|
|
44
61
|
}
|
|
45
62
|
}
|
|
46
63
|
exports.DonobuGptClient = DonobuGptClient;
|
|
47
|
-
DonobuGptClient.DEFAULT_API_URL = 'https://donobu-api-73193699649.us-central1.run.app';
|
|
64
|
+
DonobuGptClient.DEFAULT_API_URL = 'https://donobu-prd-api-service-73193699649.us-central1.run.app';
|
|
48
65
|
//# sourceMappingURL=DonobuGptClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DonobuGptClient.js","sourceRoot":"","sources":["../../../src/clients/DonobuGptClient.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"DonobuGptClient.js","sourceRoot":"","sources":["../../../src/clients/DonobuGptClient.ts"],"names":[],"mappings":";;;AACA,+BAA2B;AAU3B,2CAA4D;AAC5D,uDAAoD;AACpD,+EAAgE;AAEhE;;GAEG;AACH,MAAa,eAAgB,SAAQ,qBAAS;IAK5C,YAAmB,qBAA4C;QAC7D,KAAK,CAAC,qBAAqB,CAAC,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,IAAI,iCAAe,CACjC;YACE,IAAI,EAAE,QAAQ;YACd,SAAS,EAAE,EAAE;YACb,MAAM,EAAE,qBAAqB,CAAC,MAAM;SACrC,EACD,eAAe,CAAC,eAAe,CAChC,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,QAAmC;QACnD,OAAO;IACT,CAAC;IAEM,KAAK,CAAC,UAAU,CACrB,QAAsB,EACtB,OAAkC;QAElC,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAC9B,QAAsB,EACtB,SAAqB,EACrB,OAAkC;QAElC,kFAAkF;QAClF,oDAAoD;QACpD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,CAC3C,QAAQ,EACR;YACE;gBACE,IAAI,EAAE,QAAQ;gBACd,WAAW,EAAE,gDAAgD;gBAC7D,WAAW,EAAE,MAAC,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE;oBACjC,IAAA,6CAAe,EAAC,IAAI,CAAC,CAAC;oBACtB,OAAO,IAAI,CAAC;gBACd,CAAC,EAAE,SAAS,CAAC;aACd;SACF,EACD,OAAO,CACR,CAAC;QACF,MAAM,QAAQ,GAAG,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9C,OAAO;YACL,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;YACvC,IAAI,EAAE,mBAAmB;YACzB,MAAM,EAAE,IAAA,8BAAkB,EAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC;SAC5D,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,YAAY,CACvB,QAAsB,EACtB,KAAmB,EACnB,OAAkC;QAElC,MAAM,iBAAiB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7C,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,WAAW,EAAE,MAAC,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE;gBACjC,IAAA,6CAAe,EAAC,IAAI,CAAC,CAAC;gBACtB,OAAO,IAAI,CAAC;YACd,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC;SACrB,CAAC,CAAwB,CAAC;QAC3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,CAC3C,QAAQ,EACR,iBAAiB,EACjB,OAAO,CACR,CAAC;QACF,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACnC,IAAA,6CAAe,EAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;;AAhFH,0CAiFC;AAhFgB,+BAAe,GAC5B,gEAAgE,CAAC"}
|
|
@@ -22,12 +22,12 @@ export declare class GoogleGenerativeAiGptClient extends GptClient {
|
|
|
22
22
|
getToolCalls(messages: GptMessage[], tools: ToolOption[], options?: {
|
|
23
23
|
signal?: AbortSignal;
|
|
24
24
|
}): Promise<ProposedToolCallsMessage>;
|
|
25
|
-
/**
|
|
26
|
-
* Fix the "assert1" field issue in tool call parameters (Gemini has severe
|
|
27
|
-
* troubles trying to say the word "assert" on its own... really).
|
|
28
|
-
*
|
|
29
|
-
* Recursively search and replace any field containing "assert1" with "assert"
|
|
30
|
-
*/
|
|
31
|
-
private static fixAssertFields;
|
|
32
25
|
}
|
|
26
|
+
/**
|
|
27
|
+
* Fix the "assert1" field issue in tool call parameters (Gemini has severe
|
|
28
|
+
* troubles trying to say the word "assert" on its own... really).
|
|
29
|
+
*
|
|
30
|
+
* Recursively search and replace any field containing "assert1" with "assert"
|
|
31
|
+
*/
|
|
32
|
+
export declare function fixAssertFields(obj: unknown): void;
|
|
33
33
|
//# sourceMappingURL=GoogleGenerativeAiGptClient.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoogleGenerativeAiGptClient.d.ts","sourceRoot":"","sources":["../../../src/clients/GoogleGenerativeAiGptClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAE3B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC;;;GAGG;AACH,qBAAa,2BAA4B,SAAQ,SAAS;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAY;gBAElB,MAAM,EAAE,wBAAwB;IAStC,IAAI,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvD,UAAU,CACrB,QAAQ,EAAE,UAAU,EAAE,EACtB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,gBAAgB,CAAC;IAOf,mBAAmB,CAAC,CAAC,EAChC,QAAQ,EAAE,UAAU,EAAE,EACtB,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EACzB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAazB,YAAY,CACvB,QAAQ,EAAE,UAAU,EAAE,EACtB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"GoogleGenerativeAiGptClient.d.ts","sourceRoot":"","sources":["../../../src/clients/GoogleGenerativeAiGptClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAE3B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AACpE,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAGxC;;;GAGG;AACH,qBAAa,2BAA4B,SAAQ,SAAS;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAY;gBAElB,MAAM,EAAE,wBAAwB;IAStC,IAAI,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvD,UAAU,CACrB,QAAQ,EAAE,UAAU,EAAE,EACtB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,gBAAgB,CAAC;IAOf,mBAAmB,CAAC,CAAC,EAChC,QAAQ,EAAE,UAAU,EAAE,EACtB,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EACzB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAazB,YAAY,CACvB,QAAQ,EAAE,UAAU,EAAE,EACtB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,wBAAwB,CAAC;CAmBrC;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,GAAG,EAAE,OAAO,GAAG,IAAI,CAoClD"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.GoogleGenerativeAiGptClient = void 0;
|
|
4
|
+
exports.fixAssertFields = fixAssertFields;
|
|
4
5
|
const google_1 = require("@ai-sdk/google");
|
|
5
6
|
const v4_1 = require("zod/v4");
|
|
6
7
|
const MiscUtils_1 = require("../utils/MiscUtils");
|
|
@@ -27,7 +28,7 @@ class GoogleGenerativeAiGptClient extends GptClient_1.GptClient {
|
|
|
27
28
|
}
|
|
28
29
|
async getStructuredOutput(messages, zodSchema, options) {
|
|
29
30
|
const preprocessedSchema = v4_1.z.preprocess((data) => {
|
|
30
|
-
|
|
31
|
+
fixAssertFields(data);
|
|
31
32
|
return data;
|
|
32
33
|
}, zodSchema);
|
|
33
34
|
const resp = await this.delegate.getStructuredOutput(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), preprocessedSchema, options);
|
|
@@ -38,53 +39,53 @@ class GoogleGenerativeAiGptClient extends GptClient_1.GptClient {
|
|
|
38
39
|
name: tool.name,
|
|
39
40
|
description: tool.description,
|
|
40
41
|
inputSchema: v4_1.z.preprocess((data) => {
|
|
41
|
-
|
|
42
|
+
fixAssertFields(data);
|
|
42
43
|
return data;
|
|
43
44
|
}, tool.inputSchema),
|
|
44
45
|
}));
|
|
45
46
|
const resp = await this.delegate.getToolCalls(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), preprocessedTools, options);
|
|
46
47
|
resp.proposedToolCalls.forEach((t) => {
|
|
47
|
-
|
|
48
|
+
fixAssertFields(t.parameters);
|
|
48
49
|
});
|
|
49
50
|
return resp;
|
|
50
51
|
}
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
52
|
+
}
|
|
53
|
+
exports.GoogleGenerativeAiGptClient = GoogleGenerativeAiGptClient;
|
|
54
|
+
/**
|
|
55
|
+
* Fix the "assert1" field issue in tool call parameters (Gemini has severe
|
|
56
|
+
* troubles trying to say the word "assert" on its own... really).
|
|
57
|
+
*
|
|
58
|
+
* Recursively search and replace any field containing "assert1" with "assert"
|
|
59
|
+
*/
|
|
60
|
+
function fixAssertFields(obj) {
|
|
61
|
+
if (!obj || typeof obj !== 'object') {
|
|
62
|
+
return;
|
|
63
|
+
}
|
|
64
|
+
if (Array.isArray(obj)) {
|
|
65
|
+
obj.forEach((item) => fixAssertFields(item));
|
|
66
|
+
return;
|
|
67
|
+
}
|
|
68
|
+
const objRecord = obj;
|
|
69
|
+
// Check each property name for keys containing "assert1"
|
|
70
|
+
const keys = Object.keys(objRecord);
|
|
71
|
+
const keysToRename = [];
|
|
72
|
+
keys.forEach((key) => {
|
|
73
|
+
// If the key contains "assert1", prepare to rename it
|
|
74
|
+
if (key.includes('assert1')) {
|
|
75
|
+
// Create the new key by replacing all instances of "assert1" with "assert"
|
|
76
|
+
const newKey = key.replace(/assert1/g, 'assert');
|
|
77
|
+
keysToRename.push({ oldKey: key, newKey });
|
|
60
78
|
}
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
79
|
+
// Recursively process nested objects
|
|
80
|
+
if (objRecord[key] && typeof objRecord[key] === 'object') {
|
|
81
|
+
fixAssertFields(objRecord[key]);
|
|
64
82
|
}
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
const
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
// Create the new key by replacing all instances of "assert1" with "assert"
|
|
73
|
-
const newKey = key.replace(/assert1/g, 'assert');
|
|
74
|
-
keysToRename.push({ oldKey: key, newKey });
|
|
75
|
-
}
|
|
76
|
-
// Recursively process nested objects
|
|
77
|
-
if (objRecord[key] && typeof objRecord[key] === 'object') {
|
|
78
|
-
GoogleGenerativeAiGptClient.fixAssertFields(objRecord[key]);
|
|
79
|
-
}
|
|
80
|
-
});
|
|
81
|
-
// Apply all renames after iterating to avoid modifying the object during iteration
|
|
82
|
-
keysToRename.forEach(({ oldKey, newKey }) => {
|
|
83
|
-
const value = objRecord[oldKey];
|
|
84
|
-
delete objRecord[oldKey];
|
|
85
|
-
objRecord[newKey] = value;
|
|
86
|
-
});
|
|
87
|
-
}
|
|
83
|
+
});
|
|
84
|
+
// Apply all renames after iterating to avoid modifying the object during iteration
|
|
85
|
+
keysToRename.forEach(({ oldKey, newKey }) => {
|
|
86
|
+
const value = objRecord[oldKey];
|
|
87
|
+
delete objRecord[oldKey];
|
|
88
|
+
objRecord[newKey] = value;
|
|
89
|
+
});
|
|
88
90
|
}
|
|
89
|
-
exports.GoogleGenerativeAiGptClient = GoogleGenerativeAiGptClient;
|
|
90
91
|
//# sourceMappingURL=GoogleGenerativeAiGptClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoogleGenerativeAiGptClient.js","sourceRoot":"","sources":["../../../src/clients/GoogleGenerativeAiGptClient.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"GoogleGenerativeAiGptClient.js","sourceRoot":"","sources":["../../../src/clients/GoogleGenerativeAiGptClient.ts"],"names":[],"mappings":";;;AA6FA,0CAoCC;AAjID,2CAA0D;AAC1D,+BAA2B;AAS3B,kDAA+C;AAE/C,2CAAwC;AACxC,2DAAwD;AAExD;;;GAGG;AACH,MAAa,2BAA4B,SAAQ,qBAAS;IAGxD,YAAmB,MAAgC;QACjD,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,MAAM,MAAM,GAAG,IAAA,iCAAwB,EAAC;YACtC,MAAM,EAAE,MAAM,CAAC,MAAM;SACtB,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACvC,IAAI,CAAC,QAAQ,GAAG,IAAI,qCAAiB,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,OAAkC;QAClD,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAEM,KAAK,CAAC,UAAU,CACrB,QAAsB,EACtB,OAAkC;QAElC,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAC7B,qBAAS,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAC7C,OAAO,CACR,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAC9B,QAAsB,EACtB,SAAyB,EACzB,OAAkC;QAElC,MAAM,kBAAkB,GAAG,MAAC,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE;YAC/C,eAAe,CAAC,IAAI,CAAC,CAAC;YACtB,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,SAAS,CAAC,CAAC;QACd,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAClD,qBAAS,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAC7C,kBAAkB,EAClB,OAAO,CACR,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,YAAY,CACvB,QAAsB,EACtB,KAAmB,EACnB,OAAkC;QAElC,MAAM,iBAAiB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7C,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,WAAW,EAAE,MAAC,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE;gBACjC,eAAe,CAAC,IAAI,CAAC,CAAC;gBACtB,OAAO,IAAI,CAAC;YACd,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC;SACrB,CAAC,CAAwB,CAAC;QAC3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,CAC3C,qBAAS,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAC7C,iBAAiB,EACjB,OAAO,CACR,CAAC;QACF,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACnC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AAlED,kEAkEC;AAED;;;;;GAKG;AACH,SAAgB,eAAe,CAAC,GAAY;IAC1C,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO;IACT,CAAC;IAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QACvB,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GAAG,GAA8B,CAAC;IAEjD,yDAAyD;IACzD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACpC,MAAM,YAAY,GAAyC,EAAE,CAAC;IAE9D,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QACnB,sDAAsD;QACtD,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC5B,2EAA2E;YAC3E,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;YACjD,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;QAC7C,CAAC;QAED,qCAAqC;QACrC,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,OAAO,SAAS,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;YACzD,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;QAClC,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,mFAAmF;IACnF,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;QAC1C,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;QAChC,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;QACzB,SAAS,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;IAC5B,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -22,12 +22,5 @@ export declare class GoogleVertexGptClient extends GptClient {
|
|
|
22
22
|
getToolCalls(messages: GptMessage[], tools: ToolOption[], options?: {
|
|
23
23
|
signal?: AbortSignal;
|
|
24
24
|
}): Promise<ProposedToolCallsMessage>;
|
|
25
|
-
/**
|
|
26
|
-
* Fix the "assert1" field issue in tool call parameters (Gemini has severe
|
|
27
|
-
* troubles trying to say the word "assert" on its own... really).
|
|
28
|
-
*
|
|
29
|
-
* Recursively search and replace any field containing "assert1" with "assert"
|
|
30
|
-
*/
|
|
31
|
-
private static fixAssertFields;
|
|
32
25
|
}
|
|
33
26
|
//# sourceMappingURL=GoogleVertexGptClient.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoogleVertexGptClient.d.ts","sourceRoot":"","sources":["../../../src/clients/GoogleVertexGptClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAG3B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"GoogleVertexGptClient.d.ts","sourceRoot":"","sources":["../../../src/clients/GoogleVertexGptClient.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAG3B,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAC9D,OAAO,KAAK,EACV,gBAAgB,EAChB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAE9B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AAIxC;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,SAAS;IAClD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAY;gBAElB,MAAM,EAAE,kBAAkB;IAqBhC,IAAI,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvD,UAAU,CACrB,QAAQ,EAAE,UAAU,EAAE,EACtB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,gBAAgB,CAAC;IAOf,mBAAmB,CAAC,CAAC,EAChC,QAAQ,EAAE,UAAU,EAAE,EACtB,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EACzB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;IAazB,YAAY,CACvB,QAAQ,EAAE,UAAU,EAAE,EACtB,KAAK,EAAE,UAAU,EAAE,EACnB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,wBAAwB,CAAC;CAmBrC"}
|
|
@@ -7,6 +7,7 @@ const GptPlatformAuthenticationFailedException_1 = require("../exceptions/GptPla
|
|
|
7
7
|
const MiscUtils_1 = require("../utils/MiscUtils");
|
|
8
8
|
const GptClient_1 = require("./GptClient");
|
|
9
9
|
const VercelAiGptClient_1 = require("./VercelAiGptClient");
|
|
10
|
+
const GoogleGenerativeAiGptClient_1 = require("./GoogleGenerativeAiGptClient");
|
|
10
11
|
/**
|
|
11
12
|
* Implementation using the Google Vertex API
|
|
12
13
|
* @see https://ai-sdk.dev/providers/ai-sdk-providers/google-vertex
|
|
@@ -35,7 +36,7 @@ class GoogleVertexGptClient extends GptClient_1.GptClient {
|
|
|
35
36
|
}
|
|
36
37
|
async getStructuredOutput(messages, zodSchema, options) {
|
|
37
38
|
const preprocessedSchema = v4_1.z.preprocess((data) => {
|
|
38
|
-
|
|
39
|
+
(0, GoogleGenerativeAiGptClient_1.fixAssertFields)(data);
|
|
39
40
|
return data;
|
|
40
41
|
}, zodSchema);
|
|
41
42
|
const resp = await this.delegate.getStructuredOutput(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), preprocessedSchema, options);
|
|
@@ -46,53 +47,16 @@ class GoogleVertexGptClient extends GptClient_1.GptClient {
|
|
|
46
47
|
name: tool.name,
|
|
47
48
|
description: tool.description,
|
|
48
49
|
inputSchema: v4_1.z.preprocess((data) => {
|
|
49
|
-
|
|
50
|
+
(0, GoogleGenerativeAiGptClient_1.fixAssertFields)(data);
|
|
50
51
|
return data;
|
|
51
52
|
}, tool.inputSchema),
|
|
52
53
|
}));
|
|
53
54
|
const resp = await this.delegate.getToolCalls(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), preprocessedTools, options);
|
|
54
55
|
resp.proposedToolCalls.forEach((t) => {
|
|
55
|
-
|
|
56
|
+
(0, GoogleGenerativeAiGptClient_1.fixAssertFields)(t.parameters);
|
|
56
57
|
});
|
|
57
58
|
return resp;
|
|
58
59
|
}
|
|
59
|
-
/**
|
|
60
|
-
* Fix the "assert1" field issue in tool call parameters (Gemini has severe
|
|
61
|
-
* troubles trying to say the word "assert" on its own... really).
|
|
62
|
-
*
|
|
63
|
-
* Recursively search and replace any field containing "assert1" with "assert"
|
|
64
|
-
*/
|
|
65
|
-
static fixAssertFields(obj) {
|
|
66
|
-
if (!obj || typeof obj !== 'object') {
|
|
67
|
-
return;
|
|
68
|
-
}
|
|
69
|
-
if (Array.isArray(obj)) {
|
|
70
|
-
obj.forEach((item) => GoogleVertexGptClient.fixAssertFields(item));
|
|
71
|
-
return;
|
|
72
|
-
}
|
|
73
|
-
const objRecord = obj;
|
|
74
|
-
// Check each property name for keys containing "assert1"
|
|
75
|
-
const keys = Object.keys(objRecord);
|
|
76
|
-
const keysToRename = [];
|
|
77
|
-
keys.forEach((key) => {
|
|
78
|
-
// If the key contains "assert1", prepare to rename it
|
|
79
|
-
if (key.includes('assert1')) {
|
|
80
|
-
// Create the new key by replacing all instances of "assert1" with "assert"
|
|
81
|
-
const newKey = key.replace(/assert1/g, 'assert');
|
|
82
|
-
keysToRename.push({ oldKey: key, newKey });
|
|
83
|
-
}
|
|
84
|
-
// Recursively process nested objects
|
|
85
|
-
if (objRecord[key] && typeof objRecord[key] === 'object') {
|
|
86
|
-
GoogleVertexGptClient.fixAssertFields(objRecord[key]);
|
|
87
|
-
}
|
|
88
|
-
});
|
|
89
|
-
// Apply all renames after iterating to avoid modifying the object during iteration
|
|
90
|
-
keysToRename.forEach(({ oldKey, newKey }) => {
|
|
91
|
-
const value = objRecord[oldKey];
|
|
92
|
-
delete objRecord[oldKey];
|
|
93
|
-
objRecord[newKey] = value;
|
|
94
|
-
});
|
|
95
|
-
}
|
|
96
60
|
}
|
|
97
61
|
exports.GoogleVertexGptClient = GoogleVertexGptClient;
|
|
98
62
|
//# sourceMappingURL=GoogleVertexGptClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoogleVertexGptClient.js","sourceRoot":"","sources":["../../../src/clients/GoogleVertexGptClient.ts"],"names":[],"mappings":";;;AAAA,yDAAqD;AACrD,+BAA2B;AAE3B,qHAAkH;AAQlH,kDAA+C;AAE/C,2CAAwC;AACxC,2DAAwD;
|
|
1
|
+
{"version":3,"file":"GoogleVertexGptClient.js","sourceRoot":"","sources":["../../../src/clients/GoogleVertexGptClient.ts"],"names":[],"mappings":";;;AAAA,yDAAqD;AACrD,+BAA2B;AAE3B,qHAAkH;AAQlH,kDAA+C;AAE/C,2CAAwC;AACxC,2DAAwD;AACxD,+EAAgE;AAEhE;;;GAGG;AACH,MAAa,qBAAsB,SAAQ,qBAAS;IAGlD,YAAmB,MAA0B;QAC3C,KAAK,CAAC,MAAM,CAAC,CAAC;QAEd,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,IAAA,4BAAY,EAAC,MAAM,CAAC,CAAC;YACpC,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACvC,IAAI,CAAC,QAAQ,GAAG,IAAI,qCAAiB,CAAC,KAAK,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,MAAM,KAAK,GAAG,CAAU,CAAC;YAEzB,IAAI,KAAK,CAAC,IAAI,IAAI,qBAAqB,EAAE,CAAC;gBACxC,MAAM,IAAI,mFAAwC,CAChD,MAAM,CAAC,IAAI,EACX,KAAK,CAAC,OAAO,CACd,CAAC;YACJ,CAAC;YAED,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEM,KAAK,CAAC,IAAI,CAAC,OAAkC;QAClD,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;IAEM,KAAK,CAAC,UAAU,CACrB,QAAsB,EACtB,OAAkC;QAElC,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAC7B,qBAAS,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAC7C,OAAO,CACR,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,mBAAmB,CAC9B,QAAsB,EACtB,SAAyB,EACzB,OAAkC;QAElC,MAAM,kBAAkB,GAAG,MAAC,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE;YAC/C,IAAA,6CAAe,EAAC,IAAI,CAAC,CAAC;YACtB,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,SAAS,CAAC,CAAC;QACd,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CAClD,qBAAS,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAC7C,kBAAkB,EAClB,OAAO,CACR,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IAEM,KAAK,CAAC,YAAY,CACvB,QAAsB,EACtB,KAAmB,EACnB,OAAkC;QAElC,MAAM,iBAAiB,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YAC7C,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,WAAW,EAAE,MAAC,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE;gBACjC,IAAA,6CAAe,EAAC,IAAI,CAAC,CAAC;gBACtB,OAAO,IAAI,CAAC;YACd,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC;SACrB,CAAC,CAAwB,CAAC;QAC3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,YAAY,CAC3C,qBAAS,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAC7C,iBAAiB,EACjB,OAAO,CACR,CAAC;QACF,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACnC,IAAA,6CAAe,EAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAChC,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;CACF;AA9ED,sDA8EC"}
|