donobu 2.31.0 → 2.31.1
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/apis/SpecialFlowsApi.d.ts.map +1 -1
- package/dist/apis/SpecialFlowsApi.js +1 -6
- package/dist/apis/SpecialFlowsApi.js.map +1 -1
- package/dist/assets/generated/version +1 -1
- package/dist/assets/page-interactions-tracker.js +0 -33
- package/dist/clients/AnthropicAwsBedrockGptClient.d.ts +12 -4
- package/dist/clients/AnthropicAwsBedrockGptClient.d.ts.map +1 -1
- package/dist/clients/AnthropicAwsBedrockGptClient.js +8 -8
- package/dist/clients/AnthropicAwsBedrockGptClient.js.map +1 -1
- package/dist/clients/AnthropicGptClient.d.ts +12 -4
- package/dist/clients/AnthropicGptClient.d.ts.map +1 -1
- package/dist/clients/AnthropicGptClient.js +12 -10
- package/dist/clients/AnthropicGptClient.js.map +1 -1
- package/dist/clients/GoogleGenerativeAiGptClient.d.ts +12 -4
- package/dist/clients/GoogleGenerativeAiGptClient.d.ts.map +1 -1
- package/dist/clients/GoogleGenerativeAiGptClient.js +8 -8
- package/dist/clients/GoogleGenerativeAiGptClient.js.map +1 -1
- package/dist/clients/GoogleVertexGptClient.d.ts +12 -4
- package/dist/clients/GoogleVertexGptClient.d.ts.map +1 -1
- package/dist/clients/GoogleVertexGptClient.js +8 -8
- package/dist/clients/GoogleVertexGptClient.js.map +1 -1
- package/dist/clients/GptClient.d.ts +12 -4
- package/dist/clients/GptClient.d.ts.map +1 -1
- package/dist/clients/GptClient.js.map +1 -1
- package/dist/clients/OpenAiGptClient.d.ts +12 -4
- package/dist/clients/OpenAiGptClient.d.ts.map +1 -1
- package/dist/clients/OpenAiGptClient.js +12 -10
- package/dist/clients/OpenAiGptClient.js.map +1 -1
- package/dist/clients/VercelAiGptClient.d.ts +14 -5
- package/dist/clients/VercelAiGptClient.d.ts.map +1 -1
- package/dist/clients/VercelAiGptClient.js +54 -37
- package/dist/clients/VercelAiGptClient.js.map +1 -1
- package/dist/esm/apis/SpecialFlowsApi.d.ts.map +1 -1
- package/dist/esm/apis/SpecialFlowsApi.js +1 -6
- package/dist/esm/apis/SpecialFlowsApi.js.map +1 -1
- package/dist/esm/assets/generated/version +1 -1
- package/dist/esm/assets/page-interactions-tracker.js +0 -33
- package/dist/esm/clients/AnthropicAwsBedrockGptClient.d.ts +12 -4
- package/dist/esm/clients/AnthropicAwsBedrockGptClient.d.ts.map +1 -1
- package/dist/esm/clients/AnthropicAwsBedrockGptClient.js +8 -8
- package/dist/esm/clients/AnthropicAwsBedrockGptClient.js.map +1 -1
- package/dist/esm/clients/AnthropicGptClient.d.ts +12 -4
- package/dist/esm/clients/AnthropicGptClient.d.ts.map +1 -1
- package/dist/esm/clients/AnthropicGptClient.js +12 -10
- package/dist/esm/clients/AnthropicGptClient.js.map +1 -1
- package/dist/esm/clients/GoogleGenerativeAiGptClient.d.ts +12 -4
- package/dist/esm/clients/GoogleGenerativeAiGptClient.d.ts.map +1 -1
- package/dist/esm/clients/GoogleGenerativeAiGptClient.js +8 -8
- package/dist/esm/clients/GoogleGenerativeAiGptClient.js.map +1 -1
- package/dist/esm/clients/GoogleVertexGptClient.d.ts +12 -4
- package/dist/esm/clients/GoogleVertexGptClient.d.ts.map +1 -1
- package/dist/esm/clients/GoogleVertexGptClient.js +8 -8
- package/dist/esm/clients/GoogleVertexGptClient.js.map +1 -1
- package/dist/esm/clients/GptClient.d.ts +12 -4
- package/dist/esm/clients/GptClient.d.ts.map +1 -1
- package/dist/esm/clients/GptClient.js.map +1 -1
- package/dist/esm/clients/OpenAiGptClient.d.ts +12 -4
- package/dist/esm/clients/OpenAiGptClient.d.ts.map +1 -1
- package/dist/esm/clients/OpenAiGptClient.js +12 -10
- package/dist/esm/clients/OpenAiGptClient.js.map +1 -1
- package/dist/esm/clients/VercelAiGptClient.d.ts +14 -5
- package/dist/esm/clients/VercelAiGptClient.d.ts.map +1 -1
- package/dist/esm/clients/VercelAiGptClient.js +54 -37
- package/dist/esm/clients/VercelAiGptClient.js.map +1 -1
- package/dist/esm/exceptions/UserInterruptException.d.ts +7 -0
- package/dist/esm/exceptions/UserInterruptException.d.ts.map +1 -0
- package/dist/esm/exceptions/UserInterruptException.js +12 -0
- package/dist/esm/exceptions/UserInterruptException.js.map +1 -0
- package/dist/esm/lib/fixtures/gptClients.d.ts.map +1 -1
- package/dist/esm/lib/fixtures/gptClients.js +3 -4
- package/dist/esm/lib/fixtures/gptClients.js.map +1 -1
- package/dist/esm/lib/testExtension.d.ts.map +1 -1
- package/dist/esm/lib/testExtension.js +9 -4
- package/dist/esm/lib/testExtension.js.map +1 -1
- package/dist/esm/lib/utils/donobuTestStack.d.ts.map +1 -1
- package/dist/esm/lib/utils/donobuTestStack.js +2 -1
- package/dist/esm/lib/utils/donobuTestStack.js.map +1 -1
- package/dist/esm/main.d.ts +3 -1
- package/dist/esm/main.d.ts.map +1 -1
- package/dist/esm/main.js +4 -2
- package/dist/esm/main.js.map +1 -1
- package/dist/esm/managers/AdminApiController.d.ts +8 -1
- package/dist/esm/managers/AdminApiController.d.ts.map +1 -1
- package/dist/esm/managers/AdminApiController.js +10 -4
- package/dist/esm/managers/AdminApiController.js.map +1 -1
- package/dist/esm/managers/CodeGenerator.d.ts.map +1 -1
- package/dist/esm/managers/CodeGenerator.js +22 -11
- package/dist/esm/managers/CodeGenerator.js.map +1 -1
- package/dist/esm/managers/DonobuFlow.d.ts +11 -7
- package/dist/esm/managers/DonobuFlow.d.ts.map +1 -1
- package/dist/esm/managers/DonobuFlow.js +138 -155
- package/dist/esm/managers/DonobuFlow.js.map +1 -1
- package/dist/esm/managers/DonobuFlowsManager.d.ts +3 -1
- package/dist/esm/managers/DonobuFlowsManager.d.ts.map +1 -1
- package/dist/esm/managers/DonobuFlowsManager.js +7 -2
- package/dist/esm/managers/DonobuFlowsManager.js.map +1 -1
- package/dist/esm/managers/DonobuStack.d.ts +2 -1
- package/dist/esm/managers/DonobuStack.d.ts.map +1 -1
- package/dist/esm/managers/DonobuStack.js +2 -2
- package/dist/esm/managers/DonobuStack.js.map +1 -1
- package/dist/esm/managers/PageInspector.d.ts.map +1 -1
- package/dist/esm/managers/PageInspector.js +3 -7
- package/dist/esm/managers/PageInspector.js.map +1 -1
- package/dist/esm/managers/ToolManager.d.ts.map +1 -1
- package/dist/esm/managers/ToolManager.js +4 -3
- package/dist/esm/managers/ToolManager.js.map +1 -1
- package/dist/esm/models/BrowserConfig.d.ts +8 -8
- package/dist/esm/models/CodeGenerationOptions.d.ts +6 -0
- package/dist/esm/models/CodeGenerationOptions.d.ts.map +1 -1
- package/dist/esm/models/CodeGenerationOptions.js +9 -0
- package/dist/esm/models/CodeGenerationOptions.js.map +1 -1
- package/dist/esm/models/ControlPanel.d.ts +29 -0
- package/dist/esm/models/ControlPanel.d.ts.map +1 -0
- package/dist/esm/models/ControlPanel.js +16 -0
- package/dist/esm/models/ControlPanel.js.map +1 -0
- package/dist/esm/models/CreateDonobuFlow.d.ts +8 -8
- package/dist/esm/models/FlowMetadata.d.ts +8 -8
- package/dist/esm/models/ToolCallContext.d.ts +1 -1
- package/dist/esm/models/ToolCallContext.d.ts.map +1 -1
- package/dist/esm/tools/AcknowledgeUserInstruction.d.ts +1 -1
- package/dist/esm/tools/AcknowledgeUserInstruction.d.ts.map +1 -1
- package/dist/esm/tools/AcknowledgeUserInstruction.js +2 -6
- package/dist/esm/tools/AcknowledgeUserInstruction.js.map +1 -1
- package/dist/esm/tools/AssertPageTool.d.ts +4 -4
- package/dist/esm/tools/ClickTool.js +1 -1
- package/dist/esm/tools/ClickTool.js.map +1 -1
- package/dist/esm/tools/ReplayableInteraction.d.ts.map +1 -1
- package/dist/esm/tools/ReplayableInteraction.js +1 -8
- package/dist/esm/tools/ReplayableInteraction.js.map +1 -1
- package/dist/esm/tools/TriggerDonobuFlowTool.d.ts +20 -20
- package/dist/esm/utils/PlaywrightUtils.d.ts.map +1 -1
- package/dist/esm/utils/PlaywrightUtils.js +0 -2
- package/dist/esm/utils/PlaywrightUtils.js.map +1 -1
- package/dist/exceptions/UserInterruptException.d.ts +7 -0
- package/dist/exceptions/UserInterruptException.d.ts.map +1 -0
- package/dist/exceptions/UserInterruptException.js +12 -0
- package/dist/exceptions/UserInterruptException.js.map +1 -0
- package/dist/lib/fixtures/gptClients.d.ts.map +1 -1
- package/dist/lib/fixtures/gptClients.js +3 -4
- package/dist/lib/fixtures/gptClients.js.map +1 -1
- package/dist/lib/testExtension.d.ts.map +1 -1
- package/dist/lib/testExtension.js +9 -4
- package/dist/lib/testExtension.js.map +1 -1
- package/dist/lib/utils/donobuTestStack.d.ts.map +1 -1
- package/dist/lib/utils/donobuTestStack.js +2 -1
- package/dist/lib/utils/donobuTestStack.js.map +1 -1
- package/dist/main.d.ts +3 -1
- package/dist/main.d.ts.map +1 -1
- package/dist/main.js +4 -2
- package/dist/main.js.map +1 -1
- package/dist/managers/AdminApiController.d.ts +8 -1
- package/dist/managers/AdminApiController.d.ts.map +1 -1
- package/dist/managers/AdminApiController.js +10 -4
- package/dist/managers/AdminApiController.js.map +1 -1
- package/dist/managers/CodeGenerator.d.ts.map +1 -1
- package/dist/managers/CodeGenerator.js +22 -11
- package/dist/managers/CodeGenerator.js.map +1 -1
- package/dist/managers/DonobuFlow.d.ts +11 -7
- package/dist/managers/DonobuFlow.d.ts.map +1 -1
- package/dist/managers/DonobuFlow.js +138 -155
- package/dist/managers/DonobuFlow.js.map +1 -1
- package/dist/managers/DonobuFlowsManager.d.ts +3 -1
- package/dist/managers/DonobuFlowsManager.d.ts.map +1 -1
- package/dist/managers/DonobuFlowsManager.js +7 -2
- package/dist/managers/DonobuFlowsManager.js.map +1 -1
- package/dist/managers/DonobuStack.d.ts +2 -1
- package/dist/managers/DonobuStack.d.ts.map +1 -1
- package/dist/managers/DonobuStack.js +2 -2
- package/dist/managers/DonobuStack.js.map +1 -1
- package/dist/managers/PageInspector.d.ts.map +1 -1
- package/dist/managers/PageInspector.js +3 -7
- package/dist/managers/PageInspector.js.map +1 -1
- package/dist/managers/ToolManager.d.ts.map +1 -1
- package/dist/managers/ToolManager.js +4 -3
- package/dist/managers/ToolManager.js.map +1 -1
- package/dist/models/BrowserConfig.d.ts +8 -8
- package/dist/models/CodeGenerationOptions.d.ts +6 -0
- package/dist/models/CodeGenerationOptions.d.ts.map +1 -1
- package/dist/models/CodeGenerationOptions.js +9 -0
- package/dist/models/CodeGenerationOptions.js.map +1 -1
- package/dist/models/ControlPanel.d.ts +29 -0
- package/dist/models/ControlPanel.d.ts.map +1 -0
- package/dist/models/ControlPanel.js +16 -0
- package/dist/models/ControlPanel.js.map +1 -0
- package/dist/models/CreateDonobuFlow.d.ts +8 -8
- package/dist/models/FlowMetadata.d.ts +8 -8
- package/dist/models/ToolCallContext.d.ts +1 -1
- package/dist/models/ToolCallContext.d.ts.map +1 -1
- package/dist/tools/AcknowledgeUserInstruction.d.ts +1 -1
- package/dist/tools/AcknowledgeUserInstruction.d.ts.map +1 -1
- package/dist/tools/AcknowledgeUserInstruction.js +2 -6
- package/dist/tools/AcknowledgeUserInstruction.js.map +1 -1
- package/dist/tools/AssertPageTool.d.ts +4 -4
- package/dist/tools/ClickTool.js +1 -1
- package/dist/tools/ClickTool.js.map +1 -1
- package/dist/tools/ReplayableInteraction.d.ts.map +1 -1
- package/dist/tools/ReplayableInteraction.js +1 -8
- package/dist/tools/ReplayableInteraction.js.map +1 -1
- package/dist/tools/TriggerDonobuFlowTool.d.ts +20 -20
- package/dist/utils/PlaywrightUtils.d.ts.map +1 -1
- package/dist/utils/PlaywrightUtils.js +0 -2
- package/dist/utils/PlaywrightUtils.js.map +1 -1
- package/package.json +1 -1
- package/dist/assets/control-panel.js +0 -646
- package/dist/esm/assets/control-panel.js +0 -646
- package/dist/esm/managers/ControlPanel.d.ts +0 -127
- package/dist/esm/managers/ControlPanel.d.ts.map +0 -1
- package/dist/esm/managers/ControlPanel.js +0 -291
- package/dist/esm/managers/ControlPanel.js.map +0 -1
- package/dist/esm/tools/GetEntityDataFromGoogleMapResult.d.ts +0 -31
- package/dist/esm/tools/GetEntityDataFromGoogleMapResult.d.ts.map +0 -1
- package/dist/esm/tools/GetEntityDataFromGoogleMapResult.js +0 -45
- package/dist/esm/tools/GetEntityDataFromGoogleMapResult.js.map +0 -1
- package/dist/managers/ControlPanel.d.ts +0 -127
- package/dist/managers/ControlPanel.d.ts.map +0 -1
- package/dist/managers/ControlPanel.js +0 -291
- package/dist/managers/ControlPanel.js.map +0 -1
- package/dist/tools/GetEntityDataFromGoogleMapResult.d.ts +0 -31
- package/dist/tools/GetEntityDataFromGoogleMapResult.d.ts.map +0 -1
- package/dist/tools/GetEntityDataFromGoogleMapResult.js +0 -45
- package/dist/tools/GetEntityDataFromGoogleMapResult.js.map +0 -1
|
@@ -20,17 +20,17 @@ class AnthropicAwsBedrockGptClient extends GptClient_1.GptClient {
|
|
|
20
20
|
const model = bedrock(config.modelName);
|
|
21
21
|
this.delegate = new VercelAiGptClient_1.VercelAiGptClient(model);
|
|
22
22
|
}
|
|
23
|
-
async ping() {
|
|
24
|
-
return this.delegate.ping();
|
|
23
|
+
async ping(options) {
|
|
24
|
+
return this.delegate.ping(options);
|
|
25
25
|
}
|
|
26
|
-
async getMessage(messages) {
|
|
27
|
-
return this.delegate.getMessage(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages));
|
|
26
|
+
async getMessage(messages, options) {
|
|
27
|
+
return this.delegate.getMessage(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), options);
|
|
28
28
|
}
|
|
29
|
-
async getStructuredOutput(messages, jsonSchema) {
|
|
30
|
-
return this.delegate.getStructuredOutput(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), jsonSchema);
|
|
29
|
+
async getStructuredOutput(messages, jsonSchema, options) {
|
|
30
|
+
return this.delegate.getStructuredOutput(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), jsonSchema, options);
|
|
31
31
|
}
|
|
32
|
-
async getToolCalls(messages, tools) {
|
|
33
|
-
return this.delegate.getToolCalls(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), tools);
|
|
32
|
+
async getToolCalls(messages, tools, options) {
|
|
33
|
+
return this.delegate.getToolCalls(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), tools, options);
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
36
|
exports.AnthropicAwsBedrockGptClient = AnthropicAwsBedrockGptClient;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnthropicAwsBedrockGptClient.js","sourceRoot":"","sources":["../../../src/clients/AnthropicAwsBedrockGptClient.ts"],"names":[],"mappings":";;;AAAA,2CAAoD;AAQpD,2DAA6D;AAC7D,2DAAwD;AACxD,kDAA+C;AAG/C;;;GAGG;AACH,MAAa,4BAA6B,SAAQ,qBAAS;IAGzD,YAAmB,MAAiC;QAClD,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,MAAM,OAAO,GAAG,IAAA,oCAAmB,EAAC;YAClC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,eAAe,EAAE,MAAM,CAAC,eAAe;SACxC,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACxC,IAAI,CAAC,QAAQ,GAAG,IAAI,qCAAiB,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAEM,KAAK,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"AnthropicAwsBedrockGptClient.js","sourceRoot":"","sources":["../../../src/clients/AnthropicAwsBedrockGptClient.ts"],"names":[],"mappings":";;;AAAA,2CAAoD;AAQpD,2DAA6D;AAC7D,2DAAwD;AACxD,kDAA+C;AAG/C;;;GAGG;AACH,MAAa,4BAA6B,SAAQ,qBAAS;IAGzD,YAAmB,MAAiC;QAClD,KAAK,CAAC,MAAM,CAAC,CAAC;QACd,MAAM,OAAO,GAAG,IAAA,oCAAmB,EAAC;YAClC,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,WAAW,EAAE,MAAM,CAAC,WAAW;YAC/B,eAAe,EAAE,MAAM,CAAC,eAAe;SACxC,CAAC,CAAC;QACH,MAAM,KAAK,GAAG,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACxC,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,UAA4B,EAC5B,OAAkC;QAElC,OAAO,IAAI,CAAC,QAAQ,CAAC,mBAAmB,CACtC,qBAAS,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAC7C,UAAU,EACV,OAAO,CACR,CAAC;IACJ,CAAC;IAEM,KAAK,CAAC,YAAY,CACvB,QAAsB,EACtB,KAAmB,EACnB,OAAkC;QAElC,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAC/B,qBAAS,CAAC,yBAAyB,CAAC,QAAQ,CAAC,EAC7C,KAAK,EACL,OAAO,CACR,CAAC;IACJ,CAAC;CACF;AAnDD,oEAmDC"}
|
|
@@ -17,10 +17,18 @@ export declare class AnthropicGptClient extends GptClient {
|
|
|
17
17
|
private static readonly MAX_TOKENS;
|
|
18
18
|
private readonly headers;
|
|
19
19
|
constructor(anthropicConfig: AnthropicConfig);
|
|
20
|
-
ping(
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
20
|
+
ping(options?: {
|
|
21
|
+
signal?: AbortSignal;
|
|
22
|
+
}): Promise<void>;
|
|
23
|
+
getMessage(messages: GptMessage[], options?: {
|
|
24
|
+
signal?: AbortSignal;
|
|
25
|
+
}): Promise<AssistantMessage>;
|
|
26
|
+
getStructuredOutput(messages: GptMessage[], jsonSchema: z.ZodSchema<any>, options?: {
|
|
27
|
+
signal?: AbortSignal;
|
|
28
|
+
}): Promise<StructuredOutputMessage>;
|
|
29
|
+
getToolCalls(messages: GptMessage[], tools: ToolOption[], options?: {
|
|
30
|
+
signal?: AbortSignal;
|
|
31
|
+
}): Promise<ProposedToolCallsMessage>;
|
|
24
32
|
private mapErrorResponseToDonobuException;
|
|
25
33
|
private makeRequest;
|
|
26
34
|
private static chatRequestMessageFromGptMessage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnthropicGptClient.d.ts","sourceRoot":"","sources":["../../../src/clients/AnthropicGptClient.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,uBAAuB,EACvB,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,SAAS;IAW5B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAVnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAA+B;IAC9D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,4BAA4B,CAAU;IAC9D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAe;IAC1D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAAuB;IACtE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAAgB;IAChE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,CAAsB;IACvE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAQ;IAE1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEE,eAAe,EAAE,eAAe;IAUvD,IAAI,
|
|
1
|
+
{"version":3,"file":"AnthropicGptClient.d.ts","sourceRoot":"","sources":["../../../src/clients/AnthropicGptClient.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,uBAAuB,EACvB,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAGtD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,qBAAa,kBAAmB,SAAQ,SAAS;IAW5B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAVnD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAA+B;IAC9D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,4BAA4B,CAAU;IAC9D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,mBAAmB,CAAe;IAC1D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,uBAAuB,CAAuB;IACtE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,wBAAwB,CAAgB;IAChE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,yBAAyB,CAAsB;IACvE,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAQ;IAE1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEE,eAAe,EAAE,eAAe;IAUvD,IAAI,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBvD,UAAU,CACrB,QAAQ,EAAE,UAAU,EAAE,EACtB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,gBAAgB,CAAC;IAwCf,mBAAmB,CAC9B,QAAQ,EAAE,UAAU,EAAE,EACtB,UAAU,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAC5B,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,uBAAuB,CAAC;IAkEtB,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;YA2EtB,iCAAiC;YA0BjC,WAAW;IA2BzB,OAAO,CAAC,MAAM,CAAC,gCAAgC;IAkF/C,OAAO,CAAC,MAAM,CAAC,kBAAkB;CAUlC"}
|
|
@@ -24,8 +24,8 @@ class AnthropicGptClient extends GptClient_1.GptClient {
|
|
|
24
24
|
'Content-Type': AnthropicGptClient.CONTENT_TYPE_HEADER_VALUE,
|
|
25
25
|
});
|
|
26
26
|
}
|
|
27
|
-
async ping() {
|
|
28
|
-
const resp = await this.makeRequest(`/v1/models/${this.anthropicConfig.modelName}
|
|
27
|
+
async ping(options) {
|
|
28
|
+
const resp = await this.makeRequest(`/v1/models/${this.anthropicConfig.modelName}`, 'GET', undefined, undefined, options?.signal);
|
|
29
29
|
if (resp.status === 404) {
|
|
30
30
|
throw new GptModelNotFoundException_1.GptModelNotFoundException(this.config.type, this.anthropicConfig.modelName);
|
|
31
31
|
}
|
|
@@ -33,7 +33,7 @@ class AnthropicGptClient extends GptClient_1.GptClient {
|
|
|
33
33
|
throw await this.mapErrorResponseToDonobuException(resp);
|
|
34
34
|
}
|
|
35
35
|
}
|
|
36
|
-
async getMessage(messages) {
|
|
36
|
+
async getMessage(messages, options) {
|
|
37
37
|
messages = MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages);
|
|
38
38
|
const systemPrompts = messages
|
|
39
39
|
.filter((msg) => msg.type === 'system')
|
|
@@ -47,7 +47,7 @@ class AnthropicGptClient extends GptClient_1.GptClient {
|
|
|
47
47
|
.filter((msg) => msg.type !== 'system')
|
|
48
48
|
.map(AnthropicGptClient.chatRequestMessageFromGptMessage),
|
|
49
49
|
};
|
|
50
|
-
const resp = await this.makeRequest('/v1/messages', 'POST', body);
|
|
50
|
+
const resp = await this.makeRequest('/v1/messages', 'POST', body, undefined, options?.signal);
|
|
51
51
|
if (resp.status !== 200) {
|
|
52
52
|
throw await this.mapErrorResponseToDonobuException(resp);
|
|
53
53
|
}
|
|
@@ -62,7 +62,7 @@ class AnthropicGptClient extends GptClient_1.GptClient {
|
|
|
62
62
|
completionTokensUsed,
|
|
63
63
|
};
|
|
64
64
|
}
|
|
65
|
-
async getStructuredOutput(messages, jsonSchema) {
|
|
65
|
+
async getStructuredOutput(messages, jsonSchema, options) {
|
|
66
66
|
messages = MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages);
|
|
67
67
|
const systemPrompts = messages
|
|
68
68
|
.filter((msg) => msg.type === 'system')
|
|
@@ -91,7 +91,7 @@ class AnthropicGptClient extends GptClient_1.GptClient {
|
|
|
91
91
|
disable_parallel_tool_use: true,
|
|
92
92
|
},
|
|
93
93
|
};
|
|
94
|
-
const resp = await this.makeRequest('/v1/messages', 'POST', body);
|
|
94
|
+
const resp = await this.makeRequest('/v1/messages', 'POST', body, undefined, options?.signal);
|
|
95
95
|
if (resp.status !== 200) {
|
|
96
96
|
throw await this.mapErrorResponseToDonobuException(resp);
|
|
97
97
|
}
|
|
@@ -117,7 +117,7 @@ class AnthropicGptClient extends GptClient_1.GptClient {
|
|
|
117
117
|
completionTokensUsed,
|
|
118
118
|
};
|
|
119
119
|
}
|
|
120
|
-
async getToolCalls(messages, tools) {
|
|
120
|
+
async getToolCalls(messages, tools, options) {
|
|
121
121
|
messages = MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages);
|
|
122
122
|
const systemPrompts = messages
|
|
123
123
|
.filter((msg) => msg.type === 'system')
|
|
@@ -142,7 +142,7 @@ class AnthropicGptClient extends GptClient_1.GptClient {
|
|
|
142
142
|
// Note the special header for this endpoint
|
|
143
143
|
const headers = new Headers(this.headers);
|
|
144
144
|
headers.append('anthropic-beta', 'prompt-caching-2024-07-31');
|
|
145
|
-
const resp = await this.makeRequest('/v1/messages', 'POST', body, headers);
|
|
145
|
+
const resp = await this.makeRequest('/v1/messages', 'POST', body, headers, options?.signal);
|
|
146
146
|
if (resp.status !== 200) {
|
|
147
147
|
throw await this.mapErrorResponseToDonobuException(resp);
|
|
148
148
|
}
|
|
@@ -190,13 +190,15 @@ class AnthropicGptClient extends GptClient_1.GptClient {
|
|
|
190
190
|
return new GptPlatformInternalErrorException_1.GptPlatformInternalErrorException(`HTTP ${error.status}: ${error.statusText}`);
|
|
191
191
|
}
|
|
192
192
|
}
|
|
193
|
-
async makeRequest(endpoint, method = 'GET', body, customHeaders) {
|
|
193
|
+
async makeRequest(endpoint, method = 'GET', body, customHeaders, signal) {
|
|
194
194
|
try {
|
|
195
|
+
const abortSignal = signal ||
|
|
196
|
+
AbortSignal.timeout(AnthropicGptClient.REQUEST_TIMEOUT_MILLISECONDS);
|
|
195
197
|
return await fetch(`${AnthropicGptClient.API_URL}${endpoint}`, {
|
|
196
198
|
method,
|
|
197
199
|
headers: customHeaders || this.headers,
|
|
198
200
|
body: body ? JSON.stringify(body) : undefined,
|
|
199
|
-
signal:
|
|
201
|
+
signal: abortSignal,
|
|
200
202
|
});
|
|
201
203
|
}
|
|
202
204
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AnthropicGptClient.js","sourceRoot":"","sources":["../../../src/clients/AnthropicGptClient.ts"],"names":[],"mappings":";;;AAAA,4CAA4C;AAC5C,kDAA+C;AAC/C,2CAAoD;AAOpD,uFAAoF;AACpF,qHAAkH;AAClH,uGAAoG;AACpG,qGAAkG;AAGlG,kDAA+C;AAC/C,2DAAqD;AAGrD;;;GAGG;AACH,MAAa,kBAAmB,SAAQ,qBAAS;IAW/C,YAAoC,eAAgC;QAClE,KAAK,CAAC,eAAe,CAAC,CAAC;QADW,oBAAe,GAAf,eAAe,CAAiB;QAElE,IAAI,CAAC,OAAO,GAAG,IAAI,OAAO,CAAC;YACzB,CAAC,kBAAkB,CAAC,mBAAmB,CAAC,EAAE,eAAe,CAAC,MAAM;YAChE,CAAC,kBAAkB,CAAC,uBAAuB,CAAC,EAC1C,kBAAkB,CAAC,wBAAwB;YAC7C,cAAc,EAAE,kBAAkB,CAAC,yBAAyB;SAC7D,CAAC,CAAC;IACL,CAAC;IAEM,KAAK,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"AnthropicGptClient.js","sourceRoot":"","sources":["../../../src/clients/AnthropicGptClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,10 +9,18 @@ import { z } from 'zod';
|
|
|
9
9
|
export declare class GoogleGenerativeAiGptClient extends GptClient {
|
|
10
10
|
private readonly delegate;
|
|
11
11
|
constructor(config: GoogleGenerativeAiConfig);
|
|
12
|
-
ping(
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
ping(options?: {
|
|
13
|
+
signal?: AbortSignal;
|
|
14
|
+
}): Promise<void>;
|
|
15
|
+
getMessage(messages: GptMessage[], options?: {
|
|
16
|
+
signal?: AbortSignal;
|
|
17
|
+
}): Promise<AssistantMessage>;
|
|
18
|
+
getStructuredOutput(messages: GptMessage[], jsonSchema: z.ZodSchema<any>, options?: {
|
|
19
|
+
signal?: AbortSignal;
|
|
20
|
+
}): Promise<StructuredOutputMessage>;
|
|
21
|
+
getToolCalls(messages: GptMessage[], tools: ToolOption[], options?: {
|
|
22
|
+
signal?: AbortSignal;
|
|
23
|
+
}): Promise<ProposedToolCallsMessage>;
|
|
16
24
|
/**
|
|
17
25
|
* Fix the "assert1" field issue in tool call parameters (Gemini has severe
|
|
18
26
|
* troubles trying to say the word "assert" on its own... really).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoogleGenerativeAiGptClient.d.ts","sourceRoot":"","sources":["../../../src/clients/GoogleGenerativeAiGptClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAI/D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,qBAAa,2BAA4B,SAAQ,SAAS;IACxD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAY;gBAElB,MAAM,EAAE,wBAAwB;IAStC,IAAI,
|
|
1
|
+
{"version":3,"file":"GoogleGenerativeAiGptClient.d.ts","sourceRoot":"","sources":["../../../src/clients/GoogleGenerativeAiGptClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AAI/D,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;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,CAC9B,QAAQ,EAAE,UAAU,EAAE,EACtB,UAAU,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAC5B,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,uBAAuB,CAAC;IAatB,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;IAoBpC;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;CAqC/B"}
|
|
@@ -19,21 +19,21 @@ class GoogleGenerativeAiGptClient extends GptClient_1.GptClient {
|
|
|
19
19
|
const model = google(config.modelName);
|
|
20
20
|
this.delegate = new VercelAiGptClient_1.VercelAiGptClient(model);
|
|
21
21
|
}
|
|
22
|
-
async ping() {
|
|
23
|
-
return this.delegate.ping();
|
|
22
|
+
async ping(options) {
|
|
23
|
+
return this.delegate.ping(options);
|
|
24
24
|
}
|
|
25
|
-
async getMessage(messages) {
|
|
26
|
-
return this.delegate.getMessage(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages));
|
|
25
|
+
async getMessage(messages, options) {
|
|
26
|
+
return this.delegate.getMessage(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), options);
|
|
27
27
|
}
|
|
28
|
-
async getStructuredOutput(messages, jsonSchema) {
|
|
28
|
+
async getStructuredOutput(messages, jsonSchema, options) {
|
|
29
29
|
const preprocessedSchema = zod_1.z.preprocess((data) => {
|
|
30
30
|
GoogleGenerativeAiGptClient.fixAssertFields(data);
|
|
31
31
|
return data;
|
|
32
32
|
}, jsonSchema);
|
|
33
|
-
const resp = await this.delegate.getStructuredOutput(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), preprocessedSchema);
|
|
33
|
+
const resp = await this.delegate.getStructuredOutput(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), preprocessedSchema, options);
|
|
34
34
|
return resp;
|
|
35
35
|
}
|
|
36
|
-
async getToolCalls(messages, tools) {
|
|
36
|
+
async getToolCalls(messages, tools, options) {
|
|
37
37
|
const preprocessedTools = tools.map((tool) => ({
|
|
38
38
|
name: tool.name,
|
|
39
39
|
description: tool.description,
|
|
@@ -42,7 +42,7 @@ class GoogleGenerativeAiGptClient extends GptClient_1.GptClient {
|
|
|
42
42
|
return data;
|
|
43
43
|
}, tool.inputSchema),
|
|
44
44
|
}));
|
|
45
|
-
const resp = await this.delegate.getToolCalls(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), preprocessedTools);
|
|
45
|
+
const resp = await this.delegate.getToolCalls(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), preprocessedTools, options);
|
|
46
46
|
resp.proposedToolCalls.forEach((t) => {
|
|
47
47
|
GoogleGenerativeAiGptClient.fixAssertFields(t.parameters);
|
|
48
48
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoogleGenerativeAiGptClient.js","sourceRoot":"","sources":["../../../src/clients/GoogleGenerativeAiGptClient.ts"],"names":[],"mappings":";;;AAMA,2CAAoD;AAEpD,2CAA0D;AAC1D,2DAAwD;AACxD,kDAA+C;AAC/C,6BAAwB;AAExB;;;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;
|
|
1
|
+
{"version":3,"file":"GoogleGenerativeAiGptClient.js","sourceRoot":"","sources":["../../../src/clients/GoogleGenerativeAiGptClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,10 +9,18 @@ import { z } from 'zod';
|
|
|
9
9
|
export declare class GoogleVertexGptClient extends GptClient {
|
|
10
10
|
private readonly delegate;
|
|
11
11
|
constructor(config: GoogleVertexConfig);
|
|
12
|
-
ping(
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
ping(options?: {
|
|
13
|
+
signal?: AbortSignal;
|
|
14
|
+
}): Promise<void>;
|
|
15
|
+
getMessage(messages: GptMessage[], options?: {
|
|
16
|
+
signal?: AbortSignal;
|
|
17
|
+
}): Promise<AssistantMessage>;
|
|
18
|
+
getStructuredOutput(messages: GptMessage[], jsonSchema: z.ZodSchema<any>, options?: {
|
|
19
|
+
signal?: AbortSignal;
|
|
20
|
+
}): Promise<StructuredOutputMessage>;
|
|
21
|
+
getToolCalls(messages: GptMessage[], tools: ToolOption[], options?: {
|
|
22
|
+
signal?: AbortSignal;
|
|
23
|
+
}): Promise<ProposedToolCallsMessage>;
|
|
16
24
|
/**
|
|
17
25
|
* Fix the "assert1" field issue in tool call parameters (Gemini has severe
|
|
18
26
|
* troubles trying to say the word "assert" on its own... really).
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoogleVertexGptClient.d.ts","sourceRoot":"","sources":["../../../src/clients/GoogleVertexGptClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAIzD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB;;;GAGG;AACH,qBAAa,qBAAsB,SAAQ,SAAS;IAClD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAY;gBAElB,MAAM,EAAE,kBAAkB;IAqBhC,IAAI,
|
|
1
|
+
{"version":3,"file":"GoogleVertexGptClient.d.ts","sourceRoot":"","sources":["../../../src/clients/GoogleVertexGptClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,EAChB,UAAU,EACV,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACpD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAIzD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB;;;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,CAC9B,QAAQ,EAAE,UAAU,EAAE,EACtB,UAAU,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAC5B,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,uBAAuB,CAAC;IAatB,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;IAoBpC;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,eAAe;CAqC/B"}
|
|
@@ -27,21 +27,21 @@ class GoogleVertexGptClient extends GptClient_1.GptClient {
|
|
|
27
27
|
throw error;
|
|
28
28
|
}
|
|
29
29
|
}
|
|
30
|
-
async ping() {
|
|
31
|
-
return this.delegate.ping();
|
|
30
|
+
async ping(options) {
|
|
31
|
+
return this.delegate.ping(options);
|
|
32
32
|
}
|
|
33
|
-
async getMessage(messages) {
|
|
34
|
-
return this.delegate.getMessage(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages));
|
|
33
|
+
async getMessage(messages, options) {
|
|
34
|
+
return this.delegate.getMessage(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), options);
|
|
35
35
|
}
|
|
36
|
-
async getStructuredOutput(messages, jsonSchema) {
|
|
36
|
+
async getStructuredOutput(messages, jsonSchema, options) {
|
|
37
37
|
const preprocessedSchema = zod_1.z.preprocess((data) => {
|
|
38
38
|
GoogleVertexGptClient.fixAssertFields(data);
|
|
39
39
|
return data;
|
|
40
40
|
}, jsonSchema);
|
|
41
|
-
const resp = await this.delegate.getStructuredOutput(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), preprocessedSchema);
|
|
41
|
+
const resp = await this.delegate.getStructuredOutput(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), preprocessedSchema, options);
|
|
42
42
|
return resp;
|
|
43
43
|
}
|
|
44
|
-
async getToolCalls(messages, tools) {
|
|
44
|
+
async getToolCalls(messages, tools, options) {
|
|
45
45
|
const preprocessedTools = tools.map((tool) => ({
|
|
46
46
|
name: tool.name,
|
|
47
47
|
description: tool.description,
|
|
@@ -50,7 +50,7 @@ class GoogleVertexGptClient extends GptClient_1.GptClient {
|
|
|
50
50
|
return data;
|
|
51
51
|
}, tool.inputSchema),
|
|
52
52
|
}));
|
|
53
|
-
const resp = await this.delegate.getToolCalls(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), preprocessedTools);
|
|
53
|
+
const resp = await this.delegate.getToolCalls(MiscUtils_1.MiscUtils.mergeAdjacentUserMessages(messages), preprocessedTools, options);
|
|
54
54
|
resp.proposedToolCalls.forEach((t) => {
|
|
55
55
|
GoogleVertexGptClient.fixAssertFields(t.parameters);
|
|
56
56
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GoogleVertexGptClient.js","sourceRoot":"","sources":["../../../src/clients/GoogleVertexGptClient.ts"],"names":[],"mappings":";;;AAMA,2CAAoD;AAEpD,yDAAqD;AACrD,2DAAwD;AACxD,kDAA+C;AAC/C,6BAAwB;AACxB,qHAAkH;AAElH;;;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;
|
|
1
|
+
{"version":3,"file":"GoogleVertexGptClient.js","sourceRoot":"","sources":["../../../src/clients/GoogleVertexGptClient.ts"],"names":[],"mappings":";;;AAMA,2CAAoD;AAEpD,yDAAqD;AACrD,2DAAwD;AACxD,kDAA+C;AAC/C,6BAAwB;AACxB,qHAAkH;AAElH;;;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,UAA4B,EAC5B,OAAkC;QAElC,MAAM,kBAAkB,GAAG,OAAC,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE;YAC/C,qBAAqB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;YAC5C,OAAO,IAAI,CAAC;QACd,CAAC,EAAE,UAAU,CAAC,CAAC;QACf,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,OAAC,CAAC,UAAU,CAAC,CAAC,IAAI,EAAE,EAAE;gBACjC,qBAAqB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;gBAC5C,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,qBAAqB,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IAED;;;;;OAKG;IACK,MAAM,CAAC,eAAe,CAAC,GAAY;QACzC,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;YACpC,OAAO;QACT,CAAC;QAED,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YACvB,GAAG,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,qBAAqB,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC,CAAC;YACnE,OAAO;QACT,CAAC;QAED,MAAM,SAAS,GAAG,GAA8B,CAAC;QAEjD,yDAAyD;QACzD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACpC,MAAM,YAAY,GAAyC,EAAE,CAAC;QAE9D,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACnB,sDAAsD;YACtD,IAAI,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBAC5B,2EAA2E;gBAC3E,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;gBACjD,YAAY,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC;YAC7C,CAAC;YAED,qCAAqC;YACrC,IAAI,SAAS,CAAC,GAAG,CAAC,IAAI,OAAO,SAAS,CAAC,GAAG,CAAC,KAAK,QAAQ,EAAE,CAAC;gBACzD,qBAAqB,CAAC,eAAe,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC;YACxD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,mFAAmF;QACnF,YAAY,CAAC,OAAO,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE;YAC1C,MAAM,KAAK,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;YAChC,OAAO,SAAS,CAAC,MAAM,CAAC,CAAC;YACzB,SAAS,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;QAC5B,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA1HD,sDA0HC"}
|
|
@@ -14,16 +14,22 @@ export declare abstract class GptClient {
|
|
|
14
14
|
/**
|
|
15
15
|
* Attempts to communicate with the GPT using a minimal valid request.
|
|
16
16
|
*/
|
|
17
|
-
abstract ping(
|
|
17
|
+
abstract ping(options?: {
|
|
18
|
+
signal?: AbortSignal;
|
|
19
|
+
}): Promise<void>;
|
|
18
20
|
/**
|
|
19
21
|
* Simple prompt and response, does not support tool calling, etc.
|
|
20
22
|
*/
|
|
21
|
-
abstract getMessage(messages: GptMessage[]
|
|
23
|
+
abstract getMessage(messages: GptMessage[], options?: {
|
|
24
|
+
signal?: AbortSignal;
|
|
25
|
+
}): Promise<AssistantMessage>;
|
|
22
26
|
/**
|
|
23
27
|
* Have the GPT return a structured output from the given message history. The latest message must
|
|
24
28
|
* come last.
|
|
25
29
|
*/
|
|
26
|
-
abstract getStructuredOutput(messages: GptMessage[], jsonSchema: z.ZodSchema<any
|
|
30
|
+
abstract getStructuredOutput(messages: GptMessage[], jsonSchema: z.ZodSchema<any>, options?: {
|
|
31
|
+
signal?: AbortSignal;
|
|
32
|
+
}): Promise<StructuredOutputMessage>;
|
|
27
33
|
/**
|
|
28
34
|
* Have the GPT propose tool calls from the given message history. The latest message must come
|
|
29
35
|
* last.
|
|
@@ -32,6 +38,8 @@ export declare abstract class GptClient {
|
|
|
32
38
|
* @param tools The set of tools the GPT can choose from.
|
|
33
39
|
* @returns The proposed tool calls given the message history.
|
|
34
40
|
*/
|
|
35
|
-
abstract getToolCalls(messages: GptMessage[], tools: ToolOption[]
|
|
41
|
+
abstract getToolCalls(messages: GptMessage[], tools: ToolOption[], options?: {
|
|
42
|
+
signal?: AbortSignal;
|
|
43
|
+
}): Promise<ProposedToolCallsMessage>;
|
|
36
44
|
}
|
|
37
45
|
//# sourceMappingURL=GptClient.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GptClient.d.ts","sourceRoot":"","sources":["../../../src/clients/GptClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,yFAAyF;AACzF,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;CAC/B,CAAC;AAEF,6DAA6D;AAC7D,8BAAsB,SAAS;aACD,MAAM,EAAE,SAAS;gBAAjB,MAAM,EAAE,SAAS;IAE7C;;OAEG;IACH,QAAQ,CAAC,IAAI,
|
|
1
|
+
{"version":3,"file":"GptClient.d.ts","sourceRoot":"","sources":["../../../src/clients/GptClient.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,wBAAwB,EACxB,uBAAuB,EACxB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,yFAAyF;AACzF,MAAM,MAAM,UAAU,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;CAC/B,CAAC;AAEF,6DAA6D;AAC7D,8BAAsB,SAAS;aACD,MAAM,EAAE,SAAS;gBAAjB,MAAM,EAAE,SAAS;IAE7C;;OAEG;IACH,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAEhE;;OAEG;IACH,QAAQ,CAAC,UAAU,CACjB,QAAQ,EAAE,UAAU,EAAE,EACtB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,gBAAgB,CAAC;IAE5B;;;OAGG;IACH,QAAQ,CAAC,mBAAmB,CAC1B,QAAQ,EAAE,UAAU,EAAE,EACtB,UAAU,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAC5B,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,uBAAuB,CAAC;IAEnC;;;;;;;OAOG;IACH,QAAQ,CAAC,YAAY,CACnB,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;CACrC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GptClient.js","sourceRoot":"","sources":["../../../src/clients/GptClient.ts"],"names":[],"mappings":";;;AAgBA,6DAA6D;AAC7D,MAAsB,SAAS;IAC7B,YAA4B,MAAiB;QAAjB,WAAM,GAAN,MAAM,CAAW;IAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"GptClient.js","sourceRoot":"","sources":["../../../src/clients/GptClient.ts"],"names":[],"mappings":";;;AAgBA,6DAA6D;AAC7D,MAAsB,SAAS;IAC7B,YAA4B,MAAiB;QAAjB,WAAM,GAAN,MAAM,CAAW;IAAG,CAAC;CAsClD;AAvCD,8BAuCC"}
|
|
@@ -12,10 +12,18 @@ export declare class OpenAiGptClient extends GptClient {
|
|
|
12
12
|
private static readonly REQUEST_TIMEOUT_MILLISECONDS;
|
|
13
13
|
private readonly headers;
|
|
14
14
|
constructor(openAiConfig: OpenAiConfig);
|
|
15
|
-
ping(
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
15
|
+
ping(options?: {
|
|
16
|
+
signal?: AbortSignal;
|
|
17
|
+
}): Promise<void>;
|
|
18
|
+
getMessage(messages: GptMessage[], options?: {
|
|
19
|
+
signal?: AbortSignal;
|
|
20
|
+
}): Promise<AssistantMessage>;
|
|
21
|
+
getStructuredOutput(messages: GptMessage[], zodSchema: z.ZodSchema<any>, options?: {
|
|
22
|
+
signal?: AbortSignal;
|
|
23
|
+
}): Promise<StructuredOutputMessage>;
|
|
24
|
+
getToolCalls(messages: GptMessage[], tools: ToolOption[], options?: {
|
|
25
|
+
signal?: AbortSignal;
|
|
26
|
+
}): Promise<ProposedToolCallsMessage>;
|
|
19
27
|
private chatRequestMessageFromGptMessage;
|
|
20
28
|
private toolChoiceFromTool;
|
|
21
29
|
private parseAssistantMessage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAiGptClient.d.ts","sourceRoot":"","sources":["../../../src/clients/OpenAiGptClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGpD,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,uBAAuB,EACvB,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAInD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,SAAS;IAKzB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAJhD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAA4B;IAC3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,4BAA4B,CAAU;IAC9D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEE,YAAY,EAAE,YAAY;IAQjD,IAAI,
|
|
1
|
+
{"version":3,"file":"OpenAiGptClient.d.ts","sourceRoot":"","sources":["../../../src/clients/OpenAiGptClient.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGpD,OAAO,EACL,UAAU,EACV,gBAAgB,EAChB,uBAAuB,EACvB,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAInD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB;;;GAGG;AACH,qBAAa,eAAgB,SAAQ,SAAS;IAKzB,OAAO,CAAC,QAAQ,CAAC,YAAY;IAJhD,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAA4B;IAC3D,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC,4BAA4B,CAAU;IAC9D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAU;gBAEE,YAAY,EAAE,YAAY;IAQjD,IAAI,CAAC,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBvD,UAAU,CACrB,QAAQ,EAAE,UAAU,EAAE,EACtB,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,gBAAgB,CAAC;IAsBf,mBAAmB,CAC9B,QAAQ,EAAE,UAAU,EAAE,EACtB,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAC3B,OAAO,CAAC,EAAE;QAAE,MAAM,CAAC,EAAE,WAAW,CAAA;KAAE,GACjC,OAAO,CAAC,uBAAuB,CAAC;IA4CtB,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;IA2BpC,OAAO,CAAC,gCAAgC;IA8ExC,OAAO,CAAC,kBAAkB;IAiB1B,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,4BAA4B;IAkBpC,OAAO,CAAC,6BAA6B;YAuCvB,iCAAiC;IA2B/C;;OAEG;YACW,WAAW;IA0BzB;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,gCAAgC;CAyFhD"}
|
|
@@ -23,8 +23,8 @@ class OpenAiGptClient extends GptClient_1.GptClient {
|
|
|
23
23
|
'Content-Type': 'application/json',
|
|
24
24
|
});
|
|
25
25
|
}
|
|
26
|
-
async ping() {
|
|
27
|
-
const resp = await this.makeRequest(`/v1/models/${this.openAiConfig.modelName}
|
|
26
|
+
async ping(options) {
|
|
27
|
+
const resp = await this.makeRequest(`/v1/models/${this.openAiConfig.modelName}`, 'GET', undefined, options?.signal);
|
|
28
28
|
if (resp.status === 404) {
|
|
29
29
|
throw new GptModelNotFoundException_1.GptModelNotFoundException(this.config.type, this.openAiConfig.modelName);
|
|
30
30
|
}
|
|
@@ -32,12 +32,12 @@ class OpenAiGptClient extends GptClient_1.GptClient {
|
|
|
32
32
|
throw await this.mapErrorResponseToDonobuException(resp);
|
|
33
33
|
}
|
|
34
34
|
}
|
|
35
|
-
async getMessage(messages) {
|
|
35
|
+
async getMessage(messages, options) {
|
|
36
36
|
const body = {
|
|
37
37
|
model: this.openAiConfig.modelName,
|
|
38
38
|
messages: messages.map((msg) => this.chatRequestMessageFromGptMessage(msg)),
|
|
39
39
|
};
|
|
40
|
-
const resp = await this.makeRequest('/v1/chat/completions', 'POST', body);
|
|
40
|
+
const resp = await this.makeRequest('/v1/chat/completions', 'POST', body, options?.signal);
|
|
41
41
|
if (resp.status !== 200) {
|
|
42
42
|
throw await this.mapErrorResponseToDonobuException(resp);
|
|
43
43
|
}
|
|
@@ -46,7 +46,7 @@ class OpenAiGptClient extends GptClient_1.GptClient {
|
|
|
46
46
|
return this.parseAssistantMessage(data);
|
|
47
47
|
}
|
|
48
48
|
}
|
|
49
|
-
async getStructuredOutput(messages, zodSchema) {
|
|
49
|
+
async getStructuredOutput(messages, zodSchema, options) {
|
|
50
50
|
const jsonSchema = (0, zod_to_json_schema_1.zodToJsonSchema)(zodSchema, {
|
|
51
51
|
target: 'jsonSchema7',
|
|
52
52
|
$refStrategy: 'none',
|
|
@@ -64,7 +64,7 @@ class OpenAiGptClient extends GptClient_1.GptClient {
|
|
|
64
64
|
},
|
|
65
65
|
messages: messages.map((msg) => this.chatRequestMessageFromGptMessage(msg)),
|
|
66
66
|
};
|
|
67
|
-
const resp = await this.makeRequest('/v1/chat/completions', 'POST', body);
|
|
67
|
+
const resp = await this.makeRequest('/v1/chat/completions', 'POST', body, options?.signal);
|
|
68
68
|
if (resp.status !== 200) {
|
|
69
69
|
throw await this.mapErrorResponseToDonobuException(resp);
|
|
70
70
|
}
|
|
@@ -79,7 +79,7 @@ class OpenAiGptClient extends GptClient_1.GptClient {
|
|
|
79
79
|
};
|
|
80
80
|
}
|
|
81
81
|
}
|
|
82
|
-
async getToolCalls(messages, tools) {
|
|
82
|
+
async getToolCalls(messages, tools, options) {
|
|
83
83
|
const body = {
|
|
84
84
|
model: this.openAiConfig.modelName,
|
|
85
85
|
tool_choice: 'required',
|
|
@@ -88,7 +88,7 @@ class OpenAiGptClient extends GptClient_1.GptClient {
|
|
|
88
88
|
: undefined,
|
|
89
89
|
messages: messages.map((msg) => this.chatRequestMessageFromGptMessage(msg)),
|
|
90
90
|
};
|
|
91
|
-
const resp = await this.makeRequest('/v1/chat/completions', 'POST', body);
|
|
91
|
+
const resp = await this.makeRequest('/v1/chat/completions', 'POST', body, options?.signal);
|
|
92
92
|
if (resp.status !== 200) {
|
|
93
93
|
throw await this.mapErrorResponseToDonobuException(resp);
|
|
94
94
|
}
|
|
@@ -251,13 +251,15 @@ class OpenAiGptClient extends GptClient_1.GptClient {
|
|
|
251
251
|
/**
|
|
252
252
|
* Makes an HTTP request to the OpenAI API with standard configuration.
|
|
253
253
|
*/
|
|
254
|
-
async makeRequest(endpoint, method = 'GET', body) {
|
|
254
|
+
async makeRequest(endpoint, method = 'GET', body, signal) {
|
|
255
255
|
try {
|
|
256
|
+
const abortSignal = signal ||
|
|
257
|
+
AbortSignal.timeout(OpenAiGptClient.REQUEST_TIMEOUT_MILLISECONDS);
|
|
256
258
|
return await fetch(`${OpenAiGptClient.API_URL}${endpoint}`, {
|
|
257
259
|
method,
|
|
258
260
|
headers: this.headers,
|
|
259
261
|
body: body ? JSON.stringify(body) : undefined,
|
|
260
|
-
signal:
|
|
262
|
+
signal: abortSignal,
|
|
261
263
|
});
|
|
262
264
|
}
|
|
263
265
|
catch (error) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OpenAiGptClient.js","sourceRoot":"","sources":["../../../src/clients/OpenAiGptClient.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"OpenAiGptClient.js","sourceRoot":"","sources":["../../../src/clients/OpenAiGptClient.ts"],"names":[],"mappings":"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"}
|