[Enhancement] - Derrive requestMetadata from user params

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/BedrockProxyChatModel.java

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

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

@@ -25,6 +25,7 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.stream.Collectors;
 
+import org.springframework.ai.chat.prompt.Prompt;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import software.amazon.awssdk.core.SdkField;
@@ -384,6 +385,27 @@ else if (value instanceof Map mapValue) {
 		}
 	}
 
+	@SuppressWarnings("unchecked")
+	public static Map<String, String> getRequestMetadata(Prompt prompt) {
+		Map<String, Object> metadata = prompt.getUserMessage().getMetadata();
+
+		if (metadata.isEmpty()) {
+			return Map.of();
+		}
+
+		Map<String, String> result = new HashMap<>();
+		for (Map.Entry<String, Object> entry : metadata.entrySet()) {
+			String key = entry.getKey();
+			Object value = entry.getValue();
+
+			if (key != null && value != null) {
+				result.put(key, value.toString());
+			}
+		}
+
+		return result;
+	}
+
 	private static Document convertMapToDocument(Map<String, Object> value) {
 		Map<String, Document> attr = value.entrySet()
 			.stream()

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

@@ -70,7 +70,9 @@ void call() {
 				.system(s -> s.text(this.systemTextResource)
 						.param("name", "Bob")
 						.param("voice", "pirate"))
-				.user("Tell me about 3 famous pirates from the Golden Age of Piracy and what they did")
+				.user(u -> u.text("Tell me about 3 famous pirates from the Golden Age of Piracy and what they did")
+						.param("requestId", "1234")
+				)
 				.call()
 				.chatResponse();
 		// @formatter:on