reverting v1 hardcode

fixing some conversions and small bugs

Author: jacobrkerstetter

src/ansys/geometry/core/_grpc/_services/_service.py

@@ -410,16 +410,15 @@ def edges(self) -> GRPCEdgesService:
             # Import the appropriate edges service based on the version
             from .v0.edges import GRPCEdgesServiceV0
             from .v1.edges import GRPCEdgesServiceV1
-            self._edges = GRPCEdgesServiceV1(self.channel)
 
-            # if self.version == GeometryApiProtos.V0:
-            #     self._edges = GRPCEdgesServiceV0(self.channel)
-            # elif self.version == GeometryApiProtos.V1:  # pragma: no cover
-            #     # V1 is not implemented yet
-            #     self._edges = GRPCEdgesServiceV1(self.channel)
-            # else:  # pragma: no cover
-            #     # This should never happen as the version is set in the constructor
-            #     raise ValueError(f"Unsupported version: {self.version}")
+            if self.version == GeometryApiProtos.V0:
+                self._edges = GRPCEdgesServiceV0(self.channel)
+            elif self.version == GeometryApiProtos.V1:  # pragma: no cover
+                # V1 is not implemented yet
+                self._edges = GRPCEdgesServiceV1(self.channel)
+            else:  # pragma: no cover
+                # This should never happen as the version is set in the constructor
+                raise ValueError(f"Unsupported version: {self.version}")
 
         return self._edges
 
@@ -437,16 +436,15 @@ def faces(self) -> GRPCFacesService:
             # Import the appropriate faces service based on the version
             from .v0.faces import GRPCFacesServiceV0
             from .v1.faces import GRPCFacesServiceV1
-            self._faces = GRPCFacesServiceV1(self.channel)
-
-            # if self.version == GeometryApiProtos.V0:
-            #     self._faces = GRPCFacesServiceV0(self.channel)
-            # elif self.version == GeometryApiProtos.V1:  # pragma: no cover
-            #     # V1 is not implemented yet
-            #     self._faces = GRPCFacesServiceV1(self.channel)
-            # else:  # pragma: no cover
-            #     # This should never happen as the version is set in the constructor
-            #     raise ValueError(f"Unsupported version: {self.version}")
+
+            if self.version == GeometryApiProtos.V0:
+                self._faces = GRPCFacesServiceV0(self.channel)
+            elif self.version == GeometryApiProtos.V1:  # pragma: no cover
+                # V1 is not implemented yet
+                self._faces = GRPCFacesServiceV1(self.channel)
+            else:  # pragma: no cover
+                # This should never happen as the version is set in the constructor
+                raise ValueError(f"Unsupported version: {self.version}")
 
         return self._faces
 

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

@@ -179,9 +179,9 @@ def from_point3d_to_grpc_point(point: "Point3D") -> GRPCPoint:
     from ansys.geometry.core.misc.measurements import DEFAULT_UNITS
 
     return GRPCPoint(
-        x=point.x.m_as(DEFAULT_UNITS.SERVER_LENGTH),
-        y=point.y.m_as(DEFAULT_UNITS.SERVER_LENGTH),
-        z=point.z.m_as(DEFAULT_UNITS.SERVER_LENGTH),
+        x=GRPCQuantity(value_in_geometry_units=point.x.m_as(DEFAULT_UNITS.SERVER_LENGTH)),
+        y=GRPCQuantity(value_in_geometry_units=point.y.m_as(DEFAULT_UNITS.SERVER_LENGTH)),
+        z=GRPCQuantity(value_in_geometry_units=point.z.m_as(DEFAULT_UNITS.SERVER_LENGTH)),
     )
 
 
