PyIBIS-AMI 7.2.9__tar.gz → 7.3.1__tar.gz

{pyibis_ami-7.2.9/src/pyibis_ami.egg-info → pyibis_ami-7.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyibis-ami
-Version: 7.2.9
+Version: 7.3.1
 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/

{pyibis_ami-7.2.9 → pyibis_ami-7.3.1}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "setuptools.build_meta"
 [project]
 name = "pyibis-ami"
 description = "Facilitates working directly with IBIS-AMI DLLs from the Python command prompt."
-version = "7.2.9"
+version = "7.3.1"
 authors = [ {name = "David Banas",     email = "capn.freako@gmail.com"}
           ]
 readme = "README.md"

{pyibis_ami-7.2.9 → pyibis_ami-7.3.1/src/pyibis_ami.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyibis-ami
-Version: 7.2.9
+Version: 7.3.1
 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/

{pyibis_ami-7.2.9 → pyibis_ami-7.3.1}/src/pyibisami/IBIS_AMI_Tester.ipynb

@@ -69,6 +69,9 @@
    "source": [
     "%matplotlib inline\n",
     "\n",
+    "import sys\n",
+    "import shlex\n",
+    "\n",
     "from matplotlib        import pyplot as plt\n",
     "from matplotlib.figure import Figure\n",
     "\n",
@@ -161,7 +164,8 @@
     "f_max = 40e9         # maximum frequency (Hz)\n",
     "f_step = 10e6        # frequency step (Hz)\n",
     "fig_x = 10           # Figures x-dimmension (in.)\n",
-    "fig_y = 3            # Figures y-dimmension (in.)\n"
+    "fig_y = 3            # Figures y-dimmension (in.)\n",
+    "full_command_line = \"run-notebook\"\n"
    ]
   },
   {
@@ -207,8 +211,10 @@
     "ts = 0.5 / f_max\n",
     "t_fft = array([n * ts for n in range(2 * (len(f) - 1))])\n",
     "\n",
+    "print(f\"Full command line: {full_command_line}\")\n",
+    "print(f\"Testing model: {ibis_file},\")\n",
     "param_defs = expand_params(params)\n",
-    "print(\"Will use the following parameter sweeps:\")\n",
+    "print(\"using the following parameter sweeps:\")\n",
     "for (name, desc, cfgs) in param_defs:\n",
     "    print(f\"\\t{name} ({desc.strip()}): {len(cfgs)} sweeps.\")\n"
    ]
@@ -1451,7 +1457,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.11.13"
+   "version": "3.10.11"
   }
  },
  "nbformat": 4,

{pyibis_ami-7.2.9 → pyibis_ami-7.3.1}/src/pyibisami/ami/model.py

@@ -354,7 +354,9 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
                 return f"({pname} {' '.join(subs)})"
             return f"({pname} {pval})"
 
-        ami_params_in = f"({init_object.ami_params['root_name']} "
+        root_name = init_object.ami_params['root_name']
+        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":
                 ami_params_in += sexpr(item[0], item[1])
@@ -551,7 +553,7 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
             H_init *= s_init[-1] / np.abs(H_init[0])   # Normalize for proper d.c.
             rslt["out_resp_init"] = (t, h_init, s_init, p_init, f, H_init)
 
-        if calc_getw and self.info_params["GetWave_Exists"]:
+        if calc_getw and self.info_params["GetWave_Exists"].pvalue:
             # Get model's step response.
             rng = default_rng()
             u = np.concatenate(
@@ -581,6 +583,11 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
 
         return rslt
 
+    @property
+    def root_name(self):
+        """AMI parameter tree root name."""
+        return self._root_name
+
     def _getInitOut(self):
         return list(map(float, self._initOut))
 
@@ -619,7 +626,10 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
     ami_params_in = property(_getAmiParamsIn, doc="The AMI parameter string passed to AMI_Init() by initialize().")
 
     def _getAmiParamsOut(self):
-        return self._ami_params_out.value
+        pout: str = self._ami_params_out.value
+        if pout:  # pylint: disable=using-constant-test
+            return pout.decode()  # pylint: disable=no-member
+        return f"({self.root_name} )"
 
     ami_params_out = property(
         _getAmiParamsOut, doc="The AMI parameter string returned by either `AMI_Init()` or `AMI_GetWave()`."

{pyibis_ami-7.2.9 → pyibis_ami-7.3.1}/src/pyibisami/ami/parser.py

@@ -15,7 +15,7 @@ import numpy as np
 from numpy.typing import NDArray
 from parsec import ParseError, generate, many, regex, string
 from traits.api import Bool, Enum, HasTraits, Range, Trait, TraitType
-from traitsui.api import Group, HFlow, Item, VGroup, View
+from traitsui.api import Group, HGroup, Item, VGroup, View
 from traitsui.menu import ModalButtons
 
 from .model                     import AMIModelInitializer
@@ -360,7 +360,8 @@ number = lexeme(regex(r"[-+]?[0-9]*\.?[0-9]+([eE][-+]?[0-9]+)?"))
 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)
+# tap_ix = integ.parsecmap(int2tap)  # Breaks parsing of node names that begin with a numeral!
+tap_ix = integ.parsecmap(int2tap) << whitespace
 symbol = lexeme(regex(r"[0-9a-zA-Z_][^\s()]*"))
 true = lexeme(string("True")).result(True)
 false = lexeme(string("False")).result(False)
@@ -578,7 +579,7 @@ def parse_ami_param_defs(file_contents: str) -> tuple[ParseErrMsg, dict[str, Any
                                   "Model_Specific":      model_specific_dict}})
 
 
