Initial commit

Author: ramin4667

src/ansys/aedt/core/emit_core/emit_schematic.py

@@ -118,14 +118,15 @@ def create_component(self, component_type: str, name: str = None, library: str =
                     raise ValueError(f"Multiple components found for type '{component_type}', but no exact match.")
                 self.emit_instance.logger.info(
                     f"Using exact match component '{component.name}' from library '{component.component_library}"
-                    "' for type '{component_type}'."
+                    f"' for type '{component_type}'."
                 )
+            stripped_component_name = component.name.strip("'")
             revision = self.emit_instance.results.get_revision()
-
             # Create the component using the EmitCom module
             new_component_id = self._emit_com_module.CreateEmitComponent(
-                name, component.name, component.component_library
+                name, stripped_component_name, component.component_library
             )
+
             component_node = revision._get_node(node_id=new_component_id)
             return component_node
         except Exception as e:
@@ -171,35 +172,116 @@ def create_radio_antenna(
             new_radio = self.create_component(radio_type, radio_name, library)
             new_antenna = self.create_component("Antenna", antenna_name, "Antennas")
             if new_radio and new_antenna:
-                self.connect_components(new_antenna.name, new_radio.name)  # Connect antenna to radio
+                self.connect_components(new_antenna, new_radio, "in", "n1")  # Connect antenna to radio
             return new_radio, new_antenna
         except Exception as e:
             self.emit_instance.logger.error(f"Failed to create radio of type '{radio_type}' or antenna: {e}")
             raise RuntimeError(f"Failed to create radio of type '{radio_type}' or antenna: {e}")
 
     @pyaedt_function_handler
-    def connect_components(self, component_name_1: str, component_name_2: str) -> None:
+    def connect_components(
+        self, component_1: EmitNode, component_2: EmitNode, component_port_1: str = None, component_port_2: str = None
+    ) -> None:
         """Connect two components in the schematic.
 
         Parameters
         ----------
-        component_1 : str
-            Name of the first component.
-        component_2 : str
-            Name of the second component.
+        component_1 : EmitNode
+            First component to connect.
+        component_2 : EmitNode
+            Second component to connect.
+        component_port_1 : str, optional
+            Port of the first component to connect. If ``None``, the default port is used.
+        component_port_2 : str, optional
+            Port of the second component to connect. If ``None``, the default port is used.
 
         Raises
         ------
         RuntimeError
             If the connection fails.
         """
         try:
-            self.emit_instance._oeditor.PlaceComponent(component_name_1, component_name_2)
+            component_port_1 = component_port_1 or "n1"
+            component_port_2 = component_port_2 or "n2"
+            # Update the component ports to match the emit definition
+            component_port_1 = self._component_port_update(component_port_1)
+            component_port_2 = self._component_port_update(component_port_2)
+            # Get the ports and their locations for both components
+            ports_1 = self.emit_instance._oeditor.GetComponentPorts(component_1.name)
+            port_locs_1 = {
+                port: self.emit_instance._oeditor.GetComponentPortLocation(component_1.name, port) for port in ports_1
+            }
+            if len(ports_1) == 1:
+                component_port_1 = ports_1[0]
+            if component_1.properties["Type"] == "Multiplexer":
+                component_port_1 = component_port_1.strip("n")
+
+            ports_2 = self.emit_instance._oeditor.GetComponentPorts(component_2.name)
+            port_locs_2 = {
+                port: self.emit_instance._oeditor.GetComponentPortLocation(component_2.name, port) for port in ports_2
+            }
+            if len(ports_2) == 1:
+                component_port_2 = ports_2[0]
+            if component_2.properties["Type"] == "Multiplexer":
+                component_port_2 = component_port_2.strip("n")
+
+            # Validate that the specified ports exist in their respective components
+            if component_port_1 not in port_locs_1:
+                raise ValueError(f"Port '{component_port_1}' does not exist in component '{component_1.name}'.")
+            if component_port_2 not in port_locs_2:
+                raise ValueError(f"Port '{component_port_2}' does not exist in component '{component_2.name}'.")
+            # Check if the ports are on the same side of the components
+            component_1_antenna_pors_list = [x for x in component_1.properties["AntennaSidePorts"].split("|")]
+            component_1_radio_ports_list = [x for x in component_1.properties["RadioSidePorts"].split("|")]
+            if component_1.properties["Type"] == "AntennaNode":
+                component_1_radio_ports_list = ["n"]
+            component_2_antenna_ports_list = [x for x in component_2.properties["AntennaSidePorts"].split("|")]
+            component_2_radio_ports_list = [x for x in component_2.properties["RadioSidePorts"].split("|")]
+            if component_2.properties["Type"] == "AntennaNode":
+                component_2_radio_ports_list = ["n"]
+            if (
+                component_port_1[-1] in component_1_antenna_pors_list
+                and component_port_2[-1] in component_2_antenna_ports_list
+            ) or (
+                component_port_1[-1] in component_1_radio_ports_list
+                and component_port_2[-1] in component_2_radio_ports_list
+            ):
+                raise RuntimeError("Both ports are on the same side. Connection cannot be established.")
+            # Move the first component to align with the second component's port
+            delta_x = port_locs_2[component_port_2][0] - port_locs_1[component_port_1][0]
+            delta_y = port_locs_2[component_port_2][1] - port_locs_1[component_port_1][1]
+            self.emit_instance._oeditor.Move(component_1.name, delta_x, delta_y)
             self.emit_instance.logger.info(
-                f"Successfully connected components '{component_name_1}' and '{component_name_2}'."
+                f"Successfully connected components '{component_1.name}' and '{component_2.name}'."
             )
         except Exception as e:
             self.emit_instance.logger.error(
-                f"Failed to connect components '{component_name_1}' and '{component_name_2}': {e}"
+                f"Failed to connect components '{component_1.name}' and '{component_2.name}' with the given ports: {e}"
+            )
+            raise RuntimeError(
+                f"Failed to connect components '{component_1.name}' and '{component_2.name}' with the given ports: {e}"
             )
-            raise RuntimeError(f"Failed to connect components '{component_name_1}' and '{component_name_2}': {e}")
+
+    @pyaedt_function_handler
+    def _component_port_update(self, input_port: str) -> str:
+        """Update the component port properties as emit definition.
+
+        Parameters
+        ----------
+        input_port : str
+            Name of the input port to update.
+
+        Returns
+        -------
+        updated_port: int
+            The updated port number after the update.
+        """
+
+        port_number = input_port[-1]
+        if port_number in ["2", "3", "4", "5", "6"]:
+            updated_port = "n" + port_number
+        elif port_number in ["1", "n"]:
+            updated_port = "n1"
+        else:
+            raise ValueError(f"Invalid port format: '{input_port}'")
+        return updated_port

tests/system/solvers/test_26_emit.py

@@ -1672,11 +1672,10 @@ def test_30_connect_components(self, add_app):
         self.aedtapp.logger.info = MagicMock()
         new_radio = self.aedtapp.schematic.create_component("MICS")
         new_antenna = self.aedtapp.schematic.create_component("Antenna")
-        self.aedtapp.schematic.connect_components(new_radio.name, new_antenna.name)
+        self.aedtapp.schematic.connect_components(new_radio, new_antenna)
         self.aedtapp.logger.info.assert_called_with("Successfully connected components 'MICS' and 'Antenna'.")
         with pytest.raises(RuntimeError) as e:
-            self.aedtapp.schematic.connect_components(new_radio.name, "WrongComponent")
+            self.aedtapp.schematic.connect_components(new_radio, new_antenna, "wrongport", "n1")
         assert (
-            "Failed to connect components 'MICS' and 'WrongComponent': "
-            "Failed to execute gRPC AEDT command: PlaceComponent"
+            "Failed to connect components 'MICS' and 'Antenna' with the given ports: Invalid port format: 'wrongport'"
         ) in str(e.value)