feat: add test for Operator.id

Author: Matteo-Baussart-ANSYS

src/ansys/dpf/core/dpf_operator.py

@@ -242,7 +242,7 @@ def progress_bar(self) -> bool:
     def progress_bar(self, value: bool) -> None:
         self._progress_bar = value
 
-    def connect(self, pin, inpt, pin_out=0, operator_as_input=False):
+    def connect(self, pin, inpt, pin_out=0):
         """Connect an input on the operator using a pin number.
 
         Parameters
@@ -276,10 +276,7 @@ def connect(self, pin, inpt, pin_out=0, operator_as_input=False):
         if inpt is self:
             raise ValueError("Cannot connect to itself.")
         elif isinstance(inpt, Operator):
-            if operator_as_input:
-                self._api.operator_connect_operator_as_input(self, pin, inpt)
-            else:
-                self._api.operator_connect_operator_output(self, pin, inpt, pin_out)
+            self._api.operator_connect_operator_output(self, pin, inpt, pin_out)
         elif isinstance(inpt, Output):
             self._api.operator_connect_operator_output(self, pin, inpt._operator, inpt._pin)
         elif isinstance(inpt, list):
@@ -664,8 +661,8 @@ def config(self, value):
     @property
     def id(self):
         if self._id is None:
-            operator_id_op = Operator("operator_id")
-            operator_id_op.inputs.operator.connect(self, operator_as_input=True)
+            operator_id_op = Operator("operator_id", server=self._server)
+            operator_id_op.connect_operator_as_input(0, self)
             self._id = operator_id_op.outputs.id()
 
         return self._id

src/ansys/dpf/core/inputs.py

@@ -70,7 +70,7 @@ def __init__(self, spec, pin, operator, count_ellipsis=-1):
             self.name += str(self._count_ellipsis + 1)
         self._update_doc_str(docstr, self.name)
 
-    def connect(self, inpt, operator_as_input=False):
+    def connect(self, inpt):
         """Connect any input (entity or operator output) to a specified input pin of this operator.
 
         Parameters
@@ -85,7 +85,7 @@ def connect(self, inpt, operator_as_input=False):
         # always convert ranges to lists
         if isinstance(inpt, range):
             inpt = list(inpt)
-        elif not operator_as_input and isinstance(inpt, core.Operator):
+        elif isinstance(inpt, core.Operator):
             if hasattr(inpt, "outputs"):
                 inpt = inpt.outputs
             else:
@@ -150,7 +150,7 @@ def connect(self, inpt, operator_as_input=False):
                 corresponding_pins[0][1]: weakref.ref(inpt)
             }
         else:
-            self._operator().connect(self._pin, inpt, operator_as_input=operator_as_input)
+            self._operator().connect(self._pin, inpt)
             self._operator().inputs._connected_inputs[self._pin] = (
                 weakref.ref(inpt) if hasattr(inpt, "__weakref__") else inpt
             )

tests/test_operator.py

@@ -1424,3 +1424,19 @@ def test_operator_input_output_streams(server_in_process, simple_bar):
     time_provider.connect(pin=3, inpt=streams)
     times = time_provider.outputs.time_freq_support()
     assert times
+
+
+@pytest.mark.skipif(
+    not conftest.SERVERS_VERSION_GREATER_THAN_OR_EQUAL_TO_10_0,
+    reason="Operator `workflow_to_workflow_topology` does not exist below 10.0",
+)
+def test_operator_id(server_type):
+    ids = set()
+
+    for _ in range(10):
+        op = ops.utility.forward(server=server_type)
+
+        assert op.id >= 0
+        assert op.id not in ids
+
+        ids.add(op.id)