Skip to content

Use sensitivity parameters to compute analysis factor count #898

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

Merged
antoinebhs merged 4 commits into from
Dec 30, 2025
Merged

Use sensitivity parameters to compute analysis factor count #898

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
632d923
Use sensitivity parameters to compute analysis factor count
antoinebhs Dec 12, 2025
d595755
Merge remote-tracking branch 'origin' into factor-count
antoinebhs Dec 15, 2025
b541643
Merge remote-tracking branch 'origin' into factor-count
antoinebhs Dec 16, 2025
4f43e23
Merge branch 'main' into factor-count
antoinebhs Dec 29, 2025
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
14 changes: 6 additions & 8 deletions src/main/java/org/gridsuite/study/server/controller/StudyController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@
import org.gridsuite.study.server.dto.modification.ModificationType;
import org.gridsuite.study.server.dto.modification.ModificationsSearchResultByNode;
import org.gridsuite.study.server.dto.sensianalysis.SensitivityAnalysisCsvFileInfos;
import org.gridsuite.study.server.dto.sensianalysis.SensitivityFactorsIdsByGroup;
import org.gridsuite.study.server.dto.sequence.NodeSequenceType;
import org.gridsuite.study.server.dto.timeseries.TimeSeriesMetadataInfos;
import org.gridsuite.study.server.dto.timeseries.TimelineEventInfos;
Expand Down Expand Up @@ -2196,17 +2195,16 @@ public ResponseEntity<Void> setSensitivityAnalysisParameters(
return studyService.setSensitivityAnalysisParameters(studyUuid, sensitivityAnalysisParameters, userId) ? ResponseEntity.noContent().build() : ResponseEntity.ok().build();
}

@GetMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/sensitivity-analysis/factors-count")
@Operation(summary = "Get the factors count of sensitivity parameters")
@PostMapping(value = "/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/sensitivity-analysis/factor-count")
@Operation(summary = "Get the factor count of sensitivity parameters")
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The factors count of sensitivity parameters")})
public ResponseEntity<Long> getSensitivityAnalysisFactorsCount(
public ResponseEntity<String> getSensitivityAnalysisFactorCount(
@PathVariable("studyUuid") UUID studyUuid,
@Parameter(description = "rootNetworkUuid") @PathVariable("rootNetworkUuid") UUID rootNetworkUuid,
@PathVariable("nodeUuid") UUID nodeUuid,
@Parameter(description = "Is Injections Set") @RequestParam(name = "isInjectionsSet", required = false) Boolean isInjectionsSet,
SensitivityFactorsIdsByGroup factorsIds) {
return ResponseEntity.ok().body(sensitivityAnalysisService.getSensitivityAnalysisFactorsCount(rootNetworkService.getNetworkUuid(rootNetworkUuid),
networkModificationTreeService.getVariantId(nodeUuid, rootNetworkUuid), factorsIds, isInjectionsSet));
@RequestBody String sensitivityAnalysisParameters) {
return ResponseEntity.ok().body(sensitivityAnalysisService.getSensitivityAnalysisFactorCount(rootNetworkService.getNetworkUuid(rootNetworkUuid),
networkModificationTreeService.getVariantId(nodeUuid, rootNetworkUuid), sensitivityAnalysisParameters));
}

@GetMapping(value = "/servers/infos")
Expand Down
23 changes: 0 additions & 23 deletions src/main/java/org/gridsuite/study/server/dto/sensianalysis/SensitivityFactorsIdsByGroup.java
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions src/main/java/org/gridsuite/study/server/service/SensitivityAnalysisService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
import org.gridsuite.study.server.dto.NodeReceiver;
import org.gridsuite.study.server.dto.SensitivityAnalysisStatus;
import org.gridsuite.study.server.dto.sensianalysis.SensitivityAnalysisCsvFileInfos;
import org.gridsuite.study.server.dto.sensianalysis.SensitivityFactorsIdsByGroup;
import org.gridsuite.study.server.repository.StudyEntity;
import org.gridsuite.study.server.service.common.AbstractComputationService;
import org.springframework.http.*;
Expand Down Expand Up @@ -329,19 +328,20 @@ public String getSensitivityAnalysisDefaultProvider() {
return restTemplate.getForObject(sensitivityAnalysisServerBaseUri + path, String.class);
}

public Long getSensitivityAnalysisFactorsCount(UUID networkUuid, String variantId, SensitivityFactorsIdsByGroup factorsIds, Boolean isInjectionsSet) {
public String getSensitivityAnalysisFactorCount(UUID networkUuid, String variantId, String sensitivityAnalysisParameters) {
var uriComponentsBuilder = UriComponentsBuilder
.fromPath(DELIMITER + SENSITIVITY_ANALYSIS_API_VERSION + "/networks/{networkUuid}/factors-count")
.queryParam("isInjectionsSet", isInjectionsSet);
.fromPath(DELIMITER + SENSITIVITY_ANALYSIS_API_VERSION + "/networks/{networkUuid}/factor-count");
if (!StringUtils.isBlank(variantId)) {
uriComponentsBuilder.queryParam(QUERY_PARAM_VARIANT_ID, variantId);
}

factorsIds.getIds().forEach((key, value) -> uriComponentsBuilder.queryParam(String.format("ids[%s]", key), value));

var path = uriComponentsBuilder.buildAndExpand(networkUuid).toUriString();

return restTemplate.exchange(sensitivityAnalysisServerBaseUri + path, HttpMethod.GET, null, Long.class).getBody();
HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.APPLICATION_JSON);
HttpEntity<String> httpEntity = new HttpEntity<>(sensitivityAnalysisParameters, headers);

return restTemplate.exchange(sensitivityAnalysisServerBaseUri + path, HttpMethod.POST, httpEntity, String.class).getBody();
}

@Override
Expand Down
20 changes: 7 additions & 13 deletions src/test/java/org/gridsuite/study/server/SensitivityAnalysisTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.gridsuite.study.server.dto.NodeReceiver;
import org.gridsuite.study.server.dto.RootNetworkNodeInfo;
import org.gridsuite.study.server.dto.sensianalysis.SensitivityAnalysisCsvFileInfos;
import org.gridsuite.study.server.dto.sensianalysis.SensitivityFactorsIdsByGroup;
import org.gridsuite.study.server.error.StudyException;
import org.gridsuite.study.server.networkmodificationtree.dto.InsertMode;
import org.gridsuite.study.server.networkmodificationtree.dto.NetworkModificationNode;
Expand Down Expand Up @@ -109,10 +108,6 @@ class SensitivityAnalysisTest {
private static final UUID CASE_2_UUID = UUID.fromString(CASE_2_UUID_STRING);
private static final String CASE_3_UUID_STRING = "790769f9-bd31-43be-be46-e50296951e32";
private static final UUID CASE_3_UUID = UUID.fromString(CASE_3_UUID_STRING);
private static final List<UUID> MONITORED_BRANCHES_FILTERS_UUID = List.of(UUID.randomUUID());
private static final List<UUID> INJECTIONS_FILTERS_UUID = List.of(UUID.randomUUID());
private static final List<UUID> CONTINGENCIES_FILTERS_UUID = List.of(UUID.randomUUID());
private static final SensitivityFactorsIdsByGroup IDS = SensitivityFactorsIdsByGroup.builder().ids(Map.of("0", MONITORED_BRANCHES_FILTERS_UUID, "1", INJECTIONS_FILTERS_UUID, "2", CONTINGENCIES_FILTERS_UUID)).build();

private static final String SENSITIVITY_ANALYSIS_PROFILE_PARAMETERS_JSON = "{\"flowFlowSensitivityValueThreshold\":30.0,\"voltageVoltageSensitivityValueThreshold\":0.4,\"flowVoltageSensitivityValueThreshold\":0.0,\"angleFlowSensitivityValueThreshold\":0.0}";

Expand Down Expand Up @@ -274,8 +269,8 @@ public MockResponse dispatch(RecordedRequest request) {
return new MockResponse(200, Headers.of(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE), "1");
} else if (path.matches("/v1/results/invalidate-status\\?resultUuid=.*")) {
return new MockResponse(200);
} else if (path.matches("/v1/networks/" + ".*" + "/factors-count\\?isInjectionsSet" + "&ids.*")) {
return new MockResponse(200, Headers.of(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE), "4");
} else if (path.matches("/v1/networks/" + ".*" + "/factor-count")) {
return new MockResponse(200, Headers.of(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE), FAKE_RESULT_JSON);
} else if (path.matches("/v1/parameters")) {
return new MockResponse(200, Headers.of(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE), objectMapper.writeValueAsString(SENSITIVITY_ANALYSIS_PARAMETERS_UUID_STRING));
} else if (path.matches("/v1/users/" + NO_PROFILE_USER_ID + "/profile")) {
Expand Down Expand Up @@ -741,22 +736,21 @@ void testSensitivityAnalysisParameters() throws Exception {
}

@Test
void testGetSensitivityAnalysisFactorsCount(final MockWebServer server) throws Exception {
void testGetSensitivityAnalysisFactorCount(final MockWebServer server) throws Exception {
StudyEntity studyEntity = insertDummyStudy(UUID.randomUUID(), UUID.randomUUID(), SENSITIVITY_ANALYSIS_PARAMETERS_UUID);
UUID studyNameUserIdUuid = studyEntity.getId();
UUID firstRootNetworkUuid = studyTestUtils.getOneRootNetworkUuid(studyNameUserIdUuid);
UUID rootNodeUuid = getRootNodeUuid(studyNameUserIdUuid);
MockHttpServletRequestBuilder requestBuilder = get("/v1/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/sensitivity-analysis/factors-count", studyNameUserIdUuid, firstRootNetworkUuid, rootNodeUuid);
IDS.getIds().forEach((key, list) -> requestBuilder.queryParam(String.format("ids[%s]", key), list.stream().map(UUID::toString).toArray(String[]::new)));

MockHttpServletRequestBuilder requestBuilder = post("/v1/studies/{studyUuid}/root-networks/{rootNetworkUuid}/nodes/{nodeUuid}/sensitivity-analysis/factor-count", studyNameUserIdUuid, firstRootNetworkUuid, rootNodeUuid);
requestBuilder.content(SENSITIVITY_ANALYSIS_UPDATED_PARAMETERS_JSON);
String resultAsString = mockMvc.perform(requestBuilder.header("userId", "userId"))
.andExpect(status().isOk())
.andReturn()
.getResponse()
.getContentAsString();
assertEquals("4", resultAsString);
assertEquals(FAKE_RESULT_JSON, resultAsString);

assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches("/v1/networks/" + ".*" + "/factors-count.*")));
assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches("/v1/networks/" + ".*" + "/factor-count.*")));
}

private void createOrUpdateParametersAndDoChecks(UUID studyNameUserIdUuid, String parameters, String userId, HttpStatusCode status) throws Exception {
Expand Down