chore: fix repair/prepare v1 issues (#2456)

Co-authored-by: PyAnsys CI Bot <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Jacob Kerstetter <[email protected]>
Co-authored-by: Jacob Kerstetter <[email protected]>

Author: 4 people

doc/changelog.d/2456.maintenance.md

@@ -0,0 +1 @@
+Chore: fix repair/prepare v1 issues

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

@@ -29,6 +29,7 @@
 from ..base.conversions import from_measurement_to_server_angle, from_measurement_to_server_length
 from ..base.repair_tools import GRPCRepairToolsService
 from .conversions import (
+    build_grpc_id,
     serialize_tracker_command_response,
 )
 
@@ -517,7 +518,9 @@ def inspect_geometry(self, **kwargs) -> dict:  # noqa: D102
         from ansys.api.geometry.v0.repairtools_pb2 import InspectGeometryRequest
 
         # Create the request - assumes all inputs are valid and of the proper type
-        request = InspectGeometryRequest(bodies=kwargs.get("bodies", []))
+        request = InspectGeometryRequest(
+            bodies=[build_grpc_id(id) for id in kwargs.get("body_ids", [])]
+        )
 
         # Call the gRPC service
         inspect_result_response = self.stub.InspectGeometry(request)
@@ -530,7 +533,9 @@ def repair_geometry(self, **kwargs) -> dict:  # noqa: D102
         from ansys.api.geometry.v0.repairtools_pb2 import RepairGeometryRequest
 
         # Create the request - assumes all inputs are valid and of the proper type
-        request = RepairGeometryRequest(bodies=kwargs.get("bodies"))
+        request = RepairGeometryRequest(
+            bodies=[build_grpc_id(id) for id in kwargs.get("body_ids", [])]
+        )
 
         # Call the gRPC service
         response = self.stub.RepairGeometry(request)

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

@@ -48,7 +48,6 @@
     DatumPointEntity as GRPCDesignPoint,
     DrivingDimensionEntity as GRPCDrivingDimension,
     EdgeTessellation as GRPCEdgeTessellation,
-    EnhancedRepairToolMessage as GRPCEnhancedRepairToolResponse,
     Geometries as GRPCGeometries,
     Knot as GRPCKnot,
     MaterialEntity as GRPCMaterial,
@@ -72,6 +71,9 @@
 from ansys.api.discovery.v1.operations.prepare_pb2 import (
     EnclosureOptions as GRPCEnclosureOptions,
 )
+from ansys.api.discovery.v1.operations.repair_pb2 import (
+    RepairToolMessage as GRPCRepairToolResponse,
+)
 import pint
 
 from ansys.geometry.core.errors import GeometryRuntimeError
@@ -1728,68 +1730,39 @@ def serialize_entity_identifier(entity):
     }
 
 
-def get_standard_tracker_response(response) -> dict:
-    """Get a standard dictionary response from a TrackerCommandResponse gRPC object.
-
-    Parameters
-    ----------
-    response : TrackerCommandResponse
-        The gRPC TrackerCommandResponse object.
-
-    Returns
-    -------
-    dict
-        A dictionary representing the standard tracker response
-    """
-    return {
-        "success": response.command_response.success,
-        "tracker_response": serialize_tracked_command_response(response.tracked_changes),
-    }
-
-
-def get_tracker_response_with_created_bodies(response) -> dict:
-    """Get a dictionary response from a TrackerCommandResponse gRPC object including created bodies.
-
-    Parameters
-    ----------
-    response : TrackerCommandResponse
-        The gRPC TrackerCommandResponse object.
-
-    Returns
-    -------
-    dict
-        A dictionary representing the tracker response with created bodies.
-    """
-    serialized_response = get_standard_tracker_response(response)
-    serialized_response["created_bodies"] = serialized_response["tracker_response"].get(
-        "created_bodies", []
-    )
-    return serialized_response
-
-
-def serialize_repair_command_response(response: GRPCEnhancedRepairToolResponse) -> dict:
-    """Serialize a EnhancedRepairToolResponse object into a dictionary.
+def serialize_repair_command_response(response: GRPCRepairToolResponse) -> dict:
+    """Serialize a RepairToolResponse object into a dictionary.
 
     Parameters
     ----------
