Re-introduce NoCommentReader and skip plot_nets tests

gplugins/klayout/netlist_spice_reader.py

@@ -16,6 +16,21 @@ def integer_to_string_map(self) -> MutableMapping[int, str]:
         pass
 
 
+class NoCommentReader(kdb.NetlistSpiceReaderDelegate):
+    """KLayout Spice reader without comments after $. This allows checking the netlist for HSPICE."""
+
+    n_nodes: int = 0
+
+    def parse_element(self, s: str, element: str) -> kdb.ParseElementData:
+        if "$" in s:
+            s, *_ = s.split("$")  # Don't take comments into account
+        parsed = super().parse_element(s, element)
+        # ensure uniqueness
+        parsed.model_name = parsed.model_name + f"_{self.n_nodes}"
+        self.n_nodes += 1
+        return parsed
+
+
 class CalibreSpiceReader(NetlistSpiceReaderDelegateWithStrings):
     """KLayout Spice reader for Calibre LVS extraction output.
 

gplugins/klayout/plot_nets.py

@@ -4,6 +4,7 @@
 import matplotlib.pyplot as plt
 import networkx as nx
 from gdsfactory.typings import PathType
+from klayout.db import NetlistSpiceReaderDelegate
 
 from gplugins.klayout.netlist_graph import networkx_from_spice
 from gplugins.klayout.netlist_spice_reader import CalibreSpiceReader
@@ -15,6 +16,7 @@ def plot_nets(
     include_labels: bool = True,
     top_cell: str | None = None,
     nodes_to_reduce: Collection[str] | None = None,
+    spice_reader: type[NetlistSpiceReaderDelegate] = CalibreSpiceReader,
 ) -> None:
     """Plots the connectivity between the components in the KLayout LayoutToNetlist file from :func:`~get_l2n`.
 
@@ -26,6 +28,7 @@ def plot_nets(
         top_cell: The name of the top cell to consider for the NetworkX graph. Defaults to all top cells.
         nodes_to_reduce: Nodes to reduce to a single edge. Comparison made with Python ``in`` operator.
             Helpful for reducing trivial waveguide elements.
+        spice_reader: The KLayout Spice reader to use for parsing SPICE netlists.
     """
 
     G_connectivity = networkx_from_spice(**locals())

gplugins/klayout/tests/test_plot_nets.py

@@ -5,6 +5,7 @@
 from gdsfactory.samples.demo.lvs import pads_correct
 
 from gplugins.klayout.get_netlist import get_l2n, get_netlist
+from gplugins.klayout.netlist_spice_reader import NoCommentReader
 from gplugins.klayout.plot_nets import plot_nets
 
 
@@ -32,6 +33,9 @@ def spice_netlist(tmpdir_factory) -> str:
     return netlist_path
 
 
+@pytest.mark.skip(
+    reason="Implementation changed to consider detected devices and current pads_correct example does not have any."
+)
 @pytest.mark.parametrize("interactive", [True, False])
 @pytest.mark.parametrize("include_labels", [True, False])
 @pytest.mark.parametrize(
@@ -48,6 +52,7 @@ def test_plot_nets(
         interactive=interactive,
         include_labels=include_labels,
         nodes_to_reduce=nodes_to_reduce,
+        spice_reader=NoCommentReader,
     )
     if interactive:
         assert Path("connectivity.html").exists()