wip refactoring

Author: jacobrkerstetter

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

@@ -113,6 +113,11 @@ def find_and_fix_simplify(self, **kwargs) -> dict:
         """Identify and simplify areas in the geometry."""
         pass  # pragma: no cover
 
+    @abstractmethod
+    def find_and_fix_stitch_faces(self, **kwargs) -> dict:
+        """Identify and stitch faces in the geometry."""
+        pass  # pragma: no cover
+
     @abstractmethod
     def inspect_geometry(self, **kwargs) -> dict:
         """Inspect the geometry for issues."""

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

@@ -26,6 +26,7 @@
 geometry issues, such as split edges, extra edges, duplicate faces etc.
 """
 
+from google.protobuf.wrappers_pb2 import BoolValue, DoubleValue
 import grpc
 
 from ansys.geometry.core.errors import protect_grpc
@@ -170,7 +171,12 @@ def find_duplicate_faces(self, **kwargs) -> dict:  # noqa: D102
     def find_missing_faces(self, **kwargs) -> dict:  # noqa: D102
         from ansys.api.geometry.v0.repairtools_pb2 import FindMissingFacesRequest
 
-        request = FindMissingFacesRequest(faces=kwargs["faces"])
+        request = FindMissingFacesRequest(
+            faces=kwargs["faces"],
+            angle=DoubleValue(value=kwargs["angle"]),
+            distance=DoubleValue(value=kwargs["distance"]),
+        )
+
         # Call the gRPC service
         response = self.stub.FindMissingFaces(request)
 
@@ -208,9 +214,14 @@ def find_small_faces(self, **kwargs) -> dict:  # noqa: D102
     def find_stitch_faces(self, **kwargs) -> dict:  # noqa: D102
         from ansys.api.geometry.v0.repairtools_pb2 import FindStitchFacesRequest
 
-        request = FindStitchFacesRequest(faces=kwargs["faces"])
+        request = FindStitchFacesRequest(
+            faces=kwargs["faces"],
+            maximum_distance=DoubleValue(value=kwargs["distance"])
+        )
+
         # Call the gRPC service
         response = self.stub.FindStitchFaces(request)
+        
         # Return the response - formatted as a dictionary
         return {
             "problems": [
@@ -260,6 +271,32 @@ def find_and_fix_simplify(self, **kwargs) -> dict:  # noqa: D102
             "modified_bodies_monikers": [],
         }
 
+    @protect_grpc
+    def find_and_fix_stitch_faces(self, **kwargs) -> dict:  # noqa: D102
+        from ansys.api.geometry.v0.repairtools_pb2 import FindStitchFacesRequest
+
+        # Create the gRPC request
+        request = FindStitchFacesRequest(
+            faces=kwargs["body_ids"],
+            maximum_distance=DoubleValue(value=kwargs["max_distance"]),
+            allow_multiple_bodies=BoolValue(value=kwargs["allow_multiple_bodies"]),
+            maintain_components=BoolValue(value=kwargs["maintain_components"]),
+            check_for_coincidence=BoolValue(value=kwargs["check_for_coincidence"]),
+            comprehensive=kwargs["comprehensive_result"],
+        )
+
+        # Call the gRPC service
+        response = self.stub.FindAndFixStitchFaces(request)
+
+        # Return the response - formatted as a dictionary
+        return {
+            "success": response.success,
+            "created_bodies_monikers": response.created_bodies_monikers,
+            "modified_bodies_monikers": response.modified_bodies_monikers,
+            "found": response.found,
+            "repaired": response.repaired,
+        }
+
     @protect_grpc
     def inspect_geometry(self, **kwargs) -> dict:  # noqa: D102
         from ansys.api.geometry.v0.repairtools_pb2 import InspectGeometryRequest

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

@@ -80,6 +80,9 @@ def find_and_fix_split_edges(self, **kwargs) -> dict:  # noqa: D102
     def find_and_fix_simplify(self, **kwargs) -> dict:  # noqa: D102
         raise NotImplementedError
 
+    def find_and_fix_stitch_faces(self, **kwargs) -> dict:  # noqa: D102
+        raise NotImplementedError
+    
     def inspect_geometry(self, **kwargs) -> dict:  # noqa: D102
         raise NotImplementedError
 

src/ansys/geometry/core/tools/repair_tools.py

@@ -24,7 +24,6 @@
 from typing import TYPE_CHECKING
 
 from ansys.geometry.core.connection import GrpcClient
-from ansys.geometry.core.errors import protect_grpc
 from ansys.geometry.core.misc.auxiliary import (
     get_bodies_from_ids,
     get_design_from_body,
@@ -36,6 +35,7 @@
     check_type_all_elements_in_iterable,
     min_backend_version,
 )
+from ansys.geometry.core.misc.measurements import Angle, Distance
 from ansys.geometry.core.tools.check_geometry import GeometryIssue, InspectResult
 from ansys.geometry.core.tools.problem_areas import (
     DuplicateFaceProblemAreas,
@@ -65,7 +65,6 @@ def __init__(self, grpc_client: GrpcClient, modeler: "Modeler"):
         self._modeler = modeler
         self._grpc_client = grpc_client
 
-    @protect_grpc
     def find_split_edges(
         self, bodies: list["Body"], angle: Real = 0.0, length: Real = 0.0
     ) -> list[SplitEdgeProblemAreas]:
@@ -107,7 +106,6 @@ def find_split_edges(
             for res in problem_areas_response["problems"]
         ]
 
-    @protect_grpc
     def find_extra_edges(self, bodies: list["Body"]) -> list[ExtraEdgeProblemAreas]:
         """Find the extra edges in the given list of bodies.
 
