test #4 done

Author: svandenb-dev

src/pyedb/grpc/edb.py

@@ -33,7 +33,6 @@
 from pyedb.grpc.application.Variables import Variable, decompose_variable_value
 from pyedb.grpc.edb_core.components import Components
 from pyedb.grpc.edb_core.control_file import ControlFile, convert_technology_file
-from pyedb.grpc.edb_core.excitation import Excitation
 from pyedb.grpc.edb_core.hfss import Hfss
 from pyedb.grpc.edb_core.layout.layout import Layout
 from pyedb.grpc.edb_core.layout_validation import LayoutValidation
@@ -69,6 +68,7 @@
     SiwaveSimulationSetup,
 )
 from pyedb.grpc.edb_core.siwave import Siwave
+from pyedb.grpc.edb_core.source_excitations import SourceExcitation
 from pyedb.grpc.edb_core.stackup import Stackup
 from pyedb.grpc.edb_core.terminal.padstack_instance_terminal import (
     PadstackInstanceTerminal,
@@ -337,7 +337,7 @@ def _init_objects(self):
         self._nets = Nets(self)
         self._modeler = Modeler(self)
         self._materials = Materials(self)
-        self._excitation = Excitation(self)
+        self._source_excitation = SourceExcitation(self)
 
     @property
     def cell_names(self):
@@ -743,10 +743,9 @@ def stackup(self):
         return self._stackup
 
     @property
-    def excitation(self):
+    def source_excitation(self):
         if self.active_db:
-            self._excitation = Excitation(self)
-        return self._excitation
+            return self._source_excitation
 
     @property
     def materials(self):
@@ -2754,7 +2753,7 @@ def get_bounding_box(self):
         """
         lay_inst_polygon_data = [obj_inst.get_bbox() for obj_inst in self.layout_instance.query_layout_obj_instances()]
         layout_bbox = GrpcPolygonData.bbox_of_polygons(lay_inst_polygon_data)
-        return [layout_bbox[0].x.value, layout_bbox[0].y.value, layout_bbox[1].x.value, layout_bbox[1].y.value]
+        return [[layout_bbox[0].x.value, layout_bbox[0].y.value], [layout_bbox[1].x.value, layout_bbox[1].y.value]]
 
     def build_simulation_project(self, simulation_setup):
         # type: (SimulationConfiguration) -> bool

src/pyedb/grpc/edb_core/components.py

@@ -471,6 +471,34 @@ def get_component_by_name(self, name):
         """
         return self.instances[name]
 
+    def get_pin_from_component(self, component, net_name=None, pin_name=None):
+        """Return component pins.
+        Parameters
+        ----------
+        component : :class: `Component` or str.
+            Component object or component name.
+        net_name : str, List[str], optional
+            Apply filter on net name.
+        pin_name : str, optional
+            Apply filter on specific pin name.
+        Return
+        ------
+        List[:clas: `PadstackInstance`]
+
+
+
+        """
+        if isinstance(component, Component):
+            component = component.name
+        pins = [pin for pin in list(self.instances[component].pins.values())]
+        if net_name:
+            if isinstance(net_name, str):
+                net_name = [net_name]
+            pins = [pin for pin in pins if pin.net_name in net_name]
+        if pin_name:
+            pins = [pin for pin in pins if pin.name == pin_name]
+        return pins
+
     def get_components_from_nets(self, netlist=None):
         """Retrieve components from a net list.
 
@@ -2232,8 +2260,8 @@ def create_pin_group(self, reference_designator, pin_numbers, group_name=None):
         ----------
         reference_designator : str
             References designator of the component.
-        pin_numbers : int, str, list
-            List of pin names.
+        pin_numbers : int, str, list[str] or list[:class: `PadstackInstance]`
+            List of pins.
         group_name : str, optional
             Name of the pin group.
 
@@ -2247,7 +2275,7 @@ def create_pin_group(self, reference_designator, pin_numbers, group_name=None):
         if group_name is None:
             group_name = PinGroup.unique_name(self._active_layout, "")
         comp = self.instances[reference_designator]
-        pins = [pin.pin for name, pin in comp.pins.items() if name in pin_numbers]
+        pins = [pin for pin in list(comp.pins.values()) if pin.name in pin_numbers]
         edb_pingroup = PinGroup.create(self._active_layout, group_name, pins)
 
         if edb_pingroup.is_null:  # pragma: no cover
@@ -2256,7 +2284,7 @@ def create_pin_group(self, reference_designator, pin_numbers, group_name=None):
         else:
             names = [i for i in pins if i.net.name]
             edb_pingroup.net = names[0].net
-            return group_name, self._pedb.layout.pin_groups[group_name]
+            return group_name
 
     def create_pin_group_on_net(self, reference_designator, net_name, group_name=None):
         """Create pin group on component by net name.
@@ -2274,5 +2302,7 @@ def create_pin_group_on_net(self, reference_designator, net_name, group_name=Non
         -------
         PinGroup
         """
-        pins = [pin.name for pin in self.instances[reference_designator].pins if pin.name == net_name]
+        pins = [
+            pin.name for pin in list(self.instances[reference_designator].pins.values()) if pin.net_name == net_name
+        ]
         return self.create_pin_group(reference_designator, pins, group_name)

src/pyedb/grpc/edb_core/hfss.py

@@ -328,7 +328,7 @@ def create_circuit_port_on_net(
             "`pyedb.grpc.core.excitations.create_circuit_port_on_net` instead.",
             DeprecationWarning,
         )
-        return self._pedb.excitations.create_circuit_port_on_net(
+        return self._pedb.source_excitation.create_circuit_port_on_net(
             positive_component_name,
             positive_net_name,
             negative_component_name,

src/pyedb/grpc/edb_core/hierarchy/pingroup.py

@@ -35,15 +35,10 @@
 class PinGroup(GrpcPinGroup):
     """Manages pin groups."""
 
-    def __init__(self, pedb, edb_pin_group):
-        super().__init__(edb_pin_group.msg)
+    def __init__(self, pedb, edb_pin_group=None):
+        if edb_pin_group:
+            super().__init__(edb_pin_group.msg)
         self._pedb = pedb
-        self._edb_pin_group = edb_pin_group
-        self._name = edb_pin_group.name
-        self._component = ""
-        self._node_pins = []
-        self._net = ""
-        self._edb_object = self._edb_pin_group
 
     @property
     def _active_layout(self):
@@ -52,37 +47,37 @@ def _active_layout(self):
     @property
     def component(self):
         """Component."""
-        return Component(self._pedb, self.component)
+        return Component(self._pedb, super().component)
 
     @component.setter
     def component(self, value):
         if isinstance(value, Component):
-            self.component = value._edb_object
+            super(PinGroup, self.__class__).component.__set__(self, value)
 
     @property
     def pins(self):
         """Gets the pins belong to this pin group."""
-        return {i.name: PadstackInstance(self._pedb, i) for i in self.pins}
+        return {i.name: PadstackInstance(self._pedb, i) for i in super().pins}
 
     @property
     def net(self):
         """Net."""
-        return Net(self._pedb, self.net)
+        return Net(self._pedb, super().net)
 
     @net.setter
     def net(self, value):
         if isinstance(value, Net):
-            self.net = value._edb_object
+            super(PinGroup, self.__class__).net.__set__(self, value)
 
     @property
     def net_name(self):
         return self.net.name
 
-    @property
-    def terminal(self):
-        """Terminal."""
-        term = PinGroupTerminal(self._pedb, self.get_pin_group_terminal())  # TODO check method is missing
-        return term if not term.is_null else None
+    # @property
+    # def terminal(self):
+    #     """Terminal."""
+    #     term = PinGroupTerminal(self._pedb, self.get_pin_group_terminal())  # TODO check method is missing
+    #     return term if not term.is_null else None
 
     def create_terminal(self, name=None):
         """Create a terminal.
@@ -94,52 +89,53 @@ def create_terminal(self, name=None):
         """
         if not name:
             name = generate_unique_name(self.name)
-        term = PinGroupTerminal(self._pedb, self._edb_object)
-        term = term.create(name, self.net_name, self.name)
-        return term
+        term = PinGroupTerminal.create(
+            layout=self._active_layout, name=name, pin_group=self, net=self.net, is_ref=False
+        )
+        return PinGroupTerminal(self._pedb, term)
 
     def _json_format(self):
         dict_out = {"component": self.component, "name": self.name, "net": self.net, "node_type": self.node_type}
         return dict_out
 
     def create_current_source_terminal(self, magnitude=1, phase=0, impedance=1e6):
-        terminal = self.create_terminal()._edb_object
+        terminal = self.create_terminal()
         terminal.boundary_type = GrpcBoundaryType.CURRENT_SOURCE
         terminal.source_amplitude = GrpcValue(magnitude)
         terminal.source_phase = GrpcValue(phase)
         terminal.impedance = GrpcValue(impedance)
         return terminal
 
     def create_voltage_source_terminal(self, magnitude=1, phase=0, impedance=0.001):
-        terminal = self.create_terminal()._edb_object
+        terminal = self.create_terminal()
         terminal.boundary_type = GrpcBoundaryType.VOLTAGE_SOURCE
         terminal.source_amplitude = GrpcValue(magnitude)
         terminal.source_phase = GrpcValue(phase)
         terminal.impedance = GrpcValue(impedance)
         return terminal
 
     def create_voltage_probe_terminal(self, impedance=1000000):
-        terminal = self.create_terminal()._edb_object
+        terminal = self.create_terminal()
         terminal.boundary_type = GrpcBoundaryType.VOLTAGE_PROBE
         terminal.impedance = GrpcValue(impedance)
         return terminal
 
     def create_port_terminal(self, impedance=50):
-        terminal = self.create_terminal()._edb_object
+        terminal = self.create_terminal()
         terminal.boundary_type = GrpcBoundaryType.PORT
         terminal.impedance = GrpcValue(impedance)
         terminal.is_circuit_port = True
         return terminal
 
-    def delete(self):
-        """Delete active pin group.
-
-        Returns
-        -------
-        bool
-
-        """
-        terminal = self.get_pin_group_terminal()  # TODO check method exists in grpc
-        self.delete()
-        terminal.delete()
-        return True
+    # def delete(self):
+    #     """Delete active pin group.
+    #
+    #     Returns
+    #     -------
+    #     bool
+    #
+    #     """
+    #     terminal = self.get_pin_group_terminal()  # TODO check method exists in grpc
+    #     self.delete()
+    #     terminal.delete()
+    #     return True

src/pyedb/grpc/edb_core/layout/layout.py

@@ -105,7 +105,7 @@ def groups(self):
 
     @property
     def pin_groups(self):
-        return [PinGroup(pedb=self._pedb, edb_pin_group=i) for i in self._pedb.active_cell.layout.pin_groups]
+        return [PinGroup(self._pedb, i) for i in self._pedb.active_cell.layout.pin_groups]
 
     @property
     def net_classes(self):

src/pyedb/grpc/edb_core/primitive/padstack_instances.py

@@ -313,20 +313,17 @@ def net_name(self):
         str
             Name of the net.
         """
-        return self.net.name
+        if self.is_null:
+            return ""
+        elif self.net.is_null:
+            return ""
+        else:
+            return self.net.name
 
     @net_name.setter
     def net_name(self, val):
-        if not isinstance(val, str):
-            try:
-                self.net = val
-            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]
-            self.net = net
-        else:
-            raise AttributeError("Value inserted not found. Input has to be net name or net object.")
+        if not self.is_null and self.net.is_null:
+            self.net.name = val
 
     @property
     def is_pin(self):