pyedb 0.28.0__tar.gz → 0.29.0__tar.gz

{pyedb-0.28.0 → pyedb-0.29.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyedb
-Version: 0.28.0
+Version: 0.29.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>
@@ -38,7 +38,7 @@ Requires-Dist: pypandoc>=1.10.0,<1.14 ; extra == "doc"
 Requires-Dist: recommonmark ; extra == "doc"
 Requires-Dist: Sphinx>=7.1.0,<8.1 ; extra == "doc"
 Requires-Dist: sphinx-autobuild==2021.3.14 ; extra == "doc" and ( python_version == '3.8')
-Requires-Dist: sphinx-autobuild==2024.2.4 ; extra == "doc" and ( python_version > '3.8')
+Requires-Dist: sphinx-autobuild==2024.9.19 ; extra == "doc" and ( python_version > '3.8')
 Requires-Dist: sphinx-copybutton>=0.5.0,<0.6 ; extra == "doc"
 Requires-Dist: sphinx-gallery>=0.14.0,<0.18 ; extra == "doc"
 Requires-Dist: sphinx_design>=0.4.0,<0.7 ; extra == "doc"

{pyedb-0.28.0 → pyedb-0.29.0}/pyproject.toml

@@ -61,7 +61,7 @@ doc = [
     "recommonmark",
     "Sphinx>=7.1.0,<8.1",
     "sphinx-autobuild==2021.3.14; python_version == '3.8'",
-    "sphinx-autobuild==2024.2.4; python_version > '3.8'",
+    "sphinx-autobuild==2024.9.19; python_version > '3.8'",
     "sphinx-copybutton>=0.5.0,<0.6",
     "sphinx-gallery>=0.14.0,<0.18",
     "sphinx_design>=0.4.0,<0.7",

{pyedb-0.28.0 → pyedb-0.29.0}/src/pyedb/__init__.py

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

pyedb-0.29.0/src/pyedb/configuration/cfg_boundaries.py

@@ -0,0 +1,95 @@
+# 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.configuration.cfg_common import CfgBase
+
+
+class CfgBoundaries(CfgBase):
+    def __init__(self, pedb, boundary_data):
+        self._pedb = pedb
+        self.open_region = boundary_data.get("open_region", None)
+        self.open_region_type = boundary_data.get("map_open_region_type", None)
+        self.pml_visible = boundary_data.get("pml_visible", None)
+        self.pml_operation_frequency = boundary_data.get("pml_operation_frequency", None)
+        self.pml_radiation_factor = boundary_data.get("pml_radiation_factor", None)
+        self.dielectric_extent_type = boundary_data.get("dielectric_extent_type", None)
+        # self.dielectric_base_polygon = self.**kwargs.get("dielectric_base_polygon", None)
+        self.horizontal_padding = boundary_data.get("horizontal_padding", None)
+        self.honor_primitives_on_dielectric_layers = boundary_data.get("honor_primitives_on_dielectric_layers", False)
+        self.air_box_extent_type = boundary_data.get("air_box_extent_type", None)
+        self.air_box_base_polygon = boundary_data.get("air_box_base_polygon", None)
+        self.air_box_truncate_model_ground_layers = boundary_data.get("air_box_truncate_model_ground_layers", None)
+        self.air_box_horizontal_padding = boundary_data.get("air_box_horizontal_padding", None)
+        self.air_box_positive_vertical_padding = boundary_data.get("air_box_positive_vertical_padding", None)
+        self.air_box_negative_vertical_padding = boundary_data.get("air_box_negative_vertical_padding", None)
+
+    def apply(self):
+        """Imports boundary information from JSON."""
+        if self.open_region is not None:
+            self._pedb.hfss.hfss_extent_info.use_open_region = self.open_region
+        if self.open_region_type:
+            self._pedb.hfss.hfss_extent_info.open_region_type = self.open_region_type.lower()
+        if self.pml_visible is not None:
+            self._pedb.hfss.hfss_extent_info.is_pml_visible = self.pml_visible
+        if self.pml_operation_frequency:
+            self._pedb.hfss.hfss_extent_info.operating_freq = self.pml_operation_frequency
+        if self.pml_radiation_factor:
+            self._pedb.hfss.hfss_extent_info.radiation_level = self.pml_radiation_factor
+        if self.dielectric_extent_type:
+            self._pedb.hfss.hfss_extent_info.extent_type = self.dielectric_extent_type.lower()
+        # if self.dielectric_base_polygon:
+        #    self._pedb.hfss.hfss_extent_info.dielectric_base_polygon = self.dielectric_base_polygon
+        if self.horizontal_padding:
+            self._pedb.hfss.hfss_extent_info.dielectric_extent_size = float(self.horizontal_padding)
+        if self.honor_primitives_on_dielectric_layers is not None:
+            self._pedb.hfss.hfss_extent_info.honor_user_dielectric = self.honor_primitives_on_dielectric_layers
+        if self.air_box_extent_type:
+            self._pedb.hfss.hfss_extent_info.extent_type = self.air_box_extent_type.lower()
+        if self.air_box_truncate_model_ground_layers is not None:
+            self._pedb.hfss.hfss_extent_info.truncate_air_box_at_ground = self.air_box_truncate_model_ground_layers
+        if self.air_box_horizontal_padding:
+            self._pedb.hfss.hfss_extent_info.air_box_horizontal_extent = float(self.air_box_horizontal_padding)
+        if self.air_box_positive_vertical_padding:
+            self._pedb.hfss.hfss_extent_info.air_box_positive_vertical_extent = float(
+                self.air_box_positive_vertical_padding
+            )
+        if self.air_box_negative_vertical_padding:
+            self._pedb.hfss.hfss_extent_info.air_box_negative_vertical_extent = float(
+                self.air_box_negative_vertical_padding
+            )
+
+    def get_data_from_db(self):
+        self.open_region = self._pedb.hfss.hfss_extent_info.use_open_region
+        self.open_region_type = self._pedb.hfss.hfss_extent_info.open_region_type
+        self.pml_visible = self._pedb.hfss.hfss_extent_info.is_pml_visible
+        self.pml_operation_frequency = self._pedb.hfss.hfss_extent_info.operating_freq.tostring
+        self.pml_radiation_factor = self._pedb.hfss.hfss_extent_info.radiation_level.tostring
+        self.dielectric_extent_type = self._pedb.hfss.hfss_extent_info.extent_type
+        # self.dielectric_base_polygon = self._pedb.hfss.hfss_extent_info.dielectric_base_polygon
+        self.horizontal_padding = self._pedb.hfss.hfss_extent_info.dielectric_extent_size
+        self.honor_primitives_on_dielectric_layers = self._pedb.hfss.hfss_extent_info.honor_user_dielectric
+        self.air_box_extent_type = self._pedb.hfss.hfss_extent_info.extent_type
+        self.air_box_truncate_model_ground_layers = self._pedb.hfss.hfss_extent_info.truncate_air_box_at_ground
+        self.air_box_horizontal_padding = self._pedb.hfss.hfss_extent_info.air_box_horizontal_extent
+        self.air_box_positive_vertical_padding = self._pedb.hfss.hfss_extent_info.air_box_positive_vertical_extent
+        self.air_box_negative_vertical_padding = self._pedb.hfss.hfss_extent_info.air_box_negative_vertical_extent
+        return self.get_attributes()

{pyedb-0.28.0 → pyedb-0.29.0}/src/pyedb/configuration/cfg_common.py

@@ -30,7 +30,7 @@ class CfgBase:
             exclude = exclude if isinstance(exclude, list) else [exclude]
             attrs = {i: j for i, j in attrs.items() if i not in exclude}
         attrs = {i: j for i, j in attrs.items() if not i.startswith("_")}
-        attrs = {i: j for i, j in attrs.items() if j is not None}
+        attrs = {i: j for i, j in attrs.items() if j not in [None, [], {}]}
         return attrs
 
     def set_attributes(self, pedb_object):

pyedb-0.29.0/src/pyedb/configuration/cfg_components.py

@@ -0,0 +1,101 @@
+# 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.configuration.cfg_common import CfgBase
+
+
+class CfgRlcModel(CfgBase):
+    def __init__(self, **kwargs):
+        self.resistance = kwargs.get("resistance", None)
+        self.inductance = kwargs.get("inductance", None)
+        self.capacitance = kwargs.get("capacitance", None)
+        self.type = kwargs.get("type", None)
+        self.p1 = kwargs.get("p1", None)
+        self.p2 = kwargs.get("p2", None)
+
+
+class CfgComponent(CfgBase):
+    def __init__(self, **kwargs):
+        self.enabled = kwargs.get("enabled", None)
+        self.reference_designator = kwargs.get("reference_designator", None)
+        self.definition = kwargs.get("definition", None)
+        self.type = kwargs["part_type"].lower() if kwargs.get("part_type") else None
+        self.port_properties = kwargs.get("port_properties", {})
+        self.solder_ball_properties = kwargs.get("solder_ball_properties", {})
+        self.ic_die_properties = kwargs.get("ic_die_properties", {})
+        self.pin_pair_model = kwargs.get("pin_pair_model", None)
+        self.spice_model = kwargs.get("spice_model", None)
+        self.s_parameter_model = kwargs.get("s_parameter_model", None)
+
+
+class CfgComponents:
+    def __init__(self, pedb, components_data):
+        self._pedb = pedb
+        self.components = [CfgComponent(**comp) for comp in components_data]
+
+    def apply(self):
+        comps_in_db = self._pedb.components.components
+        for comp in self.components:
+            c_db = comps_in_db[comp.reference_designator]
+            if comp.definition:
+                c_db.definition = comp.definition
+            if comp.type:
+                c_db.type = comp.type
+            if comp.solder_ball_properties:
+                c_db.solder_ball_properties = comp.solder_ball_properties
+            if comp.port_properties:
+                c_db.port_properties = comp.port_properties
+            if comp.ic_die_properties:
+                c_db.set_ic_die_properties = comp.ic_die_properties
+            if comp.pin_pair_model:
+                c_db.model_properties = {"pin_pair_model": comp.pin_pair_model}
+            if comp.spice_model:
+                c_db.model_properties = {"spice_model": comp.spice_model}
+            if comp.s_parameter_model:
+                c_db.model_properties = {"s_parameter_model": comp.s_parameter_model}
+
+    def _load_data_from_db(self):
+        self.components = []
+        comps_in_db = self._pedb.components
+        for _, comp in comps_in_db.instances.items():
+            cfg_comp = CfgComponent(
+                enabled=comp.enabled,
+                reference_designator=comp.name,
+                part_type=comp.type,
+                pin_pair_model=comp.model_properties.get("pin_pair_model"),
+                spice_model=comp.model_properties.get("spice_model"),
+                s_parameter_model=comp.model_properties.get("s_parameter_model"),
+                definition=comp.component_def,
+                location=comp.location,
+                placement_layer=comp.placement_layer,
+                solder_ball_properties=comp.solder_ball_properties,
+                ic_die_properties=comp.ic_die_properties,
+                port_properties=comp.port_properties,
+            )
+            self.components.append(cfg_comp)
+
+    def get_data_from_db(self):
+        self._load_data_from_db()
+        data = []
+        for comp in self.components:
+            data.append(comp.get_attributes())
+        return data

{pyedb-0.28.0 → pyedb-0.29.0}/src/pyedb/configuration/cfg_data.py

@@ -30,7 +30,7 @@ from pyedb.configuration.cfg_package_definition import CfgPackageDefinitions
 from pyedb.configuration.cfg_padstacks import CfgPadstacks
 from pyedb.configuration.cfg_pin_groups import CfgPinGroups
 from pyedb.configuration.cfg_ports_sources import CfgPorts, CfgSources
-from pyedb.configuration.cfg_s_parameter_models import CfgSParameterModel
+from pyedb.configuration.cfg_s_parameter_models import CfgSParameters
 from pyedb.configuration.cfg_setup import CfgSetups
 from pyedb.configuration.cfg_spice_models import CfgSpiceModel
 from pyedb.configuration.cfg_stackup import CfgStackup
@@ -43,9 +43,7 @@ class CfgData(object):
         self._pedb = pedb
         self.general = CfgGeneral(self, kwargs.get("general", None))
 
-        self.boundaries = {}
-        if kwargs.get("boundaries", None):
-            self.boundaries = CfgBoundaries(self, kwargs.get("boundaries", None))
+        self.boundaries = CfgBoundaries(self._pedb, kwargs.get("boundaries", {}))
 
         self.nets = CfgNets(
             self, kwargs.get("nets", {}).get("signal_nets", []), kwargs.get("nets", {}).get("power_ground_nets", [])
@@ -65,10 +63,7 @@ class CfgData(object):
 
         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.s_parameters = CfgSParameters(self._pedb, kwargs.get("s_parameters", []), self.general.s_parameter_library)
 
         self.spice_models = [
             CfgSpiceModel(self, self.general.spice_model_library, spice_model)

{pyedb-0.28.0 → pyedb-0.29.0}/src/pyedb/configuration/cfg_operations.py

@@ -53,18 +53,20 @@ class CfgCutout(CfgBase):
 
     def get_data_from_db(self):
         if "pyedb_cutout" in self._pedb.stackup.all_layers:
-            poly = self._pedb.layout.find_primitive(layer_name="pyedb_cutout")[0]
-            self.custom_extent = poly.polygon_data.points
+            polygons = self._pedb.layout.find_primitive(layer_name="pyedb_cutout")
+            if polygons:
+                poly = polygons[0]
+                self.custom_extent = poly.polygon_data.points
 
-            net_names = []
-            for name, obj in self._pedb.nets.nets.items():
-                if obj.primitives[0].layer.name == "pyedb_cutout":
-                    continue
-                if len(obj.primitives) > 0:
-                    net_names.append(name)
+                net_names = []
+                for name, obj in self._pedb.nets.nets.items():
+                    if obj.primitives[0].layer.name == "pyedb_cutout":
+                        continue
+                    if len(obj.primitives) > 0:
+                        net_names.append(name)
 
-            self.reference_list = []
-            self.signal_list = net_names
+                self.reference_list = []
+                self.signal_list = net_names
             return self.export_properties()
 
     def export_properties(self):
@@ -95,3 +97,5 @@ class CfgOperations(CfgBase):
         data_from_db = self.op_cutout.get_data_from_db()
         if data_from_db:
             return {"cutout": data_from_db}
+        else:
+            return {}

{pyedb-0.28.0 → pyedb-0.29.0}/src/pyedb/configuration/cfg_padstacks.py

@@ -20,9 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-
-from enum import Enum
-
 from pyedb.configuration.cfg_common import CfgBase
 
 
@@ -37,16 +34,25 @@ class CfgPadstacks:
             for pdef in padstack_dict.get("definitions", []):
                 self.definitions.append(Definition(**pdef))
             for inst in padstack_dict.get("instances", []):
-                self.instances.append(Instance(self._pedb, inst))
+                self.instances.append(Instance(**inst))
 
     def apply(self):
         """Apply padstack definition and instances on layout."""
-        padstack_defs_layout = self._pedb.padstacks.definitions
-        for pdef in self.definitions:
-            pdef_layout = padstack_defs_layout[pdef.name]
-            pdef_layout.set_properties(**pdef.get_attributes())
-        for instance in self.instances:
-            instance.apply()
+        if self.definitions:
+            padstack_defs_layout = self._pedb.padstacks.definitions
+            for pdef in self.definitions:
+                pdef_layout = padstack_defs_layout[pdef.name]
+                pdef_layout.set_properties(**pdef.get_attributes())
+        if self.instances:
+            instances_layout = self._pedb.padstacks.instances_by_name
+            for inst in self.instances:
+                inst_layout = instances_layout[inst.name]
+                if inst.definition:
+                    # inst_layout.padstack_definition = inst.definition
+                    # Not supported by EDB API
+                    pass
+                if inst.backdrill_parameters:
+                    inst_layout.backdrill_parameters = inst.backdrill_parameters
 
     def get_data_from_db(self):
         self.definitions = []
@@ -66,6 +72,16 @@ class CfgPadstacks:
         for i in self.definitions:
             definitions.append(i.get_attributes())
         data["definitions"] = definitions
+
+        instances_layout = self._pedb.padstacks.instances_by_name
+        for name, obj in instances_layout.items():
+            self.instances.append(
+                Instance(name=name, definition=obj.padstack_definition, backdrill_parameters=obj.backdrill_parameters)
+            )
+        instances = []
+        for i in self.instances:
+            instances.append(i.get_attributes())
+        data["instances"] = instances
         return data
 
 
@@ -81,56 +97,10 @@ class Definition(CfgBase):
         self.hole_parameters = kwargs.get("hole_parameters", None)
 
 
-class Instance:
+class Instance(CfgBase):
     """Instance data class."""
 
-    def __init__(self, pedb, instances_dict):
-        self._pedb = pedb
-        self._instances_dict = instances_dict
-        self.name = self._instances_dict.get("name", "")
-        self.backdrill_top = None
-        self.backdrill_bottom = None
-        self._update_backdrill()
-
-    def _update_backdrill(self):
-        if "backdrill_top" in self._instances_dict:
-            self.backdrill_top = self.BackDrill()
-            self.backdrill_top.type = self.backdrill_top.BackDrillType.TOP
-            backdrill_top_dict = self._instances_dict["backdrill_top"]
-            self.backdrill_top.drill_to_layer = backdrill_top_dict.get("drill_to_layer", "")
-            self.backdrill_top.drill_diameter = backdrill_top_dict.get("drill_diameter", "")
-            self.backdrill_top.stub_length = backdrill_top_dict.get("stub_length", "")
-        if "backdrill_bottom" in self._instances_dict:
-            self.backdrill_bottom = self.BackDrill()
-            backdrill_bottom_dict = self._instances_dict["backdrill_bottom"]
-            self.backdrill_bottom.drill_to_layer = backdrill_bottom_dict.get("drill_to_layer", "")
-            self.backdrill_bottom.drill_diameter = backdrill_bottom_dict.get("drill_diameter", "")
-            self.backdrill_bottom.stub_length = backdrill_bottom_dict.get("stub_length", "")
-
-    class BackDrill:
-        """Backdrill data class."""
-
-        def __init__(self):
-            self.type = self.BackDrillType.BOTTOM
-            self.drill_to_layer = ""
-            self.drill_diameter = ""
-            self.stub_length = ""
-
-        class BackDrillType(Enum):
-            TOP = 0
-            BOTTOM = 1
-
-    def apply(self):
-        """Apply padstack instance on layout."""
-        padstack_instances = self._pedb.padstacks.instances_by_name
-        inst = padstack_instances[self.name]
-        if self.backdrill_top:
-            inst.set_backdrill_top(
-                self.backdrill_top.drill_to_layer, self.backdrill_top.drill_diameter, self.backdrill_top.stub_length
-            )
-        if self.backdrill_bottom:
-            inst.set_backdrill_bottom(
-                self.backdrill_bottom.drill_to_layer,
-                self.backdrill_bottom.drill_diameter,
-                self.backdrill_bottom.stub_length,
-            )
+    def __init__(self, **kwargs):
+        self.name = kwargs["name"]
+        self.definition = kwargs.get("definition", None)
+        self.backdrill_parameters = kwargs.get("backdrill_parameters", None)

{pyedb-0.28.0 → pyedb-0.29.0}/src/pyedb/configuration/cfg_ports_sources.py

@@ -337,13 +337,15 @@ class CfgPort(CfgCircuitElement):
         return circuit_elements
 
     def export_properties(self):
-        return {
+        data = {
             "name": self.name,
             "type": self.type,
             "reference_designator": self.reference_designator,
             "positive_terminal": self.positive_terminal_info.export_properties(),
-            "negative_terminal": self.negative_terminal_info.export_properties(),
         }
+        if self.negative_terminal_info:
+            data.update({"negative_terminal": self.negative_terminal_info.export_properties()})
+        return data
 
 
 class CfgSource(CfgCircuitElement):

pyedb-0.29.0/src/pyedb/configuration/cfg_s_parameter_models.py

@@ -0,0 +1,116 @@
+# 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 pathlib import Path
+
+
+class CfgSParameterModel:
+    def __init__(self, **kwargs):
+        self.name = kwargs.get("name", "")
+        self.component_definition = kwargs.get("component_definition", "")
+        self.file_path = kwargs.get("file_path", "")
+        self.apply_to_all = kwargs.get("apply_to_all", False)
+        self.components = kwargs.get("components", [])
+        self.reference_net = kwargs.get("reference_net", "")
+        self.reference_net_per_component = kwargs.get("reference_net_per_component", {})
+        self.pin_order = kwargs.get("pin_order", None)
+
+
+class CfgSParameters:
+    def __init__(self, pedb, data, path_lib=None):
+        self._pedb = pedb
+        self.path_libraries = path_lib
+        self.s_parameters_models = [CfgSParameterModel(**i) for i in data]
+
+    def apply(self):
+        for s_param in self.s_parameters_models:
+            fpath = s_param.file_path
+            if not Path(fpath).anchor:
+                fpath = str(Path(self.path_libraries) / fpath)
+            comp_def = self._pedb.definitions.component[s_param.component_definition]
+            if s_param.pin_order:
+                comp_def.set_properties(pin_order=s_param.pin_order)
+            comp_def.add_n_port_model(fpath, s_param.name)
+            comp_list = dict()
+            if s_param.apply_to_all:
+                comp_list.update(
+                    {refdes: comp for refdes, comp in comp_def.components.items() if refdes not in s_param.components}
+                )
+            else:
+                comp_list.update(
+                    {refdes: comp for refdes, comp in comp_def.components.items() if refdes in s_param.components}
+                )
+
+            for refdes, comp in comp_list.items():
+                if refdes in s_param.reference_net_per_component:
+                    ref_net = s_param.reference_net_per_component[refdes]
+                else:
+                    ref_net = s_param.reference_net
+                comp.use_s_parameter_model(s_param.name, reference_net=ref_net)
+
+    def get_data_from_db(self):
+        db_comp_def = self._pedb.definitions.component
+        for name, compdef_obj in db_comp_def.items():
+            nport_models = compdef_obj.component_models
+            if not nport_models:
+                continue
+            else:
+                pin_order = compdef_obj.get_properties()["pin_order"]
+                temp_comps = compdef_obj.components
+                for model_name, model_obj in nport_models.items():
+                    temp_comp_list = []
+                    reference_net_per_component = {}
+                    for i in temp_comps.values():
+                        s_param_model = i.model_properties.get("s_parameter_model")
+                        if s_param_model:
+                            if s_param_model["model_name"] == model_name:
+                                temp_comp_list.append(i.refdes)
+                                reference_net_per_component[i.refdes] = s_param_model["reference_net"]
+                        else:
+                            continue
+
+                    self.s_parameters_models.append(
+                        CfgSParameterModel(
+                            name=model_name,
+                            component_definition=name,
+                            file_path=model_obj.reference_file,
+                            apply_to_all=False,
+                            components=temp_comp_list,
+                            reference_net_per_component=reference_net_per_component,
+                            pin_order=pin_order,
+                        )
+                    )
+
+        data = []
+        for i in self.s_parameters_models:
+            data.append(
+                {
+                    "name": i.name,
+                    "component_definition": i.component_definition,
+                    "file_path": i.file_path,
+                    "apply_to_all": i.apply_to_all,
+                    "components": i.components,
+                    "reference_net_per_component": i.reference_net_per_component,
+                    "pin_order": i.pin_order,
+                }
+            )
+        return data

{pyedb-0.28.0 → pyedb-0.29.0}/src/pyedb/configuration/configuration.py

@@ -117,10 +117,6 @@ class Configuration:
         # Configure components
         self.cfg_data.components.apply()
 
-        # Configure padstacks
-        if self.cfg_data.padstacks:
-            self.cfg_data.padstacks.apply()
-
         # Configure pin groups
         self.cfg_data.pin_groups.apply()
 
@@ -145,9 +141,12 @@ class Configuration:
         else:
             self.cfg_data.stackup.apply()
 
+        # Configure padstacks
+        if self.cfg_data.padstacks:
+            self.cfg_data.padstacks.apply()
+
         # Configure S-parameter
-        for s_parameter_model in self.cfg_data.s_parameters:
-            s_parameter_model.apply()
+        self.cfg_data.s_parameters.apply()
 
         # Configure SPICE models
         for spice_model in self.cfg_data.spice_models:
@@ -293,6 +292,10 @@ class Configuration:
             data["operations"] = self.cfg_data.operations.get_data_from_db()
         if kwargs.get("padstacks", False):
             data["padstacks"] = self.cfg_data.padstacks.get_data_from_db()
+        if kwargs.get("s_parameters", False):
+            data["s_parameters"] = self.cfg_data.s_parameters.get_data_from_db()
+        if kwargs.get("boundaries", False):
+            data["boundaries"] = self.cfg_data.boundaries.get_data_from_db()
 
         return data
 
@@ -307,6 +310,10 @@ class Configuration:
         nets=True,
         pin_groups=True,
         operations=True,
+        components=True,
+        boundaries=True,
+        s_parameters=True,
+        padstacks=True,
     ):
         """Export the configuration data from layout to a file.
 
@@ -330,22 +337,39 @@ class Configuration:
             Whether to export pin groups.
         operations : bool
             Whether to export operations.
+        components : bool
+            Whether to export component.
+        boundaries : bool
+            Whether to export boundaries.
+        s_parameters : bool
+            Whether to export s_parameters.
+        padstacks : bool
+            Whether to export padstacks.
         Returns
         -------
         bool
         """
-        file_path = file_path if isinstance(file_path, Path) else Path(file_path)
-        file_path = file_path if file_path.suffix == ".json" else file_path.with_suffix(".json")
         data = self.get_data_from_db(
             stackup=stackup,
             package_definitions=package_definitions,
-            setups=setups,
+            setups=False,
             sources=sources,
             ports=ports,
             nets=nets,
             pin_groups=pin_groups,
             operations=operations,
+            components=components,
+            boundaries=boundaries,
+            s_parameters=s_parameters,
+            padstacks=padstacks,
         )
+
+        file_path = file_path if isinstance(file_path, Path) else Path(file_path)
+        file_path = file_path.with_suffix(".json") if file_path.suffix == "" else file_path
+
         with open(file_path, "w") as f:
-            json.dump(data, f, ensure_ascii=False, indent=4)
+            if file_path.suffix == ".json":
+                json.dump(data, f, ensure_ascii=False, indent=4)
+            else:
+                toml.dump(data, f)
         return True if os.path.isfile(file_path) else False