@@ -142,7 +140,6 @@ def find_extra_edges(self, bodies: list["Body"]) -> list[ExtraEdgeProblemAreas]:
             for res in problem_areas_response["problems"]
         ]
 
-    @protect_grpc
     def find_inexact_edges(self, bodies: list["Body"]) -> list[InexactEdgeProblemAreas]:
         """Find inexact edges in the given list of bodies.
 
@@ -178,7 +175,6 @@ def find_inexact_edges(self, bodies: list["Body"]) -> list[InexactEdgeProblemAre
             for res in problem_areas_response["problems"]
         ]
 
-    @protect_grpc
     def find_short_edges(
         self, bodies: list["Body"], length: Real = 0.0
     ) -> list[ShortEdgeProblemAreas]:
@@ -216,7 +212,6 @@ def find_short_edges(
             for res in problem_areas_response["problems"]
         ]
 
-    @protect_grpc
     def find_duplicate_faces(self, bodies: list["Body"]) -> list[DuplicateFaceProblemAreas]:
         """Find the duplicate face problem areas.
 
@@ -251,8 +246,12 @@ def find_duplicate_faces(self, bodies: list["Body"]) -> list[DuplicateFaceProble
             for res in problem_areas_response["problems"]
         ]
 
-    @protect_grpc
-    def find_missing_faces(self, bodies: list["Body"]) -> list[MissingFaceProblemAreas]:
+    def find_missing_faces(
+        self,
+        bodies: list["Body"],
+        angle: Angle = None,
+        distance: Distance = None,
+    )-> list[MissingFaceProblemAreas]:
         """Find the missing faces.
 
         This method find the missing face problem areas and returns a list of missing
@@ -262,6 +261,10 @@ def find_missing_faces(self, bodies: list["Body"]) -> list[MissingFaceProblemAre
         ----------
         bodies : list[Body]
             List of bodies that missing faces are investigated on.
+        angle : Angle, optional
+            The minimum angle between faces. By default, None.
+        distance : Distance, optional
+            The minimum distance between faces. By default, None.
 
         Returns
         -------
@@ -272,7 +275,9 @@ def find_missing_faces(self, bodies: list["Body"]) -> list[MissingFaceProblemAre
             return []
         body_ids = [body.id for body in bodies]
         problem_areas_response = self._grpc_client.services.repair_tools.find_missing_faces(
-            faces=body_ids
+            faces=body_ids,
+            angle=angle.value if angle is not None else None,
+            distance=distance.value if distance is not None else None,
         )
         parent_design = get_design_from_body(bodies[0])
 
@@ -285,7 +290,6 @@ def find_missing_faces(self, bodies: list["Body"]) -> list[MissingFaceProblemAre
             for res in problem_areas_response["problems"]
         ]
 
-    @protect_grpc
     def find_small_faces(self, bodies: list["Body"]) -> list[SmallFaceProblemAreas]:
         """Find the small face problem areas.
 
