modify message type get value

spring-projects · Sep 27, 2023 · 5ff2c3b · 5ff2c3b
1 parent cffa790
commit 5ff2c3b
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/...re-openai/src/main/java/org/springframework/ai/azure/openai/client/AzureOpenAiClient.java b/...re-openai/src/main/java/org/springframework/ai/azure/openai/client/AzureOpenAiClient.java
@@ -73,7 +73,7 @@ public AiResponse generate(Prompt prompt) {
 		List<Message> messages = prompt.getMessages();
 		List<ChatMessage> azureMessages = new ArrayList<>();
 		for (Message message : messages) {
-			String messageType = message.getMessageType().getValue();
+			String messageType = message.getMessageTypeValue();
 			ChatRole chatRole = ChatRole.fromString(messageType);
 			azureMessages.add(new ChatMessage(chatRole, message.getContent()));
 		}

diff --git a/spring-ai-core/src/main/java/org/springframework/ai/prompt/messages/AbstractMessage.java b/spring-ai-core/src/main/java/org/springframework/ai/prompt/messages/AbstractMessage.java
@@ -87,4 +87,9 @@ public MessageType getMessageType() {
 		return this.messageType;
 	}
 
+	@Override
+	public String getMessageTypeValue() {
+		return this.messageType.getValue();
+	}
+
 }
diff --git a/spring-ai-core/src/main/java/org/springframework/ai/prompt/messages/Message.java b/spring-ai-core/src/main/java/org/springframework/ai/prompt/messages/Message.java
@@ -26,4 +26,6 @@ public interface Message {
 
 	MessageType getMessageType();
 
+	String getMessageTypeValue();
+
 }
diff --git a/spring-ai-openai/src/main/java/org/springframework/ai/openai/client/OpenAiClient.java b/spring-ai-openai/src/main/java/org/springframework/ai/openai/client/OpenAiClient.java
@@ -27,6 +27,7 @@
 import org.springframework.ai.client.Generation;
 import org.springframework.ai.prompt.Prompt;
 import org.springframework.ai.prompt.messages.Message;
+import org.springframework.ai.prompt.messages.MessageType;
 import org.springframework.util.Assert;
 
 import java.util.ArrayList;
@@ -79,7 +80,7 @@ public AiResponse generate(Prompt prompt) {
 		List<Message> messages = prompt.getMessages();
 		List<ChatMessage> theoMessages = new ArrayList<>();
 		for (Message message : messages) {
-			String messageType = message.getMessageType().getValue();
+			String messageType = message.getMessageTypeValue();
 			theoMessages.add(new ChatMessage(messageType, message.getContent()));
 		}
 		ChatCompletionRequest chatCompletionRequest = ChatCompletionRequest.builder()
@@ -148,14 +149,14 @@ private List<ChatMessage> convertToChatMessages(List<Message> messages) {
 		for (Message promptMessage : messages) {
 			switch (promptMessage.getMessageType()) {
 				case USER:
-					chatMessages.add(new ChatMessage("user", promptMessage.getContent()));
+					chatMessages.add(new ChatMessage(MessageType.USER.getValue(), promptMessage.getContent()));
 					break;
 				case ASSISTANT:
 					// TODO - valid?
-					chatMessages.add(new ChatMessage("assistant", promptMessage.getContent()));
+					chatMessages.add(new ChatMessage(MessageType.ASSISTANT.getValue(), promptMessage.getContent()));
 					break;
 				case SYSTEM:
-					chatMessages.add(new ChatMessage("system", promptMessage.getContent()));
+					chatMessages.add(new ChatMessage(MessageType.SYSTEM.getValue(), promptMessage.getContent()));
 					break;
 				case FUNCTION:
 					logger.error(