Skip to content
This repository was archived by the owner on Apr 7, 2025. It is now read-only.

6224 bug keep greek letters in extracted model somehow #6595

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,9 @@ public ResponseEntity<UUID> equationsToModel(

notificationInterface.sendMessage("AMR extracted via MIRA.");

modelService.fixGreekLetters(responseAMR);
notificationInterface.sendMessage("Greek letters fixed.");

// If no model id is provided, create a new model asset
Model model;
if (modelId == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,14 @@
import software.uncharted.terarium.hmiserver.models.dataservice.model.Model;
import software.uncharted.terarium.hmiserver.models.dataservice.model.ModelDescription;
import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelMetadata;
import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.ModelParameter;
import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.metadata.Annotations;
import software.uncharted.terarium.hmiserver.models.dataservice.modelparts.semantics.GroundedSemantic;
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.repository.data.ModelRepository;
import software.uncharted.terarium.hmiserver.service.CurrentUserService;
import software.uncharted.terarium.hmiserver.service.s3.S3ClientService;
import software.uncharted.terarium.hmiserver.service.tasks.TaskService;
import software.uncharted.terarium.hmiserver.utils.GreekDictionary;
import software.uncharted.terarium.hmiserver.utils.rebac.Schema;

@Slf4j
Expand Down Expand Up @@ -127,11 +130,44 @@ public Optional<Model> updateAsset(
asset.setMetadata(metadata);
}

final Optional<Model> updatedOptional = super.updateAsset(asset, projectId, hasWritePermission);
if (updatedOptional.isEmpty()) {
return Optional.empty();
}
return super.updateAsset(asset, projectId, hasWritePermission);
}

/**
* Fix Greek letters in a Petri Net AMR to be displayed correctly in the name of the variables.
*/
public void fixGreekLetters(Model model) {
// Only edit Petri Net models
if (!model.isPetrinet()) return;

// States
model
.getStates()
.forEach(state -> {
final String englishName = state.getName() != null ? state.getName() : state.getId();
if (englishName != null) {
state.setName(GreekDictionary.englishToGreek(englishName));
}
});

// Transitions
model
.getTransitions()
.forEach(transition -> {
final String englishName = transition.getName() != null ? transition.getName() : transition.getId();
if (englishName != null) {
transition.setName(GreekDictionary.englishToGreek(englishName));
}
});

return updatedOptional;
// Parameters
model
.getParameters()
.forEach(param -> {
final String englishName = param.getName() != null ? param.getName() : param.getId();
if (englishName != null) {
param.setName(GreekDictionary.englishToGreek(englishName));
}
});
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,41 @@
import com.google.common.collect.HashBiMap;

/**
* A class to store the Greek alphabet in a BiMap
*
* <p>englishToGreek("beta")); // Output: β greekToEnglish("β")); // Output: beta
* A class to store the Greek alphabet in a BiMap for easy translation between English and Greek.
*/
public class GreekDictionary {

private static BiMap<String, String> englishGreek = HashBiMap.create();
private static final BiMap<String, String> englishGreek = HashBiMap.create();

static {
englishGreek.put("alpha", "α");
englishGreek.put("beta", "β");
englishGreek.put("gamma", "γ");
englishGreek.put("delta", "δ");
englishGreek.put("epsilon", "ε");
englishGreek.put("epsilon", "ϵ");
englishGreek.put("varepsilon", "ε");
englishGreek.put("zeta", "ζ");
englishGreek.put("eta", "η");
englishGreek.put("theta", "θ");
englishGreek.put("vartheta", "ϑ");
englishGreek.put("iota", "ι");
englishGreek.put("kappa", "κ");
englishGreek.put("varkappa", "ϰ");
englishGreek.put("lambda", "λ");
englishGreek.put("mu", "μ");
englishGreek.put("nu", "ν");
englishGreek.put("xi", "ξ");
englishGreek.put("omicron", "ο");
englishGreek.put("pi", "π");
englishGreek.put("varpi", "ϖ");
englishGreek.put("rho", "ρ");
englishGreek.put("varrho", "ϱ");
englishGreek.put("sigma", "σ");
englishGreek.put("varsigma", "ς");
englishGreek.put("tau", "τ");
englishGreek.put("upsilon", "υ");
englishGreek.put("phi", "φ");
englishGreek.put("varphi", "ϕ");
englishGreek.put("chi", "χ");
englishGreek.put("psi", "ψ");
englishGreek.put("omega", "ω");
Expand Down