From c6f5e62561c12506ad4b1aeca932e2170586052a Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Wed, 29 May 2024 14:10:25 -0400
Subject: [PATCH 01/27] Updating the current `ModelConfiguration` class to be
 `ModelConfigurationLegacy` so that we can work with `ModelConfiguration`
 without issue.

---
 .../tera-regular-model-configurations.vue     |  4 +-
 .../tera-stratified-model-configurations.vue  |  4 +-
 .../model-diagrams/tera-model-diagram.vue     |  7 +-
 .../model/petrinet/tera-initial-entry.vue     |  4 +-
 .../model/petrinet/tera-initial-table-v2.vue  |  4 +-
 .../model/petrinet/tera-model-description.vue |  6 +-
 .../model/petrinet/tera-parameter-entry.vue   |  4 +-
 .../petrinet/tera-parameter-table-v2.vue      |  4 +-
 .../model/petrinet/tera-parameter-table.vue   |  6 +-
 .../model/petrinet/tera-petrinet-tables.vue   |  4 +-
 .../model/regnet/tera-regnet-tables.vue       |  4 +-
 .../model/stockflow/tera-stockflow-tables.vue |  4 +-
 .../model/tera-model-semantic-tables.vue      |  4 +-
 .../src/components/model/tera-model.vue       |  6 +-
 .../tera-calibrate-ciemss.vue                 |  4 +-
 .../tera-calibrate-ensemble-ciemss.vue        |  4 +-
 .../calibrate-julia/tera-calibrate-julia.vue  |  4 +-
 .../workflow/ops/funman/tera-funman.vue       |  4 +-
 .../model-config/model-config-operation.ts    |  4 +-
 .../ops/model-config/tera-model-config.vue    | 12 ++--
 .../optimize-ciemss/tera-optimize-ciemss.vue  |  4 +-
 .../petrinet/petrinet-service.ts              |  4 +-
 .../src/services/calibrate-workflow.ts        |  5 +-
 .../src/services/model-configurations.ts      | 66 +++++++++++--------
 .../client/hmi-client/src/services/model.ts   |  8 ++-
 packages/client/hmi-client/src/types/Types.ts |  2 +-
 .../ModelConfigurationController.java         | 34 +++++-----
 .../dataservice/ModelController.java          | 18 ++---
 .../SimulationRequestController.java          | 32 ++++-----
 ...ion.java => ModelConfigurationLegacy.java} |  2 +-
 .../data/ModelConfigurationService.java       |  7 +-
 .../hmiserver/service/data/ModelService.java  |  6 +-
 .../ConfigureFromDatasetResponseHandler.java  |  6 +-
 .../tasks/ConfigureModelResponseHandler.java  |  6 +-
 .../ModelConfigurationControllerTests.java    | 14 ++--
 35 files changed, 163 insertions(+), 148 deletions(-)
 rename packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/{ModelConfiguration.java => ModelConfigurationLegacy.java} (91%)

diff --git a/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-regular-model-configurations.vue b/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-regular-model-configurations.vue
index 9e1f42870f..77dc5668f6 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-regular-model-configurations.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-regular-model-configurations.vue
@@ -104,11 +104,11 @@
 <script setup lang="ts">
 import Button from 'primevue/button';
 import InputText from 'primevue/inputtext';
-import type { ModelConfiguration } from '@/types/Types';
+import type { ModelConfigurationLegacy } from '@/types/Types';
 
 defineProps<{
 	editValue: string;
-	modelConfigurations: ModelConfiguration[];
+	modelConfigurations: ModelConfigurationLegacy[];
 	calibrationConfig?: boolean;
 	cellEditStates: any[];
 }>();
diff --git a/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-model-configurations.vue b/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-model-configurations.vue
index 1017c786ec..b912898658 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-model-configurations.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/model-configurations/tera-stratified-model-configurations.vue
@@ -47,11 +47,11 @@
 <script setup lang="ts">
 import Button from 'primevue/button';
 import InputText from 'primevue/inputtext';
