[Enhancement] - Add requestMetadata to converse request

Signed-off-by: Stuart Loxton <[email protected]>
Signed-off-by: Stuart Loxton <[email protected]>

Author: Stuart Loxton

models/spring-ai-bedrock-converse/src/main/java/org/springframework/ai/bedrock/converse/BedrockChatOptions.java

@@ -53,6 +53,9 @@ public class BedrockChatOptions implements ToolCallingChatOptions {
 	@JsonProperty("presencePenalty")
 	private Double presencePenalty;
 
+	@JsonIgnore
+	private Map<String, String> requestParameters = new HashMap<>();
+
 	@JsonProperty("stopSequences")
 	private List<String> stopSequences;
 
@@ -87,6 +90,7 @@ public static BedrockChatOptions fromOptions(BedrockChatOptions fromOptions) {
 			.frequencyPenalty(fromOptions.getFrequencyPenalty())
 			.maxTokens(fromOptions.getMaxTokens())
 			.presencePenalty(fromOptions.getPresencePenalty())
+			.requestParameters(new HashMap<>(fromOptions.getRequestParameters()))
 			.stopSequences(
 					fromOptions.getStopSequences() != null ? new ArrayList<>(fromOptions.getStopSequences()) : null)
 			.temperature(fromOptions.getTemperature())
@@ -126,6 +130,12 @@ public void setMaxTokens(Integer maxTokens) {
 		this.maxTokens = maxTokens;
 	}
 
+	public Map<String, String> getRequestParameters() { return this.requestParameters; }
+
+	public void setRequestParameters(Map<String, String> requestParameters) {
+		this.requestParameters = requestParameters;
+	}
+
 	@Override
 	public Double getPresencePenalty() {
 		return this.presencePenalty;
@@ -279,6 +289,11 @@ public Builder presencePenalty(Double presencePenalty) {
 			return this;
 		}
 
+		public Builder requestParameters(Map<String, String> requestParameters) {
+			this.options.requestParameters = requestParameters;
+			return this;
+		}
+
 		public Builder stopSequences(List<String> stopSequences) {
 			this.options.stopSequences = stopSequences;
 			return this;

models/spring-ai-bedrock-converse/src/main/java/org/springframework/ai/bedrock/converse/BedrockProxyChatModel.java

@@ -22,11 +22,7 @@
 import java.net.URL;
 import java.net.URLConnection;
 import java.time.Duration;
-import java.util.ArrayList;
-import java.util.Base64;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 
 import io.micrometer.observation.Observation;
 import io.micrometer.observation.ObservationRegistry;
@@ -425,13 +421,16 @@ else if (message.getMessageType() == MessageType.TOOL) {
 		Document additionalModelRequestFields = ConverseApiUtils
 			.getChatOptionsAdditionalModelRequestFields(this.defaultOptions, prompt.getOptions());
 
+		HashMap<String, String> requestMetadata = new HashMap<>();
+
 		return ConverseRequest.builder()
 			.modelId(updatedRuntimeOptions.getModel())
 			.inferenceConfig(inferenceConfiguration)
 			.messages(instructionMessages)
 			.system(systemMessages)
 			.additionalModelRequestFields(additionalModelRequestFields)
 			.toolConfig(toolConfiguration)
+			.requestMetadata(requestMetadata)
 			.build();
 	}
 

models/spring-ai-bedrock-converse/src/test/java/org/springframework/ai/bedrock/converse/BedrockChatOptionsTests.java

@@ -37,16 +37,17 @@ void testBuilderWithAllFields() {
 			.frequencyPenalty(0.0)
 			.maxTokens(100)
 			.presencePenalty(0.0)
+			.requestParameters(Map.of("requestId", "1234"))
 			.stopSequences(List.of("stop1", "stop2"))
 			.temperature(0.7)
 			.topP(0.8)
 			.topK(50)
 			.build();
 
 		assertThat(options)
-			.extracting("model", "frequencyPenalty", "maxTokens", "presencePenalty", "stopSequences", "temperature",
-					"topP", "topK")
-			.containsExactly("test-model", 0.0, 100, 0.0, List.of("stop1", "stop2"), 0.7, 0.8, 50);
+			.extracting("model", "frequencyPenalty", "maxTokens", "presencePenalty", "requestParameters",
+					"stopSequences", "temperature", "topP", "topK")
+			.containsExactly("test-model", 0.0, 100, 0.0, Map.of("requestId", "1234"), List.of("stop1", "stop2"), 0.7, 0.8, 50);
 	}
 
 	@Test