Add name property support to AssistantMessage for multi-agent systems\n\n- Add name field to AssistantMessage for multi-agent system support\n- Add new constructors with name parameter for backward compatibility\n- Update equals, hashCode, and toString methods to include name\n- Add comprehensive test coverage for name property functionality\n- Update all AI provider implementations to pass name to API calls:\n * OpenAI ChatModel\n * DeepSeek ChatModel \n * MiniMax ChatModel\n * Mistral AI ChatModel\n * ZhiPu AI ChatModel\n * Azure OpenAI ChatModel (with reflection-based dynamic support)\n- Update Prompt class to properly copy name property\n- Update memory repository implementations (Neo4j, Cassandra)\n- Update DeepSeekAssistantMessage constructors to support name parameter\n- Apply Spring Java format to all modified files\n\nThis enhancement enables building multi-agent systems by allowing\nassistants to be distinguished by name, making it easier to share\nglobal context across different AI assistants.

huidongyin · huidongyin · commit c92ef5298174 · 2025-08-07T09:47:14.000+08:00
Signed-off-by: huidong.yin &lt;huidong.yin247203@gmail.com&gt;
diff --git a/memory/repository/spring-ai-model-chat-memory-repository-cassandra/src/main/java/org/springframework/ai/chat/memory/repository/cassandra/CassandraChatMemoryRepository.java b/memory/repository/spring-ai-model-chat-memory-repository-cassandra/src/main/java/org/springframework/ai/chat/memory/repository/cassandra/CassandraChatMemoryRepository.java
@@ -209,7 +209,7 @@ private Message getMessage(UdtValue udt) {
 		Map<String, Object> props = Map.of(CONVERSATION_TS, udt.getInstant(this.conf.messageUdtTimestampColumn));
 		switch (MessageType.valueOf(udt.getString(this.conf.messageUdtTypeColumn))) {
 			case ASSISTANT:
-				return new AssistantMessage(content, props);
+				return new AssistantMessage(content, props, List.of(), List.of(), null);
 			case USER:
 				return UserMessage.builder().text(content).metadata(props).build();
 			case SYSTEM:
diff --git a/memory/repository/spring-ai-model-chat-memory-repository-neo4j/src/main/java/org/springframework/ai/chat/memory/repository/neo4j/Neo4jChatMemoryRepository.java b/memory/repository/spring-ai-model-chat-memory-repository-neo4j/src/main/java/org/springframework/ai/chat/memory/repository/neo4j/Neo4jChatMemoryRepository.java
@@ -190,7 +190,7 @@ private Message buildAssistantMessage(org.neo4j.driver.Record record, Map<String
 					return new AssistantMessage.ToolCall((String) toolCallMap.get("id"),
 							(String) toolCallMap.get("type"), (String) toolCallMap.get("name"),
 							(String) toolCallMap.get("arguments"));
-				}), mediaList);
+				}), mediaList, (String) messageMap.get("name"));
 		return message;
 	}
 
diff --git a/models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatModel.java b/models/spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/AzureOpenAiChatModel.java
@@ -16,6 +16,8 @@
 
 package org.springframework.ai.azure.openai;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collections;
@@ -596,6 +598,16 @@ private List<ChatRequestMessage> fromSpringAiMessage(Message message) {
 				}
 				var azureAssistantMessage = new ChatRequestAssistantMessage(message.getText());
 				azureAssistantMessage.setToolCalls(toolCalls);
+				// Try to set name field if supported by Azure OpenAI SDK
+				try {
+					// Use reflection to check if setName method exists and call it
+					Method setNameMethod = azureAssistantMessage.getClass().getMethod("setName", String.class);
+					setNameMethod.invoke(azureAssistantMessage, assistantMessage.getName());
+				}
+				catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+					// Name field not supported in current Azure OpenAI SDK version
+					// This is expected behavior for some SDK versions
+				}
 				return List.of(azureAssistantMessage);
 			case TOOL:
 				ToolResponseMessage toolMessage = (ToolResponseMessage) message;
diff --git a/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekAssistantMessage.java b/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekAssistantMessage.java
@@ -57,6 +57,28 @@ public DeepSeekAssistantMessage(String content, String reasoningContent, Map<Str
 		this.reasoningContent = reasoningContent;
 	}
 