@@ -320,8 +324,11 @@ def find_small_faces(self, bodies: list["Body"]) -> list[SmallFaceProblemAreas]:
             for res in problem_areas_response["problems"]
         ]
 
-    @protect_grpc
-    def find_stitch_faces(self, bodies: list["Body"]) -> list[StitchFaceProblemAreas]:
+    def find_stitch_faces(
+        self,
+        bodies: list["Body"],
+        max_distance: Distance = None,
+    ) -> list[StitchFaceProblemAreas]:
         """Return the list of stitch face problem areas.
 
         This method find the stitch face problem areas and returns a list of ids of stitch face
@@ -331,6 +338,8 @@ def find_stitch_faces(self, bodies: list["Body"]) -> list[StitchFaceProblemAreas
         ----------
         bodies : list[Body]
             List of bodies that stitchable faces are investigated on.
+        max_distance : Distance, optional
+            Maximum distance between faces. By default, None.
 
         Returns
         -------
@@ -339,7 +348,8 @@ def find_stitch_faces(self, bodies: list["Body"]) -> list[StitchFaceProblemAreas
         """
         body_ids = [body.id for body in bodies]
         problem_areas_response = self._grpc_client.services.repair_tools.find_stitch_faces(
-            faces=body_ids
+            faces=body_ids,
+            distance=max_distance.value if max_distance is not None else None,
         )
         parent_design = get_design_from_body(bodies[0])
         return [
@@ -351,7 +361,6 @@ def find_stitch_faces(self, bodies: list["Body"]) -> list[StitchFaceProblemAreas
             for res in problem_areas_response["problems"]
         ]
 
-    @protect_grpc
     @min_backend_version(25, 2, 0)
     def find_simplify(self, bodies: list["Body"]) -> list[UnsimplifiedFaceProblemAreas]:
         """Detect faces in a body that can be simplified.
@@ -385,7 +394,6 @@ def find_simplify(self, bodies: list["Body"]) -> list[UnsimplifiedFaceProblemAre
             for res in problem_areas_response["problems"]
         ]
 
-    @protect_grpc
     @min_backend_version(25, 2, 0)
     def find_interferences(
         self, bodies: list["Body"], cut_smaller_body: bool = False
@@ -435,7 +443,6 @@ def find_interferences(
             for res in problem_areas_response["problems"]
         ]
 
-    @protect_grpc
     @min_backend_version(25, 2, 0)
     def find_and_fix_short_edges(
         self, bodies: list["Body"], length: Real = 0.0, comprehensive_result: bool = False
@@ -489,7 +496,6 @@ def find_and_fix_short_edges(
         )
         return message
 
-    @protect_grpc
     @min_backend_version(25, 2, 0)
     def find_and_fix_extra_edges(
         self, bodies: list["Body"], comprehensive_result: bool = False
@@ -540,7 +546,6 @@ def find_and_fix_extra_edges(
         )
         return message
 
-    @protect_grpc
     @min_backend_version(25, 2, 0)
     def find_and_fix_split_edges(
         self,
@@ -602,7 +607,6 @@ def find_and_fix_split_edges(
         )
         return message
 
-    @protect_grpc
     @min_backend_version(25, 2, 0)
     def find_and_fix_simplify(
         self, bodies: list["Body"], comprehensive_result: bool = False
@@ -652,6 +656,73 @@ def find_and_fix_simplify(
         )
         return message
 
+    @min_backend_version(25, 2, 0)
+    def find_and_fix_stitch_faces(
+        self,
+        bodies: list["Body"],
+        max_distance: Distance = None,
+        allow_multiple_bodies: bool = False,
+        maintain_components: bool = True,
+        check_for_coincidence: bool = False,
+        comprehensive_result: bool = False,
+    ) -> RepairToolMessage:
+        """Find and fix the stitch face problem areas.
+        
+        Parameters
+        ----------
+        bodies : list[Body]
+            List of bodies that stitchable faces are investigated on.
+        max_distance : Real, optional
+            The maximum distance between faces to be stitched.
+            By default, 0.0001.
+        allow_multiple_bodies : bool, optional
+            Whether to allow multiple bodies in the result.
+            By default, False.
+        maintain_components : bool, optional
+            Whether to stitch bodies within the components.
+            By default, True.
+        check_for_coincidence : bool, optional
+            Whether coincidence surfaces are searched.
+            By default, False.
+        comprehensive_result : bool, optional
+            Whether to fix all problem areas individually.
+            By default, False.
+
+        Returns
+        -------
+        RepairToolMessage
+            Message containing number of problem areas found/fixed, created and/or modified bodies.
+
+        Notes
+        -----
+        This method finds the stitchable faces and fixes them.
+        """
+        from ansys.geometry.core.designer.body import Body
+
+        check_type_all_elements_in_iterable(bodies, Body)
+
+        body_ids = [body.id for body in bodies]
+
+        response = self._grpc_client.services.repair_tools.find_and_fix_stitch_faces(
+            body_ids=body_ids,
+            max_distance=max_distance.value if max_distance is not None else None,
+            allow_multiple_bodies=allow_multiple_bodies,
+            maintain_components=maintain_components,
+            check_for_coincidence=check_for_coincidence,
+            comprehensive_result=comprehensive_result,
+        )
+
+        parent_design = get_design_from_body(bodies[0])
+        parent_design._update_design_inplace()
+        message = RepairToolMessage(
+            response.get("success"),
+            response.get("created_bodies_monikers"),
+            response.get("modified_bodies_monikers"),
+            response.get("found"),
+            response.get("repaired"),
+        )
+        return message
+
     def inspect_geometry(self, bodies: list["Body"] = None) -> list[InspectResult]:
         """Return a list of geometry issues organized by body.
 
@@ -715,7 +786,6 @@ def __create_issues_from_response(
             issues.append(geometry_issue)
         return issues
 
-    @protect_grpc
     @min_backend_version(25, 2, 0)
     def repair_geometry(self, bodies: list["Body"] = None) -> RepairToolMessage:
         """Attempt to repair the geometry for the given bodies.

tests/integration/test_repair_tools.py

@@ -285,6 +285,32 @@ def test_fix_interference(modeler: Modeler):
     assert result.success is True
 
 
+def test_find_and_fix_stitch_faces(modeler: Modeler):
+    """Test to find and fix stitch faces and validate that we get a solid."""
+    design = modeler.open_file(FILES_DIR / "stitch_1200_bodies.dsco")
+    assert len(design.bodies) == 3600
+
+    stitch_faces = modeler.repair_tools.find_and_fix_stitch_faces(design.bodies)
+    assert stitch_faces.found == 1
+    assert stitch_faces.repaired == 1
+
+    assert len(design.bodies) == 1200
+
+
+def test_find_and_fix_stitch_faces_comprehensive(modeler: Modeler):
+    """Test to find and fix stitch faces and validate that we get a solid."""
+    design = modeler.open_file(FILES_DIR / "stitch_1200_bodies.dsco")
+    assert len(design.bodies) == 3600
+
+    stitch_faces = modeler.repair_tools.find_and_fix_stitch_faces(
+        design.bodies, comprehensive_result=True
+    )
+    assert stitch_faces.found == 1200
+    assert stitch_faces.repaired == 1200
+
+    assert len(design.bodies) == 1200
+
+
 def test_find_and_fix_duplicate_faces(modeler: Modeler):
     """Test to read geometry, find and fix duplicate faces and validate they are removed."""
     design = modeler.open_file(FILES_DIR / "DuplicateFaces.scdocx")