admin/hermione
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged PR 4: updated step counter for user visualization while executing scenarios

Browse Source 
updated step counter for user visualization while executing scenarios
This commit is contained in:
Ferrelli, Emanuele
2024-11-21 15:40:48 +00:00
parent dbeb7e4a64 a8cd3e1478
commit 013922b495
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/olympus/hermione/services/ScenarioExecutionService.java
View File

@@ -3,6 +3,8 @@ package com.olympus.hermione.services;
import java.util.HashMap;
import java.util.List;
import java.util.Optional;
import java.util.OptionalInt;
import java.util.stream.IntStream;
import org.slf4j.LoggerFactory;
import org.springframework.ai.azure.openai.AzureOpenAiChatModel;
@@ -85,7 +87,7 @@ public class ScenarioExecutionService {
public ScenarioOutput getExecutionProgress(String scenarioExecutionId){
ScenarioOutput scenarioOutput = new ScenarioOutput();
Optional<ScenarioExecution> o_scenarioExecution = scenarioExecutionRepository.findById(scenarioExecutionId);
if(o_scenarioExecution.isPresent()){
ScenarioExecution scenarioExecution = o_scenarioExecution.get();
scenarioExecution.setCurrentStepId(scenarioExecution.getCurrentStepId());
@@ -98,10 +100,16 @@ public class ScenarioExecutionService {
}else{
scenarioOutput.setScenarioExecution_id(scenarioExecution.getId());
scenarioOutput.setStatus("IN_PROGRESS");
scenarioOutput.setCurrentStepId(scenarioExecution.getCurrentStepId());
scenarioOutput.setCurrentStepDescription(scenarioExecution.getCurrentStepDescription());
if (scenarioOutput.getCurrentStepId() != null){
scenarioOutput.setMessage("Executing "+scenarioOutput.getCurrentStepId()+"/"+scenarioExecution.getScenario().getSteps().size()+": "+scenarioOutput.getCurrentStepDescription()+".");
if (scenarioExecution.getCurrentStepId() != null){
OptionalInt indexOpt = IntStream.range(0, scenarioExecution.getScenario().getSteps().size())
.filter(i -> scenarioExecution.getScenario().getSteps().get(i).getStepId().equals(scenarioExecution.getCurrentStepId()))
.map(i -> i + 1)
.findFirst();
scenarioOutput.setCurrentStepId(scenarioExecution.getCurrentStepId());
scenarioOutput.setCurrentStepDescription(scenarioExecution.getCurrentStepDescription());
scenarioOutput.setMessage("Executing step "+indexOpt.getAsInt()+"/"+scenarioExecution.getScenario().getSteps().size()+": "+scenarioOutput.getCurrentStepDescription()+".");
}else {
scenarioOutput.setMessage("Starting execution...");
}