+	// Constructors with name parameter
+	public DeepSeekAssistantMessage(String content, Map<String, Object> properties, String name) {
+		super(content, properties, name);
+	}
+
+	public DeepSeekAssistantMessage(String content, Map<String, Object> properties, List<ToolCall> toolCalls,
+			String name) {
+		super(content, properties, toolCalls, name);
+	}
+
+	public DeepSeekAssistantMessage(String content, String reasoningContent, Map<String, Object> properties,
+			List<ToolCall> toolCalls, String name) {
+		super(content, properties, toolCalls, name);
+		this.reasoningContent = reasoningContent;
+	}
+
+	public DeepSeekAssistantMessage(String content, String reasoningContent, Map<String, Object> properties,
+			List<ToolCall> toolCalls, List<Media> media, String name) {
+		super(content, properties, toolCalls, media, name);
+		this.reasoningContent = reasoningContent;
+	}
+
 	public static DeepSeekAssistantMessage prefixAssistantMessage(String context) {
 		return prefixAssistantMessage(context, null);
 	}
diff --git a/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekChatModel.java b/models/spring-ai-deepseek/src/main/java/org/springframework/ai/deepseek/DeepSeekChatModel.java
@@ -446,8 +446,9 @@ else if (message.getMessageType() == MessageType.ASSISTANT) {
 						&& Boolean.TRUE.equals(((DeepSeekAssistantMessage) message).getPrefix())) {
 					isPrefixAssistantMessage = true;
 				}
