Skip to content

feat: python scripting for queue server type handling #1

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

Draft
JMit-dev wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

feat: python scripting for queue server type handling #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions app/queue-server/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@
<artifactId>jackson-dataformat-yaml</artifactId>
<version>2.19.1</version>
</dependency>
<!-- Jython for Python scripting -->
<dependency>
<groupId>org.python</groupId>
<artifactId>jython-standalone</artifactId>
<version>${jython.version}</version>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
Expand Down
179 changes: 90 additions & 89 deletions ...src/main/java/org/phoebus/applications/queueserver/controller/RePlanEditorController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import org.phoebus.applications.queueserver.view.PlanEditEvent;
import org.phoebus.applications.queueserver.view.TabSwitchEvent;
import org.phoebus.applications.queueserver.view.ItemUpdateEvent;
import org.phoebus.applications.queueserver.util.PythonParameterConverter;
import com.fasterxml.jackson.databind.ObjectMapper;
import javafx.application.Platform;
import javafx.geometry.Insets;
Expand Down Expand Up @@ -63,6 +64,8 @@ public class RePlanEditorController implements Initializable {
private final ObjectMapper objectMapper = new ObjectMapper();
// Store original parameter values for reset functionality
private final Map<String, Object> originalParameterValues = new HashMap<>();
// Python-based parameter converter
private final PythonParameterConverter pythonConverter = new PythonParameterConverter();

private class EditableTableCell extends TableCell<ParameterRow, String> {
private TextField textField;
Expand All @@ -88,9 +91,11 @@ protected void updateItem(String item, boolean empty) {
setText(getString());
setGraphic(null);

// Style based on enabled state and add tooltip
// Style based on enabled state and validation
if (!row.isEnabled()) {
setStyle("-fx-text-fill: grey;");
} else if (!row.validate(pythonConverter)) {
setStyle("-fx-text-fill: red;");
} else {
setStyle("");
}
Expand Down Expand Up @@ -132,15 +137,19 @@ public void commitEdit(String newValue) {
ParameterRow row = getTableRow().getItem();
if (row != null) {
row.setValue(newValue);

// Update cell color based on Python validation
updateValidationColor(row);

switchToEditingMode();
updateButtonStates();
// Update cell color based on validation
updateValidationColor(row);
}
}

private void updateValidationColor(ParameterRow row) {
if (row.validate()) {
if (!row.isEnabled()) {
setStyle("-fx-text-fill: grey;");
} else if (row.validate(pythonConverter)) {
setStyle("");
} else {
setStyle("-fx-text-fill: red;");
Expand Down Expand Up @@ -208,69 +217,7 @@ public ParameterRow(String name, boolean enabled, String value, String descripti
public boolean isOptional() { return isOptional.get(); }
public Object getDefaultValue() { return defaultValue; }

public Object getParsedValue() {
if (!enabled.get()) return defaultValue;

String valueStr = value.get();
if (valueStr == null || valueStr.trim().isEmpty()) {
return defaultValue;
}

try {
return parseLiteralValue(valueStr);
} catch (Exception e) {
return valueStr;
}
}

private Object parseLiteralValue(String valueStr) throws Exception {
valueStr = valueStr.trim();

// Handle None/null
if ("None".equals(valueStr) || "null".equals(valueStr)) {
return null;
}

// Handle booleans
if ("True".equals(valueStr) || "true".equals(valueStr)) {
return true;
}
if ("False".equals(valueStr) || "false".equals(valueStr)) {
return false;
}

// Handle strings (quoted)
if ((valueStr.startsWith("'") && valueStr.endsWith("'")) ||
(valueStr.startsWith("\"") && valueStr.endsWith("\""))) {
return valueStr.substring(1, valueStr.length() - 1);
}

// Handle numbers
try {
if (valueStr.contains(".")) {
return Double.parseDouble(valueStr);
} else {
return Long.parseLong(valueStr);
}
} catch (NumberFormatException e) {
// Continue to other parsing attempts
}

// Handle lists and dicts using JSON parsing (similar to Python's literal_eval)
if (valueStr.startsWith("[") || valueStr.startsWith("{")) {
try {
ObjectMapper mapper = new ObjectMapper();
return mapper.readValue(valueStr, Object.class);
} catch (Exception e) {
// Fall back to string if JSON parsing fails
}
}

// Default to string
return valueStr;
}

public boolean validate() {
public boolean validate(PythonParameterConverter converter) {
if (!enabled.get()) {
return true; // Disabled parameters are always valid
}
Expand All @@ -280,8 +227,18 @@ public boolean validate() {
return isOptional.get();
}

// Validate using Python converter
try {
getParsedValue();
List<PythonParameterConverter.ParameterInfo> testParams = List.of(
new PythonParameterConverter.ParameterInfo(
getName(),
valueStr,
true,
isOptional.get(),
getDefaultValue()
)
);
converter.convertParameters(testParams);
return true;
} catch (Exception e) {
return false;
Expand Down Expand Up @@ -545,9 +502,6 @@ private void loadParametersForSelection(String selectedName) {
isEnabled = true;
} else if (defaultValue != null) {
currentValue = String.valueOf(defaultValue);
if (!isEditMode) {
currentValue += " (default)";
}
}

ParameterRow row = new ParameterRow(paramName, isEnabled, currentValue, description, isOptional, defaultValue);
Expand Down Expand Up @@ -642,7 +596,7 @@ private void autoResizeColumns() {
private boolean areParametersValid() {
boolean allValid = true;
for (ParameterRow row : parameterRows) {
boolean rowValid = row.validate();
boolean rowValid = row.validate(pythonConverter);
if (!rowValid) {
allValid = false;
}
Expand Down Expand Up @@ -681,8 +635,32 @@ private void updateButtonStates() {
cancelBtn.setDisable(!isEditMode);
}

/**
* Build kwargs map using Python-based type conversion.
* All type conversion is handled by Python script using ast.literal_eval.
*/
private Map<String, Object> buildKwargsWithPython() {
List<PythonParameterConverter.ParameterInfo> paramInfos = new ArrayList<>();

for (ParameterRow row : parameterRows) {
PythonParameterConverter.ParameterInfo paramInfo =
new PythonParameterConverter.ParameterInfo(
row.getName(),
row.getValue(),
row.isEnabled(),
row.isOptional(),
row.getDefaultValue()
);
paramInfos.add(paramInfo);
}

// Use Python to convert parameters - no Java fallback
return pythonConverter.convertParameters(paramInfos);
}

private void addItemToQueue() {
if (!areParametersValid()) {
showValidationError("Some parameters have invalid values. Please check the red fields.");
return;
}

Expand All @@ -693,13 +671,9 @@ private void addItemToQueue() {
}

String itemType = planRadBtn.isSelected() ? "plan" : "instruction";
Map<String, Object> kwargs = new HashMap<>();

for (ParameterRow row : parameterRows) {
if (row.isEnabled()) {
kwargs.put(row.getName(), row.getParsedValue());
}
}
// Use Python-based parameter conversion
Map<String, Object> kwargs = buildKwargsWithPython();

QueueItem item = new QueueItem(
itemType,
Expand Down Expand Up @@ -732,24 +706,45 @@ private void addItemToQueue() {
TabSwitchEvent.getInstance().switchToTab("Plan Viewer");
exitEditMode();
showItemPreview();
} else {
showValidationError("Failed to add item to queue: " + response.msg());
}
});
} catch (Exception e) {
e.printStackTrace();
LOG.log(Level.WARNING, "Failed to add item to queue", e);
Platform.runLater(() -> {
String errorMsg = e.getMessage();
if (errorMsg == null || errorMsg.isEmpty()) {
errorMsg = e.getClass().getSimpleName();
}
showValidationError("Failed to add item to queue: " + errorMsg);
});
}
}).start();

} catch (Exception e) {
e.printStackTrace();
LOG.log(Level.SEVERE, "Failed to add item to queue", e);
Platform.runLater(() -> {
showValidationError("Failed to add item: " + e.getMessage());
});
}
}

private void showValidationError(String message) {
Alert alert = new Alert(Alert.AlertType.ERROR);
alert.setTitle("Validation Error");
alert.setHeaderText(null);
alert.setContentText(message);
alert.showAndWait();
}

private void saveItem() {
if (!isEditMode || currentItem == null) {
return;
}

if (!areParametersValid()) {
showValidationError("Some parameters have invalid values. Please check the red fields.");
return;
}

Expand All @@ -760,13 +755,9 @@ private void saveItem() {
}

String itemType = planRadBtn.isSelected() ? "plan" : "instruction";
Map<String, Object> kwargs = new HashMap<>();

for (ParameterRow row : parameterRows) {
if (row.isEnabled()) {
kwargs.put(row.getName(), row.getParsedValue());
}
}
// Use Python-based parameter conversion
Map<String, Object> kwargs = buildKwargsWithPython();

QueueItem updatedItem = new QueueItem(
itemType,
Expand Down Expand Up @@ -795,16 +786,26 @@ private void saveItem() {
exitEditMode();
showItemPreview();
} else {
LOG.log(Level.WARNING, "Save failed: " + response.msg());
showValidationError("Failed to save item: " + response.msg());
}
});
} catch (Exception e) {
LOG.log(Level.WARNING, "Save error", e);
LOG.log(Level.WARNING, "Failed to save item", e);
Platform.runLater(() -> {
String errorMsg = e.getMessage();
if (errorMsg == null || errorMsg.isEmpty()) {
errorMsg = e.getClass().getSimpleName();
}
showValidationError("Failed to save item: " + errorMsg);
});
}
}).start();

} catch (Exception e) {
e.printStackTrace();
LOG.log(Level.SEVERE, "Failed to save item", e);
Platform.runLater(() -> {
showValidationError("Failed to save item: " + e.getMessage());
});
}
}

Expand Down
Loading