Skip to content

fix(ai-prompt): preserve all original messages in decorateBody #6343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
eye-gu wants to merge 3 commits into
base: master
Choose a base branch
from
+147 −1
Open

fix(ai-prompt): preserve all original messages in decorateBody #6343

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cf7dd97
fix(ai-prompt): preserve all original messages in decorateBody
eye-gu May 15, 2026
e58113a
Merge branch 'master' into fix-6342
moremind May 16, 2026
44b0656
move SuppressWarnings
eye-gu May 17, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...nyu-plugin-ai-prompt/src/main/java/org/apache/shenyu/plugin/ai/prompt/AiPromptPlugin.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ private String decorateBody(final String originalBody, final AiPromptConfig aiPr
prependMap.put(Constants.ROLE, aiPromptConfig.getPreRole());
decoratedMessages.add(prependMap);
}
decoratedMessages.add(messages.get(0));
decoratedMessages.addAll(messages);
// If append in aiPromptConfig is not empty, add append to the end of message body
if (Objects.nonNull(aiPromptConfig.getAppend()) && Objects.nonNull(aiPromptConfig.getPostRole())) {
// Assemble append content role
Expand Down
141 changes: 141 additions & 0 deletions ...plugin-ai-prompt/src/test/java/org/apache/shenyu/plugin/ai/prompt/AiPromptPluginTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,16 @@

package org.apache.shenyu.plugin.ai.prompt;

import org.apache.shenyu.common.dto.convert.plugin.AiPromptConfig;
import org.apache.shenyu.common.enums.PluginEnum;
import org.apache.shenyu.common.utils.GsonUtils;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.springframework.http.codec.HttpMessageReader;

import java.lang.reflect.Method;
import java.util.List;
import java.util.Map;

import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.mockito.Mockito.mock;
Expand Down Expand Up @@ -50,4 +54,141 @@ void testGetOrder() {

assertEquals(PluginEnum.AI_PROMPT.getCode(), plugin.getOrder());
}

@Test
void testDecorateBodyReturnsOriginalWhenNoMessages() throws Exception {
AiPromptConfig config = new AiPromptConfig();
String body = "{\"model\":\"gpt-4\"}";
String result = invokeDecorateBody(body, config);
assertEquals(body, result);
}

@Test
void testDecorateBodyReturnsOriginalWhenMessagesEmpty() throws Exception {
AiPromptConfig config = new AiPromptConfig();
String body = "{\"messages\":[]}";
String result = invokeDecorateBody(body, config);
assertEquals(body, result);
}

@Test
void testDecorateBodyWithPrependAndAppend() throws Exception {
AiPromptConfig config = new AiPromptConfig();
config.setPrepend("system instruction");
config.setPreRole("system");
config.setAppend("post instruction");
config.setPostRole("assistant");

String body = "{\"messages\":[{\"role\":\"user\",\"content\":\"hello\"}]}";
String result = invokeDecorateBody(body, config);

Map<String, Object> resultMap = GsonUtils.getInstance().convertToMap(result);
List<Map<String, Object>> messages = (List<Map<String, Object>>) resultMap.get("messages");

assertEquals(3, messages.size());
assertEquals("system instruction", messages.get(0).get("content"));
assertEquals("system", messages.get(0).get("role"));
assertEquals("hello", messages.get(1).get("content"));
assertEquals("user", messages.get(1).get("role"));
assertEquals("post instruction", messages.get(2).get("content"));
assertEquals("assistant", messages.get(2).get("role"));
}

@Test
void testDecorateBodyWithOnlyPrepend() throws Exception {
AiPromptConfig config = new AiPromptConfig();
config.setPrepend("system instruction");
config.setPreRole("system");

String body = "{\"messages\":[{\"role\":\"user\",\"content\":\"hello\"}]}";
String result = invokeDecorateBody(body, config);

Map<String, Object> resultMap = GsonUtils.getInstance().convertToMap(result);
List<Map<String, Object>> messages = (List<Map<String, Object>>) resultMap.get("messages");

assertEquals(2, messages.size());
assertEquals("system instruction", messages.get(0).get("content"));
assertEquals("hello", messages.get(1).get("content"));
}

@Test
void testDecorateBodyPreservesAllOriginalMessages() throws Exception {
AiPromptConfig config = new AiPromptConfig();
config.setPrepend("system prompt");
config.setPreRole("system");
config.setAppend("footer");
config.setPostRole("assistant");

String body = "{\"messages\":["
+ "{\"role\":\"system\",\"content\":\"sys\"},"
+ "{\"role\":\"user\",\"content\":\"hi\"},"
+ "{\"role\":\"assistant\",\"content\":\"hello\"},"
+ "{\"role\":\"user\",\"content\":\"how are you\"}"
+ "]}";
String result = invokeDecorateBody(body, config);

Map<String, Object> resultMap = GsonUtils.getInstance().convertToMap(result);
List<Map<String, Object>> messages = (List<Map<String, Object>>) resultMap.get("messages");

assertEquals(6, messages.size());
assertEquals("system prompt", messages.get(0).get("content"));
assertEquals("sys", messages.get(1).get("content"));
assertEquals("hi", messages.get(2).get("content"));
assertEquals("hello", messages.get(3).get("content"));
assertEquals("how are you", messages.get(4).get("content"));
assertEquals("footer", messages.get(5).get("content"));
}

@Test
void testDecorateBodyNoPrependOrAppend() throws Exception {
AiPromptConfig config = new AiPromptConfig();

String body = "{\"messages\":[{\"role\":\"user\",\"content\":\"hello\"}]}";
String result = invokeDecorateBody(body, config);

Map<String, Object> resultMap = GsonUtils.getInstance().convertToMap(result);
List<Map<String, Object>> messages = (List<Map<String, Object>>) resultMap.get("messages");

assertEquals(1, messages.size());
assertEquals("hello", messages.get(0).get("content"));
}

@Test
void testDecorateBodyPrependWithoutRoleIgnored() throws Exception {
AiPromptConfig config = new AiPromptConfig();
config.setPrepend("system instruction");

String body = "{\"messages\":[{\"role\":\"user\",\"content\":\"hello\"}]}";
String result = invokeDecorateBody(body, config);

Map<String, Object> resultMap = GsonUtils.getInstance().convertToMap(result);
List<Map<String, Object>> messages = (List<Map<String, Object>>) resultMap.get("messages");

assertEquals(1, messages.size());
assertEquals("hello", messages.get(0).get("content"));
}

@Test
void testDecorateBodyPreservesOtherFields() throws Exception {
AiPromptConfig config = new AiPromptConfig();
config.setPrepend("prefix");
config.setPreRole("system");

String body = "{\"model\":\"gpt-4\",\"temperature\":0.7,\"messages\":[{\"role\":\"user\",\"content\":\"hi\"}]}";
String result = invokeDecorateBody(body, config);

Map<String, Object> resultMap = GsonUtils.getInstance().convertToMap(result);
assertEquals("gpt-4", resultMap.get("model"));
assertEquals(0.7, ((Number) resultMap.get("temperature")).doubleValue(), 0.001);

List<Map<String, Object>> messages = (List<Map<String, Object>>) resultMap.get("messages");
assertEquals(2, messages.size());
}

@SuppressWarnings("unchecked")
private String invokeDecorateBody(final String body, final AiPromptConfig config) throws Exception {
Method method = AiPromptPlugin.class.getDeclaredMethod("decorateBody", String.class, AiPromptConfig.class);
method.setAccessible(true);
return (String) method.invoke(plugin, body, config);
}
Comment thread
eye-gu marked this conversation as resolved.
Outdated
}
Loading