From 358d9b652dae63b8d262e9204965e64801f30523 Mon Sep 17 00:00:00 2001
From: David Gauldie <dgauldie@uncharted.software>
Date: Tue, 4 Feb 2025 21:12:20 -0500
Subject: [PATCH] merge 2.31.5 back into main (#6419)

Co-authored-by: Cole Blanchard <33158416+blanchco@users.noreply.github.com>
Co-authored-by: Nelson Liu <nliu@uncharted.software>
Co-authored-by: Yohann Paris <github@yohannparis.com>
Co-authored-by: Cole Blanchard <cblanchard@Coles-MacBook-Pro.local>
Co-authored-by: Derek Vince <dvince@uncharted.software>
Co-authored-by: Daniel Chang <mwdchang@gmail.com>
Co-authored-by: Tom Szendrey <T.Szendrey@hotmail.com>
Co-authored-by: Shawn Yama <syama@uncharted.software>
Co-authored-by: Jamie Waese <120480244+jamiewaese-uncharted@users.noreply.github.com>
Co-authored-by: Jaehwan Ryu <jryu@uncharted.software>
Co-authored-by: Adrian <95376249+asylves1@users.noreply.github.com>
---
 .../model-parts/tera-model-part-entry.vue     |  13 +-
 .../model/petrinet/tera-initial-entry.vue     |   4 +
 .../model/petrinet/tera-initial-table.vue     |  32 ++-
 .../model/petrinet/tera-parameter-entry.vue   |  19 +-
 .../model/petrinet/tera-parameter-table.vue   |  38 +++-
 .../tera-calibrate-ciemss-drilldown.vue       |   9 +-
 .../tera-calibrate-node-ciemss.vue            |  85 +++++---
 .../tera-calibrate-ensemble-node-ciemss.vue   |  23 ++-
 .../tera-compare-datasets-drilldown.vue       | 185 ++++++------------
 .../tera-model-config-drilldown.vue           |   5 +-
 .../tera-model-configuration-item.vue         |  19 +-
 .../tera-model-from-equations-drilldown.vue   |   6 +-
 .../tera-optimize-ciemss-node.vue             |  35 ++--
 .../tera-simulate-ciemss-drilldown.vue        |  35 ++--
 .../tera-simulate-ensemble-node-ciemss.vue    |  38 ++--
 .../stratify-mira/stratify-mira-operation.ts  |   4 +-
 .../stratify-mira/tera-stratify-drilldown.vue |  13 +-
 .../ops/stratify-mira/tera-stratify-node.vue  |  61 ++++--
 .../workflow/tera-workflow-annotation.vue     |  55 +++++-
 .../hmi-client/src/composables/useCharts.ts   | 100 +++++-----
 .../client/hmi-client/src/services/charts.ts  |  36 +++-
 .../client/hmi-client/src/services/graph.ts   |   2 +-
 .../client/hmi-client/src/services/jupyter.ts |   2 +-
 packages/client/hmi-client/src/utils/stats.ts | 127 +++++++++++-
 .../data/ModelConfigurationService.java       |   5 +-
 25 files changed, 605 insertions(+), 346 deletions(-)

diff --git a/packages/client/hmi-client/src/components/model/model-parts/tera-model-part-entry.vue b/packages/client/hmi-client/src/components/model/model-parts/tera-model-part-entry.vue
index 9b7146d625..884f4300bb 100644
--- a/packages/client/hmi-client/src/components/model/model-parts/tera-model-part-entry.vue
+++ b/packages/client/hmi-client/src/components/model/model-parts/tera-model-part-entry.vue
@@ -65,6 +65,7 @@
 
 <script setup lang="ts">
 import { computed, ref } from 'vue';
+import { debounce } from 'lodash';
 import Button from 'primevue/button';
 import Dropdown from 'primevue/dropdown';
 import TeraConcept from '@/components/widgets/tera-concept.vue';
@@ -90,25 +91,29 @@ const props = defineProps<{
 
 const emit = defineEmits(['update-item']);
 
+const debouncer = debounce((key: string, value: string = '') => {
+	emit('update-item', { key, value });
+}, 300);
+
 const nameText = computed({
 	get: () => props.name,
-	set: (newName) => emit('update-item', { key: 'name', value: newName })
+	set: (newName) => debouncer('name', newName)
 });
 const unitExpression = computed({
 	get: () => props.unitExpression,
-	set: (newUnitExpression) => emit('update-item', { key: 'unitExpression', value: newUnitExpression })
+	set: (newUnitExpression) => debouncer('unitExpression', newUnitExpression)
 });
 const descriptionText = computed({
 	get: () => props.description,
 	set: (newDescription) => {
-		emit('update-item', { key: 'description', value: newDescription });
+		debouncer('description', newDescription);
 		showDescription.value = !!newDescription;
 	}
 });
 const showDescription = ref<boolean>(!!descriptionText.value);
 const grounding = computed({
 	get: () => props.grounding,
-	set: (newGrounding) => emit('update-item', { key: 'grounding', value: newGrounding })
+	set: (newGrounding) => debouncer('grounding', newGrounding)
 });
 
 // If we are in preview mode and there is no content, show nothing
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-entry.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-entry.vue
index cc39c94f2f..6c210293bc 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-entry.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-entry.vue
@@ -138,6 +138,10 @@ onMounted(async () => {
 .empty {
 	border-left: 4px solid var(--error-color);
 }
+.empty:hover {
+	border-left: 4px solid var(--error-color);
+	background-color: var(--red-50);
+}
 header {
 	display: flex;
 	flex-direction: column;
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table.vue
index 4cf9faefbe..244e082707 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table.vue
@@ -9,12 +9,22 @@
 			<ul>
 				<li v-for="{ baseInitial, childInitials, isVirtual } in initialList" :key="baseInitial">
 					<!-- Stratified -->
-					<section v-if="isVirtual" class="initial-entry-stratified">
+					<section
+						v-if="isVirtual"
+						class="initial-entry-stratified"
+						:class="{ warning: hasEmptyExpressions({ baseInitial }) }"
+					>
 						<Accordion multiple>
 							<AccordionTab>
 								<template #header>
 									<span>{{ baseInitial }}</span>
-									<Button label="Open Matrix" text size="small" @click.stop="matrixModalId = baseInitial" />
+									<Button
+										label="Open matrix"
+										text
+										size="small"
+										@click.stop="matrixModalId = baseInitial"
+										class="ml-3"
+									/>
 								</template>
 								<ul>
 									<li v-for="{ target } in childInitials" :key="target">
@@ -110,6 +120,12 @@ const initialList = computed<
 		.filter(({ baseInitial }) => baseInitial.toLowerCase().includes(filterText.value.toLowerCase()));
 });
 
+const hasEmptyExpressions = computed(() => ({ baseInitial }) => {
+	const semanticsForThisInitial = props.modelConfiguration.initialSemanticList.filter((s) =>
+		s.target.startsWith(`${baseInitial}_`)
+	);
+	return semanticsForThisInitial.some((s) => !s.expression);
+});
 const currentActiveIndicies = ref([0]);
 
 const matrixModalId = ref('');
@@ -138,15 +154,13 @@ ul {
 	border-left: 4px solid var(--surface-300);
 	padding-left: var(--gap-1);
 }
-.initial-entry-stratified:hover {
-	border-left-color: var(--primary-color);
-	background: var(--surface-highlight);
+.initial-entry-stratified.warning {
+	border-left-color: var(--error-color);
 }
-/* But set a lighter hover state when hovering over child elements */
-.initial-entry-stratified:hover:has(.initial-entry:hover) {
-	border-left: 4px solid var(--primary-color-light);
-	background: color-mix(in srgb, var(--surface-highlight) 30%, var(--surface-0) 70%);
+.initial-entry-stratified.warning:hover {
+	border-left-color: var(--error-color);
 }
+
 .artifact-amount {
 	font-size: var(--font-caption);
 	color: var(--text-color-subdued);
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-entry.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-entry.vue
index 50a78cfa28..8786cc3810 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-entry.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-entry.vue
@@ -1,5 +1,5 @@
 <template>
-	<div class="parameter-entry flex flex-column flex-1" :class="{ empty: isParameterEmpty }">
+	<div class="parameter-entry flex flex-column flex-1" :class="{ empty: computedIsParameterEmpty }">
 		<header class="gap-1 pt-2 pb-2">
 			<div class="flex">
 				<strong>{{ parameterId }}</strong>
@@ -82,7 +82,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref, onMounted, watch } from 'vue';
 import { Model, ModelConfiguration } from '@/types/Types';
 import {
 	getParameterSource,
@@ -149,6 +149,19 @@ onMounted(async () => {
 	const parameter = getParameterDistribution(props.modelConfiguration, props.parameterId, true);
 	isParameterEmpty.value = inferredDistribution.value ? false : isParameterInputEmpty(parameter);
 });
+
+const computedIsParameterEmpty = computed(() => {
+	const parameter = getParameterDistribution(props.modelConfiguration, props.parameterId);
+	return inferredDistribution.value ? false : isParameterInputEmpty(parameter);
+});
+
+watch(
+	[inferredDistribution, () => getParameterDistribution(props.modelConfiguration, props.parameterId)],
+	([newInferredDist, newParameter]) => {
+		isParameterEmpty.value = newInferredDist ? false : isParameterInputEmpty(newParameter);
+	},
+	{ immediate: true }
+);
 </script>
 
 <style scoped>
@@ -162,7 +175,7 @@ onMounted(async () => {
 	transition: all 0.15s;
 	box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
 }
-.parameter-entry:hover {
+.parameter-entry:hover:not(.empty) {
 	border-left: 4px solid var(--primary-color);
 	background: var(--surface-highlight);
 }
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue
index a8ae797f77..cf611f8e9d 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table.vue
@@ -55,7 +55,11 @@
 			<ul class="pl-1">
 				<li v-for="{ baseParameter, childParameters, isVirtual } in parameterList" :key="baseParameter">
 					<!-- Stratified -->
-					<section v-if="isVirtual" class="parameter-entry-stratified">
+					<section
+						v-if="isVirtual"
+						class="parameter-entry-stratified"
+						:class="{ warning: hasEmptyParameters({ baseParameter }) }"
+					>
 						<Accordion multiple>
 							<AccordionTab>
 								<template #header>
@@ -82,7 +86,7 @@
 											text
 											size="small"
 											@click.stop="matrixModalId = baseParameter"
-											class="ml-auto"
+											class="ml-3"
 										/>
 									</div>
 								</template>
@@ -225,6 +229,17 @@ const parameterList = computed<{ baseParameter: string; childParameters: Paramet
 	}
 );
 
+const hasEmptyParameters = computed(() => ({ baseParameter }) => {
+	const parametersForThisGroup = props.modelConfiguration.parameterSemanticList.filter((s) =>
+		s.referenceId.startsWith(`${baseParameter}_`)
+	);
+
+	return parametersForThisGroup.some((p) => {
+		const value = p.distribution?.parameters?.value;
+		return value === null || value === undefined || value === '' || Number.isNaN(value);
+	});
+});
+
 const matrixModalId = ref('');
 
 const onAddUncertainty = () => {
@@ -335,14 +350,19 @@ ul {
 	border-left: 4px solid var(--surface-300);
 	padding-left: var(--gap-1);
 }
-.parameter-entry-stratified:hover {
-	border-left-color: var(--primary-color);
-	background: var(--surface-highlight);
+.parameter-entry-stratified {
+	border: 1px solid var(--surface-border-light);
+	border-radius: var(--border-radius);
+	background: var(--surface-0);
+	box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.05);
+	border-left: 4px solid var(--surface-300);
+	padding-left: var(--gap-1);
+}
+.parameter-entry-stratified.warning {
+	border-left-color: var(--error-color);
 }
-/* But set a lighter hover state when hovering over child elements */
-.parameter-entry-stratified:hover:has(.parameter-entry:hover) {
-	border-left: 4px solid var(--primary-color-light);
-	background: color-mix(in srgb, var(--surface-highlight) 30%, var(--surface-0) 70%);
+.parameter-entry-stratified.warning:hover {
+	border-left-color: var(--error-color);
 }
 
 .stratified {
diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue
index 767b364235..fa8cd7d705 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue
@@ -686,7 +686,12 @@ const runResultSummaryPre = ref<DataArray>([]);
 const showSaveModal = ref(false);
 const configuredModelConfig = ref<ModelConfiguration | null>(null);
 
-const isLoading = ref(false);
+const isLoading = computed<boolean>(
+	() =>
+		props.node.state.inProgressCalibrationId !== '' ||
+		props.node.state.inProgressPreForecastId !== '' ||
+		props.node.state.inProgressForecastId !== ''
+);
 
 const mapping = ref<CalibrateMap[]>(props.node.state.mapping);
 
@@ -1116,11 +1121,9 @@ watch(
 	[() => props.node.state.inProgressCalibrationId, lossChartSize],
 	([id, size]) => {
 		if (id === '') {
-			isLoading.value = false;
 			updateLossChartSpec(lossValues.value, size);
 			unsubscribeToUpdateMessages([id], ClientEventType.SimulationPyciemss, messageHandler);
 		} else {
-			isLoading.value = true;
 			updateLossChartSpec(LOSS_CHART_DATA_SOURCE, size);
 			subscribeToUpdateMessages([id], ClientEventType.SimulationPyciemss, messageHandler);
 		}
diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-node-ciemss.vue
index 8738dd32ce..e414aac9ec 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-node-ciemss.vue
@@ -1,22 +1,18 @@
 <template>
 	<main>
-		<template
-			v-if="!inProgressCalibrationId && runResult && csvAsset && runResultPre && selectedVariableSettings.length"
-		>
+		<section>
 			<tera-node-preview
 				:node="node"
-				:is-loading="!!inProgressCalibrationId"
-				:prepared-charts="Object.assign({}, variableCharts, interventionCharts)"
-				:chart-settings="[...selectedVariableSettings, ...selectedInterventionSettings]"
-				:progress="node.state.currentProgress + '%'"
+				:is-loading="isLoading"
+				:prepared-charts="Object.assign({}, interventionCharts, variableCharts)"
+				:chart-settings="[...selectedInterventionSettings, ...selectedVariableSettings]"
+				:are-embed-actions-visible="true"
+				:placeholder="placeholderText"
+				:processing="processingMessage"
 			/>
-		</template>
-		<vega-chart v-else-if="lossChartSpec" :are-embed-actions-visible="false" :visualization-spec="lossChartSpec" />
-
+			<vega-chart v-if="lossChartSpec" :are-embed-actions-visible="false" :visualization-spec="lossChartSpec" />
+		</section>
 		<Button v-if="areInputsFilled" label="Open" @click="emit('open-drilldown')" severity="secondary" outlined />
-		<tera-operator-placeholder v-else :node="node">
-			Connect a model configuration and dataset
-		</tera-operator-placeholder>
 	</main>
 </template>
 
@@ -24,8 +20,6 @@
 import _ from 'lodash';
 import { computed, watch, ref, shallowRef, onMounted, toRef } from 'vue';
 import Button from 'primevue/button';
-
-import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
 import {
 	getRunResultCSV,
 	pollAction,
@@ -41,6 +35,7 @@ import { nodeMetadata, nodeOutputLabel } from '@/components/workflow/util';
 import { logger } from '@/utils/logger';
 import { Poller, PollerState } from '@/api/api';
 import type { WorkflowNode } from '@/types/workflow';
+import VegaChart from '@/components/widgets/VegaChart.vue';
 import {
 	CsvAsset,
 	Simulation,
@@ -54,7 +49,6 @@ import {
 } from '@/types/Types';
 import { createLLMSummary } from '@/services/summary-service';
 import { createForecastChart, AUTOSIZE } from '@/services/charts';
-import VegaChart from '@/components/widgets/VegaChart.vue';
 import * as stats from '@/utils/stats';
 import { createDatasetFromSimulationResult, getDataset } from '@/services/dataset';
 import { useProjects } from '@/composables/project';
@@ -92,7 +86,28 @@ const csvAsset = shallowRef<CsvAsset | undefined>(undefined);
 const groundTruth = computed<DataArray>(() => parseCsvAsset(csvAsset.value as CsvAsset));
 
 const areInputsFilled = computed(() => props.node.inputs[0].value && props.node.inputs[1].value);
-const inProgressCalibrationId = computed(() => props.node.state.inProgressCalibrationId);
+const isLoading = computed<boolean>(
+	() =>
+		props.node.state.inProgressCalibrationId !== '' ||
+		props.node.state.inProgressPreForecastId !== '' ||
+		props.node.state.inProgressForecastId !== ''
+);
+const placeholderText = computed(() => {
+	if (!areInputsFilled.value) {
+		return 'Connect a model configuration and dataset';
+	}
+	return undefined;
+});
+const processingMessage = computed(() => {
+	if (props.node.state.inProgressCalibrationId) {
+		return `Processing calibration... ${props.node.state.currentProgress}%`;
+	}
+	if (props.node.state.inProgressPreForecastId || props.node.state.inProgressForecastId) {
+		return 'Calibration complete. Running simulations';
+	}
+
+	return undefined;
+});
 
 const chartSize = { width: 180, height: 120 };
 
@@ -292,7 +307,6 @@ watch(
 
 			state.inProgressForecastId = '';
 			state.inProgressPreForecastId = '';
-			emit('update-state', state);
 
 			// Get the calibrate losses to generate a run summary
 			const calibrateResponse = await pollAction(state.calibrationId);
@@ -370,7 +384,7 @@ watch(
 				simulationId: state.calibrationId,
 				modelId: baseConfig.modelId,
 				observableSemanticList: _.cloneDeep(baseConfig.observableSemanticList),
-				parameterSemanticList: [],
+				parameterSemanticList: _.cloneDeep(baseConfig.parameterSemanticList),
 				initialSemanticList: _.cloneDeep(baseConfig.initialSemanticList),
 				inferredParameterList: inferredParameters,
 				temporary: true
@@ -381,6 +395,12 @@ watch(
 			const projectId = useProjects().activeProjectId.value;
 			const datasetResult = await createDatasetFromSimulationResult(projectId, state.forecastId, datasetName, false);
 			if (!datasetResult) {
+				state.errorMessage = {
+					name: 'Failed to create dataset',
+					value: '',
+					traceback: `Failed to create dataset from simulation result: ${state.forecastId}`
+				};
+				emit('update-state', state);
 				return;
 			}
 
@@ -394,18 +414,21 @@ watch(
 				mappedModelVariables
 			);
 
-			// const portLabel = props.node.inputs[0].label;
-			emit('append-output', {
-				type: CalibrationOperationCiemss.outputs[0].type,
-				label: nodeOutputLabel(props.node, `Calibration Result`),
-				value: [
-					{
-						modelConfigId: modelConfigResponse.id,
-						datasetId: datasetResult.id
-					}
-				],
-				state: _.omit(state, ['chartSettings'])
-			});
+			emit(
+				'append-output',
+				{
+					type: CalibrationOperationCiemss.outputs[0].type,
+					label: nodeOutputLabel(props.node, `Calibration Result`),
+					value: [
+						{
+							modelConfigId: modelConfigResponse.id,
+							datasetId: datasetResult.id
+						}
+					],
+					state: _.omit(state, ['chartSettings'])
+				},
+				state
+			);
 		}
 	},
 	{ immediate: true }
diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-node-ciemss.vue
index 1c9da28164..f069848ebf 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-node-ciemss.vue
@@ -257,7 +257,6 @@ watch(
 
 			state.inProgressForecastId = '';
 			state.inProgressPreForecastId = '';
-			emit('update-state', state);
 
 			const datasetName = `Forecast run ${state.postForecastId}`;
 			const projectId = useProjects().activeProjectId.value;
@@ -268,15 +267,25 @@ watch(
 				false
 			);
 			if (!datasetResult) {
+				state.errorMessage = {
+					name: 'Failed to create dataset',
+					value: '',
+					traceback: `Failed to create dataset from simulation result: ${state.postForecastId}`
+				};
+				emit('update-state', state);
 				return;
 			}
 
-			emit('append-output', {
-				type: CalibrateEnsembleCiemssOperation.outputs[0].type,
-				label: nodeOutputLabel(props.node, `Calibration Result`),
-				value: datasetResult.id,
-				state: _.omit(state, ['chartSettings'])
-			});
+			emit(
+				'append-output',
+				{
+					type: CalibrateEnsembleCiemssOperation.outputs[0].type,
+					label: nodeOutputLabel(props.node, `Calibration Result`),
+					value: datasetResult.id,
+					state: _.omit(state, ['chartSettings'])
+				},
+				state
+			);
 		}
 	},
 	{ immediate: true }
diff --git a/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue
index 2c5caa4a00..337af22f23 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/compare-datasets/tera-compare-datasets-drilldown.vue
@@ -83,6 +83,7 @@
 								placeholder="Dataset"
 							/>
 							<label class="mt-2"> Map column names for each input </label>
+							<label class="mt-1"> (This mapping just assists in making the WIS table appear) </label>
 							<DataTable class="mt-2" :value="knobs.mapping">
 								<Column v-if="datasets[groundTruthDatasetIndex]?.id" :header="datasets[groundTruthDatasetIndex].name">
 									<template #body="{ data }">
@@ -92,9 +93,11 @@
 											:options="
 												datasets[groundTruthDatasetIndex].columns
 													?.map((ele) => ele.name)
-													.filter((ele) => ele?.includes('mean'))
+													.filter((ele) => ele?.includes('mean') || ele?.includes('time'))
 											"
+											filter
 											placeholder="Variable"
+											@change="constructWisTable"
 										/>
 									</template>
 								</Column>
@@ -108,6 +111,7 @@
 											v-if="dataset.id"
 											class="mapping-dropdown"
 											placeholder="Variable"
+											filter
 											v-model="data[dataset.id]"
 											:options="
 												dataset.columns
@@ -120,6 +124,7 @@
 															!ele?.includes('max')
 													)
 											"
+											@change="constructWisTable"
 										/>
 									</template>
 								</Column>
@@ -237,7 +242,17 @@
 					<template v-else-if="knobs.selectedCompareOption === CompareValue.ERROR">
 						<AccordionTab header="Model error metrics" v-if="showWIS || showMAE">
 							<template v-if="showWIS">
-								<h5>Weighted interval score (WIS)</h5>
+								<header class="flex justify-content-between mb-2">
+									<h5>Weighted interval score (WIS)</h5>
+									<div class="flex gap-4">
+										<tera-checkbox
+											v-model="calculateWisByPercentage"
+											label="Calculate by percentage"
+											@change="constructWisTable"
+										/>
+										<tera-checkbox v-model="checkConsistency" label="Check consistency" @change="constructWisTable" />
+									</div>
+								</header>
 								<p class="mb-3">
 									The weighted interval score (WIS) measures the accuracy of a probabilistic forecasts relative to
 									observations (i.e. ground truth). <b>Low WIS values are better</b>, meaning the forecast performed
@@ -261,10 +276,14 @@
 									>
 										<template #body="{ data, field }">
 											<div class="flex gap-2" v-if="data[field]">
-												<div>{{ displayNumber(data[field]) }}</div>
-												<div v-if="showATEErrors" class="error ml-auto">
-													± {{ displayNumber(data[`${field}_error`]) }}
+												<div>
+													{{ displayNumber(data[field]) }}
+													<template v-if="calculateWisByPercentage">%</template>
 												</div>
+												<!-- TODO: I don't think there are errors based on the WIS code but they're in the design
+												  <div v-if="showATEErrors" class="error ml-auto">
+													± {{ displayNumber(data[`${field}_error`]) }}
+												</div> -->
 											</div>
 										</template>
 									</Column>
@@ -272,9 +291,11 @@
 										<template #body="{ data, field }">
 											<div class="flex gap-2">
 												<div>{{ displayNumber(data[field]) }}</div>
+												<template v-if="calculateWisByPercentage">%</template>
+												<!-- TODO: I don't think there are errors based on the WIS code but they're in the design
 												<div v-if="showATEErrors" class="error ml-auto">
 													± {{ displayNumber(data['overall_error']) }}
-												</div>
+												</div> -->
 											</div>
 										</template>
 									</Column>
@@ -333,7 +354,7 @@
 								($event) => {
 									updateChartSettings($event, ChartSettingType.VARIABLE);
 									constructATETable();
-									// constructWisTable();
+									constructWisTable();
 								}
 							"
 						>
@@ -374,6 +395,7 @@
 
 <script setup lang="ts">
 import { isEmpty, cloneDeep } from 'lodash';
+import { logger } from '@/utils/logger';
 import TeraDrilldown from '@/components/drilldown/tera-drilldown.vue';
 import { WorkflowNode } from '@/types/workflow';
 import TeraSliderPanel from '@/components/widgets/tera-slider-panel.vue';
@@ -399,7 +421,7 @@ import { useChartSettings } from '@/composables/useChartSettings';
 import { useDrilldownChartSize } from '@/composables/useDrilldownChartSize';
 import { useCharts, type ChartData } from '@/composables/useCharts';
 import { DataArray } from '@/services/models/simulation-service';
-import { mean, stddev, quantile } from '@/utils/stats';
+import { mean, stddev, computeQuantile, getWeightedIntervalScore } from '@/utils/stats';
 import { displayNumber } from '@/utils/number';
 import TeraCriteriaOfInterestCard from './tera-criteria-of-interest-card.vue';
 import {
@@ -440,7 +462,10 @@ const ateTable = ref<any[]>([]);
 const ateVariableHeaders = ref<string[]>([]);
 
 const showWIS = ref(true);
+const checkConsistency = ref(false);
 const wisTable = ref<any[]>([]);
+const calculateWisByPercentage = ref(true);
+const wisVariableHeaders = ref<string[]>([]);
 const showMAE = ref(false);
 
 const plotOptions = [
@@ -636,125 +661,21 @@ function addMapping() {
 		newMapping[id as string] = '';
 	});
 	knobs.value.mapping.push(newMapping);
+	constructWisTable();
 }
 
 function deleteMapRow(index: number) {
 	knobs.value.mapping.splice(index, 1);
+	constructWisTable();
 }
 
-// TODO: All WIS functions should probably be moved to a stats or util file and deserve some cleaning up
-function computeQuantile(values: number[], quantiles: number[]) {
-	// Compute the estimated quantiles from a time-series dataset with many samples.
-	//     Parameters
-	//     ------------
-	//     df: pandas.DataFrame
-	//         Dataset with columns named "timepoint_unknown" (contains timepoint values of given outcome variable) and an outcome variable name.
-	//     quantiles: iterable
-	//         List of alpha values for which quantiles are estimated from the sampled data points.
-	const quantileValueMap: Record<number, number> = {};
-	quantiles.forEach((q) => {
-		quantileValueMap[q] = quantile(values, q);
-	});
-	return quantileValueMap;
-}
-
-function intervalScore(
-	groundTruthObservations: Record<number, number>,
-	variableObservations: Record<number, number>,
-	alpha: number,
-	percent: boolean,
-	checkConsistency: boolean,
-	leftQuantile: number | null = null,
-	rightQuantile: number | null = null
-) {
-	if (!leftQuantile) {
-		leftQuantile = variableObservations[alpha / 2];
-	}
-	if (!rightQuantile) {
-		rightQuantile = variableObservations[1 - alpha / 2];
-	}
-
-	if (checkConsistency && leftQuantile > rightQuantile) {
-		throw new Error('Left quantile must be smaller than right quantile.');
-	}
-
-	let sharpness = rightQuantile - leftQuantile;
-
-	let calibration = Object.values(groundTruthObservations).map((obs) => {
-		const leftClip = Math.max(0, leftQuantile - obs);
-		const rightClip = Math.max(0, obs - rightQuantile);
-		return ((leftClip + rightClip) * 2) / alpha;
-	});
-
-	if (percent) {
-		sharpness /= mean(Object.values(groundTruthObservations));
-		// sharpness = sharpness / observations.map((obs) => Math.abs(obs));
-		calibration = calibration.map((cal, index) => cal / Math.abs(groundTruthObservations[index]));
-	}
-
-	const total = calibration.map((cal) => cal + sharpness);
-
-	return { total, sharpness, calibration };
-}
-
-function weightedIntervalScore(
-	groundTruthObservations: Record<number, number>,
-	variableObservations: Record<number, number>,
-	alphas: number[],
-	weights: number[],
-	percent: boolean = false,
-	checkConsistency: boolean = true
-) {
-	if (isEmpty(weights)) {
-		weights = alphas.map((alpha) => alpha / 2);
-	}
-
-	// Helper function to weigh scores
-	function weighScores(tupleIn, weight) {
-		return [tupleIn[0] * weight, tupleIn[1] * weight, tupleIn[2] * weight];
-	}
-
-	// Calculate interval scores for each alpha and weight
-	const intervalScores = alphas.map((alpha, index) => {
-		const { total, sharpness, calibration } = intervalScore(
-			groundTruthObservations,
-			variableObservations,
-			alpha,
-			percent,
-			checkConsistency
-		);
-		return weighScores([total, sharpness, calibration], weights[index]);
-	});
-
-	// Transpose the result to sum across different alphas
-	const summedScores = intervalScores.reduce(
-		(acc: any, scoreTuple) => {
-			scoreTuple.forEach((score, idx) => {
-				acc[idx].push(score);
-			});
-			return acc;
-		},
-		[[], [], []]
-	);
-
-	const [totalScores, sharpnessScores, calibrationScores] = summedScores;
-
-	// Sum the scores across all alphas and normalize by the sum of the weights
-	const total = totalScores.reduce((sum, val) => sum + val, 0) / weights.reduce((sum, val) => sum + val, 0);
-	const sharpness = sharpnessScores.reduce((sum, val) => sum + val, 0) / weights.reduce((sum, val) => sum + val, 0);
-	const calibration = calibrationScores.reduce((sum, val) => sum + val, 0) / weights.reduce((sum, val) => sum + val, 0);
-
-	return { total, sharpness, calibration };
-}
-
+// TODO: Investigate sharing similar logic between constructing ate and wis tables since they are very similar
+// It may or may not be a good idea
 function constructWisTable() {
-	const DEFAULT_ALPHA_QS = [
-		0.01, 0.025, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9,
-		0.95, 0.975, 0.99
-	];
-
 	wisTable.value = [];
+	wisVariableHeaders.value = [];
 
+	let isConsistent = true;
 	const observationsMap: Record<number, number> = {};
 	const variableToTypeMap: Record<string, string> = {};
 
@@ -768,7 +689,7 @@ function constructWisTable() {
 					if (key.includes(variableName)) {
 						if (!variableToTypeMap[variableName]) {
 							variableToTypeMap[variableName] = key.includes('_observable_state_') ? '_observable_state_' : '_state_';
-							ateVariableHeaders.value.push(variableName);
+							wisVariableHeaders.value.push(variableName);
 						}
 						return true;
 					}
@@ -777,8 +698,7 @@ function constructWisTable() {
 			) {
 				return;
 			}
-			const values = summaryResult.map((row) => row[key]);
-			const observations = computeQuantile(values, DEFAULT_ALPHA_QS);
+			const observations = computeQuantile(summaryResult, key);
 			observationsMap[key] = observations;
 		});
 	});
@@ -811,20 +731,28 @@ function constructWisTable() {
 				});
 			}
 
-			const wis = weightedIntervalScore(
+			const wis = getWeightedIntervalScore(
 				observationsMap[groundTruthKey],
 				observationsMap[key],
-				[0.02, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9],
-				[],
-				true
+				calculateWisByPercentage.value,
+				checkConsistency.value
 			);
 
-			wisRow[variableName] = wis.total;
-			wisValues.push(wis.total);
+			if (!isConsistent) {
+				isConsistent = wis.isConsistent;
+			}
+
+			const totalMean = mean(wis.total);
+			wisRow[variableName] = totalMean;
+			wisValues.push(totalMean);
 		});
 		wisRow.overall = mean(wisValues);
 		wisTable.value.push({ modelName: dataset.name, ...wisRow });
 	});
+
+	if (!isConsistent) {
+		logger.error('Left quantile must be smaller than right quantile. Datasets are not ideal for WIS calculation.');
+	}
 }
 
 onMounted(async () => {
@@ -853,7 +781,8 @@ onMounted(async () => {
 	constructATETable();
 
 	if (isEmpty(knobs.value.mapping)) addMapping();
-	if (false) constructWisTable();
+
+	constructWisTable();
 });
 
 watch(
diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config-drilldown.vue
index a15b8cff77..587ff74a32 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config-drilldown.vue
@@ -536,16 +536,15 @@ const amrParameters = ref<ModelParameter[]>([]);
 const getMissingInputsMessage = (amount, total) => {
 	if (!total) return '';
 	const percent = (amount / total) * 100;
-	return amount ? `Missing values: ${amount}/${total} (${percent.toFixed(0)}%)` : '';
+	return amount ? `Missing values: ${amount} of ${total} (${percent.toFixed(0)}%)` : '';
 };
 
 const missingInputCount = (modelConfiguration: ModelConfiguration) => {
 	if (selectedConfigId.value === modelConfiguration.id) {
 		return selectedConfigMissingInputCount.value;
 	}
-	const inferredParameterList = modelConfiguration.inferredParameterList?.length ?? 0;
 	const total = amrInitials.value.length + amrParameters.value.length;
-	const amount = total - getTotalInput(modelConfiguration) - inferredParameterList;
+	const amount = total - getTotalInput(modelConfiguration);
 	return getMissingInputsMessage(amount, total);
 };
 
diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-configuration-item.vue b/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-configuration-item.vue
index 642d7b8133..f25f8d23d3 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-configuration-item.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-configuration-item.vue
@@ -14,7 +14,7 @@
 		/>
 		<p class="constrain-width">{{ configuration.description }}</p>
 		<p>{{ formatTimestamp(configuration.createdOn) }}</p>
-		<span v-if="emptyInputCount" :class="{ 'input-count': emptyInputCount }">{{ emptyInputCount }}</span>
+		<div v-if="emptyInputCount" class="input-count">{{ emptyInputCount }}</div>
 	</div>
 </template>
 
@@ -122,10 +122,6 @@ span {
 	color: var(--text-color-subdued);
 	font-size: var(--font-caption);
 	padding-right: var(--gap-6);
-
-	&.input-count {
-		background-color: var(--error-background);
-	}
 }
 span {
 	padding-right: unset;
@@ -141,4 +137,17 @@ p + p {
 	word-break: break-word; /* For compatibility */
 	max-width: 100%; /* Ensures the text stays within container */
 }
+
+.input-count {
+	padding: var(--gap-1) var(--gap-2);
+	border-radius: var(--border-radius);
+	margin-top: var(--gap-2);
+	width: fit-content;
+	font-size: var(--font-caption);
+	background-color: var(--error-background);
+	border: 1px solid var(--error-color);
+}
+.input-count:hover {
+	background-color: var(--error-background);
+}
 </style>
diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-from-equations/tera-model-from-equations-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/model-from-equations/tera-model-from-equations-drilldown.vue
index a5c24a840f..94bf92f127 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/model-from-equations/tera-model-from-equations-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/model-from-equations/tera-model-from-equations-drilldown.vue
@@ -477,10 +477,8 @@ const onSelection = (id: string) => {
 };
 
 function onCheckBoxChange(equation) {
-	const state = cloneDeep(props.node.state);
-	const index = state.equations.findIndex((e) => e.name === equation.name);
-	state.equations[index].includeInProcess = equation.includeInProcess;
-	emit('update-state', state);
+	const index = clonedState.value.equations.findIndex((e) => e.name === equation.name);
+	clonedState.value.equations[index].includeInProcess = equation.includeInProcess;
 }
 
 async function onRun(extractionService: 'mira' | 'skema' = 'skema') {
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 024028d23d..e7885f0fe1 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
@@ -245,7 +245,6 @@ Provide a consis summary in 100 words or less.
 			state.inProgressPostForecastId = '';
 			state.postForecastRunId = postSimId;
 			state.currentProgress = 0;
-			emit('update-state', state);
 
 			const datasetName = `Forecast run ${state.postForecastRunId}`;
 			const projectId = useProjects().activeProjectId.value;
@@ -256,21 +255,31 @@ Provide a consis summary in 100 words or less.
 				false
 			);
 			if (!datasetResult) {
+				state.simulateErrorMessage = {
+					name: 'Failed to create dataset',
+					value: '',
+					traceback: `Failed to create dataset from simulation result: ${state.postForecastRunId}`
+				};
+				emit('update-state', state);
 				return;
 			}
 
-			emit('append-output', {
-				type: OptimizeCiemssOperation.outputs[0].type,
-				label: nodeOutputLabel(props.node, `Optimize output`),
-				value: [
-					{
-						policyInterventionId: state.optimizedInterventionPolicyId,
-						datasetId: datasetResult.id
-					}
-				],
-				isSelected: false,
-				state: _.omit(state, ['chartSettings'])
-			});
+			emit(
+				'append-output',
+				{
+					type: OptimizeCiemssOperation.outputs[0].type,
+					label: nodeOutputLabel(props.node, `Optimize output`),
+					value: [
+						{
+							policyInterventionId: state.optimizedInterventionPolicyId,
+							datasetId: datasetResult.id
+						}
+					],
+					isSelected: false,
+					state: _.omit(state, ['chartSettings'])
+				},
+				state
+			);
 		} else {
 			// Simulation Failed:
 			const state = _.cloneDeep(props.node.state);
diff --git a/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-ciemss-drilldown.vue
index 42fda40033..75aacef71a 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-ciemss-drilldown.vue
@@ -329,17 +329,19 @@
 				<template #content>
 					<div class="output-settings-panel">
 						<!-- Intervention charts -->
-						<tera-chart-settings
-							:title="'Interventions over time'"
-							:settings="chartSettings"
-							:type="ChartSettingType.INTERVENTION"
-							:select-options="Object.keys(groupedInterventionOutputs)"
-							:selected-options="selectedInterventionSettings.map((s) => s.selectedVariables[0])"
-							@open="setActiveChartSettings($event)"
-							@remove="removeChartSettings"
-							@selection-change="updateChartSettings"
-						/>
-						<Divider />
+						<div v-if="interventionPolicy">
+							<tera-chart-settings
+								:title="'Interventions over time'"
+								:settings="chartSettings"
+								:type="ChartSettingType.INTERVENTION"
+								:select-options="Object.keys(groupedInterventionOutputs)"
+								:selected-options="selectedInterventionSettings.map((s) => s.selectedVariables[0])"
+								@open="setActiveChartSettings($event)"
+								@remove="removeChartSettings"
+								@selection-change="updateChartSettings"
+							/>
+							<Divider />
+						</div>
 						<!-- Variable charts -->
 						<tera-chart-settings
 							:title="'Variables over time'"
@@ -902,6 +904,17 @@ watch(
 	{ immediate: true }
 );
 
+// Watch for run results and open settings panel if no charts are configured
+watch(
+	[() => runResults.value[selectedRunId.value], () => chartSettings.value],
+	([results, settings]) => {
+		if (results && (!settings || isEmpty(settings))) {
+			isOutputSettingsPanelOpen.value = true;
+		}
+	},
+	{ immediate: true }
+);
+
 onMounted(() => {
 	buildJupyterContext();
 });
diff --git a/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-node-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-node-ciemss.vue
index 41ddf6347e..45152df935 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-node-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-node-ciemss.vue
@@ -76,27 +76,40 @@ const pollResult = async (runId: string) => {
 	return pollerResults;
 };
 
-const processResult = async (simulationId: string) => {
+const processResult = async () => {
 	const portLabel = props.node.inputs[0].label;
 	const state = _.cloneDeep(props.node.state);
+	state.errorMessage = { name: '', value: '', traceback: '' };
+	state.forecastId = state.inProgressForecastId;
+	state.inProgressForecastId = '';
+	const simulationId = state.forecastId;
 	if (state.chartConfigs.length === 0) {
 		chartProxy.addChart();
 	}
-
 	const datasetName = `Forecast run ${simulationId}`;
 	const projectId = useProjects().activeProjectId.value;
 	const datasetResult = await createDatasetFromSimulationResult(projectId, simulationId, datasetName, false);
 	if (!datasetResult) {
+		state.errorMessage = {
+			name: 'Failed to create dataset',
+			value: '',
+			traceback: `Failed to create dataset from simulation result: ${simulationId}`
+		};
+		emit('update-state', state);
 		return;
 	}
 
-	emit('append-output', {
-		type: SimulateEnsembleCiemssOperation.outputs[0].type,
-		label: nodeOutputLabel(props.node, `${portLabel} Result`),
-		value: [datasetResult.id],
-		state: _.omit(state, ['chartSettings']),
-		isSelected: false
-	});
+	emit(
+		'append-output',
+		{
+			type: SimulateEnsembleCiemssOperation.outputs[0].type,
+			label: nodeOutputLabel(props.node, `${portLabel} Result`),
+			value: [datasetResult.id],
+			state: _.omit(state, ['chartSettings']),
+			isSelected: false
+		},
+		state
+	);
 };
 
 watch(
@@ -116,12 +129,7 @@ watch(
 
 		const response = await pollResult(id);
 		if (response?.state === PollerState.Done) {
-			const state = _.cloneDeep(props.node.state);
-			state.errorMessage = { name: '', value: '', traceback: '' };
-			state.inProgressForecastId = '';
-			state.forecastId = id;
-			emit('update-state', state);
-			await processResult(id);
+			processResult();
 		}
 	},
 	{ immediate: true }
diff --git a/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/stratify-mira-operation.ts b/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/stratify-mira-operation.ts
index eaf4da528d..d79d269364 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/stratify-mira-operation.ts
+++ b/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/stratify-mira-operation.ts
@@ -28,6 +28,7 @@ export interface StratifyOperationStateMira extends BaseState {
 	strataGroup: StratifyGroup;
 	strataCodeHistory: StratifyCode[];
 	hasCodeBeenRun: boolean;
+	baseModelId: string;
 }
 
 export const blankStratifyGroup: StratifyGroup = {
@@ -68,7 +69,8 @@ export const StratifyMiraOperation: Operation = {
 		const init: StratifyOperationStateMira = {
 			strataGroup: blankStratifyGroup,
 			strataCodeHistory: [],
-			hasCodeBeenRun: false
+			hasCodeBeenRun: false,
+			baseModelId: ''
 		};
 		return init;
 	}
diff --git a/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-drilldown.vue
index 54f4802388..6bb8fad328 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-drilldown.vue
@@ -105,7 +105,6 @@ import TeraProgressSpinner from '@/components/widgets/tera-progress-spinner.vue'
 import TeraStratificationGroupForm from '@/components/workflow/ops/stratify-mira/tera-stratification-group-form.vue';
 import { KernelSessionManager } from '@/services/jupyter';
 import { createModelFromOld, getModel } from '@/services/model';
-import { getModelIdFromModelConfigurationId } from '@/services/model-configurations';
 import type { Model } from '@/types/Types';
 import { AMRSchemaNames } from '@/types/common';
 import { OperatorStatus, WorkflowNode } from '@/types/workflow';
@@ -326,15 +325,7 @@ const getStatesAndParameters = (amrModel: Model) => {
 };
 
 const inputChangeHandler = async () => {
-	const input = props.node.inputs[0];
-	if (!input) return;
-
-	let modelId: string | null = null;
-	if (input.type === 'modelId') {
-		modelId = input.value?.[0];
-	} else if (input.type === 'modelConfigId') {
-		modelId = await getModelIdFromModelConfigurationId(input.value?.[0]);
-	}
+	const modelId = props.node.state.baseModelId;
 	if (!modelId) return;
 
 	amr.value = await getModel(modelId);
@@ -465,7 +456,7 @@ watch(
 
 // Set model, modelNodeOptions
 watch(
-	() => props.node.inputs[0],
+	() => props.node.state.baseModelId,
 	async () => {
 		await inputChangeHandler();
 	},
diff --git a/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-node.vue b/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-node.vue
index cc50ddbbb0..58944e4afa 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-node.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-node.vue
@@ -15,9 +15,10 @@ import { WorkflowNode } from '@/types/workflow';
 import TeraOperatorPlaceholder from '@/components/operator/tera-operator-placeholder.vue';
 import TeraModelDiagram from '@/components/model/petrinet/tera-model-diagram.vue';
 import Button from 'primevue/button';
-import { getModel } from '@/services/model';
+import { getModel, createModel } from '@/services/model';
+import { getModelConfigurationById, getAsConfiguredModel } from '@/services/model-configurations';
 import { Model } from '@/types/Types';
-import { getModelIdFromModelConfigurationId } from '@/services/model-configurations';
+// import { useProjects } from '@/composables/project';
 import { StratifyOperationStateMira, StratifyMiraOperation } from './stratify-mira-operation';
 
 const emit = defineEmits(['open-drilldown', 'append-output']);
@@ -27,31 +28,57 @@ const props = defineProps<{
 	node: WorkflowNode<StratifyOperationStateMira>;
 }>();
 
+// /models/from-model-configuration/:config-id
+
 watch(
 	() => props.node.inputs,
 	async () => {
 		const input = props.node.inputs[0];
 		// Create a default if we dont have an output yet:
-		if (input && !props.node.outputs[0].value) {
-			let modelId: string | null = null;
+		// if (input && !props.node.outputs[0].value) {
+		if (input && input.value) {
+			let baseModelId = '';
+
 			if (input.type === 'modelId') {
-				modelId = input.value?.[0];
+				baseModelId = input.value[0];
 			} else if (input.type === 'modelConfigId') {
-				modelId = await getModelIdFromModelConfigurationId(input.value?.[0]);
+				const modelConfigId = input.value?.[0];
+
+				const modelConfiguration = await getModelConfigurationById(modelConfigId);
+				const model = (await getAsConfiguredModel(modelConfigId)) as Model;
+
+				// Mark the model as orginating from the config
+				model.temporary = true;
+				model.name += ` (${modelConfiguration.name})`;
+				model.header.name = model.name as string;
+
+				const res = await createModel(model);
+				if (res) {
+					baseModelId = res.id as string;
+				}
+				// await useProjects().addAsset(AssetType.Model, baseModelId, useProjects().activeProject.value?.id);
 			}
-			if (!modelId) return;
+			if (!baseModelId) return;
 
-			const model = await getModel(modelId);
+			const model = await getModel(baseModelId);
 			const modelName = model?.name;
-			emit('append-output', {
-				type: StratifyMiraOperation.outputs[0].type,
-				label: modelName ?? 'Default Model',
-				value: modelId,
-				state: {
-					strataGroup: cloneDeep(props.node.state.strataGroup),
-					strataCodeHistory: cloneDeep(props.node.state.strataCodeHistory)
-				}
-			});
+
+			const state = cloneDeep(props.node.state);
+			state.baseModelId = baseModelId;
+
+			emit(
+				'append-output',
+				{
+					type: StratifyMiraOperation.outputs[0].type,
+					label: modelName ?? 'Default Model',
+					value: baseModelId,
+					state: {
+						strataGroup: cloneDeep(props.node.state.strataGroup),
+						strataCodeHistory: cloneDeep(props.node.state.strataCodeHistory)
+					}
+				},
+				state
+			);
 		}
 	},
 	{ deep: true }
diff --git a/packages/client/hmi-client/src/components/workflow/tera-workflow-annotation.vue b/packages/client/hmi-client/src/components/workflow/tera-workflow-annotation.vue
index 22b104be4a..8be458de57 100644
--- a/packages/client/hmi-client/src/components/workflow/tera-workflow-annotation.vue
+++ b/packages/client/hmi-client/src/components/workflow/tera-workflow-annotation.vue
@@ -5,9 +5,8 @@
 		class="wf-annotation"
 		:style="{ fontSize: annotationRef.textSize + 'px' }"
 		@dblclick.stop="edit"
-	>
-		{{ annotationRef.content }}
-	</div>
+		v-html="formattedContent"
+	></div>
 	<!-- Editing view -->
 	<div v-else class="wf-annotation-editing">
 		<textarea
@@ -81,7 +80,7 @@
 <script setup lang="ts">
 import Button from 'primevue/button';
 import { WorkflowAnnotation } from '@/types/workflow';
-import { ref } from 'vue';
+import { ref, nextTick, computed } from 'vue';
 
 const props = defineProps<{
 	annotation: WorkflowAnnotation;
@@ -89,21 +88,38 @@ const props = defineProps<{
 
 const annotationRef = ref<WorkflowAnnotation>(props.annotation);
 const isEditing = ref(false);
-const defaultContent = props.annotation.content;
 
 const emit = defineEmits(['update-annotation', 'remove-annotation']);
 
 const reset = () => {
 	isEditing.value = false;
-	annotationRef.value.content = defaultContent;
+	annotationRef.value.content = annotationContentBackup.value || defaultPlaceholder;
 };
 
+const defaultPlaceholder = 'Double click to edit...';
+const annotationContentBackup = ref<string | null>(null);
+
 const edit = () => {
-	isEditing.value = !isEditing.value;
+	// Backup current content to handle cancelation
+	annotationContentBackup.value = annotationRef.value.content;
+
+	if (annotationRef.value.content === defaultPlaceholder) {
+		annotationRef.value.content = '';
+	}
+
+	isEditing.value = true;
 	autoResize();
+	nextTick(() => {
+		textarea.value?.focus();
+	});
 };
 
 const update = () => {
+	/* Reset to default placeholder if content is empty */
+	if (!annotationRef.value.content.trim()) {
+		annotationRef.value.content = defaultPlaceholder;
+	}
+
 	emit('update-annotation', annotationRef.value);
 	isEditing.value = false;
 };
@@ -133,6 +149,9 @@ const autoResize = () => {
 		element.style.height = `${element.scrollHeight}px`;
 	}
 };
+
+/* display newline characters as line breaks */
+const formattedContent = computed(() => annotationRef.value.content.replace(/\n/g, '<br>'));
 </script>
 
 <style scoped>
@@ -158,11 +177,25 @@ const autoResize = () => {
 }
 .wf-annotation-editing .text-area {
 	width: 100%;
-	padding: var(--gap-4);
-	border: 1px solid var(--primary-color);
+	padding: 10px 14px;
+	min-height: 40px;
+	border: 2px solid var(--primary-color);
 	border-radius: var(--border-radius);
 	font-family: var(--font-family);
 }
+
+/* Floating toolbar */
+@keyframes fadeInUp {
+	0% {
+		opacity: 0;
+		transform: translateY(10px);
+	}
+	100% {
+		opacity: 1;
+		transform: translateY(0);
+	}
+}
+
 .wf-annotation-editing .floating-toolbar {
 	position: absolute;
 	background: var(--surface-highlight);
@@ -174,5 +207,9 @@ const autoResize = () => {
 	display: flex;
 	gap: var(--gap-2);
 	justify-content: space-between;
+
+	/* Animation */
+	animation: fadeInUp 0.3s ease forwards;
+	opacity: 0;
 }
 </style>
diff --git a/packages/client/hmi-client/src/composables/useCharts.ts b/packages/client/hmi-client/src/composables/useCharts.ts
index 79ae6e3155..88da43dd6e 100644
--- a/packages/client/hmi-client/src/composables/useCharts.ts
+++ b/packages/client/hmi-client/src/composables/useCharts.ts
@@ -20,7 +20,12 @@ import {
 	createSensitivityRankingChart
 } from '@/services/charts';
 import { flattenInterventionData } from '@/services/intervention-policy';
-import { DataArray, extractModelConfigIdsInOrder, extractModelConfigIds } from '@/services/models/simulation-service';
+import {
+	DataArray,
+	extractModelConfigIdsInOrder,
+	extractModelConfigIds,
+	processAndSortSamplesByTimepoint
+} from '@/services/models/simulation-service';
 import {
 	ChartSetting,
 	ChartSettingComparison,
@@ -47,7 +52,7 @@ import { getModelConfigName } from '@/services/model-configurations';
 import { EnsembleErrorData } from '@/components/workflow/ops/calibrate-ensemble-ciemss/calibrate-ensemble-util';
 import { PlotValue } from '@/components/workflow/ops/compare-datasets/compare-datasets-operation';
 import { DATASET_VAR_NAME_PREFIX } from '@/services/dataset';
-import { calculatePercentage, calculatePercentages, sumArrays } from '@/utils/math';
+import { calculatePercentage } from '@/utils/math';
 import { pythonInstance } from '@/python/PyodideController';
 import { useChartAnnotations } from './useChartAnnotations';
 
@@ -117,21 +122,19 @@ const addModelConfigNameToTranslationMap = (
 
 /**
  * Calculate the extent of the y-axis based on the provided result summary and variables.
- * @param resultSummary The result summary data array.
+ * @param result The result data array.
  * @param variables The list of variables to calculate the extent for.
  * @returns The extent of the y-axis as a tuple of [min, max].
  */
-const calculateYExtent = (resultSummary: DataArray, variables: string[], includeBeforeValues = false) => {
+const calculateYExtent = (result: DataArray, variables: string[], includeBeforeValues = false) => {
 	const extent: [number, number] = [Infinity, -Infinity];
-	resultSummary.forEach((row) => {
+	result.forEach((row) => {
 		variables.forEach((variable) => {
-			const minVarName = `${variable}_min`;
-			const maxVarName = `${variable}_max`;
-			extent[0] = Math.min(extent[0], row[minVarName]);
-			extent[1] = Math.max(extent[1], row[maxVarName]);
+			extent[0] = Math.min(extent[0], row[variable]);
+			extent[1] = Math.max(extent[1], row[variable]);
 			if (includeBeforeValues) {
-				extent[0] = Math.min(extent[0], row[`${minVarName}:pre`]);
-				extent[1] = Math.max(extent[1], row[`${maxVarName}:pre`]);
+				extent[0] = Math.min(extent[0], row[`${variable}:pre`]);
+				extent[1] = Math.max(extent[1], row[`${variable}:pre`]);
 			}
 		});
 	});
@@ -161,27 +164,31 @@ const normalizeStratifiedModelChartData = (setting: ChartSettingComparison, data
 
 	const includeBeforeData = setting.showBeforeAfter && setting.smallMultiples;
 
-	// If show quantiles is on,  normalize group by timepoint data
-	if (setting.showQuantiles) {
-		const resultGroupByTimepoint: GroupedDataArray = [];
-		(data.resultGroupByTimepoint ?? []).forEach((row) => {
+	const normalizeSampleData = () => {
+		const result: DataArray = [];
+		data.result.forEach((row) => {
 			const newEntry = { timepoint_id: row.timepoint_id, sample_id: row.sample_id };
 			Object.entries(selectedVariablesGroupByStrata).forEach(([group, variables]) => {
-				// Sum all values for the variables in the same strata group
-				const denominatorValues = sumArrays(...allVariablesGroupByStrata[group].map((v) => row[data.pyciemssMap[v]]));
+				const denominator = allVariablesGroupByStrata[group].reduce((acc, v) => acc + row[data.pyciemssMap[v]], 0);
 				variables
 					.map((v) => data.pyciemssMap[v])
 					.forEach((variable) => {
-						newEntry[variable] = !group ? row[variable] : calculatePercentages(row[variable], denominatorValues);
+						newEntry[variable] = !group ? row[variable] : calculatePercentage(row[variable], denominator);
 						if (includeBeforeData) {
 							newEntry[`${variable}:pre`] = !group
 								? row[variable]
-								: calculatePercentages(row[`${variable}:pre`], denominatorValues);
+								: calculatePercentage(row[`${variable}:pre`], denominator);
 						}
 					});
 			});
-			resultGroupByTimepoint.push(newEntry);
+			result.push(newEntry);
 		});
+		return result;
+	};
+
+	// If show quantiles is on,  normalize group by timepoint data
+	if (setting.showQuantiles) {
+		const resultGroupByTimepoint = processAndSortSamplesByTimepoint(normalizeSampleData());
 		return { ...data, resultGroupByTimepoint };
 	}
 	// Else, normalize result and resultSummary data
@@ -209,24 +216,7 @@ const normalizeStratifiedModelChartData = (setting: ChartSettingComparison, data
 	});
 
 	// Normalize sample data
-	const result: DataArray = [];
-	data.result.forEach((row) => {
-		const newEntry = { timepoint_id: row.timepoint_id, sample_id: row.sample_id };
-		Object.entries(selectedVariablesGroupByStrata).forEach(([group, variables]) => {
-			const denominator = allVariablesGroupByStrata[group].reduce((acc, v) => acc + row[data.pyciemssMap[v]], 0);
-			variables
-				.map((v) => data.pyciemssMap[v])
-				.forEach((variable) => {
-					newEntry[variable] = !group ? row[variable] : calculatePercentage(row[variable], denominator);
-					if (includeBeforeData) {
-						newEntry[`${variable}:pre`] = !group
-							? row[variable]
-							: calculatePercentage(row[`${variable}:pre`], denominator);
-					}
-				});
-		});
-		result.push(newEntry);
-	});
+	const result = normalizeSampleData();
 	return { ...data, result, resultSummary };
 };
 
@@ -693,7 +683,7 @@ export function useCharts(
 				if (setting.smallMultiples && setting.selectedVariables.length > 1 && !isNodeChart) {
 					const sharedYExtent = setting.shareYAxis
 						? calculateYExtent(
-								resultSummary,
+								result,
 								selectedVars.map((v) => chartData.value?.pyciemssMap[v] ?? ''),
 								Boolean(setting.showBeforeAfter)
 							)
@@ -1129,18 +1119,18 @@ export function useCharts(
 			Record<string, { lineChart: VisualizationSpec; scatterChart: VisualizationSpec; rankingChart: VisualizationSpec }>
 		>({});
 		const sensitivityDataLoading = ref(false);
-		let rankingScores: Map<string, Map<string, number>> = new Map();
+		const rankingScores = ref<Map<string, Map<string, number>>>(new Map());
+		const timepoint = ref(0);
 
 		const fetchSensitivityData = async () => {
 			// pick the first setting's timepoint for now
-			const timepoint = chartSettings.value[0].timepoint;
 			const { result } = chartData.value as ChartData;
-			const sliceData = result.filter((d: any) => d.timepoint_id === timepoint) as any[];
+			const sliceData = result.filter((d) => d.timepoint_id === timepoint.value);
 			// Translate names ahead of time, because we can't seem to customize titles
 			// in vegalite with repeat
 			const translationMap = chartData.value?.translationMap;
-			const sliceDataTranslated = sliceData.map((obj: any) => {
-				const r: any = {};
+			const sliceDataTranslated = sliceData.map((obj) => {
+				const r = {};
 				Object.keys(obj).forEach((key) => {
 					if (translationMap && translationMap[key]) {
 						const newKey = translationMap[key];
@@ -1172,7 +1162,7 @@ export function useCharts(
 				options.title = `${settings.selectedVariables[0]} sensitivity`;
 				options.legendProperties = { direction: 'vertical', columns: 1, labelLimit: 500 };
 
-				const rankingSpec = createSensitivityRankingChart(rankingScores.get(selectedVariable)!, options);
+				const rankingSpec = createSensitivityRankingChart(rankingScores.value.get(selectedVariable)!, options);
 
 				const lineSpec = createForecastChart(
 					{
@@ -1228,7 +1218,7 @@ export function useCharts(
 				}
 
 				// Add sensitivity annotation
-				const annotation = createForecastChartAnnotation('x', timepoint, 'Sensitivity analysis', true);
+				const annotation = createForecastChartAnnotation('x', timepoint.value, 'Sensitivity analysis', true);
 				lineSpec.layer[0].layer.push(annotation.layerSpec);
 
 				const spec = createSimulateSensitivityScatter(
@@ -1260,15 +1250,19 @@ export function useCharts(
 			const allSelectedVariables = chartSettings.value.map(
 				(s) => chartData.value?.pyciemssMap[s.selectedVariables[0]] || s.selectedVariables[0]
 			);
-			// only run if the ranking scores keys are not equal to the selectedVariables
+
+			// only run if the ranking scores if keys are not equal to the selectedVariables or timepoint has changed
 			const hasAllScores =
-				allSelectedVariables.every((v) => rankingScores.has(v)) &&
-				Array.from(rankingScores.keys()).every((k) => allSelectedVariables.includes(k));
-			if (!hasAllScores) {
-				const timepoint = chartSettings.value[0].timepoint;
+				allSelectedVariables.every((v) => rankingScores.value.has(v)) &&
+				Array.from(rankingScores.value.keys()).every((k) => allSelectedVariables.includes(k));
+
+			const hasTimepointChanged = timepoint.value !== chartSettings.value[0].timepoint;
+			timepoint.value = chartSettings.value[0].timepoint;
+
+			if (!hasAllScores || hasTimepointChanged) {
 				const allParameters = model?.value?.semantics?.ode.parameters?.map((p) => p.id) ?? [];
-				const sliceData = chartData.value.result.filter((d) => d.timepoint_id === timepoint);
-				rankingScores = await pythonInstance.getRankingScores(sliceData, allSelectedVariables, allParameters);
+				const sliceData = chartData.value.result.filter((d) => d.timepoint_id === timepoint.value);
+				rankingScores.value = await pythonInstance.getRankingScores(sliceData, allSelectedVariables, allParameters);
 			}
 			fetchSensitivityData();
 			sensitivityDataLoading.value = false;
diff --git a/packages/client/hmi-client/src/services/charts.ts b/packages/client/hmi-client/src/services/charts.ts
index b38a81fdec..354a8251eb 100644
--- a/packages/client/hmi-client/src/services/charts.ts
+++ b/packages/client/hmi-client/src/services/charts.ts
@@ -1339,10 +1339,39 @@ export function createSimulateSensitivityScatter(samplingLayer: SensitivityChart
 /* -------------------------------------------------------------------------- */
 
 export function createSensitivityRankingChart(data: Map<string, number>, options: BaseChartOptions) {
+	// use only 20 highest scores
+	const parametersShownCount = 20;
+	const foramttedData = Array.from(data)
+		.map(([parameter, score]) => ({ parameter, score }))
+		.filter((d) => d.score !== 0)
+		.sort((a, b) => Math.abs(b.score) - Math.abs(a.score))
+		.slice(0, parametersShownCount);
+
+	let title = '';
+	if (foramttedData.length === parametersShownCount) {
+		title = `Top ${parametersShownCount} most sensitive parameters displayed.`;
+	}
+	const notShownCount = data.size - foramttedData.length;
+	if (title && notShownCount > 0) title += ` ${notShownCount} parameters not shown.`;
+
+	const globalFont = 'Figtree';
+
 	const spec: any = {
 		$schema: VEGALITE_SCHEMA,
+		config: {
+			font: globalFont,
+			bar: {
+				discreteBandSize: 8 // Fixed bar width
+			}
+		},
+		title: {
+			text: title,
+			anchor: 'start',
+			subtitle: ' ',
+			subtitlePadding: 0
+		},
 		description: 'Sensitivity score ranking chart',
-		data: { values: Array.from(data).map(([parameter, score]) => ({ parameter, score })) },
+		data: { values: foramttedData },
 		transform: [
 			{
 				calculate: 'abs(datum.score)',
@@ -1350,10 +1379,13 @@ export function createSensitivityRankingChart(data: Map<string, number>, options
 			}
 		],
 		width: options.width,
+		autosize: {
+			type: options.autosize ?? AUTOSIZE.FIT_X
+		},
 		mark: { type: 'bar' },
 		layer: [
 			{
-				mark: { type: 'bar', height: 10 },
+				mark: { type: 'bar' },
 				encoding: {
 					x: {
 						field: 'score',
diff --git a/packages/client/hmi-client/src/services/graph.ts b/packages/client/hmi-client/src/services/graph.ts
index 12f21d30fa..3e2bdd4980 100644
--- a/packages/client/hmi-client/src/services/graph.ts
+++ b/packages/client/hmi-client/src/services/graph.ts
@@ -306,7 +306,7 @@ export const runDagreLayout = <V, E>(graphData: IGraph<V, E>, lr: boolean = true
 
 		// FIXME: temp hack, need to optimize OrthogonalConnector
 		const nonControllerEdges = graphData.edges.filter((edge: IEdge<any>) => edge.data?.isController !== true);
-		if (nonControllerEdges.length < 100) {
+		if (nonControllerEdges.length < 25) {
 			rerouteEdges(graphData.nodes, nonControllerEdges);
 		}
 
diff --git a/packages/client/hmi-client/src/services/jupyter.ts b/packages/client/hmi-client/src/services/jupyter.ts
index 875ed197e1..d125c3e8f5 100644
--- a/packages/client/hmi-client/src/services/jupyter.ts
+++ b/packages/client/hmi-client/src/services/jupyter.ts
@@ -279,7 +279,7 @@ export class KernelSessionManager {
 		// A bit of a hacky way to wait for the kernel to be setup in order
 		// to send custom messages
 		const interval = 100;
-		const threshold = 50;
+		const threshold = 100;
 		return new Promise((resolve, reject) => {
 			let counter = 0;
 			const id = setInterval(() => {
diff --git a/packages/client/hmi-client/src/utils/stats.ts b/packages/client/hmi-client/src/utils/stats.ts
index 791b7dc273..ad86d1cfe8 100644
--- a/packages/client/hmi-client/src/utils/stats.ts
+++ b/packages/client/hmi-client/src/utils/stats.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import { meanBy, isEmpty } from 'lodash';
 
 export type DataArray = Record<string, any>[];
 
@@ -36,7 +36,7 @@ export const mae = (arr1: DataArray, arr2: DataArray, keyField: string, valueFie
 	});
 
 	const sharedKey = [...map1.keys()].filter((key) => map2.has(key));
-	const error = _.meanBy(sharedKey, (key) => {
+	const error = meanBy(sharedKey, (key) => {
 		const firstValue = map1.get(key) as number;
 		const secondValue = map2.get(key) as number;
 		return Math.abs(firstValue - secondValue);
@@ -61,3 +61,126 @@ export function quantile(numberList: number[], q: number) {
 
 	return lowerValue + (upperValue - lowerValue) * (pos - lowerIndex);
 }
+
+// Weighted Interval Score (WIS)
+// These are js ports of python functions specified in this issue: https://github.com/orgs/DARPA-ASKEM/projects/3/views/8?pane=issue&itemId=93848937&issue=DARPA-ASKEM%7Cterarium%7C6067
+// The original python code: https://github.com/adrian-lison/interval-scoring/blob/master/scoring.py
+
+const DEFAULT_ALPHA_QS = [
+	0.01, 0.025, 0.05, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7, 0.75, 0.8, 0.85, 0.9, 0.95,
+	0.975, 0.99
+];
+
+// Compute the estimated quantiles from a time-series dataset with many samples.
+export function computeQuantile(
+	summaryResult: Record<string, any>,
+	variableName: string,
+	alphas: number[] = DEFAULT_ALPHA_QS
+) {
+	const values = summaryResult.map((row) => row[variableName]);
+	const quantileValueMap: Record<number, number> = {};
+	alphas.forEach((q) => {
+		quantileValueMap[q] = quantile(values, q);
+	});
+	return quantileValueMap;
+}
+
+// Compute interval scores (1) for an array of observations and predicted intervals.
+// Either a dictionary with the respective (alpha/2) and (1-(alpha/2)) quantiles via q_dict needs to be
+// specified or the quantiles need to be specified via q_left and q_right.
+// This is a dumbed down version of the original function as it's just handling the case where the left and right quantiles are not specified, etc.
+export function getIntervalScore(
+	groundTruthObservations: Record<number, number>,
+	variableObservations: Record<number, number>,
+	alpha: number,
+	percent: boolean,
+	checkConsistency: boolean
+) {
+	const leftQuantile = variableObservations[alpha / 2];
+	const rightQuantile = variableObservations[1 - alpha / 2];
+
+	if (checkConsistency && leftQuantile > rightQuantile) {
+		return { sharpness: [], calibration: [], total: [], isConsistent: false };
+	}
+
+	// FIXME: The python code expects sharpness to be a list but for now it makes sense for it to be a number
+	let sharpness = rightQuantile - leftQuantile;
+
+	let calibration = Object.values(groundTruthObservations).map((obs) => {
+		const leftClip = Math.max(0, leftQuantile - obs);
+		const rightClip = Math.max(0, obs - rightQuantile);
+		return ((leftClip + rightClip) * 2) / alpha;
+	});
+
+	if (percent) {
+		const groundTruthObservationsValues = Object.values(groundTruthObservations);
+		sharpness /= Math.abs(groundTruthObservationsValues[0]);
+		calibration = calibration.map((cal, index) => cal / Math.abs(groundTruthObservationsValues[index]));
+	}
+
+	const total = calibration.map((cal) => cal + sharpness);
+
+	return {
+		total,
+		sharpness: [sharpness], // Make sharpness a list for consistency with the original python code (and so it works at all lol)
+		calibration,
+		isConsistent: true
+	};
+}
+
+// Compute weighted interval scores for an array of observations and a number of different predicted intervals.
+// This function implements the WIS-score (2). A dictionary with the respective (alpha/2)
+// and (1-(alpha/2)) quantiles for all alpha levels given in `alphas` needs to be specified.
+export function getWeightedIntervalScore(
+	groundTruthObservations: Record<number, number>,
+	variableObservations: Record<number, number>,
+	percent: boolean = true,
+	checkConsistency: boolean = true,
+	alphas: number[] = [0.02, 0.05, 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9],
+	weights: number[] = []
+) {
+	if (isEmpty(weights)) {
+		weights = alphas.map((alpha) => alpha / 2);
+	}
+
+	let isConsistent = true;
+
+	// Calculate interval scores for each alpha and weight
+	const intervalScores = alphas.map((alpha, index) => {
+		const intervalScore = getIntervalScore(
+			groundTruthObservations,
+			variableObservations,
+			alpha,
+			percent,
+			checkConsistency
+		);
+
+		if (!isConsistent) {
+			isConsistent = intervalScore.isConsistent;
+		}
+
+		// Weigh scores
+		const { total, sharpness, calibration } = intervalScore;
+		const weight = weights[index];
+		return [total.map((d) => d * weight), sharpness.map((d) => d * weight), calibration.map((d) => d * weight)];
+	});
+
+	// This is what zip does in python
+	const [totalScores, sharpnessScores, calibrationScores] = intervalScores[0].map((_, colIndex) =>
+		intervalScores.map((row) => row[colIndex])
+	);
+
+	// Sum the scores across all alphas and normalize by the sum of the weights
+	const weightSum = weights.reduce((sum, val) => sum + val, 0);
+
+	// Sum column-wise (equivalent to np.sum(np.vstack(interval_scores[i]), axis=0))
+	function columnWiseSum(array: number[][]) {
+		return array[0].map((_, colIndex) => array.reduce((sum, row) => sum + row[colIndex], 0));
+	}
+
+	const total = columnWiseSum(totalScores).map((d) => d / weightSum);
+	const sharpness = columnWiseSum(sharpnessScores).map((d) => d / weightSum);
+	const calibration = columnWiseSum(calibrationScores).map((d) => d / weightSum);
+
+	return { total, sharpness, calibration, isConsistent };
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationService.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationService.java
index 31129f9f62..80a4a3160a 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationService.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationService.java
@@ -206,10 +206,7 @@ private static ModelDistribution getModelDistribution(final ModelParameter param
 	}
 
 	public static Model createAMRFromConfiguration(final Model model, final ModelConfiguration modelConfiguration) {
-		// Do not bother setting when we have simulationId as we will use that calibration's inferred parameters.
-		if (modelConfiguration.getSimulationId() == null) {
-			setModelParameters(model.getParameters(), modelConfiguration.getParameterSemanticList());
-		}
+		setModelParameters(model.getParameters(), modelConfiguration.getParameterSemanticList());
 		setModelInitials(model.getInitials(), modelConfiguration.getInitialSemanticList());
 		setModelObservables(model.getObservables(), modelConfiguration.getObservableSemanticList());
 		return model.clone();