Remove dots from the prompt template placeholder names

The ST library doesn't permit dots in the placeholder names.
spring-projects · May 27, 2024 · 42095f0 · 42095f0
1 parent 9c1b1b8
commit 42095f0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/...ai-openai/src/test/java/org/springframework/ai/openai/chat/client/OpenAiChatClientIT.java b/...ai-openai/src/test/java/org/springframework/ai/openai/chat/client/OpenAiChatClientIT.java
@@ -62,7 +62,7 @@ record ActorsFilms(String actor, List<String> 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
@@ -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<String, Object> 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<Message>(advisedRequest.messages);

diff --git a/...e/src/main/java/org/springframework/ai/chat/client/advisor/AbstractChatMemoryAdvisor.java b/...e/src/main/java/org/springframework/ai/chat/client/advisor/AbstractChatMemoryAdvisor.java
@@ -29,9 +29,9 @@
  */
 public abstract class AbstractChatMemoryAdvisor<T> 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/...-core/src/main/java/org/springframework/ai/chat/client/advisor/QuestionAnswerAdvisor.java b/...-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<String, Object>
 
 		// 4. Advise the user parameters.
 		Map<String, Object> advisedUserParams = new HashMap<>(request.userParams());
-		advisedUserParams.put("context", documentContext);
+		advisedUserParams.put("question_answer_context", documentContext);
 
 		AdvisedRequest advisedRequest = AdvisedRequest.from(request)
 			.withUserText(advisedUserText)