pyibis-ami 7.2.1__tar.gz → 7.2.2__tar.gz

{pyibis_ami-7.2.1/src/pyibis_ami.egg-info → pyibis_ami-7.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyibis-ami
-Version: 7.2.1
+Version: 7.2.2
 Summary: Facilitates working directly with IBIS-AMI DLLs from the Python command prompt.
 Author-email: David Banas <capn.freako@gmail.com>
 License-Expression: BSD-3-Clause

{pyibis_ami-7.2.1 → pyibis_ami-7.2.2}/pyproject.toml

@@ -1,11 +1,11 @@
 [build-system]
-requires = ["setuptools>=61.0"]
+requires = ["setuptools>=77.0"]
 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.1"
+version = "7.2.2"
 authors = [ {name = "David Banas",     email = "capn.freako@gmail.com"}
           ]
 readme = "README.md"

{pyibis_ami-7.2.1 → pyibis_ami-7.2.2/src/pyibis_ami.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyibis-ami
-Version: 7.2.1
+Version: 7.2.2
 Summary: Facilitates working directly with IBIS-AMI DLLs from the Python command prompt.
 Author-email: David Banas <capn.freako@gmail.com>
 License-Expression: BSD-3-Clause

{pyibis_ami-7.2.1 → pyibis_ami-7.2.2}/src/pyibisami/ami/model.py

@@ -159,6 +159,13 @@ class AMIModelInitializer:
                 if key in self._init_data:
                     self._init_data[key] = optional_args[key]
 
+    def __str__(self):
+        return "\n\t".join([
+            f"AMIModelInitializer instance:",
+            f"`ami_params`: {self.ami_params}",
+            f"`info_params`: {self.ami_params}",
+            ])
+
     def _getChannelResponse(self):
         return list(map(float, self._init_data["channel_response"]))
 
@@ -234,6 +241,7 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
             OSError: If given file cannot be opened.
         """
 
+        self._filename = filename
         self._ami_mem_handle = None
         my_dll = CDLL(filename)
         self._amiInit = my_dll.AMI_Init
@@ -255,6 +263,24 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
         if self._ami_mem_handle:
             self._amiClose(self._ami_mem_handle)
 
+    def __str__(self):
+        return "\n\t".join([
+            f"AMIModel instance: `{self._filename}`",
+            f"Length of initOut = {len(self._initOut)}",
+            f"row_size = {self._row_size}",
+            f"num_aggressors = {self._num_aggressors}",
+            f"sample_interval = {self._sample_interval}",
+            f"bit_time = {self._bit_time}",
+            f"samps_per_bit = {self._samps_per_bit}",
+            f"bits_per_call = {self._bits_per_call}",
+            f"ami_params_in = {self._ami_params_in}",
+            f"ami_params_out = {self._ami_params_out}",
+            f"&ami_mem_handle = {byref(self._ami_mem_handle)}",
+            f"Message = {self._msg}",
+            f"AMI_Init(): {self._amiInit}",
+            f"AMI_GetWave(): {self._amiGetWave}",
+            f"AMI_Close(): {self._amiClose}",])
+
     def initialize(self, init_object: AMIModelInitializer):
         """
         Wraps the ``AMI_Init()`` function.
@@ -298,15 +324,13 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
             "bit_time"
         ]
         self._info_params = init_object.info_params  # pylint: disable=attribute-defined-outside-init
-        assert self._info_params, RuntimeError(
-            f"`info_params` is None!\n`init_object: {init_object}"
-        )  # pylint: disable=attribute-defined-outside-init
 
         # Check GetWave() consistency if possible.
         if init_object.info_params and init_object.info_params["GetWave_Exists"]:
-            assert self._amiGetWave, RuntimeError(
-                "Reserved parameter `GetWave_Exists` is True, but I can't bind to `AMI_GetWave()`!"
-            )
+            if not self._amiGetWave:
+                raise RuntimeError(
+                    "Reserved parameter `GetWave_Exists` is True, but I can't bind to `AMI_GetWave()`!"
+                )
 
         # Construct the AMI parameters string.
         def sexpr(pname, pval):
@@ -420,9 +444,19 @@ class AMIModel:  # pylint: disable=too-many-instance-attributes
             else:
                 tmp_wave = wave[idx: idx + samps_per_call]
             _wave = Signal(*tmp_wave)
-            self._amiGetWave(
-                byref(_wave), len(_wave), byref(_clock_times), byref(self._ami_params_out), self._ami_mem_handle
-            )  # type: ignore
+            try:
+                self._amiGetWave(
+                    byref(_wave), len(_wave), byref(_clock_times),
+                    byref(self._ami_params_out), self._ami_mem_handle
+                )  # type: ignore
+            except OSError:
+                print(self)
+                print(f"byref(_wave): {byref(_wave)}")
+                print(f"len(_wave): {len(_wave)}")
+                print(f"byref(_clock_times): {byref(_clock_times)}")
+                print(f"byref(self._ami_params_out): {byref(self._ami_params_out)}")
+                print(f"self._ami_mem_handle: {self._ami_mem_handle}")
+                raise
             wave_out.extend(_wave)
             clock_times.extend(_clock_times)
             params_out.append(self.ami_params_out)

{pyibis_ami-7.2.1 → pyibis_ami-7.2.2}/src/pyibisami/common.py

@@ -14,8 +14,8 @@ from scipy.linalg       import convolution_matrix, lstsq
 
 Real = TypeVar("Real", float, float)
 Comp = TypeVar("Comp", complex, complex)
-Rvec: TypeAlias = npt.NDArray[Real]
-Cvec: TypeAlias = npt.NDArray[Comp]
+Rvec: TypeAlias = npt.NDArray["Real"]
+Cvec: TypeAlias = npt.NDArray["Comp"]
 
 PI:    float = 3.141592653589793238462643383279502884
 TWOPI: float = 2.0 * PI