From b1a56028821a04d3fc8cab6b5d28aa90d0f96e4c Mon Sep 17 00:00:00 2001 From: "andrea.terzani" Date: Mon, 29 Jul 2024 12:41:27 +0200 Subject: [PATCH] moved to mongo --- .../com/olympus/hermione/controllers/TestController.java | 2 +- .../olympus/hermione/stepSolvers/BasicQueryRagSolver.java | 5 +++-- src/main/resources/application.properties | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/olympus/hermione/controllers/TestController.java b/src/main/java/com/olympus/hermione/controllers/TestController.java index 0e3905d..c5dc160 100644 --- a/src/main/java/com/olympus/hermione/controllers/TestController.java +++ b/src/main/java/com/olympus/hermione/controllers/TestController.java @@ -15,7 +15,7 @@ public class TestController { @GetMapping("/test/scenario_execution") public String testScenarioExecution(){ - String result = scenarioExecutionService.executeScenario("66a5ff66fc2ae458a491f161","What's the purpose if an inputset in ATF? How it can be defined?"); + String result = scenarioExecutionService.executeScenario("66a5ff66fc2ae458a491f161","How i can modify a query on ATF ?"); return result; } } diff --git a/src/main/java/com/olympus/hermione/stepSolvers/BasicQueryRagSolver.java b/src/main/java/com/olympus/hermione/stepSolvers/BasicQueryRagSolver.java index 03fed70..1d84273 100644 --- a/src/main/java/com/olympus/hermione/stepSolvers/BasicQueryRagSolver.java +++ b/src/main/java/com/olympus/hermione/stepSolvers/BasicQueryRagSolver.java @@ -69,8 +69,7 @@ public class BasicQueryRagSolver extends StepSolver { @Override public ScenarioExecution solveStep(){ - System.out.println("Solving step: " + this.step.getName()); - + logger.info("Solving step: " + this.step.getName()); loadParameters(); logParameters(); @@ -81,9 +80,11 @@ public class BasicQueryRagSolver extends StepSolver { if(this.rag_filter != null && !this.rag_filter.isEmpty()){ request.withFilterExpression(this.rag_filter); + logger.info("Using Filter expression: " + this.rag_filter); } List docs = this.vectorStore.similaritySearch(request); + logger.info("Number of VDB retrieved documents: " + docs.size()); List result = new ArrayList(); for (Document doc : docs) { diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 3fc2fe8..fb32ef8 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,10 +4,10 @@ server.port=8081 spring.data.mongodb.uri=mongodb+srv://olympus_adm:26111979@olympus.l6qor4p.mongodb.net/?retryWrites=true&w=majority&appName=Olympus spring.data.mongodb.database=olympus spring.data.mongodb.username=olympus_adm -spring.data.mongodb.password=XXXXXX +spring.data.mongodb.password=26111979 spring.ai.vectorstore.mongodb.indexName=vector_index spring.ai.vectorstore.mongodb.collection-name=vector_store spring.ai.vectorstore.mongodb.initialize-schema=false -spring.ai.openai.api-key=sk-proj-k4jrXXXUYQN8yQG2vNmWT3BlbkFJ0Ge9EfKcrMxduVFQZlyO +spring.ai.openai.api-key=sk-proj-j3TFJ0h348DIzMrYYfyUT3BlbkFJjk4HMc8A2ux2Asg8Y7H1