Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

if we can't find a grounding, we set as a default empty grounding #5367

Merged
merged 5 commits into from
Nov 5, 2024
Merged

if we can't find a grounding, we set as a default empty grounding #5367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8093b5a
if we can't find a grounding, we set as a default empty grounding
dgauldie Nov 1, 2024
d0f05e2
refactor controller to a common service method
dgauldie Nov 4, 2024
68f15e9
remove open session in view
dgauldie Nov 5, 2024
b2843f8
remove model card notifications
dgauldie Nov 5, 2024
2b23765
Merge branch 'main' into 5282-bug-model-from-equations-failure
dgauldie Nov 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 1 addition & 14 deletions packages/client/hmi-client/src/components/model/tera-model.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,7 @@ import TeraModelParts from '@/components/model/tera-model-parts.vue';
import TeraSaveAssetModal from '@/components/project/tera-save-asset-modal.vue';
import { getModel, updateModel } from '@/services/model';
import type { FeatureConfig } from '@/types/common';
import { AssetType, ClientEvent, ClientEventType, type Model, TaskResponse, TaskStatus } from '@/types/Types';
import { useClientEvent } from '@/composables/useClientEvent';
import { AssetType, type Model } from '@/types/Types';
import { useProjects } from '@/composables/project';
import { logger } from '@/utils/logger';

