@purista/harness-bedrock 1.2.1 → 1.2.3

package/dist/index.js

@@ -83,9 +83,11 @@ class BedrockModelProvider extends BaseModelProvider {
         req.signal.throwIfAborted();
         const response = await this.client.send(new ConverseCommand(toConverseInput(req, true)), { abortSignal: req.signal });
         const toolUse = response.output?.message?.content?.find((block) => block.toolUse?.name === 'harness_response')?.toolUse;
+        const toolCalls = withoutObjectTool(extractToolCalls(response, req, 'object'));
         const object = (toolUse?.input ?? parseJson(outputText(response) || '{}', req, 'object'));
         return {
             object,
+            ...(toolCalls ? { toolCalls } : {}),
             usage: toUsage(response.usage?.inputTokens, response.usage?.outputTokens),
             finishReason: toFinishReason(response.stopReason),
             raw: response
@@ -129,17 +131,19 @@ function toConverseInput(req, forceObject) {
         ...(req.call?.providerOptions ?? {})
     };
     const { system, messages } = toBedrockMessages(req.messages);
-    const tools = forceObject ? [toObjectTool(req)] : toTools(req.tools);
+    const modelTools = toTools(req.tools) ?? [];
+    const tools = forceObject ? [...modelTools, toObjectTool(req)] : modelTools;
+    const forceObjectTool = forceObject && modelTools.length === 0;
     return {
         modelId: req.model,
         messages,
         ...(system.length > 0 ? { system } : {}),
-        ...(tools ? { toolConfig: { tools, ...(forceObject ? { toolChoice: { tool: { name: 'harness_response' } } } : {}) } } : {}),
+        ...(tools.length > 0 ? { toolConfig: { tools, ...(forceObjectTool ? { toolChoice: { tool: { name: 'harness_response' } } } : {}) } } : {}),
         inferenceConfig: {
-            ...(req.call?.maxTokens ?? req.defaults?.maxTokens !== undefined ? { maxTokens: req.call?.maxTokens ?? req.defaults?.maxTokens } : {}),
-            ...(req.call?.temperature ?? req.defaults?.temperature !== undefined ? { temperature: req.call?.temperature ?? req.defaults?.temperature } : {}),
-            ...(req.call?.topP ?? req.defaults?.topP !== undefined ? { topP: req.call?.topP ?? req.defaults?.topP } : {}),
-            ...(req.call?.stopSequences ?? req.defaults?.stopSequences ? { stopSequences: req.call?.stopSequences ?? req.defaults?.stopSequences } : {})
+            ...((req.call?.maxTokens ?? req.defaults?.maxTokens) !== undefined ? { maxTokens: req.call?.maxTokens ?? req.defaults?.maxTokens } : {}),
+            ...((req.call?.temperature ?? req.defaults?.temperature) !== undefined ? { temperature: req.call?.temperature ?? req.defaults?.temperature } : {}),
+            ...((req.call?.topP ?? req.defaults?.topP) !== undefined ? { topP: req.call?.topP ?? req.defaults?.topP } : {}),
+            ...((req.call?.stopSequences ?? req.defaults?.stopSequences) !== undefined ? { stopSequences: req.call?.stopSequences ?? req.defaults?.stopSequences } : {})
         },
         ...providerOptions
     };
@@ -211,6 +215,10 @@ function extractToolCalls(response, req, method) {
         arguments: typeof call.input === 'string' ? parseJson(call.input, req, method) : call.input ?? {}
     }));
 }
+function withoutObjectTool(calls) {
+    const filtered = calls?.filter((call) => call.name !== 'harness_response');
+    return filtered && filtered.length > 0 ? filtered : undefined;
+}
 function parseJson(content, req, method) {
     try {
         return JSON.parse(content);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@purista/harness-bedrock",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "description": "Amazon Bedrock model provider adapter for @purista/harness.",
   "type": "module",
   "main": "./dist/index.js",