Skip to content

[WIP] Get computation statuses for branch #986

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sBouzols wants to merge 2 commits into
base: main
Choose a base branch
from
Open

[WIP] Get computation statuses for branch #986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d470ec5
feat(): add `getLoadFlowStatuses`
sBouzols Apr 30, 2026
ff495a4
Merge remote-tracking branch 'origin/main' into get_computation_statu…
sBouzols Apr 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ...java/org/gridsuite/study/server/repository/rootnetwork/RootNetworkNodeInfoRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@ public interface RootNetworkNodeInfoRepository extends JpaRepository<RootNetwork
@EntityGraph(attributePaths = {"rootNetwork"}, type = EntityGraph.EntityGraphType.LOAD)
List<RootNetworkNodeInfoEntity> findAllWithRootNetworkByNodeInfoId(UUID nodeInfoId);

List<RootNetworkNodeInfoEntity> findAllByNodeInfoIdInAndRootNetworkId(List<UUID> nodeInfoIds, UUID rootNetworkUuid);

Optional<RootNetworkNodeInfoEntity> findByNodeInfoIdAndRootNetworkId(UUID nodeInfoId, UUID rootNetworkUuid);

@EntityGraph(attributePaths = {"modificationsUuidsToExclude"}, type = EntityGraph.EntityGraphType.LOAD)
Expand Down
26 changes: 26 additions & 0 deletions src/main/java/org/gridsuite/study/server/service/LoadFlowService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.UUID;

Expand Down Expand Up @@ -143,6 +144,22 @@ public LoadFlowStatus getLoadFlowStatus(UUID resultUuid) {
return restTemplate.getForObject(loadFlowServerBaseUri + path, LoadFlowStatus.class);
}

public Map<UUID, LoadFlowStatus> getLoadFlowStatuses(List<UUID> resultUuids) {
if (resultUuids == null || resultUuids.isEmpty()) {
return null;
Copy link
Copy Markdown
Contributor

@SlimaneAmar SlimaneAmar May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Map.of() ?

}

UriComponentsBuilder uriComponentsBuilder = UriComponentsBuilder.fromPath(DELIMITER + LOADFLOW_API_VERSION + "/results/statuses");
String path = uriComponentsBuilder.toUriString();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);

HttpEntity<List<UUID>> httpEntity = new HttpEntity<>(resultUuids, headers);

return restTemplate.exchange(loadFlowServerBaseUri + path, HttpMethod.POST, httpEntity, new ParameterizedTypeReference<Map<UUID, LoadFlowStatus>>() {
}).getBody();
}

public void stopLoadFlow(UUID studyUuid, UUID nodeUuid, UUID rootNetworkUuid, UUID resultUuid, String userId) {
Objects.requireNonNull(studyUuid);
Objects.requireNonNull(nodeUuid);
Expand Down Expand Up @@ -198,6 +215,15 @@ public void assertLoadFlowNotRunning(UUID resultUuid) {
}
}

public void assertLoadFlowsNotRunning(List<UUID> resultUuids) {
Copy link
Copy Markdown
Contributor

@SlimaneAmar SlimaneAmar May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove assertLoadFlowNotRunning

Copy link
Copy Markdown
Contributor

@SlimaneAmar SlimaneAmar May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Rename by assertNoLoadFlowRunning ?

Map<UUID, LoadFlowStatus> loadFlowStatuses = getLoadFlowStatuses(resultUuids);
// this is O(n) complexity, maybe we should adapt endoint to simply check LoadFlowsNotRunning
// for a list of resultUuids returning boolean if encounter one RUNNING computation ?
if (loadFlowStatuses != null && loadFlowStatuses.containsValue(LoadFlowStatus.RUNNING)) {
throw new StudyException(COMPUTATION_RUNNING);
}
Comment on lines +222 to +224
Copy link
Copy Markdown
Contributor

@SlimaneAmar SlimaneAmar May 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Set<LoadFlowStatus> values = new HashSet<>(loadFlowStatuses.values()); if (loadFlowStatuses != null && values.contains(LoadFlowStatus.RUNNING)) { throw new StudyException(COMPUTATION_RUNNING); }

}