@@ -987,7 +987,6 @@ def from_grpc_curve_to_curve(curve: GRPCCurveGeometry) -> "Curve":
     Curve
         Resulting converted curve.
     """
-    from ansys.geometry.core.math.point import Point3D
     from ansys.geometry.core.math.vector import UnitVector3D
     from ansys.geometry.core.shapes.curves.circle import Circle
     from ansys.geometry.core.shapes.curves.ellipse import Ellipse
@@ -1000,10 +999,13 @@ def from_grpc_curve_to_curve(curve: GRPCCurveGeometry) -> "Curve":
     except ValueError:
         # curve will be a line
         pass
-    if curve.radius != 0:
-        result = Circle(origin, curve.radius, reference, axis)
-    elif curve.major_radius != 0 and curve.minor_radius != 0:
-        result = Ellipse(origin, curve.major_radius, curve.minor_radius, reference, axis)
+
+    major_radius = curve.major_radius.value_in_geometry_units
+    minor_radius = curve.minor_radius.value_in_geometry_units
+    if curve.radius.value_in_geometry_units != 0:
+        result = Circle(origin, curve.radius.value_in_geometry_units, reference, axis)
+    elif major_radius != 0 and minor_radius != 0:
+        result = Ellipse(origin, major_radius, minor_radius, reference, axis)
     elif curve.nurbs_curve.nurbs_data.degree != 0:
         result = from_grpc_nurbs_curve_to_nurbs_curve(curve.nurbs_curve)
     elif curve.direction is not None:
@@ -1446,15 +1448,15 @@ def serialize_entity_identifier(entity):
         }
 
     return {
-        "success": getattr(response, "success", False),
+        "success": getattr(response.command_response, "success", False),
         "created_bodies": [
-            serialize_body(body) for body in getattr(response, "created_bodies", [])
+            serialize_body(body) for body in getattr(response.tracked_changes, "created_bodies", [])
         ],
         "modified_bodies": [
-            serialize_body(body) for body in getattr(response, "modified_bodies", [])
+            serialize_body(body) for body in getattr(response.tracked_changes, "modified_bodies", [])
         ],
         "deleted_bodies": [
             serialize_entity_identifier(entity)
-            for entity in getattr(response, "deleted_bodies", [])
+            for entity in getattr(response.tracked_changes, "deleted_bodies", [])
         ],
     }

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

@@ -433,7 +433,7 @@ def revolve_faces(self, **kwargs) -> dict:  # noqa: D102
                 RevolveFacesRequestData(
                     selection_id=[build_grpc_id(id) for id in kwargs["selection_ids"]],
                     axis=from_line_to_grpc_line(kwargs["axis"]),
-                    angle=from_measurement_to_server_angle(kwargs["angle"]),
+                    angle=from_angle_to_grpc_quantity(kwargs["angle"]),
                     extrude_type=kwargs["extrude_type"].value,
                 )
             ]
@@ -493,9 +493,9 @@ def revolve_faces_by_helix(self, **kwargs) -> dict:  # noqa: D102
                     selection_ids=[build_grpc_id(id) for id in kwargs["selection_ids"]],
                     direction=from_unit_vector_to_grpc_direction(kwargs["direction"]),
                     axis=from_line_to_grpc_line(kwargs["axis"]),
-                    height=from_measurement_to_server_length(kwargs["height"]),
-                    pitch=from_measurement_to_server_length(kwargs["pitch"]),
-                    taper_angle=from_measurement_to_server_angle(kwargs["taper_angle"]),
+                    height=from_length_to_grpc_quantity(kwargs["height"]),
+                    pitch=from_length_to_grpc_quantity(kwargs["pitch"]),
+                    taper_angle=from_angle_to_grpc_quantity(kwargs["taper_angle"]),
                     right_handed=kwargs["right_handed"],
                     both_sides=kwargs["both_sides"],
                     extrude_type=kwargs["extrude_type"].value,
@@ -510,7 +510,9 @@ def revolve_faces_by_helix(self, **kwargs) -> dict:  # noqa: D102
         # Return the response - formatted as a dictionary
         return {
             "success": tracked_response.get("success"),
-            "created_bodies": [body.get("id") for body in tracked_response.get("created_bodies")],
+            "created_bodies": [
+                body.get("id").id for body in tracked_response.get("created_bodies")
+            ],
         }
 
     @protect_grpc
@@ -613,7 +615,7 @@ def offset_faces(self, **kwargs) -> dict:  # noqa: D102
         request = OffsetFacesRequest(
             request_data=[
                 OffsetFacesRequestData(
-                    faces=[build_grpc_id(id) for id in kwargs["face_ids"]],
+                    face_ids=[build_grpc_id(id) for id in kwargs["face_ids"]],
                     offset=from_measurement_to_server_length(kwargs["distance"]),
                     direction=from_unit_vector_to_grpc_direction(kwargs["direction"]),
                     extrude_type=kwargs["extrude_type"].value,

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

@@ -543,7 +543,6 @@ def get_named_selections(self) -> list["NamedSelection"]:
         """
         included_ns = []
         for ns in get_design_from_body(self.body).named_selections:
-            print([face.id for face in ns.faces])
             if any(face.id == self.id for face in ns.faces):
                 included_ns.append(ns)