wavekit 0.5.2__tar.gz → 0.5.4__tar.gz

{wavekit-0.5.2 → wavekit-0.5.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wavekit
-Version: 0.5.2
+Version: 0.5.4
 Summary: a fundamental package for digital circuit waveform analysis
 License-File: LICENSE
 Author: cxzzzz

{wavekit-0.5.2 → wavekit-0.5.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wavekit"
-version = "0.5.2"
+version = "0.5.4"
 description = "a fundamental package for digital circuit waveform analysis"
 authors = ["cxzzzz <cxz19961010@outlook.com>"]
 readme = "README.md"

{wavekit-0.5.2 → wavekit-0.5.4}/src/wavekit/__init__.py

@@ -34,11 +34,35 @@ __all__ = [
     'MatchResult',
     'MatchStatus',
     'PatternError',
+    'has_fsdb_support',
 ]
 
-try:
-    from .readers.fsdb.reader import FsdbReader as FsdbReader
+# Detect if FSDB support is available (compiled with VERDI_HOME)
+import importlib.util
+
+_fsdb_available = (
+    importlib.util.find_spec('.readers.fsdb.npi_fsdb_reader', package=__name__) is not None
+)
+
+
+def has_fsdb_support() -> bool:
+    """Check if FsdbReader is available in the current installation."""
+    return _fsdb_available
 
-    __all__.append('FsdbReader')
-except ImportError:
-    pass
+
+class _FsdbReaderStub:
+    """Placeholder that raises an error when FsdbReader is used without Verdi support."""
+
+    def __init__(self, *args, **kwargs):
+        raise RuntimeError(
+            'FsdbReader requires Verdi to be installed and configured.\n\n'
+            '1. Set VERDI_HOME environment variable to your Verdi installation path.\n'
+            '2. Reinstall wavekit:\n'
+            '    pip install --force-reinstall --no-cache-dir --no-deps wavekit'
+        )
+
+
+if _fsdb_available:
+    from .readers.fsdb.reader import FsdbReader as FsdbReader
+else:
+    FsdbReader = _FsdbReaderStub  # type: ignore[assignment]

{wavekit-0.5.2 → wavekit-0.5.4}/src/wavekit/readers/fsdb/npi_fsdb_reader.pyx

@@ -162,8 +162,10 @@ cdef class NpiFsdbScope:
         assert self.scope_handle != NULL
         return npi_fsdb_scope_property_str(npiFsdbScopeType, self.scope_handle).decode('ascii')
 
-    def def_name(self) -> str:
-        assert self.scope_handle != NULL
+    def def_name(self) -> str | None:
+        """Return the module definition name, or None if this scope is not a module."""
+        if self.type() != 'npiFsdbScopeSvModule':
+            return None
         return npi_fsdb_scope_property_str(npiFsdbScopeDefName, self.scope_handle).decode('ascii')
 
 

{wavekit-0.5.2 → wavekit-0.5.4}/src/wavekit/readers/fsdb/reader.py

@@ -101,17 +101,15 @@ class FsdbScope(Scope):
     def child_scope_list(self) -> Sequence[Scope]:
         return [FsdbScope(c, self, self.reader) for c in self._npi_scope.child_scope_list()]
 
-    @property
+    @cached_property
     def type(self) -> str:
-        if not hasattr(self, '_type'):
-            self._type = self._npi_scope.type()
-        return self._type
+        """Return the NPI scope type string, e.g. 'npiFsdbScopeSvModule'."""
+        return self._npi_scope.type()
 
-    @property
+    @cached_property
     def def_name(self) -> str | None:
-        if not hasattr(self, '_def_name'):
-            self._def_name = self._npi_scope.def_name()
-        return self._def_name
+        """Return the module definition name, or None if this scope is not a module."""
+        return self._npi_scope.def_name()
 
     def find_scope_by_module(self, module_name: str, depth: int = 0) -> list[Scope]:
         if not hasattr(self, '_preloaded_module_scope'):
@@ -140,7 +138,13 @@ class FsdbReader(Reader):
             import os
             import sys
 
-            rel_lib_path = os.environ['VERDI_HOME'] + '/share/NPI/python'
+            verdi_home = os.environ.get('VERDI_HOME')
+            if verdi_home is None:
+                raise RuntimeError(
+                    'VERDI_HOME environment variable is not set.\n'
+                    'Please set VERDI_HOME to your Verdi installation path.'
+                )
+            rel_lib_path = verdi_home + '/share/NPI/python'
             sys.path.append(os.path.abspath(rel_lib_path))
             FsdbReader.pynpi['npisys'] = importlib.import_module('pynpi.npisys')
             FsdbReader.pynpi['waveform'] = importlib.import_module('pynpi.waveform')