From 42095f011a7767fe45541c168f4e05a9298ec30c Mon Sep 17 00:00:00 2001 From: Christian Tzolov Date: Mon, 27 May 2024 07:44:56 +0200 Subject: [PATCH] Remove dots from the prompt template placeholder names The ST library doesn't permit dots in the placeholder names. --- .../ai/openai/chat/client/OpenAiChatClientIT.java | 2 +- .../java/org/springframework/ai/chat/client/ChatClient.java | 4 ++-- .../ai/chat/client/advisor/AbstractChatMemoryAdvisor.java | 4 ++-- .../ai/chat/client/advisor/QuestionAnswerAdvisor.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/client/OpenAiChatClientIT.java b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/client/OpenAiChatClientIT.java index 839f8784bc..830cd0f7d8 100644 --- a/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/client/OpenAiChatClientIT.java +++ b/models/spring-ai-openai/src/test/java/org/springframework/ai/openai/chat/client/OpenAiChatClientIT.java @@ -62,7 +62,7 @@ record ActorsFilms(String actor, List movies) { } @Test - void roleTest() { + void call() { // @formatter:off ChatResponse response = ChatClient.builder(chatModel).build().prompt() diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/ChatClient.java b/spring-ai-core/src/main/java/org/springframework/ai/chat/client/ChatClient.java index 17709827e6..5c6d2bf0f1 100644 --- a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/ChatClient.java +++ b/spring-ai-core/src/main/java/org/springframework/ai/chat/client/ChatClient.java @@ -576,12 +576,12 @@ private ChatResponse doGetChatResponse(ChatClientRequest inputRequest, String fo ChatClientRequest advisedRequest = adviseOnRequest(inputRequest, context); var processedUserText = StringUtils.hasText(formatParam) - ? advisedRequest.userText + System.lineSeparator() + "{spring.ai.soc.format}" + ? advisedRequest.userText + System.lineSeparator() + "{spring_ai_soc_format}" : advisedRequest.userText; Map userParams = new HashMap<>(advisedRequest.userParams); if (StringUtils.hasText(formatParam)) { - userParams.put("spring.ai.soc.format", formatParam); + userParams.put("spring_ai_soc_format", formatParam); } var messages = new ArrayList(advisedRequest.messages); diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/AbstractChatMemoryAdvisor.java b/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/AbstractChatMemoryAdvisor.java index edef56e7da..6399c47b77 100644 --- a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/AbstractChatMemoryAdvisor.java +++ b/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/AbstractChatMemoryAdvisor.java @@ -29,9 +29,9 @@ */ public abstract class AbstractChatMemoryAdvisor implements RequestResponseAdvisor { - public static final String CHAT_MEMORY_CONVERSATION_ID_KEY = "chat.memory.conversation.id"; + public static final String CHAT_MEMORY_CONVERSATION_ID_KEY = "chat_memory_conversation_id"; - public static final String CHAT_MEMORY_RETRIEVE_SIZE_KEY = "chat.memory.response.size"; + public static final String CHAT_MEMORY_RETRIEVE_SIZE_KEY = "chat_memory_response_size"; public static final String DEFAULT_CHAT_MEMORY_CONVERSATION_ID = "default"; diff --git a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/QuestionAnswerAdvisor.java b/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/QuestionAnswerAdvisor.java index 9db7d9461a..5c5f8d73fb 100644 --- a/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/QuestionAnswerAdvisor.java +++ b/spring-ai-core/src/main/java/org/springframework/ai/chat/client/advisor/QuestionAnswerAdvisor.java @@ -41,7 +41,7 @@ public class QuestionAnswerAdvisor implements RequestResponseAdvisor { private static final String DEFAULT_USER_TEXT_ADVISE = """ Context information is below. --------------------- - {context} + {question_answer_context} --------------------- Given the context and provided history information and not prior knowledge, reply to the user comment. If the answer is not in the context, inform @@ -85,7 +85,7 @@ public AdvisedRequest adviseRequest(AdvisedRequest request, Map // 4. Advise the user parameters. Map advisedUserParams = new HashMap<>(request.userParams()); - advisedUserParams.put("context", documentContext); + advisedUserParams.put("question_answer_context", documentContext); AdvisedRequest advisedRequest = AdvisedRequest.from(request) .withUserText(advisedUserText)