-def make_gui(params: ModelSpecificDict) -> tuple[Group, list[TraitType]]:
+def make_gui(params: ModelSpecificDict) -> tuple[Group, list[TraitType]]:  # pylint: disable=too-many-locals
     """
     Builds top-level ``Group`` and list of ``Trait`` s from AMI parameter dictionary.
 
@@ -594,18 +595,53 @@ def make_gui(params: ModelSpecificDict) -> tuple[Group, list[TraitType]]:
     Notes:
         1. The dictionary passed through ``params`` may have sub-dictionaries.
         The window layout will reflect this nesting.
+        2. Some AMI files are written to encode the AMI parameter hierarchy
+        via some parameter naming scheme. This function makes a primitive attempt
+        to decode one particular example of this: ``<grp>_<param>``.
     """
 
     gui_items: list[Item | Group] = []
     new_traits: list[tuple[str, TraitType]] = []
-    pnames = list(params.keys())
-    pnames.sort()
-    for pname in pnames:
-        gui_item, new_trait = make_gui_items(pname, params[pname])
-        gui_items.extend(gui_item)
-        new_traits.extend(new_trait)
 
-    return (HFlow(*gui_items), new_traits)
+    # Place parameters with a common prefix in their names,
+    # 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))
+    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.
+    unique_group_names = []
+    for group_name in group_names:
+        if group_name not in unique_group_names:
+            unique_group_names.append(group_name)
+    # - Process all parameters, trapping those from a non-explicit group for special processing.
+    for group_name in unique_group_names:
+        pnames_in_group = [pname for pname, grp_name in grouped_pnames if grp_name == group_name]
+        if len(pnames_in_group) > 1:
+            _gui_items: list[Item | Group] = []
+            for pname in pnames_in_group:
+                gui_item, new_trait = make_gui_items(pname, params[pname])
+                _gui_items.extend(gui_item)
+                new_traits.extend(new_trait)
+            gui_items.append(VGroup(*_gui_items, label=group_name, show_border=True))
+        else:
+            pname = pnames_in_group[0]
+            gui_item, new_trait = make_gui_items(pname, params[pname])
+            gui_items.extend(gui_item)
+            new_traits.extend(new_trait)
+
+    # Finally, split into two rows if necessary.
+    MAX_ITEMS_PER_ROW = 8
+    if len(gui_items) > MAX_ITEMS_PER_ROW:
+        rslt_grp = VGroup(
+            HGroup(*(gui_items[:MAX_ITEMS_PER_ROW])),
+            HGroup(*(gui_items[MAX_ITEMS_PER_ROW:])))
+    else:
+        rslt_grp = HGroup(*gui_items)
+
+    return (rslt_grp, new_traits)
 
 
 def make_gui_items(  # pylint: disable=too-many-locals,too-many-branches

{pyibis_ami-7.2.9 → pyibis_ami-7.3.1}/src/pyibisami/ibis/file.py

@@ -139,7 +139,7 @@ class IBISModel(HasTraits):  # pylint: disable=too-many-instance-attributes
 
         # Add Traits for various attributes found in the IBIS file.
         self.add_trait("comp", Trait(list(components)[0], components))  # Doesn't need a custom mapper, because
-        self.pins = self.get_pins()  # the thing above it (file) can't change.
+        self.pins = self.get_pins()                                     # the thing above it (file) can't change.
         self.add_trait("pin", Enum(self.pins[0], values="pins"))
         (mname, _) = self.pin_
         self.models = self.get_models(mname)
@@ -191,7 +191,8 @@ class IBISModel(HasTraits):  # pylint: disable=too-many-instance-attributes
 
     def __call__(self):
         """Present a customized GUI to the user, for model selection, etc."""
-        self.edit_traits(kind="livemodal")
+        # self.configure_traits(kind='modal')  # Waiting for Enthought/Traits PR1841 to be accepted.
+        self.configure_traits()
 
     # Logger & Pop-up
     def log(self, msg, alert=False):
@@ -228,7 +229,7 @@ class IBISModel(HasTraits):  # pylint: disable=too-many-instance-attributes
             resizable=False,
             buttons=ModalButtons,
             title="PyBERT IBIS Model Selector",
-            id="pybert.pybert_ami.model_selector",
+            id="pybert_ibis_model_selector",
         )
         return view
 

