pyedb 0.25.0__py3-none-any.whl → 0.26.0__py3-none-any.whl

pyedb/__init__.py

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

pyedb/dotnet/edb_core/cell/primitive/primitive.py

@@ -113,8 +113,11 @@ class Primitive(Connectable):
     @property
     def layer(self):
         """Get the primitive edb layer object."""
-        layer_name = self._edb_object.GetLayer().GetName()
-        return self._pedb.stackup.all_layers[layer_name]
+        obj = self._edb_object.GetLayer()
+        if obj.IsNull():
+            return None
+        else:
+            return self._pedb.stackup.find_layer_by_name(obj.GetName())
 
     @property
     def layer_name(self):

pyedb/dotnet/edb_core/cell/terminal/padstack_instance_terminal.py

@@ -84,8 +84,13 @@ class PadstackInstanceTerminal(Terminal):
             isRef=is_ref,
         )
         terminal = PadstackInstanceTerminal(self._pedb, terminal)
-
-        return terminal if not terminal.is_null else False
+        if terminal.is_null:
+            msg = f"Failed to create terminal. "
+            if name in self._pedb.terminals:
+                msg += f"Terminal {name} already exists."
+            raise Exception(msg)
+        else:
+            return terminal
 
     def _get_parameters(self):
         """Gets the parameters of the padstack instance terminal."""

pyedb/dotnet/edb_core/cell/terminal/pingroup_terminal.py

@@ -56,7 +56,13 @@ class PinGroupTerminal(Terminal):
             is_ref,
         )
         term = PinGroupTerminal(self._pedb, term)
-        return term if not term.is_null else False
+        if term.is_null:
+            msg = f"Failed to create terminal. "
+            if name in self._pedb.terminals:
+                msg += f"Terminal {name} already exists."
+            raise Exception(msg)
+        else:
+            return term
 
     def pin_group(self):
         """Gets the pin group the terminal refers to."""

pyedb/dotnet/edb_core/cell/terminal/point_terminal.py

@@ -59,4 +59,10 @@ class PointTerminal(Terminal):
             is_ref,
         )
         terminal = PointTerminal(self._pedb, terminal)
-        return terminal if not terminal.is_null else False
+        if terminal.is_null:
+            msg = f"Failed to create terminal. "
+            if name in self._pedb.terminals:
+                msg += f"Terminal {name} already exists."
+            raise Exception(msg)
+        else:
+            return terminal

pyedb/dotnet/edb_core/edb_data/layer_data.py

@@ -23,6 +23,13 @@
 from __future__ import absolute_import
 
 
+def layer_cast(pedb, edb_object):
+    if edb_object.IsStackupLayer():
+        return StackupLayerEdbClass(pedb, edb_object.Clone(), name=edb_object.GetName())
+    else:
+        return LayerEdbClass(pedb, edb_object.Clone(), name=edb_object.GetName())
+
+
 class LayerEdbClass(object):
     """Manages Edb Layers. Replaces EDBLayer."""
 

pyedb/dotnet/edb_core/stackup.py

@@ -36,6 +36,7 @@ import warnings
 from pyedb.dotnet.edb_core.edb_data.layer_data import (
     LayerEdbClass,
     StackupLayerEdbClass,
+    layer_cast,
 )
 from pyedb.dotnet.edb_core.general import convert_py_list_to_net_list
 from pyedb.generic.general_methods import ET, generate_unique_name
@@ -284,10 +285,7 @@ class LayerCollection(object):
         layer_list = list(self._edb_object.Layers(self._pedb.edb_api.cell.layer_type_set.AllLayerSet))
         temp = dict()
         for i in layer_list:
-            if i.IsStackupLayer():
-                obj = StackupLayerEdbClass(self._pedb, i.Clone(), name=i.GetName())
-            else:
-                obj = LayerEdbClass(self._pedb, i.Clone(), name=i.GetName())
+            obj = layer_cast(self._pedb, i)
             temp[obj.name] = obj
         return temp
 
