From c7f9b1f61c52240ad3311bd6332b18bf01e361d4 Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Cole-Blanchards-MacBook-Pro.local>
Date: Tue, 24 Sep 2024 14:03:26 -0400
Subject: [PATCH 1/6] save for reuse for simulation assets

---
 .../project/tera-save-simulation-modal.vue    |  63 +++++++++
 .../tera-calibrate-ciemss-drilldown.vue       |  16 ++-
 .../tera-optimize-ciemss-drilldown.vue        |  14 +-
 .../tera-simulate-ciemss-drilldown.vue        |  40 +++---
 .../src/services/models/simulation-service.ts |  24 +++-
 .../dataservice/SimulationController.java     | 126 ++++++++++++------
 .../service/data/SimulationService.java       |  58 +++++++-
 7 files changed, 263 insertions(+), 78 deletions(-)
 create mode 100644 packages/client/hmi-client/src/components/project/tera-save-simulation-modal.vue

diff --git a/packages/client/hmi-client/src/components/project/tera-save-simulation-modal.vue b/packages/client/hmi-client/src/components/project/tera-save-simulation-modal.vue
new file mode 100644
index 0000000000..d77fa06f13
--- /dev/null
+++ b/packages/client/hmi-client/src/components/project/tera-save-simulation-modal.vue
@@ -0,0 +1,63 @@
+<template>
+	<tera-modal
+		v-if="isVisible"
+		class="w-4"
+		@modal-mask-clicked="closeModal"
+		@on-modal-open="newName = props.initialName ?? ''"
+		@modal-enter-press="save"
+	>
+		<template #header>
+			<h4>Save simulation assets</h4>
+		</template>
+		<template #default>
+			<form @submit.prevent>
+				<label for="new-name">What would you like to call it?</label>
+				<tera-input-text id="new-name" v-model="newName" placeholder="Enter a unique name" />
+			</form>
+		</template>
+		<template #footer>
+			<Button label="Save" size="large" @click="save" />
+			<Button label="Close" class="p-button-secondary" size="large" outlined @click="closeModal" />
+		</template>
+	</tera-modal>
+</template>
+
+<script setup lang="ts">
+import TeraModal from '@/components/widgets/tera-modal.vue';
+import Button from 'primevue/button';
+import TeraInputText from '@/components/widgets/tera-input-text.vue';
+import { SimulationType } from '@/types/Types';
+import { ref } from 'vue';
+import { useProjects } from '@/composables/project';
+import { createSimulationAssets } from '@/services/models/simulation-service';
+
+const props = defineProps<{
+	initialName?: string;
+	isVisible: boolean;
+	simulationOptions: { id: string; type: SimulationType };
+	assetId?: string;
+}>();
+
+const newName = ref('');
+
+const emit = defineEmits(['close-modal', 'on-save']);
+
+function save() {
+	createSimulationAssets(
+		useProjects().activeProjectId.value,
+		props.simulationOptions.id,
+		props.simulationOptions.type,
+		newName.value,
+		props.assetId
+	).then((data) => {
+		useProjects().refresh();
+		closeModal();
+		emit('on-save', data);
+	});
+}
+
+function closeModal() {
+	newName.value = '';
+	emit('close-modal');
+}
+</script>
diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue
index 04ab681fde..48e3f961c2 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue
@@ -373,14 +373,16 @@
 			</tera-slider-panel>
 		</template>
 	</tera-drilldown>
-	<tera-save-asset-modal
+	<tera-save-simulation-modal
 		:initial-name="configuredModelConfig?.name"
 		:is-visible="showSaveModal"
-		:asset="configuredModelConfig"
-		:asset-type="AssetType.ModelConfiguration"
+		:asset-id="configuredModelConfig?.id"
 		@close-modal="showSaveModal = false"
 		@on-save="onSaveAsModelConfiguration"
-		is-updating-asset
+		:simulation-options="{
+			id: node.state.forecastId,
+			type: SimulationType.Calibration
+		}"
 	/>
 </template>
 
@@ -418,9 +420,9 @@ import {
 	CsvAsset,
 	DatasetColumn,
 	ModelConfiguration,
-	AssetType,
 	ChartAnnotation,
-	InterventionPolicy
+	InterventionPolicy,
+	SimulationType
 } from '@/types/Types';
 import { CiemssPresetTypes, DrilldownTabs, ChartSetting, ChartSettingType } from '@/types/common';
 import { getTimespan, drilldownChartSize, nodeMetadata } from '@/components/workflow/util';
@@ -451,7 +453,7 @@ import TeraChartControl from '@/components/workflow/tera-chart-control.vue';
 import TeraInputText from '@/components/widgets/tera-input-text.vue';
 import { displayNumber } from '@/utils/number';
 import TeraPyciemssCancelButton from '@/components/pyciemss/tera-pyciemss-cancel-button.vue';
-import TeraSaveAssetModal from '@/components/project/tera-save-asset-modal.vue';
+import TeraSaveSimulationModal from '@/components/project/tera-save-simulation-modal.vue';
 import { useClientEvent } from '@/composables/useClientEvent';
 import { getInterventionPolicyById } from '@/services/intervention-policy';
 import TeraInterventionSummaryCard from '@/components/workflow/ops/simulate-ciemss/tera-intervention-summary-card.vue';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
index 830c445961..694b5b165a 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
@@ -372,14 +372,16 @@
 			@click="saveModelConfiguration"
 		/>
 	</Dialog>
-	<tera-save-asset-modal
+	<tera-save-simulation-modal
 		:initial-name="optimizedInterventionPolicy?.name"
 		:is-visible="showSaveInterventionPolicy"
-		:asset="optimizedInterventionPolicy"
-		:asset-type="AssetType.InterventionPolicy"
+		:asset-id="optimizedInterventionPolicy?.id"
 		@close-modal="showSaveInterventionPolicy = false"
 		@on-save="onSaveForReuse"
-		is-updating-asset
+		:simulation-options="{
+			id: node.state.postForecastRunId,
+			type: SimulationType.Optimization
+		}"
 	/>
 </template>
 
@@ -391,7 +393,7 @@ import Dropdown from 'primevue/dropdown';
 import TeraInputText from '@/components/widgets/tera-input-text.vue';
 import SelectButton from 'primevue/selectbutton';
 import Dialog from 'primevue/dialog';
-import TeraSaveAssetModal from '@/components/project/tera-save-asset-modal.vue';
+import TeraSaveSimulationModal from '@/components/project/tera-save-simulation-modal.vue';
 import TeraDatasetDatatable from '@/components/dataset/tera-dataset-datatable.vue';
 import TeraDrilldown from '@/components/drilldown/tera-drilldown.vue';
 import TeraDrilldownSection from '@/components/drilldown/tera-drilldown-section.vue';
@@ -419,7 +421,7 @@ import {
 	OptimizeInterventions,
 	OptimizeQoi,
 	OptimizeRequestCiemss,
-	AssetType
+	SimulationType
 } from '@/types/Types';
 import { logger } from '@/utils/logger';
 import { drilldownChartSize, nodeMetadata } from '@/components/workflow/util';
diff --git a/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-ciemss-drilldown.vue
index 031543f554..2a9eaa4f3a 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-ciemss-drilldown.vue
@@ -118,15 +118,10 @@
 
 		<!-- Preview -->
 		<template #preview>
-			<tera-drilldown-preview
-				v-if="selectedOutputId"
-				title="Simulation output"
-				:options="outputs"
-				v-model:output="selectedOutputId"
-				@update:selection="onSelection"
-				:is-loading="showSpinner"
-				is-selectable
-			>
+			<tera-drilldown-section v-if="selectedOutputId" :is-loading="showSpinner">
+				<template #header-controls-right>
+					<Button label="Save for re-use" severity="secondary" outlined @click="showSaveDataset = true" />
+				</template>
 				<tera-operator-output-summary
 					v-if="node.state.summaryId && runResults[selectedRunId]"
 					:summary-id="node.state.summaryId"
@@ -186,7 +181,7 @@
 						/>
 					</div>
 				</template>
-			</tera-drilldown-preview>
+			</tera-drilldown-section>
 
 			<!-- Empty state -->
 			<section v-else class="empty-state">
@@ -195,6 +190,14 @@
 			</section>
 		</template>
 	</tera-drilldown>
+	<tera-save-simulation-modal
+		:is-visible="showSaveDataset"
+		@close-modal="showSaveDataset = false"
+		:simulation-options="{
+			id: node.state.forecastId,
+			type: SimulationType.Simulation
+		}"
+	/>
 </template>
 
 <script setup lang="ts">
