From a937440832d31adb7d782b97864878516e78ca47 Mon Sep 17 00:00:00 2001
From: Emanuele Ferrelli <emanuele.ferrelli@accenture.com>
Date: Mon, 4 Nov 2024 17:20:48 +0100
Subject: [PATCH] added logic for retrieving aiModel

---
 .../hermione/services/ScenarioExecutionService.java      | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java b/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
index 4ecd6bf..4514bd0 100644
--- a/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
+++ b/src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
@@ -132,18 +132,19 @@ public class ScenarioExecutionService {
             HashMap<String, Object> execSharedMap = new HashMap<String, Object>();
             execSharedMap.put("user_input", inputs);
             scenarioExecution.setExecSharedMap(execSharedMap);
-            scenarioExecutionRepository.save(scenarioExecution);
             
             AiModel aiModel;
             if(scenario.getAiModel() != null){
                 aiModel  = scenario.getAiModel();
             }else {
                 aiModel = aiModelRepository.findByIsDefault(true);
-                //scenario.setAiModel(aiModel);
-                //scenarioRepository.save(scenario);
+                scenario.setAiModel(aiModel);
+                scenarioExecution.setScenario(scenario);
             }
+            ChatModel chatModel = createChatModel(aiModel);   
+        
+            scenarioExecutionRepository.save(scenarioExecution);
 
-            ChatModel chatModel = createChatModel(aiModel);
 
             if(scenario.isUseChatMemory()){
                 logger.info("Initializing chatClient with chat-memory advisor");