Merge branch 'main' into test-doc-grpc

svandenb-dev · web-flow · commit 22f49c8432e6 · 2025-06-30T13:15:07.000+02:00
diff --git a/src/pyedb/__init__.py b/src/pyedb/__init__.py
@@ -44,7 +44,7 @@ def custom_show_warning(message, category, filename, lineno, file=None, line=Non
 #
 
 pyedb_path = os.path.dirname(__file__)
-__version__ = "0.50.dev0"
+__version__ = "0.51.dev0"
 version = __version__
 
 #
diff --git a/src/pyedb/configuration/cfg_ports_sources.py b/src/pyedb/configuration/cfg_ports_sources.py
diff --git a/src/pyedb/configuration/configuration.py b/src/pyedb/configuration/configuration.py
diff --git a/src/pyedb/dotnet/clr_module.py b/src/pyedb/dotnet/clr_module.py
@@ -38,6 +38,7 @@ def custom_show_warning(message, category, filename, lineno, file=None, line=Non
 
     dotnet_root = None
     runtime_config = None
+    runtime_spec = None
     # Use system .NET core runtime or fall back to dotnetcore2
     if os.environ.get("DOTNET_ROOT") is None:
         try:
@@ -78,11 +79,16 @@ def custom_show_warning(message, category, filename, lineno, file=None, line=Non
                     "Please ensure that .NET SDK is correctly installed or "
                     "that DOTNET_ROOT is correctly set."
                 )
-            runtime_config = candidates[0]
+            runtime_spec = candidates[0]
     # Use specific .NET core runtime
-    if dotnet_root is not None and runtime_config is not None:
+    if dotnet_root is not None and (runtime_config is not None or runtime_spec is not None):
         try:
-            load("coreclr", runtime_config=str(runtime_config), dotnet_root=str(dotnet_root))
+            load(
+                "coreclr",
+                runtime_config=str(runtime_config) if runtime_config else None,
+                runtime_spec=runtime_spec,
+                dotnet_root=str(dotnet_root),
+            )
             os.environ["DOTNET_ROOT"] = dotnet_root.as_posix()
             if "mono" not in os.getenv("LD_LIBRARY_PATH", ""):
                 warnings.warn("LD_LIBRARY_PATH needs to be setup to use pyedb.")
diff --git a/src/pyedb/dotnet/database/cell/layout.py b/src/pyedb/dotnet/database/cell/layout.py
@@ -80,6 +80,7 @@ def primitive_cast(pedb, edb_object):
 class Layout(ObjBase):
     def __init__(self, pedb, edb_object):
         super().__init__(pedb, edb_object)
+        self._primitives = []
 
     @property
     def cell(self):
@@ -230,7 +231,15 @@ def primitives(self):
         -------
         list of :class:`dotnet.database.dotnet.primitive.PrimitiveDotNet` cast objects.
         """
-        return [primitive_cast(self._pedb, p) for p in self._edb_object.Primitives if p]
+        primitives = list(self._edb_object.Primitives)
+        if len(primitives) != len(self._primitives):
+            self._primitives = [primitive_cast(self._pedb, p) for p in primitives]
+        return self._primitives
+
+    @property
+    def primitives_by_aedt_name(self) -> dict:
+        """Primitives."""
+        return {i.aedt_name: i for i in self.primitives}
 
     @property
     def bondwires(self):
diff --git a/src/pyedb/dotnet/database/dotnet/database.py b/src/pyedb/dotnet/database/dotnet/database.py
@@ -27,7 +27,6 @@
 
 from pyedb import __version__
 from pyedb.dotnet.database.general import convert_py_list_to_net_list
-from pyedb.edb_logger import pyedb_logger
 from pyedb.generic.general_methods import (
     env_path,
     env_path_student,
@@ -704,7 +703,6 @@ class EdbDotNet(object):
     """Edb Dot Net Class."""
 
     def __init__(self, edbversion, student_version=False):
-        self._logger = pyedb_logger
         if not edbversion:  # pragma: no cover
             try:
                 edbversion = "20{}.{}".format(list_installed_ansysem()[0][-3:-1], list_installed_ansysem()[0][-1:])
diff --git a/src/pyedb/dotnet/database/edb_data/padstacks_data.py b/src/pyedb/dotnet/database/edb_data/padstacks_data.py
@@ -1807,8 +1807,14 @@ def aedt_name(self):
 
         val = String("")
         _, name = self._edb_padstackinstance.GetProductProperty(self._pedb.edb_api.ProductId.Designer, 11, val)
-        name = str(name).strip("'")
-        return name
+        aedt_name = str(name).strip("'")
+        if aedt_name == "":
+            if self.is_pin and self.component:
+                aedt_name = f"{self.component.name}-{self.component_pin}"
+            elif self.component_pin:
+                aedt_name = self.component_pin
+            self.aedt_name = aedt_name
+        return aedt_name
 
     @aedt_name.setter
     def aedt_name(self, value):
diff --git a/src/pyedb/dotnet/database/layout_validation.py b/src/pyedb/dotnet/database/layout_validation.py
@@ -22,7 +22,6 @@
 
 import re
 
-from pyedb.dotnet.clr_module import String
 from pyedb.dotnet.database.edb_data.padstacks_data import EDBPadstackInstance
 from pyedb.dotnet.database.edb_data.primitives_data import Primitive
 from pyedb.generic.general_methods import generate_unique_name
@@ -304,38 +303,33 @@ def illegal_net_names(self, fix=False):
 
     def illegal_rlc_values(self, fix=False):
         """Find and fix RLC illegal values."""
-        inductors = self._pedb.components.inductors
 
-        temp = []
-        for k, v in inductors.items():
-            componentProperty = v.edbcomponent.GetComponentProperty()
-            model = componentProperty.GetModel().Clone()
-            pinpairs = model.PinPairs
-
-            if not len(list(pinpairs)):  # pragma: no cover
-                temp.append(k)
-                if fix:
-                    v.rlc_values = [0, 1, 0]
-
-        self._pedb._logger.info("Found {} inductors have no value.".format(len(temp)))
+        for name, objs in {
+            "inductors": self._pedb.components.inductors,
+            "resistors": self._pedb.components.resistors,
+            "capacitors": self._pedb.components.capacitors,
+        }.items():
+            temp = []
+            for k, v in objs.items():
+                componentProperty = v.edbcomponent.GetComponentProperty()
+                model = componentProperty.GetModel().Clone()
+                pinpairs = model.PinPairs
+
+                if not len(list(pinpairs)):  # pragma: no cover
+                    temp.append(k)
+                    if fix:
+                        v.rlc_values = [0, 1, 0]
+
+            self._pedb._logger.info(f"Found {len(temp)} {name} have no value.")
         return
 
     def padstacks_no_name(self, fix=False):
+        """Find and fix padstacks without aedt_name."""
         pds = self._pedb.layout.padstack_instances
         counts = 0
-        via_count = 1
         for obj in pds:
-            val = String("")
-            _, name = obj._edb_object.GetProductProperty(self._pedb.edb_api.ProductId.Designer, 11, val)
-            name = str(name).strip("'")
-            if name == "":
+            if obj.aedt_name == "":
                 counts += 1
                 if fix:
-                    if not obj.component:
-                        obj._edb_object.SetProductProperty(self._pedb.edb_api.ProductId.Designer, 11, f"Via{via_count}")
-                        via_count = via_count + 1
-                    else:
-                        obj._edb_object.SetProductProperty(
-                            self._pedb.edb_api.ProductId.Designer, 11, f"{obj.component.name}-{obj.component_pin}"
-                        )
+                    obj.aedt_name = f"via_{obj.id}"
         self._pedb._logger.info(f"Found {counts}/{len(pds)} padstacks have no name.")
diff --git a/src/pyedb/dotnet/database/modeler.py b/src/pyedb/dotnet/database/modeler.py
@@ -67,7 +67,6 @@ def __getitem__(self, name):
 
     def __init__(self, p_edb):
         self._pedb = p_edb
-        self._primitives = []
 
     @property
     def _edb(self):
diff --git a/src/pyedb/dotnet/database/stackup.py b/src/pyedb/dotnet/database/stackup.py
@@ -2234,7 +2234,7 @@ def _add_materials_from_dictionary(self, material_dict):
                     material.loss_tanget = material_properties["DielectricLossTangent"]
         return True
 
-    def _import_xml(self, file_path, rename=False):
+    def _import_xml(self, file_path):
         """Read external xml file and convert into json file.
         You can use xml file to import layer stackup but using json file is recommended.
         see :class:`pyedb.dotnet.database.edb_data.simulation_configuration.SimulationConfiguration´ class to
@@ -2304,7 +2304,8 @@ def _import_xml(self, file_path, rename=False):
                 layers.append(layer)
             stackup_dict["layers"] = layers
         cfg = {"stackup": stackup_dict}
-        return self._pedb.configuration.load(cfg, apply_file=True)
+        self._pedb.configuration.load(cfg)
+        return self._pedb.configuration.run()
 
     def _export_xml(self, file_path):
         """Export stackup information to an external XMLfile.
@@ -2391,7 +2392,7 @@ def load(self, file_path, rename=False):
         elif file_path.endswith(".json"):
             return self._import_json(file_path, rename=rename)
         elif file_path.endswith(".xml"):
-            return self._import_xml(file_path, rename=rename)
+            return self._import_xml(file_path)
         else:
             return False
 
diff --git a/src/pyedb/dotnet/edb.py b/src/pyedb/dotnet/edb.py
@@ -25,6 +25,7 @@
 This module is implicitly loaded in HFSS 3D Layout when launched.
 
 """
+from datetime import datetime
 from itertools import combinations
 import os
 from pathlib import Path
@@ -91,6 +92,7 @@
     SiwaveDCSimulationSetup,
     SiwaveSimulationSetup,
 )
+from pyedb.edb_logger import pyedb_logger
 from pyedb.generic.constants import AEDT_UNITS, SolverType, unit_converter
 from pyedb.generic.general_methods import (
     generate_unique_name,
@@ -195,6 +197,10 @@ def __init__(
         layer_filter: str = None,
         remove_existing_aedt: bool = False,
     ):
+        self._logger = pyedb_logger
+        now = datetime.now()
+        self.logger.info(f"Star initializing Edb {now.time()}")
+
         if isinstance(edbpath, Path):
             edbpath = str(edbpath)
 
@@ -290,7 +296,7 @@ def __init__(
                 self._logger.add_file_logger(self.log_name, "Edb")
             self.open_edb()
         if self.active_cell:
-            self.logger.info("EDB initialized.")
+            self.logger.info(f"EDB initialized.Time lapse {datetime.now() - now}")
         else:
             raise AttributeError("Failed to initialize DLLs.")
 
@@ -1232,7 +1238,7 @@ def modeler(self):
         return self._core_primitives
 
     @property
-    def layout(self):
+    def layout(self) -> Layout:
         """Layout object.
 
         Returns
diff --git a/src/pyedb/grpc/database/definition/materials.py b/src/pyedb/grpc/database/definition/materials.py
@@ -228,14 +228,14 @@ def dc_permittivity(self):
 
         """
         try:
-            return self.dielectric_material_model.dc_relative_permitivity
+            return self.dielectric_material_model.dc_relative_permittivity
         except:
             return None
 
     @dc_permittivity.setter
     def dc_permittivity(self, value):
         if self.dielectric_material_model:
-            self.dielectric_material_model.dc_relative_permitivity = float(value)
+            self.dielectric_material_model.dc_relative_permittivity = float(value)
 
     @property
     def loss_tangent_at_frequency(self) -> float:
@@ -289,14 +289,14 @@ def permittivity_at_frequency(self) -> float:
 
         """
         try:
-            return self.dielectric_material_model.relative_permitivity_at_frequency
+            return self.dielectric_material_model.relative_permittivity_at_frequency
         except:
             return None
 
     @permittivity_at_frequency.setter
     def permittivity_at_frequency(self, value):
         if self.dielectric_material_model:
-            self.dielectric_material_model.relative_permitivity_at_frequency = float(value)
+            self.dielectric_material_model.relative_permittivity_at_frequency = float(value)
 
     @property
     def permittivity(self) -> float:
@@ -771,14 +771,14 @@ def add_djordjevicsarkar_dielectric(
             raise ValueError(f"Material names are case-insensitive and {name.lower()} already exists.")
 
         material_model = GrpcDjordjecvicSarkarModel.create()
-        material_model.relative_permitivity_at_frequency = permittivity_at_frequency
+        material_model.relative_permittivity_at_frequency = permittivity_at_frequency
         material_model.loss_tangent_at_frequency = loss_tangent_at_frequency
         material_model.frequency = dielectric_model_frequency
         if dc_conductivity is not None:
             material_model.dc_conductivity = dc_conductivity
             material_model.use_dc_relative_conductivity = True
         if dc_permittivity is not None:
-            material_model.dc_relative_permitivity = dc_permittivity
+            material_model.dc_relative_permittivity = dc_permittivity
         try:
             material = self.__add_dielectric_material_model(name, material_model)
             for key, value in kwargs.items():
@@ -841,7 +841,7 @@ def add_debye_material(
         material_model = GrpcDebyeModel.create()
         material_model.frequency_range = (lower_freqency, higher_frequency)
         material_model.loss_tangent_at_high_low_frequency = (loss_tangent_low, loss_tangent_high)
-        material_model.relative_permitivity_at_high_low_frequency = (permittivity_low, permittivity_high)
+        material_model.relative_permittivity_at_high_low_frequency = (permittivity_low, permittivity_high)
         try:
             material = self.__add_dielectric_material_model(name, material_model)
             for key, value in kwargs.items():
diff --git a/src/pyedb/grpc/edb_init.py b/src/pyedb/grpc/edb_init.py
@@ -302,7 +302,10 @@ def save_as(self, path, version=""):
         version : str
             EDB version to save to. Empty string means current version.
         """
-        return self._db.save_as(path, version)
+        self._db.save_as(path, version)
+        if os.path.exists(path):
+            return True
+        return False
 
     @property
     def directory(self):
diff --git a/tests/example_models/TEDB/ANSYS_SVP_V1_1.aedb/edb.def b/tests/example_models/TEDB/ANSYS_SVP_V1_1.aedb/edb.def
diff --git a/tests/grpc/system/test_edb_materials.py b/tests/grpc/system/test_edb_materials.py
@@ -163,7 +163,7 @@ def test_material_update_properties(self):
         # Dielectric model defined changing conductivity is not allowed
         assert material.conductivity == 0.0044504017896274855
         assert material.dc_conductivity == 1e-12
-        assert material.dielectric_material_model.dc_relative_permitivity == 5.0
+        assert material.dielectric_material_model.dc_relative_permittivity == 5.0
         assert material.dielectric_material_model.loss_tangent_at_frequency == 0.02
         assert material.loss_tangent_at_frequency == 0.02
         assert material.mass_density == 13.0
diff --git a/tests/grpc/system/test_edb_stackup.py b/tests/grpc/system/test_edb_stackup.py
@@ -800,8 +800,8 @@ def test_stackup_place_on_top_of_lam_with_mold_solder(self):
                 assert cellInstance.Is3DPlacement()
             if chipEdb.grpc:
                 transform = cellInstance.transform3d
-                assert transform.matrix[3][:3] == [0, 0, 0.00016]
-                assert transform.shift.magnitude == 0.00016
+                assert transform.matrix[3][:3] == [0, 0, 0.00019]
+                assert transform.shift.magnitude == 0.00019
             else:
                 if desktop_version > "2023.1":
                     (
@@ -891,8 +891,8 @@ def test_stackup_place_on_bottom_of_lam_with_mold_solder(self):
                 assert cellInstance.Is3DPlacement()
             if chipEdb.grpc:
                 transform = cellInstance.transform3d
-                assert [round(val, 6) for val in transform.matrix[3][:3]] == [0.0, 0.0, 1e-05]
-                assert round(transform.shift.magnitude, 6) == 1e-5
+                assert [round(val, 6) for val in transform.matrix[3][:3]] == [0.0, 0.0, -2e-05]
+                assert round(transform.shift.magnitude, 6) == 2e-5
             else:
                 if desktop_version > "2023.1":
                     (
@@ -1159,8 +1159,8 @@ def test_stackup_place_on_top_with_zoffset_solder_chip(self):
                 assert cellInstance.Is3DPlacement()
             if chipEdb.grpc:
                 transform = cellInstance.transform3d
-                assert [round(val, 6) for val in transform.matrix[3][:3]] == [0.0, 0.0, 5e-05]
-                assert round(transform.shift.magnitude, 6) == 5e-5
+                assert [round(val, 6) for val in transform.matrix[3][:3]] == [0.0, 0.0, 2e-05]
+                assert round(transform.shift.magnitude, 6) == 2e-5
             else:
                 if desktop_version > "2023.1":
                     (
@@ -1247,8 +1247,8 @@ def test_stackup_place_on_bottom_with_zoffset_solder_chip(self):
                 assert cellInstance.Is3DPlacement()
             if chipEdb.grpc:
                 transform = cellInstance.transform3d
-                assert [round(val, 6) for val in transform.matrix[3][:3]] == [0.0, 0.0, 5e-05]
-                assert round(transform.shift.magnitude, 6) == 5e-5
+                assert [round(val, 6) for val in transform.matrix[3][:3]] == [0.0, 0.0, 2e-05]
+                assert round(transform.shift.magnitude, 6) == 2e-5
             else:
                 if desktop_version > "2023.1":
                     (
diff --git a/tests/legacy/system/test_edb_padstacks.py b/tests/legacy/system/test_edb_padstacks.py
@@ -182,14 +182,15 @@ def test_padstack_properties_setter(self):
         pad.pad_by_layer[pad.via_stop_layer].parameters = {"XSize": 1, "YSize": 1, "CornerRadius": 1}
         pad.pad_by_layer[pad.via_stop_layer].parameters = [1, 1, 1]
 
-    def test_padstack_get_instance(self):
-        assert self.edbapp.padstacks.get_instances(name="Via1961")
-        assert self.edbapp.padstacks.get_instances(definition_name="v35h15")
-        assert self.edbapp.padstacks.get_instances(net_name="1V0")
-        assert self.edbapp.padstacks.get_instances(component_reference_designator="U7")
+    def test_padstack_get_instance(self, edb_examples):
+        edbapp = edb_examples.get_si_verse(source_file_path="TEDB/ANSYS_SVP_V1_1.aedb")
+        assert edbapp.padstacks.get_instances(name="Via1961")
+        assert edbapp.padstacks.get_instances(definition_name="v35h15")
+        assert edbapp.padstacks.get_instances(net_name="1V0")
+        assert edbapp.padstacks.get_instances(component_reference_designator="U7")
 
         """Access padstack instance by name."""
-        padstack_instances = self.edbapp.padstacks.get_padstack_instance_by_net_name("GND")
+        padstack_instances = edbapp.padstacks.get_padstack_instance_by_net_name("GND")
         assert len(padstack_instances)
         padstack_1 = padstack_instances[0]
         assert padstack_1.id
@@ -199,6 +200,7 @@ def test_padstack_get_instance(self):
                 v.name = "TestInst"
                 assert v.name == "TestInst"
                 break
+        edbapp.close()
 
     def test_padstack_duplicate_padstack(self):
         """Duplicate a padstack."""

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ def custom_show_warning(message, category, filename, lineno, file=None, line=Non`
`44`	`44`	`#`
`45`	`45`
`46`	`46`	`pyedb_path = os.path.dirname(__file__)`
`47`		`-__version__ = "0.50.dev0"`
	`47`	`+__version__ = "0.51.dev0"`
`48`	`48`	`version = __version__`
`49`	`49`
`50`	`50`	`#`