PyIBIS-AMI 9.1.0__tar.gz → 9.3.0__tar.gz

{pyibis_ami-9.1.0/src/pyibis_ami.egg-info → pyibis_ami-9.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyibis-ami
-Version: 9.1.0
+Version: 9.3.0
 Summary: Facilitates working directly with IBIS-AMI DLLs from the Python command prompt.
 Author-email: David Banas <capn.freako@gmail.com>
 Project-URL: Documentation, https://pyibis-ami.readthedocs.io/en/latest/
@@ -17,25 +17,28 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: System :: Emulators
 Classifier: Topic :: Utilities
-Requires-Python: <3.13,>=3.10
+Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: chaco>=6.0.0
-Requires-Dist: click>=8.1.3
-Requires-Dist: empy>=3.3.4
-Requires-Dist: importlib_resources
-Requires-Dist: jupyter
-Requires-Dist: lxml-html-clean>=0.4.4
+Requires-Dist: chaco==6.1.1
+Requires-Dist: click==8.4.2
+Requires-Dist: empy==4.2.1
+Requires-Dist: importlib_resources==7.1.0
+Requires-Dist: jupyter==1.1.1
+Requires-Dist: lxml-html-clean==0.4.5
 Requires-Dist: matplotlib>=3.6.1
-Requires-Dist: numpy<1.27,>=1.26
-Requires-Dist: papermill
-Requires-Dist: parsec>=3.15
-Requires-Dist: reportlab>=4.4.10
-Requires-Dist: scipy>=1.9
-Requires-Dist: types-reportlab>=4.4.10.20260223
+Requires-Dist: numpy>=1.26
+Requires-Dist: papermill==2.7.0
+Requires-Dist: parsec==3.17
+Requires-Dist: reportlab==5.0.0
+Requires-Dist: scipy>=1.15
+Requires-Dist: traits==7.1.0
+Requires-Dist: traitsui==8.0.0
+Requires-Dist: types-reportlab==4.5.1.20260712
 Dynamic: license-file
 
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/capn-freako/PyAMI/master.svg)](https://results.pre-commit.ci/latest/github/capn-freako/PyAMI/master)

{pyibis_ami-9.1.0 → pyibis_ami-9.3.0}/pyproject.toml

@@ -5,25 +5,27 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "pyibis-ami"
 description = "Facilitates working directly with IBIS-AMI DLLs from the Python command prompt."
-version = "9.1.0"
+version = "9.3.0"
 authors = [ {name = "David Banas",     email = "capn.freako@gmail.com"}
           ]
 readme = "README.md"
-requires-python = ">=3.10,<3.13"
+requires-python = ">=3.10,<3.14"
 dependencies = [
-    "chaco>=6.0.0",
-    "click>=8.1.3",
-    "empy>=3.3.4",
-    "importlib_resources",
-    "jupyter",
-    "lxml-html-clean>=0.4.4",
+    "chaco==6.1.1",
+    "click==8.4.2",
+    "empy==4.2.1",
+    "importlib_resources==7.1.0",
+    "jupyter==1.1.1",
+    "lxml-html-clean==0.4.5",
     "matplotlib>=3.6.1",
-    "numpy>=1.26,<1.27",
-    "papermill",
-    "parsec>=3.15",
-    "reportlab>=4.4.10",
-    "scipy>=1.9",
-    "types-reportlab>=4.4.10.20260223",
+    "numpy>=1.26",
+    "papermill==2.7.0",
+    "parsec==3.17",
+    "reportlab==5.0.0",
+    "scipy>=1.15",
+    "traits==7.1.0",
+    "traitsui==8.0.0",
+    "types-reportlab==4.5.1.20260712",
 ]
 keywords=["ibis-ami"]
 classifiers=[
@@ -36,6 +38,7 @@ classifiers=[
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: System :: Emulators",
     "Topic :: Utilities",
@@ -93,6 +96,13 @@ ignore = [
 exclude = [
     "*.ipynb"
 ]
+lint.ignore = [
+    "UP045",    # "Optional[X] -> "X | None"
+    "I001",     # import formatting
+    "BLE001",   # blind exceptions
+    "UP031",    # format specifiers instead of '%'
+    "RUF022",   # unsorted all
+]
 
 [[tool.mypy.overrides]]
 module = [

{pyibis_ami-9.1.0 → pyibis_ami-9.3.0/src/pyibis_ami.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyibis-ami
-Version: 9.1.0
+Version: 9.3.0
 Summary: Facilitates working directly with IBIS-AMI DLLs from the Python command prompt.
 Author-email: David Banas <capn.freako@gmail.com>
 Project-URL: Documentation, https://pyibis-ami.readthedocs.io/en/latest/
@@ -17,25 +17,28 @@ Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: System :: Emulators
 Classifier: Topic :: Utilities
-Requires-Python: <3.13,>=3.10
+Requires-Python: <3.14,>=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: chaco>=6.0.0
-Requires-Dist: click>=8.1.3
-Requires-Dist: empy>=3.3.4
-Requires-Dist: importlib_resources
-Requires-Dist: jupyter
-Requires-Dist: lxml-html-clean>=0.4.4
+Requires-Dist: chaco==6.1.1
+Requires-Dist: click==8.4.2
+Requires-Dist: empy==4.2.1
+Requires-Dist: importlib_resources==7.1.0
+Requires-Dist: jupyter==1.1.1
+Requires-Dist: lxml-html-clean==0.4.5
 Requires-Dist: matplotlib>=3.6.1
-Requires-Dist: numpy<1.27,>=1.26
-Requires-Dist: papermill
-Requires-Dist: parsec>=3.15
-Requires-Dist: reportlab>=4.4.10
-Requires-Dist: scipy>=1.9
-Requires-Dist: types-reportlab>=4.4.10.20260223
+Requires-Dist: numpy>=1.26
+Requires-Dist: papermill==2.7.0
+Requires-Dist: parsec==3.17
+Requires-Dist: reportlab==5.0.0
+Requires-Dist: scipy>=1.15
+Requires-Dist: traits==7.1.0
+Requires-Dist: traitsui==8.0.0
+Requires-Dist: types-reportlab==4.5.1.20260712
 Dynamic: license-file
 
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/capn-freako/PyAMI/master.svg)](https://results.pre-commit.ci/latest/github/capn-freako/PyAMI/master)

pyibis_ami-9.3.0/src/pyibis_ami.egg-info/requires.txt

@@ -0,0 +1,15 @@
+chaco==6.1.1
+click==8.4.2
+empy==4.2.1
+importlib_resources==7.1.0
+jupyter==1.1.1
+lxml-html-clean==0.4.5
+matplotlib>=3.6.1
+numpy>=1.26
+papermill==2.7.0
+parsec==3.17
+reportlab==5.0.0
+scipy>=1.15
+traits==7.1.0
+traitsui==8.0.0
+types-reportlab==4.5.1.20260712

{pyibis_ami-9.1.0 → pyibis_ami-9.3.0}/src/pyibisami/ami/config.py

@@ -171,7 +171,7 @@ def mk_model(
                     "param_types": param_types,
                     "model_name": model_name,
                     "description": description,
-                    "date": str(date.today()),
+                    "date": str(date.today()),  # noqa: DTZ011
                 },
             )
             try:
@@ -246,8 +246,8 @@ def mk_tests(  # pylint: disable=too-many-locals
     pname.mkdir(exist_ok=True)
     pname = (pname / file_base_name).resolve()
     pname.mkdir(exist_ok=True)
-    for fname in test_defs.keys():
-        desc, ami_defs, sim_defs, ref_fstr = test_defs[fname]
+    for fname, value in test_defs.items():
+        desc, ami_defs, sim_defs, ref_fstr = value
         ami_str, ami_dict = ami_defs
         sim_str, sim_dict = sim_defs
         with open((pname / fname).with_suffix(".run"), "w", encoding="utf-8") as f:
@@ -258,8 +258,7 @@ def mk_tests(  # pylint: disable=too-many-locals
                     pdict.update(dict(sim_comb))
                     f.write(f"\n('{ami_str.format(pdict=pdict)}_{sim_str.format(pdict=pdict)}', \\\n")
                     f.write(f"  ({{'root_name': '{file_base_name}', \\\n")
-                    for k, v in ami_comb:
-                        f.write(f"    '{k}': {v}, \\\n")
+                    f.writelines(f"    '{k}': {v}, \\\n" for k, v in ami_comb)
                     f.write("   }, \\\n")
                     if sim_comb:
                         head, *tail = sim_comb

{pyibis_ami-9.1.0 → pyibis_ami-9.3.0}/src/pyibisami/ami/model.py

@@ -355,11 +355,12 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
         self._info_params = init_object.info_params  # pylint: disable=attribute-defined-outside-init
 
         # Check GetWave() consistency if possible.
-        if init_object.info_params and init_object.info_params["GetWave_Exists"] and init_object.info_params["GetWave_Exists"].pvalue:
-            if not self._amiGetWave:
-                raise RuntimeError(
-                    "Reserved parameter `GetWave_Exists` is True, but I can't bind to `AMI_GetWave()`!"
-                )
+        if (init_object.info_params and init_object.info_params["GetWave_Exists"] and
+            init_object.info_params["GetWave_Exists"].pvalue and
+            not self._amiGetWave):  # noqa: E129
+            raise RuntimeError(
+                "Reserved parameter `GetWave_Exists` is True, but I can't bind to `AMI_GetWave()`!"
+            )
 
         # Construct the AMI parameters string.
         def sexpr(pname: str, pval: Any) -> str:
@@ -387,7 +388,7 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
         self._root_name = root_name  # pylint: disable=attribute-defined-outside-init
         ami_params_in = f"({root_name} "
         for item in list(init_object.ami_params.items()):
-            if not item[0] == "root_name":
+            if item[0] != "root_name":
                 ami_params_in += sexpr(item[0], item[1])
         ami_params_in += ")"
         self._ami_params_in = ami_params_in.encode("utf-8")  # pylint: disable=attribute-defined-outside-init
@@ -424,7 +425,7 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
             print(f"&ami_params_out = {byref(self._ami_params_out)}")
             print(f"&ami_mem_handle = {byref(self._ami_mem_handle)}")  # type: ignore
             print(f"&msg = {byref(self._msg)}")
-            raise err
+            raise
 
         # Initialize attributes used by getWave().
         bit_time = init_object.bit_time
@@ -441,7 +442,7 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
         )
         self._getwave_step_response_out_params = None
 
-    def getWave(self, wave: Rvec, bits_per_call: int = 0) -> tuple[Rvec, Rvec, list[str]]:  # noqa: F405
+    def getWave(self, wave: Rvec, bits_per_call: int = 0) -> tuple[Rvec, Rvec, list[str]]:
         """
         Performs time domain processing of input waveform, using the ``AMI_GetWave()`` function.
 
@@ -562,13 +563,12 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
         ts = self.sample_interval
         info_params = self._info_params
         ignore_bits = 0
-        if info_params:
-            if "Ignore_Bits" in info_params:
-                ignore_bits = info_params["Ignore_Bits"].pvalue
+        if info_params and "Ignore_Bits" in info_params:
+            ignore_bits = info_params["Ignore_Bits"].pvalue
 
         # Capture/convert instance variables.
-        chnl_imp = np.array(self.channel_response) * ts     # input (a.k.a. - "channel") impulse response (V/sample)
-        out_imp = np.array(self.initOut) * ts               # output impulse response (V/sample)
+        chnl_imp = np.array(self.channel_response[:self.row_size]) * ts   # input (a.k.a. - "channel") impulse response (V/sample)
+        out_imp = np.array(self.initOut[:self.row_size]) * ts             # output impulse response (V/sample)
 
         # Calculate some needed intermediate values.
         nspui = int(ui / ts)            # samps per UI
@@ -584,7 +584,7 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
         ):
             pass
         else:
-            h_model = deconv_same(out_imp, chnl_imp)  # noqa: F405
+            h_model = deconv_same(out_imp, chnl_imp)
             rslt[IMP_RESP_INIT] = np.roll(h_model, -len(h_model) // 2 + 3 * nspui)
 
             h_init = np.roll(out_imp, pad_samps)

{pyibis_ami-9.1.0 → pyibis_ami-9.3.0}/src/pyibisami/ami/parameter.py

@@ -7,6 +7,10 @@ Original date:   December 24, 2016
 Copyright (c) 2019 David Banas; all rights reserved World wide.
 """
 
+from typing import ClassVar
+
+from traits.api import Bool, Float, HasTraits, List, Str
+
 #####
 # AMI parameter
 #####
@@ -179,7 +183,7 @@ class AMIParameter:  # pylint: disable=too-many-instance-attributes,too-few-publ
     # The idea is to allow this class to grow along with the IBIS
     # standard, without having to change any of its boilerplate.
 
-    _param_def_tag_procs = {
+    _param_def_tag_procs: ClassVar = {
         "Usage": _set_usage,
         "Type": _set_type,
         "Format": _set_format,
@@ -326,3 +330,66 @@ class AMIParameter:  # pylint: disable=too-many-instance-attributes,too-few-publ
 
     def __str__(self):
         return f"{self.pvalue}"
+
+
+#####
+# AMI parameter tuner
+#####
+
+
+# pylint: disable=too-many-instance-attributes,too-few-public-methods
+class AmiParamTuner(HasTraits):
+    """Object used to populate the rows of a Tx/Rx AMI parameter tuning table.
+
+    Represents one *Model_Specific* 'In'/'InOut' AMI parameter, of 'Range'
+    format, offered to the user for inclusion in EQ optimization.
+    """
+
+    name = Str("(noname)")  # Display name (fully hierarchical, e.g. "tx_preset_coeffs_main").
+    branch_names = List(Str)  # Hierarchical path for `fetch_param_val()`/`set_param_val()`.
+    enabled = Bool(False)  # Will participate in EQ optimization when *True*.
+    min_val = Float(0.0)  # Minimum allowed value during optimization.
+    max_val = Float(0.0)  # Maximum allowed value during optimization.
+    step = Float(0.0)  # Increment used during optimization.
+    value = Float(0.0)  # Current value.
+    is_int = Bool(False)  # Round swept values to the nearest integer when *True*.
+
+    # pylint: disable=too-many-arguments,too-many-positional-arguments
+    def __init__(
+        self, name: str = "(noname)", branch_names: "list[str] | None" = None, enabled: bool = False,
+        min_val: float = 0.0, max_val: float = 0.0, step: float = 0.0, value: float = 0.0, is_int: bool = False
+    ):
+        """
+        Allows user to define properties, at instantiation.
+
+        Keyword Args:
+            name: Parameter name/label.
+                Default: "(noname)"
+            branch_names: Hierarchical path to the parameter, rooted at "Model_Specific".
+                Default: []
+            enabled: Will participate in EQ optimization when *True*.
+                Default: *False*
+            min_val: Minimum allowed value during optimization.
+                Default: 0.0
+            max_val: Maximum allowed value during optimization.
+                Default: 0.0
+            step: Increment used during optimization.
+                Default: 0.0
+            value: Current value.
+                Default: 0.0
+            is_int: Round swept values to the nearest integer when *True*.
+                Default: *False*
+        """
+
+        # Super-class initialization is ABSOLUTELY NECESSARY, in order
+        # to get all the Traits/UI machinery setup correctly.
+        super().__init__()
+
+        self.name = name
+        self.branch_names = branch_names or []
+        self.enabled = enabled
+        self.min_val = min_val
+        self.max_val = max_val
+        self.step = step
+        self.value = value
+        self.is_int = is_int

{pyibis_ami-9.1.0 → pyibis_ami-9.3.0}/src/pyibisami/ami/parser.py

@@ -11,7 +11,8 @@ from __future__     import annotations
 from ctypes         import c_double
 from dataclasses    import dataclass
 import re
-from typing         import Any, Callable, NewType, Optional, TypeAlias
+from typing         import Any, NewType, Optional, TypeAlias
+from collections.abc import Callable
 
 import numpy as np
 from numpy.typing import NDArray
@@ -21,7 +22,7 @@ from traitsui.api import Group, HGroup, Item, VGroup, View
 from traitsui.menu import ModalButtons
 
 from .model                     import AMIModelInitializer
-from .parameter                 import AMIParamError, AMIParameter
+from .parameter                 import AmiParamTuner, AMIParamError, AMIParameter
 from .reserved_parameter_names  import AmiReservedParameterName, RESERVED_PARAM_NAMES
 
 # New types and aliases.
@@ -47,7 +48,7 @@ class AmiLeaf:
 @dataclass(frozen=True)
 class AmiBranch:
     name: AmiName
-    children: list["AmiNode"]
+    children: list[AmiNode]
 
 
 AmiNode:       TypeAlias = AmiLeaf | AmiBranch
@@ -60,7 +61,7 @@ AmiRootName = NewType("AmiRootName", str)
 ReservedParamDict: TypeAlias = dict[AmiReservedParameterName, AMIParameter]
 ModelSpecificDict: TypeAlias = dict[ParamName, "'AMIParameter' | 'ModelSpecificDict'"]
 
-__all__ = [
+__all__ = [  # ruff: ignore=RUF022
     "ParamName", "ParamValue", "Parameters", "ParamValues",
     "AmiName", "AmiAtom", "AmiNode", "AmiNodeParser", "AmiParser",
     "ami_parse", "AMIParamConfigurator"]
@@ -186,32 +187,125 @@ class AMIParamConfigurator(HasTraits):
             return _param.pvalue
         return None
 
-    def set_param_val(self, branch_names, new_val):
-        """Sets the value of the parameter found by traversing 'branch_names'
+    def set_param_val(
+        self: AMIParamConfigurator,
+        branch_names: list[str],
+        new_val: Any
+    ) -> None:
+        """
+        Sets the value of the parameter found by traversing 'branch_names'
         or raises an exception if not found.
 
-        Note: 'branch_names' should *not* begin with 'root_name'.
-        Note: Be careful! There is no checking done here!
+        Args:
+            branch_names: A sequence of node names, used to traverse the parameter tree.
+            new_val: The value to assign to the target parameter.
+
+        Notes:
+            1. ``branch_names`` should *not* begin with <root_name>.
+            2. Be careful! There is no checking done here!
         """
 
         param_dict = self.ami_param_defs
+        tname_parts: list[str] = []  # Fully hierarchical trait name, minus the root key.
+        root_key: Optional[str] = None
         while branch_names:
             branch_name = branch_names.pop(0)
+            if root_key is None:
+                root_key = branch_name  # "Reserved_Parameters" or "Model_Specific"; not part of the trait name.
+            else:
+                tname_parts.append(branch_name)
             if branch_name in param_dict:
-                param_dict = param_dict[branch_name]
+                param_dict = param_dict[branch_name]  # type: ignore
             else:
                 raise ValueError(
                     f"Failed parameter tree search looking for: {branch_name}; available keys: {param_dict.keys()}"
                 )
         if isinstance(param_dict, AMIParameter):
-            param_dict.pvalue = new_val
-            try:
-                eval(f"self.set({branch_name}_={new_val})")  # pylint: disable=eval-used
-            except Exception:  # pylint: disable=broad-exception-caught
-                eval(f"self.set({branch_name}={new_val})")  # pylint: disable=eval-used
+            # Coerce to the parameter's declared type. Notably: a `Bool` trait rejects a
+            # float outright, and a vendor's AMI_Init() parser may choke on "1.0" where an
+            # Integer-typed value (e.g. a List-format mode selector) is expected.
+            if param_dict.ptype == "Boolean":
+                if not isinstance(new_val, bool):
+                    if isinstance(new_val, str):
+                        match new_val:
+                            case "FALSE" | "False" | "false":
+                                new_val = False
+                            case _:
+                                new_val = bool(new_val)
+                    else:
+                        new_val = bool(new_val)
+            elif param_dict.ptype in ("Integer", "Tap"):
+                new_val = int(new_val)
+            # `pvalue`, for 'List' format, holds the list of *legal* values, not the
+            # current one (that lives on the Trait) -- leave it alone, to avoid corrupting it.
+            if param_dict.pformat != "List":
+                param_dict.pvalue = new_val
+            tname = "_".join(tname_parts)
+            if tname:
+                try:
+                    self.trait_set(**{f"{tname}_": new_val})
+                except Exception:  # pylint: disable=broad-exception-caught
+                    self.trait_set(**{tname: new_val})
         else:
             raise TypeError(f"{param_dict} is not of type: AMIParameter!")
 
+    @property
+    def tunable_params(self) -> list[tuple[list[str], AMIParameter]]:
+        """Every *Model Specific* parameter of type 'In' or 'InOut' that is a
+        candidate for automated sweeping/optimization, paired with its fully
+        hierarchical branch name path. This includes:
+
+            - numeric 'Range'-format parameters (real min/max bounds),
+            - 'Boolean' parameters (True/False), and
+            - 'List'-format 'Integer' parameters whose legal values form a
+              contiguous range (e.g. a mode selector like `(List 0 1)`) --
+              this is deliberately conservative: a non-contiguous legal set
+              (e.g. `(List 6 12 18)`) can't be swept with a uniform step
+              without risking illegal intermediate values, so it's excluded.
+
+        The returned branch name paths are ready to pass directly into
+        ``fetch_param_val()``/``set_param_val()`` (i.e. - they are rooted at
+        ``"Model_Specific"``).
+        """
+        return _walk_tunable_params(self._model_specific_dict, ["Model_Specific"])
+
+    def mk_tap_tuners(self) -> list[AmiParamTuner]:
+        """Build a fresh list of `AmiParamTuner`s from this AMI model's tunable
+        Model_Specific parameters (see `tunable_params` for exactly which ones
+        qualify: Range-format, Boolean, and contiguous Integer/List "mode
+        selector" parameters)."""
+        tuners = []
+        for branch_names, param in self.tunable_params:
+            tname = "_".join(branch_names[1:])  # Drop the "Model_Specific" root.
+            if param.pformat == "Range":
+                pmin, pmax = float(param.pmin), float(param.pmax)
+                step = (pmax - pmin) / 10 or 1.0
+                is_int = param.ptype == "Integer"
+                value = float(param.pvalue)
+            elif param.pformat == "Value" and param.ptype == "Boolean":
+                pmin, pmax, step, is_int = 0.0, 1.0, 1.0, True
+                value = float(param.pvalue)
+            else:  # List-format Integer "mode selector" (contiguous legal values).
+                vals = [float(v) for v in param.pvalue]
+                pmin, pmax, step, is_int = min(vals), max(vals), 1.0, True
+                # `pvalue`, for 'List' format, is the list of *legal* values, not the
+                # current one -- that lives on the Trait `make_gui_items()` registered.
+                try:
+                    value = float(self.trait_get(tname + "_")[tname + "_"])
+                except Exception:  # pylint: disable=broad-exception-caught
+                    value = float(self.trait_get(tname)[tname])
+            tuners.append(AmiParamTuner(
+                name=tname,
+                branch_names=branch_names,
+                enabled=False,
+                min_val=pmin,
+                max_val=pmax,
+                step=step,
+                value=value,
+                is_int=is_int,
+            ))
+        return tuners
+
     @property
     def ami_parsing_errors(self) -> list[str]:
         """Any errors or warnings encountered, while parsing the AMI parameter
@@ -286,7 +380,7 @@ class AMIParamConfigurator(HasTraits):
         elif isinstance(param, dict):  # We received a dictionary of subparameters, in 'param'.
             subs: ParamValues = {}
             for sname in param:
-                subs.update(self.input_ami_param(param, sname, prefix=pname + "_"))  # type: ignore
+                subs.update(self.input_ami_param(param, sname, prefix=tname + "_"))  # type: ignore
             res[pname] = subs
         return res
 
@@ -332,6 +426,47 @@ class AMIParamConfigurator(HasTraits):
         return initializer
 
 
+def _is_sweepable(param: AMIParameter) -> bool:
+    "See `AMIParamConfigurator.tunable_params` for the exact criteria."
+    if param.pusage not in ("In", "InOut"):
+        return False
+    if param.pformat == "Range":
+        return True
+    if param.pformat == "Value" and param.ptype == "Boolean":
+        return True
+    if param.pformat == "List" and param.ptype == "Integer":
+        vals = sorted(int(v) for v in param.pvalue)
+        return vals == list(range(vals[0], vals[-1] + 1))  # Contiguous?
+    return False
+
+
+def _walk_tunable_params(
+    params: Parameters, prefix: list[str]
+) -> list[tuple[list[str], AMIParameter]]:
+    """Recursively collect every sweepable (see `_is_sweepable`) leaf of a
+    *Model Specific* parameter (sub)tree.
+
+    Args:
+        params: The (sub)dictionary of AMI parameters to walk.
+        prefix: The branch name path leading to ``params``.
+
+    Returns:
+        A list of (branch name path, parameter) pairs, one per sweepable leaf.
+    """
+
+    results: list[tuple[list[str], AMIParameter]] = []
+    for pname, param in params.items():
+        if pname == "description":  # A branch's optional descriptive text, not a subparameter.
+            continue
+        path = prefix + [pname]
+        if isinstance(param, AMIParameter):
+            if _is_sweepable(param):
+                results.append((path, param))
+        else:  # Subparameter branch.
+            results.extend(_walk_tunable_params(param, path))
+    return results
+
+
 #####
 # AMI file parser.
 #####
@@ -367,7 +502,8 @@ integ = lexeme(regex(r"[-+]?[0-9]+"))
 nat = lexeme(regex(r"[0-9]+"))
 # tap_ix = (integ << whitespace).parsecmap(int2tap)  # Doesn't work!
 # tap_ix = integ.parsecmap(int2tap)  # Breaks parsing of node names that begin with a numeral!
-tap_ix = integ.parsecmap(int2tap) << whitespace
+# tap_ix = integ.parsecmap(int2tap) << whitespace  # This fails; I don't know why.
+tap_ix = lexeme(integ.parsecmap(int2tap))  # This works, as an alternative to the line above.
 symbol = lexeme(regex(r"[0-9a-zA-Z_][^\s()]*"))
 true = lexeme(string("True")).result(True)
 false = lexeme(string("False")).result(False)
@@ -557,7 +693,7 @@ def parse_ami_file_contents(  # pylint: disable=too-many-locals,too-many-branche
     init_returns_impulse_found = False
     getwave_exists_found = False
     model_spec_found = False
-    root_name, params = list(param_dict.items())[0]
+    root_name, params = next(iter(param_dict.items()))
     description = ""
     reserved_params_dict: dict[AmiReservedParameterName, AMIParameter] = {}
     model_specific_dict: ModelSpecificDict = {}
@@ -605,8 +741,7 @@ def parse_ami_file_contents(  # pylint: disable=too-many-locals,too-many-branche
 # Legacy client code support:
 def parse_ami_param_defs(file_contents: str) -> tuple[ParseErrMsg, dict[str, Any]]:
     "The legacy version of ``parse_ami_file_contents()``."
-    # err_msg, root_name, description, reserved_params_dict, model_specific_dict = parse_ami_file_contents(file_contents)
-    errors, warnings, root_name, description, reserved_params_dict, model_specific_dict = parse_ami_file_contents(file_contents)
+    errors, _warnings, root_name, description, reserved_params_dict, model_specific_dict = parse_ami_file_contents(file_contents)
     if errors:
         err_msg = errors[0]
     else:
@@ -649,8 +784,8 @@ def make_gui(params: ModelSpecificDict) -> tuple[Group, list[tuple[str, TraitTyp
     # but no pre-existing enclosing group, in a ``VGroup``.
     # - Generate grouped parameter names and list of unique group names.
     pnames = list(params.keys())
-    pnames_split = list(map(lambda n: n.split('_'), pnames))
-    group_names = list(map(lambda xs: xs[0], pnames_split))
+    pnames_split = [n.split('_') for n in pnames]
+    group_names = [xs[0] for xs in pnames_split]
     grouped_pnames = list(zip(pnames, group_names))
     # The following doesn't preserve the parameter ordering of the AMI file!
     # for group_name in set(group_names):  # Iterate over unique group names.
@@ -728,7 +863,7 @@ def make_gui_items(  # pylint: disable=too-many-locals,too-many-branches
                 if list_tips:
                     tmp_dict: dict[str, Any] = {}
                     tmp_dict.update(list(zip(list_tips, param.pvalue)))
-                    val = list(tmp_dict.keys())[0]
+                    val = next(iter(tmp_dict.keys()))
                     if default:
                         for tip in tmp_dict.items():
                             if tip[1] == default:

{pyibis_ami-9.1.0 → pyibis_ami-9.3.0}/src/pyibisami/ami/reserved_parameter_names.py

@@ -12,7 +12,7 @@ from dataclasses import dataclass
 
 
 @dataclass
-class AmiReservedParameterName():
+class AmiReservedParameterName:
     "IBIS-AMI Reserved Parameter Name"
 
     pname: str