public List<LimitViolationInfos> getLimitViolations(UUID resultUuid, String filters, String globalFilters, Sort sort, UUID networkUuid, String variantId) {
List<LimitViolationInfos> result = new ArrayList<>();

Expand Down
38 changes: 27 additions & 11 deletions src/main/java/org/gridsuite/study/server/service/RootNetworkNodeInfoService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,10 @@ public Optional<RootNetworkNodeInfoEntity> getRootNetworkNodeInfo(UUID nodeUuid,
return rootNetworkNodeInfoRepository.findByNodeInfoIdAndRootNetworkId(nodeUuid, rootNetworkUuid);
}

public List<RootNetworkNodeInfoEntity> getRootNetworkNodeInfos(List<UUID> nodeUuids, UUID rootNetworkUuid) {
return rootNetworkNodeInfoRepository.findAllByNodeInfoIdInAndRootNetworkId(nodeUuids, rootNetworkUuid);
}

private static UUID getComputationResultUuid(RootNetworkNodeInfoEntity rootNetworkNodeInfoEntity, ComputationType computationType) {
return switch (computationType) {
case LOAD_FLOW -> rootNetworkNodeInfoEntity.getLoadFlowResultUuid();
Expand All @@ -470,6 +474,14 @@ public UUID getComputationResultUuid(UUID nodeUuid, UUID rootNetworkUuid, Comput
return rootNetworkNodeInfoEntityOpt.map(rootNetworkNodeInfoEntity -> getComputationResultUuid(rootNetworkNodeInfoEntity, computationType)).orElse(null);
}

public List<UUID> getComputationResultUuids(List<UUID> nodeUuids, UUID rootNetworkUuid, ComputationType computationType) {
List<RootNetworkNodeInfoEntity> rootNetworkNodeInfoEntities = getRootNetworkNodeInfos(nodeUuids, rootNetworkUuid);
return rootNetworkNodeInfoEntities.stream()
.map(rootNetworkNodeInfoEntity -> getComputationResultUuid(rootNetworkNodeInfoEntity, computationType))
.filter(Objects::nonNull)
.toList();
}

public List<UUID> getComputationResultUuids(UUID studyUuid, ComputationType computationType) {
return rootNetworkNodeInfoRepository.findAllByRootNetworkStudyId(studyUuid).stream()
.map(rootNetworkNodeInfoEntity -> getComputationResultUuid(rootNetworkNodeInfoEntity, computationType))
Expand Down Expand Up @@ -656,19 +668,23 @@ private List<UUID> getReportUuids(RootNetworkNodeInfo rootNetworkNodeInfo) {
.toList();
}

public void assertComputationNotRunning(UUID nodeUuid, UUID rootNetworkUuid) {
loadFlowService.assertLoadFlowNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, LOAD_FLOW));
securityAnalysisService.assertSecurityAnalysisNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, SECURITY_ANALYSIS));
dynamicSimulationService.assertDynamicSimulationNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, DYNAMIC_SIMULATION));
dynamicSecurityAnalysisService.assertDynamicSecurityAnalysisNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, DYNAMIC_SECURITY_ANALYSIS));
dynamicMarginCalculationService.assertDynamicMarginCalculationNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, DYNAMIC_MARGIN_CALCULATION));
sensitivityAnalysisService.assertSensitivityAnalysisNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, SENSITIVITY_ANALYSIS));
shortCircuitService.assertShortCircuitAnalysisNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, SHORT_CIRCUIT), getComputationResultUuid(nodeUuid, rootNetworkUuid, SHORT_CIRCUIT_ONE_BUS));
voltageInitService.assertVoltageInitNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, VOLTAGE_INITIALIZATION));
stateEstimationService.assertStateEstimationNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, STATE_ESTIMATION));
pccMinService.assertPccMinNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, PCC_MIN));
public void assertComputationsNotRunning(List<UUID> nodeUuids, UUID rootNetworkUuid) {
nodeUuids.forEach(nodeUuid -> {
securityAnalysisService.assertSecurityAnalysisNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, SECURITY_ANALYSIS));
dynamicSimulationService.assertDynamicSimulationNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, DYNAMIC_SIMULATION));
dynamicSecurityAnalysisService.assertDynamicSecurityAnalysisNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, DYNAMIC_SECURITY_ANALYSIS));
dynamicMarginCalculationService.assertDynamicMarginCalculationNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, DYNAMIC_MARGIN_CALCULATION));
sensitivityAnalysisService.assertSensitivityAnalysisNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, SENSITIVITY_ANALYSIS));
shortCircuitService.assertShortCircuitAnalysisNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, SHORT_CIRCUIT), getComputationResultUuid(nodeUuid, rootNetworkUuid, SHORT_CIRCUIT_ONE_BUS));
voltageInitService.assertVoltageInitNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, VOLTAGE_INITIALIZATION));
stateEstimationService.assertStateEstimationNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, STATE_ESTIMATION));
pccMinService.assertPccMinNotRunning(getComputationResultUuid(nodeUuid, rootNetworkUuid, PCC_MIN));
});
loadFlowService.assertLoadFlowsNotRunning(getComputationResultUuids(nodeUuids, rootNetworkUuid, LOAD_FLOW));
}