-				return List.of(new ChatCompletionMessage(assistantMessage.getText(),
-						ChatCompletionMessage.Role.ASSISTANT, null, null, toolCalls, isPrefixAssistantMessage, null));
+				return List
+					.of(new ChatCompletionMessage(assistantMessage.getText(), ChatCompletionMessage.Role.ASSISTANT,
+							assistantMessage.getName(), null, toolCalls, isPrefixAssistantMessage, null));
 			}
 			else if (message.getMessageType() == MessageType.TOOL) {
 				ToolResponseMessage toolMessage = (ToolResponseMessage) message;
diff --git a/models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/MiniMaxChatModel.java b/models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/MiniMaxChatModel.java
@@ -519,7 +519,7 @@ else if (message.getMessageType() == MessageType.ASSISTANT) {
 					}).toList();
 				}
 				return List.of(new ChatCompletionMessage(assistantMessage.getText(),
-						ChatCompletionMessage.Role.ASSISTANT, null, null, toolCalls));
+						ChatCompletionMessage.Role.ASSISTANT, assistantMessage.getName(), null, toolCalls));
 			}
 			else if (message.getMessageType() == MessageType.TOOL) {
 				ToolResponseMessage toolMessage = (ToolResponseMessage) message;
diff --git a/models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/MistralAiChatModel.java b/models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/MistralAiChatModel.java
@@ -454,7 +454,8 @@ else if (message instanceof AssistantMessage assistantMessage) {
 				}
 
 				return List.of(new MistralAiApi.ChatCompletionMessage(assistantMessage.getText(),
-						MistralAiApi.ChatCompletionMessage.Role.ASSISTANT, null, toolCalls, null));
+						MistralAiApi.ChatCompletionMessage.Role.ASSISTANT, assistantMessage.getName(), toolCalls,
+						null));
 			}
 			else if (message instanceof ToolResponseMessage toolResponseMessage) {
 				toolResponseMessage.getResponses()
diff --git a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatModel.java b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatModel.java
@@ -591,8 +591,9 @@ else if (message.getMessageType() == MessageType.ASSISTANT) {
 					audioOutput = new AudioOutput(assistantMessage.getMedia().get(0).getId(), null, null, null);
 
 				}
-				return List.of(new ChatCompletionMessage(assistantMessage.getText(),
-						ChatCompletionMessage.Role.ASSISTANT, null, null, toolCalls, null, audioOutput, null));
+				return List
+					.of(new ChatCompletionMessage(assistantMessage.getText(), ChatCompletionMessage.Role.ASSISTANT,
+							assistantMessage.getName(), null, toolCalls, null, audioOutput, null));
 			}
 			else if (message.getMessageType() == MessageType.TOOL) {
 				ToolResponseMessage toolMessage = (ToolResponseMessage) message;
diff --git a/models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/ZhiPuAiChatModel.java b/models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/ZhiPuAiChatModel.java
@@ -510,7 +510,7 @@ else if (message.getMessageType() == MessageType.ASSISTANT) {
 					}).toList();
 				}
 				return List.of(new ChatCompletionMessage(assistantMessage.getText(),
-						ChatCompletionMessage.Role.ASSISTANT, null, null, toolCalls));
+						ChatCompletionMessage.Role.ASSISTANT, assistantMessage.getName(), null, toolCalls));
 			}
 			else if (message.getMessageType() == MessageType.TOOL) {
 				ToolResponseMessage toolMessage = (ToolResponseMessage) message;
diff --git a/spring-ai-model/src/main/java/org/springframework/ai/chat/messages/AssistantMessage.java b/spring-ai-model/src/main/java/org/springframework/ai/chat/messages/AssistantMessage.java
@@ -41,6 +41,8 @@ public class AssistantMessage extends AbstractMessage implements MediaContent {
 
 	protected final List<Media> media;
 
+	private final String name;
+
 	public AssistantMessage(String content) {
 		this(content, Map.of());
 	}
@@ -55,11 +57,29 @@ public AssistantMessage(String content, Map<String, Object> properties, List<Too
 
 	public AssistantMessage(String content, Map<String, Object> properties, List<ToolCall> toolCalls,
 			List<Media> media) {
+		this(content, properties, toolCalls, media, null);
+	}
+
+	public AssistantMessage(String content, String name) {
+		this(content, Map.of(), name);
+	}
+
+	public AssistantMessage(String content, Map<String, Object> properties, String name) {
+		this(content, properties, List.of(), name);
+	}
+
+	public AssistantMessage(String content, Map<String, Object> properties, List<ToolCall> toolCalls, String name) {
+		this(content, properties, toolCalls, List.of(), name);
+	}
+
+	public AssistantMessage(String content, Map<String, Object> properties, List<ToolCall> toolCalls, List<Media> media,
+			String name) {
 		super(MessageType.ASSISTANT, content, properties);
 		Assert.notNull(toolCalls, "Tool calls must not be null");
 		Assert.notNull(media, "Media must not be null");
 		this.toolCalls = toolCalls;
 		this.media = media;
+		this.name = name;
 	}
 
 	public List<ToolCall> getToolCalls() {
@@ -75,6 +95,16 @@ public List<Media> getMedia() {
 		return this.media;
 	}
 
+	/**
+	 * Get the name of the assistant. This field allows the model to distinguish the name
+	 * of the assistant, making it easier for building multi-agent systems to share global
+	 * context.
+	 * @return the assistant name, or null if not set
+	 */
+	public String getName() {
+		return this.name;
+	}
+
 	@Override
 	public boolean equals(Object o) {
 		if (this == o) {
@@ -86,18 +116,19 @@ public boolean equals(Object o) {
 		if (!super.equals(o)) {
 			return false;
 		}
-		return Objects.equals(this.toolCalls, that.toolCalls) && Objects.equals(this.media, that.media);
+		return Objects.equals(this.toolCalls, that.toolCalls) && Objects.equals(this.media, that.media)
+				&& Objects.equals(this.name, that.name);
 	}
 
 	@Override
 	public int hashCode() {
-		return Objects.hash(super.hashCode(), this.toolCalls, this.media);
+		return Objects.hash(super.hashCode(), this.toolCalls, this.media, this.name);
 	}
 
 	@Override
 	public String toString() {
 		return "AssistantMessage [messageType=" + this.messageType + ", toolCalls=" + this.toolCalls + ", textContent="
-				+ this.textContent + ", metadata=" + this.metadata + "]";
+				+ this.textContent + ", name=" + this.name + ", metadata=" + this.metadata + "]";
 	}
 
 	public record ToolCall(String id, String type, String name, String arguments) {
diff --git a/spring-ai-model/src/main/java/org/springframework/ai/chat/prompt/Prompt.java b/spring-ai-model/src/main/java/org/springframework/ai/chat/prompt/Prompt.java
@@ -178,7 +178,7 @@ else if (message instanceof SystemMessage systemMessage) {
 			}
 			else if (message instanceof AssistantMessage assistantMessage) {
 				messagesCopy.add(new AssistantMessage(assistantMessage.getText(), assistantMessage.getMetadata(),
-						assistantMessage.getToolCalls()));
+						assistantMessage.getToolCalls(), assistantMessage.getMedia(), assistantMessage.getName()));
 			}
 			else if (message instanceof ToolResponseMessage toolResponseMessage) {
 				messagesCopy.add(new ToolResponseMessage(new ArrayList<>(toolResponseMessage.getResponses()),
diff --git a/spring-ai-model/src/test/java/org/springframework/ai/chat/messages/AssistantMessageTest.java b/spring-ai-model/src/test/java/org/springframework/ai/chat/messages/AssistantMessageTest.java
@@ -0,0 +1,116 @@
+/*
+ * Copyright 2023-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ai.chat.messages;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.ai.content.Media;
+
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+/**
+ * Tests for {@link AssistantMessage} with name property support.
+ *
+ * @author Spring AI Team
+ */
+class AssistantMessageTest {
+
+	@Test
+	void shouldCreateAssistantMessageWithName() {
+		AssistantMessage message = new AssistantMessage("Hello", "Alice");
+		assertThat(message.getText()).isEqualTo("Hello");
+		assertThat(message.getName()).isEqualTo("Alice");
+		assertThat(message.getMessageType()).isEqualTo(MessageType.ASSISTANT);
+	}
+
+	@Test
+	void shouldCreateAssistantMessageWithNameAndProperties() {
+		Map<String, Object> properties = Map.of("key", "value");
+		AssistantMessage message = new AssistantMessage("Hello", properties, "Bob");
+		assertThat(message.getText()).isEqualTo("Hello");
+		assertThat(message.getName()).isEqualTo("Bob");
+		assertThat(message.getMetadata()).containsEntry("key", "value");
+	}
+
+	@Test
+	void shouldCreateAssistantMessageWithNameAndToolCalls() {
+		List<AssistantMessage.ToolCall> toolCalls = List
+			.of(new AssistantMessage.ToolCall("1", "function", "testTool", "{}"));
+		AssistantMessage message = new AssistantMessage("Hello", Map.of(), toolCalls, "Charlie");
+		assertThat(message.getText()).isEqualTo("Hello");
+		assertThat(message.getName()).isEqualTo("Charlie");
+		assertThat(message.getToolCalls()).hasSize(1);
+		assertThat(message.getToolCalls().get(0).name()).isEqualTo("testTool");
+	}
+
+	@Test
+	void shouldCreateAssistantMessageWithNameAndMedia() {
+		List<AssistantMessage.ToolCall> toolCalls = List.of();
+		List<Media> media = List.of();
+		AssistantMessage message = new AssistantMessage("Hello", Map.of(), toolCalls, media, "David");
+		assertThat(message.getText()).isEqualTo("Hello");
+		assertThat(message.getName()).isEqualTo("David");
+		assertThat(message.getToolCalls()).isEmpty();
+		assertThat(message.getMedia()).isEmpty();
+	}
+
+	@Test
+	void shouldHandleNullName() {
+		AssistantMessage message = new AssistantMessage("Hello", Map.of(), List.of(), List.of(), null);
+		assertThat(message.getText()).isEqualTo("Hello");
+		assertThat(message.getName()).isNull();
+	}
+
+	@Test
+	void shouldHandleEmptyName() {
+		AssistantMessage message = new AssistantMessage("Hello", "");
+		assertThat(message.getText()).isEqualTo("Hello");
+		assertThat(message.getName()).isEqualTo("");
+	}
+
+	@Test
+	void shouldBeEqualWithSameName() {
+		AssistantMessage message1 = new AssistantMessage("Hello", "Alice");
+		AssistantMessage message2 = new AssistantMessage("Hello", "Alice");
+		assertThat(message1).isEqualTo(message2);
+		assertThat(message1.hashCode()).isEqualTo(message2.hashCode());
+	}
+
+	@Test
+	void shouldNotBeEqualWithDifferentName() {
+		AssistantMessage message1 = new AssistantMessage("Hello", "Alice");
+		AssistantMessage message2 = new AssistantMessage("Hello", "Bob");
+		assertThat(message1).isNotEqualTo(message2);
+	}
+
+	@Test
+	void shouldIncludeNameInToString() {
+		AssistantMessage message = new AssistantMessage("Hello", "Alice");
+		String toString = message.toString();
+		assertThat(toString).contains("name=Alice");
+	}
+
+	@Test
+	void shouldHandleNullNameInToString() {
+		AssistantMessage message = new AssistantMessage("Hello", Map.of(), List.of(), List.of(), null);
+		String toString = message.toString();
+		assertThat(toString).contains("name=null");
+	}
+
+}

Original file line number	Diff line number	Diff line change
`@@ -190,7 +190,7 @@ private Message buildAssistantMessage(org.neo4j.driver.Record record, Map<String`
`190`	`190`	`return new AssistantMessage.ToolCall((String) toolCallMap.get("id"),`
`191`	`191`	`(String) toolCallMap.get("type"), (String) toolCallMap.get("name"),`
`192`	`192`	`(String) toolCallMap.get("arguments"));`
`193`		`- }), mediaList);`
	`193`	`+ }), mediaList, (String) messageMap.get("name"));`
`194`	`194`	`return message;`
`195`	`195`	`}`
`196`	`196`
Original file line number	Diff line number	Diff line change
`@@ -446,8 +446,9 @@ else if (message.getMessageType() == MessageType.ASSISTANT) {`
`446`	`446`	`&& Boolean.TRUE.equals(((DeepSeekAssistantMessage) message).getPrefix())) {`
`447`	`447`	`isPrefixAssistantMessage = true;`
`448`	`448`	`}`
`449`		`- return List.of(new ChatCompletionMessage(assistantMessage.getText(),`
`450`		`- ChatCompletionMessage.Role.ASSISTANT, null, null, toolCalls, isPrefixAssistantMessage, null));`
	`449`	`+ return List`
	`450`	`+ .of(new ChatCompletionMessage(assistantMessage.getText(), ChatCompletionMessage.Role.ASSISTANT,`
	`451`	`+ assistantMessage.getName(), null, toolCalls, isPrefixAssistantMessage, null));`
`451`	`452`	`}`
`452`	`453`	`else if (message.getMessageType() == MessageType.TOOL) {`
`453`	`454`	`ToolResponseMessage toolMessage = (ToolResponseMessage) message;`
Original file line number	Diff line number	Diff line change
`@@ -519,7 +519,7 @@ else if (message.getMessageType() == MessageType.ASSISTANT) {`
`519`	`519`	`}).toList();`
`520`	`520`	`}`
`521`	`521`	`return List.of(new ChatCompletionMessage(assistantMessage.getText(),`
`522`		`- ChatCompletionMessage.Role.ASSISTANT, null, null, toolCalls));`
	`522`	`+ ChatCompletionMessage.Role.ASSISTANT, assistantMessage.getName(), null, toolCalls));`
`523`	`523`	`}`
`524`	`524`	`else if (message.getMessageType() == MessageType.TOOL) {`
`525`	`525`	`ToolResponseMessage toolMessage = (ToolResponseMessage) message;`
Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,8 @@ else if (message instanceof AssistantMessage assistantMessage) {`
`454`	`454`	`}`
`455`	`455`
`456`	`456`	`return List.of(new MistralAiApi.ChatCompletionMessage(assistantMessage.getText(),`
`457`		`- MistralAiApi.ChatCompletionMessage.Role.ASSISTANT, null, toolCalls, null));`
	`457`	`+ MistralAiApi.ChatCompletionMessage.Role.ASSISTANT, assistantMessage.getName(), toolCalls,`
	`458`	`+ null));`
`458`	`459`	`}`
`459`	`460`	`else if (message instanceof ToolResponseMessage toolResponseMessage) {`
`460`	`461`	`toolResponseMessage.getResponses()`
Original file line number	Diff line number	Diff line change
`@@ -591,8 +591,9 @@ else if (message.getMessageType() == MessageType.ASSISTANT) {`
`591`	`591`	`audioOutput = new AudioOutput(assistantMessage.getMedia().get(0).getId(), null, null, null);`
`592`	`592`
`593`	`593`	`}`
`594`		`- return List.of(new ChatCompletionMessage(assistantMessage.getText(),`
`595`		`- ChatCompletionMessage.Role.ASSISTANT, null, null, toolCalls, null, audioOutput, null));`
	`594`	`+ return List`
	`595`	`+ .of(new ChatCompletionMessage(assistantMessage.getText(), ChatCompletionMessage.Role.ASSISTANT,`
	`596`	`+ assistantMessage.getName(), null, toolCalls, null, audioOutput, null));`
`596`	`597`	`}`
`597`	`598`	`else if (message.getMessageType() == MessageType.TOOL) {`
`598`	`599`	`ToolResponseMessage toolMessage = (ToolResponseMessage) message;`
Original file line number	Diff line number	Diff line change
`@@ -510,7 +510,7 @@ else if (message.getMessageType() == MessageType.ASSISTANT) {`
`510`	`510`	`}).toList();`
`511`	`511`	`}`
`512`	`512`	`return List.of(new ChatCompletionMessage(assistantMessage.getText(),`
`513`		`- ChatCompletionMessage.Role.ASSISTANT, null, null, toolCalls));`
	`513`	`+ ChatCompletionMessage.Role.ASSISTANT, assistantMessage.getName(), null, toolCalls));`
`514`	`514`	`}`
`515`	`515`	`else if (message.getMessageType() == MessageType.TOOL) {`
`516`	`516`	`ToolResponseMessage toolMessage = (ToolResponseMessage) message;`