From b0793fab3d1cc133b74f5eaeecb404aa81a5bf14 Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Mon, 9 Sep 2024 15:28:55 -0400
Subject: [PATCH 01/10] Using optional as Kevin suggests

---
 packages/client/hmi-client/src/types/Types.ts   |  6 ++++--
 .../simulationservice/CiemssStatusUpdate.java   | 17 ++++++++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index b76588d5be..8785dc35a4 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -554,9 +554,11 @@ export interface CalibrationRequestCiemss {
 }
 
 export interface CiemssStatusUpdate {
-    loss: number;
-    progress: number;
     jobId: string;
+    progress: number;
+    loss?: number;
+    currentResults?: number[];
+    totalPossibleIterations?: number;
 }
 
 export interface EnsembleCalibrationCiemssRequest {
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/CiemssStatusUpdate.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/CiemssStatusUpdate.java
index 988f75aeda..fd35fa6545 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/CiemssStatusUpdate.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/CiemssStatusUpdate.java
@@ -4,19 +4,30 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import java.util.List;
 import lombok.Data;
 import software.uncharted.terarium.hmiserver.annotations.TSModel;
+import software.uncharted.terarium.hmiserver.annotations.TSOptional;
 
 @Data
 @TSModel
 public class CiemssStatusUpdate {
 
-	private Number loss;
+	@JsonAlias("job_id")
+	private String jobId;
 
 	private Number progress;
 
-	@JsonAlias("job_id")
-	private String jobId;
+	@TSOptional
+	private Number loss;
+
+	@TSOptional
+	@JsonAlias("current_results")
+	private List<Number> currentResults;
+
+	@TSOptional
+	@JsonAlias("total_possible_iterations")
+	private Number totalPossibleIterations;
 
 	@JsonIgnore
 	public JsonNode getDataToPersist() {

From 61b9a63e3b44d1a6c52c569b85f2a581547529cb Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Tue, 10 Sep 2024 09:40:58 -0400
Subject: [PATCH 02/10] adding % to node.

---
 .../optimize-ciemss-operation.ts              |  5 +++-
 .../tera-optimize-ciemss-node.vue             | 26 ++++++++++++++++---
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts
index 09192f8243..4917dbb963 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts
@@ -72,6 +72,8 @@ export interface OptimizeCiemssOperationState extends BaseState {
 	optimizedInterventionPolicyId: string;
 	optimizeErrorMessage: { name: string; value: string; traceback: string };
 	simulateErrorMessage: { name: string; value: string; traceback: string };
+	// Intermediate:
+	currentProgress: number;
 }
 
 // This is used as a map between dropdown labels and the inner values used by pyciemss-service.
@@ -150,7 +152,8 @@ export const OptimizeCiemssOperation: Operation = {
 			optimizationRunId: '',
 			optimizedInterventionPolicyId: '',
 			optimizeErrorMessage: { name: '', value: '', traceback: '' },
-			simulateErrorMessage: { name: '', value: '', traceback: '' }
+			simulateErrorMessage: { name: '', value: '', traceback: '' },
+			currentProgress: 0
 		};
 		return init;
 	}
diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
index 592ceca61d..158da7dbb0 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
@@ -4,7 +4,11 @@
 			<template v-if="!node.inputs[0].value"> Attach a model configuration </template>
 		</tera-operator-placeholder>
 		<template v-if="node.inputs[0].value">
-			<tera-progress-spinner v-if="showSpinner" :font-size="2" is-centered style="height: 100%" />
+			<div v-if="showSpinner">
+				<p>{{ node.state.currentProgress }}% of maximum iterations complete</p>
+				<tera-progress-spinner :font-size="2" is-centered style="height: 100%" />
+			</div>
+
 			<div v-if="!showSpinner && runResults">
 				<template v-for="(_, index) of node.state.selectedSimulationVariables" :key="index">
 					<vega-chart :visualization-spec="preparedCharts[index]" :are-embed-actions-visible="false" />
@@ -33,7 +37,7 @@ import {
 	parsePyCiemssMap
 } from '@/services/models/simulation-service';
 import { nodeMetadata, nodeOutputLabel } from '@/components/workflow/util';
-import { SimulationRequest, InterventionPolicy } from '@/types/Types';
+import { SimulationRequest, InterventionPolicy, Simulation } from '@/types/Types';
 import { createLLMSummary } from '@/services/summary-service';
 import VegaChart from '@/components/widgets/VegaChart.vue';
 import { createForecastChart } from '@/services/charts';
@@ -74,7 +78,23 @@ const pollResult = async (runId: string) => {
 	poller
 		.setInterval(5000)
 		.setThreshold(100)
-		.setPollAction(async () => pollAction(runId));
+		.setPollAction(async () => pollAction(runId))
+		.setProgressAction((data: Simulation) => {
+			if (data?.updates?.length) {
+				console.log(data.updates);
+			}
+			if (runId === props.node.state.inProgressOptimizeId && data.updates.length > 0) {
+				const checkpoint = _.first(data.updates);
+				if (checkpoint) {
+					const state = _.cloneDeep(props.node.state);
+					state.currentProgress = +((100 * checkpoint.data.progress) / checkpoint.data.totalPossibleIterations).toFixed(
+						2
+					);
+					console.log(state.currentProgress);
+					emit('update-state', state);
+				}
+			}
+		});
 
 	const pollerResults = await poller.start();
 

From 042c047ccf24d28a201f0296380fb7ecb27307d2 Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Tue, 10 Sep 2024 09:46:25 -0400
Subject: [PATCH 03/10] reset currentProgress when optimize run finished

---
 .../workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
index 158da7dbb0..321366b28b 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
@@ -201,6 +201,7 @@ watch(
 			state.inProgressPreForecastId = preForecastId;
 			state.inProgressPostForecastId = postForecastId;
 			state.optimizedInterventionPolicyId = newInterventionResponse.id ?? '';
+			state.currentProgress = 0;
 			emit('update-state', state);
 		} else {
 			// Simulation Failed:

From 71167a96810719291543f64c7499b6ab38ac285e Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Tue, 10 Sep 2024 13:12:06 -0400
Subject: [PATCH 04/10] adding message to drilldown

---
 .../optimize-ciemss-operation.ts              |  2 +-
 .../tera-optimize-ciemss-drilldown.vue        | 26 ++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts
index 4917dbb963..6412cfeae8 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/optimize-ciemss-operation.ts
@@ -73,7 +73,7 @@ export interface OptimizeCiemssOperationState extends BaseState {
 	optimizeErrorMessage: { name: string; value: string; traceback: string };
 	simulateErrorMessage: { name: string; value: string; traceback: string };
 	// Intermediate:
-	currentProgress: number;
+	currentProgress: number; // optimization run's 2 digit %
 }
 
 // This is used as a map between dropdown labels and the inner values used by pyciemss-service.
diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
index 8743a061e2..6a433578e2 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
@@ -239,7 +239,6 @@
 		<template #preview>
 			<tera-drilldown-section
 				class="ml-3 mr-3"
-				:is-loading="showSpinner"
 				:class="{ 'failed-run': optimizationResult.success === 'False' ?? 'successful-run' }"
 			>
 				<template #header-controls-left v-if="optimizedInterventionPolicy?.name">
@@ -254,10 +253,16 @@
 						@click="showSaveInterventionPolicy = true"
 					/>
 				</template>
-
+				<section v-if="showSpinner" class="spinner-message">
+					<tera-progress-spinner :font-size="2" is-centered style="height: 12rem" />
+					<p>{{ node.state.currentProgress }}% of maximum iterations complete</p>
+				</section>
 				<tera-operator-output-summary v-if="node.state.summaryId && !showSpinner" :summary-id="node.state.summaryId" />
 				<!-- Optimize result.json display: -->
-				<div v-if="optimizationResult && displayOptimizationResultMessage" class="result-message-grid mt-2 mb-2">
+				<div
+					v-if="optimizationResult && displayOptimizationResultMessage && !showSpinner"
+					class="result-message-grid mt-2 mb-2"
+				>
 					<span class="flex flex-row">
 						<p class="mt-2">For debugging</p>
 						<Button
@@ -275,6 +280,7 @@
 					</div>
 				</div>
 				<SelectButton
+					v-if="!showSpinner"
 					:model-value="outputViewSelection"
 					@change="if ($event.value) outputViewSelection = $event.value;"
 					:options="outputViewOptions"
@@ -288,7 +294,7 @@
 				</SelectButton>
 				<tera-notebook-error v-bind="node.state.optimizeErrorMessage" />
 				<tera-notebook-error v-bind="node.state.simulateErrorMessage" />
-				<template v-if="runResults[knobs.postForecastRunId] && runResults[knobs.preForecastRunId]">
+				<template v-if="runResults[knobs.postForecastRunId] && runResults[knobs.preForecastRunId] && !showSpinner">
 					<section v-if="outputViewSelection === OutputView.Charts" ref="outputPanel">
 						<Accordion multiple :active-index="[0, 1, 2]">
 							<AccordionTab header="Success criteria">
@@ -379,6 +385,7 @@ import TeraDrilldownSection from '@/components/drilldown/tera-drilldown-section.
 import TeraSaveDatasetFromSimulation from '@/components/dataset/tera-save-dataset-from-simulation.vue';
 import TeraPyciemssCancelButton from '@/components/pyciemss/tera-pyciemss-cancel-button.vue';
 import TeraOperatorOutputSummary from '@/components/operator/tera-operator-output-summary.vue';
+import TeraProgressSpinner from '@/components/widgets/tera-progress-spinner.vue';
 import { getUnitsFromModelParts, getModelByModelConfigurationId } from '@/services/model';
 import { createModelConfiguration, getModelConfigurationById } from '@/services/model-configurations';
 import {
@@ -1119,6 +1126,17 @@ watch(
 	padding: var(--gap-1) var(--gap);
 	gap: var(--gap-2);
 }
+
+.spinner-message {
+	align-items: center;
+	align-self: center;
+	display: flex;
+	flex-direction: column;
+	gap: var(--gap-2);
+	margin-top: 15rem;
+	text-align: center;
+}
+
 .info-circle {
 	color: var(--text-color-secondary);
 	font-size: var(--font-caption);

From acdadefdb40f0232310496caa5092425d77a35b5 Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Tue, 10 Sep 2024 13:13:15 -0400
Subject: [PATCH 05/10] updating progress when simulations are done

---
 .../workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
index 321366b28b..02e03731c8 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
@@ -201,7 +201,6 @@ watch(
 			state.inProgressPreForecastId = preForecastId;
 			state.inProgressPostForecastId = postForecastId;
 			state.optimizedInterventionPolicyId = newInterventionResponse.id ?? '';
-			state.currentProgress = 0;
 			emit('update-state', state);
 		} else {
 			// Simulation Failed:
@@ -255,6 +254,7 @@ Provide a consis summary in 100 words or less.
 			state.preForecastRunId = preSimId;
 			state.inProgressPostForecastId = '';
 			state.postForecastRunId = postSimId;
+			state.currentProgress = 0;
 			emit('update-state', state);
 
 			const datasetName = `Forecast run ${state.postForecastRunId}`;
@@ -302,6 +302,7 @@ Provide a consis summary in 100 words or less.
 			state.inProgressOptimizeId = '';
 			state.inProgressPreForecastId = '';
 			state.inProgressPostForecastId = '';
+			state.currentProgress = 0;
 			emit('update-state', state);
 		}
 	},

From 96cd7c28428274ad7e2e34c81354f1f672145dd8 Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Tue, 10 Sep 2024 13:22:52 -0400
Subject: [PATCH 06/10] removing console.logs

---
 .../ops/optimize-ciemss/tera-optimize-ciemss-node.vue         | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
index 02e03731c8..6f35246688 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
@@ -80,9 +80,6 @@ const pollResult = async (runId: string) => {
 		.setThreshold(100)
 		.setPollAction(async () => pollAction(runId))
 		.setProgressAction((data: Simulation) => {
-			if (data?.updates?.length) {
-				console.log(data.updates);
-			}
 			if (runId === props.node.state.inProgressOptimizeId && data.updates.length > 0) {
 				const checkpoint = _.first(data.updates);
 				if (checkpoint) {
@@ -90,7 +87,6 @@ const pollResult = async (runId: string) => {
 					state.currentProgress = +((100 * checkpoint.data.progress) / checkpoint.data.totalPossibleIterations).toFixed(
 						2
 					);
-					console.log(state.currentProgress);
 					emit('update-state', state);
 				}
 			}

From 893811210611399f05f7393fe0813ebeac7e2d6b Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Wed, 11 Sep 2024 09:19:30 -0400
Subject: [PATCH 07/10] spinner fix - thanks Dan

---
 .../ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
index 6a433578e2..b9f51bd255 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
@@ -253,10 +253,9 @@
 						@click="showSaveInterventionPolicy = true"
 					/>
 				</template>
-				<section v-if="showSpinner" class="spinner-message">
-					<tera-progress-spinner :font-size="2" is-centered style="height: 12rem" />
-					<p>{{ node.state.currentProgress }}% of maximum iterations complete</p>
-				</section>
+				<tera-progress-spinner v-if="showSpinner" :font-size="2" is-centered style="height: 100%">
+					<div>{{ props.node.state.currentProgress }}% of maximum iterations complete</div>
+				</tera-progress-spinner>
 				<tera-operator-output-summary v-if="node.state.summaryId && !showSpinner" :summary-id="node.state.summaryId" />
 				<!-- Optimize result.json display: -->
 				<div

From cb2194d277f3da45aee40b20a31c0da074ce4e7e Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Wed, 11 Sep 2024 14:44:24 -0400
Subject: [PATCH 08/10] Distinct types for calibrate and optimize

---
 .../tera-optimize-ciemss-node.vue             |  8 +-
 packages/client/hmi-client/src/types/Types.ts | 28 +++++--
 .../CiemssCalibrateStatusUpdate.java          | 11 +++
 .../CiemssOptimizeStatusUpdate.java}          | 15 +---
 .../statusupdates/CiemssStatusType.java       | 22 +++++
 .../statusupdates/CiemssStatusUpdate.java     | 26 ++++++
 .../service/SimulationEventService.java       | 80 ++++++++++++++-----
 7 files changed, 146 insertions(+), 44 deletions(-)
 create mode 100644 packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/statusupdates/CiemssCalibrateStatusUpdate.java
 rename packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/{CiemssStatusUpdate.java => statusupdates/CiemssOptimizeStatusUpdate.java} (73%)
 create mode 100644 packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/statusupdates/CiemssStatusType.java
 create mode 100644 packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/statusupdates/CiemssStatusUpdate.java

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
index 6f35246688..e517277771 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
@@ -37,7 +37,7 @@ import {
 	parsePyCiemssMap
 } from '@/services/models/simulation-service';
 import { nodeMetadata, nodeOutputLabel } from '@/components/workflow/util';
-import { SimulationRequest, InterventionPolicy, Simulation } from '@/types/Types';
+import { SimulationRequest, InterventionPolicy, Simulation, CiemssOptimizeStatusUpdate } from '@/types/Types';
 import { createLLMSummary } from '@/services/summary-service';
 import VegaChart from '@/components/widgets/VegaChart.vue';
 import { createForecastChart } from '@/services/charts';
@@ -81,10 +81,10 @@ const pollResult = async (runId: string) => {
 		.setPollAction(async () => pollAction(runId))
 		.setProgressAction((data: Simulation) => {
 			if (runId === props.node.state.inProgressOptimizeId && data.updates.length > 0) {
-				const checkpoint = _.first(data.updates);
-				if (checkpoint) {
+				const checkpointData = _.first(data.updates)?.data as CiemssOptimizeStatusUpdate;
+				if (checkpointData) {
 					const state = _.cloneDeep(props.node.state);
-					state.currentProgress = +((100 * checkpoint.data.progress) / checkpoint.data.totalPossibleIterations).toFixed(
+					state.currentProgress = +((100 * checkpointData.progress) / checkpointData.totalPossibleIterations).toFixed(
 						2
 					);
 					emit('update-state', state);
diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index 8785dc35a4..74659442f9 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -553,14 +553,6 @@ export interface CalibrationRequestCiemss {
     engine: string;
 }
 
-export interface CiemssStatusUpdate {
-    jobId: string;
-    progress: number;
-    loss?: number;
-    currentResults?: number[];
-    totalPossibleIterations?: number;
-}
-
 export interface EnsembleCalibrationCiemssRequest {
     modelConfigs: EnsembleModelConfigs[];
     dataset: DatasetLocation;
@@ -674,6 +666,21 @@ export interface TimeSpan {
     end: number;
 }
 
+export interface CiemssCalibrateStatusUpdate extends CiemssStatusUpdate {
+    loss: number;
+}
+
+export interface CiemssOptimizeStatusUpdate extends CiemssStatusUpdate {
+    currentResults: number[];
+    totalPossibleIterations: number;
+}
+
+export interface CiemssStatusUpdate {
+    jobId: string;
+    progress: number;
+    type: CiemssStatusType;
+}
+
 export interface TaskResponse {
     id: string;
     script: string;
@@ -1028,6 +1035,11 @@ export enum EvaluationScenarioStatus {
     Stopped = "STOPPED",
 }
 
+export enum CiemssStatusType {
+    Optimize = "optimize",
+    Calibrate = "calibrate",
+}
+
 export enum TaskStatus {
     Queued = "QUEUED",
     Running = "RUNNING",
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/statusupdates/CiemssCalibrateStatusUpdate.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/statusupdates/CiemssCalibrateStatusUpdate.java
new file mode 100644
index 0000000000..f91fd50127
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/statusupdates/CiemssCalibrateStatusUpdate.java
@@ -0,0 +1,11 @@
+package software.uncharted.terarium.hmiserver.models.simulationservice.statusupdates;
+
+import lombok.Data;
+import software.uncharted.terarium.hmiserver.annotations.TSModel;
+
+@Data
+@TSModel
+public class CiemssCalibrateStatusUpdate extends CiemssStatusUpdate {
+
+	private Number loss;
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/CiemssStatusUpdate.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/statusupdates/CiemssOptimizeStatusUpdate.java
similarity index 73%
rename from packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/CiemssStatusUpdate.java
rename to packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/statusupdates/CiemssOptimizeStatusUpdate.java
index fd35fa6545..a40169efb7 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/CiemssStatusUpdate.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/statusupdates/CiemssOptimizeStatusUpdate.java
@@ -1,4 +1,4 @@
-package software.uncharted.terarium.hmiserver.models.simulationservice;
+package software.uncharted.terarium.hmiserver.models.simulationservice.statusupdates;
 
 import com.fasterxml.jackson.annotation.JsonAlias;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -7,25 +7,14 @@
 import java.util.List;
 import lombok.Data;
 import software.uncharted.terarium.hmiserver.annotations.TSModel;
-import software.uncharted.terarium.hmiserver.annotations.TSOptional;
 
 @Data
 @TSModel
-public class CiemssStatusUpdate {
+public class CiemssOptimizeStatusUpdate extends CiemssStatusUpdate {
 
-	@JsonAlias("job_id")
-	private String jobId;
-
-	private Number progress;
-
-	@TSOptional
-	private Number loss;
-
-	@TSOptional
 	@JsonAlias("current_results")
 	private List<Number> currentResults;
 
-	@TSOptional
 	@JsonAlias("total_possible_iterations")
 	private Number totalPossibleIterations;
 
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/statusupdates/CiemssStatusType.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/statusupdates/CiemssStatusType.java
new file mode 100644
index 0000000000..f80b6f8bf8
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/statusupdates/CiemssStatusType.java
@@ -0,0 +1,22 @@
+package software.uncharted.terarium.hmiserver.models.simulationservice.statusupdates;
+
+import com.fasterxml.jackson.annotation.JsonValue;
+import software.uncharted.terarium.hmiserver.annotations.TSModel;
+
+@TSModel
+public enum CiemssStatusType {
+	OPTIMIZE("optimize"),
+	CALIBRATE("calibrate");
+
+	public final String type;
+
+	CiemssStatusType(final String type) {
+		this.type = type;
+	}
+
+	@Override
+	@JsonValue
+	public String toString() {
+		return type;
+	}
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/statusupdates/CiemssStatusUpdate.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/statusupdates/CiemssStatusUpdate.java
new file mode 100644
index 0000000000..2ebecda1fe
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/simulationservice/statusupdates/CiemssStatusUpdate.java
@@ -0,0 +1,26 @@
+package software.uncharted.terarium.hmiserver.models.simulationservice.statusupdates;
+
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import lombok.Data;
+import software.uncharted.terarium.hmiserver.annotations.TSModel;
+
+@Data
+@TSModel
+public abstract class CiemssStatusUpdate {
+
+	@JsonAlias("job_id")
+	private String jobId;
+
+	private Number progress;
+
+	private CiemssStatusType type;
+
+	@JsonIgnore
+	public JsonNode getDataToPersist() {
+		final ObjectMapper mapper = new ObjectMapper();
+		return mapper.valueToTree(this);
+	}
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/SimulationEventService.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/SimulationEventService.java
index 33fb2eb6ac..87e94ead3f 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/SimulationEventService.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/SimulationEventService.java
@@ -1,5 +1,6 @@
 package software.uncharted.terarium.hmiserver.service;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.rabbitmq.client.Channel;
 import jakarta.annotation.PostConstruct;
 import java.io.IOException;
@@ -26,8 +27,11 @@
 import software.uncharted.terarium.hmiserver.models.ClientEventType;
 import software.uncharted.terarium.hmiserver.models.User;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.SimulationUpdate;
-import software.uncharted.terarium.hmiserver.models.simulationservice.CiemssStatusUpdate;
 import software.uncharted.terarium.hmiserver.models.simulationservice.ScimlStatusUpdate;
+import software.uncharted.terarium.hmiserver.models.simulationservice.statusupdates.CiemssCalibrateStatusUpdate;
+import software.uncharted.terarium.hmiserver.models.simulationservice.statusupdates.CiemssOptimizeStatusUpdate;
+import software.uncharted.terarium.hmiserver.models.simulationservice.statusupdates.CiemssStatusType;
+import software.uncharted.terarium.hmiserver.models.simulationservice.statusupdates.CiemssStatusUpdate;
 import software.uncharted.terarium.hmiserver.service.data.SimulationService;
 import software.uncharted.terarium.hmiserver.utils.rebac.Schema;
 
@@ -151,11 +155,30 @@ private void onScimlAllInstanceReceive(final Message message) {
 
 	@RabbitListener(queues = "${terarium.simulation-status}", concurrency = "1")
 	private void onPyciemssOneInstanceReceives(final Message message, final Channel channel) throws IOException {
-		final CiemssStatusUpdate update = ClientEventService.decodeMessage(message, CiemssStatusUpdate.class);
-		if (update == null) {
+		// Parse message to get message type:
+		final String updateType = (ClientEventService.decodeMessage(message, JsonNode.class)).get("type").asText();
+		if (updateType.equals(CiemssStatusType.OPTIMIZE.toString())) {
+			final CiemssOptimizeStatusUpdate update = ClientEventService.decodeMessage(
+				message,
+				CiemssOptimizeStatusUpdate.class
+			);
+			updateAndSendMessage(message, update);
+		} else if (updateType.equals(CiemssStatusType.CALIBRATE.toString())) {
+			final CiemssCalibrateStatusUpdate update = ClientEventService.decodeMessage(
+				message,
+				CiemssCalibrateStatusUpdate.class
+			);
+			updateAndSendMessage(message, update);
+		} else {
+			log.error("message in simulation-status with unknown type: " + updateType);
 			return;
 		}
+	}
 
+	private void updateAndSendMessage(final Message message, final CiemssStatusUpdate update) {
+		if (update == null) {
+			return;
+		}
 		try {
 			final SimulationUpdate simulationUpdate = new SimulationUpdate();
 			simulationUpdate.setData(update.getDataToPersist());
@@ -193,26 +216,45 @@ private void onPyciemssOneInstanceReceives(final Message message, final Channel
 	)
 	private void onPyciemssAllInstanceReceive(final Message message) {
 		try {
-			final CiemssStatusUpdate update = ClientEventService.decodeMessage(message, CiemssStatusUpdate.class);
-			if (update == null) {
+			// Parse message to get message type:
+			final String updateType = (ClientEventService.decodeMessage(message, JsonNode.class)).get("type").asText();
+			if (updateType.equals(CiemssStatusType.OPTIMIZE.toString())) {
+				final CiemssOptimizeStatusUpdate update = ClientEventService.decodeMessage(
+					message,
+					CiemssOptimizeStatusUpdate.class
+				);
+				passPyciemssToUser(update);
+			} else if (updateType.equals(CiemssStatusType.CALIBRATE.toString())) {
+				final CiemssCalibrateStatusUpdate update = ClientEventService.decodeMessage(
+					message,
+					CiemssCalibrateStatusUpdate.class
+				);
+				passPyciemssToUser(update);
+			} else {
+				log.error("message in simulation-status with unknown type: " + updateType);
 				return;
 			}
-
-			final ClientEvent<CiemssStatusUpdate> status = ClientEvent.<CiemssStatusUpdate>builder()
-				.type(ClientEventType.SIMULATION_PYCIEMSS)
-				.data(update)
-				.build();
-
-			final String id = update.getJobId();
-			if (simulationIdToUserIds.containsKey(id)) {
-				simulationIdToUserIds
-					.get(id)
-					.forEach(userId -> {
-						clientEventService.sendToUser(status, userId);
-					});
-			}
 		} catch (final Exception e) {
 			log.error("Error processing event", e);
 		}
 	}
+
+	private void passPyciemssToUser(final CiemssStatusUpdate update) {
+		if (update == null) {
+			return;
+		}
+		final ClientEvent<CiemssStatusUpdate> status = ClientEvent.<CiemssStatusUpdate>builder()
+			.type(ClientEventType.SIMULATION_PYCIEMSS)
+			.data(update)
+			.build();
+
+		final String id = update.getJobId();
+		if (simulationIdToUserIds.containsKey(id)) {
+			simulationIdToUserIds
+				.get(id)
+				.forEach(userId -> {
+					clientEventService.sendToUser(status, userId);
+				});
+		}
+	}
 }

From 6d48daf90b14d97edc56271701d27d8a60bf3130 Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Wed, 11 Sep 2024 14:45:03 -0400
Subject: [PATCH 09/10] rename helper.

---
 .../terarium/hmiserver/service/SimulationEventService.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/SimulationEventService.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/SimulationEventService.java
index 87e94ead3f..0039683797 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/SimulationEventService.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/SimulationEventService.java
@@ -162,20 +162,20 @@ private void onPyciemssOneInstanceReceives(final Message message, final Channel
 				message,
 				CiemssOptimizeStatusUpdate.class
 			);
-			updateAndSendMessage(message, update);
+			updateAndSendPyciemssMessage(message, update);
 		} else if (updateType.equals(CiemssStatusType.CALIBRATE.toString())) {
 			final CiemssCalibrateStatusUpdate update = ClientEventService.decodeMessage(
 				message,
 				CiemssCalibrateStatusUpdate.class
 			);
-			updateAndSendMessage(message, update);
+			updateAndSendPyciemssMessage(message, update);
 		} else {
 			log.error("message in simulation-status with unknown type: " + updateType);
 			return;
 		}
 	}
 
-	private void updateAndSendMessage(final Message message, final CiemssStatusUpdate update) {
+	private void updateAndSendPyciemssMessage(final Message message, final CiemssStatusUpdate update) {
 		if (update == null) {
 			return;
 		}

From 9baa0ef48196de01a617d564a1deda9c7dff0c7e Mon Sep 17 00:00:00 2001
From: Tom Szendrey <T.Szendrey@hotmail.com>
Date: Wed, 11 Sep 2024 15:01:31 -0400
Subject: [PATCH 10/10] adding message for forecasts

---
 .../ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue   | 5 ++++-
 .../ops/optimize-ciemss/tera-optimize-ciemss-node.vue        | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
index b9f51bd255..c2f177c53a 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
@@ -254,7 +254,10 @@
 					/>
 				</template>
 				<tera-progress-spinner v-if="showSpinner" :font-size="2" is-centered style="height: 100%">
-					<div>{{ props.node.state.currentProgress }}% of maximum iterations complete</div>
+					<div v-if="node.state.inProgressOptimizeId !== ''">
+						{{ props.node.state.currentProgress }}% of maximum iterations complete
+					</div>
+					<div v-else>Optimize complete. Running simulations</div>
 				</tera-progress-spinner>
 				<tera-operator-output-summary v-if="node.state.summaryId && !showSpinner" :summary-id="node.state.summaryId" />
 				<!-- Optimize result.json display: -->
diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
index e517277771..d7ec7ef71a 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-node.vue
@@ -5,7 +5,10 @@
 		</tera-operator-placeholder>
 		<template v-if="node.inputs[0].value">
 			<div v-if="showSpinner">
-				<p>{{ node.state.currentProgress }}% of maximum iterations complete</p>
+				<div v-if="node.state.inProgressOptimizeId !== ''">
+					{{ props.node.state.currentProgress }}% of maximum iterations complete
+				</div>
+				<div v-else>Optimize complete. Running simulations</div>
 				<tera-progress-spinner :font-size="2" is-centered style="height: 100%" />
 			</div>