Keep developing and testing the script language

Author: ctrueden

pom.xml

@@ -89,7 +89,8 @@
 		<!-- NB: Deploy releases to the SciJava Maven repository. -->
 		<releaseProfiles>sign,deploy-to-scijava</releaseProfiles>
 
-		<appose.version>0.10.0</appose.version>
+		<appose.version>0.11.0</appose.version>
+		<imglib2-appose.version>0.9.0</imglib2-appose.version>
 	</properties>
 
 	<dependencies>
@@ -121,9 +122,15 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.scijava</groupId>
-			<artifactId>scijava-common</artifactId>
-			<classifier>tests</classifier>
+			<groupId>net.imglib2</groupId>
+			<artifactId>imglib2-appose</artifactId>
+			<version>${imglib2-appose.version}</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<!-- For net.imglib2.img.Img parameter handling. -->
+			<groupId>net.imagej</groupId>
+			<artifactId>imagej-common</artifactId>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

src/main/java/org/scijava/plugins/scripting/appose/python/ApposePythonScriptEngine.java

@@ -41,7 +41,6 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import javax.script.Bindings;
-import javax.script.ScriptContext;
 import javax.script.ScriptEngine;
 import javax.script.ScriptException;
 
@@ -85,10 +84,6 @@
  */
 public class ApposePythonScriptEngine extends AbstractScriptEngine {
 
-	/** Cache of built environments, keyed by resolved env file absolute path. */
-	private static final Map<String, Environment> ENV_CACHE =
-		new ConcurrentHashMap<>();
-
 	@Parameter
 	private ConvertService convertService;
 
@@ -235,9 +230,8 @@ public Bindings createBindings() {
 	// -- Helper methods --
 
 	/**
-	 * Lazily builds (or fetches from cache) the Appose {@link Environment}
-	 * described by the {@code env} and {@code scheme} attributes of the script's
-	 * {@code #@script} directive.
+	 * Lazily builds the Appose {@link Environment} described by the {@code env}
+	 * and {@code scheme} attributes of the script's {@code #@script} directive.
 	 */
 	private Environment buildEnvironment(final ScriptInfo info)
 		throws ScriptException
@@ -247,46 +241,21 @@ private Environment buildEnvironment(final ScriptInfo info)
 		if (envRef == null) return null;
 
 		final File envFile = resolveEnvFile(envRef, info.getPath());
-		final String cacheKey = envFile.getAbsolutePath();
 		final String envName = sanitizeEnvName(info.getPath());
 
+		log.info("Building Appose environment: " + envName);
 		try {
-			return ENV_CACHE.computeIfAbsent(cacheKey, key -> {
-				log.info("Building Appose environment: " + key);
-				try {
-					return selectBuilder(key, info.get("scheme")).name(envName).build();
-				}
-				catch (final BuildException e) {
-					throw new RuntimeException(
-						"Failed to build Appose environment: " + e.getMessage(), e);
-				}
-			});
-		}
-		catch (final RuntimeException e) {
-			if (e.getCause() instanceof BuildException) {
-				throw new ScriptException(e.getMessage());
-			}
-			throw e;
-		}
-	}
+			String scheme = info.get("scheme");
+			Builder<?> builder = scheme == null ?
+				Appose.file(envFile) : Appose.file(envFile).scheme(scheme);
 
-	/**
-	 * Selects the appropriate Appose builder based on the {@code scheme} hint.
-	 * Falls back to auto-detection ({@link Appose#file}) if unspecified or
-	 * unrecognized.
-	 */
-	private Builder<?> selectBuilder(final String envFilePath,
-		final String scheme) throws BuildException
-	{
-		if (scheme == null || scheme.isEmpty()) return Appose.file(envFilePath);
-		switch (scheme.toLowerCase()) {
-			case "pixi.toml":       return Appose.pixi(envFilePath);
-			case "environment.yml": return Appose.mamba(envFilePath);
-			case "requirements.txt":
-			case "pyproject.toml":  return Appose.uv(envFilePath);
-			default:
-				log.warn("Unrecognized scheme '" + scheme + "'; using auto-detection.");
-				return Appose.file(envFilePath);
+			return builder.name(envName).build();
+		}
+		catch (final BuildException e) {
+			ScriptException se = new ScriptException(
+				"Failed to build Appose environment");
+			se.initCause(e);
+			throw se;
 		}
 	}
 
@@ -308,9 +277,9 @@ private static File resolveEnvFile(final String envRef,
 	 * all non-alphanumeric characters (except {@code -}) with {@code _}.
 	 */
 	private static String sanitizeEnvName(final String scriptPath) {
-		if (scriptPath == null) return "appose-python";
+		if (scriptPath == null) return "scripting-appose-python";
 		return new File(scriptPath).getAbsolutePath()
-			.replaceAll("[^a-zA-Z0-9_-]", "_");
+			.replaceAll("[^a-zA-Z0-9_]", "-");
 	}
 
 	/**

src/main/resources/script_templates/appose-python/StarDist_cellcast.py

@@ -1,5 +1,5 @@
 #!appose-python
-#@script (language="appose-python", env="cellcast-stardist.toml", scheme="pixi.toml")
+#@script (language="appose-python", env="cellcast.toml", scheme="pixi.toml")
 
 #@ Img image
 #@output Img labels

src/main/resources/script_templates/appose-python/cellcast.toml

@@ -0,0 +1,13 @@
+[workspace]
+authors = ["Curtis Rueden <ctrueden@wisc.edu>"]
+channels = ["conda-forge"]
+name = "stardist-cellcast"
+platforms = ["osx-arm64", "linux-64", "win-64"]
+version = "0.1.0"
+
+[dependencies]
+python = ">=3.14.3,<3.15"
+
+[pypi-dependencies]
+cellcast = ">=0.1.2, <0.2"
+appose = ">=0.11.0, <0.12"

…lugins/scripting/appose/python/Main.java …lugins/scripting/appose/python/Main.javasrc/main/java/org/scijava/plugins/scripting/appose/python/Main.java renamed to src/test/java/org/scijava/plugins/scripting/appose/python/Main.java src/main/java/org/scijava/plugins/scripting/appose/python/Main.java renamed to src/test/java/org/scijava/plugins/scripting/appose/python/Main.java

@@ -29,11 +29,42 @@
 
 package org.scijava.plugins.scripting.appose.python;
 
-import org.scijava.script.ScriptREPL;
+import net.imagej.Dataset;
+import net.imagej.DatasetService;
+import net.imagej.axis.Axes;
+import net.imagej.axis.AxisType;
+import org.scijava.Context;
+import org.scijava.ui.UIService;
+import org.scijava.ui.swing.script.TextEditor;
+
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
 
 public class Main {
 
 	public static void main(String... args) throws Exception {
-		ScriptREPL.main(args);
+		final Context ctx = new Context();
+
+		long[] dims = {512, 384};
+		String name = "blank";
+		AxisType[] axes = {Axes.X, Axes.Y};
+		int bitsPerPixel = 8;
+		boolean signed = false;
+		boolean floating = false;
+		UIService ui = ctx.service(UIService.class);
+		ui.showUI();
+		DatasetService ds = ctx.service(DatasetService.class);
+		Dataset dataset = ds.create(dims, name, axes, bitsPerPixel, signed, floating);
+		ui.show(dataset);
+		System.out.println(dataset);
+
+		TextEditor scriptEditor = new TextEditor(ctx);
+		scriptEditor.setVisible(true);
+		scriptEditor.addWindowListener(new WindowAdapter() {
+			@Override
+			public void windowClosed(WindowEvent e) {
+				ctx.dispose();
+			}
+		});
 	}
 }