test #5 done

Author: svandenb-dev

src/pyedb/grpc/edb.py

@@ -43,13 +43,7 @@
 from pyedb.grpc.edb_core.nets.extended_net import ExtendedNet
 from pyedb.grpc.edb_core.nets.net_class import NetClass
 from pyedb.grpc.edb_core.padstack import Padstacks
-from pyedb.grpc.edb_core.ports.ports import (
-    BundleWavePort,
-    CoaxPort,
-    ExcitationSources,
-    GapPort,
-    WavePort,
-)
+from pyedb.grpc.edb_core.ports.ports import BundleWavePort, CoaxPort, GapPort, WavePort
 from pyedb.grpc.edb_core.primitive.circle import Circle
 from pyedb.grpc.edb_core.primitive.padstack_instances import PadstackInstance
 from pyedb.grpc.edb_core.primitive.path import Path
@@ -455,8 +449,7 @@ def excitations_nets(self):
     @property
     def sources(self):
         """Get all layout sources."""
-        terms = [term for term in self.layout.terminals if term.boundary_type.value in [3, 4, 7]]
-        return {ter.name: ExcitationSources(self, ter) for ter in terms}
+        self.terminals
 
     @property
     def voltage_regulator_modules(self):
@@ -3545,16 +3538,14 @@ def create_voltage_source(self, terminal, ref_terminal):
         -------
         class:`legacy.edb_core.edb_data.ports.ExcitationSources`
         """
-        from ansys.edb.core.terminal.terminals import BoundaryType as GrpcBoundaryType
-
         term = Terminal(self, terminal)
-        term.boundary_type = GrpcBoundaryType.VOLTAGE_SOURCE
+        term.boundary_type = "voltage_source"
 
         ref_term = Terminal(self, ref_terminal)
-        ref_term.boundary_type = GrpcBoundaryType.VOLTAGE_SOURCE
+        ref_term.boundary_type = "voltage_source"
 
         term.ref_terminal = ref_terminal
-        return self.sources[term.name]
+        return term
 
     def create_current_source(self, terminal, ref_terminal):
         """Create a current source.

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

@@ -29,6 +29,9 @@
 from ansys.edb.core.primitive.primitive import PadstackInstance as GrpcPadstackInstance
 from ansys.edb.core.utility.value import Value as GrpcValue
 
+from pyedb.grpc.edb_core.terminal.padstack_instance_terminal import (
+    PadstackInstanceTerminal,
+)
 from pyedb.modeler.geometry_operators import GeometryOperators
 
 
@@ -77,6 +80,19 @@ def create_terminal(self, name=None):
         term = PadstackInstanceTerminal(self._pedb, self._edb_object)
         return term.create(self, name)
 
+    def get_terminal(self, create_new_terminal=True):
+        inst_term = self.get_padstack_instance_terminal()
+        if inst_term.is_null and create_new_terminal:
+            inst_term = PadstackInstanceTerminal.create(
+                layout=self.layout,
+                name=self.name,
+                padstack_instance=self,
+                layer=self.get_layer_range()[0],
+                net=self.net,
+                is_ref=False,
+            )
+        return PadstackInstanceTerminal(self._pedb, inst_term)
+
     def create_coax_port(self, name=None, radial_extent_factor=0):
         """Create a coax port."""
         port = self.create_port(name)

src/pyedb/grpc/edb_core/source_excitations.py

@@ -52,7 +52,6 @@
     ResistorSource,
     Source,
     SourceType,
-    VoltageSource,
 )
 from pyedb.modeler.geometry_operators import GeometryOperators
 