{pyibis_ami-7.2.9 → pyibis_ami-7.3.1}/src/pyibisami/ibis/parser.py

@@ -91,8 +91,9 @@ def word(p):
 @generate("remainder of line")
 def rest_line():
     "Parse remainder of line."
-    chars = yield many(none_of("\n\r")) << ignore  # So that we still function as a lexeme.
-    return "".join(chars)
+    chars = yield many(none_of("[\n\r")) << ignore  # So that we still function as a lexeme.
+    rslt = "".join(chars)
+    return rslt
 
 
 skip_line = lexeme(rest_line).result("(Skipped.)")
@@ -162,9 +163,6 @@ def ratio():
     return None
 
 
-ramp_line = string("dV/dt_") >> ((string("r").result("rising") | string("f").result("falling")) << ignore) + times(
-    ratio, 1, 3
-)
 ex_line = (
     word(string("Executable"))
     >> (  # noqa: W503
@@ -309,11 +307,21 @@ def end():
 
 
 # [Model]
+load_line = string("R_load = ") >> number
+
+ramp_line = string("dV/dt_") >> ((string("r").result("rising") | string("f").result("falling")) << ignore) + times(
+    ratio, 1, 3
+)
+
+
 @generate("[Ramp]")
 def ramp():
     "Parse [Ramp]."
+    load = yield optional(load_line, 50)
     lines = yield count(ramp_line, 2).desc("Two ramp_lines")
-    return dict(lines)  # .update(dict(params))
+    rslt = dict(lines)
+    rslt.update({"load": load})
+    return rslt
 
 
 Model_keywords = {
@@ -348,6 +356,17 @@ def model():
 rlc = lexeme(string("R_pin") | string("L_pin") | string("C_pin"))
 
 
+@generate("[Manufacturer]")
+def manufacturer():
+    "Parse manufacturer."
+    rslt = yield rest_line
+    if not rslt:
+        rslt = "(n/a)"
+    if DEBUG:
+        print(f"Manufacturer: {rslt}", flush=True)
+    return rslt
+
+
 @generate("[Package]")
 def package():
     "Parse package RLC values."
@@ -392,7 +411,7 @@ def pins():
 
 
 Component_keywords = {
-    "manufacturer": rest_line,
+    "manufacturer": manufacturer,
     "package": package,
     "pin": pins,
     "diff_pin": skip_keyword,
@@ -495,6 +514,9 @@ def parse_ibis_file(ibis_file_contents_str, debug=False):
                 Dictionary containing keyword definitions (empty upon failure).
     """
 
+    global DEBUG  # pylint: disable=W0603
+    DEBUG = debug
+
     try:
         nodes = ibis_file.parse_strict(ibis_file_contents_str)  # Parse must consume the entire file.
         if debug:

{pyibis_ami-7.2.9 → pyibis_ami-7.3.1}/src/pyibisami/tools/run_notebook.py

@@ -13,6 +13,8 @@ Copyright (c) 2025 David Banas; all rights reserved World wide.
 import os
 from pathlib    import Path
 import subprocess
+import sys
+import shlex
 from time       import time
 from typing     import Any, Optional
 
@@ -118,10 +120,12 @@ def run_notebook(
 @click.argument("bit_rate", type=float)
 @click.version_option(package_name="PyIBIS-AMI")
 # pylint: disable=too-many-arguments,too-many-positional-arguments
-def main(notebook, out_dir, params, ibis_file, bit_rate,
+def main(notebook, out_dir, params, ibis_file, bit_rate,  # pylint: disable=too-many-locals
          debug, is_tx, nspui, no_nspui_swp, nbits,
          plot_t_max, f_max, f_step, fig_x, fig_y):
     "Run a *Jupyter* notebook on an IBIS-AMI model file."
+    arguments_list = sys.argv
+    full_command_line = "run-notebook " + " ".join(shlex.quote(arg) for arg in arguments_list[1:])
     run_notebook(
         Path(ibis_file).resolve(), Path(notebook).resolve(),
         out_dir=Path(out_dir).resolve(),
@@ -140,6 +144,7 @@ def main(notebook, out_dir, params, ibis_file, bit_rate,
             'fig_y': fig_y,
             'bit_rate': bit_rate,
             'params': params,
+            'full_command_line': full_command_line,
         })