From b4fa5025cae0a3dfd41a826371ced99a6408bb4a Mon Sep 17 00:00:00 2001 From: "andrea.terzani" Date: Fri, 21 Feb 2025 14:39:46 +0100 Subject: [PATCH] Correggi il logger per AdvancedAIPromptSolver e modifica il metodo di invio dei messaggi --- .../hermione/stepSolvers/AdvancedAIPromptSolver.java | 10 ++++++---- .../hermione/stepSolvers/BasicAIPromptSolver.java | 5 +++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/olympus/hermione/stepSolvers/AdvancedAIPromptSolver.java b/src/main/java/com/olympus/hermione/stepSolvers/AdvancedAIPromptSolver.java index e6ca50d..fe4bfb6 100644 --- a/src/main/java/com/olympus/hermione/stepSolvers/AdvancedAIPromptSolver.java +++ b/src/main/java/com/olympus/hermione/stepSolvers/AdvancedAIPromptSolver.java @@ -23,7 +23,7 @@ public class AdvancedAIPromptSolver extends StepSolver { private String qai_custom_memory_id; - Logger logger = (Logger) LoggerFactory.getLogger(BasicQueryRagSolver.class); + Logger logger = (Logger) LoggerFactory.getLogger(AdvancedAIPromptSolver.class); private void loadParameters(){ logger.info("Loading parameters"); @@ -59,14 +59,16 @@ public class AdvancedAIPromptSolver extends StepSolver { this.scenarioExecution.setCurrentStepId(this.step.getStepId()); loadParameters(); - + /* String userText = this.qai_user_input; Message userMessage = new UserMessage(userText); Message systemMessage = new SystemMessage(this.qai_system_prompt_template); - + */ CallResponseSpec resp = chatClient.prompt() - .messages(userMessage,systemMessage) + .user(this.qai_user_input) + .system(this.qai_system_prompt_template) + //.messages(userMessage,systemMessage) .advisors(advisor -> advisor .param("chat_memory_conversation_id", this.scenarioExecution.getId()+this.qai_custom_memory_id) .param("chat_memory_response_size", 100)) diff --git a/src/main/java/com/olympus/hermione/stepSolvers/BasicAIPromptSolver.java b/src/main/java/com/olympus/hermione/stepSolvers/BasicAIPromptSolver.java index 2a665ac..89e3251 100644 --- a/src/main/java/com/olympus/hermione/stepSolvers/BasicAIPromptSolver.java +++ b/src/main/java/com/olympus/hermione/stepSolvers/BasicAIPromptSolver.java @@ -57,8 +57,9 @@ public class BasicAIPromptSolver extends StepSolver { Message userMessage = new UserMessage(this.qai_user_input); Message systemMessage = new SystemMessage(this.qai_system_prompt_template); - CallResponseSpec resp = chatClient.prompt() - .messages(userMessage,systemMessage) + CallResponseSpec resp = chatClient.prompt().user(this.qai_user_input) + .system(this.qai_system_prompt_template) + //.messages(userMessage,systemMessage) .call(); String output = resp.content();