@@ -887,7 +886,7 @@ def _create_terminal_on_pins(
         use_pin_top_layer=True,
         source_type="circuit_port",
         impedance=50,
-        magnitude=1.0,
+        magnitude=0,
         phase=0,
         r=0,
         l=0,
@@ -998,7 +997,7 @@ def _create_terminal_on_pins(
             return False
         return pos_terminal.name
 
-    def create_voltage_source_on_pin(self, pos_pin, neg_pin, voltage_value=3.3, phase_value=0, source_name=""):
+    def create_voltage_source_on_pin(self, pos_pin, neg_pin, voltage_value=0, phase_value=0, source_name=None):
         """Create a voltage source.
 
         Parameters
@@ -1028,21 +1027,18 @@ def create_voltage_source_on_pin(self, pos_pin, neg_pin, voltage_value=3.3, phas
         >>> edbapp.excitations.create_voltage_source_on_pin(pins[0], pins[1], 50, "source_name")
         """
 
-        voltage_source = VoltageSource()
-        voltage_source.positive_node.net = pos_pin.net.name
-        voltage_source.negative_node.net = neg_pin.net.name
-        voltage_source.magnitude = voltage_value
-        voltage_source.phase = phase_value
         if not source_name:
             source_name = (
-                f"VSource_{pos_pin.component.name}_{pos_pin.net.name}_{neg_pin.component.name}_{neg_pin.net.name}"
+                f"VSource_{pos_pin.component.name}_{pos_pin.net_name}_{neg_pin.component.name}_{neg_pin.net_name}"
             )
-        voltage_source.name = source_name
-        voltage_source.positive_node.component_node = pos_pin.component
-        voltage_source.positive_node.node_pins = pos_pin
-        voltage_source.negative_node.component_node = neg_pin.component
-        voltage_source.negative_node.node_pins = pos_pin
-        return self._create_terminal_on_pins(voltage_source)
+        return self._create_terminal_on_pins(
+            positive_pin=pos_pin,
+            negative_pin=neg_pin,
+            name=source_name,
+            magnitude=voltage_value,
+            phase=phase_value,
+            source_type="voltage_source",
+        )
 
     def create_current_source_on_pin(self, pos_pin, neg_pin, current_value=0.1, phase_value=0, source_name=""):
         """Create a current source.
@@ -1351,7 +1347,7 @@ def create_voltage_source_on_net(
         negative_net_name=None,
         voltage_value=3.3,
         phase_value=0,
-        source_name="",
+        source_name=None,
     ):
         """Create a voltage source.
 
@@ -1389,29 +1385,23 @@ def create_voltage_source_on_net(
             negative_component_name = positive_component_name
         if not negative_net_name:
             negative_net_name = self._check_gnd(negative_component_name)
-        voltage_source = VoltageSource()
-        voltage_source.positive_node.net = positive_net_name
-        voltage_source.negative_node.net = negative_net_name
-        voltage_source.magnitude = voltage_value
-        voltage_source.phase = phase_value
-        pos_node_cmp = self._pedb.components.get_component_by_name(positive_component_name)
-        neg_node_cmp = self._pedb.components.get_component_by_name(negative_component_name)
         pos_node_pins = self._pedb.components.get_pin_from_component(positive_component_name, positive_net_name)
         neg_node_pins = self._pedb.components.get_pin_from_component(negative_component_name, negative_net_name)
 
-        if source_name == "":
-            source_name = "Vsource_{}_{}_{}_{}".format(
-                positive_component_name,
-                positive_net_name,
-                negative_component_name,
-                negative_net_name,
+        if not source_name:
+            source_name = (
+                f"Vsource_{positive_component_name}_{positive_net_name}_"
+                f"{negative_component_name}_{negative_net_name}"
             )
-        voltage_source.name = source_name
-        voltage_source.positive_node.component_node = pos_node_cmp
-        voltage_source.positive_node.node_pins = pos_node_pins
-        voltage_source.negative_node.component_node = neg_node_cmp
-        voltage_source.negative_node.node_pins = neg_node_pins
-        return self.create_pin_group_terminal(voltage_source)
+        return self.create_pin_group_terminal(
+            positive_pins=pos_node_pins,
+            negatives_pins=neg_node_pins,
+            name=source_name,
+            magnitude=voltage_value,
+            phase=phase_value,
+            impedance=1e-6,
+            source_type="voltage_source",
+        )
 
     def create_current_source_on_net(
         self,

src/pyedb/grpc/edb_core/terminal/padstack_instance_terminal.py

@@ -69,3 +69,43 @@ def net_name(self):
     def net_name(self, val):
         if not self.is_null and self.net.is_null:
             self.net.name = val
+
+    @property
+    def magnitude(self):
+        return self.source_amplitude
+
+    @magnitude.setter
+    def magnitude(self, value):
+        self.source_amplitude = value
+
+    @property
+    def phase(self):
+        return self.source_phase
+
+    @phase.setter
+    def phase(self, value):
+        self.source_phase = value
+
+    @property
+    def source_amplitude(self):
+        return super().source_amplitude
+
+    @source_amplitude.setter
+    def source_amplitude(self, value):
+        super(PadstackInstanceTerminal, self.__class__).source_amplitude.__set__(self, value)
+
+    @property
+    def source_phase(self):
+        return super().source_phase.value
+
+    @source_phase.setter
+    def source_phase(self, value):
+        super(PadstackInstanceTerminal, self.__class__).source_phase.__set__(self, value)
+
+    @property
+    def impedance(self):
+        return super().impedance.value
+
+    @impedance.setter
+    def impedance(self, value):
+        super(PadstackInstanceTerminal, self.__class__).impedance.__set__(self, value)

src/pyedb/grpc/edb_core/terminal/pingroup_terminal.py

@@ -20,8 +20,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+from ansys.edb.core.terminal.terminals import BoundaryType as GrpcBoundaryType
 from ansys.edb.core.terminal.terminals import PinGroupTerminal as GrpcPinGroupTerminal
 
+from pyedb.grpc.edb_core.nets.net import Net
+
 
 class PinGroupTerminal(GrpcPinGroupTerminal):
     """Manages pin group terminal properties."""
@@ -30,3 +33,73 @@ def __init__(self, pedb, edb_object):
         super().__init__(edb_object)
         self._edb_object = edb_object
         self._pedb = pedb
+
+    @property
+    def boundary_type(self):
+        return super().boundary_type.name.lower()
+
+    @boundary_type.setter
+    def boundary_type(self, value):
+        if value == "voltage_source":
+            value = GrpcBoundaryType.VOLTAGE_SOURCE
+        if value == "current_source":
+            value = GrpcBoundaryType.CURRENT_SOURCE
+        if value == "port":
+            value = GrpcBoundaryType.PORT
+        if value == "voltage_probe":
+            value = GrpcBoundaryType.VOLTAGE_PROBE
+        super(PinGroupTerminal, self.__class__).boundary_type.__set__(self, value)
+
+    @property
+    def magnitude(self):
+        return self.source_amplitude
+
+    @magnitude.setter
+    def magnitude(self, value):
+        self.source_amplitude = value
+
+    @property
+    def phase(self):
+        return self.source_phase
+
+    @phase.setter
+    def phase(self, value):
+        self.source_phase = value
+
+    @property
+    def source_amplitude(self):
+        return super().source_amplitude
+
+    @source_amplitude.setter
+    def source_amplitude(self, value):
+        super(PinGroupTerminal, self.__class__).source_amplitude.__set__(self, value)
+
+    @property
+    def source_phase(self):
+        return super().source_amplitude.value
+
+    @source_phase.setter
+    def source_phase(self, value):
+        super(PinGroupTerminal, self.__class__).source_phase.__set__(self, value)
+
+    @property
+    def impedance(self):
+        return super().impedance.value
+
+    @impedance.setter
+    def impedance(self, value):
+        super(PinGroupTerminal, self.__class__).impedance.__set__(self, value)
+
+    @property
+    def net(self):
+        return Net(self._pedb, super().net)
+
+    @net.setter
+    def net(self, value):
+        super(PinGroupTerminal, self.__class__).net.__set__(self, value)
+
+    @property
+    def pin_group(self):
+        from pyedb.grpc.edb_core.hierarchy.pingroup import PinGroup
+
+        return PinGroup(self._pedb, super().pin_group)

src/pyedb/grpc/edb_core/terminal/terminal.py

@@ -34,7 +34,7 @@
 
 class Terminal(GrpcTerminal):
     def __init__(self, pedb, edb_object):
-        super().__init__(edb_object)
+        super().__init__(edb_object.msg)
         self._pedb = pedb
         self._reference_object = None
         self.edb_object = edb_object
@@ -44,7 +44,7 @@ def __init__(self, pedb, edb_object):
             "pec": GrpcBoundaryType.PEC,
             "rlc": GrpcBoundaryType.RLC,
             "current_source": GrpcBoundaryType.CURRENT_SOURCE,
-            "vltage_source": GrpcBoundaryType.VOLTAGE_SOURCE,
+            "voltage_source": GrpcBoundaryType.VOLTAGE_SOURCE,
             "nexxim_ground": GrpcBoundaryType.NEXXIM_GROUND,
             "nxxim_port": GrpcBoundaryType.NEXXIM_PORT,
             "dc_terminal": GrpcBoundaryType.DC_TERMINAL,
@@ -164,11 +164,11 @@ def boundary_type(self):
         str
             port, pec, rlc, current_source, voltage_source, nexxim_ground, nexxim_pPort, dc_terminal, voltage_probe.
         """
-        return self.boundary_type.name.lower()
+        return super().boundary_type.name.lower()
 
     @boundary_type.setter
     def boundary_type(self, value):
-        self.boundary_type = self._boundary_type_mapping[value]
+        super(Terminal, self.__class__).boundary_type.__set__(self, self._boundary_type_mapping[value])
 
     @property
     def is_port(self):

tests/grpc/system/test_edb.py

@@ -83,17 +83,18 @@ def test_siwave_create_circuit_port_on_net(self):
 
     def test_siwave_create_voltage_source(self):
         """Create a voltage source."""
-        assert len(self.edbapp.sources) == 0
         assert "Vsource_" in self.edbapp.siwave.create_voltage_source_on_net("U1", "USB3_D_P", "U1", "GND", 3.3, 0)
-        assert len(self.edbapp.sources) == 1
-        assert list(self.edbapp.sources.values())[0].magnitude == 3.3
+        assert len(self.edbapp.terminals) == 2
+        assert list(self.edbapp.terminals.values())[0].magnitude == 3.3
 
         pins = self.edbapp.components.get_pin_from_component("U1")
-        assert "VSource_" in self.edbapp.siwave.create_voltage_source_on_pin(pins[300], pins[10], 3.3, 0)
-        assert len(self.edbapp.sources) == 2
-        assert len(self.edbapp.probes) == 0
-        list(self.edbapp.sources.values())[0].phase = 1
-        assert list(self.edbapp.sources.values())[0].phase == 1
+        assert "VSource_" in self.edbapp.siwave.create_voltage_source_on_pin(
+            pins[300], pins[10], voltage_value=3.3, phase_value=1
+        )
+        assert len(self.edbapp.terminals) == 4
+        assert list(self.edbapp.terminals.values())[2].phase == 1.0
+        assert list(self.edbapp.terminals.values())[2].magnitude == 3.3
+
         u6 = self.edbapp.components["U6"]
         voltage_source = self.edbapp.create_voltage_source(
             u6.pins["F2"].get_terminal(create_new_terminal=True), u6.pins["F1"].get_terminal(create_new_terminal=True)