Skip to content

WIP as progress #968

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

Draft
jonenst wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

WIP as progress #968

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions src/main/java/org/gridsuite/study/server/notification/NotificationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,9 @@ public class NotificationService {
public static final String UPDATE_TYPE_SECURITY_ANALYSIS_FAILED = "securityAnalysis_failed";
public static final String UPDATE_TYPE_SECURITY_ANALYSIS_RESULT = "securityAnalysisResult";
public static final String UPDATE_TYPE_SECURITY_ANALYSIS_STATUS = "securityAnalysis_status";
public static final String UPDATE_TYPE_SECURITY_ANALYSIS_PROGRESS = "securityAnalysis_progress";
public static final String HEADER_SA_PROGRESS_CURRENT = "progressCurrent";
public static final String HEADER_SA_PROGRESS_TOTAL = "progressTotal";
public static final String UPDATE_TYPE_SENSITIVITY_ANALYSIS_RESULT = "sensitivityAnalysisResult";
public static final String UPDATE_TYPE_SENSITIVITY_ANALYSIS_STATUS = "sensitivityAnalysis_status";
public static final String UPDATE_TYPE_SENSITIVITY_ANALYSIS_FAILED = "sensitivityAnalysis_failed";
Expand Down Expand Up @@ -494,6 +497,15 @@ public void emitStudyAlert(UUID studyUuid, UUID nodeUuid, UUID rootNetworkUuid,
}
}

public void emitSecurityAnalysisProgress(UUID studyUuid, UUID nodeUuid, UUID rootNetworkUuid, int current, int total) {
sendStudyUpdateMessage(studyUuid, UPDATE_TYPE_SECURITY_ANALYSIS_PROGRESS, MessageBuilder.withPayload("")
.setHeader(HEADER_NODE, nodeUuid)
.setHeader(HEADER_ROOT_NETWORK_UUID, rootNetworkUuid)
.setHeader(HEADER_SA_PROGRESS_CURRENT, current)
.setHeader(HEADER_SA_PROGRESS_TOTAL, total)
);
}

@PostCompletion
public void emitComputationDebugFileStatus(UUID studyUuid, UUID nodeUuid, UUID rootNetworkUuid, ComputationType computationType, String userId, UUID resultUuid, @Nullable String error) {
sendStudyUpdateMessage(studyUuid, COMPUTATION_DEBUG_FILE_STATUS, MessageBuilder.withPayload("")
Expand Down
12 changes: 12 additions & 0 deletions src/main/java/org/gridsuite/study/server/service/ConsumerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -813,6 +813,18 @@ public Consumer<Message<String>> consumeSaFailed() {
return message -> consumeCalculationFailed(message, SECURITY_ANALYSIS);
}

@Bean
public Consumer<Message<String>> consumeSaProgress() {
return message -> getNodeReceiver(message).ifPresent(receiverObj -> {
Integer current = message.getHeaders().get(NotificationService.HEADER_SA_PROGRESS_CURRENT, Integer.class);
Integer total = message.getHeaders().get(NotificationService.HEADER_SA_PROGRESS_TOTAL, Integer.class);
if (current != null && total != null) {
UUID studyUuid = networkModificationTreeService.getStudyUuidForNodeId(receiverObj.getNodeUuid());
notificationService.emitSecurityAnalysisProgress(studyUuid, receiverObj.getNodeUuid(), receiverObj.getRootNetworkUuid(), current, total);
}
});
}

@Bean
public Consumer<Message<String>> consumeSensitivityAnalysisResult() {
return message -> consumeCalculationResult(message, SENSITIVITY_ANALYSIS);
Expand Down
5 changes: 4 additions & 1 deletion src/main/resources/config/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ spring:
allow-circular-references: true
cloud:
function:
definition: "consumeSaResult;consumeSaStopped;consumeSaFailed;consumeSaCancelFailed;\
definition: "consumeSaResult;consumeSaStopped;consumeSaFailed;consumeSaCancelFailed;consumeSaProgress;\
consumeDsDebug;consumeDsResult;consumeDsStopped;consumeDsFailed;consumeDsCancelFailed;\
consumeDsaDebug;consumeDsaResult;consumeDsaStopped;consumeDsaFailed;consumeDsaCancelFailed;\
consumeDmcDebug;consumeDmcResult;consumeDmcStopped;consumeDmcFailed;consumeDmcCancelFailed;\
Expand Down Expand Up @@ -36,6 +36,9 @@ spring:
consumeSaFailed-in-0:
destination: ${powsybl-ws.rabbitmq.destination.prefix:}sa.run.dlx
group: dlq
consumeSaProgress-in-0:
destination: ${powsybl-ws.rabbitmq.destination.prefix:}sa.progress
group: studySaProgressGroup
consumeDsDebug-in-0:
destination: ${powsybl-ws.rabbitmq.destination.prefix:}ds.debug
group: studyDsDebugGroup
Expand Down
Loading