improve interactions when Funman times out (#5509)

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
DARPA-ASKEM · Nov 15, 2024 · da98267 · da98267
1 parent ef456d7
commit da98267
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-node.vue b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman-node.vue
@@ -25,6 +25,7 @@ import Button from 'primevue/button';
 import { Poller, PollerState } from '@/api/api';
 import { pollAction, getRunResult } from '@/services/models/simulation-service';
 import { logger } from '@/utils/logger';
+import { useToastService } from '@/services/toast';
 import { Simulation } from '@/types/Types';
 import { getModelConfigurationById } from '@/services/model-configurations';
 
@@ -60,8 +61,8 @@ const addOutputPorts = async (runId: string) => {
 
 const getStatus = async (runId: string) => {
 	poller
-		.setInterval(5000)
-		.setThreshold(100)
+		.setInterval(6000)
+		.setThreshold(200)
 		.setPollAction(async () => pollAction(runId))
 		.setProgressAction((data: Simulation) => {
 			if (data.progress) {
@@ -77,7 +78,11 @@ const getStatus = async (runId: string) => {
 		return pollerResults;
 	}
 	if (pollerResults.state !== PollerState.Done || !pollerResults.data) {
-		console.error(`Funman: ${runId} has failed`, pollerResults);
+		console.error(`Funman: ${runId} has failed with state=${pollerResults.state}`, pollerResults);
+
+		if (pollerResults.state === PollerState.ExceedThreshold) {
+			useToastService().error('Funman polling exceeded', 'Refresh page if you want to resume polling', 8000);
+		}
 	}
 	return pollerResults;
 };
@@ -94,12 +99,11 @@ watch(
 		const response = await getStatus(id);
 		if (response.state === PollerState.Done) {
 			addOutputPorts(id);
+			const state = _.cloneDeep(props.node.state);
+			state.inProgressId = '';
+			state.currentProgress = 0;
+			emit('update-state', state);
 		}
-
-		const state = _.cloneDeep(props.node.state);
-		state.inProgressId = '';
-		state.currentProgress = 0;
-		emit('update-state', state);
 	},
 	{ immediate: true }
 );

diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
@@ -796,8 +796,8 @@ export interface ModelUnit {
 
 export interface GroundedSemantic {
     id: string;
-    name?: string;
     grounding?: ModelGrounding;
+    name?: string;
     description?: string;
 }
 

diff --git a/...c/main/java/software/uncharted/terarium/hmiserver/controller/funman/FunmanController.java b/...c/main/java/software/uncharted/terarium/hmiserver/controller/funman/FunmanController.java
@@ -86,7 +86,7 @@ public ResponseEntity<Simulation> createValidationRequest(
 		);
 
 		final TaskRequest taskRequest = new TaskRequest();
-		taskRequest.setTimeoutMinutes(30);
+		taskRequest.setTimeoutMinutes(45);
 		taskRequest.setType(TaskType.FUNMAN);
 		taskRequest.setScript(ValidateModelConfigHandler.NAME);
 		taskRequest.setUserId(currentUserService.get().getId());