pyedb 0.26.3__tar.gz → 0.27.0__tar.gz

{pyedb-0.26.3 → pyedb-0.27.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyedb
-Version: 0.26.3
+Version: 0.27.0
 Summary: Higher-Level Pythonic Ansys Electronics Data Base
 Author-email: "ANSYS, Inc." <pyansys.core@ansys.com>
 Maintainer-email: PyEDB developers <simon.vandenbrouck@ansys.com>

{pyedb-0.26.3 → pyedb-0.27.0}/src/pyedb/__init__.py

@@ -44,7 +44,7 @@ deprecation_warning()
 #
 
 pyedb_path = os.path.dirname(__file__)
-__version__ = "0.26.3"
+__version__ = "0.27.0"
 version = __version__
 
 #

{pyedb-0.26.3 → pyedb-0.27.0}/src/pyedb/configuration/cfg_spice_models.py

@@ -34,6 +34,7 @@ class CfgSpiceModel:
         self.sub_circuit_name = self._spice_dict.get("sub_circuit_name", "")
         self.apply_to_all = self._spice_dict.get("apply_to_all", True)
         self.components = list(self._spice_dict.get("components", []))
+        self.terminal_pairs = self._spice_dict.get("terminal_pairs", None)
 
     def apply(self):
         """Apply Spice model on layout."""
@@ -45,8 +46,8 @@ class CfgSpiceModel:
         comps = self._pedb.components.definitions[self.component_definition].components
         if self.apply_to_all:
             for ref_des, comp in comps.items():
-                comp.assign_spice_model(fpath, self.name, self.sub_circuit_name)
+                comp.assign_spice_model(fpath, self.name, self.sub_circuit_name, self.terminal_pairs)
         else:
             for ref_des, comp in comps.items():
                 if ref_des in self.components:
-                    comp.assign_spice_model(fpath, self.name, self.sub_circuit_name)
+                    comp.assign_spice_model(fpath, self.name, self.sub_circuit_name, self.terminal_pairs)

{pyedb-0.26.3 → pyedb-0.27.0}/src/pyedb/dotnet/edb_core/cell/connectable.py

@@ -47,6 +47,27 @@ class Connectable(LayoutObj):
         net = self._pedb.nets[value]
         self._edb_object.SetNet(net.net_object)
 
+    @property
+    def net_name(self):
+        """Get the primitive layer name.
+
+        Returns
+        -------
+        str
+        """
+        try:
+            return self._edb_object.GetNet().GetName()
+        except (KeyError, AttributeError):  # pragma: no cover
+            return None
+
+    @net_name.setter
+    def net_name(self, name):
+        if name in self._pedb.nets.netlist:
+            obj = self._pedb.nets.nets[name].net_object
+            self._edb_object.SetNet(obj)
+        else:
+            raise ValueError(f"Net {name} not found.")
+
     @property
     def component(self):
         """Component connected to this object.

{pyedb-0.26.3 → pyedb-0.27.0}/src/pyedb/dotnet/edb_core/cell/hierarchy/component.py

@@ -22,6 +22,7 @@
 
 import logging
 import re
+from typing import Optional
 import warnings
 
 from pyedb.dotnet.edb_core.cell.hierarchy.hierarchy_obj import Group
@@ -61,6 +62,15 @@ class EDBComponent(Group):
         self._layout_instance = None
         self._comp_instance = None
 
+    @property
+    def name(self):
+        """Name of the definition."""
+        return self._edb_object.GetName()
+
+    @name.setter
+    def name(self, value):
+        self._edb_object.SetName(value)
+
     @property
     def group_type(self):
         return self._edb_object.ToString().split(".")[-1].lower()
@@ -808,7 +818,13 @@ class EDBComponent(Group):
             return False
         return True
 
-    def assign_spice_model(self, file_path, name=None, sub_circuit_name=None):
+    def assign_spice_model(
+        self,
+        file_path: str,
+        name: Optional[str] = None,
+        sub_circuit_name: Optional[str] = None,
+        terminal_pairs: Optional[list] = None,
+    ):
         """Assign Spice model to this component.
 
         Parameters
@@ -817,6 +833,10 @@ class EDBComponent(Group):
             File path of the Spice model.
         name : str, optional
             Name of the Spice model.
+        sub_circuit_name : str, optional
+            Name of the sub circuit.
+        terminal_pairs : list, optional
+            list of terminal pairs.
 
         Returns
         -------
@@ -828,23 +848,30 @@ class EDBComponent(Group):
         with open(file_path, "r") as f:
             for line in f:
                 if "subckt" in line.lower():
-                    pinNames = [i.strip() for i in re.split(" |\t", line) if i]
-                    pinNames.remove(pinNames[0])
-                    pinNames.remove(pinNames[0])
+                    pin_names_sp = [i.strip() for i in re.split(" |\t", line) if i]
+                    pin_names_sp.remove(pin_names_sp[0])
+                    pin_names_sp.remove(pin_names_sp[0])
                     break
-        if len(pinNames) == self.numpins:
-            model = self._edb.cell.hierarchy._hierarchy.SPICEModel()
-            model.SetModelPath(file_path)
-            model.SetModelName(name)
-            if sub_circuit_name:
-                model.SetSubCkt(sub_circuit_name)
-            terminal = 1
-            for pn in pinNames:
-                model.AddTerminalPinPair(pn, str(terminal))
-                terminal += 1
-        else:  # pragma: no cover
-            logging.error("Wrong number of Pins")
-            return False
+        if not len(pin_names_sp) == self.numpins:  # pragma: no cover
+            raise ValueError(f"Pin counts doesn't match component {self.name}.")
+
+        model = self._edb.cell.hierarchy._hierarchy.SPICEModel()
+        model.SetModelPath(file_path)
+        model.SetModelName(name)
+        if sub_circuit_name:
+            model.SetSubCkt(sub_circuit_name)
+
+        if terminal_pairs:
+            terminal_pairs = terminal_pairs if isinstance(terminal_pairs[0], list) else [terminal_pairs]
+            for pair in terminal_pairs:
+                pname, pnumber = pair
+                if pname not in pin_names_sp:  # pragma: no cover
+                    raise ValueError(f"Pin name {pname} doesn't exist in {file_path}.")
+                model.AddTerminalPinPair(pname, str(pnumber))
+        else:
+            for idx, pname in enumerate(pin_names_sp):
+                model.AddTerminalPinPair(pname, str(idx + 1))
+
         return self._set_model(model)
 
     def assign_s_param_model(self, file_path, name=None, reference_net=None):
@@ -856,7 +883,8 @@ class EDBComponent(Group):
             File path of the S-parameter model.
         name : str, optional
             Name of the S-parameter model.
-
+        reference_net : str, optional
+            Name of the reference net.
         Returns
         -------
 

{pyedb-0.26.3 → pyedb-0.27.0}/src/pyedb/dotnet/edb_core/cell/layout.py

@@ -54,6 +54,29 @@ from pyedb.dotnet.edb_core.general import convert_py_list_to_net_list
 from pyedb.dotnet.edb_core.utilities.obj_base import ObjBase
 
 
+def primitive_cast(pedb, edb_object):
+    if edb_object.GetPrimitiveType().ToString() == "Rectangle":
+        return EdbRectangle(edb_object, pedb)
+    elif edb_object.GetPrimitiveType().ToString() == "Circle":
+        return EdbCircle(edb_object, pedb)
+    elif edb_object.GetPrimitiveType().ToString() == "Polygon":
+        return EdbPolygon(edb_object, pedb)
+    elif edb_object.GetPrimitiveType().ToString() == "Path":
+        return Path(pedb, edb_object)
+    elif edb_object.GetPrimitiveType().ToString() == "Bondwire":
+        return Bondwire(pedb, edb_object)
+    elif edb_object.GetPrimitiveType().ToString() == "Text":
+        return EdbText(edb_object, pedb)
+    elif edb_object.GetPrimitiveType().ToString() == "PrimitivePlugin":
+        return
+    elif edb_object.GetPrimitiveType().ToString() == "Path3D":
+        return
+    elif edb_object.GetPrimitiveType().ToString() == "BoardBendDef":
+        return
+    else:
+        return
+
+
 class Layout(ObjBase):
     def __init__(self, pedb, edb_object):
         super().__init__(pedb, edb_object)
@@ -209,7 +232,7 @@ class Layout(ObjBase):
         """
         prims = []
         for p in self._edb_object.Primitives:
-            obj = self.find_object_by_id(p.GetId())
+            obj = primitive_cast(self._pedb, p)
             prims.append(obj)
         return prims
 
@@ -285,26 +308,7 @@ class Layout(ObjBase):
             return EDBPadstackInstance(obj, self._pedb)
 
         if obj.GetObjType().ToString() == "Primitive":
-            if obj.GetPrimitiveType().ToString() == "Rectangle":
-                return EdbRectangle(obj, self._pedb)
-            elif obj.GetPrimitiveType().ToString() == "Circle":
-                return EdbCircle(obj, self._pedb)
-            elif obj.GetPrimitiveType().ToString() == "Polygon":
-                return EdbPolygon(obj, self._pedb)
-            elif obj.GetPrimitiveType().ToString() == "Path":
-                return Path(self._pedb, obj)
-            elif obj.GetPrimitiveType().ToString() == "Bondwire":
-                return Bondwire(self._pedb, obj)
-            elif obj.GetPrimitiveType().ToString() == "Text":
-                return EdbText(obj, self._pedb)
-            elif obj.GetPrimitiveType().ToString() == "PrimitivePlugin":
-                pass
-            elif obj.GetPrimitiveType().ToString() == "Path3D":
-                pass
-            elif obj.GetPrimitiveType().ToString() == "BoardBendDef":
-                pass
-            else:
-                pass
+            return primitive_cast(self._pedb, obj)
 
     def find_net_by_name(self, value: str):
         """Find a net object by name

{pyedb-0.26.3 → pyedb-0.27.0}/src/pyedb/dotnet/edb_core/cell/primitive/primitive.py

@@ -89,27 +89,6 @@ class Primitive(Connectable):
         """
         return self._edb_object.GetPrimitiveType().ToString().lower()
 
-    @property
-    def net_name(self):
-        """Get the primitive net name.
-
-        Returns
-        -------
-        str
-        """
-        return self.net.name
-
-    @net_name.setter
-    def net_name(self, name):
-        if isinstance(name, str):
-            net = self._app.nets.nets[name].net_object
-            self.primitive_object.SetNet(net)
-        else:
-            try:
-                self.net = name.name
-            except:  # pragma: no cover
-                self._app.logger.error("Failed to set net name.")
-
     @property
     def layer(self):
         """Get the primitive edb layer object."""
@@ -128,7 +107,7 @@ class Primitive(Connectable):
         str
         """
         try:
-            return self.layer.name
+            return self._edb_object.GetLayer().GetName()
         except (KeyError, AttributeError):  # pragma: no cover
             return None
 

{pyedb-0.26.3 → pyedb-0.27.0}/src/pyedb/dotnet/edb_core/cell/terminal/terminal.py

@@ -159,16 +159,6 @@ class Terminal(Connectable):
         ppp.DoRenormalize = value
         self._port_post_processing_prop = ppp
 
-    @property
-    def net_name(self):
-        """Net name.
-
-        Returns
-        -------
-        str
-        """
-        return self.net.name
-
     @property
     def terminal_type(self):
         """Terminal Type.

{pyedb-0.26.3 → pyedb-0.27.0}/src/pyedb/dotnet/edb_core/components.py

@@ -1807,8 +1807,8 @@ class Components(object):
 
             sParameterMod = self._edb.cell.hierarchy._hierarchy.SParameterModel()
             sParameterMod.SetComponentModelName(nPortModelName)
-            gndnets = filter(lambda x: "gnd" in x.lower(), componentNets)
-            if len(list(gndnets)) > 0:  # pragma: no cover
+            gndnets = list(filter(lambda x: "gnd" in x.lower(), componentNets))
+            if len(gndnets) > 0:  # pragma: no cover
                 net = gndnets[0]
             else:  # pragma: no cover
                 net = componentNets[len(componentNets) - 1]

{pyedb-0.26.3 → pyedb-0.27.0}/src/pyedb/dotnet/edb_core/definition/component_def.py

@@ -130,22 +130,32 @@ class EDBComponentDef(ObjBase):
             comp.assign_s_param_model(file_path, model_name, reference_net)
         return True
 
-    def assign_spice_model(self, file_path, model_name=None):
+    def assign_spice_model(
+        self,
+        file_path,
+        model_name=None,
+        sub_circuit_name=None,
+        terminal_pairs=None,
+    ):
         """Assign Spice model to all components under this part name.
 
         Parameters
         ----------
         file_path : str
             File path of the Spice model.
-        name : str, optional
+        model_name : str, optional
             Name of the Spice model.
+        sub_circuit_name : str, optional
+            Name of the sub circuit.
+        terminal_pairs : list, optional
+            list of terminal pairs.
 
         Returns
         -------
 
         """
         for comp in list(self.components.values()):
-            comp.assign_spice_model(file_path, model_name)
+            comp.assign_spice_model(file_path, model_name, sub_circuit_name, terminal_pairs)
         return True
 
     @property

{pyedb-0.26.3 → pyedb-0.27.0}/src/pyedb/dotnet/edb_core/edb_data/padstacks_data.py

@@ -1562,30 +1562,6 @@ class EDBPadstackInstance(Primitive):
                     break
         return layer_list
 
-    @property
-    def net_name(self):
-        """Net name.
-
-        Returns
-        -------
-        str
-            Name of the net.
-        """
-        return self._edb_padstackinstance.GetNet().GetName()
-
-    @net_name.setter
-    def net_name(self, val):
-        if not isinstance(val, str):
-            try:
-                self._edb_padstackinstance.SetNet(val.net_obj)
-            except:
-                raise AttributeError("Value inserted not found. Input has to be net name or net object.")
-        elif val in self._pedb.nets.netlist:
-            net = self._pedb.nets.nets[val].net_object
-            self._edb_padstackinstance.SetNet(net)
-        else:
-            raise AttributeError("Value inserted not found. Input has to be net name or net object.")
-
     @property
     def is_pin(self):
         """Determines whether this padstack instance is a layout pin.

{pyedb-0.26.3 → pyedb-0.27.0}/src/pyedb/dotnet/edb_core/geometry/polygon_data.py

@@ -51,6 +51,19 @@ class PolygonData:
         else:  # pragma: no cover
             self._edb_object = edb_object
 
+    @property
+    def bounding_box(self):
+        """Bounding box.
+
+        Returns
+        -------
+        List[float]
+            List of coordinates for the component's bounding box, with the list of
+            coordinates in this order: [X lower left corner, Y lower left corner,
+            X upper right corner, Y upper right corner].
+        """
+        return BBox(self._pedb, self._edb_object.GetBBox()).corner_points
+
     @property
     def arcs(self):
         """Get the Primitive Arc Data."""

{pyedb-0.26.3 → pyedb-0.27.0}/src/pyedb/dotnet/edb_core/layout_validation.py

@@ -249,7 +249,7 @@ class LayoutValidation:
                             new_nets.append(net_obj.name)
                             for geo in disjoints:
                                 try:
-                                    obj_dict[geo].net_name = net_obj
+                                    obj_dict[geo].net_name = net_obj.name
                                 except KeyError:
                                     pass
                             disjoints_objects.extend(disjoints)

{pyedb-0.26.3 → pyedb-0.27.0}/src/pyedb/dotnet/edb_core/padstack.py

@@ -62,7 +62,7 @@ class EdbPadstacks(object):
 
         """
         if isinstance(name, int) and name in self.instances:
-            return self._pedb.layout.find_object_by_id(name)
+            return self.instances(name)
         elif name in self.definitions:
             return self.definitions[name]
         else:

{pyedb-0.26.3 → pyedb-0.27.0}/src/pyedb/dotnet/edb_core/utilities/obj_base.py

@@ -79,16 +79,3 @@ class ObjBase(object):
     @name.setter
     def name(self, value):
         self._edb_object.SetName(value)
-
-    @property
-    def bounding_box(self):
-        """Bounding box.
-
-        Returns
-        -------
-        List[float]
-            List of coordinates for the component's bounding box, with the list of
-            coordinates in this order: [X lower left corner, Y lower left corner,
-            X upper right corner, Y upper right corner].
-        """
-        return BBox(self._pedb, self._edb_object.GetBBox()).corner_points