pyedb 0.12.0__tar.gz → 0.12.2__tar.gz

{pyedb-0.12.0 → pyedb-0.12.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyedb
-Version: 0.12.0
+Version: 0.12.2
 Summary: Higher-Level Pythonic Ansys Electronics Data Base
 Author-email: "ANSYS, Inc." <pyansys.core@ansys.com>
 Maintainer-email: PyEDB developers <simon.vandenbrouck@ansys.com>
@@ -24,7 +24,7 @@ Requires-Dist: toml == 0.10.2
 Requires-Dist: Rtree >= 1.2.0
 Requires-Dist: ansys-sphinx-theme>=0.10.0,<0.17 ; extra == "doc"
 Requires-Dist: imageio>=2.30.0,<2.35 ; extra == "doc"
-Requires-Dist: ipython>=8.13.0,<8.25 ; extra == "doc"
+Requires-Dist: ipython>=8.13.0,<8.26 ; extra == "doc"
 Requires-Dist: jupyterlab>=4.0.0,<4.3 ; extra == "doc"
 Requires-Dist: matplotlib>=3.5.0,<3.10 ; extra == "doc"
 Requires-Dist: nbsphinx>=0.9.0,<0.10 ; extra == "doc"

{pyedb-0.12.0 → pyedb-0.12.2}/pyproject.toml

@@ -47,7 +47,7 @@ tests = [
 doc = [
     "ansys-sphinx-theme>=0.10.0,<0.17",
     "imageio>=2.30.0,<2.35",
-    "ipython>=8.13.0,<8.25",
+    "ipython>=8.13.0,<8.26",
     "jupyterlab>=4.0.0,<4.3",
     "matplotlib>=3.5.0,<3.10",
     "nbsphinx>=0.9.0,<0.10",

{pyedb-0.12.0 → pyedb-0.12.2}/src/pyedb/__init__.py

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

{pyedb-0.12.0 → pyedb-0.12.2}/src/pyedb/configuration/cfg_boundaries.py

@@ -25,7 +25,7 @@ from enum import Enum
 
 class CfgBoundaries:
     def __init__(self, pdata, boundaries_dict):
-        self._pedb = pdata.pedb
+        self._pedb = pdata._pedb
         self._boundaries_dict = boundaries_dict
         self.open_region = self._boundaries_dict.get("open_region", None)
         self._map_open_region_type()

{pyedb-0.12.0 → pyedb-0.12.2}/src/pyedb/configuration/cfg_components.py

@@ -60,7 +60,7 @@ class CfgSolderBallsProperties:
 
 class CfgComponent:
     def __init__(self, pdata, **kwargs):
-        self._pedb = pdata.pedb
+        self._pedb = pdata._pedb
         self._comp_dict = kwargs
         self.reference_designator = ""
         self.part_type = self.ComponentType.RESISTOR

{pyedb-0.12.0 → pyedb-0.12.2}/src/pyedb/configuration/cfg_data.py

@@ -30,39 +30,58 @@ from pyedb.configuration.cfg_ports_sources import CfgPort, CfgSources
 from pyedb.configuration.cfg_s_parameter_models import CfgSParameterModel
 from pyedb.configuration.cfg_setup import CfgSetup
 from pyedb.configuration.cfg_spice_models import CfgSpiceModel
+from pyedb.configuration.cfg_stackup import CfgStackup
+from pyedb.generic.general_methods import pyedb_function_handler
 
 
 class CfgData(object):
     """Manages configure data."""
 
     def __init__(self, pedb, **kwargs):
-        self.pedb = pedb
-        self.edb_comps = self.pedb.components.components
+        self._pedb = pedb
+        self.edb_comps = self._pedb.components.components
         self.general = CfgGeneral(self, kwargs.get("general", None))
+
         self.boundaries = {}
         if kwargs.get("boundaries", None):
             self.boundaries = CfgBoundaries(self, kwargs.get("boundaries", None))
-        self.nets = CfgNets(self)
+
+        self.nets = None
         if kwargs.get("nets"):
             self.nets = CfgNets(
                 self, kwargs.get("nets", {}).get("signal_nets", []), kwargs.get("nets", {}).get("power_ground_nets", [])
             )
+
         self.components = [CfgComponent(self, **component) for component in kwargs.get("components", [])]
+
         self.padstacks = CfgPadstacks(self, kwargs.get("padstacks", None))
+
         self.pin_groups = [CfgPinGroup(self, pin_group) for pin_group in kwargs.get("pin_groups", [])]
+
         self.ports = [CfgPort(self, **port) for port in kwargs.get("ports", [])]
+
         self.sources = [CfgSources(self, **source) for source in kwargs.get("sources", [])]
-        self.setups = [CfgSetup(self)]
+
+        self.setups = []
         if kwargs.get("setups", None):
             self.setups = [CfgSetup(self, setup) for setup in kwargs.get("setups", [])]
-        self.stackup = None
+
+        self.stackup = CfgStackup(self._pedb, data=kwargs.get("stackup", {}))
+
         self.s_parameters = [
             CfgSParameterModel(self, self.general.s_parameter_library, sparam_model)
             for sparam_model in kwargs.get("s_parameters", [])
         ]
+
         self.spice_models = [
             CfgSpiceModel(self, self.general.spice_model_library, spice_model)
             for spice_model in kwargs.get("spice_models", [])
         ]
+
         self.package_definition = None
         self.operations = None
+
+    @pyedb_function_handler
+    def apply(self):
+        """Apply configuration settings to the current design"""
+        self.stackup.apply()

{pyedb-0.12.0 → pyedb-0.12.2}/src/pyedb/configuration/cfg_general.py

@@ -25,7 +25,7 @@ class CfgGeneral:
     """Manage configuration general settings."""
 
     def __init__(self, pdata, general_dict):
-        self._pedb = pdata.pedb
+        self._pedb = pdata._pedb
         self.spice_model_library = ""
         self.s_parameter_library = ""
         if general_dict:

{pyedb-0.12.0 → pyedb-0.12.2}/src/pyedb/configuration/cfg_nets.py

@@ -25,7 +25,7 @@ class CfgNets:
     """Manage configuration net class."""
 
     def __init__(self, pdata, signal_nets=None, power_nets=None):
-        self._pedb = pdata.pedb
+        self._pedb = pdata._pedb
         self.signal_nets = []
         self.power_nets = []
         if signal_nets:

{pyedb-0.12.0 → pyedb-0.12.2}/src/pyedb/configuration/cfg_padstacks.py

@@ -28,7 +28,7 @@ class CfgPadstacks:
     """Padstack data class."""
 
     def __init__(self, pdata, padstack_dict=None):
-        self._pedb = pdata.pedb
+        self._pedb = pdata._pedb
         self.definitions = []
         self.instances = []
         self._padstack_dict = padstack_dict
@@ -52,7 +52,7 @@ class Definition:
     """Padstack definition data class."""
 
     def __init__(self, pdata, definition_dict):
-        self._pedb = pdata.pedb
+        self._pedb = pdata._pedb
         self._definition_dict = definition_dict
         self.name = self._definition_dict.get("name", None)
         self.hole_diameter = self._definition_dict.get("hole_diameter", None)
@@ -78,7 +78,7 @@ class Instance:
     """Instance data class."""
 
     def __init__(self, pdata, instances_dict):
-        self._pedb = pdata.pedb
+        self._pedb = pdata._pedb
         self._instances_dict = instances_dict
         self.name = self._instances_dict.get("name", "")
         self.backdrill_top = None

{pyedb-0.12.0 → pyedb-0.12.2}/src/pyedb/configuration/cfg_pin_groups.py

@@ -25,7 +25,7 @@ class CfgPinGroup:
     """Manage configuration pin group class."""
 
     def __init__(self, pdata, pingroup_dict):
-        self._pedb = pdata.pedb
+        self._pedb = pdata._pedb
         self._pingroup_dict = pingroup_dict
         self.name = self._pingroup_dict.get("name", "")
         self.reference_designator = self._pingroup_dict.get("reference_designator", "")
@@ -36,7 +36,7 @@ class CfgPinGroup:
         """Apply pin group on layout."""
         if self.pins:
             if not self._pedb.siwave.create_pin_group(self.reference_designator, list(self.pins), self.name):
-                self._pedb.loogger.error(f"Failed to create pin group on pins {self.pins}")
+                self._pedb.logger.error(f"Failed to create pin group on pins {self.pins}")
                 return False
             self._pedb.logger.info(f"Pin group {self.name} created.")
             return True

{pyedb-0.12.0 → pyedb-0.12.2}/src/pyedb/configuration/cfg_ports_sources.py

@@ -27,7 +27,7 @@ class CfgCircuitElement:
     @property
     def pedb(self):
         """Edb."""
-        return self._pdata.pedb
+        return self._pdata._pedb
 
     @pyedb_function_handler
     def __init__(self, pdata, **kwargs):
@@ -76,7 +76,7 @@ class CfgCircuitElement:
                 search_radius = neg_value.get("search_radius", "5e-3")
                 temp = dict()
                 for i, j in pos_objs.items():
-                    temp[i] = self._pdata.pedb.padstacks.get_reference_pins(j, ref_net, search_radius, max_limit=1)[0]
+                    temp[i] = self._pdata._pedb.padstacks.get_reference_pins(j, ref_net, search_radius, max_limit=1)[0]
                 self.neg_terminal = {
                     i: j.create_terminal(i + "_ref") if not j.terminal else j.terminal for i, j in temp.items()
                 }
@@ -105,7 +105,7 @@ class CfgCircuitElement:
                 pins.update(get_pin_obj(i))
         else:
             if terminal_type == "net":
-                temp = self._pdata.pedb.components.get_pins(self.reference_designator, terminal_value[0])
+                temp = self._pdata._pedb.components.get_pins(self.reference_designator, terminal_value[0])
             elif terminal_type == "pin_group":
                 pin_group = self.pedb.siwave.pin_groups[terminal_value[0]]
                 temp = pin_group.pins
@@ -119,7 +119,7 @@ class CfgCircuitElement:
         else:
             pg_name = f"pg_{self.name}_{self.reference_designator}"
         pin_names = [i.pin_number for i in pins.values()]
-        name, temp = self._pdata.pedb.siwave.create_pin_group(self.reference_designator, pin_names, pg_name)
+        name, temp = self._pdata._pedb.siwave.create_pin_group(self.reference_designator, pin_names, pg_name)
         return {name: temp}
 
 

{pyedb-0.12.0 → pyedb-0.12.2}/src/pyedb/configuration/cfg_s_parameter_models.py

@@ -25,7 +25,7 @@ from pathlib import Path
 
 class CfgSParameterModel:
     def __init__(self, pdata, path_lib, sparam_dict):
-        self._pedb = pdata.pedb
+        self._pedb = pdata._pedb
         self.path_libraries = path_lib
         self._sparam_dict = sparam_dict
         self.name = self._sparam_dict.get("name", "")

{pyedb-0.12.0 → pyedb-0.12.2}/src/pyedb/configuration/cfg_setup.py

@@ -89,7 +89,7 @@ class DcIrSettings:
 
 class CfgSetup:
     def __init__(self, pdata, setup_dict=None):
-        self._pedb = pdata.pedb
+        self._pedb = pdata._pedb
         self._setup_dict = None
         self.name = "PyEDB_setup"
         self.type = self.SetupType.HFSS

{pyedb-0.12.0 → pyedb-0.12.2}/src/pyedb/configuration/cfg_spice_models.py

@@ -25,7 +25,7 @@ from pathlib import Path
 
 class CfgSpiceModel:
     def __init__(self, pdata, path_lib, spice_dict):
-        self._pedb = pdata.pedb
+        self._pedb = pdata._pedb
         self.path_libraries = path_lib
         self._spice_dict = spice_dict
         self.name = self._spice_dict.get("name", "")

pyedb-0.12.2/src/pyedb/configuration/cfg_stackup.py

@@ -0,0 +1,135 @@
+# Copyright (C) 2023 - 2024 ANSYS, Inc. and/or its affiliates.
+# SPDX-License-Identifier: MIT
+#
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+
+from pyedb.generic.general_methods import pyedb_function_handler
+
+
+class CfgStackup:
+    def __init__(self, pedb, data):
+        self._pedb = pedb
+
+        self.materials = [CfgMaterial(self._pedb, **mat) for mat in data.get("materials", [])]
+        self.layers = [CfgLayer(self._pedb, **lay) for lay in data.get("layers", [])]
+
+    @pyedb_function_handler
+    def apply(self):
+        """Apply configuration settings to the current design"""
+        if len(self.materials):
+            self.__apply_materials()
+        if len(self.layers):
+            self.__apply_layers()
+
+    @pyedb_function_handler
+    def __apply_layers(self):
+        """Apply layer settings to the current design"""
+        layers = list()
+        layers.extend(self.layers)
+        input_signal_layers = [i for i in layers if i.type.lower() == "signal"]
+        if not len(input_signal_layers) == len(self._pedb.stackup.signal_layers):
+            self._pedb.logger.error("Input signal layer count do not match.")
+            return False
+
+        removal_list = []
+        lc_signal_layers = []
+        for name, obj in self._pedb.stackup.all_layers.items():
+            if obj.type == "dielectric":
+                removal_list.append(name)
+            elif obj.type == "signal":
+                lc_signal_layers.append(obj.id)
+        for l in removal_list:
+            self._pedb.stackup.remove_layer(l)
+
+        # update all signal layers
+        id_name = {i[0]: i[1] for i in self._pedb.stackup.layers_by_id}
+        signal_idx = 0
+        for l in layers:
+            if l.type == "signal":
+                layer_id = lc_signal_layers[signal_idx]
+                layer_name = id_name[layer_id]
+                attrs = {
+                    i: j for i, j in l.__dict__.items() if not i.startswith("_") and isinstance(j, (int, float, str))
+                }
+                self._pedb.stackup.layers[layer_name].update(**attrs)
+                signal_idx = signal_idx + 1
+
+        # add all dielectric layers. Dielectric layers must be added last. Otherwise,
+        # dielectric layer will occupy signal and document layer id.
+        prev_layer_clone = None
+        l = layers.pop(0)
+        if l.type == "signal":
+            prev_layer_clone = self._pedb.stackup.layers[l.name]
+        else:
+            attrs = {i: j for i, j in l.__dict__.items() if not i.startswith("_") and isinstance(j, (int, float, str))}
+            prev_layer_clone = self._pedb.stackup.add_layer_top(**attrs)
+        for idx, l in enumerate(layers):
+            if l.type == "dielectric":
+                attrs = {
+                    i: j for i, j in l.__dict__.items() if not i.startswith("_") and isinstance(j, (int, float, str))
+                }
+                prev_layer_clone = self._pedb.stackup.add_layer_below(base_layer_name=prev_layer_clone.name, **attrs)
+            elif l.type == "signal":
+                prev_layer_clone = self._pedb.stackup.layers[l.name]
+
+    @pyedb_function_handler
+    def __apply_materials(self):
+        """Apply material settings to the current design"""
+        materials_in_db = {i.lower(): i for i, _ in self._pedb.materials.materials.items()}
+        for mat_in_cfg in self.materials:
+            if mat_in_cfg.name.lower() in materials_in_db:
+                self._pedb.materials.delete_material(materials_in_db[mat_in_cfg.name.lower()])
+
+            attrs = {
+                i: j
+                for i, j in mat_in_cfg.__dict__.items()
+                if not i.startswith("_") and isinstance(j, (int, float, str))
+            }
+            mat = self._pedb.materials.add_material(**attrs)
+
+
+class CfgMaterial:
+    def __init__(self, pedb, **kwargs):
+        self._pedb = pedb
+        self.name = kwargs.get("name")
+        self.permittivity = kwargs.get("permittivity", None)
+        self.conductivity = kwargs.get("conductivity", None)
+        self.dielectric_loss_tangent = kwargs.get("dielectric_loss_tangent", None)
+        self.magnetic_loss_tangent = kwargs.get("magnetic_loss_tangent", None)
+        self.mass_density = kwargs.get("mass_density", None)
+        self.permeability = kwargs.get("permeability", None)
+        self.poisson_ratio = kwargs.get("poisson_ratio", None)
+        self.specific_heat = kwargs.get("specific_heat", None)
+        self.thermal_conductivity = kwargs.get("thermal_conductivity", None)
+        self.youngs_modulus = kwargs.get("youngs_modulus", None)
+        self.thermal_expansion_coefficient = kwargs.get("thermal_expansion_coefficient", None)
+
+
+class CfgLayer:
+    def __init__(self, pedb, **kwargs):
+        self._pedb = pedb
+        self.name = kwargs.get("name", None)
+        self.type = kwargs.get("type", None)
+        self.material = kwargs.get("material", None)
+        self.fill_material = kwargs.get("fill_material", None)
+        self.thickness = kwargs.get("thickness", None)
+        self.etch_factor = kwargs.get("etch_factor", None)
+        self.lower_elevation = kwargs.get("lower_elevation", None)

{pyedb-0.12.0 → pyedb-0.12.2}/src/pyedb/configuration/configuration.py

@@ -27,7 +27,6 @@ import toml
 
 from pyedb.configuration.cfg_data import CfgData
 from pyedb.dotnet.edb_core.definition.package_def import PackageDef
-from pyedb.dotnet.edb_core.stackup import LayerCollection
 from pyedb.generic.general_methods import pyedb_function_handler
 
 
@@ -133,8 +132,6 @@ class Configuration:
             port.create()
 
         # Configure sources
-        """if "sources" in self.data:
-            self._load_sources()"""
         for source in self.cfg_data.sources:
             source.create()
 
@@ -143,8 +140,7 @@ class Configuration:
             setup.apply()
 
         # Configure stackup
-        if "stackup" in self.data:
-            self._load_stackup()
+        self.cfg_data.stackup.apply()
 
         # Configure S-parameter
         for s_parameter_model in self.cfg_data.s_parameters:
@@ -182,56 +178,44 @@ class Configuration:
         layers = data.get("layers")
 
         if layers:
-            lc = self._pedb.stackup
             input_signal_layers = [i for i in layers if i["type"].lower() == "signal"]
-            if not len(input_signal_layers) == len(lc.signal_layers):
+            if not len(input_signal_layers) == len(self._pedb.stackup.signal_layers):
                 self._pedb.logger.error("Input signal layer count do not match.")
                 return False
 
-            layer_clones = []
-            doc_layer_clones = []
-            for name, obj in lc.layers.items():
-                if obj.is_stackup_layer:
-                    if obj.type == "signal":  # keep signal layers
-                        layer_clones.append(obj)
-                else:
-                    doc_layer_clones.append(obj)
-
-            lc_new = LayerCollection(self._pedb)
-            lc_new.auto_refresh = False
-            signal_layer_ids = {}
-            top_layer_clone = None
-
-            # add all signal layers
+            removal_list = []
+            lc_signal_layers = []
+            for name, obj in self._pedb.stackup.all_layers.items():
+                if obj.type == "dielectric":
+                    removal_list.append(name)
+                elif obj.type == "signal":
+                    lc_signal_layers.append(obj.id)
+            for l in removal_list:
+                self._pedb.stackup.remove_layer(l)
+
+            # update all signal layers
+            id_name = {i[0]: i[1] for i in self._pedb.stackup.layers_by_id}
+            signal_idx = 0
             for l in layers:
                 if l["type"] == "signal":
-                    clone = layer_clones.pop(0)
-                    clone.update(**l)
-                    lc_new.add_layer_bottom(name=clone.name, layer_clone=clone)
-                    signal_layer_ids[clone.name] = clone.id
-
-            # add all document layers at bottom
-            for l in doc_layer_clones:
-                doc_layer = lc_new.add_document_layer(name=l.name, layer_clone=l)
-                first_doc_layer_name = doc_layer.name
+                    layer_id = lc_signal_layers[signal_idx]
+                    layer_name = id_name[layer_id]
+                    self._pedb.stackup.layers[layer_name].update(**l)
+                    signal_idx = signal_idx + 1
 
             # add all dielectric layers. Dielectric layers must be added last. Otherwise,
             # dielectric layer will occupy signal and document layer id.
             prev_layer_clone = None
             l = layers.pop(0)
             if l["type"] == "signal":
-                prev_layer_clone = lc_new.layers[l["name"]]
+                prev_layer_clone = self._pedb.stackup.layers[l["name"]]
             else:
-                prev_layer_clone = lc_new.add_layer_top(**l)
+                prev_layer_clone = self._pedb.stackup.add_layer_top(**l)
             for idx, l in enumerate(layers):
                 if l["type"] == "dielectric":
-                    prev_layer_clone = lc_new.add_layer_below(base_layer_name=prev_layer_clone.name, **l)
-                else:
-                    prev_layer_clone = lc_new.layers[l["name"]]
-
-            lc._edb_object = lc_new._edb_object
-            lc_new.auto_refresh = True
-            lc.update_layout()
+                    prev_layer_clone = self._pedb.stackup.add_layer_below(base_layer_name=prev_layer_clone.name, **l)
+                elif l["type"] == "signal":
+                    prev_layer_clone = self._pedb.stackup.layers[l["name"]]
 
     @pyedb_function_handler
     def _load_operations(self):

{pyedb-0.12.0 → pyedb-0.12.2}/src/pyedb/dotnet/edb.py

@@ -846,9 +846,7 @@ class Edb(Database):
         >>> edbapp.stackup.layers["TOP"].thickness == 4e-05
         >>> edbapp.stackup.add_layer("Diel", "GND", layer_type="dielectric", thickness="0.1mm", material="FR4_epoxy")
         """
-        if not self._stackup2 and self.active_db:
-            self._stackup2 = Stackup(self, self.layout.layer_collection)
-        return self._stackup2
+        return Stackup(self, self.layout.layer_collection)
 
     @property
     def materials(self):

{pyedb-0.12.0 → pyedb-0.12.2}/src/pyedb/dotnet/edb_core/edb_data/layer_data.py

@@ -257,8 +257,8 @@ class StackupLayerEdbClass(LayerEdbClass):
         self._lower_elevation = 0.0
 
     def _create(self, layer_type):
-        layer_type = self._layer_name_mapping[layer_type]
-        layer_type = self._layer_type_mapping[layer_type]
+        layer_type_edb_name = self._layer_name_mapping[layer_type]
+        layer_type = self._layer_type_mapping[layer_type_edb_name]
         self._edb_object = self._pedb.edb_api.cell._cell.StackupLayer(
             self._name,
             layer_type,