Spring/spring-ai
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

modify message type get value

Browse Source
This commit is contained in:
Ueibin Kim
2023-09-26 02:18:14 +09:00
committed by Mark Pollack
parent cffa790a8b
commit 5ff2c3bb92
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-ai-azure-openai/src/main/java/org/springframework/ai/azure/openai/client/AzureOpenAiClient.java
View File

@@ -73,7 +73,7 @@ public class AzureOpenAiClient implements AiClient {
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()));
}

5
spring-ai-core/src/main/java/org/springframework/ai/prompt/messages/AbstractMessage.java
View File

@@ -87,4 +87,9 @@ public abstract class AbstractMessage implements Message {
return this.messageType;
}
@Override
public String getMessageTypeValue() {
return this.messageType.getValue();
}
}

2
spring-ai-core/src/main/java/org/springframework/ai/prompt/messages/Message.java
View File

@@ -26,4 +26,6 @@ public interface Message {
MessageType getMessageType();
String getMessageTypeValue();
}

9
spring-ai-openai/src/main/java/org/springframework/ai/openai/client/OpenAiClient.java
View File

@@ -27,6 +27,7 @@ import org.springframework.ai.client.AiResponse;
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 class OpenAiClient implements AiClient {
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 @@ public class OpenAiClient implements AiClient {
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(