-import type { ModelConfiguration } from '@/types/Types';
+import type { ModelConfigurationLegacy } from '@/types/Types';
 
 defineProps<{
 	editValue: string;
-	modelConfigurations: ModelConfiguration[];
+	modelConfigurations: ModelConfigurationLegacy[];
 	calibrationConfig?: boolean;
 	cellEditStates: any[];
 	baseInitialsAndParameters: any;
diff --git a/packages/client/hmi-client/src/components/model/petrinet/model-diagrams/tera-model-diagram.vue b/packages/client/hmi-client/src/components/model/petrinet/model-diagrams/tera-model-diagram.vue
index 7eff5bc1fd..56892a4d05 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/model-diagrams/tera-model-diagram.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/model-diagrams/tera-model-diagram.vue
@@ -91,7 +91,8 @@
 					:open-value-config="openValueConfig"
 					@close-modal="openValueConfig = false"
 					@update-configuration="
-						(configToUpdate: ModelConfiguration) => emit('update-configuration', configToUpdate)
+						(configToUpdate: ModelConfigurationLegacy) =>
+							emit('update-configuration', configToUpdate)
 					"
 				/>
 			</Teleport>
@@ -117,7 +118,7 @@ import Button from 'primevue/button';
 import SelectButton from 'primevue/selectbutton';
 import { PetrinetRenderer, NodeType } from '@/model-representation/petrinet/petrinet-renderer';
 import { getModelType, getMMT } from '@/services/model';
-import type { Model, ModelConfiguration } from '@/types/Types';
+import type { Model, ModelConfigurationLegacy } from '@/types/Types';
 import TeraResizablePanel from '@/components/widgets/tera-resizable-panel.vue';
 import TeraTooltip from '@/components/widgets/tera-tooltip.vue';
 
@@ -140,7 +141,7 @@ import TeraStratifiedMatrixPreview from '../model-configurations/tera-stratified
 const props = defineProps<{
 	model: Model;
 	isEditable: boolean;
-	modelConfiguration?: ModelConfiguration;
+	modelConfiguration?: ModelConfigurationLegacy;
 	isPreview?: boolean;
 }>();
 
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 77bc356422..3581088ef1 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
@@ -30,7 +30,7 @@
 </template>
 
 <script setup lang="ts">
-import { ModelConfiguration } from '@/types/Types';
+import { ModelConfigurationLegacy } from '@/types/Types';
 import {
 	getInitialName,
 	getInitialDescription,
@@ -43,7 +43,7 @@ import { ref } from 'vue';
 import Button from 'primevue/button';
 
 const props = defineProps<{
-	modelConfiguration: ModelConfiguration;
+	modelConfiguration: ModelConfigurationLegacy;
 	initialId: string;
 }>();
 
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table-v2.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table-v2.vue
index e0d8365fbf..04ed7baec9 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table-v2.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table-v2.vue
@@ -53,7 +53,7 @@
 </template>
 
 <script setup lang="ts">
-import { ModelConfiguration } from '@/types/Types';
+import { ModelConfigurationLegacy } from '@/types/Types';
 import { getInitials } from '@/services/model-configurations';
 import { StratifiedMatrix } from '@/types/Model';
 import { ref } from 'vue';
@@ -67,7 +67,7 @@ import TeraStratifiedMatrixModal from './model-configurations/tera-stratified-ma
 import TeraInitialEntry from './tera-initial-entry.vue';
 
 const props = defineProps<{
-	modelConfiguration: ModelConfiguration;
+	modelConfiguration: ModelConfigurationLegacy;
 	mmt: MiraModel;
 	mmtParams: MiraTemplateParams;
 }>();
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-model-description.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-model-description.vue
index bfad281283..f13ad23fe4 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-model-description.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-model-description.vue
@@ -99,7 +99,7 @@ import AccordionTab from 'primevue/accordiontab';
 import Column from 'primevue/column';
 import DataTable from 'primevue/datatable';
 import { FeatureConfig, ResultType } from '@/types/common';
-import type { Dataset, Model, ModelConfiguration, ProjectAsset } from '@/types/Types';
+import type { Dataset, Model, ModelConfigurationLegacy, ProjectAsset } from '@/types/Types';
 import { AssetType } from '@/types/Types';
 import SelectButton from 'primevue/selectbutton';
 import TeraRelatedDocuments from '@/components/widgets/tera-related-documents.vue';
@@ -113,7 +113,7 @@ import TeraModelSemanticTables from '@/components/model/tera-model-semantic-tabl
 
 const props = defineProps<{
 	model: Model;
-	modelConfigurations?: ModelConfiguration[];
+	modelConfigurations?: ModelConfigurationLegacy[];
 	featureConfig?: FeatureConfig;
 	isGeneratingCard?: boolean;
 }>();
@@ -206,7 +206,7 @@ function fetchAsset() {
 	emit('fetch-model');
 }
 
-function updateConfiguration(updatedConfiguration: ModelConfiguration) {
+function updateConfiguration(updatedConfiguration: ModelConfigurationLegacy) {
 	emit('update-configuration', updatedConfiguration);
 }
 </script>
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 c3f19afd64..2272a6d174 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
@@ -88,7 +88,7 @@
 </template>
 
 <script setup lang="ts">
-import { ModelConfiguration } from '@/types/Types';
+import { ModelConfigurationLegacy } from '@/types/Types';
 import {
 	getParameterName,
 	getParameterDescription,
@@ -103,7 +103,7 @@ import Dropdown from 'primevue/dropdown';
 import { DistributionType, distributionTypeOptions } from '@/services/distribution';
 
 const props = defineProps<{
-	modelConfiguration: ModelConfiguration;
+	modelConfiguration: ModelConfigurationLegacy;
 	parameterId: string;
 }>();
 
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table-v2.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table-v2.vue
index 82ad6aeb9f..b58ccdaca6 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table-v2.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table-v2.vue
@@ -59,7 +59,7 @@
 </template>
 
 <script setup lang="ts">
-import { ModelConfiguration } from '@/types/Types';
+import { ModelConfigurationLegacy } from '@/types/Types';
 import { getParameters } from '@/services/model-configurations';
 import { StratifiedMatrix } from '@/types/Model';
 import { ref } from 'vue';
@@ -74,7 +74,7 @@ import TeraStratifiedMatrixModal from './model-configurations/tera-stratified-ma
 import TeraParameterEntry from './tera-parameter-entry.vue';
 
 const props = defineProps<{
-	modelConfiguration: ModelConfiguration;
+	modelConfiguration: ModelConfigurationLegacy;
 	mmt: MiraModel;
 	mmtParams: MiraTemplateParams;
 }>();
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 277df8e8c9..0e9940e959 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
@@ -235,7 +235,7 @@
 import { computed, ref, watch } from 'vue';
 import { cloneDeep, isEmpty } from 'lodash';
 import Button from 'primevue/button';
-import type { Model, ModelConfiguration, ModelParameter } from '@/types/Types';
+import type { Model, ModelConfigurationLegacy, ModelParameter } from '@/types/Types';
 import InputText from 'primevue/inputtext';
 import Datatable from 'primevue/datatable';
 import Column from 'primevue/column';
@@ -257,7 +257,7 @@ import TeraInputNumber from '@/components/widgets/tera-input-number.vue';
 
 const props = defineProps<{
 	model: Model;
-	modelConfigurations?: ModelConfiguration[];
+	modelConfigurations?: ModelConfigurationLegacy[];
 	mmt: MiraModel;
 	mmtParams: MiraTemplateParams;
 	data?: ModelConfigTableData[]; // we can use our own passed in data or the computed one.  this is for the embedded matrix table
@@ -272,7 +272,7 @@ const isStratified = computed(() => isStratifiedModel(props.mmt));
 
 interface SuggestedValue {
 	parameter: ModelParameter;
-	configuration: ModelConfiguration;
+	configuration: ModelConfigurationLegacy;
 	index: number;
 }
 const selectedValue = ref<SuggestedValue | null>(null);
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-petrinet-tables.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-petrinet-tables.vue
index 31940c9182..ca59e8e56f 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-petrinet-tables.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-petrinet-tables.vue
@@ -122,7 +122,7 @@
 </template>
 
 <script setup lang="ts">
-import type { Initial, Model, ModelConfiguration, ModelParameter } from '@/types/Types';
+import type { Initial, Model, ModelConfigurationLegacy, ModelParameter } from '@/types/Types';
 import { cloneDeep, groupBy, isEmpty } from 'lodash';
 import Accordion from 'primevue/accordion';
 import AccordionTab from 'primevue/accordiontab';
@@ -141,7 +141,7 @@ import TeraOtherConceptsTable from './tera-other-concepts-table.vue';
 
 const props = defineProps<{
 	model: Model;
-	modelConfigurations?: ModelConfiguration[];
+	modelConfigurations?: ModelConfigurationLegacy[];
 	readonly?: boolean;
 }>();
 
diff --git a/packages/client/hmi-client/src/components/model/regnet/tera-regnet-tables.vue b/packages/client/hmi-client/src/components/model/regnet/tera-regnet-tables.vue
index 05e3b3f591..225eac7bee 100644
--- a/packages/client/hmi-client/src/components/model/regnet/tera-regnet-tables.vue
+++ b/packages/client/hmi-client/src/components/model/regnet/tera-regnet-tables.vue
@@ -81,7 +81,7 @@
 </template>
 
 <script setup lang="ts">
-import type { DKG, Model, ModelConfiguration, ModelParameter } from '@/types/Types';
+import type { DKG, Model, ModelConfigurationLegacy, ModelParameter } from '@/types/Types';
 import { cloneDeep, isEmpty } from 'lodash';
 import Accordion from 'primevue/accordion';
 import AccordionTab from 'primevue/accordiontab';
@@ -104,7 +104,7 @@ import Button from 'primevue/button';
 
 const props = defineProps<{
 	model: Model;
-	modelConfigurations?: ModelConfiguration[];
+	modelConfigurations?: ModelConfigurationLegacy[];
 	readonly?: boolean;
 }>();
 
diff --git a/packages/client/hmi-client/src/components/model/stockflow/tera-stockflow-tables.vue b/packages/client/hmi-client/src/components/model/stockflow/tera-stockflow-tables.vue
index 59a36380f5..3f2ffd5e1a 100644
--- a/packages/client/hmi-client/src/components/model/stockflow/tera-stockflow-tables.vue
+++ b/packages/client/hmi-client/src/components/model/stockflow/tera-stockflow-tables.vue
@@ -144,7 +144,7 @@
 </template>
 
 <script setup lang="ts">
-import type { Initial, Model, ModelConfiguration, ModelParameter } from '@/types/Types';
+import type { Initial, Model, ModelConfigurationLegacy, ModelParameter } from '@/types/Types';
 import { cloneDeep, groupBy, isEmpty } from 'lodash';
 import Accordion from 'primevue/accordion';
 import AccordionTab from 'primevue/accordiontab';
@@ -162,7 +162,7 @@ import Button from 'primevue/button';
 
 const props = defineProps<{
 	model: Model;
-	modelConfigurations?: ModelConfiguration[];
+	modelConfigurations?: ModelConfigurationLegacy[];
 	readonly?: boolean;
 }>();
 
diff --git a/packages/client/hmi-client/src/components/model/tera-model-semantic-tables.vue b/packages/client/hmi-client/src/components/model/tera-model-semantic-tables.vue
index 402cbb2a4b..1ca17aa2e4 100644
--- a/packages/client/hmi-client/src/components/model/tera-model-semantic-tables.vue
+++ b/packages/client/hmi-client/src/components/model/tera-model-semantic-tables.vue
@@ -10,7 +10,7 @@
 
 <script setup lang="ts">
 import { computed } from 'vue';
-import type { Model, ModelConfiguration } from '@/types/Types';
+import type { Model, ModelConfigurationLegacy } from '@/types/Types';
 import TeraPetrinetTables from '@/components/model/petrinet/tera-petrinet-tables.vue';
 import TeraRegnetTables from '@/components/model/regnet/tera-regnet-tables.vue';
 import TeraStockflowTables from '@/components/model/stockflow/tera-stockflow-tables.vue';
@@ -20,7 +20,7 @@ import { getModelType } from '@/services/model';
 
 const props = defineProps<{
 	model: Model;
-	modelConfigurations?: ModelConfiguration[];
+	modelConfigurations?: ModelConfigurationLegacy[];
 	readonly?: boolean;
 }>();
 
diff --git a/packages/client/hmi-client/src/components/model/tera-model.vue b/packages/client/hmi-client/src/components/model/tera-model.vue
index c816b4a60b..2d3847b9aa 100644
--- a/packages/client/hmi-client/src/components/model/tera-model.vue
+++ b/packages/client/hmi-client/src/components/model/tera-model.vue
@@ -58,7 +58,7 @@ import ContextMenu from 'primevue/contextmenu';
 import { addDefaultConfiguration, updateModelConfiguration } from '@/services/model-configurations';
 import { getModel, getModelConfigurations, isModelEmpty, updateModel } from '@/services/model';
 import { FeatureConfig } from '@/types/common';
-import { AssetType, type Model, type ModelConfiguration } from '@/types/Types';
+import { AssetType, type Model, type ModelConfigurationLegacy } from '@/types/Types';
 import { useProjects } from '@/composables/project';
 import { logger } from '@/utils/logger';
 
@@ -84,7 +84,7 @@ const emit = defineEmits([
 ]);
 
 const model = ref<Model | null>(null);
-const modelConfigurations = ref<ModelConfiguration[]>([]);
+const modelConfigurations = ref<ModelConfigurationLegacy[]>([]);
 const newName = ref('New Model');
 const isRenaming = ref(false);
 const isModelLoading = ref(false);
@@ -166,7 +166,7 @@ async function updateModelName() {
 	isRenaming.value = false;
 }
 
-async function updateConfiguration(updatedConfiguration: ModelConfiguration) {
+async function updateConfiguration(updatedConfiguration: ModelConfigurationLegacy) {
 	await updateModelConfiguration(updatedConfiguration);
 	setTimeout(async () => {
 		emit('update-model-configuration');
diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss.vue
index 80071da91b..821e4c84c4 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss.vue
@@ -194,7 +194,7 @@ import {
 	ClientEventType,
 	CsvAsset,
 	DatasetColumn,
-	ModelConfiguration,
+	ModelConfigurationLegacy,
 	State
 } from '@/types/Types';
 import { getTimespan, chartActionsProxy, drilldownChartSize } from '@/components/workflow/util';
@@ -228,7 +228,7 @@ const modelStateOptions = ref<State[] | undefined>();
 const datasetColumns = ref<DatasetColumn[]>();
 const csvAsset = shallowRef<CsvAsset | undefined>(undefined);
 
-const modelConfig = ref<ModelConfiguration>();
+const modelConfig = ref<ModelConfigurationLegacy>();
 
 const modelConfigId = computed<string | undefined>(() => props.node.inputs[0]?.value?.[0]);
 const datasetId = computed<string | undefined>(() => props.node.inputs[1]?.value?.[0]);
diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-ciemss.vue
index 44a47c62c2..a7a36f466b 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ensemble-ciemss/tera-calibrate-ensemble-ciemss.vue
@@ -209,7 +209,7 @@ import TeraPyciemssCancelButton from '@/components/pyciemss/tera-pyciemss-cancel
 import { chartActionsProxy, drilldownChartSize, getTimespan } from '@/components/workflow/util';
 import type {
 	CsvAsset,
-	ModelConfiguration,
+	ModelConfigurationLegacy,
 	EnsembleModelConfigs,
 	EnsembleCalibrationCiemssRequest,
 	State
@@ -287,7 +287,7 @@ const currentDatasetFileName = ref<string>();
 const datasetColumnNames = ref<string[]>();
 
 const listModelLabels = ref<string[]>([]);
-const allModelConfigurations = ref<ModelConfiguration[]>([]);
+const allModelConfigurations = ref<ModelConfigurationLegacy[]>([]);
 // List of each observible + state for each model.
 const allModelOptions = ref<State[][]>([]);
 
diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-julia/tera-calibrate-julia.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-julia/tera-calibrate-julia.vue
index 5aa6da2f76..ea9f99d995 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-julia/tera-calibrate-julia.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-julia/tera-calibrate-julia.vue
@@ -201,7 +201,7 @@ import {
 	ClientEventType,
 	CsvAsset,
 	DatasetColumn,
-	ModelConfiguration,
+	ModelConfigurationLegacy,
 	ScimlStatusUpdate,
 	State
 } from '@/types/Types';
@@ -256,7 +256,7 @@ const inProgressSimulationId = ref<string>(props.node.state.inProgressSimulation
 
 const csvAsset = shallowRef<CsvAsset | undefined>(undefined);
 
-const modelConfig = ref<ModelConfiguration>();
+const modelConfig = ref<ModelConfigurationLegacy>();
 const modelConfigId = computed<string | undefined>(() => props.node.inputs[0]?.value?.[0]);
 const datasetId = computed<string | undefined>(() => props.node.inputs[1]?.value?.[0]);
 const currentDatasetFileName = ref<string>();
diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman.vue b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman.vue
index 1e34920cc2..f7c635799f 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman.vue
@@ -185,7 +185,7 @@ import TeraProgressSpinner from '@/components/widgets/tera-progress-spinner.vue'
 import type {
 	FunmanPostQueriesRequest,
 	Model,
-	ModelConfiguration,
+	ModelConfigurationLegacy,
 	ModelParameter
 } from '@/types/Types';
 import { makeQueries } from '@/services/models/funman-service';
@@ -294,7 +294,7 @@ const requestConstraints = computed(() =>
 
 const requestParameters = ref<any[]>([]);
 const model = ref<Model | null>();
-const modelConfiguration = ref<ModelConfiguration>();
+const modelConfiguration = ref<ModelConfigurationLegacy>();
 
 const modelStates = ref<string[]>([]); // Used for form's multiselect.
 const modelParameters = ref<string[]>([]);
diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-config/model-config-operation.ts b/packages/client/hmi-client/src/components/workflow/ops/model-config/model-config-operation.ts
index 0fe7597d55..f69381271a 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/model-config/model-config-operation.ts
+++ b/packages/client/hmi-client/src/components/workflow/ops/model-config/model-config-operation.ts
@@ -1,5 +1,5 @@
 import { Operation, WorkflowOperationTypes, BaseState } from '@/types/workflow';
-import type { Model, ModelConfiguration } from '@/types/Types';
+import type { Model, ModelConfigurationLegacy } from '@/types/Types';
 
 export const name = 'ModelConfigOperation';
 
@@ -9,7 +9,7 @@ export interface ModelEditCode {
 }
 
 export interface ModelConfigOperationState extends BaseState {
-	transientModelConfig: ModelConfiguration;
+	transientModelConfig: ModelConfigurationLegacy;
 	modelEditCodeHistory: ModelEditCode[];
 	hasCodeBeenRun: boolean;
 	tempConfigId: string; // This is used for beaker context when there is no output selected. It is a config id that is in TDS and marked as temp
diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config.vue b/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config.vue
index d03cd20bde..51f946512c 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config.vue
@@ -333,7 +333,7 @@ import {
 	setParameterDistribution
 } from '@/services/model-configurations';
 import { useToastService } from '@/services/toast';
-import type { Intervention, Model, ModelConfiguration } from '@/types/Types';
+import type { Intervention, Model, ModelConfigurationLegacy } from '@/types/Types';
 import { TaskStatus } from '@/types/Types';
 import { AMRSchemaNames } from '@/types/common';
 import type { WorkflowNode } from '@/types/workflow';
@@ -375,7 +375,7 @@ const emit = defineEmits(['append-output', 'update-state', 'select-output', 'clo
 
 interface BasicKnobs {
 	tempConfigId: string;
-	transientModelConfig: ModelConfiguration;
+	transientModelConfig: ModelConfigurationLegacy;
 }
 
 const knobs = ref<BasicKnobs>({
@@ -596,8 +596,8 @@ const datasetIds = computed(() => props.node.inputs?.[2]?.value);
 
 const suggestedConfigurationContext = ref<{
 	isOpen: boolean;
-	tableData: ModelConfiguration[];
-	modelConfiguration: ModelConfiguration | null;
+	tableData: ModelConfigurationLegacy[];
+	modelConfiguration: ModelConfigurationLegacy | null;
 }>({
 	isOpen: false,
 	tableData: [],
@@ -772,7 +772,7 @@ const initialize = async () => {
 	}
 };
 
-const applyConfigValues = (config: ModelConfiguration) => {
+const applyConfigValues = (config: ModelConfigurationLegacy) => {
 	const state = cloneDeep(props.node.state);
 	knobs.value.transientModelConfig = cloneDeep(config);
 
@@ -804,7 +804,7 @@ const applyConfigValues = (config: ModelConfiguration) => {
 	logger.success(`Configuration applied ${config.name}`);
 };
 
-const onOpenSuggestedConfiguration = (config: ModelConfiguration) => {
+const onOpenSuggestedConfiguration = (config: ModelConfigurationLegacy) => {
 	suggestedConfigurationContext.value.modelConfiguration = config;
 	suggestedConfigurationContext.value.isOpen = true;
 };
diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss.vue
index f2647fb063..7d90f6f22e 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss.vue
@@ -322,7 +322,7 @@ import {
 import { createCsvAssetFromRunResults } from '@/services/dataset';
 // Types:
 import {
-	ModelConfiguration,
+	ModelConfigurationLegacy,
 	State,
 	ModelParameter,
 	OptimizeRequestCiemss,
@@ -473,7 +473,7 @@ const optimizationResult = ref<any>('');
 
 const modelParameterOptions = ref<ModelParameter[]>([]);
 const modelStateAndObsOptions = ref<string[]>([]);
-const modelConfiguration = ref<ModelConfiguration>();
+const modelConfiguration = ref<ModelConfigurationLegacy>();
 
 const showAdditionalOptions = ref(true);
 
diff --git a/packages/client/hmi-client/src/model-representation/petrinet/petrinet-service.ts b/packages/client/hmi-client/src/model-representation/petrinet/petrinet-service.ts
index b97b898848..6d885dd868 100644
--- a/packages/client/hmi-client/src/model-representation/petrinet/petrinet-service.ts
+++ b/packages/client/hmi-client/src/model-representation/petrinet/petrinet-service.ts
@@ -1,5 +1,5 @@
 import { updateModelConfiguration } from '@/services/model-configurations';
-import { Model, ModelConfiguration } from '@/types/Types';
+import { Model, ModelConfigurationLegacy } from '@/types/Types';
 
 const replaceExactString = (str: string, wordToReplace: string, replacementWord: string): string =>
 	str.trim() === wordToReplace.trim() ? str.replace(wordToReplace, replacementWord) : str;
@@ -94,7 +94,7 @@ export const updateParameterId = (amr: Model, id: string, newId: string) => {
 };
 
 export const updateConfigFields = async (
-	modelConfigs: ModelConfiguration[],
+	modelConfigs: ModelConfigurationLegacy[],
 	id: string,
 	newId: string
 ) => {
diff --git a/packages/client/hmi-client/src/services/calibrate-workflow.ts b/packages/client/hmi-client/src/services/calibrate-workflow.ts
index 9f903f40a4..2d4f78e0bf 100644
--- a/packages/client/hmi-client/src/services/calibrate-workflow.ts
+++ b/packages/client/hmi-client/src/services/calibrate-workflow.ts
@@ -1,6 +1,6 @@
 import * as d3 from 'd3';
 
-import type { ModelConfiguration, Dataset, CsvAsset, State } from '@/types/Types';
+import type { ModelConfigurationLegacy, Dataset, CsvAsset, State } from '@/types/Types';
 import { getModelConfigurationById } from '@/services/model-configurations';
 import { downloadRawFile, getDataset } from '@/services/dataset';
 
@@ -13,7 +13,8 @@ export interface CalibrateMap {
 // Takes a model config Id and grabs relevant objects
 export const setupModelInput = async (modelConfigId: string | undefined) => {
 	if (modelConfigId) {
-		const modelConfiguration: ModelConfiguration = await getModelConfigurationById(modelConfigId);
+		const modelConfiguration: ModelConfigurationLegacy =
+			await getModelConfigurationById(modelConfigId);
 		const modelOptions: State[] = modelConfiguration.configuration.model.states;
 
 		// add observables
diff --git a/packages/client/hmi-client/src/services/model-configurations.ts b/packages/client/hmi-client/src/services/model-configurations.ts
index 3077a3d3af..00baa19fcd 100644
--- a/packages/client/hmi-client/src/services/model-configurations.ts
+++ b/packages/client/hmi-client/src/services/model-configurations.ts
@@ -1,7 +1,7 @@
 import _, { cloneDeep, isEmpty } from 'lodash';
 import API from '@/api/api';
 import type {
-	ModelConfiguration,
+	ModelConfigurationLegacy,
 	Model,
 	Intervention,
 	ModelParameter,
@@ -13,12 +13,12 @@ import { DistributionType } from '@/services/distribution';
 
 export const getAllModelConfigurations = async () => {
 	const response = await API.get(`/model-configurations`);
-	return (response?.data as ModelConfiguration[]) ?? null;
+	return (response?.data as ModelConfigurationLegacy[]) ?? null;
 };
 
 export const getModelConfigurationById = async (id: string) => {
 	const response = await API.get(`/model-configurations/${id}`);
-	return (response?.data as ModelConfiguration) ?? null;
+	return (response?.data as ModelConfigurationLegacy) ?? null;
 };
 
 export const getModelIdFromModelConfigurationId = async (id: string) => {
@@ -54,7 +54,7 @@ export const addDefaultConfiguration = async (model: Model): Promise<void> => {
 	await createModelConfiguration(model.id, 'Default config', 'Default config', model);
 };
 
-export const updateModelConfiguration = async (config: ModelConfiguration) => {
+export const updateModelConfiguration = async (config: ModelConfigurationLegacy) => {
 	// Do a sanity pass to ensure type-safety
 	const model: Model = config.configuration as Model;
 	const parameters = model.semantics?.ode.parameters;
@@ -77,7 +77,7 @@ export const updateModelConfiguration = async (config: ModelConfiguration) => {
 	return response?.data ?? null;
 };
 
-export function sanityCheck(config: ModelConfiguration): string[] {
+export function sanityCheck(config: ModelConfigurationLegacy): string[] {
 	const errors: string[] = [];
 	const modelToCheck = config.configuration;
 	if (!modelToCheck) {
@@ -114,35 +114,38 @@ export function sanityCheck(config: ModelConfiguration): string[] {
 	return errors;
 }
 
-export function getInitial(config: ModelConfiguration, initialId: string): Initial | undefined {
+export function getInitial(
+	config: ModelConfigurationLegacy,
+	initialId: string
+): Initial | undefined {
 	return config.configuration.semantics?.ode.initials?.find(
 		(initial) => initial.target === initialId
 	);
 }
 
-export function getInitialSource(config: ModelConfiguration, initialId: string): string {
+export function getInitialSource(config: ModelConfigurationLegacy, initialId: string): string {
 	return config.configuration.metadata?.initials?.[initialId]?.source ?? '';
 }
 
-export function getInitialName(config: ModelConfiguration, initialId: string): string {
+export function getInitialName(config: ModelConfigurationLegacy, initialId: string): string {
 	return config.configuration.metadata?.initials?.[initialId]?.name ?? '';
 }
 
-export function getInitialUnit(config: ModelConfiguration, initialId: string): string {
+export function getInitialUnit(config: ModelConfigurationLegacy, initialId: string): string {
 	return config.configuration.metadata?.initials?.[initialId]?.unit ?? '';
 }
 
-export function getInitialDescription(config: ModelConfiguration, initialId: string): string {
+export function getInitialDescription(config: ModelConfigurationLegacy, initialId: string): string {
 	return config.configuration.metadata?.initials?.[initialId]?.description ?? '';
 }
 
-export function getInitialExpression(config: ModelConfiguration, initialId: string): string {
+export function getInitialExpression(config: ModelConfigurationLegacy, initialId: string): string {
 	const initial = getInitial(config, initialId);
 	return initial?.expression ?? '';
 }
 
 export function setInitialSource(
-	config: ModelConfiguration,
+	config: ModelConfigurationLegacy,
 	initialId: string,
 	source: string
 ): void {
@@ -153,7 +156,7 @@ export function setInitialSource(
 }
 
 export function setInitialExpression(
-	config: ModelConfiguration,
+	config: ModelConfigurationLegacy,
 	initialId: string,
 	expression: string
 ): void {
@@ -173,7 +176,11 @@ export function setInitialExpression(
 		});
 }
 
-export function setInitialName(config: ModelConfiguration, initialId: string, name: string): void {
+export function setInitialName(
+	config: ModelConfigurationLegacy,
+	initialId: string,
+	name: string
+): void {
 	const initial = config.configuration.metadata?.initials?.[initialId];
 	if (initial) {
 		initial.name = name;
@@ -181,7 +188,7 @@ export function setInitialName(config: ModelConfiguration, initialId: string, na
 }
 
 export function setInitialDescription(
-	config: ModelConfiguration,
+	config: ModelConfigurationLegacy,
 	initialId: string,
 	description: string
 ): void {
@@ -192,29 +199,32 @@ export function setInitialDescription(
 }
 
 export function getParameter(
-	config: ModelConfiguration,
+	config: ModelConfigurationLegacy,
 	parameterId: string
 ): ModelParameter | undefined {
 	return config.configuration.semantics?.ode.parameters?.find((param) => param.id === parameterId);
 }
 
-export function getParameterName(config: ModelConfiguration, parameterId: string): string {
+export function getParameterName(config: ModelConfigurationLegacy, parameterId: string): string {
 	const parameter = getParameter(config, parameterId);
 	return parameter?.name ?? '';
 }
 
-export function getParameterDescription(config: ModelConfiguration, parameterId: string): string {
+export function getParameterDescription(
+	config: ModelConfigurationLegacy,
+	parameterId: string
+): string {
 	const parameter = getParameter(config, parameterId);
 	return parameter?.description ?? '';
 }
 
-export function getParameterUnit(config: ModelConfiguration, parameterId: string): string {
+export function getParameterUnit(config: ModelConfigurationLegacy, parameterId: string): string {
 	const parameter = getParameter(config, parameterId);
 	return parameter?.units?.expression ?? '';
 }
 
 export function getParameterDistribution(
-	config: ModelConfiguration,
+	config: ModelConfigurationLegacy,
 	parameterId: string
 ): ModelDistribution {
 	const parameter = cloneDeep(getParameter(config, parameterId));
@@ -234,13 +244,13 @@ export function getParameterDistribution(
 	return parameter.distribution;
 }
 
-export function getInterventions(config: ModelConfiguration): Intervention[] {
+export function getInterventions(config: ModelConfigurationLegacy): Intervention[] {
 	return config.interventions ?? [];
 }
 
 // FIXME: for set and remove interventions, we should not be using the index.  This should be addressed when we move to the new model config data structure.
 export function setIntervention(
-	config: ModelConfiguration,
+	config: ModelConfigurationLegacy,
 	index: number,
 	intervention: Intervention
 ): void {
@@ -248,17 +258,17 @@ export function setIntervention(
 	interventions[index] = intervention;
 }
 
-export function removeIntervention(config: ModelConfiguration, index: number): void {
+export function removeIntervention(config: ModelConfigurationLegacy, index: number): void {
 	const interventions = getInterventions(config);
 	interventions.splice(index, 1);
 }
 
-export function getParameterSource(config: ModelConfiguration, parameterId: string): string {
+export function getParameterSource(config: ModelConfigurationLegacy, parameterId: string): string {
 	return config.configuration.metadata?.parameters?.[parameterId]?.source ?? '';
 }
 
 export function setParameterSource(
-	config: ModelConfiguration,
+	config: ModelConfigurationLegacy,
 	parameterId: string,
 	source: string
 ): void {
@@ -269,7 +279,7 @@ export function setParameterSource(
 }
 
 export function setParameterDistribution(
-	config: ModelConfiguration,
+	config: ModelConfigurationLegacy,
 	parameterId: string,
 	distribution: ModelDistribution
 ): void {
@@ -298,10 +308,10 @@ function convertToUniformDistribution(distribution: ModelDistribution): ModelDis
 	};
 }
 
-export function getParameters(config: ModelConfiguration): ModelParameter[] {
+export function getParameters(config: ModelConfigurationLegacy): ModelParameter[] {
 	return config.configuration.semantics?.ode.parameters ?? [];
 }
 
-export function getInitials(config: ModelConfiguration): Initial[] {
+export function getInitials(config: ModelConfigurationLegacy): Initial[] {
 	return config.configuration.semantics?.ode.initials ?? [];
 }
diff --git a/packages/client/hmi-client/src/services/model.ts b/packages/client/hmi-client/src/services/model.ts
index b8cab1c9fa..5ead43bbee 100644
--- a/packages/client/hmi-client/src/services/model.ts
+++ b/packages/client/hmi-client/src/services/model.ts
@@ -1,7 +1,7 @@
 import API from '@/api/api';
 import { useProjects } from '@/composables/project';
 import * as EventService from '@/services/event';
-import type { Initial, Model, ModelConfiguration, ModelParameter } from '@/types/Types';
+import type { Initial, Model, ModelConfigurationLegacy, ModelParameter } from '@/types/Types';
 import { Artifact, AssetType, EventType } from '@/types/Types';
 import { AMRSchemaNames, ModelServiceType } from '@/types/common';
 import { fileToJson } from '@/utils/file';
@@ -75,9 +75,11 @@ export async function updateModel(model: Model) {
 	return response?.data ?? null;
 }
 
-export async function getModelConfigurations(modelId: Model['id']): Promise<ModelConfiguration[]> {
+export async function getModelConfigurations(
+	modelId: Model['id']
+): Promise<ModelConfigurationLegacy[]> {
 	const response = await API.get(`/models/${modelId}/model-configurations`);
-	return response?.data ?? ([] as ModelConfiguration[]);
+	return response?.data ?? ([] as ModelConfigurationLegacy[]);
 }
 
 export async function processAndAddModelToProject(artifact: Artifact): Promise<string | null> {
diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index 117750a67f..5a39ae32f7 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -210,7 +210,7 @@ export interface Model extends TerariumAssetThatSupportsAdditionalProperties {
     metadata?: ModelMetadata;
 }
 
-export interface ModelConfiguration extends TerariumAssetThatSupportsAdditionalProperties {
+export interface ModelConfigurationLegacy extends TerariumAssetThatSupportsAdditionalProperties {
     configuration: Model;
     interventions?: Intervention[];
     model_id: string;
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
index 5835e22532..bdcd43228c 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
@@ -26,7 +26,7 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ResponseStatusException;
 import software.uncharted.terarium.hmiserver.models.dataservice.ResponseDeleted;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
 import software.uncharted.terarium.hmiserver.security.Roles;
 import software.uncharted.terarium.hmiserver.service.CurrentUserService;
 import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
@@ -59,13 +59,13 @@ public class ModelConfigurationController {
 												@ArraySchema(
 														schema =
 																@io.swagger.v3.oas.annotations.media.Schema(
-																		implementation = ModelConfiguration.class)))),
+																		implementation = ModelConfigurationLegacy.class)))),
 				@ApiResponse(
 						responseCode = "500",
 						description = "There was an issue retrieving configuration from the data store",
 						content = @Content)
 			})
-	public ResponseEntity<List<ModelConfiguration>> getModelConfigurations(
+	public ResponseEntity<List<ModelConfigurationLegacy>> getModelConfigurations(
 			@RequestParam(name = "page-size", defaultValue = "500") final Integer pageSize,
 			@RequestParam(name = "page", defaultValue = "0") final Integer page) {
 
@@ -91,16 +91,16 @@ public ResponseEntity<List<ModelConfiguration>> getModelConfigurations(
 										mediaType = "application/json",
 										schema =
 												@io.swagger.v3.oas.annotations.media.Schema(
-														implementation = ModelConfiguration.class))),
+														implementation = ModelConfigurationLegacy.class))),
 				@ApiResponse(
 						responseCode = "500",
 						description = "There was an issue creating the configuration",
 						content = @Content)
 			})
-	public ResponseEntity<ModelConfiguration> createModelConfiguration(
-			@RequestBody final ModelConfiguration config,
+	public ResponseEntity<ModelConfigurationLegacy> createModelConfiguration(
+			@RequestBody final ModelConfigurationLegacy config,
 			@RequestParam(name = "project-id", required = false) final UUID projectId) {
-		Schema.Permission permission =
+		final Schema.Permission permission =
 				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
 
 		try {
@@ -126,7 +126,7 @@ public ResponseEntity<ModelConfiguration> createModelConfiguration(
 										mediaType = "application/json",
 										schema =
 												@io.swagger.v3.oas.annotations.media.Schema(
-														implementation = ModelConfiguration.class))),
+														implementation = ModelConfigurationLegacy.class))),
 				@ApiResponse(
 						responseCode = "404",
 						description = "There was no configuration found",
@@ -136,14 +136,14 @@ public ResponseEntity<ModelConfiguration> createModelConfiguration(
 						description = "There was an issue retrieving the configuration from the data store",
 						content = @Content)
 			})
-	public ResponseEntity<ModelConfiguration> getModelConfiguration(
+	public ResponseEntity<ModelConfigurationLegacy> getModelConfiguration(
 			@PathVariable("id") final UUID id,
 			@RequestParam(name = "project-id", required = false) final UUID projectId) {
-		Schema.Permission permission =
+		final Schema.Permission permission =
 				projectService.checkPermissionCanRead(currentUserService.get().getId(), projectId);
 
 		try {
-			final Optional<ModelConfiguration> modelConfiguration = modelConfigurationService.getAsset(id, permission);
+			final Optional<ModelConfigurationLegacy> modelConfiguration = modelConfigurationService.getAsset(id, permission);
 			return modelConfiguration.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound()
 					.build());
 		} catch (final IOException e) {
@@ -166,7 +166,7 @@ public ResponseEntity<ModelConfiguration> getModelConfiguration(
 										mediaType = "application/json",
 										schema =
 												@io.swagger.v3.oas.annotations.media.Schema(
-														implementation = ModelConfiguration.class))),
+														implementation = ModelConfigurationLegacy.class))),
 				@ApiResponse(
 						responseCode = "404",
 						description = "Model configuration could not be found",
@@ -176,16 +176,16 @@ public ResponseEntity<ModelConfiguration> getModelConfiguration(
 						description = "There was an issue updating the configuration",
 						content = @Content)
 			})
-	public ResponseEntity<ModelConfiguration> updateModelConfiguration(
+	public ResponseEntity<ModelConfigurationLegacy> updateModelConfiguration(
 			@PathVariable("id") final UUID id,
-			@RequestBody final ModelConfiguration config,
+			@RequestBody final ModelConfigurationLegacy config,
 			@RequestParam(name = "project-id", required = false) final UUID projectId) {
-		Schema.Permission permission =
+		final Schema.Permission permission =
 				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
 
 		try {
 			config.setId(id);
-			final Optional<ModelConfiguration> updated = modelConfigurationService.updateAsset(config, permission);
+			final Optional<ModelConfigurationLegacy> updated = modelConfigurationService.updateAsset(config, permission);
 			return updated.map(ResponseEntity::ok)
 					.orElseGet(() -> ResponseEntity.notFound().build());
 		} catch (final IOException e) {
@@ -215,7 +215,7 @@ public ResponseEntity<ModelConfiguration> updateModelConfiguration(
 	public ResponseEntity<ResponseDeleted> deleteModelConfiguration(
 			@PathVariable("id") final UUID id,
 			@RequestParam(name = "project-id", required = false) final UUID projectId) {
-		Schema.Permission permission =
+		final Schema.Permission permission =
 				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
 
 		try {
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java
index be63fa40b1..0cb15209b5 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java
@@ -38,7 +38,7 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.dataset.Dataset;
 import software.uncharted.terarium.hmiserver.models.dataservice.document.DocumentAsset;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelDescription;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelMetadata;
 import software.uncharted.terarium.hmiserver.models.dataservice.provenance.ProvenanceQueryParam;
@@ -134,7 +134,7 @@ public ResponseEntity<List<ModelDescription>> listModels(
 	ResponseEntity<ModelDescription> getDescription(
 			@PathVariable("id") final UUID id, @RequestParam("project-id") final UUID projectId) {
 
-		Schema.Permission permission =
+		final Schema.Permission permission =
 				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
 
 		try {
@@ -325,7 +325,7 @@ ResponseEntity<Model> updateModel(
 			@PathVariable("id") final UUID id,
 			@RequestBody final Model model,
 			@RequestParam(name = "project-id", required = false) final UUID projectId) {
-		Schema.Permission permission =
+		final Schema.Permission permission =
 				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
 
 		try {
@@ -363,7 +363,7 @@ ResponseEntity<Model> updateModel(
 	ResponseEntity<ResponseDeleted> deleteModel(
 			@PathVariable("id") final UUID id,
 			@RequestParam(name = "project-id", required = false) final UUID projectId) {
-		Schema.Permission permission =
+		final Schema.Permission permission =
 				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
 
 		try {
@@ -397,7 +397,7 @@ ResponseEntity<ResponseDeleted> deleteModel(
 			})
 	ResponseEntity<Model> createModel(
 			@RequestBody Model model, @RequestParam(name = "project-id", required = false) final UUID projectId) {
-		Schema.Permission permission =
+		final Schema.Permission permission =
 				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
 
 		try {
@@ -428,22 +428,22 @@ ResponseEntity<Model> createModel(
 												@ArraySchema(
 														schema =
 																@io.swagger.v3.oas.annotations.media.Schema(
-																		implementation = ModelConfiguration.class)))),
+																		implementation = ModelConfigurationLegacy.class)))),
 				@ApiResponse(
 						responseCode = "500",
 						description = "There was an issue retrieving configurations from the data store",
 						content = @Content)
 			})
-	ResponseEntity<List<ModelConfiguration>> getModelConfigurationsForModelId(
+	ResponseEntity<List<ModelConfigurationLegacy>> getModelConfigurationsForModelId(
 			@PathVariable("id") final UUID id,
 			@RequestParam(value = "page", required = false, defaultValue = "0") final int page,
 			@RequestParam(value = "page-size", required = false, defaultValue = "100") final int pageSize,
 			@RequestParam(name = "project-id", required = false) final UUID projectId) {
-		Schema.Permission permission =
+		final Schema.Permission permission =
 				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
 
 		try {
-			final List<ModelConfiguration> modelConfigurations =
+			final List<ModelConfigurationLegacy> modelConfigurations =
 					modelService.getModelConfigurationsByModelId(id, page, pageSize);
 
 			modelConfigurations.forEach(config -> {
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/simulationservice/SimulationRequestController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/simulationservice/SimulationRequestController.java
index b31a462e88..0a62053c91 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/simulationservice/SimulationRequestController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/simulationservice/SimulationRequestController.java
@@ -16,7 +16,7 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.server.ResponseStatusException;
 import software.uncharted.terarium.hmiserver.controller.SnakeCaseController;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
 import software.uncharted.terarium.hmiserver.models.dataservice.project.Project;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.ProgressState;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.Simulation;
@@ -70,7 +70,7 @@ public class SimulationRequestController implements SnakeCaseController {
 	public ResponseEntity<Simulation> getSimulation(
 			@PathVariable("id") final UUID id,
 			@RequestParam(name = "project-id", required = false) final UUID projectId) {
-		Schema.Permission permission =
+		final Schema.Permission permission =
 				projectService.checkPermissionCanRead(currentUserService.get().getId(), projectId);
 
 		try {
@@ -139,7 +139,7 @@ public ResponseEntity<Simulation> makeForecastRunCiemss(
 
 		// Get model config's interventions and append them to requests:
 		try {
-			final Optional<ModelConfiguration> modelConfiguration =
+			final Optional<ModelConfigurationLegacy> modelConfiguration =
 					modelConfigService.getAsset(request.getModelConfigId(), permission);
 			if (modelConfiguration.isEmpty()) {
 				return ResponseEntity.notFound().build();
@@ -149,13 +149,13 @@ public ResponseEntity<Simulation> makeForecastRunCiemss(
 			if (modelInterventions != null) {
 				List<Intervention> allInterventions = request.getInterventions();
 				if (allInterventions == null) {
-					allInterventions = new ArrayList<Intervention>();
+					allInterventions = new ArrayList<>();
 				}
 				allInterventions.addAll(modelInterventions);
 				request.setInterventions(allInterventions);
 			}
-		} catch (IOException e) {
-			String error = "Server error has occured while fetching the model configuration";
+		} catch (final IOException e) {
+			final String error = "Server error has occured while fetching the model configuration";
 			log.error(error, e);
 			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
 		}
@@ -207,11 +207,11 @@ public ResponseEntity<JobResponse> makeCalibrateJob(@RequestBody final Calibrati
 	@Secured(Roles.USER)
 	public ResponseEntity<JobResponse> makeCalibrateJobCiemss(
 			@RequestBody final CalibrationRequestCiemss request, @RequestParam("project-id") final UUID projectId) {
-		Schema.Permission permission =
+		final Schema.Permission permission =
 				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
 		// Get model config's interventions and append them to requests:
 		try {
-			final Optional<ModelConfiguration> modelConfiguration =
+			final Optional<ModelConfigurationLegacy> modelConfiguration =
 					modelConfigService.getAsset(request.getModelConfigId(), permission);
 			if (modelConfiguration.isEmpty()) {
 				return ResponseEntity.notFound().build();
@@ -221,13 +221,13 @@ public ResponseEntity<JobResponse> makeCalibrateJobCiemss(
 			if (modelInterventions != null) {
 				List<Intervention> allInterventions = request.getInterventions();
 				if (allInterventions == null) {
-					allInterventions = new ArrayList<Intervention>();
+					allInterventions = new ArrayList<>();
 				}
 				allInterventions.addAll(modelInterventions);
 				request.setInterventions(allInterventions);
 			}
-		} catch (IOException e) {
-			String error = "Server error has occured while fetching the model configuration";
+		} catch (final IOException e) {
+			final String error = "Server error has occured while fetching the model configuration";
 			log.error(error, e);
 			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
 		}
@@ -240,12 +240,12 @@ public ResponseEntity<JobResponse> makeCalibrateJobCiemss(
 	@Secured(Roles.USER)
 	public ResponseEntity<JobResponse> makeOptimizeJobCiemss(
 			@RequestBody final OptimizeRequestCiemss request, @RequestParam("project-id") final UUID projectId) {
-		Schema.Permission permission =
+		final Schema.Permission permission =
 				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
 
 		// Get model config's interventions and append them to requests:
 		try {
-			final Optional<ModelConfiguration> modelConfiguration =
+			final Optional<ModelConfigurationLegacy> modelConfiguration =
 					modelConfigService.getAsset(request.getModelConfigId(), permission);
 			if (modelConfiguration.isEmpty()) {
 				return ResponseEntity.notFound().build();
@@ -255,13 +255,13 @@ public ResponseEntity<JobResponse> makeOptimizeJobCiemss(
 			if (modelInterventions != null) {
 				List<Intervention> allInterventions = request.getFixedStaticParameterInterventions();
 				if (allInterventions == null) {
-					allInterventions = new ArrayList<Intervention>();
+					allInterventions = new ArrayList<>();
 				}
 				allInterventions.addAll(modelInterventions);
 				request.setFixedStaticParameterInterventions(allInterventions);
 			}
-		} catch (IOException e) {
-			String error = "Server error has occured while fetching the model configuration";
+		} catch (final IOException e) {
+			final String error = "Server error has occured while fetching the model configuration";
 			log.error(error, e);
 			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
 		}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/ModelConfiguration.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/ModelConfigurationLegacy.java
similarity index 91%
rename from packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/ModelConfiguration.java
rename to packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/ModelConfigurationLegacy.java
index 6a8e0aefe2..3a136c9304 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/ModelConfiguration.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/ModelConfigurationLegacy.java
@@ -16,7 +16,7 @@
 @Data
 @Accessors(chain = true)
 @TSModel
-public class ModelConfiguration extends TerariumAssetThatSupportsAdditionalProperties {
+public class ModelConfigurationLegacy extends TerariumAssetThatSupportsAdditionalProperties {
 
 	@Serial
 	private static final long serialVersionUID = -4109896135386019667L;
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 d20a38b88c..a2d93ffebe 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
@@ -7,18 +7,18 @@
 import org.springframework.stereotype.Service;
 import software.uncharted.terarium.hmiserver.configuration.Config;
 import software.uncharted.terarium.hmiserver.configuration.ElasticsearchConfiguration;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
 import software.uncharted.terarium.hmiserver.service.elasticsearch.ElasticsearchService;
 
 @Service
-public class ModelConfigurationService extends TerariumAssetService<ModelConfiguration> {
+public class ModelConfigurationService extends TerariumAssetService<ModelConfigurationLegacy> {
 
 	public ModelConfigurationService(
 			final ElasticsearchConfiguration elasticConfig,
 			final Config config,
 			final ElasticsearchService elasticService,
 			final ProjectAssetService projectAssetService) {
-		super(elasticConfig, config, elasticService, projectAssetService, ModelConfiguration.class);
+		super(elasticConfig, config, elasticService, projectAssetService, ModelConfigurationLegacy.class);
 	}
 
 	@Override
@@ -27,6 +27,7 @@ protected String getAssetIndex() {
 		return elasticConfig.getModelConfigurationIndex();
 	}
 
+	@Override
 	public Integer uploadFile(final UUID uuid, final String filename, final ContentType contentType, final byte[] data)
 			throws IOException {
 		throw new UnsupportedOperationException("Unimplemented");
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelService.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelService.java
index 83727f340b..ed0170a5fc 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelService.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelService.java
@@ -16,7 +16,7 @@
 import software.uncharted.terarium.hmiserver.configuration.Config;
 import software.uncharted.terarium.hmiserver.configuration.ElasticsearchConfiguration;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelDescription;
 import software.uncharted.terarium.hmiserver.repository.data.ModelRepository;
 import software.uncharted.terarium.hmiserver.service.elasticsearch.ElasticsearchService;
@@ -83,7 +83,7 @@ public Optional<ModelDescription> getDescription(final UUID id, final Schema.Per
 	}
 
 	@Observed(name = "function_profile")
-	public List<ModelConfiguration> getModelConfigurationsByModelId(
+	public List<ModelConfigurationLegacy> getModelConfigurationsByModelId(
 			final UUID id, final Integer page, final Integer pageSize) throws IOException {
 
 		final SearchRequest req = new SearchRequest.Builder()
@@ -101,7 +101,7 @@ public List<ModelConfiguration> getModelConfigurationsByModelId(
 						.build())
 				.build();
 
-		return elasticService.search(req, ModelConfiguration.class);
+		return elasticService.search(req, ModelConfigurationLegacy.class);
 	}
 
 	@Override
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureFromDatasetResponseHandler.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureFromDatasetResponseHandler.java
index e6a4460904..4d133c281c 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureFromDatasetResponseHandler.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureFromDatasetResponseHandler.java
@@ -11,7 +11,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelParameter;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.Initial;
 import software.uncharted.terarium.hmiserver.models.dataservice.provenance.Provenance;
@@ -86,7 +86,7 @@ public TaskResponse onSuccess(final TaskResponse resp) {
 			}
 
 			// Create the new configuration
-			final ModelConfiguration configuration = new ModelConfiguration();
+			final ModelConfigurationLegacy configuration = new ModelConfigurationLegacy();
 			configuration.setModelId(model.getId());
 			configuration.setName("New configuration from dataset");
 			configuration.setDescription("");
@@ -94,7 +94,7 @@ public TaskResponse onSuccess(final TaskResponse resp) {
 
 			try {
 				for (final UUID datasetId : props.datasetIds) {
-					final ModelConfiguration newConfig = modelConfigurationService.createAsset(
+					final ModelConfigurationLegacy newConfig = modelConfigurationService.createAsset(
 							configuration, ASSUME_WRITE_PERMISSION_ON_BEHALF_OF_USER);
 					// add provenance
 					provenanceService.createProvenance(new Provenance()
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureModelResponseHandler.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureModelResponseHandler.java
index d2b364642b..a0e47b652a 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureModelResponseHandler.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureModelResponseHandler.java
@@ -11,7 +11,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelParameter;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.Initial;
 import software.uncharted.terarium.hmiserver.models.dataservice.provenance.Provenance;
@@ -107,14 +107,14 @@ public TaskResponse onSuccess(final TaskResponse resp) {
 				model.getMetadata().setGollmExtractions(gollmExtractions);
 
 				// Create the new configuration
-				final ModelConfiguration configuration = new ModelConfiguration();
+				final ModelConfigurationLegacy configuration = new ModelConfigurationLegacy();
 				configuration.setModelId(model.getId());
 				configuration.setName(condition.get("name").asText());
 				configuration.setDescription(condition.get("description").asText());
 
 				configuration.setConfiguration(modelCopy);
 
-				final ModelConfiguration newConfig =
+				final ModelConfigurationLegacy newConfig =
 						modelConfigurationService.createAsset(configuration, ASSUME_WRITE_PERMISSION_ON_BEHALF_OF_USER);
 				// add provenance
 				provenanceService.createProvenance(new Provenance()
diff --git a/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationControllerTests.java b/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationControllerTests.java
index 77e24bce68..20be88c255 100644
--- a/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationControllerTests.java
+++ b/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationControllerTests.java
@@ -17,7 +17,7 @@
 import software.uncharted.terarium.hmiserver.configuration.ElasticsearchConfiguration;
 import software.uncharted.terarium.hmiserver.configuration.MockUser;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
 import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
 import software.uncharted.terarium.hmiserver.service.elasticsearch.ElasticsearchService;
 
@@ -49,8 +49,8 @@ public void teardown() throws IOException {
 	@WithUserDetails(MockUser.URSULA)
 	public void testItCanGetModelConfiguration() throws Exception {
 
-		final ModelConfiguration modelConfiguration = modelConfigurationService.createAsset(
-				(ModelConfiguration) new ModelConfiguration()
+		final ModelConfigurationLegacy modelConfiguration = modelConfigurationService.createAsset(
+				(ModelConfigurationLegacy) new ModelConfigurationLegacy()
 						.setModelId(UUID.randomUUID())
 						.setConfiguration(new Model())
 						.setName("test-framework")
@@ -67,7 +67,7 @@ public void testItCanGetModelConfiguration() throws Exception {
 	@WithUserDetails(MockUser.URSULA)
 	public void testItCanCreateModelConfiguration() throws Exception {
 
-		final ModelConfiguration modelConfiguration = (ModelConfiguration) new ModelConfiguration()
+		final ModelConfigurationLegacy modelConfiguration = (ModelConfigurationLegacy) new ModelConfigurationLegacy()
 				.setModelId(UUID.randomUUID())
 				.setConfiguration(new Model())
 				.setDescription("test-desc")
@@ -85,8 +85,8 @@ public void testItCanCreateModelConfiguration() throws Exception {
 	@WithUserDetails(MockUser.URSULA)
 	public void testItCanUpdateModelConfiguration() throws Exception {
 
-		final ModelConfiguration modelConfiguration = modelConfigurationService.createAsset(
-				(ModelConfiguration) new ModelConfiguration()
+		final ModelConfigurationLegacy modelConfiguration = modelConfigurationService.createAsset(
+				(ModelConfigurationLegacy) new ModelConfigurationLegacy()
 						.setModelId(UUID.randomUUID())
 						.setConfiguration(new Model())
 						.setDescription("test-desc")
@@ -105,7 +105,7 @@ public void testItCanUpdateModelConfiguration() throws Exception {
 	@WithUserDetails(MockUser.URSULA)
 	public void testItCanDeleteModelConfiguration() throws Exception {
 
-		final ModelConfiguration modelConfiguration = (ModelConfiguration) new ModelConfiguration()
+		final ModelConfigurationLegacy modelConfiguration = (ModelConfigurationLegacy) new ModelConfigurationLegacy()
 				.setModelId(UUID.randomUUID())
 				.setConfiguration(new Model())
 				.setDescription("test-desc")

From 183a52d9db2098130330d7e4061fe958b3c5f9c7 Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Wed, 29 May 2024 14:43:05 -0400
Subject: [PATCH 02/27] Adding POJOs for our model config typing as well as the
 generated typescript

---
 packages/client/hmi-client/src/types/Types.ts | 58 ++++++++++++++++---
 .../model/configurations/InitialSemantic.java | 16 +++++
 .../configurations/ModelConfiguration.java    | 19 ++++++
 .../configurations/ObservableSemantic.java    | 17 ++++++
 .../configurations/ParameterSemantic.java     | 22 +++++++
 .../model/configurations/Semantic.java        | 15 +++++
 .../model/configurations/SemanticType.java    | 14 +++++
 7 files changed, 152 insertions(+), 9 deletions(-)
 create mode 100644 packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
 create mode 100644 packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
 create mode 100644 packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
 create mode 100644 packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
 create mode 100644 packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java
 create mode 100644 packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/SemanticType.java

diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index 5a39ae32f7..abff3d9e53 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -229,6 +229,40 @@ export interface ModelFramework extends TerariumAssetThatSupportsAdditionalPrope
     semantics: string;
 }
 
+export interface InitialSemantic extends Semantic {
+    target: string;
+    expression: string;
+    unit: string;
+}
+
+export interface ModelConfiguration extends TerariumAsset {
+    calibrated: boolean;
+    modelId: string;
+    values: { [index: string]: Semantic };
+}
+
+export interface ObservableSemantic extends Semantic {
+    id: string;
+    states: State[];
+    expression: string;
+}
+
+export interface ParameterSemantic extends Semantic {
+    id: string;
+    value: number;
+    distribution: ModelDistribution;
+    interventions: Intervention[];
+    modelUnit: ModelUnit;
+    default: boolean;
+}
+
+export interface Semantic {
+    name: string;
+    description: string;
+    source: string;
+    type: SemanticType;
+}
+
 export interface State {
     id: string;
     name?: string;
@@ -882,10 +916,9 @@ export interface ModelMetadata {
 export interface TerariumAssetThatSupportsAdditionalProperties extends TerariumAsset {
 }
 
-export interface ModelGrounding {
-    identifiers: { [index: string]: any };
-    context?: { [index: string]: any };
-    modifiers?: any;
+export interface ModelDistribution {
+    type: string;
+    parameters: { [index: string]: any };
 }
 
 export interface ModelUnit {
@@ -893,6 +926,12 @@ export interface ModelUnit {
     expression_mathml: string;
 }
 
+export interface ModelGrounding {
+    identifiers: { [index: string]: any };
+    context?: { [index: string]: any };
+    modifiers?: any;
+}
+
 export interface Properties {
     name: string;
     grounding?: ModelGrounding;
@@ -926,11 +965,6 @@ export interface ProvenanceEdge {
     right: ProvenanceNode;
 }
 
-export interface ModelDistribution {
-    type: string;
-    parameters: { [index: string]: any };
-}
-
 export interface XDDFacetsItemResponse {
     buckets: XDDFacetBucket[];
     doc_count_error_upper_bound: number;
@@ -1292,6 +1326,12 @@ export enum ColumnType {
     Time = "TIME",
 }
 
+export enum SemanticType {
+    Initial = "initial",
+    Parameter = "parameter",
+    Observable = "observable",
+}
+
 export enum ProvenanceRelationType {
     BeginsAt = "BEGINS_AT",
     Cites = "CITES",
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
new file mode 100644
index 0000000000..a2d118281d
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
@@ -0,0 +1,16 @@
+package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import software.uncharted.terarium.hmiserver.annotations.TSModel;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@Accessors
+@TSModel
+public class InitialSemantic extends Semantic {
+	private String target;
+	private String expression;
+	private String unit;
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
new file mode 100644
index 0000000000..9fdbd5c801
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
@@ -0,0 +1,19 @@
+package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
+
+import java.util.Map;
+import java.util.UUID;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import software.uncharted.terarium.hmiserver.annotations.TSModel;
+import software.uncharted.terarium.hmiserver.models.TerariumAsset;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TSModel
+@Accessors
+public class ModelConfiguration extends TerariumAsset {
+	private boolean calibrated;
+	private UUID modelId;
+	private Map<String, Semantic> values;
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
new file mode 100644
index 0000000000..610cdafa57
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
@@ -0,0 +1,17 @@
+package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import software.uncharted.terarium.hmiserver.annotations.TSModel;
+import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.State;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TSModel
+@Accessors
+public class ObservableSemantic extends Semantic {
+	private String id;
+	private State[] states;
+	private String expression;
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
new file mode 100644
index 0000000000..af17aeccad
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
@@ -0,0 +1,22 @@
+package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import software.uncharted.terarium.hmiserver.annotations.TSModel;
+import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelDistribution;
+import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelUnit;
+import software.uncharted.terarium.hmiserver.models.simulationservice.parts.Intervention;
+
+@EqualsAndHashCode(callSuper = true)
+@Data
+@TSModel
+@Accessors
+public class ParameterSemantic extends Semantic {
+	private String id;
+	private Number value;
+	private ModelDistribution distribution;
+	private boolean isDefault;
+	private Intervention[] interventions;
+	private ModelUnit modelUnit;
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java
new file mode 100644
index 0000000000..424dbd052a
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java
@@ -0,0 +1,15 @@
+package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+import software.uncharted.terarium.hmiserver.annotations.TSModel;
+
+@Data
+@Accessors
+@TSModel
+public abstract class Semantic {
+	private String name;
+	private String description;
+	private String source;
+	private SemanticType type;
+}
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/SemanticType.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/SemanticType.java
new file mode 100644
index 0000000000..a181b7ab4c
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/SemanticType.java
@@ -0,0 +1,14 @@
+package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public enum SemanticType {
+	@JsonProperty("initial")
+	INITIAL,
+
+	@JsonProperty("parameter")
+	PARAMETER,
+
+	@JsonProperty("observable")
+	OBSERVABLE
+}

From 879a5f8649fb3da7880a63f5a324a4a2a92835f1 Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Wed, 29 May 2024 14:53:35 -0400
Subject: [PATCH 03/27] More legacy renaming.

---
 .../controller/dataservice/ModelConfigurationController.java  | 4 ++--
 .../simulationservice/SimulationRequestController.java        | 4 ++--
 ...ationService.java => ModelConfigurationLegacyService.java} | 4 ++--
 .../hmiserver/service/data/TerariumAssetServices.java         | 2 +-
 .../service/tasks/ConfigureFromDatasetResponseHandler.java    | 4 ++--
 .../service/tasks/ConfigureModelResponseHandler.java          | 4 ++--
 .../dataservice/ModelConfigurationControllerTests.java        | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)
 rename packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/{ModelConfigurationService.java => ModelConfigurationLegacyService.java} (89%)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
index bdcd43228c..ee38b46367 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
@@ -29,7 +29,7 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
 import software.uncharted.terarium.hmiserver.security.Roles;
 import software.uncharted.terarium.hmiserver.service.CurrentUserService;
-import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
+import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationLegacyService;
 import software.uncharted.terarium.hmiserver.service.data.ProjectService;
 import software.uncharted.terarium.hmiserver.utils.rebac.Schema;
 
@@ -39,7 +39,7 @@
 @Slf4j
 public class ModelConfigurationController {
 
-	final ModelConfigurationService modelConfigurationService;
+	final ModelConfigurationLegacyService modelConfigurationService;
 	final ObjectMapper objectMapper;
 
 	final ProjectService projectService;
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/simulationservice/SimulationRequestController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/simulationservice/SimulationRequestController.java
index 0a62053c91..eb1e46d722 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/simulationservice/SimulationRequestController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/simulationservice/SimulationRequestController.java
@@ -34,7 +34,7 @@
 import software.uncharted.terarium.hmiserver.proxies.simulationservice.SimulationServiceProxy;
 import software.uncharted.terarium.hmiserver.security.Roles;
 import software.uncharted.terarium.hmiserver.service.CurrentUserService;
-import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
+import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationLegacyService;
 import software.uncharted.terarium.hmiserver.service.data.ModelService;
 import software.uncharted.terarium.hmiserver.service.data.ProjectService;
 import software.uncharted.terarium.hmiserver.service.data.SimulationService;
@@ -58,7 +58,7 @@ public class SimulationRequestController implements SnakeCaseController {
 	private final SimulationService simulationService;
 
 	private final ModelService modelService;
-	private final ModelConfigurationService modelConfigService;
+	private final ModelConfigurationLegacyService modelConfigService;
 
 	private final ObjectMapper objectMapper;
 
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/ModelConfigurationLegacyService.java
similarity index 89%
rename from packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationService.java
rename to packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationLegacyService.java
index a2d93ffebe..9274b3243e 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/ModelConfigurationLegacyService.java
@@ -11,9 +11,9 @@
 import software.uncharted.terarium.hmiserver.service.elasticsearch.ElasticsearchService;
 
 @Service
-public class ModelConfigurationService extends TerariumAssetService<ModelConfigurationLegacy> {
+public class ModelConfigurationLegacyService extends TerariumAssetService<ModelConfigurationLegacy> {
 
-	public ModelConfigurationService(
+	public ModelConfigurationLegacyService(
 			final ElasticsearchConfiguration elasticConfig,
 			final Config config,
 			final ElasticsearchService elasticService,
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/TerariumAssetServices.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/TerariumAssetServices.java
index d194053cb8..2d9f67f436 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/TerariumAssetServices.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/TerariumAssetServices.java
@@ -14,7 +14,7 @@ public class TerariumAssetServices {
 	private final CodeService codeService;
 	private final DatasetService datasetService;
 	private final DocumentAssetService documentAssetService;
-	private final ModelConfigurationService modelConfigurationService;
+	private final ModelConfigurationLegacyService modelConfigurationService;
 	private final ModelService modelService;
 	private final NotebookSessionService notebookSessionService;
 	private final WorkflowService workflowService;
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureFromDatasetResponseHandler.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureFromDatasetResponseHandler.java
index 4d133c281c..e5cac008c0 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureFromDatasetResponseHandler.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureFromDatasetResponseHandler.java
@@ -18,7 +18,7 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.provenance.ProvenanceRelationType;
 import software.uncharted.terarium.hmiserver.models.dataservice.provenance.ProvenanceType;
 import software.uncharted.terarium.hmiserver.models.task.TaskResponse;
-import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
+import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationLegacyService;
 import software.uncharted.terarium.hmiserver.service.data.ModelService;
 import software.uncharted.terarium.hmiserver.service.data.ProvenanceService;
 import software.uncharted.terarium.hmiserver.service.gollm.ScenarioExtraction;
@@ -31,7 +31,7 @@ public class ConfigureFromDatasetResponseHandler extends TaskResponseHandler {
 
 	private final ObjectMapper objectMapper;
 	private final ModelService modelService;
-	private final ModelConfigurationService modelConfigurationService;
+	private final ModelConfigurationLegacyService modelConfigurationService;
 	private final ProvenanceService provenanceService;
 
 	@Override
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureModelResponseHandler.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureModelResponseHandler.java
index a0e47b652a..83f9a3a856 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureModelResponseHandler.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/tasks/ConfigureModelResponseHandler.java
@@ -18,7 +18,7 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.provenance.ProvenanceRelationType;
 import software.uncharted.terarium.hmiserver.models.dataservice.provenance.ProvenanceType;
 import software.uncharted.terarium.hmiserver.models.task.TaskResponse;
-import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
+import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationLegacyService;
 import software.uncharted.terarium.hmiserver.service.data.ModelService;
 import software.uncharted.terarium.hmiserver.service.data.ProvenanceService;
 import software.uncharted.terarium.hmiserver.service.gollm.ScenarioExtraction;
@@ -31,7 +31,7 @@ public class ConfigureModelResponseHandler extends TaskResponseHandler {
 
 	private final ObjectMapper objectMapper;
 	private final ModelService modelService;
-	private final ModelConfigurationService modelConfigurationService;
+	private final ModelConfigurationLegacyService modelConfigurationService;
 	private final ProvenanceService provenanceService;
 
 	@Override
diff --git a/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationControllerTests.java b/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationControllerTests.java
index 20be88c255..87e5f216ff 100644
--- a/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationControllerTests.java
+++ b/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationControllerTests.java
@@ -18,7 +18,7 @@
 import software.uncharted.terarium.hmiserver.configuration.MockUser;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
-import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
+import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationLegacyService;
 import software.uncharted.terarium.hmiserver.service.elasticsearch.ElasticsearchService;
 
 public class ModelConfigurationControllerTests extends TerariumApplicationTests {
@@ -27,7 +27,7 @@ public class ModelConfigurationControllerTests extends TerariumApplicationTests
 	private ObjectMapper objectMapper;
 
 	@Autowired
-	private ModelConfigurationService modelConfigurationService;
+	private ModelConfigurationLegacyService modelConfigurationService;
 
 	@Autowired
 	private ElasticsearchService elasticService;

From a727c7a3d94287bf4bac990d357d48153adfc302 Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Wed, 29 May 2024 15:01:09 -0400
Subject: [PATCH 04/27] Service and Repository

---
 packages/client/hmi-client/src/types/Types.ts |  2 +-
 .../configurations/ModelConfiguration.java    |  4 ++-
 .../data/ModelConfigRepository.java           |  9 +++++++
 .../data/ModelConfigurationService.java       | 26 +++++++++++++++++++
 4 files changed, 39 insertions(+), 2 deletions(-)
 create mode 100644 packages/server/src/main/java/software/uncharted/terarium/hmiserver/repository/data/ModelConfigRepository.java
 create mode 100644 packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationService.java

diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index abff3d9e53..94890af1b4 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -236,7 +236,7 @@ export interface InitialSemantic extends Semantic {
 }
 
 export interface ModelConfiguration extends TerariumAsset {
-    calibrated: boolean;
+    calibrationRunId: string;
     modelId: string;
     values: { [index: string]: Semantic };
 }
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
index 9fdbd5c801..379771c577 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
@@ -1,5 +1,6 @@
 package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
 
+import jakarta.persistence.Entity;
 import java.util.Map;
 import java.util.UUID;
 import lombok.Data;
@@ -12,8 +13,9 @@
 @Data
 @TSModel
 @Accessors
+@Entity
 public class ModelConfiguration extends TerariumAsset {
-	private boolean calibrated;
+	private UUID calibrationRunId;
 	private UUID modelId;
 	private Map<String, Semantic> values;
 }
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/repository/data/ModelConfigRepository.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/repository/data/ModelConfigRepository.java
new file mode 100644
index 0000000000..b7f5393491
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/repository/data/ModelConfigRepository.java
@@ -0,0 +1,9 @@
+package software.uncharted.terarium.hmiserver.repository.data;
+
+import java.util.UUID;
+import org.springframework.stereotype.Repository;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.repository.PSCrudSoftDeleteRepository;
+
+@Repository
+public interface ModelConfigRepository extends PSCrudSoftDeleteRepository<ModelConfiguration, UUID> {}
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
new file mode 100644
index 0000000000..c27137d539
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/ModelConfigurationService.java
@@ -0,0 +1,26 @@
+package software.uncharted.terarium.hmiserver.service.data;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.stereotype.Service;
+import software.uncharted.terarium.hmiserver.configuration.Config;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.repository.data.ModelConfigRepository;
+import software.uncharted.terarium.hmiserver.service.s3.S3ClientService;
+
+@Service
+public class ModelConfigurationService
+		extends TerariumAssetServiceWithoutSearch<ModelConfiguration, ModelConfigRepository> {
+	public ModelConfigurationService(
+			final ObjectMapper objectMapper,
+			final Config config,
+			final ProjectAssetService projectAssetService,
+			final ModelConfigRepository repository,
+			final S3ClientService s3ClientService) {
+		super(objectMapper, config, projectAssetService, repository, s3ClientService, ModelConfiguration.class);
+	}
+
+	@Override
+	protected String getAssetPath() {
+		throw new UnsupportedOperationException("Model Configurations are not stored in S3");
+	}
+}

From 93d06095a0cf71fc72c9343c41d18c57bb969517 Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Wed, 29 May 2024 15:52:53 -0400
Subject: [PATCH 05/27] Database entity prep

---
 .../model/configurations/InitialSemantic.java |  9 ++++++
 .../configurations/ModelConfiguration.java    | 28 +++++++++++++++++++
 .../configurations/ObservableSemantic.java    | 16 +++++++++++
 .../configurations/ParameterSemantic.java     | 20 +++++++++++++
 .../model/configurations/Semantic.java        |  8 +++++-
 5 files changed, 80 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
index a2d118281d..78d0cc3265 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
@@ -1,5 +1,9 @@
 package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -9,8 +13,13 @@
 @Data
 @Accessors
 @TSModel
+@Entity
 public class InitialSemantic extends Semantic {
 	private String target;
 	private String expression;
 	private String unit;
+
+	@ManyToOne
+	@JsonBackReference
+	@NotNull private ModelConfiguration modelConfiguration;
 }
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
index 379771c577..84793c6c17 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
@@ -1,11 +1,19 @@
 package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
 
+import com.fasterxml.jackson.annotation.JsonManagedReference;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Transient;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import software.uncharted.terarium.hmiserver.annotations.TSIgnore;
 import software.uncharted.terarium.hmiserver.annotations.TSModel;
 import software.uncharted.terarium.hmiserver.models.TerariumAsset;
 
@@ -17,5 +25,25 @@
 public class ModelConfiguration extends TerariumAsset {
 	private UUID calibrationRunId;
 	private UUID modelId;
+
+	@Transient
 	private Map<String, Semantic> values;
+
+	@TSIgnore
+	@OneToMany(mappedBy = "model_configuration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+	@Schema(accessMode = Schema.AccessMode.READ_ONLY)
+	@JsonManagedReference
+	private List<ObservableSemantic> observableSemanticList;
+
+	@TSIgnore
+	@OneToMany(mappedBy = "model_configuration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+	@Schema(accessMode = Schema.AccessMode.READ_ONLY)
+	@JsonManagedReference
+	private List<ParameterSemantic> parameterSemanticList;
+
+	@TSIgnore
+	@OneToMany(mappedBy = "model_configuration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+	@Schema(accessMode = Schema.AccessMode.READ_ONLY)
+	@JsonManagedReference
+	private List<InitialSemantic> initialSemanticList;
 }
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
index 610cdafa57..ee569fefa5 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
@@ -1,8 +1,15 @@
 package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import io.hypersistence.utils.hibernate.type.json.JsonType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.hibernate.annotations.Type;
 import software.uncharted.terarium.hmiserver.annotations.TSModel;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.State;
 
@@ -10,8 +17,17 @@
 @Data
 @TSModel
 @Accessors
+@Entity
 public class ObservableSemantic extends Semantic {
 	private String id;
+
+	@Type(JsonType.class)
+	@Column(columnDefinition = "json")
 	private State[] states;
+
 	private String expression;
+
+	@ManyToOne
+	@JsonBackReference
+	@NotNull private ModelConfiguration modelConfiguration;
 }
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
index af17aeccad..0fe2f1432f 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
@@ -1,8 +1,15 @@
 package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
 
+import com.fasterxml.jackson.annotation.JsonBackReference;
+import io.hypersistence.utils.hibernate.type.json.JsonType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.ManyToOne;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.hibernate.annotations.Type;
 import software.uncharted.terarium.hmiserver.annotations.TSModel;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelDistribution;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelUnit;
@@ -12,11 +19,24 @@
 @Data
 @TSModel
 @Accessors
+@Entity
 public class ParameterSemantic extends Semantic {
+
 	private String id;
+
 	private Number value;
+
 	private ModelDistribution distribution;
+
 	private boolean isDefault;
+
+	@Type(JsonType.class)
+	@Column(columnDefinition = "json")
 	private Intervention[] interventions;
+
 	private ModelUnit modelUnit;
+
+	@ManyToOne
+	@JsonBackReference
+	@NotNull private ModelConfiguration modelConfiguration;
 }
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java
index 424dbd052a..fb493949a6 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java
@@ -1,13 +1,19 @@
 package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
 
+import jakarta.persistence.Entity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 import software.uncharted.terarium.hmiserver.annotations.TSModel;
+import software.uncharted.terarium.hmiserver.models.TerariumEntity;
 
+@EqualsAndHashCode(callSuper = true)
 @Data
 @Accessors
 @TSModel
-public abstract class Semantic {
+@Entity
+public abstract class Semantic extends TerariumEntity {
+
 	private String name;
 	private String description;
 	private String source;

From 9da19c48d46feea840c28a6a717221d02d6b23bf Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Wed, 29 May 2024 16:03:27 -0400
Subject: [PATCH 06/27] Changing endpoints. More renaming to legacy

---
 .../hmi-client/src/services/model-configurations.ts |  8 ++++----
 packages/client/hmi-client/src/services/model.ts    |  2 +-
 ...java => ModelConfigurationLegacyController.java} | 13 ++++++++-----
 .../controller/dataservice/ModelController.java     |  2 +-
 .../ModelConfigurationControllerTests.java          |  8 ++++----
 5 files changed, 18 insertions(+), 15 deletions(-)
 rename packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/{ModelConfigurationController.java => ModelConfigurationLegacyController.java} (95%)

diff --git a/packages/client/hmi-client/src/services/model-configurations.ts b/packages/client/hmi-client/src/services/model-configurations.ts
index 00baa19fcd..e0bf4a8694 100644
--- a/packages/client/hmi-client/src/services/model-configurations.ts
+++ b/packages/client/hmi-client/src/services/model-configurations.ts
@@ -12,12 +12,12 @@ import { pythonInstance } from '@/python/PyodideController';
 import { DistributionType } from '@/services/distribution';
 
 export const getAllModelConfigurations = async () => {
-	const response = await API.get(`/model-configurations`);
+	const response = await API.get(`/model-configurations-legacy`);
 	return (response?.data as ModelConfigurationLegacy[]) ?? null;
 };
 
 export const getModelConfigurationById = async (id: string) => {
-	const response = await API.get(`/model-configurations/${id}`);
+	const response = await API.get(`/model-configurations-legacy/${id}`);
 	return (response?.data as ModelConfigurationLegacy) ?? null;
 };
 
@@ -39,7 +39,7 @@ export const createModelConfiguration = async (
 	}
 	const temporary = isTemporary ?? false;
 	const interventions = givenInterventions ?? [];
-	const response = await API.post(`/model-configurations`, {
+	const response = await API.post(`/model-configurations-legacy`, {
 		model_id,
 		temporary,
 		name,
@@ -73,7 +73,7 @@ export const updateModelConfiguration = async (config: ModelConfigurationLegacy)
 		API.put(`/models/${config.configuration.id}`, config.configuration);
 	}
 
-	const response = await API.put(`/model-configurations/${config.id}`, config);
+	const response = await API.put(`/model-configurations-legacy/${config.id}`, config);
 	return response?.data ?? null;
 };
 
diff --git a/packages/client/hmi-client/src/services/model.ts b/packages/client/hmi-client/src/services/model.ts
index 5ead43bbee..7eac0f608d 100644
--- a/packages/client/hmi-client/src/services/model.ts
+++ b/packages/client/hmi-client/src/services/model.ts
@@ -78,7 +78,7 @@ export async function updateModel(model: Model) {
 export async function getModelConfigurations(
 	modelId: Model['id']
 ): Promise<ModelConfigurationLegacy[]> {
-	const response = await API.get(`/models/${modelId}/model-configurations`);
+	const response = await API.get(`/models/${modelId}/model-configurations-legacy`);
 	return response?.data ?? ([] as ModelConfigurationLegacy[]);
 }
 
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationLegacyController.java
similarity index 95%
rename from packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
rename to packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationLegacyController.java
index ee38b46367..356c933970 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationLegacyController.java
@@ -33,11 +33,11 @@
 import software.uncharted.terarium.hmiserver.service.data.ProjectService;
 import software.uncharted.terarium.hmiserver.utils.rebac.Schema;
 
-@RequestMapping("/model-configurations")
+@RequestMapping("/model-configurations-legacy")
 @RestController
 @RequiredArgsConstructor
 @Slf4j
-public class ModelConfigurationController {
+public class ModelConfigurationLegacyController {
 
 	final ModelConfigurationLegacyService modelConfigurationService;
 	final ObjectMapper objectMapper;
@@ -59,7 +59,8 @@ public class ModelConfigurationController {
 												@ArraySchema(
 														schema =
 																@io.swagger.v3.oas.annotations.media.Schema(
-																		implementation = ModelConfigurationLegacy.class)))),
+																		implementation =
+																				ModelConfigurationLegacy.class)))),
 				@ApiResponse(
 						responseCode = "500",
 						description = "There was an issue retrieving configuration from the data store",
@@ -143,7 +144,8 @@ public ResponseEntity<ModelConfigurationLegacy> getModelConfiguration(
 				projectService.checkPermissionCanRead(currentUserService.get().getId(), projectId);
 
 		try {
-			final Optional<ModelConfigurationLegacy> modelConfiguration = modelConfigurationService.getAsset(id, permission);
+			final Optional<ModelConfigurationLegacy> modelConfiguration =
+					modelConfigurationService.getAsset(id, permission);
 			return modelConfiguration.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound()
 					.build());
 		} catch (final IOException e) {
@@ -185,7 +187,8 @@ public ResponseEntity<ModelConfigurationLegacy> updateModelConfiguration(
 
 		try {
 			config.setId(id);
-			final Optional<ModelConfigurationLegacy> updated = modelConfigurationService.updateAsset(config, permission);
+			final Optional<ModelConfigurationLegacy> updated =
+					modelConfigurationService.updateAsset(config, permission);
 			return updated.map(ResponseEntity::ok)
 					.orElseGet(() -> ResponseEntity.notFound().build());
 		} catch (final IOException e) {
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java
index 0cb15209b5..fb4d4a07ab 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java
@@ -414,7 +414,7 @@ ResponseEntity<Model> createModel(
 		}
 	}
 
-	@GetMapping("/{id}/model-configurations")
+	@GetMapping("/{id}/model-configurations-legacy")
 	@Secured(Roles.USER)
 	@Operation(summary = "Gets all model configurations for a model")
 	@ApiResponses(
diff --git a/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationControllerTests.java b/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationControllerTests.java
index 87e5f216ff..428332854d 100644
--- a/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationControllerTests.java
+++ b/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationControllerTests.java
@@ -57,7 +57,7 @@ public void testItCanGetModelConfiguration() throws Exception {
 						.setDescription("test-desc"),
 				ASSUME_WRITE_PERMISSION);
 
-		mockMvc.perform(MockMvcRequestBuilders.get("/model-configurations/" + modelConfiguration.getId())
+		mockMvc.perform(MockMvcRequestBuilders.get("/model-configurations-legacy/" + modelConfiguration.getId())
 						.param("project-id", PROJECT_ID.toString())
 						.with(csrf()))
 				.andExpect(status().isOk());
@@ -73,7 +73,7 @@ public void testItCanCreateModelConfiguration() throws Exception {
 				.setDescription("test-desc")
 				.setName("test-framework");
 
-		mockMvc.perform(MockMvcRequestBuilders.post("/model-configurations")
+		mockMvc.perform(MockMvcRequestBuilders.post("/model-configurations-legacy")
 						.param("project-id", PROJECT_ID.toString())
 						.with(csrf())
 						.contentType("application/json")
@@ -93,7 +93,7 @@ public void testItCanUpdateModelConfiguration() throws Exception {
 						.setName("test-framework"),
 				ASSUME_WRITE_PERMISSION);
 
-		mockMvc.perform(MockMvcRequestBuilders.put("/model-configurations/" + modelConfiguration.getId())
+		mockMvc.perform(MockMvcRequestBuilders.put("/model-configurations-legacy/" + modelConfiguration.getId())
 						.param("project-id", PROJECT_ID.toString())
 						.with(csrf())
 						.contentType("application/json")
@@ -111,7 +111,7 @@ public void testItCanDeleteModelConfiguration() throws Exception {
 				.setDescription("test-desc")
 				.setName("test-framework");
 
-		mockMvc.perform(MockMvcRequestBuilders.delete("/model-configurations/" + modelConfiguration.getId())
+		mockMvc.perform(MockMvcRequestBuilders.delete("/model-configurations-legacy/" + modelConfiguration.getId())
 						.param("project-id", PROJECT_ID.toString())
 						.with(csrf()))
 				.andExpect(status().isOk());

From 0be46d9c677b46b8c58d51519b6847e4dc733f1d Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Wed, 29 May 2024 16:23:06 -0400
Subject: [PATCH 07/27] New controller

---
 .../ModelConfigurationController.java         | 83 +++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
new file mode 100644
index 0000000000..3ad7ca661c
--- /dev/null
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
@@ -0,0 +1,83 @@
+package software.uncharted.terarium.hmiserver.controller.dataservice;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.ArraySchema;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.annotation.Secured;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ResponseStatusException;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.project.Project;
+import software.uncharted.terarium.hmiserver.security.Roles;
+import software.uncharted.terarium.hmiserver.service.CurrentUserService;
+import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
+import software.uncharted.terarium.hmiserver.utils.Messages;
+
+@RequestMapping("/model-configurations")
+@RestController
+@RequiredArgsConstructor
+@Slf4j
+public class ModelConfigurationController {
+	final ModelConfigurationService modelConfigurationService;
+	final CurrentUserService currentUserService;
+	final Messages messages;
+
+	/**
+	 * Gets all model configurations (which are visible to this user)
+	 *
+	 * @param pageSize how many entries per page
+	 * @param page page number
+	 * @return all model configurations visible to this user
+	 */
+	@GetMapping
+	@Secured(Roles.USER)
+	@Operation(summary = "Gets all model configurations (which are visible to this user)")
+	@ApiResponses(
+			value = {
+				@ApiResponse(
+						responseCode = "200",
+						description = "model configurations found.",
+						content =
+								@Content(
+										array =
+												@ArraySchema(
+														schema =
+																@io.swagger.v3.oas.annotations.media.Schema(
+																		implementation = Project.class)))),
+				@ApiResponse(
+						responseCode = "204",
+						description = "There are no errors, but also no model configurations for this user",
+						content = @Content),
+				@ApiResponse(
+						responseCode = "503",
+						description = "There was an issue communicating with back-end services",
+						content = @Content)
+			})
+	public ResponseEntity<List<ModelConfiguration>> getModelConfigurations(
+			@RequestParam(name = "page-size", defaultValue = "500") final Integer pageSize,
+			@RequestParam(name = "page", defaultValue = "1") final Integer page) {
+
+		try {
+			final List<ModelConfiguration> modelConfigurations =
+					modelConfigurationService.getPublicNotTemporaryAssets(pageSize, page);
+			if (modelConfigurations.isEmpty()) {
+				return ResponseEntity.noContent().build();
+			}
+			return ResponseEntity.ok(modelConfigurations);
+		} catch (final Exception e) {
+			log.error("Unable to get model configurations from postgres db", e);
+			throw new ResponseStatusException(
+					org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE,
+					messages.get("postgres.service-unavailable"));
+		}
+	}
+}

From 8593a79661343cc9fa8c5a0ecfa45de5ff3806a0 Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Mon, 3 Jun 2024 10:53:28 -0400
Subject: [PATCH 08/27] Creating model configs

---
 .../ModelConfigurationController.java         | 102 +++++++++++++++++-
 .../src/main/resources/messages.properties    |   1 -
 2 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
index 3ad7ca661c..c5157e4509 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
@@ -3,24 +3,34 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import java.io.IOException;
 import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.annotation.Secured;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ResponseStatusException;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ModelConfiguration;
-import software.uncharted.terarium.hmiserver.models.dataservice.project.Project;
 import software.uncharted.terarium.hmiserver.security.Roles;
 import software.uncharted.terarium.hmiserver.service.CurrentUserService;
 import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
+import software.uncharted.terarium.hmiserver.service.data.ProjectService;
 import software.uncharted.terarium.hmiserver.utils.Messages;
+import software.uncharted.terarium.hmiserver.utils.rebac.Schema.Permission;
 
 @RequestMapping("/model-configurations")
 @RestController
@@ -30,6 +40,7 @@ public class ModelConfigurationController {
 	final ModelConfigurationService modelConfigurationService;
 	final CurrentUserService currentUserService;
 	final Messages messages;
+	final ProjectService projectService;
 
 	/**
 	 * Gets all model configurations (which are visible to this user)
@@ -50,9 +61,7 @@ public class ModelConfigurationController {
 								@Content(
 										array =
 												@ArraySchema(
-														schema =
-																@io.swagger.v3.oas.annotations.media.Schema(
-																		implementation = Project.class)))),
+														schema = @Schema(implementation = ModelConfiguration.class)))),
 				@ApiResponse(
 						responseCode = "204",
 						description = "There are no errors, but also no model configurations for this user",
@@ -80,4 +89,89 @@ public ResponseEntity<List<ModelConfiguration>> getModelConfigurations(
 					messages.get("postgres.service-unavailable"));
 		}
 	}
+
+	/**
+	 * Gets a specific model configuration by id
+	 *
+	 * @param id UUID of the specific model configuration to fetch
+	 * @param projectId the owning project ID
+	 * @return the requested model configuration
+	 */
+	@GetMapping("/{id}")
+	@Secured(Roles.USER)
+	@Operation(summary = "Gets a specific model configuration by id")
+	@ApiResponses(
+			value = {
+				@ApiResponse(
+						responseCode = "200",
+						description = "model configuration found.",
+						content =
+								@Content(
+										mediaType = "application/json",
+										schema = @Schema(implementation = ModelConfiguration.class))),
+				@ApiResponse(
+						responseCode = "404",
+						description = "There was no configuration found by this ID",
+						content = @Content),
+				@ApiResponse(
+						responseCode = "403",
+						description = "User does not have permissions to this model configuration",
+						content = @Content),
+				@ApiResponse(
+						responseCode = "503",
+						description = "There was an issue communicating with back-end services",
+						content = @Content)
+			})
+	public ResponseEntity<ModelConfiguration> getModelConfiguration(
+			@PathVariable("id") final UUID id,
+			@RequestParam(name = "project-id", required = false) final UUID projectId) {
+		final Permission permission =
+				projectService.checkPermissionCanRead(currentUserService.get().getId(), projectId);
+		try {
+			final Optional<ModelConfiguration> modelConfiguration = modelConfigurationService.getAsset(id, permission);
+			return modelConfiguration.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound()
+					.build());
+		} catch (final Exception e) {
+			log.error("Unable to get model configuration from postgres db", e);
+			throw new ResponseStatusException(
+					org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE,
+					messages.get("postgres.service-unavailable"));
+		}
+	}
+
+	@PostMapping
+	@Secured(Roles.USER)
+	@Operation(summary = "Create a new model configuration")
+	@ApiResponses(
+			value = {
+				@ApiResponse(
+						responseCode = "201",
+						description = "Model configuration created.",
+						content =
+								@Content(
+										mediaType = "application/json",
+										schema =
+												@io.swagger.v3.oas.annotations.media.Schema(
+														implementation = ModelConfigurationLegacy.class))),
+				@ApiResponse(
+						responseCode = "503",
+						description = "There was an issue creating the configuration",
+						content = @Content)
+			})
+	public ResponseEntity<ModelConfiguration> createModelConfiguration(
+			@RequestBody final ModelConfiguration modelConfiguration,
+			@RequestParam(name = "project-id", required = false) final UUID projectId) {
+		final software.uncharted.terarium.hmiserver.utils.rebac.Schema.Permission permission =
+				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
+
+		try {
+			return ResponseEntity.status(HttpStatus.CREATED)
+					.body(modelConfigurationService.createAsset(modelConfiguration, permission));
+		} catch (final IOException e) {
+			log.error("Unable to get model configuration from postgres db", e);
+			throw new ResponseStatusException(
+				org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE,
+				messages.get("postgres.service-unavailable"));
+		}
+	}
 }
diff --git a/packages/server/src/main/resources/messages.properties b/packages/server/src/main/resources/messages.properties
index e9efb83d72..ae48e525ff 100644
--- a/packages/server/src/main/resources/messages.properties
+++ b/packages/server/src/main/resources/messages.properties
@@ -24,7 +24,6 @@ model.not-found = We were unable to find the requested model. Please ensure that
 model.unable-to-update = We were unable to update the dataset model. Please try again later.
 model.unable-to-delete = We were unable to delete the dataset model. Please try again later.
 
-
 postgres.service-unavailable = Terarium's data storage is temporarily unavailable. Please try again later.
 
 projects.asset-already-added = An asset with the same ID already exists in another project project. Please verify that the asset is not already in another project or contact support.

From 99e7adf9fbd21bea3898e7d64f18205768b8bf52 Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Mon, 3 Jun 2024 13:13:44 -0400
Subject: [PATCH 09/27] Updating model config

---
 .../ModelConfigurationController.java         | 49 ++++++++++++++++---
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
index c5157e4509..f6dfbfe0a9 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
@@ -23,7 +23,6 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ResponseStatusException;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelConfigurationLegacy;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ModelConfiguration;
 import software.uncharted.terarium.hmiserver.security.Roles;
 import software.uncharted.terarium.hmiserver.service.CurrentUserService;
@@ -150,9 +149,7 @@ public ResponseEntity<ModelConfiguration> getModelConfiguration(
 						content =
 								@Content(
 										mediaType = "application/json",
-										schema =
-												@io.swagger.v3.oas.annotations.media.Schema(
-														implementation = ModelConfigurationLegacy.class))),
+										schema = @Schema(implementation = ModelConfiguration.class))),
 				@ApiResponse(
 						responseCode = "503",
 						description = "There was an issue creating the configuration",
@@ -170,8 +167,48 @@ public ResponseEntity<ModelConfiguration> createModelConfiguration(
 		} catch (final IOException e) {
 			log.error("Unable to get model configuration from postgres db", e);
 			throw new ResponseStatusException(
-				org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE,
-				messages.get("postgres.service-unavailable"));
+					org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE,
+					messages.get("postgres.service-unavailable"));
+		}
+	}
+
+	@PostMapping
+	@Secured(Roles.USER)
+	@Operation(summary = "Create a new model configuration")
+	@ApiResponses(
+			value = {
+				@ApiResponse(
+						responseCode = "200",
+						description = "Model configuration updated.",
+						content =
+								@Content(
+										mediaType = "application/json",
+										schema = @Schema(implementation = ModelConfiguration.class))),
+				@ApiResponse(
+						responseCode = "404",
+						description = "There was no model configuration found by this ID",
+						content = @Content),
+				@ApiResponse(
+						responseCode = "503",
+						description = "There was an issue updating the configuration",
+						content = @Content)
+			})
+	public ResponseEntity<ModelConfiguration> updateModelConfiguration(
+			@PathVariable("id") final UUID id,
+			@RequestBody final ModelConfiguration config,
+			@RequestParam(name = "project-id", required = false) final UUID projectId) {
+		final software.uncharted.terarium.hmiserver.utils.rebac.Schema.Permission permission =
+				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
+		try {
+			config.setId(id);
+			final Optional<ModelConfiguration> updated = modelConfigurationService.updateAsset(config, permission);
+			return updated.map(ResponseEntity::ok)
+					.orElseGet(() -> ResponseEntity.notFound().build());
+		} catch (final IOException e) {
+			log.error("Unable to update model configuration in postgres db", e);
+			throw new ResponseStatusException(
+					org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE,
+					messages.get("postgres.service-unavailable"));
 		}
 	}
 }

From 467f0c92535a0a42f27565e3cee3b957cddbd5c9 Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Mon, 3 Jun 2024 13:54:05 -0400
Subject: [PATCH 10/27] delete model config

---
 .../ModelConfigurationController.java         | 59 ++++++++++++++++++-
 1 file changed, 58 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
index f6dfbfe0a9..fd35f907ce 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
@@ -15,14 +15,17 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.annotation.Secured;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ResponseStatusException;
+import software.uncharted.terarium.hmiserver.models.dataservice.ResponseDeleted;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ModelConfiguration;
 import software.uncharted.terarium.hmiserver.security.Roles;
 import software.uncharted.terarium.hmiserver.service.CurrentUserService;
@@ -138,6 +141,13 @@ public ResponseEntity<ModelConfiguration> getModelConfiguration(
 		}
 	}
 
+	/**
+	 * Creates a new model config and saves it to the DB
+	 *
+	 * @param modelConfiguration new model config to create
+	 * @param projectId owning project ID, used for permissions
+	 * @return newly created model config with id set.
+	 */
 	@PostMapping
 	@Secured(Roles.USER)
 	@Operation(summary = "Create a new model configuration")
@@ -172,7 +182,15 @@ public ResponseEntity<ModelConfiguration> createModelConfiguration(
 		}
 	}
 
-	@PostMapping
+	/**
+	 * Updates an existing model config
+	 *
+	 * @param id UUID of the model to update
+	 * @param config New model config to update with
+	 * @param projectId owning project ID, used for permissions
+	 * @return updated project ID with UUID set
+	 */
+	@PutMapping("/{id}")
 	@Secured(Roles.USER)
 	@Operation(summary = "Create a new model configuration")
 	@ApiResponses(
@@ -211,4 +229,43 @@ public ResponseEntity<ModelConfiguration> updateModelConfiguration(
 					messages.get("postgres.service-unavailable"));
 		}
 	}
+
+	/**
+	 * Deletes a model config by id
+	 *
+	 * @param id id of the model config to delete
+	 * @param projectId ID of the owning project, for permissions
+	 * @return ResponseDeleted
+	 */
+	@DeleteMapping("/{id}")
+	@Secured(Roles.USER)
+	@Operation(summary = "Deletes a model configuration")
+	@ApiResponses(
+			value = {
+				@ApiResponse(
+						responseCode = "200",
+						description = "Deleted configuration",
+						content = {
+							@Content(
+									mediaType = "application/json",
+									schema = @Schema(implementation = ResponseDeleted.class))
+						}),
+				@ApiResponse(responseCode = "503", description = "An error occurred while deleting", content = @Content)
+			})
+	public ResponseEntity<ResponseDeleted> deleteModelConfiguration(
+			@PathVariable("id") final UUID id,
+			@RequestParam(name = "project-id", required = false) final UUID projectId) {
+		final software.uncharted.terarium.hmiserver.utils.rebac.Schema.Permission permission =
+				projectService.checkPermissionCanWrite(currentUserService.get().getId(), projectId);
+
+		try {
+			modelConfigurationService.deleteAsset(id, permission);
+			return ResponseEntity.ok(new ResponseDeleted("ModelConfiguration", id));
+		} catch (final IOException e) {
+			log.error("Unable to delete model configuration", e);
+			throw new ResponseStatusException(
+					org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE,
+					messages.get("postgres.service-unavailable"));
+		}
+	}
 }

From 5d880c1110178f68abe471064bc1000dd262aa9f Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Mon, 3 Jun 2024 14:00:54 -0400
Subject: [PATCH 11/27] Updaing front end to use legacy while this is
 transfered

---
 .../src/components/model/petrinet/tera-initial-entry.vue     | 2 +-
 .../src/components/model/petrinet/tera-initial-table-v2.vue  | 2 +-
 .../src/components/model/petrinet/tera-parameter-entry.vue   | 2 +-
 .../components/model/petrinet/tera-parameter-table-v2.vue    | 2 +-
 .../client/hmi-client/src/components/model/tera-model.vue    | 5 ++++-
 .../src/components/workflow/ops/funman/tera-funman.vue       | 2 +-
 .../workflow/ops/model-config/tera-model-config.vue          | 2 +-
 .../components/workflow/ops/model-edit/tera-model-edit.vue   | 2 +-
 .../ops/model-transformer/tera-model-transformer.vue         | 2 +-
 .../workflow/ops/optimize-ciemss/tera-optimize-ciemss.vue    | 2 +-
 .../tera-simulate-ensemble-ciemss.vue                        | 2 +-
 .../workflow/ops/simulate-julia/tera-simulate-julia.vue      | 2 +-
 .../workflow/ops/stratify-mira/tera-stratify-mira.vue        | 2 +-
 .../src/model-representation/petrinet/petrinet-service.ts    | 2 +-
 .../client/hmi-client/src/services/calibrate-workflow.ts     | 2 +-
 ...odel-configurations.ts => model-configurations-legacy.ts} | 0
 16 files changed, 18 insertions(+), 15 deletions(-)
 rename packages/client/hmi-client/src/services/{model-configurations.ts => model-configurations-legacy.ts} (100%)

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 3581088ef1..5986c8b649 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
@@ -37,7 +37,7 @@ import {
 	getInitialUnit,
 	getInitialExpression,
 	getInitialSource
-} from '@/services/model-configurations';
+} from '@/services/model-configurations-legacy';
 import TeraInput from '@/components/widgets/tera-input.vue';
 import { ref } from 'vue';
 import Button from 'primevue/button';
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table-v2.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table-v2.vue
index 04ed7baec9..4176cb0b50 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table-v2.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-initial-table-v2.vue
@@ -54,7 +54,7 @@
 
 <script setup lang="ts">
 import { ModelConfigurationLegacy } from '@/types/Types';
-import { getInitials } from '@/services/model-configurations';
+import { getInitials } from '@/services/model-configurations-legacy';
 import { StratifiedMatrix } from '@/types/Model';
 import { ref } from 'vue';
 import { collapseInitials, isStratifiedModel } from '@/model-representation/mira/mira';
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 2272a6d174..2dd5ee8807 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
@@ -95,7 +95,7 @@ import {
 	getParameterUnit,
 	getParameterSource,
 	getParameterDistribution
-} from '@/services/model-configurations';
+} from '@/services/model-configurations-legacy';
 import TeraInput from '@/components/widgets/tera-input.vue';
 import { ref } from 'vue';
 import Button from 'primevue/button';
diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table-v2.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table-v2.vue
index b58ccdaca6..bf10073d05 100644
--- a/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table-v2.vue
+++ b/packages/client/hmi-client/src/components/model/petrinet/tera-parameter-table-v2.vue
@@ -60,7 +60,7 @@
 
 <script setup lang="ts">
 import { ModelConfigurationLegacy } from '@/types/Types';
-import { getParameters } from '@/services/model-configurations';
+import { getParameters } from '@/services/model-configurations-legacy';
 import { StratifiedMatrix } from '@/types/Model';
 import { ref } from 'vue';
 import { collapseParameters, isStratifiedModel } from '@/model-representation/mira/mira';
diff --git a/packages/client/hmi-client/src/components/model/tera-model.vue b/packages/client/hmi-client/src/components/model/tera-model.vue
index 2d3847b9aa..5cfc14a3e4 100644
--- a/packages/client/hmi-client/src/components/model/tera-model.vue
+++ b/packages/client/hmi-client/src/components/model/tera-model.vue
@@ -55,7 +55,10 @@ import TeraModelDescription from '@/components/model/petrinet/tera-model-descrip
 import Button from 'primevue/button';
 import InputText from 'primevue/inputtext';
 import ContextMenu from 'primevue/contextmenu';
-import { addDefaultConfiguration, updateModelConfiguration } from '@/services/model-configurations';
+import {
+	addDefaultConfiguration,
+	updateModelConfiguration
+} from '@/services/model-configurations-legacy';
 import { getModel, getModelConfigurations, isModelEmpty, updateModel } from '@/services/model';
 import { FeatureConfig } from '@/types/common';
 import { AssetType, type Model, type ModelConfigurationLegacy } from '@/types/Types';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman.vue b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman.vue
index 7f457e0044..d7945c937e 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/funman/tera-funman.vue
@@ -190,7 +190,7 @@ import type {
 } from '@/types/Types';
 import { makeQueries } from '@/services/models/funman-service';
 import { WorkflowNode, WorkflowOutput } from '@/types/workflow';
-import { getModelConfigurationById } from '@/services/model-configurations';
+import { getModelConfigurationById } from '@/services/model-configurations-legacy';
 import { useToastService } from '@/services/toast';
 import { pythonInstance } from '@/python/PyodideController';
 import TeraFunmanOutput from '@/components/workflow/ops/funman/tera-funman-output.vue';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config.vue b/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config.vue
index 2c7b37f08c..074259be1d 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/model-config/tera-model-config.vue
@@ -334,7 +334,7 @@ import {
 	setInitialExpression,
 	setParameterSource,
 	setParameterDistribution
-} from '@/services/model-configurations';
+} from '@/services/model-configurations-legacy';
 import { useToastService } from '@/services/toast';
 import type { Intervention, Model, ModelConfigurationLegacy } from '@/types/Types';
 import { TaskStatus } from '@/types/Types';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-edit/tera-model-edit.vue b/packages/client/hmi-client/src/components/workflow/ops/model-edit/tera-model-edit.vue
index 88ee1c04db..8453fb90cf 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/model-edit/tera-model-edit.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/model-edit/tera-model-edit.vue
@@ -106,7 +106,7 @@ import TeraNotebookJupyterInput from '@/components/llm/tera-notebook-jupyter-inp
 import teraNotebookJupyterThoughtOutput from '@/components/llm/tera-notebook-jupyter-thought-output.vue';
 
 import { KernelSessionManager } from '@/services/jupyter';
-import { getModelIdFromModelConfigurationId } from '@/services/model-configurations';
+import { getModelIdFromModelConfigurationId } from '@/services/model-configurations-legacy';
 import TeraSaveAssetModal from '@/page/project/components/tera-save-asset-modal.vue';
 import { saveCodeToState } from '@/services/notebook';
 import { ModelEditOperationState } from './model-edit-operation';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/model-transformer/tera-model-transformer.vue b/packages/client/hmi-client/src/components/workflow/ops/model-transformer/tera-model-transformer.vue
index 2e2ff179fe..c94fb1186c 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/model-transformer/tera-model-transformer.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/model-transformer/tera-model-transformer.vue
@@ -30,7 +30,7 @@ import { v4 as uuidv4 } from 'uuid';
 import type { NotebookSession } from '@/types/Types';
 import { cloneDeep } from 'lodash';
 import { getModel } from '@/services/model';
-import { addDefaultConfiguration } from '@/services/model-configurations';
+import { addDefaultConfiguration } from '@/services/model-configurations-legacy';
 import TeraDrilldown from '@/components/drilldown/tera-drilldown.vue';
 
 import { ModelTransformerState } from './model-transformer-operation';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss.vue
index 7d90f6f22e..82e5c2bfb2 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss.vue
@@ -313,7 +313,7 @@ import TeraPyciemssCancelButton from '@/components/pyciemss/tera-pyciemss-cancel
 import {
 	getModelConfigurationById,
 	createModelConfiguration
-} from '@/services/model-configurations';
+} from '@/services/model-configurations-legacy';
 import {
 	makeOptimizeJobCiemss,
 	getRunResultCiemss,
diff --git a/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-ciemss.vue b/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-ciemss.vue
index af38e73f3c..5f7f7f1b0f 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-ciemss.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/simulate-ensemble-ciemss/tera-simulate-ensemble-ciemss.vue
@@ -223,7 +223,7 @@ import {
 	getRunResultCiemss,
 	makeEnsembleCiemssSimulation
 } from '@/services/models/simulation-service';
-import { getModelConfigurationById } from '@/services/model-configurations';
+import { getModelConfigurationById } from '@/services/model-configurations-legacy';
 import { chartActionsProxy, drilldownChartSize } from '@/components/workflow/util';
 
 import type { WorkflowNode } from '@/types/workflow';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/simulate-julia/tera-simulate-julia.vue b/packages/client/hmi-client/src/components/workflow/ops/simulate-julia/tera-simulate-julia.vue
index 1b899117a5..24587c7494 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/simulate-julia/tera-simulate-julia.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/simulate-julia/tera-simulate-julia.vue
@@ -113,7 +113,7 @@ import InputNumber from 'primevue/inputnumber';
 import type { CsvAsset, SimulationRequest, TimeSpan } from '@/types/Types';
 import type { RunResults } from '@/types/SimulateConfig';
 import type { WorkflowNode } from '@/types/workflow';
-import { getModelConfigurationById } from '@/services/model-configurations';
+import { getModelConfigurationById } from '@/services/model-configurations-legacy';
 import { getRunResult, makeForecastJob } from '@/services/models/simulation-service';
 import { createCsvAssetFromRunResults } from '@/services/dataset';
 import { csvParse } from 'd3';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-mira.vue b/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-mira.vue
index 11fe2d3e79..570780d9e9 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-mira.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/stratify-mira/tera-stratify-mira.vue
@@ -127,7 +127,7 @@ import TeraNotebookError from '@/components/drilldown/tera-notebook-error.vue';
 import type { Model } from '@/types/Types';
 import { AssetType } from '@/types/Types';
 import { AMRSchemaNames } from '@/types/common';
-import { getModelIdFromModelConfigurationId } from '@/services/model-configurations';
+import { getModelIdFromModelConfigurationId } from '@/services/model-configurations-legacy';
 
 /* Jupyter imports */
 import { KernelSessionManager } from '@/services/jupyter';
diff --git a/packages/client/hmi-client/src/model-representation/petrinet/petrinet-service.ts b/packages/client/hmi-client/src/model-representation/petrinet/petrinet-service.ts
index 6d885dd868..5ba148910a 100644
--- a/packages/client/hmi-client/src/model-representation/petrinet/petrinet-service.ts
+++ b/packages/client/hmi-client/src/model-representation/petrinet/petrinet-service.ts
@@ -1,4 +1,4 @@
-import { updateModelConfiguration } from '@/services/model-configurations';
+import { updateModelConfiguration } from '@/services/model-configurations-legacy';
 import { Model, ModelConfigurationLegacy } from '@/types/Types';
 
 const replaceExactString = (str: string, wordToReplace: string, replacementWord: string): string =>
diff --git a/packages/client/hmi-client/src/services/calibrate-workflow.ts b/packages/client/hmi-client/src/services/calibrate-workflow.ts
index 2d4f78e0bf..57b038ae4c 100644
--- a/packages/client/hmi-client/src/services/calibrate-workflow.ts
+++ b/packages/client/hmi-client/src/services/calibrate-workflow.ts
@@ -1,7 +1,7 @@
 import * as d3 from 'd3';
 
 import type { ModelConfigurationLegacy, Dataset, CsvAsset, State } from '@/types/Types';
-import { getModelConfigurationById } from '@/services/model-configurations';
+import { getModelConfigurationById } from '@/services/model-configurations-legacy';
 import { downloadRawFile, getDataset } from '@/services/dataset';
 
 export interface CalibrateMap {
diff --git a/packages/client/hmi-client/src/services/model-configurations.ts b/packages/client/hmi-client/src/services/model-configurations-legacy.ts
similarity index 100%
rename from packages/client/hmi-client/src/services/model-configurations.ts
rename to packages/client/hmi-client/src/services/model-configurations-legacy.ts

From f61758c0701c17f12c32476dc0daebd6f7cf926a Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Tue, 4 Jun 2024 09:49:27 -0400
Subject: [PATCH 12/27] Front end model configuration service

---
 .../src/services/model-configurations.ts      | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 packages/client/hmi-client/src/services/model-configurations.ts

diff --git a/packages/client/hmi-client/src/services/model-configurations.ts b/packages/client/hmi-client/src/services/model-configurations.ts
new file mode 100644
index 0000000000..d7dea4987a
--- /dev/null
+++ b/packages/client/hmi-client/src/services/model-configurations.ts
@@ -0,0 +1,28 @@
+import API from '@/api/api';
+import type { ModelConfiguration } from '@/types/Types';
+
+export const getAllModelConfigurations = async (): Promise<ModelConfiguration[]> => {
+	const response = await API.get(`/model-configurations`);
+	return response?.data ?? null;
+};
+
+export const getModelConfigurationById = async (id: string): Promise<ModelConfiguration> => {
+	const response = await API.get(`/model-configurations/${id}`);
+	return response?.data ?? null;
+};
+
+export const createModelConfiguration = async (
+	modelConfiguration: ModelConfiguration
+): Promise<ModelConfiguration> => {
+	modelConfiguration.temporary = modelConfiguration.temporary ?? false;
+	const response = await API.post(`/model-configurations`, modelConfiguration);
+	return response?.data ?? null;
+};
+
+export const updateModelConfiguration = async (modelConfiguration: ModelConfiguration) => {
+	const response = await API.put(
+		`/model-configurations/${modelConfiguration.id}`,
+		modelConfiguration
+	);
+	return response?.data ?? null;
+};

From a714ec2006b3eb46c5f9484c104a46c5502b601b Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Tue, 4 Jun 2024 09:57:38 -0400
Subject: [PATCH 13/27] merging main

---
 .../src/services/model-configurations-legacy.ts          | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/client/hmi-client/src/services/model-configurations-legacy.ts b/packages/client/hmi-client/src/services/model-configurations-legacy.ts
index e0bf4a8694..46c78e12d4 100644
--- a/packages/client/hmi-client/src/services/model-configurations-legacy.ts
+++ b/packages/client/hmi-client/src/services/model-configurations-legacy.ts
@@ -315,3 +315,12 @@ export function getParameters(config: ModelConfigurationLegacy): ModelParameter[
 export function getInitials(config: ModelConfigurationLegacy): Initial[] {
 	return config.configuration.semantics?.ode.initials ?? [];
 }
+
+export function setParameterDistributions(
+	config: ModelConfigurationLegacy,
+	distributionParameterMappings: { id: string; distribution: ModelDistribution }[]
+): void {
+	distributionParameterMappings.forEach((mapping) => {
+		setParameterDistribution(config, mapping.id, mapping.distribution);
+	});
+}

From cb333da75cb253f2b0cc21f58d40f6503f723b4f Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Tue, 4 Jun 2024 13:18:04 -0400
Subject: [PATCH 14/27] generating types

---
 packages/client/hmi-client/src/types/Types.ts              | 7 ++++---
 .../model/configurations/ObservableSemantic.java           | 1 -
 .../model/configurations/ParameterSemantic.java            | 2 --
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index 94890af1b4..866338d8bb 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -233,6 +233,7 @@ export interface InitialSemantic extends Semantic {
     target: string;
     expression: string;
     unit: string;
+    modelConfiguration: ModelConfiguration;
 }
 
 export interface ModelConfiguration extends TerariumAsset {
@@ -242,21 +243,21 @@ export interface ModelConfiguration extends TerariumAsset {
 }
 
 export interface ObservableSemantic extends Semantic {
-    id: string;
     states: State[];
     expression: string;
+    modelConfiguration: ModelConfiguration;
 }
 
 export interface ParameterSemantic extends Semantic {
-    id: string;
     value: number;
     distribution: ModelDistribution;
     interventions: Intervention[];
     modelUnit: ModelUnit;
     default: boolean;
+    modelConfiguration: ModelConfiguration;
 }
 
-export interface Semantic {
+export interface Semantic extends TerariumEntity {
     name: string;
     description: string;
     source: string;
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
index ee569fefa5..afae7d6a80 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
@@ -19,7 +19,6 @@
 @Accessors
 @Entity
 public class ObservableSemantic extends Semantic {
-	private String id;
 
 	@Type(JsonType.class)
 	@Column(columnDefinition = "json")
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
index 0fe2f1432f..2987765b62 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
@@ -22,8 +22,6 @@
 @Entity
 public class ParameterSemantic extends Semantic {
 
-	private String id;
-
 	private Number value;
 
 	private ModelDistribution distribution;

From 8c703781d176f846697ed66324f304c204d1ee96 Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Tue, 4 Jun 2024 13:56:21 -0400
Subject: [PATCH 15/27] leg work on endpoint

---
 .../ModelConfigurationController.java         | 70 ++++++++++++++++++-
 .../src/main/resources/messages.properties    |  2 +
 2 files changed, 70 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
index fd35f907ce..fbca83e6e3 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
@@ -26,10 +26,12 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ResponseStatusException;
 import software.uncharted.terarium.hmiserver.models.dataservice.ResponseDeleted;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ModelConfiguration;
 import software.uncharted.terarium.hmiserver.security.Roles;
 import software.uncharted.terarium.hmiserver.service.CurrentUserService;
 import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
+import software.uncharted.terarium.hmiserver.service.data.ModelService;
 import software.uncharted.terarium.hmiserver.service.data.ProjectService;
 import software.uncharted.terarium.hmiserver.utils.Messages;
 import software.uncharted.terarium.hmiserver.utils.rebac.Schema.Permission;
@@ -40,6 +42,7 @@
 @Slf4j
 public class ModelConfigurationController {
 	final ModelConfigurationService modelConfigurationService;
+	final ModelService modelService;
 	final CurrentUserService currentUserService;
 	final Messages messages;
 	final ProjectService projectService;
@@ -131,8 +134,71 @@ public ResponseEntity<ModelConfiguration> getModelConfiguration(
 				projectService.checkPermissionCanRead(currentUserService.get().getId(), projectId);
 		try {
 			final Optional<ModelConfiguration> modelConfiguration = modelConfigurationService.getAsset(id, permission);
-			return modelConfiguration.map(ResponseEntity::ok).orElseGet(() -> ResponseEntity.notFound()
-					.build());
+			if (modelConfiguration.isEmpty()) {
+				throw new ResponseStatusException(HttpStatus.NOT_FOUND, messages.get("modelconfig.not-found"));
+			}
+			return ResponseEntity.ok(modelConfiguration.get());
+		} catch (final Exception e) {
+			log.error("Unable to get model configuration from postgres db", e);
+			throw new ResponseStatusException(
+					org.springframework.http.HttpStatus.SERVICE_UNAVAILABLE,
+					messages.get("postgres.service-unavailable"));
+		}
+	}
+
+	/**
+	 * Create a configured model from a model config
+	 *
+	 * @param id id of the model configuration
+	 * @param projectId associated project for permissions
+	 * @return configured model
+	 */
+	@GetMapping("/as-configured-model/{id}")
+	@Secured(Roles.USER)
+	@Operation(summary = "Gets a specific model configuration by id")
+	@ApiResponses(
+			value = {
+				@ApiResponse(
+						responseCode = "200",
+						description = "Configured model created",
+						content =
+								@Content(
+										mediaType = "application/json",
+										schema = @Schema(implementation = Model.class))),
+				@ApiResponse(
+						responseCode = "404",
+						description = "There was no model or model configuration found by this ID",
+						content = @Content),
+				@ApiResponse(
+						responseCode = "403",
+						description = "User does not have permissions to this model configuration",
+						content = @Content),
+				@ApiResponse(
+						responseCode = "503",
+						description = "There was an issue communicating with back-end services",
+						content = @Content)
+			})
+	public ResponseEntity<Model> getConfiguredModel(
+			@PathVariable("id") final UUID id,
+			@RequestParam(name = "project-id", required = false) final UUID projectId) {
+		final Permission permission =
+				projectService.checkPermissionCanRead(currentUserService.get().getId(), projectId);
+		try {
+
+			final Optional<ModelConfiguration> modelConfiguration = modelConfigurationService.getAsset(id, permission);
+			if (modelConfiguration.isEmpty()) {
+				throw new ResponseStatusException(HttpStatus.NOT_FOUND, messages.get("modelconfig.not-found"));
+			}
+			final Optional<Model> model =
+					modelService.getAsset(modelConfiguration.get().getModelId(), permission);
+			if (model.isEmpty()) {
+				throw new ResponseStatusException(HttpStatus.NOT_FOUND, messages.get("model.not-found"));
+			}
+
+			// TODO: Apply configuration to the Model here. Should this use ModelConfigurationLegacy??
+
+			throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED);
+
 		} catch (final Exception e) {
 			log.error("Unable to get model configuration from postgres db", e);
 			throw new ResponseStatusException(
diff --git a/packages/server/src/main/resources/messages.properties b/packages/server/src/main/resources/messages.properties
index fb6b9a1c9e..aa8484ee55 100644
--- a/packages/server/src/main/resources/messages.properties
+++ b/packages/server/src/main/resources/messages.properties
@@ -32,6 +32,8 @@ model.not-found = We were unable to find the requested model. Please ensure that
 model.unable-to-delete = We were unable to delete the dataset model. Please try again later.
 model.unable-to-update = We were unable to update the dataset model. Please try again later.
 
+modelconfig.not-found = We were unable to find the requested model configuration. Please ensure that the model configuration ID you supplied is correct or contact support.
+
 
 postgres.service-unavailable = Terarium's data storage is temporarily unavailable. Please try again later.
 

From dbc08e039d41cda08885131d422ea45aac241dd7 Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Wed, 5 Jun 2024 09:29:25 -0400
Subject: [PATCH 16/27] fixing relations

---
 .../model/configurations/ModelConfiguration.java            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
index 84793c6c17..97864fa4f8 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
@@ -30,19 +30,19 @@ public class ModelConfiguration extends TerariumAsset {
 	private Map<String, Semantic> values;
 
 	@TSIgnore
-	@OneToMany(mappedBy = "model_configuration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+	@OneToMany(mappedBy = "modelConfiguration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
 	@Schema(accessMode = Schema.AccessMode.READ_ONLY)
 	@JsonManagedReference
 	private List<ObservableSemantic> observableSemanticList;
 
 	@TSIgnore
-	@OneToMany(mappedBy = "model_configuration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+	@OneToMany(mappedBy = "modelConfiguration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
 	@Schema(accessMode = Schema.AccessMode.READ_ONLY)
 	@JsonManagedReference
 	private List<ParameterSemantic> parameterSemanticList;
 
 	@TSIgnore
-	@OneToMany(mappedBy = "model_configuration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+	@OneToMany(mappedBy = "modelConfiguration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
 	@Schema(accessMode = Schema.AccessMode.READ_ONLY)
 	@JsonManagedReference
 	private List<InitialSemantic> initialSemanticList;

From 4a25160abcd72000b34c7866a12a7ce36af98fa3 Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Wed, 5 Jun 2024 09:46:09 -0400
Subject: [PATCH 17/27] Stuffing `values` for front end

---
 .../ModelConfigurationController.java         | 29 +++++++++++++++++++
 .../configurations/ObservableSemantic.java    |  1 +
 .../configurations/ParameterSemantic.java     |  2 ++
 3 files changed, 32 insertions(+)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
index fbca83e6e3..b5aafc0845 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
@@ -7,6 +7,7 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -27,7 +28,10 @@
 import org.springframework.web.server.ResponseStatusException;
 import software.uncharted.terarium.hmiserver.models.dataservice.ResponseDeleted;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.InitialSemantic;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ObservableSemantic;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ParameterSemantic;
 import software.uncharted.terarium.hmiserver.security.Roles;
 import software.uncharted.terarium.hmiserver.service.CurrentUserService;
 import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
@@ -86,6 +90,8 @@ public ResponseEntity<List<ModelConfiguration>> getModelConfigurations(
 			if (modelConfigurations.isEmpty()) {
 				return ResponseEntity.noContent().build();
 			}
+			modelConfigurations.forEach(ModelConfigurationController::stuffModelConfigSemanticsForFrontEnd);
+
 			return ResponseEntity.ok(modelConfigurations);
 		} catch (final Exception e) {
 			log.error("Unable to get model configurations from postgres db", e);
@@ -137,6 +143,7 @@ public ResponseEntity<ModelConfiguration> getModelConfiguration(
 			if (modelConfiguration.isEmpty()) {
 				throw new ResponseStatusException(HttpStatus.NOT_FOUND, messages.get("modelconfig.not-found"));
 			}
+			stuffModelConfigSemanticsForFrontEnd(modelConfiguration.get());
 			return ResponseEntity.ok(modelConfiguration.get());
 		} catch (final Exception e) {
 			log.error("Unable to get model configuration from postgres db", e);
@@ -334,4 +341,26 @@ public ResponseEntity<ResponseDeleted> deleteModelConfiguration(
 					messages.get("postgres.service-unavailable"));
 		}
 	}
+
+	private static void stuffModelConfigSemanticsForFrontEnd(final ModelConfiguration modelConfiguration) {
+		modelConfiguration.setValues(new HashMap<>());
+
+		if (modelConfiguration.getObservableSemanticList() != null) {
+			for (final ObservableSemantic observableSemantic : modelConfiguration.getObservableSemanticList()) {
+				modelConfiguration.getValues().put(observableSemantic.getReferenceID(), observableSemantic);
+			}
+		}
+
+		if (modelConfiguration.getParameterSemanticList() != null) {
+			for (final ParameterSemantic parameterSemantic : modelConfiguration.getParameterSemanticList()) {
+				modelConfiguration.getValues().put(parameterSemantic.getReferenceID(), parameterSemantic);
+			}
+		}
+
+		if (modelConfiguration.getInitialSemanticList() != null) {
+			for (final InitialSemantic initialSemantic : modelConfiguration.getInitialSemanticList()) {
+				modelConfiguration.getValues().put(initialSemantic.getTarget(), initialSemantic);
+			}
+		}
+	}
 }
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
index afae7d6a80..ce744a051d 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
@@ -20,6 +20,7 @@
 @Entity
 public class ObservableSemantic extends Semantic {
 
+	private String referenceID;
 	@Type(JsonType.class)
 	@Column(columnDefinition = "json")
 	private State[] states;
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
index 2987765b62..83f2a3d195 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
@@ -22,6 +22,8 @@
 @Entity
 public class ParameterSemantic extends Semantic {
 
+	private String referenceID;
+
 	private Number value;
 
 	private ModelDistribution distribution;

From 87d89d41c8ecca6e6638b8d2eab1e0cf6aaf9426 Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Wed, 5 Jun 2024 11:20:07 -0400
Subject: [PATCH 18/27] generated types

---
 packages/client/hmi-client/src/types/Types.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index 866338d8bb..631de4d96d 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -243,12 +243,14 @@ export interface ModelConfiguration extends TerariumAsset {
 }
 
 export interface ObservableSemantic extends Semantic {
+    referenceID: string;
     states: State[];
     expression: string;
     modelConfiguration: ModelConfiguration;
 }
 
 export interface ParameterSemantic extends Semantic {
+    referenceID: string;
     value: number;
     distribution: ModelDistribution;
     interventions: Intervention[];

From bcb9676bfed73b17bb9d0552988f04db29387f12 Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Wed, 5 Jun 2024 15:39:14 -0400
Subject: [PATCH 19/27] Removing unused properties

---
 packages/client/hmi-client/src/types/Types.ts     | 15 +++++----------
 .../model/configurations/InitialSemantic.java     |  1 -
 .../model/configurations/ParameterSemantic.java   |  5 -----
 .../model/configurations/Semantic.java            |  2 --
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index 631de4d96d..0735ccc1b5 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -232,7 +232,6 @@ export interface ModelFramework extends TerariumAssetThatSupportsAdditionalPrope
 export interface InitialSemantic extends Semantic {
     target: string;
     expression: string;
-    unit: string;
     modelConfiguration: ModelConfiguration;
 }
 
@@ -251,17 +250,13 @@ export interface ObservableSemantic extends Semantic {
 
 export interface ParameterSemantic extends Semantic {
     referenceID: string;
-    value: number;
     distribution: ModelDistribution;
     interventions: Intervention[];
-    modelUnit: ModelUnit;
     default: boolean;
     modelConfiguration: ModelConfiguration;
 }
 
 export interface Semantic extends TerariumEntity {
-    name: string;
-    description: string;
     source: string;
     type: SemanticType;
 }
@@ -924,17 +919,17 @@ export interface ModelDistribution {
     parameters: { [index: string]: any };
 }
 
-export interface ModelUnit {
-    expression: string;
-    expression_mathml: string;
-}
-
 export interface ModelGrounding {
     identifiers: { [index: string]: any };
     context?: { [index: string]: any };
     modifiers?: any;
 }
 
+export interface ModelUnit {
+    expression: string;
+    expression_mathml: string;
+}
+
 export interface Properties {
     name: string;
     grounding?: ModelGrounding;
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
index 78d0cc3265..5b339bc50c 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
@@ -17,7 +17,6 @@
 public class InitialSemantic extends Semantic {
 	private String target;
 	private String expression;
-	private String unit;
 
 	@ManyToOne
 	@JsonBackReference
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
index 83f2a3d195..f33b7a8661 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
@@ -12,7 +12,6 @@
 import org.hibernate.annotations.Type;
 import software.uncharted.terarium.hmiserver.annotations.TSModel;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelDistribution;
-import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelUnit;
 import software.uncharted.terarium.hmiserver.models.simulationservice.parts.Intervention;
 
 @EqualsAndHashCode(callSuper = true)
@@ -24,8 +23,6 @@ public class ParameterSemantic extends Semantic {
 
 	private String referenceID;
 
-	private Number value;
-
 	private ModelDistribution distribution;
 
 	private boolean isDefault;
@@ -34,8 +31,6 @@ public class ParameterSemantic extends Semantic {
 	@Column(columnDefinition = "json")
 	private Intervention[] interventions;
 
-	private ModelUnit modelUnit;
-
 	@ManyToOne
 	@JsonBackReference
 	@NotNull private ModelConfiguration modelConfiguration;
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java
index fb493949a6..ed18871b64 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java
@@ -14,8 +14,6 @@
 @Entity
 public abstract class Semantic extends TerariumEntity {
 
-	private String name;
-	private String description;
 	private String source;
 	private SemanticType type;
 }

From 5eba2122dae003aaa1ac35dd369162f4c38e9876 Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Wed, 5 Jun 2024 15:44:56 -0400
Subject: [PATCH 20/27] Correct casing

---
 packages/client/hmi-client/src/types/Types.ts                 | 4 ++--
 .../controller/dataservice/ModelConfigurationController.java  | 4 ++--
 .../dataservice/model/configurations/ObservableSemantic.java  | 3 ++-
 .../dataservice/model/configurations/ParameterSemantic.java   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index 0735ccc1b5..5c767d7181 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -242,14 +242,14 @@ export interface ModelConfiguration extends TerariumAsset {
 }
 
 export interface ObservableSemantic extends Semantic {
-    referenceID: string;
+    referenceId: string;
     states: State[];
     expression: string;
     modelConfiguration: ModelConfiguration;
 }
 
 export interface ParameterSemantic extends Semantic {
-    referenceID: string;
+    referenceId: string;
     distribution: ModelDistribution;
     interventions: Intervention[];
     default: boolean;
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
index b5aafc0845..5b283cf3cd 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
@@ -347,13 +347,13 @@ private static void stuffModelConfigSemanticsForFrontEnd(final ModelConfiguratio
 
 		if (modelConfiguration.getObservableSemanticList() != null) {
 			for (final ObservableSemantic observableSemantic : modelConfiguration.getObservableSemanticList()) {
-				modelConfiguration.getValues().put(observableSemantic.getReferenceID(), observableSemantic);
+				modelConfiguration.getValues().put(observableSemantic.getReferenceId(), observableSemantic);
 			}
 		}
 
 		if (modelConfiguration.getParameterSemanticList() != null) {
 			for (final ParameterSemantic parameterSemantic : modelConfiguration.getParameterSemanticList()) {
-				modelConfiguration.getValues().put(parameterSemantic.getReferenceID(), parameterSemantic);
+				modelConfiguration.getValues().put(parameterSemantic.getReferenceId(), parameterSemantic);
 			}
 		}
 
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
index ce744a051d..6f9fa6b9ac 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
@@ -20,7 +20,8 @@
 @Entity
 public class ObservableSemantic extends Semantic {
 
-	private String referenceID;
+	private String referenceId;
+
 	@Type(JsonType.class)
 	@Column(columnDefinition = "json")
 	private State[] states;
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
index f33b7a8661..8bd18b5ec7 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
@@ -21,7 +21,7 @@
 @Entity
 public class ParameterSemantic extends Semantic {
 
-	private String referenceID;
+	private String referenceId;
 
 	private ModelDistribution distribution;
 

From a30b5fde253b13373de79a2c0cde36e22f334820 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 7 Jun 2024 18:54:41 +0000
Subject: [PATCH 21/27] chore: lint and format server codebase

---
 .../hmiserver/controller/dataservice/ModelController.java      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java
index 061fa27d1a..5a0429f7b5 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelController.java
@@ -430,7 +430,8 @@ ResponseEntity<Model> createModel(
 												@ArraySchema(
 														schema =
 																@io.swagger.v3.oas.annotations.media.Schema(
-																		implementation = ModelConfigurationLegacy.class)))),
+																		implementation =
+																				ModelConfigurationLegacy.class)))),
 				@ApiResponse(
 						responseCode = "500",
 						description = "There was an issue retrieving configurations from the data store",

From 8b3a4a8c51cfe94d0f559d1541e16d21719ad9ba Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Mon, 10 Jun 2024 11:55:35 -0400
Subject: [PATCH 22/27] Removing `values` map

---
 packages/client/hmi-client/src/types/Types.ts |  4 ++-
 .../ModelConfigurationController.java         | 28 -------------------
 .../configurations/ModelConfiguration.java    |  9 ------
 3 files changed, 3 insertions(+), 38 deletions(-)

diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index 5c767d7181..9abcd4cbec 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -238,7 +238,9 @@ export interface InitialSemantic extends Semantic {
 export interface ModelConfiguration extends TerariumAsset {
     calibrationRunId: string;
     modelId: string;
-    values: { [index: string]: Semantic };
+    observableSemanticList: ObservableSemantic[];
+    parameterSemanticList: ParameterSemantic[];
+    initialSemanticList: InitialSemantic[];
 }
 
 export interface ObservableSemantic extends Semantic {
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
index 5b283cf3cd..680c5b7704 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
@@ -7,7 +7,6 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
@@ -28,10 +27,7 @@
 import org.springframework.web.server.ResponseStatusException;
 import software.uncharted.terarium.hmiserver.models.dataservice.ResponseDeleted;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.InitialSemantic;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ModelConfiguration;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ObservableSemantic;
-import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ParameterSemantic;
 import software.uncharted.terarium.hmiserver.security.Roles;
 import software.uncharted.terarium.hmiserver.service.CurrentUserService;
 import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
@@ -90,7 +86,6 @@ public ResponseEntity<List<ModelConfiguration>> getModelConfigurations(
 			if (modelConfigurations.isEmpty()) {
 				return ResponseEntity.noContent().build();
 			}
-			modelConfigurations.forEach(ModelConfigurationController::stuffModelConfigSemanticsForFrontEnd);
 
 			return ResponseEntity.ok(modelConfigurations);
 		} catch (final Exception e) {
@@ -143,7 +138,6 @@ public ResponseEntity<ModelConfiguration> getModelConfiguration(
 			if (modelConfiguration.isEmpty()) {
 				throw new ResponseStatusException(HttpStatus.NOT_FOUND, messages.get("modelconfig.not-found"));
 			}
-			stuffModelConfigSemanticsForFrontEnd(modelConfiguration.get());
 			return ResponseEntity.ok(modelConfiguration.get());
 		} catch (final Exception e) {
 			log.error("Unable to get model configuration from postgres db", e);
@@ -341,26 +335,4 @@ public ResponseEntity<ResponseDeleted> deleteModelConfiguration(
 					messages.get("postgres.service-unavailable"));
 		}
 	}
-
-	private static void stuffModelConfigSemanticsForFrontEnd(final ModelConfiguration modelConfiguration) {
-		modelConfiguration.setValues(new HashMap<>());
-
-		if (modelConfiguration.getObservableSemanticList() != null) {
-			for (final ObservableSemantic observableSemantic : modelConfiguration.getObservableSemanticList()) {
-				modelConfiguration.getValues().put(observableSemantic.getReferenceId(), observableSemantic);
-			}
-		}
-
-		if (modelConfiguration.getParameterSemanticList() != null) {
-			for (final ParameterSemantic parameterSemantic : modelConfiguration.getParameterSemanticList()) {
-				modelConfiguration.getValues().put(parameterSemantic.getReferenceId(), parameterSemantic);
-			}
-		}
-
-		if (modelConfiguration.getInitialSemanticList() != null) {
-			for (final InitialSemantic initialSemantic : modelConfiguration.getInitialSemanticList()) {
-				modelConfiguration.getValues().put(initialSemantic.getTarget(), initialSemantic);
-			}
-		}
-	}
 }
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
index 97864fa4f8..4843544a11 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
@@ -6,14 +6,11 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.OneToMany;
-import jakarta.persistence.Transient;
 import java.util.List;
-import java.util.Map;
 import java.util.UUID;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-import software.uncharted.terarium.hmiserver.annotations.TSIgnore;
 import software.uncharted.terarium.hmiserver.annotations.TSModel;
 import software.uncharted.terarium.hmiserver.models.TerariumAsset;
 
@@ -26,22 +23,16 @@ public class ModelConfiguration extends TerariumAsset {
 	private UUID calibrationRunId;
 	private UUID modelId;
 
-	@Transient
-	private Map<String, Semantic> values;
-
-	@TSIgnore
 	@OneToMany(mappedBy = "modelConfiguration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
 	@Schema(accessMode = Schema.AccessMode.READ_ONLY)
 	@JsonManagedReference
 	private List<ObservableSemantic> observableSemanticList;
 
-	@TSIgnore
 	@OneToMany(mappedBy = "modelConfiguration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
 	@Schema(accessMode = Schema.AccessMode.READ_ONLY)
 	@JsonManagedReference
 	private List<ParameterSemantic> parameterSemanticList;
 
-	@TSIgnore
 	@OneToMany(mappedBy = "modelConfiguration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
 	@Schema(accessMode = Schema.AccessMode.READ_ONLY)
 	@JsonManagedReference

From a3c56616d5908bd77e18c1b974c529c221822cde Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Mon, 10 Jun 2024 15:10:10 -0400
Subject: [PATCH 23/27] Fixing swagger implementation

---
 .../model/configurations/InitialSemantic.java         |  2 ++
 .../model/configurations/ModelConfiguration.java      | 11 ++++-------
 .../model/configurations/ObservableSemantic.java      |  2 ++
 .../model/configurations/ParameterSemantic.java       |  2 ++
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
index 5b339bc50c..253ae903dc 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
@@ -1,6 +1,7 @@
 package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Entity;
 import jakarta.persistence.ManyToOne;
 import jakarta.validation.constraints.NotNull;
@@ -20,5 +21,6 @@ public class InitialSemantic extends Semantic {
 
 	@ManyToOne
 	@JsonBackReference
+	@Schema(hidden = true)
 	@NotNull private ModelConfiguration modelConfiguration;
 }
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
index 4843544a11..874759f996 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ModelConfiguration.java
@@ -1,11 +1,11 @@
 package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
 
 import com.fasterxml.jackson.annotation.JsonManagedReference;
-import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.OneToMany;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
 import lombok.Data;
@@ -24,17 +24,14 @@ public class ModelConfiguration extends TerariumAsset {
 	private UUID modelId;
 
 	@OneToMany(mappedBy = "modelConfiguration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
-	@Schema(accessMode = Schema.AccessMode.READ_ONLY)
 	@JsonManagedReference
-	private List<ObservableSemantic> observableSemanticList;
+	private List<ObservableSemantic> observableSemanticList = new ArrayList<>();
 
 	@OneToMany(mappedBy = "modelConfiguration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
-	@Schema(accessMode = Schema.AccessMode.READ_ONLY)
 	@JsonManagedReference
-	private List<ParameterSemantic> parameterSemanticList;
+	private List<ParameterSemantic> parameterSemanticList = new ArrayList<>();
 
 	@OneToMany(mappedBy = "modelConfiguration", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
-	@Schema(accessMode = Schema.AccessMode.READ_ONLY)
 	@JsonManagedReference
-	private List<InitialSemantic> initialSemanticList;
+	private List<InitialSemantic> initialSemanticList = new ArrayList<>();
 }
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
index 6f9fa6b9ac..4ec33ebbfd 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.hypersistence.utils.hibernate.type.json.JsonType;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.ManyToOne;
@@ -30,5 +31,6 @@ public class ObservableSemantic extends Semantic {
 
 	@ManyToOne
 	@JsonBackReference
+	@Schema(hidden = true)
 	@NotNull private ModelConfiguration modelConfiguration;
 }
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
index 8bd18b5ec7..0a9f7e3795 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.hypersistence.utils.hibernate.type.json.JsonType;
+import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.ManyToOne;
@@ -33,5 +34,6 @@ public class ParameterSemantic extends Semantic {
 
 	@ManyToOne
 	@JsonBackReference
+	@Schema(hidden = true)
 	@NotNull private ModelConfiguration modelConfiguration;
 }

From 6e7f1bf9af6292fd024119c78a55da8e94ed7ef7 Mon Sep 17 00:00:00 2001
From: Cole Blanchard <33158416+blanchco@users.noreply.github.com>
Date: Tue, 11 Jun 2024 11:17:38 -0400
Subject: [PATCH 24/27] Function to create an AMR model structure from model
 configuration (#3811)

Co-authored-by: Cole Blanchard <cblanchard@Cole-Blanchards-MacBook-Pro.local>
Co-authored-by: dvince <dvince@uncharted.software>
---
 .../ModelConfigurationController.java         | 82 ++++++++++++++++++-
 .../models/dataservice/model/Model.java       |  7 ++
 .../model/configurations/InitialSemantic.java |  1 +
 .../configurations/ObservableSemantic.java    | 10 ++-
 4 files changed, 92 insertions(+), 8 deletions(-)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
index 680c5b7704..b3ee55a1a0 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
@@ -7,7 +7,9 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 import lombok.RequiredArgsConstructor;
@@ -27,7 +29,13 @@
 import org.springframework.web.server.ResponseStatusException;
 import software.uncharted.terarium.hmiserver.models.dataservice.ResponseDeleted;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.InitialSemantic;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ObservableSemantic;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ParameterSemantic;
+import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelParameter;
+import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.Initial;
+import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.Observable;
 import software.uncharted.terarium.hmiserver.security.Roles;
 import software.uncharted.terarium.hmiserver.service.CurrentUserService;
 import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
@@ -47,6 +55,9 @@ public class ModelConfigurationController {
 	final Messages messages;
 	final ProjectService projectService;
 
+	private static final String CONSTANT_TYPE = "Constant";
+	private static final String VALUE_PARAM = "value";
+
 	/**
 	 * Gets all model configurations (which are visible to this user)
 	 *
@@ -195,10 +206,12 @@ public ResponseEntity<Model> getConfiguredModel(
 			if (model.isEmpty()) {
 				throw new ResponseStatusException(HttpStatus.NOT_FOUND, messages.get("model.not-found"));
 			}
-
-			// TODO: Apply configuration to the Model here. Should this use ModelConfigurationLegacy??
-
-			throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED);
+			setModelParameters(
+					model.get().getParameters(), modelConfiguration.get().getParameterSemanticList());
+			setModelInitials(
+					model.get().getInitials(), modelConfiguration.get().getInitialSemanticList());
+			setModelObservables(model.get().getObservables(), modelConfiguration.get().getObservableSemanticList());
+			return ResponseEntity.ok(model.get());
 
 		} catch (final Exception e) {
 			log.error("Unable to get model configuration from postgres db", e);
@@ -335,4 +348,65 @@ public ResponseEntity<ResponseDeleted> deleteModelConfiguration(
 					messages.get("postgres.service-unavailable"));
 		}
 	}
+
+	private void setModelParameters(
+			final List<ModelParameter> modelParameters, final List<ParameterSemantic> configParameters) {
+		// Create a map from ConfigParameter IDs to ConfigParameter objects
+		final Map<String, ParameterSemantic> configParameterMap = new HashMap<>();
+		for (final ParameterSemantic configParameter : configParameters) {
+			configParameterMap.put(configParameter.getReferenceId(), configParameter);
+		}
+
+		// Iterate through the list of ModelParameter objects
+		for (final ModelParameter modelParameter : modelParameters) {
+			// Look up the corresponding ConfigParameter in the map
+			final ParameterSemantic matchingConfigParameter = configParameterMap.get(modelParameter.getId());
+			if (matchingConfigParameter != null) {
+				// set distributions
+				if (CONSTANT_TYPE.equals(
+						matchingConfigParameter.getDistribution().getType())) {
+					modelParameter.setValue((Double) matchingConfigParameter
+							.getDistribution()
+							.getParameters()
+							.get(VALUE_PARAM));
+					modelParameter.setDistribution(null);
+				} else {
+					modelParameter.setDistribution(matchingConfigParameter.getDistribution());
+				}
+			}
+		}
+	}
+
+	private void setModelInitials(
+			final List<Initial> modelInitials, final List<InitialSemantic> configInitials) {
+		final Map<String, InitialSemantic> configInitialMap = new HashMap<>();
+		for (final InitialSemantic configInitial : configInitials) {
+			configInitialMap.put(configInitial.getTarget(), configInitial);
+		}
+
+		for (final Initial modelInitial : modelInitials) {
+			final InitialSemantic matchingConfigInitial = configInitialMap.get(modelInitial.getTarget());
+			if (matchingConfigInitial != null) {
+				modelInitial.setExpression(matchingConfigInitial.getExpression());
+				modelInitial.setExpressionMathml(matchingConfigInitial.getExpressionMathml());
+			}
+		}
+	}
+
+	private void setModelObservables(
+		final List<Observable> modelObservables, final List<ObservableSemantic> configObservables) {
+		final Map<String, ObservableSemantic> configObservableMap = new HashMap<>();
+		for (final ObservableSemantic configObservable : configObservables) {
+			configObservableMap.put(configObservable.getReferenceId(), configObservable);
+		}
+
+		for (final Observable modelObservable : modelObservables) {
+			final ObservableSemantic matchingConfigObservable = configObservableMap.get(modelObservable.getId());
+			if (matchingConfigObservable != null) {
+				modelObservable.setStates(matchingConfigObservable.getStates());
+				modelObservable.setExpression(matchingConfigObservable.getExpression());
+				modelObservable.setExpressionMathml(matchingConfigObservable.getExpressionMathml());
+			}
+		}
+	}
 }
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/Model.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/Model.java
index 8bc5a6ccf5..ac48da49a4 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/Model.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/Model.java
@@ -24,6 +24,7 @@
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelParameter;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelSemantics;
 import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.Initial;
+import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.Observable;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -94,6 +95,12 @@ public Model clone() {
 		return clone;
 	}
 
+@JsonIgnore
+@TSIgnore
+public List<Observable> getObservables() {
+	return this.getSemantics().getOde().getObservables();
+}
+
 	@JsonIgnore
 	@TSIgnore
 	public List<ModelParameter> getParameters() {
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
index 253ae903dc..7b9f072721 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
@@ -18,6 +18,7 @@
 public class InitialSemantic extends Semantic {
 	private String target;
 	private String expression;
+	private String expressionMathml;
 
 	@ManyToOne
 	@JsonBackReference
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
index 4ec33ebbfd..ccdd444e1c 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
@@ -10,9 +10,11 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+
+import java.util.List;
+
 import org.hibernate.annotations.Type;
 import software.uncharted.terarium.hmiserver.annotations.TSModel;
-import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.State;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -23,12 +25,12 @@ public class ObservableSemantic extends Semantic {
 
 	private String referenceId;
 
-	@Type(JsonType.class)
-	@Column(columnDefinition = "json")
-	private State[] states;
+	private List<String> states;
 
 	private String expression;
 
+	private String expressionMathml;
+
 	@ManyToOne
 	@JsonBackReference
 	@Schema(hidden = true)

From 94c12f8dce6fcbd71443a2d0eece6a7002383041 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 11 Jun 2024 15:18:19 +0000
Subject: [PATCH 25/27] chore: lint and format server codebase

---
 .../dataservice/ModelConfigurationController.java     | 11 +++++------
 .../hmiserver/models/dataservice/model/Model.java     | 10 +++++-----
 .../model/configurations/ObservableSemantic.java      |  7 +------
 3 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
index b3ee55a1a0..06732161b6 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/ModelConfigurationController.java
@@ -208,9 +208,9 @@ public ResponseEntity<Model> getConfiguredModel(
 			}
 			setModelParameters(
 					model.get().getParameters(), modelConfiguration.get().getParameterSemanticList());
-			setModelInitials(
-					model.get().getInitials(), modelConfiguration.get().getInitialSemanticList());
-			setModelObservables(model.get().getObservables(), modelConfiguration.get().getObservableSemanticList());
+			setModelInitials(model.get().getInitials(), modelConfiguration.get().getInitialSemanticList());
+			setModelObservables(
+					model.get().getObservables(), modelConfiguration.get().getObservableSemanticList());
 			return ResponseEntity.ok(model.get());
 
 		} catch (final Exception e) {
@@ -377,8 +377,7 @@ private void setModelParameters(
 		}
 	}
 
-	private void setModelInitials(
-			final List<Initial> modelInitials, final List<InitialSemantic> configInitials) {
+	private void setModelInitials(final List<Initial> modelInitials, final List<InitialSemantic> configInitials) {
 		final Map<String, InitialSemantic> configInitialMap = new HashMap<>();
 		for (final InitialSemantic configInitial : configInitials) {
 			configInitialMap.put(configInitial.getTarget(), configInitial);
@@ -394,7 +393,7 @@ private void setModelInitials(
 	}
 
 	private void setModelObservables(
-		final List<Observable> modelObservables, final List<ObservableSemantic> configObservables) {
+			final List<Observable> modelObservables, final List<ObservableSemantic> configObservables) {
 		final Map<String, ObservableSemantic> configObservableMap = new HashMap<>();
 		for (final ObservableSemantic configObservable : configObservables) {
 			configObservableMap.put(configObservable.getReferenceId(), configObservable);
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/Model.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/Model.java
index ac48da49a4..8ce966e656 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/Model.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/Model.java
@@ -95,11 +95,11 @@ public Model clone() {
 		return clone;
 	}
 
-@JsonIgnore
-@TSIgnore
-public List<Observable> getObservables() {
-	return this.getSemantics().getOde().getObservables();
-}
+	@JsonIgnore
+	@TSIgnore
+	public List<Observable> getObservables() {
+		return this.getSemantics().getOde().getObservables();
+	}
 
 	@JsonIgnore
 	@TSIgnore
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
index ccdd444e1c..0debb58001 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
@@ -1,19 +1,14 @@
 package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
-import io.hypersistence.utils.hibernate.type.json.JsonType;
 import io.swagger.v3.oas.annotations.media.Schema;
-import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.ManyToOne;
 import jakarta.validation.constraints.NotNull;
+import java.util.List;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
-
-import java.util.List;
-
-import org.hibernate.annotations.Type;
 import software.uncharted.terarium.hmiserver.annotations.TSModel;
 
 @EqualsAndHashCode(callSuper = true)

From 9f0373b3bdfd38e8f0a3e294f860026e6a3df5a4 Mon Sep 17 00:00:00 2001
From: blanchco <blanchco@users.noreply.github.com>
Date: Tue, 11 Jun 2024 15:19:50 +0000
Subject: [PATCH 26/27] chore: update generated types

---
 packages/client/hmi-client/src/types/Types.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/client/hmi-client/src/types/Types.ts b/packages/client/hmi-client/src/types/Types.ts
index 9abcd4cbec..02d3729f9b 100644
--- a/packages/client/hmi-client/src/types/Types.ts
+++ b/packages/client/hmi-client/src/types/Types.ts
@@ -232,6 +232,7 @@ export interface ModelFramework extends TerariumAssetThatSupportsAdditionalPrope
 export interface InitialSemantic extends Semantic {
     target: string;
     expression: string;
+    expressionMathml: string;
     modelConfiguration: ModelConfiguration;
 }
 
@@ -245,8 +246,9 @@ export interface ModelConfiguration extends TerariumAsset {
 
 export interface ObservableSemantic extends Semantic {
     referenceId: string;
-    states: State[];
+    states: string[];
     expression: string;
+    expressionMathml: string;
     modelConfiguration: ModelConfiguration;
 }
 

From e27c98ea1c2dd5efd35945e53b3ebddab3315545 Mon Sep 17 00:00:00 2001
From: dvince <dvince@uncharted.software>
Date: Tue, 11 Jun 2024 13:19:59 -0400
Subject: [PATCH 27/27] Correct Schemas

---
 .../dataservice/model/configurations/InitialSemantic.java  | 7 +++++++
 .../model/configurations/ObservableSemantic.java           | 7 +++++++
 .../model/configurations/ParameterSemantic.java            | 2 ++
 .../models/dataservice/model/configurations/Semantic.java  | 3 +++
 4 files changed, 19 insertions(+)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
index 7b9f072721..dba0076a0e 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/InitialSemantic.java
@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.ManyToOne;
 import jakarta.validation.constraints.NotNull;
@@ -16,8 +17,14 @@
 @TSModel
 @Entity
 public class InitialSemantic extends Semantic {
+
+	@Column(columnDefinition = "text")
 	private String target;
+
+	@Column(columnDefinition = "text")
 	private String expression;
+
+	@Column(columnDefinition = "text")
 	private String expressionMathml;
 
 	@ManyToOne
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
index 0debb58001..b96a35c796 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ObservableSemantic.java
@@ -1,7 +1,9 @@
 package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
 
 import com.fasterxml.jackson.annotation.JsonBackReference;
+import io.hypersistence.utils.hibernate.type.json.JsonType;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.ManyToOne;
 import jakarta.validation.constraints.NotNull;
@@ -9,6 +11,7 @@
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
+import org.hibernate.annotations.Type;
 import software.uncharted.terarium.hmiserver.annotations.TSModel;
 
 @EqualsAndHashCode(callSuper = true)
@@ -20,10 +23,14 @@ public class ObservableSemantic extends Semantic {
 
 	private String referenceId;
 
+	@Type(JsonType.class)
+	@Column(columnDefinition = "json")
 	private List<String> states;
 
+	@Column(columnDefinition = "text")
 	private String expression;
 
+	@Column(columnDefinition = "text")
 	private String expressionMathml;
 
 	@ManyToOne
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
index 0a9f7e3795..e23e660072 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/ParameterSemantic.java
@@ -24,6 +24,8 @@ public class ParameterSemantic extends Semantic {
 
 	private String referenceId;
 
+	@Type(JsonType.class)
+	@Column(columnDefinition = "json")
 	private ModelDistribution distribution;
 
 	private boolean isDefault;
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java
index ed18871b64..806686f22c 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/models/dataservice/model/configurations/Semantic.java
@@ -1,5 +1,6 @@
 package software.uncharted.terarium.hmiserver.models.dataservice.model.configurations;
 
+import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -14,6 +15,8 @@
 @Entity
 public abstract class Semantic extends TerariumEntity {
 
+	@Column(columnDefinition = "text")
 	private String source;
+
 	private SemanticType type;
 }