Expand All @@ -118,18 +117,6 @@ const props = defineProps({

const emit = defineEmits(['close-preview', 'on-save']);

// Listen for the task completion event
useClientEvent(ClientEventType.TaskGollmModelCard, (event: ClientEvent<TaskResponse>) => {
if (
!event.data ||
event.data.status !== TaskStatus.Success ||
event.data.additionalProperties.modelId !== props.assetId
) {
return;
}
fetchModel();
});

const model = ref<Model | null>(null);
const temporaryModel = ref<Model | null>(null);

Expand Down
1 change: 0 additions & 1 deletion packages/client/hmi-client/src/components/navbar/tera-notification-panel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,6 @@ const cancelTask = (item: NotificationItem) => {
if (!item.supportCancel) return;
if (
[
ClientEventType.TaskGollmModelCard,
ClientEventType.TaskGollmConfigureModelFromDocument,
ClientEventType.TaskGollmConfigureModelFromDataset,
ClientEventType.TaskGollmCompareModel
Expand Down
17 changes: 2 additions & 15 deletions packages/client/hmi-client/src/components/widgets/tera-asset-enrichment.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,15 @@
<script setup lang="ts">
import { enrichDataset } from '@/services/knowledge';
import { getRelatedArtifacts, mapAssetTypeToProvenanceType } from '@/services/provenance';
import type { ClientEvent, DocumentAsset, ProjectAsset, TaskResponse, TerariumAsset } from '@/types/Types';
import { AssetType, ClientEventType, ProvenanceType, TaskStatus } from '@/types/Types';
import type { DocumentAsset, ProjectAsset, TerariumAsset } from '@/types/Types';
import { AssetType, ProvenanceType } from '@/types/Types';
import { isDocumentAsset } from '@/utils/asset';
import Button from 'primevue/button';
import RadioButton from 'primevue/radiobutton';
import { computed, ref, watch } from 'vue';
import { enrichModelMetadata } from '@/services/goLLM';
import { useProjects } from '@/composables/project';
import TeraModal from '@/components/widgets/tera-modal.vue';
import { useClientEvent } from '@/composables/useClientEvent';

const props = defineProps<{
assetType: AssetType.Model | AssetType.Dataset;
Expand All @@ -57,18 +56,6 @@ const props = defineProps<{

const emit = defineEmits(['finished-job']);

// Listen for the task completion event for models
useClientEvent(ClientEventType.TaskGollmModelCard, (event: ClientEvent<TaskResponse>) => {
const { modelId } = event.data?.additionalProperties || {};
const { status } = event.data || {};

if (props.assetType !== AssetType.Model || modelId !== props.assetId) {
return;
}

isLoading.value = ![TaskStatus.Success, TaskStatus.Failed, TaskStatus.Cancelled].includes(status);
});

const isLoading = ref(false);
const isModalVisible = ref(false);

Expand Down
2 changes: 1 addition & 1 deletion packages/client/hmi-client/src/services/goLLM.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export async function interventionPolicyFromDocument(

export async function enrichModelMetadata(modelId: string, documentId: string, overwrite: boolean): Promise<void> {
try {
await API.get<TaskResponse>('/gollm/enrich-model-metadata', {
await API.get('/gollm/enrich-model-metadata', {
params: {
'model-id': modelId,
'document-id': documentId,
Expand Down
9 changes: 0 additions & 9 deletions packages/client/hmi-client/src/services/notificationEventHandlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import { logger } from '@/utils/logger';
import { snakeToCapitalSentence } from '@/utils/text';
import { Ref } from 'vue';
import { getDocumentAsset } from './document-assets';
import { getModel } from './model';
import { getWorkflow } from './workflow';

type NotificationEventData = TaskResponse | StatusUpdate<unknown>;
Expand Down Expand Up @@ -154,14 +153,6 @@ export const createNotificationEventHandlers = (notificationItems: Ref<Notificat
Object.assign(created, { sourceName: document?.name || '' })
);
});
registerHandler<TaskResponse>(ClientEventType.TaskGollmModelCard, (event, created) => {
created.supportCancel = true;
created.assetId = event.data.additionalProperties.modelId as string;
created.pageType = AssetType.Model;
getModel(created.assetId, created.projectId).then((model) =>
Object.assign(created, { sourceName: model?.name || '' })
);
});
registerHandler<TaskResponse>(ClientEventType.TaskGollmConfigureModelFromDocument, (event, created) => {
created.supportCancel = true;
created.sourceName = 'Model Configuration from Document';
Expand Down
1 change: 1 addition & 0 deletions packages/gollm/gollm_openai/prompts/latex_style_guide.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@
11) Do not use "\\cdot" or "*" to indicate multiplication. Use whitespace instead.
12) Replace "\\epsilon" with "\\varepsilon" when representing a parameter or variable
13) Avoid using notation for mathematical constants like "e" and "pi". Use their actual values up to 3 decimal places instead.
14) If equations are separated by commas, do not include commas in the LaTeX code.
"""
152 changes: 24 additions & 128 deletions ...src/main/java/software/uncharted/terarium/hmiserver/controller/gollm/GoLLMController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,12 +41,7 @@
import software.uncharted.terarium.hmiserver.models.dataservice.dataset.Dataset;
import software.uncharted.terarium.hmiserver.models.dataservice.document.DocumentAsset;
import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelParameter;
import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.Observable;
import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.State;
import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.Transition;
import software.uncharted.terarium.hmiserver.models.dataservice.regnet.RegNetVertex;
import software.uncharted.terarium.hmiserver.models.task.CompoundTask;
import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelMetadata;
import software.uncharted.terarium.hmiserver.models.task.TaskRequest;
import software.uncharted.terarium.hmiserver.models.task.TaskRequest.TaskType;
import software.uncharted.terarium.hmiserver.models.task.TaskResponse;
Expand Down Expand Up @@ -269,7 +264,7 @@ public ResponseEntity<TaskResponse> createConfigureModelFromDocumentTask(

// stripping the metadata from the model before its sent since it can cause
// gollm to fail with massive inputs
model.get().setMetadata(null);
model.get().setMetadata(new ModelMetadata());
input.setAmr(model.get().serializeWithoutTerariumFields(new String[] { "id" }, null));

// Create the task
Expand Down Expand Up @@ -397,7 +392,7 @@ public ResponseEntity<TaskResponse> createConfigureModelFromDatasetTask(
input.setDataset(dataArray);
// stripping the metadata from the model before its sent since it can cause
// gollm to fail with massive inputs
model.get().setMetadata(null);
model.get().setMetadata(new ModelMetadata());
input.setAmr(model.get().serializeWithoutTerariumFields(null, null));

// set matrix string if provided
Expand Down Expand Up @@ -512,7 +507,7 @@ public ResponseEntity<TaskResponse> createInterventionsFromDocumentTask(

// stripping the metadata from the model before its sent since it can cause
// gollm to fail with massive inputs
model.get().setMetadata(null);
model.get().setMetadata(new ModelMetadata());
input.setAmr(model.get().serializeWithoutTerariumFields(new String[] { "id" }, null));

// Create the task
Expand Down Expand Up @@ -748,7 +743,7 @@ public ResponseEntity<TaskResponse> createGenerateResponseTask(
description = "Dispatched successfully",
content = @Content(
mediaType = "application/json",
schema = @io.swagger.v3.oas.annotations.media.Schema(implementation = TaskResponse.class)
schema = @io.swagger.v3.oas.annotations.media.Schema(implementation = UUID.class)
)
),
@ApiResponse(
Expand All @@ -759,10 +754,10 @@ public ResponseEntity<TaskResponse> createGenerateResponseTask(
@ApiResponse(responseCode = "500", description = "There was an issue dispatching the request", content = @Content)
}
)
public ResponseEntity<TaskResponse> createEnrichModelMetadataTask(
public ResponseEntity<UUID> createEnrichModelMetadataTask(
@RequestParam(name = "model-id", required = true) final UUID modelId,
@RequestParam(name = "document-id", required = false) final UUID documentId,
@RequestParam(name = "mode", required = false, defaultValue = "ASYNC") final TaskMode mode,
@RequestParam(name = "mode", required = false, defaultValue = "SYNC") final TaskMode mode,
@RequestParam(name = "project-id", required = false) final UUID projectId,
@RequestParam(name = "overwrite", required = false, defaultValue = "false") final boolean overwrite
) {
Expand All @@ -771,129 +766,30 @@ public ResponseEntity<TaskResponse> createEnrichModelMetadataTask(
projectId
);

// Grab the document
final Optional<DocumentAsset> document = documentAssetService.getAsset(documentId, permission);

// make sure there is text in the document. We don't need a document but if we
// do have one it can't be empty
if (document.isPresent() && (document.get().getText() == null || document.get().getText().isEmpty())) {
log.warn(String.format("Document %s has no extracted text", documentId));
throw new ResponseStatusException(HttpStatus.NOT_FOUND, messages.get("document.extraction.not-done"));
}

// Grab the model
Optional<Model> modelOptional = modelService.getAsset(modelId, permission);
if (modelOptional.isEmpty()) {
log.warn(String.format("Model %s not found", modelId));
throw new ResponseStatusException(HttpStatus.NOT_FOUND, messages.get("model.not-found"));
}

final TaskRequest req;

if (document.isPresent()) {
final TaskRequest enrichAmrRequest;
try {
enrichAmrRequest = TaskUtilities.getEnrichAMRTaskRequest(
currentUserService.get().getId(),
document.orElse(null),
modelOptional.get(),
projectId,
overwrite
);
} catch (final IOException e) {
log.error("Unable to create Enrich AMR task", e);
throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, messages.get("generic.io-error.write"));
}

final TaskRequest modelCardRequest;
try {
modelCardRequest = TaskUtilities.getModelCardTask(
currentUserService.get().getId(),
document.orElse(null),
modelOptional.get(),
projectId
);
} catch (final IOException e) {
log.error("Unable to create Model Card task", e);
throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, messages.get("generic.io-error.write"));
}

req = new CompoundTask(enrichAmrRequest, modelCardRequest);
} else {
try {
req = TaskUtilities.getModelCardTask(currentUserService.get().getId(), null, modelOptional.get(), projectId);
} catch (final IOException e) {
log.error("Unable to create Model Card task", e);
throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, messages.get("generic.io-error.write"));
}
}

final TaskResponse resp;
try {
resp = taskService.runTask(mode, req);
} catch (final JsonProcessingException e) {
log.error("Unable to serialize input", e);
throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, messages.get("task.gollm.json-processing"));
} catch (final TimeoutException e) {
log.warn("Timeout while waiting for task response", e);
throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE, messages.get("task.gollm.timeout"));
} catch (final InterruptedException e) {
log.warn("Interrupted while waiting for task response", e);
throw new ResponseStatusException(HttpStatus.UNPROCESSABLE_ENTITY, messages.get("task.gollm.interrupted"));
} catch (final ExecutionException e) {
modelService.enrichModel(projectId, documentId, modelId, permission, true);
} catch (final IOException e) {
log.error("An error occurred while trying to retrieve information necessary for model enrichment.", e);
throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE, messages.get("postgres.service-unavailable"));
} catch (ExecutionException e) {
log.error("Error while waiting for task response", e);
throw new ResponseStatusException(HttpStatus.INTERNAL_SERVER_ERROR, messages.get("task.gollm.execution-failure"));
} catch (InterruptedException e) {
log.warn("Interrupted while waiting for task response", e);
throw new ResponseStatusException(HttpStatus.UNPROCESSABLE_ENTITY, messages.get("task.gollm.interrupted"));
} catch (TimeoutException e) {
log.warn("Timeout while waiting for task response", e);
throw new ResponseStatusException(HttpStatus.SERVICE_UNAVAILABLE, messages.get("task.gollm.timeout"));
}

// at this point the initial enrichment has happened.
modelOptional = modelService.getAsset(modelId, permission);
if (modelOptional.isEmpty()) {
// this would be a very strange case
log.warn(String.format("Model %s not found", modelId));
throw new ResponseStatusException(HttpStatus.NOT_FOUND, messages.get("model.not-found"));
}

final Model model = modelOptional.get();

// Update State Grounding
if (!model.isRegnet()) {
final List<State> states = model.getStates();
states.forEach(state -> TaskUtilities.performDKGSearchAndSetGrounding(miraProxy, state));
model.setStates(states);
} else if (model.isRegnet()) {
final List<RegNetVertex> vertices = model.getVerticies();
vertices.forEach(vertex -> TaskUtilities.performDKGSearchAndSetGrounding(miraProxy, vertex));
model.setVerticies(vertices);
}

// Update Observable Grounding
if (model.getObservables() != null && !model.getObservables().isEmpty()) {
final List<Observable> observables = model.getObservables();
observables.forEach(observable -> TaskUtilities.performDKGSearchAndSetGrounding(miraProxy, observable));
model.setObservables(observables);
}

// Update Parameter Grounding
if (model.getParameters() != null && !model.getParameters().isEmpty()) {
final List<ModelParameter> parameters = model.getParameters();
parameters.forEach(parameter -> TaskUtilities.performDKGSearchAndSetGrounding(miraProxy, parameter));
model.setParameters(parameters);
}

// Update Transition Grounding
if (model.getTransitions() != null && !model.getTransitions().isEmpty()) {
final List<Transition> transitions = model.getTransitions();
transitions.forEach(transition -> TaskUtilities.performDKGSearchAndSetGrounding(miraProxy, transition));
model.setTransitions(transitions);
}

try {
modelService.updateAsset(model, projectId, permission);
} catch (final IOException e) {
throw new RuntimeException(e);
// check that we have a model to return
final Optional<Model> model = modelService.getAsset(modelId, permission);
if (model.isEmpty()) {
log.error(String.format("The model %s does not exist.", modelId));
throw new ResponseStatusException(HttpStatus.BAD_REQUEST, messages.get("model.not-found"));
}

return ResponseEntity.ok().body(resp);
return ResponseEntity.ok().body(model.get().getId());
}

@GetMapping("/enrich-amr")
Expand Down
Loading
Loading