PyIBIS-AMI 8.0.0__tar.gz → 8.1.0__tar.gz

{pyibis_ami-8.0.0/src/pyibis_ami.egg-info → pyibis_ami-8.1.0}/PKG-INFO

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

{pyibis_ami-8.0.0 → pyibis_ami-8.1.0}/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 = "8.0.0"
+version = "8.1.0"
 authors = [ {name = "David Banas",     email = "capn.freako@gmail.com"}
           ]
 readme = "README.md"

{pyibis_ami-8.0.0 → pyibis_ami-8.1.0/src/pyibis_ami.egg-info}/PKG-INFO

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

{pyibis_ami-8.0.0 → pyibis_ami-8.1.0}/src/pyibisami/ami/model.py

@@ -626,7 +626,7 @@ 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):
-        pout: str = self._ami_params_out.value
+        pout = self._ami_params_out.value
         if pout:  # pylint: disable=using-constant-test
             return pout.decode()  # pylint: disable=no-member
         return f"({self.root_name} )"

{pyibis_ami-8.0.0 → pyibis_ami-8.1.0}/src/pyibisami/ami/parser.py

@@ -7,7 +7,9 @@ Original date:   December 17, 2016
 Copyright (c) 2019 David Banas; all rights reserved World wide.
 """
 
+from __future__     import annotations
 from ctypes         import c_double
+from dataclasses    import dataclass
 import re
 from typing         import Any, Callable, NewType, Optional, TypeAlias
 
@@ -31,13 +33,28 @@ ParamValue:  TypeAlias = int | float | str | list["ParamValue"]
 Parameters:  TypeAlias = dict[ParamName, "'AMIParameter' | 'Parameters'"]
 ParamValues: TypeAlias = dict[ParamName, "'ParamValue'   | 'ParamValues'"]
 
+# AMI parameter tree structure.
 AmiName = NewType("AmiName", str)
 AmiAtom: TypeAlias = bool | int | float | str
-AmiExpr: TypeAlias = "'AmiAtom' | 'AmiNode'"
-AmiNode: TypeAlias = tuple[AmiName, list[AmiExpr]]
+
+
+@dataclass(frozen=True)
+class AmiLeaf:
+    name: AmiName
+    values: list[AmiAtom]
+
+
+@dataclass(frozen=True)
+class AmiBranch:
+    name: AmiName
+    children: list["AmiNode"]
+
+
+AmiNode:       TypeAlias = AmiLeaf | AmiBranch
 AmiNodeParser: TypeAlias = Callable[[str], AmiNode]
 AmiParser:     TypeAlias = Callable[[str], tuple[AmiName, list[AmiNode]]]  # Atoms may not exist at the root level.
 
+# Local definitions.
 ParseErrMsg = NewType("ParseErrMsg", str)
 AmiRootName = NewType("AmiRootName", str)
 ReservedParamDict: TypeAlias = dict[AmiReservedParameterName, AMIParameter]
@@ -45,7 +62,7 @@ ModelSpecificDict: TypeAlias = dict[ParamName, "'AMIParameter' | 'ModelSpecificD
 
 __all__ = [
     "ParamName", "ParamValue", "Parameters", "ParamValues",
-    "AmiName", "AmiAtom", "AmiExpr", "AmiNode", "AmiNodeParser", "AmiParser",
+    "AmiName", "AmiAtom", "AmiNode", "AmiNodeParser", "AmiParser",
     "ami_parse", "AMIParamConfigurator"]
 
 #####