Skip to content

Commit 23ff244

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent b8893e6 commit 23ff244

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/request/completion/AmazonBedrockUnifiedChatCompletionRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public Flow.Publisher<StreamingUnifiedChatCompletionResults.Results> executeStre
8787
}
8888

8989
inferenceConfig(requestEntity).ifPresent(converseStreamRequest::inferenceConfig);
90-
// return new ToolAwareUnifiedPublisher(awsBedrockClient, converseStreamRequest.build());
90+
// return new ToolAwareUnifiedPublisher(awsBedrockClient, converseStreamRequest.build());
9191
return awsBedrockClient.converseUnifiedStream(converseStreamRequest.build());
9292
}
9393

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/services/amazonbedrock/request/completion/ToolAwareUnifiedPublisher.java

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@
77

88
package org.elasticsearch.xpack.inference.services.amazonbedrock.request.completion;
99

10-
import org.elasticsearch.xpack.core.inference.results.StreamingUnifiedChatCompletionResults;
11-
import org.elasticsearch.xpack.inference.services.amazonbedrock.client.AmazonBedrockBaseClient;
12-
1310
import software.amazon.awssdk.services.bedrockruntime.model.ContentBlock;
1411
import software.amazon.awssdk.services.bedrockruntime.model.ConversationRole;
1512
import software.amazon.awssdk.services.bedrockruntime.model.ConverseStreamRequest;
1613
import software.amazon.awssdk.services.bedrockruntime.model.Message;
1714
import software.amazon.awssdk.services.bedrockruntime.model.ToolResultBlock;
1815

16+
import org.elasticsearch.xpack.core.inference.results.StreamingUnifiedChatCompletionResults;
17+
import org.elasticsearch.xpack.inference.services.amazonbedrock.client.AmazonBedrockBaseClient;
18+
1919
import java.util.ArrayList;
2020
import java.util.List;
2121
import java.util.concurrent.Flow;
@@ -99,7 +99,6 @@ public void onComplete() {
9999
}
100100
});
101101

102-
103102
boolean toolRequested = "TOOL_USE".equalsIgnoreCase(stopReasons[0]) || !toolUses.isEmpty();
104103

105104
if (!toolRequested) {
@@ -110,20 +109,20 @@ public void onComplete() {
110109
for (var toolUse : toolUses) {
111110

112111
String jsonIn = toolUse.inputJson.toString();
113-
// String jsonOut = execute(toolUse.getName(), jsonIn);
112+
// String jsonOut = execute(toolUse.getName(), jsonIn);
114113

115114
toolResultBlocks.add(
116115
ContentBlock.builder()
117-
.toolResult(ToolResultBlock.builder()
118-
.toolUseId(toolUse.getId())
119-
// .content((Collection<ToolResultContentBlock>) Document.fromString(jsonOut))
120-
.build())
121-
.build());
122-
123-
Message toolResultMsg = Message.builder()
124-
.role(ConversationRole.USER)
125-
.content(toolResultBlocks)
126-
.build();
116+
.toolResult(
117+
ToolResultBlock.builder()
118+
.toolUseId(toolUse.getId())
119+
// .content((Collection<ToolResultContentBlock>) Document.fromString(jsonOut))
120+
.build()
121+
)
122+
.build()
123+
);
124+
125+
Message toolResultMsg = Message.builder().role(ConversationRole.USER).content(toolResultBlocks).build();
127126

128127
history.add(toolResultMsg);
129128

0 commit comments

Comments
 (0)