@@ -306,12 +304,20 @@ class LayerCollection(object):
         """
         return {name: obj for name, obj in self.all_layers.items() if obj.is_stackup_layer}
 
+    def find_layer_by_name(self, name: str):
+        """Finds a layer with the given name."""
+        obj = self._pedb.edb_api.cell._cell.Layer.FindByName(self._edb_object, name)
+        if obj.IsNull():
+            raise ValueError("Layer with name '{}' was not found.".format(name))
+        else:
+            return layer_cast(self._pedb, obj.Clone())
+
 
 class Stackup(LayerCollection):
     """Manages EDB methods for stackup accessible from `Edb.stackup` property."""
 
     def __getitem__(self, item):
-        return self.all_layers[item]
+        return self.find_layer_by_name(item)
 
     def __init__(self, pedb, edb_object=None):
         super().__init__(pedb, edb_object)
@@ -1800,7 +1806,7 @@ class Stackup(LayerCollection):
         temp_data = {name: 0 for name, _ in self.signal_layers.items()}
         outline_area = 0
         for i in self._pedb.modeler.primitives:
-            layer_name = i.layer.name
+            layer_name = i._edb_object.GetLayer().GetName()
             if layer_name.lower() == "outline":
                 if i.area() > outline_area:
                     outline_area = i.area()

pyedb/siwave.py

@@ -266,6 +266,16 @@ class Siwave(object):  # pragma no cover
         else:
             return False
 
+    @property
+    def file_dir(self) -> str:
+        """Directory path of the open project."""
+        return self.oproject.GetFileDir()
+
+    @property
+    def file_path(self) -> str:
+        """Path of the open project file."""
+        return self.oproject.GetFilePath()
+
     def save_project(self, projectpath=None, projectName=None):
         """Save the project.
 
