From d0ff9eeaf67f055f5f2ade50f75385b03488924f Mon Sep 17 00:00:00 2001 From: Yohann Paris Date: Fri, 8 Mar 2024 17:37:10 -0500 Subject: [PATCH 01/20] remove the format of equations --- .../src/components/model/petrinet/tera-model-equation.vue | 2 +- packages/client/hmi-client/src/services/knowledge.ts | 3 +-- .../model-from-document/tera-model-from-document-drilldown.vue | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-model-equation.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-model-equation.vue index 72451363f1..b3a29110a5 100644 --- a/packages/client/hmi-client/src/components/model/petrinet/tera-model-equation.vue +++ b/packages/client/hmi-client/src/components/model/petrinet/tera-model-equation.vue @@ -76,7 +76,7 @@ const updateLatexFormula = (equationsList: string[]) => { const updateModelFromEquations = async () => { isUpdating.value = true; isEditing.value = false; - const updated = await equationsToAMR('latex', equations.value, 'petrinet', props.model.id); + const updated = await equationsToAMR(equations.value, 'petrinet', props.model.id); if (updated) { emit('model-updated'); useToastService().success('Success', `Model Updated from equation`); diff --git a/packages/client/hmi-client/src/services/knowledge.ts b/packages/client/hmi-client/src/services/knowledge.ts index ad8b652bc3..f519ddd6c0 100644 --- a/packages/client/hmi-client/src/services/knowledge.ts +++ b/packages/client/hmi-client/src/services/knowledge.ts @@ -46,7 +46,6 @@ export async function fetchExtraction(id: string): Promise> { * @return {Promise} */ export const equationsToAMR = async ( - format: string, equations: string[], framework: string = 'petrinet', modelId?: string @@ -54,7 +53,7 @@ export const equationsToAMR = async ( try { const response: AxiosResponse = await API.post( `/knowledge/equations-to-model`, - { format, framework, modelId, equations } + { model: framework, modelId, equations } ); if (response && response?.status === 200) { const { id, status } = response.data; diff --git a/packages/client/hmi-client/src/workflow/ops/model-from-document/tera-model-from-document-drilldown.vue b/packages/client/hmi-client/src/workflow/ops/model-from-document/tera-model-from-document-drilldown.vue index 8290b22463..579365d086 100644 --- a/packages/client/hmi-client/src/workflow/ops/model-from-document/tera-model-from-document-drilldown.vue +++ b/packages/client/hmi-client/src/workflow/ops/model-from-document/tera-model-from-document-drilldown.vue @@ -300,7 +300,7 @@ async function onRun() { .filter((e) => e.includeInProcess && !e.asset.extractionError) .map((e) => e.asset.text); - const res = await equationsToAMR('latex', equations, clonedState.value.modelFramework); + const res = await equationsToAMR(equations, clonedState.value.modelFramework); if (!res) { return; From 049a7b1cefa14301be4a1d419b565b5d1356d41c Mon Sep 17 00:00:00 2001 From: Yohann Paris Date: Fri, 8 Mar 2024 17:37:55 -0500 Subject: [PATCH 02/20] Update the knowledge controller to create an AMR --- .../hmi-client/src/services/knowledge.ts | 13 +----- .../knowledge/KnowledgeController.java | 46 +++++++++++++++++-- 2 files changed, 43 insertions(+), 16 deletions(-) diff --git a/packages/client/hmi-client/src/services/knowledge.ts b/packages/client/hmi-client/src/services/knowledge.ts index f519ddd6c0..52f409ded2 100644 --- a/packages/client/hmi-client/src/services/knowledge.ts +++ b/packages/client/hmi-client/src/services/knowledge.ts @@ -55,18 +55,7 @@ export const equationsToAMR = async ( `/knowledge/equations-to-model`, { model: framework, modelId, equations } ); - if (response && response?.status === 200) { - const { id, status } = response.data; - if (status === 'queued') { - const result = await fetchExtraction(id); - if (result?.state === PollerState.Done && result?.data?.job_result?.status_code === 200) { - return result.data; - } - } - if (status === 'finished' && response.data.result.job_result?.status_code === 200) { - return response.data.result; - } - } + return response.data; } catch (error: unknown) { logger.error(error, { showToast: false }); } diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnowledgeController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnowledgeController.java index 1330d3e3a3..7b9df2e555 100644 --- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnowledgeController.java +++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnowledgeController.java @@ -34,6 +34,7 @@ import software.uncharted.terarium.hmiserver.proxies.skema.SkemaUnifiedProxy; import software.uncharted.terarium.hmiserver.security.Roles; import software.uncharted.terarium.hmiserver.service.data.CodeService; +import software.uncharted.terarium.hmiserver.service.data.ModelService; import software.uncharted.terarium.hmiserver.service.data.ProvenanceService; import java.io.IOException; @@ -54,6 +55,8 @@ public class KnowledgeController { final ProvenanceService provenanceService; + final ModelService modelService; + final CodeService codeService; final ExtractionProxy extractionProxy; @@ -71,13 +74,48 @@ public ResponseEntity getTaskStatus( return ResponseEntity.ok(knowledgeMiddlewareProxy.getTaskStatus(id).getBody()); } + /** + * Send the equations to the skema unified service to get the AMR + * @param req + * @return + */ @PostMapping("/equations-to-model") @Secured(Roles.USER) - public ResponseEntity equationsToModel(@RequestBody JsonNode req) { - return ResponseEntity - .ok(skemaUnifiedProxy + public ResponseEntity equationsToModel(@RequestBody final JsonNode req) { + try { + final Model responseAMR = skemaUnifiedProxy .consolidatedEquationsToAMR(req) - .getBody()); + .getBody(); + + if (responseAMR == null) { + throw new ResponseStatusException( + HttpStatus.NO_CONTENT, + "No AMR returned by Skema Unified Service."); + } + + final UUID modelId = req.get("modelId") != null ? UUID.fromString(req.get("modelId").asText()) : null; + if (modelId != null) { + final Optional model = modelService.getAsset(modelId); + if (model.isPresent()) { + responseAMR.setId(model.get().getId()); + modelService.updateAsset(responseAMR); + return ResponseEntity.ok(model.get().getId()); + } else { + throw new ResponseStatusException( + HttpStatus.BAD_REQUEST, + "The model id provided does not exist."); + } + } + + final Model model = modelService.createAsset(responseAMR); + return ResponseEntity.ok(model.getId()); + + } catch (final Exception e) { + log.error("unable to create model", e); + throw new ResponseStatusException( + org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, + "Error creating model"); + } } @PostMapping("/base64-equations-to-model") From 08bdae5094b663a8b6d2198174ba627a28e457f1 Mon Sep 17 00:00:00 2001 From: Yohann Paris Date: Fri, 8 Mar 2024 21:19:02 -0500 Subject: [PATCH 03/20] Update KnowledgeController.java --- .../hmiserver/controller/knowledge/KnowledgeController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnowledgeController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnowledgeController.java index 7b9df2e555..d8f68fbd6d 100644 --- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnowledgeController.java +++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnowledgeController.java @@ -76,8 +76,7 @@ public ResponseEntity getTaskStatus( /** * Send the equations to the skema unified service to get the AMR - * @param req - * @return + * @return UUID Model ID, or null if the model was not created or updated */ @PostMapping("/equations-to-model") @Secured(Roles.USER) From 0ea689878251cfa6c37b5927f2d9e1441ae83a8a Mon Sep 17 00:00:00 2001 From: Yohann Paris Date: Fri, 8 Mar 2024 21:19:52 -0500 Subject: [PATCH 04/20] change the answer from knowledge eq to amr --- .../model/petrinet/tera-model-equation.vue | 5 ++--- .../client/hmi-client/src/services/knowledge.ts | 13 +++++++------ .../tera-model-from-document-drilldown.vue | 9 +-------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/packages/client/hmi-client/src/components/model/petrinet/tera-model-equation.vue b/packages/client/hmi-client/src/components/model/petrinet/tera-model-equation.vue index b3a29110a5..2fb1adc4a9 100644 --- a/packages/client/hmi-client/src/components/model/petrinet/tera-model-equation.vue +++ b/packages/client/hmi-client/src/components/model/petrinet/tera-model-equation.vue @@ -76,8 +76,8 @@ const updateLatexFormula = (equationsList: string[]) => { const updateModelFromEquations = async () => { isUpdating.value = true; isEditing.value = false; - const updated = await equationsToAMR(equations.value, 'petrinet', props.model.id); - if (updated) { + const modelId = await equationsToAMR(equations.value, 'petrinet', props.model.id); + if (modelId) { emit('model-updated'); useToastService().success('Success', `Model Updated from equation`); } @@ -87,7 +87,6 @@ const updateModelFromEquations = async () => { watch( () => props.model, async () => { - // const latexFormula = await petriToLatex(convertAMRToACSet(props.model)); const latexFormula = await getModelEquation(props.model); if (latexFormula) { updateLatexFormula(cleanLatexEquations(latexFormula.split(' \\\\'))); diff --git a/packages/client/hmi-client/src/services/knowledge.ts b/packages/client/hmi-client/src/services/knowledge.ts index 52f409ded2..ea023138f2 100644 --- a/packages/client/hmi-client/src/services/knowledge.ts +++ b/packages/client/hmi-client/src/services/knowledge.ts @@ -1,6 +1,6 @@ import API, { Poller, PollerResult, PollerState, PollResponse } from '@/api/api'; import { AxiosError, AxiosResponse } from 'axios'; -import type { Code, Dataset, ExtractionResponse, Model } from '@/types/Types'; +import type { Code, Dataset, Model } from '@/types/Types'; import { logger } from '@/utils/logger'; import { modelCard } from './goLLM'; @@ -49,12 +49,13 @@ export const equationsToAMR = async ( equations: string[], framework: string = 'petrinet', modelId?: string -): Promise => { +): Promise => { try { - const response: AxiosResponse = await API.post( - `/knowledge/equations-to-model`, - { model: framework, modelId, equations } - ); + const response: AxiosResponse = await API.post(`/knowledge/equations-to-model`, { + model: framework, + modelId, + equations + }); return response.data; } catch (error: unknown) { logger.error(error, { showToast: false }); diff --git a/packages/client/hmi-client/src/workflow/ops/model-from-document/tera-model-from-document-drilldown.vue b/packages/client/hmi-client/src/workflow/ops/model-from-document/tera-model-from-document-drilldown.vue index 579365d086..b699ebe112 100644 --- a/packages/client/hmi-client/src/workflow/ops/model-from-document/tera-model-from-document-drilldown.vue +++ b/packages/client/hmi-client/src/workflow/ops/model-from-document/tera-model-from-document-drilldown.vue @@ -300,14 +300,7 @@ async function onRun() { .filter((e) => e.includeInProcess && !e.asset.extractionError) .map((e) => e.asset.text); - const res = await equationsToAMR(equations, clonedState.value.modelFramework); - - if (!res) { - return; - } - - const modelId = res.job_result?.tds_model_id; - + const modelId = await equationsToAMR(equations, clonedState.value.modelFramework); if (!modelId) return; generateCard(document.value?.id, modelId); From 9adee7e302f83cef599e65a8db6f8b1c9792cbc0 Mon Sep 17 00:00:00 2001 From: Yohann Paris Date: Fri, 8 Mar 2024 21:20:12 -0500 Subject: [PATCH 05/20] Update model.ts --- packages/client/hmi-client/src/services/model.ts | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/packages/client/hmi-client/src/services/model.ts b/packages/client/hmi-client/src/services/model.ts index a431972145..8f7ca016be 100644 --- a/packages/client/hmi-client/src/services/model.ts +++ b/packages/client/hmi-client/src/services/model.ts @@ -181,7 +181,7 @@ export async function generateModelCard( } } -// helper fucntion to get the model type, will always default to petrinet if the model is not found +// helper function to get the model type, will always default to petrinet if the model is not found export function getModelType(model: Model | null | undefined): AMRSchemaNames { const schemaName = model?.header?.schema_name?.toLowerCase(); if (schemaName === 'regnet') { @@ -194,15 +194,14 @@ export function getModelType(model: Model | null | undefined): AMRSchemaNames { } // Converts a model into latex equation, either one of petrinet, stocknflow, or regnet; -export async function getModelEquation(model: Model) { +export async function getModelEquation(model: Model): Promise { const unSupportedFormats = ['decapodes']; if (unSupportedFormats.includes(model.header.schema_name as string)) { - console.log(`getModelEquation: ${model.header.schema_name} not suported `); + console.warn(`getModelEquation: ${model.header.schema_name} not supported `); return ''; } - const id = model.id; - const response = await API.get(`/transforms/model-to-latex/${id}`); + const response = await API.get(`/transforms/model-to-latex/${model.id}`); const latex = response.data.latex; if (!latex) return ''; From 94a16925de988d3f1ae39c505fe711c2e5b9f925 Mon Sep 17 00:00:00 2001 From: Yohann Paris Date: Fri, 8 Mar 2024 21:29:33 -0500 Subject: [PATCH 06/20] Update KnowledgeController.java --- .../knowledge/KnowledgeController.java | 95 +++++++++---------- 1 file changed, 47 insertions(+), 48 deletions(-) diff --git a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnowledgeController.java b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnowledgeController.java index d8f68fbd6d..0141ff0817 100644 --- a/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnowledgeController.java +++ b/packages/server/src/main/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnowledgeController.java @@ -70,12 +70,13 @@ public class KnowledgeController { @GetMapping("/status/{id}") @Secured(Roles.USER) public ResponseEntity getTaskStatus( - @PathVariable("id") final String id) { + @PathVariable("id") final String id) { return ResponseEntity.ok(knowledgeMiddlewareProxy.getTaskStatus(id).getBody()); } /** * Send the equations to the skema unified service to get the AMR + * * @return UUID Model ID, or null if the model was not created or updated */ @PostMapping("/equations-to-model") @@ -83,13 +84,11 @@ public ResponseEntity getTaskStatus( public ResponseEntity equationsToModel(@RequestBody final JsonNode req) { try { final Model responseAMR = skemaUnifiedProxy - .consolidatedEquationsToAMR(req) - .getBody(); + .consolidatedEquationsToAMR(req) + .getBody(); if (responseAMR == null) { - throw new ResponseStatusException( - HttpStatus.NO_CONTENT, - "No AMR returned by Skema Unified Service."); + throw new ResponseStatusException(HttpStatus.UNPROCESSABLE_ENTITY, "No AMR returned by Skema Unified Service with the provided Equations."); } final UUID modelId = req.get("modelId") != null ? UUID.fromString(req.get("modelId").asText()) : null; @@ -112,8 +111,8 @@ public ResponseEntity equationsToModel(@RequestBody final JsonNode req) { } catch (final Exception e) { log.error("unable to create model", e); throw new ResponseStatusException( - org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, - "Error creating model"); + org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, + "Error creating model"); } } @@ -121,18 +120,18 @@ public ResponseEntity equationsToModel(@RequestBody final JsonNode req) { @Secured(Roles.USER) public ResponseEntity base64EquationsToAMR(@RequestBody final JsonNode req) { return ResponseEntity - .ok(skemaUnifiedProxy - .base64EquationsToAMR(req) - .getBody()); + .ok(skemaUnifiedProxy + .base64EquationsToAMR(req) + .getBody()); } @PostMapping("/base64-equations-to-latex") @Secured(Roles.USER) public ResponseEntity base64EquationsToLatex(@RequestBody final JsonNode req) { return ResponseEntity - .ok(skemaUnifiedProxy - .base64EquationsToLatex(req) - .getBody()); + .ok(skemaUnifiedProxy + .base64EquationsToLatex(req) + .getBody()); } /** @@ -150,29 +149,29 @@ public ResponseEntity base64EquationsToLatex(@RequestBody final JsonNode @PostMapping("/code-to-amr") @Secured(Roles.USER) ResponseEntity postCodeToAMR( - @RequestParam("code_id") final UUID codeId, - @RequestParam(name = "name", required = false) final String name, - @RequestParam(name = "description", required = false) final String description, - @RequestParam(name = "dynamics_only", required = false) final Boolean dynamicsOnly, - @RequestParam(name = "llm_assisted", required = false) final Boolean llmAssisted) { + @RequestParam("code_id") final UUID codeId, + @RequestParam(name = "name", required = false) final String name, + @RequestParam(name = "description", required = false) final String description, + @RequestParam(name = "dynamics_only", required = false) final Boolean dynamicsOnly, + @RequestParam(name = "llm_assisted", required = false) final Boolean llmAssisted) { return ResponseEntity.ok( - knowledgeMiddlewareProxy.postCodeToAMR(codeId.toString(), name, description, dynamicsOnly, llmAssisted) - .getBody()); + knowledgeMiddlewareProxy.postCodeToAMR(codeId.toString(), name, description, dynamicsOnly, llmAssisted) + .getBody()); } // Create a model from code blocks @Operation(summary = "Create a model from code blocks") @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "Return the extraction job for code to amr", content = @Content(mediaType = "application/json", schema = @io.swagger.v3.oas.annotations.media.Schema(implementation = ExtractionResponse.class))), - @ApiResponse(responseCode = "500", description = "Error running code blocks to model", content = @Content) + @ApiResponse(responseCode = "200", description = "Return the extraction job for code to amr", content = @Content(mediaType = "application/json", schema = @io.swagger.v3.oas.annotations.media.Schema(implementation = ExtractionResponse.class))), + @ApiResponse(responseCode = "500", description = "Error running code blocks to model", content = @Content) }) @PostMapping(value = "/code-blocks-to-model", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) @Secured(Roles.USER) public ResponseEntity codeBlocksToModel(@RequestPart final Code code, - @RequestPart("file") final MultipartFile input) throws IOException { + @RequestPart("file") final MultipartFile input) throws IOException { try (final CloseableHttpClient httpClient = HttpClients.custom() - .build()) { + .build()) { // 1. create code asset from code blocks final Code createdCode = codeService.createAsset(code); @@ -182,7 +181,7 @@ public ResponseEntity codeBlocksToModel(@RequestPart final C // we have pre-formatted the files object already so no need to use uploadCode final PresignedURL presignedURL = codeService.getUploadUrl(createdCode.getId(), - input.getOriginalFilename()); + input.getOriginalFilename()); final HttpPut put = new HttpPut(presignedURL.getUrl()); put.setEntity(fileEntity); final HttpResponse response = httpClient.execute(put); @@ -192,13 +191,13 @@ public ResponseEntity codeBlocksToModel(@RequestPart final C } // 3. create model from code asset return ResponseEntity.ok(knowledgeMiddlewareProxy - .postCodeToAMR(createdCode.getId().toString(), "temp model", "temp model description", false, false) - .getBody()); + .postCodeToAMR(createdCode.getId().toString(), "temp model", "temp model description", false, false) + .getBody()); } catch (final Exception e) { log.error("unable to upload file", e); throw new ResponseStatusException( - org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, - "Error creating running code to model"); + org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, + "Error creating running code to model"); } } @@ -217,13 +216,13 @@ public ResponseEntity codeBlocksToModel(@RequestPart final C @PostMapping("/pdf-extractions") @Secured(Roles.USER) public ResponseEntity postPDFExtractions( - @RequestParam("document_id") final UUID documentId, - @RequestParam(name = "annotate_skema", defaultValue = "true") final Boolean annotateSkema, - @RequestParam(name = "annotate_mit", defaultValue = "true") final Boolean annotateMIT, - @RequestParam(name = "name", required = false) final String name, - @RequestParam(name = "description", required = false) final String description) { + @RequestParam("document_id") final UUID documentId, + @RequestParam(name = "annotate_skema", defaultValue = "true") final Boolean annotateSkema, + @RequestParam(name = "annotate_mit", defaultValue = "true") final Boolean annotateMIT, + @RequestParam(name = "name", required = false) final String name, + @RequestParam(name = "description", required = false) final String description) { return ResponseEntity.ok(knowledgeMiddlewareProxy - .postPDFExtractions(documentId.toString(), annotateSkema, annotateMIT, name, description).getBody()); + .postPDFExtractions(documentId.toString(), annotateSkema, annotateMIT, name, description).getBody()); } /** @@ -244,8 +243,8 @@ public ResponseEntity postPDFToCosmos(@RequestParam("document_id") fin final String error = "Unable to create provenance"; log.error(error, e); throw new ResponseStatusException( - org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, - error); + org.springframework.http.HttpStatus.INTERNAL_SERVER_ERROR, + error); } } @@ -259,12 +258,12 @@ public ResponseEntity postPDFToCosmos(@RequestParam("document_id") fin @PostMapping("/profile-model/{model_id}") @Secured(Roles.USER) public ResponseEntity postProfileModel( - @PathVariable("model_id") final UUID modelId, - @RequestParam("document_id") final UUID documentId) { + @PathVariable("model_id") final UUID modelId, + @RequestParam("document_id") final UUID documentId) { try { final Provenance provenancePayload = new Provenance(ProvenanceRelationType.EXTRACTED_FROM, modelId, - ProvenanceType.MODEL, documentId, ProvenanceType.DOCUMENT); + ProvenanceType.MODEL, documentId, ProvenanceType.DOCUMENT); provenanceService.createProvenance(provenancePayload); } catch (final Exception e) { final String error = "Unable to create provenance for profile-model"; @@ -272,7 +271,7 @@ public ResponseEntity postProfileModel( } return ResponseEntity - .ok(knowledgeMiddlewareProxy.postProfileModel(modelId.toString(), documentId.toString()).getBody()); + .ok(knowledgeMiddlewareProxy.postProfileModel(modelId.toString(), documentId.toString()).getBody()); } /** @@ -285,14 +284,14 @@ public ResponseEntity postProfileModel( @PostMapping("/profile-dataset/{dataset_id}") @Secured(Roles.USER) public ResponseEntity postProfileDataset( - @PathVariable("dataset_id") final UUID datasetId, - @RequestParam(name = "document_id", required = false) final Optional documentId) { + @PathVariable("dataset_id") final UUID datasetId, + @RequestParam(name = "document_id", required = false) final Optional documentId) { // Provenance call if a document id is provided if (documentId.isPresent()) { try { final Provenance provenancePayload = new Provenance(ProvenanceRelationType.EXTRACTED_FROM, datasetId, - ProvenanceType.DATASET, documentId.get(), ProvenanceType.DOCUMENT); + ProvenanceType.DATASET, documentId.get(), ProvenanceType.DOCUMENT); provenanceService.createProvenance(provenancePayload); } catch (final Exception e) { final String error = "Unable to create provenance for profile-dataset"; @@ -302,7 +301,7 @@ public ResponseEntity postProfileDataset( final String docIdString = documentId.map(UUID::toString).orElse(null); return ResponseEntity.ok( - knowledgeMiddlewareProxy.postProfileDataset(datasetId.toString(), docIdString).getBody()); + knowledgeMiddlewareProxy.postProfileDataset(datasetId.toString(), docIdString).getBody()); } /** @@ -315,8 +314,8 @@ public ResponseEntity postProfileDataset( @PostMapping("/link-amr") @Secured(Roles.USER) public ResponseEntity postLinkAmr( - @RequestParam("document_id") final String documentId, - @RequestParam("model_id") final String modelId) { + @RequestParam("document_id") final String documentId, + @RequestParam("model_id") final String modelId) { return ResponseEntity.ok(knowledgeMiddlewareProxy.postLinkAmr(documentId, modelId).getBody()); } From 8ae51461889c297ea4848bb268bdc573f59def6c Mon Sep 17 00:00:00 2001 From: Yohann Paris Date: Fri, 8 Mar 2024 21:43:44 -0500 Subject: [PATCH 07/20] Update KnoweldgeControllerTests.java --- .../knowledge/KnoweldgeControllerTests.java | 93 +++++++++---------- 1 file changed, 46 insertions(+), 47 deletions(-) diff --git a/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnoweldgeControllerTests.java b/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnoweldgeControllerTests.java index 60c5a72f55..17c7919cbf 100644 --- a/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnoweldgeControllerTests.java +++ b/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnoweldgeControllerTests.java @@ -1,11 +1,7 @@ package software.uncharted.terarium.hmiserver.controller.knowledge; -import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; - -import java.nio.file.Files; -import java.util.Base64; - +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; @@ -13,14 +9,17 @@ import org.springframework.security.test.context.support.WithUserDetails; import org.springframework.test.web.servlet.MvcResult; import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; - -import com.fasterxml.jackson.databind.ObjectMapper; - -import lombok.extern.slf4j.Slf4j; import software.uncharted.terarium.hmiserver.TerariumApplicationTests; import software.uncharted.terarium.hmiserver.configuration.MockUser; import software.uncharted.terarium.hmiserver.models.dataservice.model.Model; +import java.nio.file.Files; +import java.util.Base64; +import java.util.UUID; + +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + @Slf4j public class KnoweldgeControllerTests extends TerariumApplicationTests { @@ -31,7 +30,7 @@ public class KnoweldgeControllerTests extends TerariumApplicationTests { @WithUserDetails(MockUser.URSULA) public void equationsToModelRegNet() throws Exception { - String payload1 = """ + final String payload1 = """ { "equations": [ "\\\\frac{dS}{dt} = -\\\\alpha S I -\\\\beta S D -\\\\gamma S A -\\\\delta S R", @@ -54,13 +53,13 @@ public void equationsToModelRegNet() throws Exception { .andExpect(status().isOk()) .andReturn(); - Model amr = objectMapper.readValue(res.getResponse().getContentAsString(), Model.class); - log.info(amr.toString()); + UUID regnetModelId = UUID.fromString(res.getResponse().getContentAsString()); + log.info(regnetModelId.toString()); - String payload2 = """ + final String payload2 = """ { "equations": [ - "\\\\frac{d S}{d t} = -\\\\beta S I", + "\\\\frac{d S}{d t} = -\\\\beta S I", "\\\\frac{d I}{d t} = \\\\beta S I - \\\\gamma I", "\\\\frac{d R}{d t} = \\\\gamma I"], "model": "regnet" @@ -74,15 +73,15 @@ public void equationsToModelRegNet() throws Exception { .andExpect(status().isOk()) .andReturn(); - amr = objectMapper.readValue(res.getResponse().getContentAsString(), Model.class); - log.info(amr.toString()); + regnetModelId = UUID.fromString(res.getResponse().getContentAsString()); + log.info(regnetModelId.toString()); } @Test @WithUserDetails(MockUser.URSULA) public void equationsToModelPetrinet() throws Exception { - String payload1 = """ + final String payload1 = """ { "equations": [ "\\\\frac{dS}{dt} = -\\\\alpha S I -\\\\beta S D -\\\\gamma S A -\\\\delta S R", @@ -105,10 +104,10 @@ public void equationsToModelPetrinet() throws Exception { .andExpect(status().isOk()) .andReturn(); - Model amr = objectMapper.readValue(res.getResponse().getContentAsString(), Model.class); - log.info(amr.toString()); + UUID petrinetModelId = UUID.fromString(res.getResponse().getContentAsString()); + log.info(petrinetModelId.toString()); - String payload2 = """ + final String payload2 = """ { "equations": [ "\\\\frac{d S}{d t} = -\\\\beta S I", @@ -125,39 +124,39 @@ public void equationsToModelPetrinet() throws Exception { .andExpect(status().isOk()) .andReturn(); - amr = objectMapper.readValue(res.getResponse().getContentAsString(), Model.class); - log.info(amr.toString()); + petrinetModelId = UUID.fromString(res.getResponse().getContentAsString()); + log.info(petrinetModelId.toString()); } // @Test @WithUserDetails(MockUser.URSULA) public void base64EquationsToAMRTests() throws Exception { - ClassPathResource resource1 = new ClassPathResource("knowledge/equation1.png"); - byte[] content1 = Files.readAllBytes(resource1.getFile().toPath()); - String encodedString1 = Base64.getEncoder().encodeToString(content1); + final ClassPathResource resource1 = new ClassPathResource("knowledge/equation1.png"); + final byte[] content1 = Files.readAllBytes(resource1.getFile().toPath()); + final String encodedString1 = Base64.getEncoder().encodeToString(content1); - ClassPathResource resource2 = new ClassPathResource("knowledge/equation2.png"); - byte[] content2 = Files.readAllBytes(resource2.getFile().toPath()); - String encodedString2 = Base64.getEncoder().encodeToString(content2); + final ClassPathResource resource2 = new ClassPathResource("knowledge/equation2.png"); + final byte[] content2 = Files.readAllBytes(resource2.getFile().toPath()); + final String encodedString2 = Base64.getEncoder().encodeToString(content2); - ClassPathResource resource3 = new ClassPathResource("knowledge/equation3.png"); - byte[] content3 = Files.readAllBytes(resource3.getFile().toPath()); - String encodedString3 = Base64.getEncoder().encodeToString(content3); + final ClassPathResource resource3 = new ClassPathResource("knowledge/equation3.png"); + final byte[] content3 = Files.readAllBytes(resource3.getFile().toPath()); + final String encodedString3 = Base64.getEncoder().encodeToString(content3); - String payload = "{\"images\": [" + + final String payload = "{\"images\": [" + "\"" + encodedString1 + "\"," + "\"" + encodedString2 + "\"," + "\"" + encodedString3 + "\"],\"model\": \"regnet\"}"; - MvcResult res = mockMvc.perform(MockMvcRequestBuilders.post("/knowledge/base64-equations-to-model") + final MvcResult res = mockMvc.perform(MockMvcRequestBuilders.post("/knowledge/base64-equations-to-model") .contentType(MediaType.APPLICATION_JSON) .content(payload) .with(csrf())) .andExpect(status().isOk()) .andReturn(); - Model amr = objectMapper.readValue(res.getResponse().getContentAsString(), Model.class); + final Model amr = objectMapper.readValue(res.getResponse().getContentAsString(), Model.class); log.info(amr.toString()); } @@ -165,31 +164,31 @@ public void base64EquationsToAMRTests() throws Exception { @WithUserDetails(MockUser.URSULA) public void base64EquationsToLatexTests() throws Exception { - ClassPathResource resource1 = new ClassPathResource("knowledge/equation1.png"); - byte[] content1 = Files.readAllBytes(resource1.getFile().toPath()); - String encodedString1 = Base64.getEncoder().encodeToString(content1); + final ClassPathResource resource1 = new ClassPathResource("knowledge/equation1.png"); + final byte[] content1 = Files.readAllBytes(resource1.getFile().toPath()); + final String encodedString1 = Base64.getEncoder().encodeToString(content1); - ClassPathResource resource2 = new ClassPathResource("knowledge/equation2.png"); - byte[] content2 = Files.readAllBytes(resource2.getFile().toPath()); - String encodedString2 = Base64.getEncoder().encodeToString(content2); + final ClassPathResource resource2 = new ClassPathResource("knowledge/equation2.png"); + final byte[] content2 = Files.readAllBytes(resource2.getFile().toPath()); + final String encodedString2 = Base64.getEncoder().encodeToString(content2); - ClassPathResource resource3 = new ClassPathResource("knowledge/equation3.png"); - byte[] content3 = Files.readAllBytes(resource3.getFile().toPath()); - String encodedString3 = Base64.getEncoder().encodeToString(content3); + final ClassPathResource resource3 = new ClassPathResource("knowledge/equation3.png"); + final byte[] content3 = Files.readAllBytes(resource3.getFile().toPath()); + final String encodedString3 = Base64.getEncoder().encodeToString(content3); - String payload = "{\"images\": [" + + final String payload = "{\"images\": [" + "\"" + encodedString1 + "\"," + "\"" + encodedString2 + "\"," + "\"" + encodedString3 + "\"],\"model\": \"regnet\"}"; - MvcResult res = mockMvc.perform(MockMvcRequestBuilders.post("/knowledge/base64-equations-to-latex") + final MvcResult res = mockMvc.perform(MockMvcRequestBuilders.post("/knowledge/base64-equations-to-latex") .contentType(MediaType.APPLICATION_JSON) .content(payload) .with(csrf())) .andExpect(status().isOk()) .andReturn(); - String latex = res.getResponse().getContentAsString(); + final String latex = res.getResponse().getContentAsString(); log.info(latex.toString()); } From d0f4bc9f3249fce1d2764bc0c34aeead066963d1 Mon Sep 17 00:00:00 2001 From: Yohann Paris Date: Fri, 8 Mar 2024 22:23:16 -0500 Subject: [PATCH 08/20] Update KnoweldgeControllerTests.java --- .../knowledge/KnoweldgeControllerTests.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnoweldgeControllerTests.java b/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnoweldgeControllerTests.java index 17c7919cbf..1271d5abd6 100644 --- a/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnoweldgeControllerTests.java +++ b/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnoweldgeControllerTests.java @@ -53,8 +53,13 @@ public void equationsToModelRegNet() throws Exception { .andExpect(status().isOk()) .andReturn(); - UUID regnetModelId = UUID.fromString(res.getResponse().getContentAsString()); - log.info(regnetModelId.toString()); + String responseContent = res.getResponse().getContentAsString(); // Remove double quotes + try { + final UUID regnetModelId = UUID.fromString(responseContent); + log.info(regnetModelId.toString()); + } catch (final IllegalArgumentException e) { + log.error("Response content is not a valid UUID: " + responseContent); + } final String payload2 = """ { @@ -73,8 +78,13 @@ public void equationsToModelRegNet() throws Exception { .andExpect(status().isOk()) .andReturn(); - regnetModelId = UUID.fromString(res.getResponse().getContentAsString()); - log.info(regnetModelId.toString()); + responseContent = res.getResponse().getContentAsString(); + try { + final UUID regnetModelId = UUID.fromString(responseContent); + log.info(regnetModelId.toString()); + } catch (final IllegalArgumentException e) { + log.error("Response content is not a valid UUID: " + responseContent); + } } @Test From 8a137f700fc8468a4bd564993f31094ad0830d2c Mon Sep 17 00:00:00 2001 From: Yohann Paris Date: Fri, 8 Mar 2024 22:29:53 -0500 Subject: [PATCH 09/20] Update KnoweldgeControllerTests.java --- .../knowledge/KnoweldgeControllerTests.java | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnoweldgeControllerTests.java b/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnoweldgeControllerTests.java index 1271d5abd6..3fe1a7610a 100644 --- a/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnoweldgeControllerTests.java +++ b/packages/server/src/test/java/software/uncharted/terarium/hmiserver/controller/knowledge/KnoweldgeControllerTests.java @@ -114,8 +114,13 @@ public void equationsToModelPetrinet() throws Exception { .andExpect(status().isOk()) .andReturn(); - UUID petrinetModelId = UUID.fromString(res.getResponse().getContentAsString()); - log.info(petrinetModelId.toString()); + String responseContent = res.getResponse().getContentAsString(); // Remove double quotes + try { + final UUID petrinetModelId = UUID.fromString(responseContent); + log.info(petrinetModelId.toString()); + } catch (final IllegalArgumentException e) { + log.error("Response content is not a valid UUID: " + responseContent); + } final String payload2 = """ { @@ -134,8 +139,13 @@ public void equationsToModelPetrinet() throws Exception { .andExpect(status().isOk()) .andReturn(); - petrinetModelId = UUID.fromString(res.getResponse().getContentAsString()); - log.info(petrinetModelId.toString()); + responseContent = res.getResponse().getContentAsString(); // Remove double quotes + try { + final UUID petrinetModelId = UUID.fromString(responseContent); + log.info(petrinetModelId.toString()); + } catch (final IllegalArgumentException e) { + log.error("Response content is not a valid UUID: " + responseContent); + } } // @Test From c800da15fb096f34ad8c94995763d03a8a6b8946 Mon Sep 17 00:00:00 2001 From: Yohann Paris Date: Sat, 9 Mar 2024 21:05:58 -0500 Subject: [PATCH 10/20] Put the toast in the center and wider --- packages/client/hmi-client/src/App.vue | 11 ++++++----- .../theme/designer/components/messages/_toast.scss | 1 + packages/client/hmi-client/src/services/toast.ts | 2 -- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/client/hmi-client/src/App.vue b/packages/client/hmi-client/src/App.vue index ef03cb5f63..3d4c6a33a5 100644 --- a/packages/client/hmi-client/src/App.vue +++ b/packages/client/hmi-client/src/App.vue @@ -1,9 +1,10 @@ +3 -
- -
-

These equations will be used to create your model.

-
-
    -
  • - - -
    - - -
    - +
    +

    These equations will be used to create your model.

    +
    +
      +
    • + + +
      + + +
      + +
      + +
      • +
    + + -

    These equations will be used to create your model.

    @@ -62,19 +61,11 @@ class="w-full md:w-14rem ml-2" v-model="clonedState.modelFramework" :options="modelFrameworks" + option-label="label" + option-value="value" @change="onChangeModelFramework" /> - - - - - - - - - -