Merge branch 'spring-projects:main' into main

Author: ddobrin

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/api/OpenAiApiIT.java

@@ -122,8 +122,7 @@ void inputAudio() throws IOException {
 
 	@Test
 	void outputAudio() {
-		ChatCompletionMessage chatCompletionMessage = new ChatCompletionMessage(
-				"What is the magic spell to make objects fly?", Role.USER);
+		ChatCompletionMessage chatCompletionMessage = new ChatCompletionMessage("Say 'I am a robot'", Role.USER);
 		ChatCompletionRequest.AudioParameters audioParameters = new ChatCompletionRequest.AudioParameters(
 				ChatCompletionRequest.AudioParameters.Voice.NOVA,
 				ChatCompletionRequest.AudioParameters.AudioResponseFormat.MP3);
@@ -139,7 +138,7 @@ void outputAudio() {
 
 		assertThat(response.getBody().choices().get(0).message().audioOutput().data()).isNotNull();
 		assertThat(response.getBody().choices().get(0).message().audioOutput().transcript())
-			.containsIgnoringCase("leviosa");
+			.containsIgnoringCase("robot");
 	}
 
 	@Test

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/OpenAiChatModelIT.java

@@ -589,7 +589,19 @@ void multiModalityInputAudio(String modelName) {
 			.call(new Prompt(List.of(userMessage), ChatOptions.builder().model(modelName).build()));
 
 		logger.info(response.getResult().getOutput().getText());
-		assertThat(response.getResult().getOutput().getText()).containsIgnoringCase("hobbits");
+		String responseText = response.getResult().getOutput().getText();
+		assertThat(responseText).satisfiesAnyOf(text -> assertThat(text).containsIgnoringCase("hobbit"),
+				text -> assertThat(text).containsIgnoringCase("lord of the rings"),
+				text -> assertThat(text).containsIgnoringCase("lotr"),
+				text -> assertThat(text).containsIgnoringCase("tolkien"),
+				text -> assertThat(text).containsIgnoringCase("fantasy"),
+				text -> assertThat(text).containsIgnoringCase("ring"),
+				text -> assertThat(text).containsIgnoringCase("shire"),
+				text -> assertThat(text).containsIgnoringCase("baggins"),
+				text -> assertThat(text).containsIgnoringCase("gandalf"),
+				text -> assertThat(text).containsIgnoringCase("frodo"),
+				text -> assertThat(text).containsIgnoringCase("meme"),
+				text -> assertThat(text).containsIgnoringCase("remix"));
 		assertThat(response.getMetadata().getModel()).containsIgnoringCase(modelName);
 	}
 

spring-ai-docs/src/main/antora/modules/ROOT/images/advisors-api-classes.jpg

@@ -314,7 +314,7 @@ Flux<String> flux = this.chatClient.prompt()
 
 String content = this.flux.collectList().block().stream().collect(Collectors.joining());
 
-List<ActorFilms> actorFilms = this.converter.convert(this.content);
+List<ActorsFilms> actorFilms = this.converter.convert(this.content);
 ----
 
 == Prompt Templates

spring-ai-docs/src/main/antora/modules/ROOT/images/advisors-flow.jpg

@@ -65,7 +65,24 @@ For multiple clients:
 List<McpSyncClient> clients = // obtain list of clients
 List<ToolCallback> callbacks = SyncMcpToolCallbackProvider.syncToolCallbacks(clients);
 ----
++
+For dynamic selection of a subset of clients 
++
+[source,java]
+----
+@Autowired
+private List<McpSyncClient> mcpSyncClients;
 
+public ToolCallbackProvider buildProvider(Set<String> allowedServerNames) {
+    // Filter by server.name().
+    List<McpSyncClient> selected = mcpSyncClients.stream()
+        .filter(c -> allowedServerNames.contains(c.getServerInfo().name()))
+        .toList();
+
+    return new SyncMcpToolCallbackProvider(selected);
+}
+
+----
 Async::
 +
 [source,java]

spring-ai-docs/src/main/antora/modules/ROOT/images/advisors-non-stream-vs-stream.jpg

@@ -383,5 +383,5 @@ You can have multiple beans producing ToolCallbacks. The auto-configuration will
 == Additional Resources
 
 * link:https://docs.spring.io/spring-ai/reference/[Spring AI Documentation]
-* link:https://modelcontextprotocol.github.io/specification/[Model Context Protocol Specification]
+* link:https://modelcontextprotocol.io/specification[Model Context Protocol Specification]
 * link:https://docs.spring.io/spring-boot/docs/current/reference/html/features.html#features.developing-auto-configuration[Spring Boot Auto-configuration]