changed stitch to combine_merge to utilize already in place server method

Author: jacobrkerstetter

src/ansys/geometry/core/_grpc/_services/base/bodies.py

@@ -233,6 +233,6 @@ def create_body_from_loft_profiles_with_guides(self, **kwargs) -> dict:
         pass
 
     @abstractmethod
-    def stitch(self, **kwargs) -> dict:
-        """Stitch bodies."""
+    def combine_merge(self, **kwargs) -> dict:
+        """Combine and merge bodies."""
         pass

src/ansys/geometry/core/_grpc/_services/v0/bodies.py

@@ -892,24 +892,16 @@ def create_body_from_loft_profiles_with_guides(self, **kwargs) -> dict:  # noqa:
         }
 
     @protect_grpc
-    def stitch(self, **kwargs) -> dict:  # noqa: D102
-        from ansys.api.geometry.v0.bodies_pb2 import StitchRequest, StitchRequestData
+    def combine_merge(self, **kwargs) -> dict:  # noqa: D102
+        from ansys.api.geometry.v0.commands_pb2 import CombineMergeBodiesRequest
 
         # Create the request - assumes all inputs are valid and of the proper type
-        request = StitchRequest(
-            StitchRequestData(
-                ids=kwargs["body_ids"],
-                tolerance=from_measurement_to_server_length(kwargs["tolerance"]),
-            )
+        request = CombineMergeBodiesRequest(
+            target_selection=[build_grpc_id(id) for id in kwargs["body_ids"]],
         )
 
         # Call the gRPC service
-        resp = self.stub.Stitch(request=request)
+        _ = self.command_stub.CombineMergeBodies(request=request)
 
         # Return the response - formatted as a dictionary
-        return {
-            "id": resp.id,
-            "name": resp.name,
-            "master_id": resp.master_id,
-            "is_surface": resp.is_surface,
-        }
+        return {}

src/ansys/geometry/core/_grpc/_services/v1/bodies.py

@@ -203,3 +203,7 @@ def split_body(self, **kwargs) -> dict:  # noqa: D102
     @protect_grpc
     def create_body_from_loft_profiles_with_guides(self, **kwargs) -> dict:  # noqa: D102
         raise NotImplementedError
+    
+    @protect_grpc
+    def combine_merge(self, **kwargs) -> dict: # noqa: D102
+        raise NotImplementedError

src/ansys/geometry/core/designer/body.py

@@ -818,6 +818,16 @@ def unite(self, other: Union["Body", Iterable["Body"]], keep_other: bool = False
         the united body is retained.
         """
         return
+    
+    def combine_merge(self, other: Union["Body", list["Body"]]) -> None:
+        """Combine this body with another body or bodies, merging them into a single body.
+        
+        Parameters
+        ----------
+        other : Union[Body, list[Body]]
+            The body or list of bodies to combine with this body.
+        """
+        return
 
 
 class MasterBody(IBody):
@@ -1359,6 +1369,17 @@ def remove_faces(self, selection: Face | Iterable[Face], offset: Real) -> bool:
             self._grpc_client.log.warning(f"Failed to remove faces from body {self.id}.")
 
         return result.success
+    
+    @min_backend_version(25, 2, 0)
+    @check_input_types
+    def combine_merge(self, other: Union["Body", list["Body"]]) -> None:  # noqa: D102
+        other = other if isinstance(other, list) else [other]
+        check_type_all_elements_in_iterable(other, Body)
+
+        self._grpc_client.log.debug(f"Combining and merging to body {self.id}.")
+        self._grpc_client.services.bodies.combine_merge(
+            body_ids=[self.id] + [body.id for body in other]
+        )
 
     def plot(  # noqa: D102
         self,
@@ -1386,7 +1407,7 @@ def unite(self, other: Union["Body", Iterable["Body"]], keep_other: bool = False
         raise NotImplementedError(
             "MasterBody does not implement Boolean methods. Call this method on a body instead."
         )
-
+            
     def __repr__(self) -> str:
         """Represent the master body as a string."""
         lines = [f"ansys.geometry.core.designer.MasterBody {hex(id(self))}"]
@@ -1903,6 +1924,9 @@ def unite(self, other: Union["Body", Iterable["Body"]], keep_other: bool = False
         else:
             self.__generic_boolean_command(other, False, "unite", "union operation failed")
 
+    def combine_merge(self, other: Union["Body", list["Body"]]) -> None:  # noqa: D102
+        self._template.combine_merge(other)
+
     @reset_tessellation_cache
     @ensure_design_is_active
     @check_input_types

src/ansys/geometry/core/designer/geometry_commands.py

@@ -1832,40 +1832,4 @@ def revolve_edges(
         )
 
         design = get_design_from_edge(edges[0])
-        design._update_design_inplace()
-
-    @min_backend_version(26, 1, 0)
-    def stitch_bodies(self, bodies: list["Body"], tolerance: Distance | Quantity | Real) -> bool:
-        """Stitch bodies together.
-
-        Parameters
-        ----------
-        bodies : list[Body]
-            Bodies to stitch.
-        tolerance : Distance | Quantity | Real
-            Tolerance to use when stitching bodies. Default units are meters.
-
-        Returns
-        -------
-        bool
-            ``True`` when successful, ``False`` when failed.
-        """
-        from ansys.geometry.core.designer.body import Body
-
-        check_type_all_elements_in_iterable(bodies, Body)
-
-        for body in bodies:
-            body._reset_tessellation_cache()
-
-        tolerance = tolerance if isinstance(tolerance, Distance) else Distance(tolerance)
-
-        result = self._grpc_client._services.bodies.stitch(
-            body_ids=[body.id for body in bodies],
-            tolerance=tolerance,
-        )
-
-        if result.get("success"):
-            design = get_design_from_body(bodies[0])
-            design._update_design_inplace()
-
-        return result.get("success")
+        design._update_design_inplace()