Fix for misc.save_script_parameters (Issue #136)

.vscode/settings.json

@@ -15,6 +15,7 @@
         "bdvp",
         "bigstitcher",
         "biop",
+        "caplog",
         "clij",
         "Dscijava",
         "flatfield",

TESTING.md

@@ -1,5 +1,15 @@
 # Testing 🧪🧫 in Fiji / ImageJ2
 
+## Using 🎭 Poetry, pytest 🐍🔬 and Python 3 for plain Python code
+
+The easiest way to run [`pytest`][pytest] (using Python 3) is when you're
+already having a working [poetry] setup. In that case tests can simply be run by
+using the `run-poetry.sh` wrapper script, for example:
+
+```bash
+scripts/run-poetry.sh run pytest tests/test_misc.py
+```
+
 ## Using pytest 🐍🔬 and Python 3 for plain Python code
 
 Those parts of the package that do not interact / depend on ImageJ objects can
@@ -22,7 +32,7 @@ test -d "venv" || python3 -m venv venv
 source venv/bin/activate
 
 # install dependencies / requirements:
-MOCKS_REL="0.2.0"
+MOCKS_REL="0.14.0"
 URL_PFX="https://github.com/imcf/imcf-fiji-mocks/releases/download/v$MOCKS_REL"
 pip install --upgrade \
     $URL_PFX/imcf_fiji_mocks-${MOCKS_REL}-py2.py3-none-any.whl \

scripts/run-poetry.sh

@@ -21,6 +21,19 @@ if [ -z "$RUN_ON_UNCLEAN" ]; then
     fi
 fi
 
+TOML_STATUS=$(git status --porcelain pyproject.toml)
+if [ -n "$TOML_STATUS" ]; then
+    echo "==== ERROR: stopping to preserve changes in 'pyproject.toml'! ===="
+    echo
+    git status pyproject.toml --porcelain
+    echo
+    echo "--------"
+    echo "Refusing to continue as 'pyproject.toml' would be re-set at the end"
+    echo "of this script. Please stash your changes and re-run the script!"
+    echo
+    exit 2
+fi
+
 ### clean up old poetry artifacts:
 rm -rf dist/
 

src/imcflibs/imagej/misc.py

@@ -766,3 +766,104 @@ def bytes_to_human_readable(size):
     # If the value is larger than the largest unit, fall back to TB with
     # the current value (already divided accordingly).
     return "%3.1f %s" % (size, "TB")
+
+
+def _is_password_style(item):  # pragma: no cover (jython)
+    """Check if a script-parameter item is declared with `style="password"`.
+
+    Parameters
+    ----------
+    item : org.scijava.module.ModuleItem
+        The module item to check, obtained e.g. by calling `inputs()` on an
+        instance of `org.scijava.script.ScriptInfo`.
+
+    Returns
+    -------
+    bool
+    """
+    return WidgetStyle.isStyle(item, TextWidget.PASSWORD_STYLE)
+
+
+def save_script_parameters(
+    script_globals, destination, save_file_name="script_parameters.txt"
+):
+    """Save all Fiji script parameters to a text file.
+
+    Record all input parameters defined in the Fiji script header (e.g.
+    `#@ String`) to a text file such that they can be stored e.g. next to the
+    input data and the analysis results in order to document how a specific
+    processing run was executed.
+
+    The following parameters are excluded:
+
+    - Parameters explicitly declared with `style="password"`.
+    - Runtime keys: `USERNAME`, `SJLOG`, `COMMAND`, `RM`.
+
+    Parameters
+    ----------
+    script_globals : dict
+        The globals dictionary from the running Fiji instance. Must be passed
+        explicitly as `globals()` by the calling code.
+    destination : str
+        Directory where the script parameters file will be saved.
+    save_file_name : str, optional
+        Name of the script parameters file, by default "script_parameters.txt".
+
+    Examples
+    --------
+    In a Fiji script, you can call this function as follows to save the parameters:
+
+    >>> save_script_parameters(script_globals=globals(), destination="/data")
+    Saved script parameters to: /data/script_parameters.txt
+    """
+    try:
+        module = script_globals.get("org.scijava.script.ScriptModule")
+        # Access script metadata and inputs
+        script_info = module.getInfo()
+        inputs = module.getInputs()
+    except:
+        timed_log("ScriptModule inspection failed - skipping saving of parameters.")
+        return
+
+    # TODO: discuss if the two parameters should better be merged into one?
+    destination = str(destination)
+    out_path = os.path.join(destination, save_file_name)
+
+    # Keys to skip explicitly
+    skip_keys = ["USERNAME", "SJLOG", "COMMAND", "RM"]
+
+    saved = skipped = passwords = 0
+    with open(out_path, "w") as f:
+        for item in script_info.inputs():
+            key = item.getName()
+
+            # Skip if any keys are in the skip list
+            if any(skip in key.upper() for skip in skip_keys):
+                log.info("Skipping parameter from skip-list: %s", key)
+                skipped += 1
+                continue
+
+            # Skip if parameter is declared with password style
+            if _is_password_style(item):
+                log.info("Skipping password-style parameter: %s", key)
+                passwords += 1
+                continue
+
+            # TODO: discuss if this approach is fine within Fiji/Jython
+            try:
+                val = inputs.get(key)
+                if not val:  # required for testing in CPython
+                    raise KeyError("failure looking up value for '%s'" % key)
+                f.write("%s: %s\n" % (key, str(val)))
+                saved += 1
+            except:
+                log.warning("Unable to fetch value for parameter: %s", key)
+                pass
+
+    log.info(
+        "Saved %i parameters (skipped %i password-style and %i others).",
+        saved,
+        passwords,
+        skipped,
+    )
+    timed_log("Saved %i script parameters to: %s" % (saved, out_path))

tests/interactive-imagej/test_save_params.md

@@ -0,0 +1,18 @@
+# Testing script for misc.save_script_parameters()
+
+```python
+# @ String(label="Password", description="please enter your password", style="password") PASSWORD
+# @ String(label="USERNAME", description="please enter your USR") USERNAME
+# @ File(label="Path for storage", style="directory") outputPath
+# @ Integer threshold
+# @ Boolean taDa
+# @ RoiManager rm
+# @ CommandService command
+# @ LogService sjlog
+
+import os
+from imcflibs.imagej import misc, omerotools
+
+misc.save_script_parameters(outputPath, script_globals=globals())
+print("Saved params")
+```

tests/test_misc.py

@@ -1,6 +1,134 @@
 """Tests for `imcflibs.imagej.misc` utility functions."""
 
+import logging
+
+import imcflibs.imagej.misc
+
 from imcflibs.imagej.misc import bytes_to_human_readable
+from imcflibs.imagej.misc import save_script_parameters
+
+
+PASSWORD_ITEMS = ["OMERO_PASSWD"]
+
+
+class ModuleItem:
+    """Mock for the org.scijava.module.ModuleItem interface."""
+
+    def __init__(self, input_name):
+        """ModuleItem constructor.
+
+        Parameters
+        ----------
+        input_name : str
+            FIXME: describe (see the ScriptModule class)
+        """
+        self.input_name = input_name
+
+    def getName(self):
+        """Getter method for the "input_name" attribute.
+
+        Returns
+        -------
+        str
+        """
+        return self.input_name
+
+
+class ScriptInfo:
+    """Mock for the org.scijava.script.ScriptInfo class."""
+
+    def __init__(self, input_names):
+        """ScriptInfo constructor.
+
+        Parameters
+        ----------
+        input_names : list(str)
+            FIXME: describe (see the ScriptModule class)
+        """
+        self.input_names = [ModuleItem(x) for x in input_names]
+
+    def inputs(self):
+        """Get the list of input-objects.
+
+        Returns
+        -------
+        list(ModuleItem)
+        """
+        return self.input_names
+
+
+class ScriptModule:
+    """Mock for the org.scijava.script.ScriptModule class."""
+
+    def __init__(self, input_names, inputs):
+        """ScriptModule constructor.
+
+        Parameters
+        ----------
+        input_names : list(str)
+            The list of input names. FIXME: explain better.
+        inputs : dict
+            A dict having the `input_names` as keys. Values are representing the
+            content of the respective script parameter.
+        """
+        self.info = ScriptInfo(input_names)
+        self.inputs = inputs
+
+    def getInfo(self):
+        """Getter method for the "info" attribute.
+
+        Returns
+        -------
+        ScriptInfo
+        """
+        return self.info
+
+    def getInputs(self):
+        """Getter method for the "inputs" attribute.
+
+        Returns
+        -------
+        dict
+        """
+        return self.inputs
+
+
+def test_save_script_parameters_fail(caplog):
+    """Tests save_script_parameters with an invalid script_globals object."""
+    caplog.clear()
+
+    save_script_parameters(script_globals=None, destination="")
+    assert "ScriptModule inspection failed" in caplog.messages[0]
+
+
+def test_save_script_parameters(tmp_path, monkeypatch, caplog):
+    """Tests save_script_parameters."""
+    caplog.set_level(logging.DEBUG)
+    caplog.clear()
+
+    base = tmp_path / "saved_parameters"
+    base.mkdir()
+
+    def _is_password_style(item):
+        return item.getName() in PASSWORD_ITEMS
+
+    monkeypatch.setattr(imcflibs.imagej.misc, "_is_password_style", _is_password_style)
+
+    script_module = ScriptModule(
+        input_names=["AAA", "BBB", "OMERO_PASSWD", "SJLOG", "NOT_THERE"],
+        inputs={"AAA": "aaa", "BBB": "bbb", "OMERO_PASSWD": "ultra-secret"},
+    )
+    script_globals = {"org.scijava.script.ScriptModule": script_module}
+    save_script_parameters(script_globals, destination=base)
+    assert "Skipping parameter from skip-list" in caplog.text
+    assert "Skipping password-style parameter" in caplog.text
+    assert "Unable to fetch value for parameter: NOT_THERE" in caplog.text
+    assert "Saved 2 parameters (skipped 1 password-style and 1 others)." in caplog.text
+    assert "Saved 2 script parameters to" in caplog.text
+
+    with open(str(base) + "/script_parameters.txt", "r") as f:
+        contents = f.read()
+    assert contents == "AAA: aaa\nBBB: bbb\n"
 
 
 def test_bytes_to_human_readable_simple():