refactor to match new grpc architecture

Author: jacobrkerstetter

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

@@ -173,8 +173,9 @@ def find_missing_faces(self, **kwargs) -> dict:  # noqa: D102
 
         request = FindMissingFacesRequest(
             faces=kwargs["faces"],
-            angle=DoubleValue(value=kwargs["angle"]),
-            distance=DoubleValue(value=kwargs["distance"]),
+            angle=DoubleValue(value=kwargs["angle"].value) if kwargs["angle"] is not None else None,
+            distance=DoubleValue(value=kwargs["distance"].value)
+                if kwargs["distance"] is not None else None,
         )
 
         # Call the gRPC service
@@ -216,7 +217,8 @@ def find_stitch_faces(self, **kwargs) -> dict:  # noqa: D102
 
         request = FindStitchFacesRequest(
             faces=kwargs["faces"],
-            maximum_distance=DoubleValue(value=kwargs["distance"])
+            maximum_distance=DoubleValue(value=kwargs["distance"].value) 
+                if kwargs["distance"] is not None else None
         )
 
         # Call the gRPC service
@@ -278,7 +280,8 @@ def find_and_fix_stitch_faces(self, **kwargs) -> dict:  # noqa: D102
         # Create the gRPC request
         request = FindStitchFacesRequest(
             faces=kwargs["body_ids"],
-            maximum_distance=DoubleValue(value=kwargs["max_distance"]),
+            maximum_distance=DoubleValue(value=kwargs["max_distance"])
+                if kwargs["max_distance"] is not None else None,
             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"]),

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

@@ -99,11 +99,11 @@ def find_split_edges(
         parent_design = get_design_from_body(bodies[0])
         return [
             SplitEdgeProblemAreas(
-                f"{res['id']}",
+                f"{res.get('id')}",
                 self._grpc_client,
-                get_edges_from_ids(parent_design, res["edges"]),
+                get_edges_from_ids(parent_design, res.get("edges")),
             )
-            for res in problem_areas_response["problems"]
+            for res in problem_areas_response.get("problems")
         ]
 
     def find_extra_edges(self, bodies: list["Body"]) -> list[ExtraEdgeProblemAreas]:
@@ -133,11 +133,11 @@ def find_extra_edges(self, bodies: list["Body"]) -> list[ExtraEdgeProblemAreas]:
 
         return [
             ExtraEdgeProblemAreas(
-                f"{res['id']}",
+                f"{res.get('id')}",
                 self._grpc_client,
-                get_edges_from_ids(parent_design, res["edges"]),
+                get_edges_from_ids(parent_design, res.get("edges")),
             )
-            for res in problem_areas_response["problems"]
+            for res in problem_areas_response.get("problems")
         ]
 
     def find_inexact_edges(self, bodies: list["Body"]) -> list[InexactEdgeProblemAreas]:
@@ -168,11 +168,11 @@ def find_inexact_edges(self, bodies: list["Body"]) -> list[InexactEdgeProblemAre
 
         return [
             InexactEdgeProblemAreas(
-                f"{res['id']}",
+                f"{res.get('id')}",
                 self._grpc_client,
-                get_edges_from_ids(parent_design, res["edges"]),
+                get_edges_from_ids(parent_design, res.get("edges")),
             )
-            for res in problem_areas_response["problems"]
+            for res in problem_areas_response.get("problems")
         ]
 
     def find_short_edges(
@@ -205,11 +205,11 @@ def find_short_edges(
         parent_design = get_design_from_body(bodies[0])
         return [
             ShortEdgeProblemAreas(
-                f"{res['id']}",
+                f"{res.get('id')}",
                 self._grpc_client,
-                get_edges_from_ids(parent_design, res["edges"]),
+                get_edges_from_ids(parent_design, res.get("edges")),
             )
-            for res in problem_areas_response["problems"]
+            for res in problem_areas_response.get("problems")
         ]
 
     def find_duplicate_faces(self, bodies: list["Body"]) -> list[DuplicateFaceProblemAreas]:
@@ -239,11 +239,11 @@ def find_duplicate_faces(self, bodies: list["Body"]) -> list[DuplicateFaceProble
         parent_design = get_design_from_body(bodies[0])
         return [
             DuplicateFaceProblemAreas(
-                f"{res['id']}",
+                f"{res.get('id')}",
                 self._grpc_client,
-                get_faces_from_ids(parent_design, res["faces"]),
+                get_faces_from_ids(parent_design, res.get("faces")),
             )
-            for res in problem_areas_response["problems"]
+            for res in problem_areas_response.get("problems")
         ]
 
     def find_missing_faces(
@@ -276,18 +276,18 @@ def find_missing_faces(
         body_ids = [body.id for body in bodies]
         problem_areas_response = self._grpc_client.services.repair_tools.find_missing_faces(
             faces=body_ids,
-            angle=angle.value if angle is not None else None,
-            distance=distance.value if distance is not None else None,
+            angle=angle,
+            distance=distance,
         )
         parent_design = get_design_from_body(bodies[0])
 
         return [
             MissingFaceProblemAreas(
-                f"{res['id']}",
+                f"{res.get('id')}",
                 self._grpc_client,
-                get_edges_from_ids(parent_design, res["edges"]),
+                get_edges_from_ids(parent_design, res.get("edges")),
             )
-            for res in problem_areas_response["problems"]
+            for res in problem_areas_response.get("problems")
         ]
 
     def find_small_faces(self, bodies: list["Body"]) -> list[SmallFaceProblemAreas]:
@@ -317,11 +317,11 @@ def find_small_faces(self, bodies: list["Body"]) -> list[SmallFaceProblemAreas]:
 
         return [
             SmallFaceProblemAreas(
-                f"{res['id']}",
+                f"{res.get('id')}",
                 self._grpc_client,
-                get_faces_from_ids(parent_design, res["faces"]),
+                get_faces_from_ids(parent_design, res.get("faces")),
             )
-            for res in problem_areas_response["problems"]
+            for res in problem_areas_response.get("problems")
         ]
 
     def find_stitch_faces(
@@ -349,16 +349,16 @@ def find_stitch_faces(
         body_ids = [body.id for body in bodies]
         problem_areas_response = self._grpc_client.services.repair_tools.find_stitch_faces(
             faces=body_ids,
-            distance=max_distance.value if max_distance is not None else None,
+            distance=max_distance,
         )
         parent_design = get_design_from_body(bodies[0])
         return [
             StitchFaceProblemAreas(
-                f"{res['id']}",
+                f"{res.get('id')}",
                 self._grpc_client,
-                get_bodies_from_ids(parent_design, res["bodies"]),
+                get_bodies_from_ids(parent_design, res.get("bodies")),
             )
-            for res in problem_areas_response["problems"]
+            for res in problem_areas_response.get("problems")
         ]
 
     @min_backend_version(25, 2, 0)
@@ -387,11 +387,11 @@ def find_simplify(self, bodies: list["Body"]) -> list[UnsimplifiedFaceProblemAre
 
         return [
             UnsimplifiedFaceProblemAreas(
-                f"{res['id']}",
+                f"{res.get('id')}",
                 self._grpc_client,
-                get_faces_from_ids(parent_design, res["bodies"]),
+                get_faces_from_ids(parent_design, res.get("bodies")),
             )
-            for res in problem_areas_response["problems"]
+            for res in problem_areas_response.get("problems")
         ]
 
     @min_backend_version(25, 2, 0)
@@ -436,11 +436,11 @@ def find_interferences(
 
         return [
             InterferenceProblemAreas(
-                f"{res['id']}",
+                f"{res.get('id')}",
                 self._grpc_client,
-                get_bodies_from_ids(parent_design, res["bodies"]),
+                get_bodies_from_ids(parent_design, res.get("bodies")),
             )
-            for res in problem_areas_response["problems"]
+            for res in problem_areas_response.get("problems")
         ]
 
     @min_backend_version(25, 2, 0)
@@ -488,9 +488,9 @@ def find_and_fix_short_edges(
         parent_design = get_design_from_body(bodies[0])
         parent_design._update_design_inplace()
         message = RepairToolMessage(
-            success=response["success"],
-            found=response["found"],
-            repaired=response["repaired"],
+            success=response.get("success"),
+            found=response.get("found"),
+            repaired=response.get("repaired"),
             created_bodies=[],
             modified_bodies=[],
         )
@@ -538,11 +538,11 @@ def find_and_fix_extra_edges(
         parent_design = get_design_from_body(bodies[0])
         parent_design._update_design_inplace()
         message = RepairToolMessage(
-            response["success"],
-            response["created_bodies_monikers"],
-            response["modified_bodies_monikers"],
-            response["found"],
-            response["repaired"],
+            response.get("success"),
+            response.get("created_bodies_monikers"),
+            response.get("modified_bodies_monikers"),
+            response.get("found"),
+            response.get("repaired"),
         )
         return message
 
@@ -599,11 +599,11 @@ def find_and_fix_split_edges(
         parent_design = get_design_from_body(bodies[0])
         parent_design._update_design_inplace()
         message = RepairToolMessage(
-            response["success"],
-            response["created_bodies_monikers"],
-            response["modified_bodies_monikers"],
-            response["found"],
-            response["repaired"],
+            response.get("success"),
+            response.get("created_bodies_monikers"),
+            response.get("modified_bodies_monikers"),
+            response.get("found"),
+            response.get("repaired"),
         )
         return message
 
@@ -648,11 +648,11 @@ def find_and_fix_simplify(
         parent_design = get_design_from_body(bodies[0])
         parent_design._update_design_inplace()
         message = RepairToolMessage(
-            response["success"],
-            response["created_bodies_monikers"],
-            response["modified_bodies_monikers"],
-            response["found"],
-            response["repaired"],
+            response.get("success"),
+            response.get("created_bodies_monikers"),
+            response.get("modified_bodies_monikers"),
+            response.get("found"),
+            response.get("repaired"),
         )
         return message
 
@@ -705,7 +705,7 @@ def find_and_fix_stitch_faces(
 
         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,
+            max_distance=max_distance,
             allow_multiple_bodies=allow_multiple_bodies,
             maintain_components=maintain_components,
             check_for_coincidence=check_for_coincidence,
@@ -746,7 +746,7 @@ def inspect_geometry(self, bodies: list["Body"] = None) -> list[InspectResult]:
             parent_design=parent_design, bodies=body_ids
         )
         return self.__create_inspect_result_from_response(
-            parent_design, inspect_result_response_dict["issues_by_body"]
+            parent_design, inspect_result_response_dict.get("issues_by_body")
         )
 
     def __create_inspect_result_from_response(
@@ -755,7 +755,7 @@ def __create_inspect_result_from_response(
         inspect_results = []
         for inspect_geometry_result in inspect_geometry_results:
             body = get_bodies_from_ids(design, [inspect_geometry_result["body"]["id"]])
-            issues = self.__create_issues_from_response(inspect_geometry_result["issues"])
+            issues = self.__create_issues_from_response(inspect_geometry_result.get("issues"))
             inspect_result = InspectResult(
                 grpc_client=self._grpc_client, body=body[0], issues=issues
             )
@@ -769,9 +769,9 @@ def __create_issues_from_response(
     ) -> list[GeometryIssue]:
         issues = []
         for issue in inspect_geometry_result_issues:
-            message_type = issue["message_type"]
-            message_id = issue["message_id"]
-            message = issue["message"]
+            message_type = issue.get("message_type")
+            message_id = issue.get("message_id")
+            message = issue.get("message")
 
             faces = [face["id"] for face in issue.get("faces", [])]
             edges = [edge["id"] for edge in issue.get("edges", [])]
@@ -808,5 +808,5 @@ def repair_geometry(self, bodies: list["Body"] = None) -> RepairToolMessage:
             bodies=body_ids
         )
 
-        message = RepairToolMessage(repair_result_response["success"], [], [])
+        message = RepairToolMessage(repair_result_response.get("success"), [], [])
         return message

tests/integration/test_repair_tools.py

@@ -436,32 +436,6 @@ def test_find_and_stitch_and_missing_faces(modeler: Modeler):
     assert not design.bodies[0].is_surface
 
 
-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_simplify(modeler: Modeler):
     """Test to read geometry and find it's unsimplified face problem areas."""
     design = modeler.open_file(FILES_DIR / "SOBracket2_HalfModel.scdocx")