/***************************
* GET COMPUTATION RESULTS *
***************************/
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/org/gridsuite/study/server/service/StudyService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1152,8 +1152,7 @@ public void assertCanBuildNode(UUID rootNetworkUuid, UUID nodeUuid) {
}

private void assertNoBuildNoComputationInTree(UUID rootNetworkUuid, List<UUID> nodesUuids) {
// TODO modify computations endpoints to test multiple uuids
nodesUuids.forEach(uuid -> rootNetworkNodeInfoService.assertComputationNotRunning(uuid, rootNetworkUuid));
rootNetworkNodeInfoService.assertComputationsNotRunning(nodesUuids, rootNetworkUuid);
rootNetworkNodeInfoService.assertNoBuildingNode(rootNetworkUuid, nodesUuids);
}

Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/gridsuite/study/server/NetworkModificationTreeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ private void assertForbiddenNodeInsertions(UUID studyId, String userId,
NetworkModificationNode security1,
NetworkModificationNode security2) throws Exception {
// Construction node cannot be inserted before a security node
doNothing().when(rootNetworkNodeInfoService).assertComputationNotRunning(any(), any());
doNothing().when(rootNetworkNodeInfoService).assertComputationsNotRunning(any(), any());
mockMvc.perform(post("/v1/studies/{studyUuid}/tree/nodes?nodeToCutUuid={nodeUuid}&referenceNodeUuid={referenceNodeUuid}&insertMode={insertMode}",
studyId, construction2.getId(), security1.getId(), InsertMode.BEFORE)
.header(USER_ID_HEADER, userId))
Expand Down Expand Up @@ -637,7 +637,7 @@ void testNodeStashAndRestore() throws Exception {
assertEquals("not built node", networkModificationNode.getDescription());

//stash 1 node and do the checks
doNothing().when(rootNetworkNodeInfoService).assertComputationNotRunning(any(), any());
doNothing().when(rootNetworkNodeInfoService).assertComputationsNotRunning(any(), any());
stashNode(root.getStudyId(), children.get(0), false, Set.of(children.get(0)), userId);
var stashedNode = nodeRepository.findById(children.get(0).getId()).orElseThrow();
assertTrue(stashedNode.isStashed());
Expand Down Expand Up @@ -1746,7 +1746,7 @@ void testNodeAliases() throws Exception {
checkNodeAliasUpdateMessageReceived(root.getStudyId());

// Stashing node3 (with stashChildren=true) should result in aliases no more associated to nodes node3, node4 and node5
doNothing().when(rootNetworkNodeInfoService).assertComputationNotRunning(any(), any());
doNothing().when(rootNetworkNodeInfoService).assertComputationsNotRunning(any(), any());
stashNode(root.getStudyId(), node3, true, Set.of(node3, node4, node5), userId);
nodeAliases = objectMapper.readValue(mockMvc.perform(get("/v1/studies/{studyUuid}/node-aliases", root.getStudyId())).andExpect(status().isOk()).andReturn()
.getResponse()
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/gridsuite/study/server/studycontroller/NodeControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ private void cutAndPasteNode(UUID studyUuid, NetworkModificationNode nodeToCopy,
boolean wasBuilt = rootNetworkNodeInfoService.getRootNetworkNodeInfo(nodeToCopy.getId(), studyTestUtils.getOneRootNetworkUuid(studyUuid)).get().getNodeBuildStatus().toDto().isBuilt();
UUID deleteModificationIndexStub = wireMockStubs.stubNetworkModificationDeleteIndex();
output.receive(TIMEOUT, studyUpdateDestination);
doNothing().when(rootNetworkNodeInfoService).assertComputationNotRunning(any(), any());
doNothing().when(rootNetworkNodeInfoService).assertComputationsNotRunning(any(), any());
mockMvc.perform(post(STUDIES_URL +
"/{studyUuid}/tree/nodes?nodeToCutUuid={nodeUuid}&referenceNodeUuid={referenceNodeUuid}&insertMode={insertMode}",
studyUuid, nodeToCopy.getId(), referenceNodeUuid, insertMode)
Expand Down
Loading