-    response : GRPCEnhancedRepairToolResponse
-        The gRPC EnhancedRepairToolResponse object to serialize.
-        A dictionary representation of the EnhancedRepairToolResponse object.
+    response : GRPCRepairToolResponse
+        The gRPC RepairToolResponse object to serialize.
+        A dictionary representation of the RepairToolResponse object.
     """
     return {
         "success": response.tracked_command_response.command_response.success,
-        "found": response.found,
-        "repaired": response.repaired,
-        "complete_command_response": serialize_tracked_command_response(response.tracked_changes),
+        "found": getattr(response, "found", -1),
+        "repaired": getattr(response, "repaired", -1),
+        "complete_command_response": serialize_tracked_command_response(
+            response.tracked_command_response
+        ),
         "created_bodies_monikers": [
-            created_body.id for created_body in response.tracked_changes.get("created_bodies", [])
+            created_body.id.id
+            for created_body in getattr(
+                response.tracked_command_response.tracked_changes, "created_bodies", []
+            )
         ],
         "modified_bodies_monikers": [
-            modified_body.id
-            for modified_body in response.tracked_changes.get("modified_bodies", [])
+            modified_body.id.id
+            for modified_body in getattr(
+                response.tracked_command_response.tracked_changes, "modified_bodies", []
+            )
         ],
         "deleted_bodies_monikers": [
-            deleted_body.id for deleted_body in response.tracked_changes.get("deleted_bodies", [])
+            deleted_body.id
+            for deleted_body in getattr(
+                response.tracked_command_response.tracked_changes, "deleted_bodies", []
+            )
         ],
     }
 

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

@@ -31,7 +31,6 @@
     build_grpc_id,
     from_enclosure_options_to_grpc_enclosure_options,
     from_length_to_grpc_quantity,
-    get_standard_tracker_response,
     serialize_tracked_command_response,
 )
 
@@ -142,14 +141,14 @@ def enhanced_share_topology(self, **kwargs) -> dict:  # noqa: D102
         )
 
         # Call the gRPC service
-        response = self.stub.EnhancedShareTopology(request).response_data
+        response = self.stub.EnhancedShareTopology(request)
         tracked_response = serialize_tracked_command_response(response.tracked_command_response)
 
         # Return the response - formatted as a dictionary
         return {
             "success": response.tracked_command_response.command_response.success,
-            "found": response.found,
-            "repaired": response.repaired,
+            "found": getattr(response, "found", -1),
+            "repaired": getattr(response, "repaired", -1),
             "created_bodies_monikers": [
                 created_body.get("id").id
                 for created_body in tracked_response.get("created_bodies", [])
@@ -190,13 +189,16 @@ def find_logos(self, **kwargs) -> dict:  # noqa: D102
 
         # Return the response - formatted as a dictionary
         return {
-            "id": response.id,
+            "id": getattr(response, "id", None),
             "face_ids": [face.id for face in response.logo_faces],
         }
 
     @protect_grpc
     def find_and_remove_logos(self, **kwargs) -> dict:  # noqa: D102
-        from ansys.api.discovery.v1.operations.prepare_pb2 import FindLogoOptions, FindLogosRequest
+        from ansys.api.discovery.v1.operations.prepare_pb2 import (
+            FindAndRemoveLogosRequest,
+            FindLogoOptions,
+        )
 
         # Check height objects
         min_height = (
@@ -211,7 +213,7 @@ def find_and_remove_logos(self, **kwargs) -> dict:  # noqa: D102
         )
 
         # Create the request - assumes all inputs are valid and of the proper type
-        request = FindLogosRequest(
+        request = FindAndRemoveLogosRequest(
             body_ids=[build_grpc_id(body) for body in kwargs["bodies"]],
             options=FindLogoOptions(
                 min_height=min_height,
@@ -223,7 +225,7 @@ def find_and_remove_logos(self, **kwargs) -> dict:  # noqa: D102
         response = self.stub.FindAndRemoveLogos(request)
 
         # Return the response - formatted as a dictionary
-        return get_standard_tracker_response(response)
+        return {"success": response.tracked_command_response.command_response.success}
 
     @protect_grpc
     def remove_logo(self, **kwargs):  # noqa: D102
@@ -238,7 +240,7 @@ def remove_logo(self, **kwargs):  # noqa: D102
         response = self.stub.RemoveLogo(request)
 
         # Return the response - formatted as a dictionary
-        return get_standard_tracker_response(response)
+        return {"success": response.tracked_command_response.command_response.success}
 
     @protect_grpc
     def detect_helixes(self, **kwargs) -> dict:  # noqa: D102

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

@@ -157,7 +157,7 @@ def find_missing_faces(self, **kwargs) -> dict:  # noqa: D102
         response = self.stub.FindMissingFaces(request)
 
         # Return the response - formatted as a dictionary
-        return response_problem_area_for_face(response)
+        return response_problem_area_for_edge(response)
 
     @protect_grpc
     def find_small_faces(self, **kwargs) -> dict:  # noqa: D102
@@ -241,7 +241,7 @@ def find_and_fix_short_edges(self, **kwargs):  # noqa: D102
         # Call the gRPC service
         response = self.stub.FindAndFixShortEdges(request)
 
-        return serialize_repair_command_response(response.response_data)
+        return serialize_repair_command_response(response.result)
 
     @protect_grpc
     def find_and_fix_extra_edges(self, **kwargs) -> dict:  # noqa: D102
@@ -256,7 +256,7 @@ def find_and_fix_extra_edges(self, **kwargs) -> dict:  # noqa: D102
         # Call the gRPC service
         response = self.stub.FindAndFixExtraEdges(request)
 
-        return serialize_repair_command_response(response.response_data)
+        return serialize_repair_command_response(response.result)
 
     @protect_grpc
     def find_and_fix_split_edges(self, **kwargs) -> dict:  # noqa: D102
@@ -272,7 +272,7 @@ def find_and_fix_split_edges(self, **kwargs) -> dict:  # noqa: D102
         # Call the gRPC service
         response = self.stub.FindAndFixSplitEdges(request)
 
-        return serialize_repair_command_response(response.response_data)
+        return serialize_repair_command_response(response.result)
 
     @protect_grpc
     def find_and_fix_simplify(self, **kwargs) -> dict:  # noqa: D102
@@ -287,7 +287,7 @@ def find_and_fix_simplify(self, **kwargs) -> dict:  # noqa: D102
         # Call the gRPC service
         response = self.stub.FindAndSimplify(request)
 
-        return serialize_repair_command_response(response.response_data)
+        return serialize_repair_command_response(response.result)
 
     @protect_grpc
     def find_and_fix_stitch_faces(self, **kwargs) -> dict:  # noqa: D102
@@ -308,7 +308,7 @@ def find_and_fix_stitch_faces(self, **kwargs) -> dict:  # noqa: D102
         # Call the gRPC service
         response = self.stub.FindAndFixStitchFaces(request)
 
-        return serialize_repair_command_response(response.response_data)
+        return serialize_repair_command_response(response.result)
 
     @protect_grpc
     def inspect_geometry(self, **kwargs) -> dict:  # noqa: D102
@@ -331,14 +331,14 @@ def repair_geometry(self, **kwargs) -> dict:  # noqa: D102
 
         # Create the request - assumes all inputs are valid and of the proper type
         request = RepairGeometryRequest(
-            body_ids=[build_grpc_id(body) for body in kwargs.get("bodies")]
+            body_ids=[build_grpc_id(body) for body in kwargs.get("body_ids")]
         )
 
         # Call the gRPC service
         response = self.stub.RepairGeometry(request)
 
         # Return the response - formatted as a dictionary
-        return serialize_repair_command_response(response)
+        return serialize_repair_command_response(response.result)
 
     @protect_grpc
     def fix_duplicate_faces(self, **kwargs) -> dict:  # noqa: D102
@@ -473,7 +473,7 @@ def fix_unsimplified_faces(self, **kwargs) -> dict:  # noqa: D102
         response = self.stub.FixAdjustSimplify(request)
 
         # Return the response - formatted as a dictionary
-        return serialize_repair_command_response(response)
+        return serialize_repair_command_response(response.result)
 
     @protect_grpc
     def fix_interference(self, **kwargs) -> dict:  # noqa: D102
@@ -493,7 +493,7 @@ def fix_interference(self, **kwargs) -> dict:  # noqa: D102
     def __serialize_inspect_result_response(self, response) -> dict:  # noqa: D102
         def serialize_body(body):
             return {
-                "id": body.id,
+                "id": body.id.id,
                 "name": body.name,
                 "can_suppress": body.can_suppress,
                 "transform_to_master": {
@@ -502,13 +502,13 @@ def serialize_body(body):
                     "m22": body.transform_to_master.m22,
                     "m33": body.transform_to_master.m33,
                 },
-                "master_id": body.master_id,
-                "parent_id": body.parent_id,
+                "master_id": body.master_id.id,
+                "parent_id": body.parent_id.id,
             }
 
         def serialize_face(face):
             return {
-                "id": face.id,
+                "id": face.id.id,
                 "surface_type": face.surface_type,
                 "export_id": face.export_id,
                 "is_reversed": getattr(face, "is_reversed", False),
@@ -517,7 +517,7 @@ def serialize_face(face):
 
         def serialize_edge(edge):
             return {
-                "id": edge.id,
+                "id": edge.id.id,
                 "curve_type": edge.curve_type,
                 "export_id": edge.export_id,
                 "length": edge.length,