@@ -207,6 +210,7 @@ import EmptySeed from '@/assets/images/lottie-empty-seed.json';
 import TeraInputNumber from '@/components/widgets/tera-input-number.vue';
 import TeraSliderPanel from '@/components/widgets/tera-slider-panel.vue';
 import type { CsvAsset, InterventionPolicy, SimulationRequest, TimeSpan } from '@/types/Types';
+import { SimulationType } from '@/types/Types';
 import type { WorkflowNode } from '@/types/workflow';
 import {
 	getRunResultCSV,
@@ -223,7 +227,6 @@ import TeraDatasetDatatable from '@/components/dataset/tera-dataset-datatable.vu
 import SelectButton from 'primevue/selectbutton';
 import TeraDrilldown from '@/components/drilldown/tera-drilldown.vue';
 import TeraDrilldownSection from '@/components/drilldown/tera-drilldown-section.vue';
-import TeraDrilldownPreview from '@/components/drilldown/tera-drilldown-preview.vue';
 import TeraPyciemssCancelButton from '@/components/pyciemss/tera-pyciemss-cancel-button.vue';
 import TeraNotebookError from '@/components/drilldown/tera-notebook-error.vue';
 import TeraOperatorOutputSummary from '@/components/operator/tera-operator-output-summary.vue';
@@ -239,6 +242,7 @@ import { CiemssPresetTypes, DrilldownTabs } from '@/types/common';
 import { getModelConfigurationById } from '@/services/model-configurations';
 import { getInterventionPolicyById } from '@/services/intervention-policy';
 import TeraInterventionSummaryCard from '@/components/workflow/ops/simulate-ciemss/tera-intervention-summary-card.vue';
+import TeraSaveSimulationModal from '@/components/project/tera-save-simulation-modal.vue';
 import { SimulateCiemssOperationState } from './simulate-ciemss-operation';
 import TeraChartControl from '../../tera-chart-control.vue';
 
@@ -302,18 +306,6 @@ let pyciemssMap: Record<string, string> = {};
 
 const kernelManager = new KernelSessionManager();
 
-const outputs = computed(() => {
-	if (!_.isEmpty(props.node.outputs)) {
-		return [
-			{
-				label: 'Select an output',
-				items: props.node.outputs
-			}
-		];
-	}
-	return [];
-});
-
 const presetType = computed(() => {
 	if (numSamples.value === speedValues.numSamples && method.value === speedValues.method) {
 		return CiemssPresetTypes.Fast;
@@ -332,6 +324,8 @@ const cancelRunId = computed(() => props.node.state.inProgressForecastId);
 const outputPanel = ref(null);
 const chartSize = computed(() => drilldownChartSize(outputPanel.value));
 
+const showSaveDataset = ref(false);
+
 const chartProxy = chartActionsProxy(props.node, (state: SimulateCiemssOperationState) => {
 	emit('update-state', state);
 });
diff --git a/packages/client/hmi-client/src/services/models/simulation-service.ts b/packages/client/hmi-client/src/services/models/simulation-service.ts
index f65f8a835b..bce65c8101 100644
--- a/packages/client/hmi-client/src/services/models/simulation-service.ts
+++ b/packages/client/hmi-client/src/services/models/simulation-service.ts
@@ -12,13 +12,16 @@ import {
 	ProgressState,
 	Simulation,
 	SimulationRequest,
-	CsvAsset
+	CsvAsset,
+	SimulationType,
+	TerariumAsset
 } from '@/types/Types';
 import { RunResults } from '@/types/SimulateConfig';
 import * as EventService from '@/services/event';
 import { useProjects } from '@/composables/project';
 import { subscribe, unsubscribe } from '@/services/ClientEventService';
 import { FIFOCache } from '@/utils/FifoCache';
+import { AxiosResponse } from 'axios';
 
 export type DataArray = Record<string, any>[];
 
@@ -245,6 +248,25 @@ export async function makeEnsembleCiemssCalibration(params: EnsembleCalibrationC
 	}
 }
 
+export async function createSimulationAssets(
+	projectId: string,
+	simulationId: string,
+	simulationType: SimulationType,
+	newName: string | null,
+	assetId?: string
+) {
+	try {
+		const response: AxiosResponse<TerariumAsset[]> = await API.post(
+			`/simulations/${simulationId}/create-assets-from-simulation/${projectId}?name=${newName}&simulation-type=${simulationType}${assetId ? `&asset-id=${assetId}` : ''}`
+		);
+		const output = response.data;
+		return output;
+	} catch (err) {
+		logger.error(err);
+		return null;
+	}
+}
+
 export async function subscribeToUpdateMessages(
 	simulationIds: string[],
 	eventType: ClientEventType,
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
index e2c62f789c..1d48de31ee 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
@@ -1,16 +1,12 @@
 package software.uncharted.terarium.hmiserver.controller.dataservice;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.Operation;
 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 jakarta.transaction.Transactional;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -32,21 +28,23 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.server.ResponseStatusException;
 import software.uncharted.terarium.hmiserver.configuration.Config;
-import software.uncharted.terarium.hmiserver.models.dataservice.AssetType;
+import software.uncharted.terarium.hmiserver.models.TerariumAsset;
 import software.uncharted.terarium.hmiserver.models.dataservice.PresignedURL;
 import software.uncharted.terarium.hmiserver.models.dataservice.dataset.Dataset;
-import software.uncharted.terarium.hmiserver.models.dataservice.project.Project;
+import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ModelConfiguration;
 import software.uncharted.terarium.hmiserver.models.dataservice.project.ProjectAsset;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.ProgressState;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.Simulation;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.SimulationEngine;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.SimulationStatusMessage;
+import software.uncharted.terarium.hmiserver.models.dataservice.simulation.SimulationType;
+import software.uncharted.terarium.hmiserver.models.simulationservice.interventions.InterventionPolicy;
 import software.uncharted.terarium.hmiserver.proxies.simulationservice.SimulationCiemssServiceProxy;
 import software.uncharted.terarium.hmiserver.security.Roles;
 import software.uncharted.terarium.hmiserver.service.CurrentUserService;
 import software.uncharted.terarium.hmiserver.service.SimulationEventService;
-import software.uncharted.terarium.hmiserver.service.data.DatasetService;
-import software.uncharted.terarium.hmiserver.service.data.ProjectAssetService;
+import software.uncharted.terarium.hmiserver.service.data.InterventionService;
+import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
 import software.uncharted.terarium.hmiserver.service.data.ProjectService;
 import software.uncharted.terarium.hmiserver.service.data.SimulationService;
 import software.uncharted.terarium.hmiserver.utils.rebac.Schema;
@@ -58,21 +56,21 @@
 public class SimulationController {
 
 	private final Config config;
-	private final ObjectMapper mapper;
 
 	private final SimulationService simulationService;
 
-	private final DatasetService datasetService;
-
 	private final CurrentUserService currentUserService;
 
 	private final ProjectService projectService;
-	private final ProjectAssetService projectAssetService;
 
 	private final SimulationEventService simulationEventService;
 
 	private final SimulationCiemssServiceProxy simulationCiemssServiceProxy;
 
+	private final InterventionService interventionPolicyService;
+
+	private final ModelConfigurationService modelConfigurationService;
+
 	@PostMapping
 	@Secured(Roles.USER)
 	@Operation(summary = "Create a new simulation")
@@ -349,41 +347,89 @@ public ResponseEntity<Dataset> createFromSimulationResult(
 			if (sim.isEmpty()) {
 				return ResponseEntity.notFound().build();
 			}
-
 			// Create the dataset asset:
 			final UUID simId = sim.get().getId();
-			final Dataset dataset = datasetService.createAsset(new Dataset(), projectId, permission);
-			dataset.setName(datasetName);
-			dataset.setDescription(sim.get().getDescription());
-			dataset.setMetadata(mapper.convertValue(Map.of("simulationId", simId.toString()), JsonNode.class));
-			dataset.setFileNames(sim.get().getResultFiles());
-			dataset.setDataSourceDate(sim.get().getCompletedTime());
-			dataset.setColumns(new ArrayList<>());
-
-			// Attach the user to the dataset
-			if (sim.get().getUserId() != null) {
-				dataset.setUserId(sim.get().getUserId());
-			}
+			final Dataset dataset = simulationService.createDatasetFromSimulation(
+				simId,
+				datasetName,
+				projectId,
+				addToProject,
+				permission
+			);
+			return ResponseEntity.status(HttpStatus.CREATED).body(dataset);
+		} catch (final Exception e) {
+			final String error = String.format("Failed to add simulation %s result as dataset to project %s", id, projectId);
+			log.error(error, e);
+			throw new ResponseStatusException(org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, error);
+		}
+	}
 
-			// Duplicate the simulation results to a new dataset
-			simulationService.copySimulationResultToDataset(sim.get(), dataset);
-			datasetService.updateAsset(dataset, projectId, permission);
+	@PostMapping("/{id}/create-assets-from-simulation/{project-id}")
+	@Secured(Roles.USER)
+	@Operation(summary = "Create assets from a simulation result, then add them to a project")
+	@ApiResponses(
+		value = {
+			@ApiResponse(
+				responseCode = "201",
+				description = "Assets created and added to project.",
+				content = @Content(
+					mediaType = MediaType.APPLICATION_JSON_VALUE,
+					schema = @io.swagger.v3.oas.annotations.media.Schema(implementation = ProjectAsset.class)
+				)
+			),
+			@ApiResponse(responseCode = "404", description = "Simulation not found", content = @Content),
+			@ApiResponse(
+				responseCode = "500",
+				description = "There was an issue creating the assets or adding them to the project",
+				content = @Content
+			)
+		}
+	)
+	public ResponseEntity<List<TerariumAsset>> createAssetsFromSimulation(
+		@PathVariable("id") final UUID id,
+		@PathVariable("project-id") final UUID projectId,
+		@RequestParam("name") final String name,
+		@RequestParam("simulation-type") final SimulationType simulationType,
+		@RequestParam(name = "asset-id", required = false) final UUID assetId
+	) {
+		final Schema.Permission permission = projectService.checkPermissionCanWrite(
+			currentUserService.get().getId(),
+			projectId
+		);
 
-			// If this is a temporary asset, do not add to project.
-			if (addToProject == false) {
-				return ResponseEntity.status(HttpStatus.CREATED).body(dataset);
+		try {
+			final Optional<Simulation> sim = simulationService.getAsset(id, permission);
+			if (sim.isEmpty()) {
+				return ResponseEntity.notFound().build();
 			}
 
-			// Add the dataset to the project as an asset
-			final Optional<Project> project = projectService.getProject(projectId);
-			if (project.isPresent()) {
-				projectAssetService.createProjectAsset(project.get(), AssetType.DATASET, dataset, permission);
-				// underlying asset does not exist
-				return ResponseEntity.status(HttpStatus.CREATED).body(dataset);
-			} else {
-				log.error("Failed to add the dataset from simulation {} result", id);
-				return ResponseEntity.internalServerError().build();
+			List<TerariumAsset> assets = new ArrayList<>();
+			// Update the intervention policy name if the simulation is an optimization
+			if (simulationType == SimulationType.OPTIMIZATION) {
+				final Optional<InterventionPolicy> interventionPolicy = interventionPolicyService.getAsset(assetId, permission);
+				if (interventionPolicy.isPresent()) {
+					interventionPolicy.get().setName(name);
+					interventionPolicy.get().setTemporary(false);
+					interventionPolicyService.updateAsset(interventionPolicy.get(), projectId, permission);
+					assets.add(interventionPolicy.get());
+				}
+			}
+			// Update the model configuration name if the simulation is a calibration
+			else if (simulationType == SimulationType.CALIBRATION) {
+				final Optional<ModelConfiguration> modelConfiguration = modelConfigurationService.getAsset(assetId, permission);
+				if (modelConfiguration.isPresent()) {
+					modelConfiguration.get().setName(name);
+					modelConfiguration.get().setTemporary(false);
+					modelConfigurationService.updateAsset(modelConfiguration.get(), projectId, permission);
+					assets.add(modelConfiguration.get());
+				}
 			}
+
+			// Create the dataset asset
+			final Dataset dataset = simulationService.createDatasetFromSimulation(id, name, projectId, true, permission);
+			assets.add(dataset);
+
+			return ResponseEntity.status(HttpStatus.CREATED).body(assets);
 		} catch (final IOException e) {
 			final String error = String.format("Failed to add simulation %s result as dataset to project %s", id, projectId);
 			log.error(error, e);
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/SimulationService.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/SimulationService.java
index af0eb351f6..e15686c0b0 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/SimulationService.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/SimulationService.java
@@ -1,11 +1,13 @@
 package software.uncharted.terarium.hmiserver.service.data;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.micrometer.observation.annotation.Observed;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.entity.ContentType;
@@ -14,8 +16,10 @@
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
 import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
 import software.uncharted.terarium.hmiserver.configuration.Config;
+import software.uncharted.terarium.hmiserver.models.dataservice.AssetType;
 import software.uncharted.terarium.hmiserver.models.dataservice.FileExport;
 import software.uncharted.terarium.hmiserver.models.dataservice.dataset.Dataset;
+import software.uncharted.terarium.hmiserver.models.dataservice.project.Project;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.Simulation;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.SimulationUpdate;
 import software.uncharted.terarium.hmiserver.repository.data.SimulationRepository;
@@ -29,6 +33,7 @@
 public class SimulationService extends TerariumAssetServiceWithoutSearch<Simulation, SimulationRepository> {
 
 	private final SimulationUpdateRepository simulationUpdateRepository;
+	private final DatasetService datasetService;
 
 	/**
 	 * Constructor for SimulationService
@@ -45,10 +50,12 @@ public SimulationService(
 		final ProjectAssetService projectAssetService,
 		final SimulationRepository repository,
 		final S3ClientService s3ClientService,
-		final SimulationUpdateRepository simulationUpdateRepository
+		final SimulationUpdateRepository simulationUpdateRepository,
+		final DatasetService datasetService
 	) {
 		super(objectMapper, config, projectService, projectAssetService, repository, s3ClientService, Simulation.class);
 		this.simulationUpdateRepository = simulationUpdateRepository;
+		this.datasetService = datasetService;
 	}
 
 	@Override
@@ -81,6 +88,55 @@ public SimulationUpdate appendUpdateToSimulation(
 		return created;
 	}
 
+	public Dataset createDatasetFromSimulation(
+		final UUID simId,
+		final String datasetName,
+		final UUID projectId,
+		final boolean addToProject,
+		final Schema.Permission permission
+	) {
+		try {
+			final Optional<Simulation> sim = this.getAsset(simId, permission);
+			if (sim.isEmpty()) {
+				throw new IllegalArgumentException("Simulation not found");
+			}
+
+			final Dataset dataset = datasetService.createAsset(new Dataset(), projectId, permission);
+			dataset.setName(datasetName);
+			dataset.setDescription(sim.get().getDescription());
+			dataset.setMetadata(objectMapper.convertValue(Map.of("simulationId", simId.toString()), JsonNode.class));
+			dataset.setFileNames(sim.get().getResultFiles());
+			dataset.setDataSourceDate(sim.get().getCompletedTime());
+			dataset.setColumns(new ArrayList<>());
+
+			// Attach the user to the dataset
+			if (sim.get().getUserId() != null) {
+				dataset.setUserId(sim.get().getUserId());
+			}
+
+			// Duplicate the simulation results to a new dataset
+			this.copySimulationResultToDataset(sim.get(), dataset);
+			datasetService.updateAsset(dataset, projectId, permission);
+
+			if (!addToProject) {
+				return dataset;
+			}
+
+			// Add the dataset to the project
+			final Optional<Project> project = projectService.getProject(projectId);
+			if (project.isPresent()) {
+				projectAssetService.createProjectAsset(project.get(), AssetType.DATASET, dataset, permission);
+			} else {
+				throw new IllegalArgumentException("Project not found");
+			}
+
+			return dataset;
+		} catch (final Exception e) {
+			log.error("Failed to create dataset from simulation", e);
+			throw new IllegalArgumentException("Failed to create dataset from simulation");
+		}
+	}
+
 	@Observed(name = "function_profile")
 	public void copySimulationResultToDataset(final Simulation simulation, final Dataset dataset) {
 		final UUID simId = simulation.getId();

From 98044fb710f147a8c09c9f24d1ac4146e93689fe Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Cole-Blanchards-MacBook-Pro.local>
Date: Tue, 24 Sep 2024 15:40:04 -0400
Subject: [PATCH 2/6] suggestions

---
 .../project/tera-save-simulation-modal.vue     | 18 +++++++-----------
 .../src/services/models/simulation-service.ts  |  8 ++++++--
 .../dataservice/SimulationController.java      | 14 +++++++++-----
 .../service/data/SimulationService.java        | 16 +++++++---------
 4 files changed, 29 insertions(+), 27 deletions(-)

diff --git a/packages/client/hmi-client/src/components/project/tera-save-simulation-modal.vue b/packages/client/hmi-client/src/components/project/tera-save-simulation-modal.vue
index d77fa06f13..5f4442c277 100644
--- a/packages/client/hmi-client/src/components/project/tera-save-simulation-modal.vue
+++ b/packages/client/hmi-client/src/components/project/tera-save-simulation-modal.vue
@@ -43,17 +43,13 @@ const newName = ref('');
 const emit = defineEmits(['close-modal', 'on-save']);
 
 function save() {
-	createSimulationAssets(
-		useProjects().activeProjectId.value,
-		props.simulationOptions.id,
-		props.simulationOptions.type,
-		newName.value,
-		props.assetId
-	).then((data) => {
-		useProjects().refresh();
-		closeModal();
-		emit('on-save', data);
-	});
+	createSimulationAssets(props.simulationOptions.id, props.simulationOptions.type, newName.value, props.assetId).then(
+		(data) => {
+			useProjects().refresh();
+			closeModal();
+			emit('on-save', data);
+		}
+	);
 }
 
 function closeModal() {
diff --git a/packages/client/hmi-client/src/services/models/simulation-service.ts b/packages/client/hmi-client/src/services/models/simulation-service.ts
index bce65c8101..d7460c52b3 100644
--- a/packages/client/hmi-client/src/services/models/simulation-service.ts
+++ b/packages/client/hmi-client/src/services/models/simulation-service.ts
@@ -249,7 +249,6 @@ export async function makeEnsembleCiemssCalibration(params: EnsembleCalibrationC
 }
 
 export async function createSimulationAssets(
-	projectId: string,
 	simulationId: string,
 	simulationType: SimulationType,
 	newName: string | null,
@@ -257,7 +256,12 @@ export async function createSimulationAssets(
 ) {
 	try {
 		const response: AxiosResponse<TerariumAsset[]> = await API.post(
-			`/simulations/${simulationId}/create-assets-from-simulation/${projectId}?name=${newName}&simulation-type=${simulationType}${assetId ? `&asset-id=${assetId}` : ''}`
+			`/simulations/${simulationId}/create-assets-from-simulation`,
+			{
+				name: newName,
+				simulationType,
+				assetId
+			}
 		);
 		const output = response.data;
 		return output;
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
index 1d48de31ee..12276d2386 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
@@ -7,6 +7,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.concurrent.TimeUnit;
@@ -364,7 +365,7 @@ public ResponseEntity<Dataset> createFromSimulationResult(
 		}
 	}
 
-	@PostMapping("/{id}/create-assets-from-simulation/{project-id}")
+	@PostMapping("/{id}/create-assets-from-simulation")
 	@Secured(Roles.USER)
 	@Operation(summary = "Create assets from a simulation result, then add them to a project")
 	@ApiResponses(
@@ -387,16 +388,19 @@ public ResponseEntity<Dataset> createFromSimulationResult(
 	)
 	public ResponseEntity<List<TerariumAsset>> createAssetsFromSimulation(
 		@PathVariable("id") final UUID id,
-		@PathVariable("project-id") final UUID projectId,
-		@RequestParam("name") final String name,
-		@RequestParam("simulation-type") final SimulationType simulationType,
-		@RequestParam(name = "asset-id", required = false) final UUID assetId
+		@RequestBody final Map<String, Object> body,
+		@RequestParam("project-id") final UUID projectId
 	) {
 		final Schema.Permission permission = projectService.checkPermissionCanWrite(
 			currentUserService.get().getId(),
 			projectId
 		);
 
+		// Extract parameters from the body map
+		final String name = (String) body.get("name");
+		final UUID assetId = body.get("assetId") != null ? UUID.fromString((String) body.get("assetId")) : null;
+		final SimulationType simulationType = SimulationType.valueOf((String) body.get("simulationType"));
+
 		try {
 			final Optional<Simulation> sim = simulationService.getAsset(id, permission);
 			if (sim.isEmpty()) {
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/SimulationService.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/SimulationService.java
index e15686c0b0..f46e0d05ad 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/SimulationService.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/SimulationService.java
@@ -97,10 +97,15 @@ public Dataset createDatasetFromSimulation(
 	) {
 		try {
 			final Optional<Simulation> sim = this.getAsset(simId, permission);
+			final Optional<Project> project = projectService.getProject(projectId);
 			if (sim.isEmpty()) {
 				throw new IllegalArgumentException("Simulation not found");
 			}
 
+			if (!project.isPresent() && addToProject) {
+				throw new IllegalArgumentException("Project not found");
+			}
+
 			final Dataset dataset = datasetService.createAsset(new Dataset(), projectId, permission);
 			dataset.setName(datasetName);
 			dataset.setDescription(sim.get().getDescription());
@@ -118,16 +123,9 @@ public Dataset createDatasetFromSimulation(
 			this.copySimulationResultToDataset(sim.get(), dataset);
 			datasetService.updateAsset(dataset, projectId, permission);
 
-			if (!addToProject) {
-				return dataset;
-			}
-
-			// Add the dataset to the project
-			final Optional<Project> project = projectService.getProject(projectId);
-			if (project.isPresent()) {
+			// Add dataset to project
+			if (addToProject) {
 				projectAssetService.createProjectAsset(project.get(), AssetType.DATASET, dataset, permission);
-			} else {
-				throw new IllegalArgumentException("Project not found");
 			}
 
 			return dataset;

From a33c64081d3340183e972dc4aa3192c229d86446 Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Cole-Blanchards-MacBook-Pro.local>
Date: Wed, 25 Sep 2024 14:33:39 -0400
Subject: [PATCH 3/6] labels

---
 .../drilldown/tera-output-dropdown.vue        | 10 +--
 .../operator/tera-operator-outputs.vue        |  5 +-
 .../project/tera-save-simulation-modal.vue    | 18 ++--
 .../tera-calibrate-ciemss-drilldown.vue       | 18 ++--
 .../tera-optimize-ciemss-drilldown.vue        | 18 ++--
 .../tera-simulate-ciemss-drilldown.vue        | 13 +--
 .../src/services/models/simulation-service.ts | 10 +--
 .../hmi-client/src/services/workflow.ts       | 15 ++++
 .../dataservice/SimulationController.java     | 87 ++++++++++++-------
 9 files changed, 120 insertions(+), 74 deletions(-)

diff --git a/packages/client/hmi-client/src/components/drilldown/tera-output-dropdown.vue b/packages/client/hmi-client/src/components/drilldown/tera-output-dropdown.vue
index 53f7075262..0ef216e677 100644
--- a/packages/client/hmi-client/src/components/drilldown/tera-output-dropdown.vue
+++ b/packages/client/hmi-client/src/components/drilldown/tera-output-dropdown.vue
@@ -13,7 +13,7 @@
 	>
 		<template #value="slotProps">
 			<div class="dropdown-option">
-				<span>{{ getLabelById(slotProps.value) }}</span>
+				<span>{{ getOutputLabel(items, slotProps.value) }}</span>
 				<span class="timestamp"> {{ getCreateTimeById(slotProps.value) }} </span>
 			</div>
 		</template>
@@ -22,7 +22,7 @@
 		</template>
 		<template #option="slotProps">
 			<div class="dropdown-option">
-				<span>{{ slotProps.option?.label }}</span>
+				<span>{{ getOutputLabel(items, slotProps.option?.id) }}</span>
 				<span class="timestamp">
 					{{ getElapsedTimeText(slotProps.option?.timestamp) }}
 				</span>
@@ -39,6 +39,7 @@ import { computed } from 'vue';
 import { WorkflowOutput, WorkflowPortStatus } from '@/types/workflow';
 import Dropdown from 'primevue/dropdown';
 import { getElapsedTimeText } from '@/utils/date';
+import { getOutputLabel } from '@/services/workflow';
 
 const props = defineProps<{
 	options: WorkflowOutput<any>[] | { label: string; items: WorkflowOutput<any>[] }[];
@@ -56,11 +57,6 @@ const getCreateTimeById = (id: string) => {
 	if (!option?.timestamp) return '';
 	return getElapsedTimeText(option.timestamp);
 };
-
-const getLabelById = (id: string) => {
-	const option = getOptionById(id);
-	return option?.label;
-};
 </script>
 
 <style scoped>
diff --git a/packages/client/hmi-client/src/components/operator/tera-operator-outputs.vue b/packages/client/hmi-client/src/components/operator/tera-operator-outputs.vue
index 7735f3dd98..aa0f256ced 100644
--- a/packages/client/hmi-client/src/components/operator/tera-operator-outputs.vue
+++ b/packages/client/hmi-client/src/components/operator/tera-operator-outputs.vue
@@ -28,7 +28,7 @@
 					<div class="port" />
 				</div>
 				<div class="relative w-full">
-					<div class="truncate text-right">{{ useProjects().getAssetName(output.value?.[0]) || output.label }}</div>
+					<div class="truncate text-right">{{ getOutputLabel(outputs, output.id) }}</div>
 					<Button
 						class="unlink"
 						label="Unlink"
@@ -72,9 +72,8 @@
 import { PropType, computed, ref } from 'vue';
 import { WorkflowPortStatus, WorkflowDirection, WorkflowOutput } from '@/types/workflow';
 import Button from 'primevue/button';
-import { OperatorMenuItem } from '@/services/workflow';
+import { OperatorMenuItem, getOutputLabel } from '@/services/workflow';
 import TeraOperatorMenu from '@/components/operator/tera-operator-menu.vue';
-import { useProjects } from '@/composables/project';
 
 const menuFocusId = ref<string | null>(null);
 
diff --git a/packages/client/hmi-client/src/components/project/tera-save-simulation-modal.vue b/packages/client/hmi-client/src/components/project/tera-save-simulation-modal.vue
index 5f4442c277..a2df05d08d 100644
--- a/packages/client/hmi-client/src/components/project/tera-save-simulation-modal.vue
+++ b/packages/client/hmi-client/src/components/project/tera-save-simulation-modal.vue
@@ -26,7 +26,7 @@
 import TeraModal from '@/components/widgets/tera-modal.vue';
 import Button from 'primevue/button';
 import TeraInputText from '@/components/widgets/tera-input-text.vue';
-import { SimulationType } from '@/types/Types';
+import { AssetType } from '@/types/Types';
 import { ref } from 'vue';
 import { useProjects } from '@/composables/project';
 import { createSimulationAssets } from '@/services/models/simulation-service';
@@ -34,8 +34,8 @@ import { createSimulationAssets } from '@/services/models/simulation-service';
 const props = defineProps<{
 	initialName?: string;
 	isVisible: boolean;
-	simulationOptions: { id: string; type: SimulationType };
-	assetId?: string;
+	simulationId: string;
+	assets: { id: string; type: AssetType }[];
 }>();
 
 const newName = ref('');
@@ -43,13 +43,11 @@ const newName = ref('');
 const emit = defineEmits(['close-modal', 'on-save']);
 
 function save() {
-	createSimulationAssets(props.simulationOptions.id, props.simulationOptions.type, newName.value, props.assetId).then(
-		(data) => {
-			useProjects().refresh();
-			closeModal();
-			emit('on-save', data);
-		}
-	);
+	createSimulationAssets(props.simulationId, newName.value, props.assets).then((data) => {
+		useProjects().refresh();
+		closeModal();
+		emit('on-save', data);
+	});
 }
 
 function closeModal() {
diff --git a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue
index e26ea625e0..e2c050f9c6 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/calibrate-ciemss/tera-calibrate-ciemss-drilldown.vue
@@ -377,13 +377,13 @@
 	<tera-save-simulation-modal
 		:initial-name="configuredModelConfig?.name"
 		:is-visible="showSaveModal"
-		:asset-id="configuredModelConfig?.id"
+		:assets="[
+			{ id: configuredModelConfig?.id ?? '', type: AssetType.ModelConfiguration },
+			{ id: outputDatasetId, type: AssetType.Dataset }
+		]"
 		@close-modal="showSaveModal = false"
 		@on-save="onSaveAsModelConfiguration"
-		:simulation-options="{
-			id: node.state.forecastId,
-			type: SimulationType.Calibration
-		}"
+		:simulation-id="node.state.forecastId"
 	/>
 </template>
 
@@ -423,7 +423,7 @@ import {
 	ModelConfiguration,
 	ChartAnnotation,
 	InterventionPolicy,
-	SimulationType
+	AssetType
 } from '@/types/Types';
 import { CiemssPresetTypes, DrilldownTabs, ChartSetting, ChartSettingType } from '@/types/common';
 import { getTimespan, drilldownChartSize, nodeMetadata } from '@/components/workflow/util';
@@ -498,6 +498,12 @@ const presetType = computed(() => {
 	return '';
 });
 
+const outputDatasetId = computed(() => {
+	if (!selectedOutputId.value) return '';
+	const output = props.node.outputs.find((o) => o.id === selectedOutputId.value);
+	return output?.value?.[0]?.datasetId ?? '';
+});
+
 const speedPreset = Object.freeze({
 	numSamples: 1,
 	method: CiemssMethodOptions.euler,
diff --git a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
index aa812f5161..5637168c3f 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/optimize-ciemss/tera-optimize-ciemss-drilldown.vue
@@ -375,13 +375,13 @@
 	<tera-save-simulation-modal
 		:initial-name="optimizedInterventionPolicy?.name"
 		:is-visible="showSaveInterventionPolicy"
-		:asset-id="optimizedInterventionPolicy?.id"
+		:assets="[
+			{ id: optimizedInterventionPolicy?.id ?? '', type: AssetType.InterventionPolicy },
+			{ id: datasetId, type: AssetType.Dataset }
+		]"
 		@close-modal="showSaveInterventionPolicy = false"
 		@on-save="onSaveForReuse"
-		:simulation-options="{
-			id: node.state.postForecastRunId,
-			type: SimulationType.Optimization
-		}"
+		:simulation-id="node.state.postForecastRunId"
 	/>
 </template>
 
@@ -421,7 +421,7 @@ import {
 	OptimizeInterventions,
 	OptimizeQoi,
 	OptimizeRequestCiemss,
-	SimulationType
+	AssetType
 } from '@/types/Types';
 import { logger } from '@/utils/logger';
 import { drilldownChartSize, nodeMetadata } from '@/components/workflow/util';
@@ -527,6 +527,12 @@ const showSpinner = computed<boolean>(
 	() => props.node.state.inProgressOptimizeId !== '' || props.node.state.inProgressPostForecastId !== ''
 );
 
+const datasetId = computed(() => {
+	if (!selectedOutputId.value) return '';
+	const output = props.node.outputs.find((o) => o.id === selectedOutputId.value);
+	return output?.value?.[0]?.datasetId ?? '';
+});
+
 const showModelModal = ref(false);
 const displayOptimizationResultMessage = ref(true);
 
diff --git a/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-ciemss-drilldown.vue b/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-ciemss-drilldown.vue
index 2a9eaa4f3a..a19d81a2ab 100644
--- a/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-ciemss-drilldown.vue
+++ b/packages/client/hmi-client/src/components/workflow/ops/simulate-ciemss/tera-simulate-ciemss-drilldown.vue
@@ -193,10 +193,8 @@
 	<tera-save-simulation-modal
 		:is-visible="showSaveDataset"
 		@close-modal="showSaveDataset = false"
-		:simulation-options="{
-			id: node.state.forecastId,
-			type: SimulationType.Simulation
-		}"
+		:simulation-id="node.state.forecastId"
+		:assets="[{ id: datasetId, type: AssetType.Dataset }]"
 	/>
 </template>
 
@@ -210,7 +208,7 @@ import EmptySeed from '@/assets/images/lottie-empty-seed.json';
 import TeraInputNumber from '@/components/widgets/tera-input-number.vue';
 import TeraSliderPanel from '@/components/widgets/tera-slider-panel.vue';
 import type { CsvAsset, InterventionPolicy, SimulationRequest, TimeSpan } from '@/types/Types';
-import { SimulationType } from '@/types/Types';
+import { AssetType } from '@/types/Types';
 import type { WorkflowNode } from '@/types/workflow';
 import {
 	getRunResultCSV,
@@ -258,6 +256,11 @@ const codeText = ref('');
 
 const policyInterventionId = computed(() => props.node.inputs[1].value?.[0]);
 const interventionPolicy = ref<InterventionPolicy | null>(null);
+const datasetId = computed(() => {
+	if (!selectedOutputId.value) return '';
+	const output = props.node.outputs.find((o) => o.id === selectedOutputId.value);
+	return output?.value?.[0] ?? '';
+});
 
 const timespan = ref<TimeSpan>(props.node.state.currentTimespan);
 const llmThoughts = ref<any[]>([]);
diff --git a/packages/client/hmi-client/src/services/models/simulation-service.ts b/packages/client/hmi-client/src/services/models/simulation-service.ts
index d7460c52b3..bde0e1c26e 100644
--- a/packages/client/hmi-client/src/services/models/simulation-service.ts
+++ b/packages/client/hmi-client/src/services/models/simulation-service.ts
@@ -13,8 +13,8 @@ import {
 	Simulation,
 	SimulationRequest,
 	CsvAsset,
-	SimulationType,
-	TerariumAsset
+	TerariumAsset,
+	AssetType
 } from '@/types/Types';
 import { RunResults } from '@/types/SimulateConfig';
 import * as EventService from '@/services/event';
@@ -250,17 +250,15 @@ export async function makeEnsembleCiemssCalibration(params: EnsembleCalibrationC
 
 export async function createSimulationAssets(
 	simulationId: string,
-	simulationType: SimulationType,
 	newName: string | null,
-	assetId?: string
+	assets: { id: string; type: AssetType }[]
 ) {
 	try {
 		const response: AxiosResponse<TerariumAsset[]> = await API.post(
 			`/simulations/${simulationId}/create-assets-from-simulation`,
 			{
 				name: newName,
-				simulationType,
-				assetId
+				assets
 			}
 		);
 		const output = response.data;
diff --git a/packages/client/hmi-client/src/services/workflow.ts b/packages/client/hmi-client/src/services/workflow.ts
index 73d041446f..54cbd3feca 100644
--- a/packages/client/hmi-client/src/services/workflow.ts
+++ b/packages/client/hmi-client/src/services/workflow.ts
@@ -22,6 +22,7 @@ import {
 	WorkflowTransformations,
 	Transform
 } from '@/types/workflow';
+import { useProjects } from '@/composables/project';
 
 /**
  * A wrapper class around the workflow data struture to make it easier
@@ -676,6 +677,20 @@ export function getPortLabel({ label, type, isOptional }: WorkflowPort) {
 	return portLabel;
 }
 
+export function getOutputLabel(outputs: WorkflowOutput<any>[], id: string) {
+	const selectedOutput = outputs.find((output) => output.id === id);
+	if (!selectedOutput) return '';
+
+	// multiple output types, choose first name to use as label arbitrarily
+	if (selectedOutput.type.includes('|')) {
+		const outputType = selectedOutput.type.split('|');
+		return useProjects().getAssetName(selectedOutput.value?.[0]?.[outputType?.[0]]) || selectedOutput.label;
+	}
+
+	// default use single output type
+	return useProjects().getAssetName(selectedOutput.value?.[0]) || selectedOutput.label;
+}
+
 // Checker for resource-operators (e.g. model, dataset) that automatically create an output
 // without needing to "run" the operator because we can drag them onto the canvas
 export function canPropagateResource(outputs: WorkflowOutput<any>[]) {
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
index 12276d2386..fb5f2e3742 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
@@ -1,5 +1,6 @@
 package software.uncharted.terarium.hmiserver.controller.dataservice;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
@@ -30,22 +31,25 @@
 import org.springframework.web.server.ResponseStatusException;
 import software.uncharted.terarium.hmiserver.configuration.Config;
 import software.uncharted.terarium.hmiserver.models.TerariumAsset;
+import software.uncharted.terarium.hmiserver.models.dataservice.AssetType;
 import software.uncharted.terarium.hmiserver.models.dataservice.PresignedURL;
 import software.uncharted.terarium.hmiserver.models.dataservice.dataset.Dataset;
 import software.uncharted.terarium.hmiserver.models.dataservice.model.configurations.ModelConfiguration;
+import software.uncharted.terarium.hmiserver.models.dataservice.project.Project;
 import software.uncharted.terarium.hmiserver.models.dataservice.project.ProjectAsset;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.ProgressState;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.Simulation;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.SimulationEngine;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.SimulationStatusMessage;
-import software.uncharted.terarium.hmiserver.models.dataservice.simulation.SimulationType;
 import software.uncharted.terarium.hmiserver.models.simulationservice.interventions.InterventionPolicy;
 import software.uncharted.terarium.hmiserver.proxies.simulationservice.SimulationCiemssServiceProxy;
 import software.uncharted.terarium.hmiserver.security.Roles;
 import software.uncharted.terarium.hmiserver.service.CurrentUserService;
 import software.uncharted.terarium.hmiserver.service.SimulationEventService;
+import software.uncharted.terarium.hmiserver.service.data.DatasetService;
 import software.uncharted.terarium.hmiserver.service.data.InterventionService;
 import software.uncharted.terarium.hmiserver.service.data.ModelConfigurationService;
+import software.uncharted.terarium.hmiserver.service.data.ProjectAssetService;
 import software.uncharted.terarium.hmiserver.service.data.ProjectService;
 import software.uncharted.terarium.hmiserver.service.data.SimulationService;
 import software.uncharted.terarium.hmiserver.utils.rebac.Schema;
@@ -57,6 +61,7 @@
 public class SimulationController {
 
 	private final Config config;
+	private final ObjectMapper objectMapper;
 
 	private final SimulationService simulationService;
 
@@ -72,6 +77,10 @@ public class SimulationController {
 
 	private final ModelConfigurationService modelConfigurationService;
 
+	private final DatasetService datasetService;
+
+	private final ProjectAssetService projectAssetService;
+
 	@PostMapping
 	@Secured(Roles.USER)
 	@Operation(summary = "Create a new simulation")
@@ -396,44 +405,60 @@ public ResponseEntity<List<TerariumAsset>> createAssetsFromSimulation(
 			projectId
 		);
 
-		// Extract parameters from the body map
-		final String name = (String) body.get("name");
-		final UUID assetId = body.get("assetId") != null ? UUID.fromString((String) body.get("assetId")) : null;
-		final SimulationType simulationType = SimulationType.valueOf((String) body.get("simulationType"));
-
 		try {
-			final Optional<Simulation> sim = simulationService.getAsset(id, permission);
-			if (sim.isEmpty()) {
-				return ResponseEntity.notFound().build();
+			final Optional<Project> project = projectService.getProject(projectId);
+			if (!project.isPresent()) {
+				throw new IllegalArgumentException("Project not found");
 			}
+			// Extract parameters from the body map
+			final String name = (String) body.get("name");
+			final List<Map<String, Object>> assetsList = (List<Map<String, Object>>) body.get("assets");
+
+			// Iterate through the assets list and process each map
+			for (Map<String, Object> assetMap : assetsList) {
+				UUID assetId = UUID.fromString((String) assetMap.get("id"));
+				AssetType assetType = AssetType.getAssetType((String) assetMap.get("type"), objectMapper);
+
+				TerariumAsset asset = null;
+				if (assetType == AssetType.INTERVENTION_POLICY) {
+					final Optional<InterventionPolicy> interventionPolicy = interventionPolicyService.getAsset(
+						assetId,
+						permission
+					);
+					if (interventionPolicy.isPresent()) {
+						interventionPolicy.get().setName(name);
+						interventionPolicy.get().setTemporary(false);
+						interventionPolicyService.updateAsset(interventionPolicy.get(), projectId, permission);
+					}
 
-			List<TerariumAsset> assets = new ArrayList<>();
-			// Update the intervention policy name if the simulation is an optimization
-			if (simulationType == SimulationType.OPTIMIZATION) {
-				final Optional<InterventionPolicy> interventionPolicy = interventionPolicyService.getAsset(assetId, permission);
-				if (interventionPolicy.isPresent()) {
-					interventionPolicy.get().setName(name);
-					interventionPolicy.get().setTemporary(false);
-					interventionPolicyService.updateAsset(interventionPolicy.get(), projectId, permission);
-					assets.add(interventionPolicy.get());
+					asset = interventionPolicy.get();
+				} else if (assetType == AssetType.MODEL_CONFIGURATION) {
+					final Optional<ModelConfiguration> modelConfiguration = modelConfigurationService.getAsset(
+						assetId,
+						permission
+					);
+					if (modelConfiguration.isPresent()) {
+						modelConfiguration.get().setName(name);
+						modelConfiguration.get().setTemporary(false);
+						modelConfigurationService.updateAsset(modelConfiguration.get(), projectId, permission);
+					}
+					asset = modelConfiguration.get();
+				} else if (assetType == AssetType.DATASET) {
+					final Optional<Dataset> dataset = datasetService.getAsset(assetId, permission);
+					if (dataset.isPresent()) {
+						dataset.get().setName(name);
+						datasetService.updateAsset(dataset.get(), projectId, permission);
+					}
+					asset = dataset.get();
 				}
-			}
-			// Update the model configuration name if the simulation is a calibration
-			else if (simulationType == SimulationType.CALIBRATION) {
-				final Optional<ModelConfiguration> modelConfiguration = modelConfigurationService.getAsset(assetId, permission);
-				if (modelConfiguration.isPresent()) {
-					modelConfiguration.get().setName(name);
-					modelConfiguration.get().setTemporary(false);
-					modelConfigurationService.updateAsset(modelConfiguration.get(), projectId, permission);
-					assets.add(modelConfiguration.get());
+				if (!projectAssetService.isPartOfExistingProject(assetId)) {
+					projectAssetService.createProjectAsset(project.get(), assetType, asset, permission);
 				}
 			}
 
-			// Create the dataset asset
-			final Dataset dataset = simulationService.createDatasetFromSimulation(id, name, projectId, true, permission);
-			assets.add(dataset);
+			List<TerariumAsset> assetsout = new ArrayList<>();
 
-			return ResponseEntity.status(HttpStatus.CREATED).body(assets);
+			return ResponseEntity.status(HttpStatus.CREATED).body(assetsout);
 		} catch (final IOException e) {
 			final String error = String.format("Failed to add simulation %s result as dataset to project %s", id, projectId);
 			log.error(error, e);

From b25fca4c407173f51ff89634ff3ff30db4b8dd89 Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Cole-Blanchards-MacBook-Pro.local>
Date: Wed, 25 Sep 2024 14:43:34 -0400
Subject: [PATCH 4/6] updated assets

---
 .../controller/dataservice/SimulationController.java   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
index fb5f2e3742..49974004a3 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
@@ -415,6 +415,7 @@ public ResponseEntity<List<TerariumAsset>> createAssetsFromSimulation(
 			final List<Map<String, Object>> assetsList = (List<Map<String, Object>>) body.get("assets");
 
 			// Iterate through the assets list and process each map
+			List<TerariumAsset> updatedAssets = new ArrayList<>();
 			for (Map<String, Object> assetMap : assetsList) {
 				UUID assetId = UUID.fromString((String) assetMap.get("id"));
 				AssetType assetType = AssetType.getAssetType((String) assetMap.get("type"), objectMapper);
@@ -451,14 +452,17 @@ public ResponseEntity<List<TerariumAsset>> createAssetsFromSimulation(
 					}
 					asset = dataset.get();
 				}
+				// add to project if not already part of it
 				if (!projectAssetService.isPartOfExistingProject(assetId)) {
 					projectAssetService.createProjectAsset(project.get(), assetType, asset, permission);
 				}
+				// add to final response
+				if (asset != null) {
+					updatedAssets.add(asset);
+				}
 			}
 
-			List<TerariumAsset> assetsout = new ArrayList<>();
-
-			return ResponseEntity.status(HttpStatus.CREATED).body(assetsout);
+			return ResponseEntity.status(HttpStatus.CREATED).body(updatedAssets);
 		} catch (final IOException e) {
 			final String error = String.format("Failed to add simulation %s result as dataset to project %s", id, projectId);
 			log.error(error, e);

From 7e116454601ff12d2349c59147e2ca224c31e821 Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Cole-Blanchards-MacBook-Pro.local>
Date: Wed, 25 Sep 2024 14:58:18 -0400
Subject: [PATCH 5/6] -sim services

---
 .../dataservice/SimulationController.java     | 42 +++++++++++---
 .../service/data/SimulationService.java       | 56 +------------------
 2 files changed, 35 insertions(+), 63 deletions(-)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
index 49974004a3..20676bc370 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
@@ -1,5 +1,6 @@
 package software.uncharted.terarium.hmiserver.controller.dataservice;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -357,16 +358,41 @@ public ResponseEntity<Dataset> createFromSimulationResult(
 			if (sim.isEmpty()) {
 				return ResponseEntity.notFound().build();
 			}
+
 			// Create the dataset asset:
 			final UUID simId = sim.get().getId();
-			final Dataset dataset = simulationService.createDatasetFromSimulation(
-				simId,
-				datasetName,
-				projectId,
-				addToProject,
-				permission
-			);
-			return ResponseEntity.status(HttpStatus.CREATED).body(dataset);
+			final Dataset dataset = datasetService.createAsset(new Dataset(), projectId, permission);
+			dataset.setName(datasetName);
+			dataset.setDescription(sim.get().getDescription());
+			dataset.setMetadata(objectMapper.convertValue(Map.of("simulationId", simId.toString()), JsonNode.class));
+			dataset.setFileNames(sim.get().getResultFiles());
+			dataset.setDataSourceDate(sim.get().getCompletedTime());
+			dataset.setColumns(new ArrayList<>());
+
+			// Attach the user to the dataset
+			if (sim.get().getUserId() != null) {
+				dataset.setUserId(sim.get().getUserId());
+			}
+
+			// Duplicate the simulation results to a new dataset
+			simulationService.copySimulationResultToDataset(sim.get(), dataset);
+			datasetService.updateAsset(dataset, projectId, permission);
+
+			// If this is a temporary asset, do not add to project.
+			if (!addToProject) {
+				return ResponseEntity.status(HttpStatus.CREATED).body(dataset);
+			}
+
+			// Add the dataset to the project as an asset
+			final Optional<Project> project = projectService.getProject(projectId);
+			if (project.isPresent()) {
+				projectAssetService.createProjectAsset(project.get(), AssetType.DATASET, dataset, permission);
+				// underlying asset does not exist
+				return ResponseEntity.status(HttpStatus.CREATED).body(dataset);
+			} else {
+				log.error("Failed to add the dataset from simulation {} result", id);
+				return ResponseEntity.internalServerError().build();
+			}
 		} catch (final Exception e) {
 			final String error = String.format("Failed to add simulation %s result as dataset to project %s", id, projectId);
 			log.error(error, e);
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/SimulationService.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/SimulationService.java
index f46e0d05ad..af0eb351f6 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/SimulationService.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/SimulationService.java
@@ -1,13 +1,11 @@
 package software.uncharted.terarium.hmiserver.service.data;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.micrometer.observation.annotation.Observed;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.entity.ContentType;
@@ -16,10 +14,8 @@
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
 import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
 import software.uncharted.terarium.hmiserver.configuration.Config;
-import software.uncharted.terarium.hmiserver.models.dataservice.AssetType;
 import software.uncharted.terarium.hmiserver.models.dataservice.FileExport;
 import software.uncharted.terarium.hmiserver.models.dataservice.dataset.Dataset;
-import software.uncharted.terarium.hmiserver.models.dataservice.project.Project;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.Simulation;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.SimulationUpdate;
 import software.uncharted.terarium.hmiserver.repository.data.SimulationRepository;
@@ -33,7 +29,6 @@
 public class SimulationService extends TerariumAssetServiceWithoutSearch<Simulation, SimulationRepository> {
 
 	private final SimulationUpdateRepository simulationUpdateRepository;
-	private final DatasetService datasetService;
 
 	/**
 	 * Constructor for SimulationService
@@ -50,12 +45,10 @@ public SimulationService(
 		final ProjectAssetService projectAssetService,
 		final SimulationRepository repository,
 		final S3ClientService s3ClientService,
-		final SimulationUpdateRepository simulationUpdateRepository,
-		final DatasetService datasetService
+		final SimulationUpdateRepository simulationUpdateRepository
 	) {
 		super(objectMapper, config, projectService, projectAssetService, repository, s3ClientService, Simulation.class);
 		this.simulationUpdateRepository = simulationUpdateRepository;
-		this.datasetService = datasetService;
 	}
 
 	@Override
@@ -88,53 +81,6 @@ public SimulationUpdate appendUpdateToSimulation(
 		return created;
 	}
 
-	public Dataset createDatasetFromSimulation(
-		final UUID simId,
-		final String datasetName,
-		final UUID projectId,
-		final boolean addToProject,
-		final Schema.Permission permission
-	) {
-		try {
-			final Optional<Simulation> sim = this.getAsset(simId, permission);
-			final Optional<Project> project = projectService.getProject(projectId);
-			if (sim.isEmpty()) {
-				throw new IllegalArgumentException("Simulation not found");
-			}
-
-			if (!project.isPresent() && addToProject) {
-				throw new IllegalArgumentException("Project not found");
-			}
-
-			final Dataset dataset = datasetService.createAsset(new Dataset(), projectId, permission);
-			dataset.setName(datasetName);
-			dataset.setDescription(sim.get().getDescription());
-			dataset.setMetadata(objectMapper.convertValue(Map.of("simulationId", simId.toString()), JsonNode.class));
-			dataset.setFileNames(sim.get().getResultFiles());
-			dataset.setDataSourceDate(sim.get().getCompletedTime());
-			dataset.setColumns(new ArrayList<>());
-
-			// Attach the user to the dataset
-			if (sim.get().getUserId() != null) {
-				dataset.setUserId(sim.get().getUserId());
-			}
-
-			// Duplicate the simulation results to a new dataset
-			this.copySimulationResultToDataset(sim.get(), dataset);
-			datasetService.updateAsset(dataset, projectId, permission);
-
-			// Add dataset to project
-			if (addToProject) {
-				projectAssetService.createProjectAsset(project.get(), AssetType.DATASET, dataset, permission);
-			}
-
-			return dataset;
-		} catch (final Exception e) {
-			log.error("Failed to create dataset from simulation", e);
-			throw new IllegalArgumentException("Failed to create dataset from simulation");
-		}
-	}
-
 	@Observed(name = "function_profile")
 	public void copySimulationResultToDataset(final Simulation simulation, final Dataset dataset) {
 		final UUID simId = simulation.getId();

From 67b89c0bdca8d49e43aded9c9ff2d441f9f93de3 Mon Sep 17 00:00:00 2001
From: Cole Blanchard <cblanchard@Cole-Blanchards-MacBook-Pro.local>
Date: Wed, 25 Sep 2024 15:10:23 -0400
Subject: [PATCH 6/6] Revert "-sim services"

This reverts commit 7e116454601ff12d2349c59147e2ca224c31e821.
---
 .../dataservice/SimulationController.java     | 42 +++-----------
 .../service/data/SimulationService.java       | 56 ++++++++++++++++++-
 2 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
index 20676bc370..49974004a3 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/dataservice/SimulationController.java
@@ -1,6 +1,5 @@
 package software.uncharted.terarium.hmiserver.controller.dataservice;
 
-import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;
@@ -358,41 +357,16 @@ public ResponseEntity<Dataset> createFromSimulationResult(
 			if (sim.isEmpty()) {
 				return ResponseEntity.notFound().build();
 			}
-
 			// Create the dataset asset:
 			final UUID simId = sim.get().getId();
-			final Dataset dataset = datasetService.createAsset(new Dataset(), projectId, permission);
-			dataset.setName(datasetName);
-			dataset.setDescription(sim.get().getDescription());
-			dataset.setMetadata(objectMapper.convertValue(Map.of("simulationId", simId.toString()), JsonNode.class));
-			dataset.setFileNames(sim.get().getResultFiles());
-			dataset.setDataSourceDate(sim.get().getCompletedTime());
-			dataset.setColumns(new ArrayList<>());
-
-			// Attach the user to the dataset
-			if (sim.get().getUserId() != null) {
-				dataset.setUserId(sim.get().getUserId());
-			}
-
-			// Duplicate the simulation results to a new dataset
-			simulationService.copySimulationResultToDataset(sim.get(), dataset);
-			datasetService.updateAsset(dataset, projectId, permission);
-
-			// If this is a temporary asset, do not add to project.
-			if (!addToProject) {
-				return ResponseEntity.status(HttpStatus.CREATED).body(dataset);
-			}
-
-			// Add the dataset to the project as an asset
-			final Optional<Project> project = projectService.getProject(projectId);
-			if (project.isPresent()) {
-				projectAssetService.createProjectAsset(project.get(), AssetType.DATASET, dataset, permission);
-				// underlying asset does not exist
-				return ResponseEntity.status(HttpStatus.CREATED).body(dataset);
-			} else {
-				log.error("Failed to add the dataset from simulation {} result", id);
-				return ResponseEntity.internalServerError().build();
-			}
+			final Dataset dataset = simulationService.createDatasetFromSimulation(
+				simId,
+				datasetName,
+				projectId,
+				addToProject,
+				permission
+			);
+			return ResponseEntity.status(HttpStatus.CREATED).body(dataset);
 		} catch (final Exception e) {
 			final String error = String.format("Failed to add simulation %s result as dataset to project %s", id, projectId);
 			log.error(error, e);
diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/SimulationService.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/SimulationService.java
index af0eb351f6..f46e0d05ad 100644
--- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/SimulationService.java
+++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/service/data/SimulationService.java
@@ -1,11 +1,13 @@
 package software.uncharted.terarium.hmiserver.service.data;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import io.micrometer.observation.annotation.Observed;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.UUID;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.http.entity.ContentType;
@@ -14,8 +16,10 @@
 import software.amazon.awssdk.services.s3.model.GetObjectResponse;
 import software.amazon.awssdk.services.s3.model.NoSuchKeyException;
 import software.uncharted.terarium.hmiserver.configuration.Config;
+import software.uncharted.terarium.hmiserver.models.dataservice.AssetType;
 import software.uncharted.terarium.hmiserver.models.dataservice.FileExport;
 import software.uncharted.terarium.hmiserver.models.dataservice.dataset.Dataset;
+import software.uncharted.terarium.hmiserver.models.dataservice.project.Project;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.Simulation;
 import software.uncharted.terarium.hmiserver.models.dataservice.simulation.SimulationUpdate;
 import software.uncharted.terarium.hmiserver.repository.data.SimulationRepository;
@@ -29,6 +33,7 @@
 public class SimulationService extends TerariumAssetServiceWithoutSearch<Simulation, SimulationRepository> {
 
 	private final SimulationUpdateRepository simulationUpdateRepository;
+	private final DatasetService datasetService;
 
 	/**
 	 * Constructor for SimulationService
@@ -45,10 +50,12 @@ public SimulationService(
 		final ProjectAssetService projectAssetService,
 		final SimulationRepository repository,
 		final S3ClientService s3ClientService,
-		final SimulationUpdateRepository simulationUpdateRepository
+		final SimulationUpdateRepository simulationUpdateRepository,
+		final DatasetService datasetService
 	) {
 		super(objectMapper, config, projectService, projectAssetService, repository, s3ClientService, Simulation.class);
 		this.simulationUpdateRepository = simulationUpdateRepository;
+		this.datasetService = datasetService;
 	}
 
 	@Override
@@ -81,6 +88,53 @@ public SimulationUpdate appendUpdateToSimulation(
 		return created;
 	}
 
+	public Dataset createDatasetFromSimulation(
+		final UUID simId,
+		final String datasetName,
+		final UUID projectId,
+		final boolean addToProject,
+		final Schema.Permission permission
+	) {
+		try {
+			final Optional<Simulation> sim = this.getAsset(simId, permission);
+			final Optional<Project> project = projectService.getProject(projectId);
+			if (sim.isEmpty()) {
+				throw new IllegalArgumentException("Simulation not found");
+			}
+
+			if (!project.isPresent() && addToProject) {
+				throw new IllegalArgumentException("Project not found");
+			}
+
+			final Dataset dataset = datasetService.createAsset(new Dataset(), projectId, permission);
+			dataset.setName(datasetName);
+			dataset.setDescription(sim.get().getDescription());
+			dataset.setMetadata(objectMapper.convertValue(Map.of("simulationId", simId.toString()), JsonNode.class));
+			dataset.setFileNames(sim.get().getResultFiles());
+			dataset.setDataSourceDate(sim.get().getCompletedTime());
+			dataset.setColumns(new ArrayList<>());
+
+			// Attach the user to the dataset
+			if (sim.get().getUserId() != null) {
+				dataset.setUserId(sim.get().getUserId());
+			}
+
+			// Duplicate the simulation results to a new dataset
+			this.copySimulationResultToDataset(sim.get(), dataset);
+			datasetService.updateAsset(dataset, projectId, permission);
+
+			// Add dataset to project
+			if (addToProject) {
+				projectAssetService.createProjectAsset(project.get(), AssetType.DATASET, dataset, permission);
+			}
+
+			return dataset;
+		} catch (final Exception e) {
+			log.error("Failed to create dataset from simulation", e);
+			throw new IllegalArgumentException("Failed to create dataset from simulation");
+		}
+	}
+
 	@Observed(name = "function_profile")
 	public void copySimulationResultToDataset(final Simulation simulation, final Dataset dataset) {
 		final UUID simId = simulation.getId();