@@ -283,7 +293,9 @@ class Siwave(object):  # pragma no cover
 
         """
         if projectName and projectpath:
-            self.oproject.ScrSaveProjectAs(os.path.join(projectpath, projectName + ".siw"))
+            if not projectName.endswith(".siw"):
+                projectName = projectName + ".siw"
+            self.oproject.ScrSaveProjectAs(os.path.join(projectpath, projectName))
         else:
             self.oproject.Save()
         return True
@@ -476,6 +488,7 @@ class Siwave(object):  # pragma no cover
         if isinstance(file_path, Path):
             file_path = str(file_path)
         flag = self.oproject.ScrImportEDB(file_path)
+        # self.save_project(self.di)
         if flag == 0:
             self._logger.info(f"Importing EDB to {file_path}.")
             return True
@@ -493,11 +506,12 @@ class Siwave(object):  # pragma no cover
         if isinstance(file_path, Path):
             file_path = str(file_path)
 
-        temp_folder = tempfile.TemporaryDirectory(suffix=".ansys")
-        temp_edb = os.path.join(temp_folder.name, "temp.aedb")
+        # temp_folder = tempfile.TemporaryDirectory(suffix=".ansys")
+        # temp_edb = os.path.join(temp_folder.name, "temp.aedb")
+
+        temp_edb = os.path.join(self.file_dir, "temp.aedb")
 
         self.export_edb(temp_edb)
-        self.save_project()
         self.oproject.ScrCloseProject()
         edbapp = Edb(temp_edb, edbversion=self.current_version)
         edbapp.configuration.load(file_path)

{pyedb-0.25.0.dist-info → pyedb-0.26.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyedb
-Version: 0.25.0
+Version: 0.26.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>
@@ -15,7 +15,7 @@ Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
-Requires-Dist: cffi>=1.16.0,<1.17; platform_system=='Linux'
+Requires-Dist: cffi>=1.16.0,<1.18; platform_system=='Linux'
 Requires-Dist: pywin32 >= 303;platform_system=='Windows'
 Requires-Dist: ansys-pythonnet >= 3.1.0rc3
 Requires-Dist: dotnetcore2 ==3.1.23;platform_system=='Linux'
@@ -26,14 +26,14 @@ Requires-Dist: Rtree >= 1.2.0
 Requires-Dist: toml == 0.10.2
 Requires-Dist: scikit-rf
 Requires-Dist: ansys-sphinx-theme>=0.10.0,<1.1 ; extra == "doc"
-Requires-Dist: imageio>=2.30.0,<2.35 ; extra == "doc"
+Requires-Dist: imageio>=2.30.0,<2.36 ; extra == "doc"
 Requires-Dist: ipython>=8.13.0,<8.27 ; extra == "doc"
 Requires-Dist: jupyterlab>=4.0.0,<4.3 ; extra == "doc"
 Requires-Dist: jupytext>=1.16.0,<1.17 ; extra == "doc"
 Requires-Dist: matplotlib>=3.5.0,<3.10 ; extra == "doc"
 Requires-Dist: nbsphinx>=0.9.0,<0.10 ; extra == "doc"
 Requires-Dist: nbconvert < 7.17 ; extra == "doc"
-Requires-Dist: numpydoc>=1.5.0,<1.8 ; extra == "doc"
+Requires-Dist: numpydoc>=1.5.0,<1.9 ; extra == "doc"
 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"

{pyedb-0.25.0.dist-info → pyedb-0.26.0.dist-info}/RECORD

@@ -1,7 +1,7 @@
-pyedb/__init__.py,sha256=rAP6JWOARv5TMG_5-3c-fqSFE0ILez9LAXKyut2zeSc,1521
+pyedb/__init__.py,sha256=LPbrtRXIz0vH59E8iYey-OmAoq8r4GQp4vPaU_f2o3w,1521
 pyedb/edb_logger.py,sha256=yNkXnoL2me7ubLT6O6r6ElVnkZ1g8fmfFYC_2XJZ1Sw,14950
 pyedb/exceptions.py,sha256=n94xluzUks6BA24vd_L6HkrvoP_H_l6__hQmqzdCyPo,111
-pyedb/siwave.py,sha256=Mo-8ETIwTbPNbqfaDJkbl_G3Dp8mdtYFl54Ms9sGAZo,16004
+pyedb/siwave.py,sha256=mH3wJ2e-lvAgNjAFRIkLTZ7mUjz7Gp_jm4z-QN66M88,16442
 pyedb/workflow.py,sha256=Y0ya4FUHwlSmoLP45zjdYLsSpyKduHUSpT9GGK9MGd8,814
 pyedb/component_libraries/ansys_components.py,sha256=O3ypt832IHY9zG2AD_yrRrbH2KH9P1yFaoi1EO6Zllw,4830
 pyedb/configuration/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -38,7 +38,7 @@ pyedb/dotnet/edb_core/net_class.py,sha256=4U6Cc1Gn7ZJ_ub9uKmtrsoz5wD1XS42afci3Y3
 pyedb/dotnet/edb_core/nets.py,sha256=JZvrlPOKiRjbHAX6GkrYKvaXujHS3lz-rucS0Ib8ezk,43213
 pyedb/dotnet/edb_core/padstack.py,sha256=al5cXfnJXyaM6-KCAd8D8-TZzcIXHwco8grD44U7gNY,63588
 pyedb/dotnet/edb_core/siwave.py,sha256=4duoAsFCuPMNLxtMTEEVJCUaHKNkdbLDmtTXiD93VrM,64311
-pyedb/dotnet/edb_core/stackup.py,sha256=_jvmLHpo5_4CM8V_xnB81WQrqJGsEHs3eECS8Y-buaQ,119804
+pyedb/dotnet/edb_core/stackup.py,sha256=b56leXg7X7dEVPP2DUD9n8LZIakWcjIsjiqqkIWsyZU,120035
 pyedb/dotnet/edb_core/cell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyedb/dotnet/edb_core/cell/connectable.py,sha256=rKWPATg0GCHi4d1ftu2V7WWhkDONjloCSPujssie5a8,2310
 pyedb/dotnet/edb_core/cell/layout.py,sha256=u3HEdKc7rls3gkm7m31-XGi6l3pfoHEAswTVCz4FSmY,12619
@@ -55,13 +55,13 @@ pyedb/dotnet/edb_core/cell/hierarchy/spice_model.py,sha256=SGiUcan2l0n8DGk3GtwCs
 pyedb/dotnet/edb_core/cell/primitive/__init__.py,sha256=8jByHkoaowAYQTCww-zRrTQmN061fLz_OHjTLSrzQQY,58
 pyedb/dotnet/edb_core/cell/primitive/bondwire.py,sha256=fqIMdv0bNvk591DG6De5c--w9Rpkl5AOeo_qgzoPE6M,7322
 pyedb/dotnet/edb_core/cell/primitive/path.py,sha256=XVN7dOVpccoBP28M8l5iMzK5QSQdHqpKqC4jK76UTis,12543
-pyedb/dotnet/edb_core/cell/primitive/primitive.py,sha256=IMGIaPCY8wpq3uInizwc1ObmdsTn5kg9YEqk9uztRuU,29764
+pyedb/dotnet/edb_core/cell/primitive/primitive.py,sha256=L9MNMc1OD8g_ghN2fhtdxa8v6jv6FY8D7oj7fF2A4vw,29825
 pyedb/dotnet/edb_core/cell/terminal/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyedb/dotnet/edb_core/cell/terminal/bundle_terminal.py,sha256=qM0wEXkZ-DpoJ6vlVa560Ce8IgOdp4vyIJPedvoa3O0,1977
 pyedb/dotnet/edb_core/cell/terminal/edge_terminal.py,sha256=lafPRrvsDPYKcysvrkO-5tEZXF3h4IcTXdeJgTjleuI,2158
-pyedb/dotnet/edb_core/cell/terminal/padstack_instance_terminal.py,sha256=HOMNvSj8thN3RgSg2eDb_CE8PpqkcVLrIYPZGOW-IQk,3803
-pyedb/dotnet/edb_core/cell/terminal/pingroup_terminal.py,sha256=M5qZNH-MLDkgSJABNVKmnBLyLgezm2fqJGl70EyPVUo,2586
-pyedb/dotnet/edb_core/cell/terminal/point_terminal.py,sha256=DafZBGjUx_OE8gZWcUKPh4cH3BRkJSj9XolhzIPOE3I,2400
+pyedb/dotnet/edb_core/cell/terminal/padstack_instance_terminal.py,sha256=XI7NiP1qT2aft7hjPK4gX42RzreiZ66aHXIHFPwUghs,3999
+pyedb/dotnet/edb_core/cell/terminal/pingroup_terminal.py,sha256=3y2UXqg8a7W74pjzZDljB1joCPTtmOkrIKGophDdgw4,2783
+pyedb/dotnet/edb_core/cell/terminal/point_terminal.py,sha256=S3aCAuFc_QA36PVn2Cdb9L4dO3T4IikwyEVcP1FOW3I,2597
 pyedb/dotnet/edb_core/cell/terminal/terminal.py,sha256=x-xUwqg1ZJQTgubuNSd3qistl982kAvSXNvAoNohcfg,19276
 pyedb/dotnet/edb_core/definition/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyedb/dotnet/edb_core/definition/component_def.py,sha256=tYZ4L6DigwSjdQJ5AlqEbordPVZyJ6hYFNc6b3QnJ18,6514
@@ -77,7 +77,7 @@ pyedb/dotnet/edb_core/edb_data/control_file.py,sha256=_W5DDBFvm4gTq8yCvhzfiWUsfp
 pyedb/dotnet/edb_core/edb_data/design_options.py,sha256=RO9ip-T5Bfxpsl97_QEk0qDZsza3tLzIX2t25XLutys,2057
 pyedb/dotnet/edb_core/edb_data/edbvalue.py,sha256=Vj_11HXsQUNavizKp5FicORm6cjhXRh9uvxhv_D_RJc,1977
 pyedb/dotnet/edb_core/edb_data/hfss_extent_info.py,sha256=hKFHWUl0_OCMEZJbQn5c8Y1a-BYKr8nAycIlrCoeufk,13005
-pyedb/dotnet/edb_core/edb_data/layer_data.py,sha256=B6cClg5KTcKUn33jYccTN0uNZZ5dQ037WHCsI-vg3Us,25748
+pyedb/dotnet/edb_core/edb_data/layer_data.py,sha256=2K1rvBXAWg3s8paNU6TPNb5tC1B3bRHmiUZjVsoX_Z8,26001
 pyedb/dotnet/edb_core/edb_data/nets_data.py,sha256=Ifi5uSfnOuTLwesO9TS3_F-qa_8rpPXrJy6W5lvIWik,9684
 pyedb/dotnet/edb_core/edb_data/padstacks_data.py,sha256=wOBO86cFGnx8OIsALzlQv59XeSGBhUYhJa7rksySGRE,77523
 pyedb/dotnet/edb_core/edb_data/ports.py,sha256=wr2RQi8VExuNIVmnp7c4VpTIhODgthmJmHr01zO4ueo,8873
@@ -185,7 +185,7 @@ pyedb/misc/siw_feature_config/xtalk_scan/scan_config.py,sha256=YmYI6WTQulL5Uf8Wx
 pyedb/misc/siw_feature_config/xtalk_scan/td_xtalk_config.py,sha256=KHa-UqcXuabiVfT2CV-UvWl5Q2qGYHF2Ye9azcAlnXc,3966
 pyedb/modeler/geometry_operators.py,sha256=g_Sy7a6R23sP6RtboJn1rl8uTuo8oeLmMF21rNkzwjk,74198
 pyedb/siwave_core/icepak.py,sha256=WnZ-t8mik7LDY06V8hZFV-TxRZJQWK7bu_8Ichx-oBs,5206
-pyedb-0.25.0.dist-info/LICENSE,sha256=qQWivZ12ETN5l3QxvTARY-QI5eoRRlyHdwLlAj0Bg5I,1089
-pyedb-0.25.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-pyedb-0.25.0.dist-info/METADATA,sha256=ldmFsRmsGY4Dy4YbEZBpH5YY_xQN4jUdqU5FC3611SA,8386
-pyedb-0.25.0.dist-info/RECORD,,
+pyedb-0.26.0.dist-info/LICENSE,sha256=qQWivZ12ETN5l3QxvTARY-QI5eoRRlyHdwLlAj0Bg5I,1089
+pyedb-0.26.0.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+pyedb-0.26.0.dist-info/METADATA,sha256=jAmjbUO3XTLpJ7Y-PIpgYQvcktdrERXU9caJNfVcSXc,8386
+pyedb-0.26.0.dist-info/RECORD,,