Skip to content

Commit 0281b93

Browse files
various geometry commands test fixes
1 parent 1cad187 commit 0281b93

File tree

6 files changed

+51
-24
lines changed

6 files changed

+51
-24
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -732,8 +732,8 @@ def boolean(self, **kwargs) -> dict: # noqa: D102
732732
serialized_tracker_response = {}
733733
try:
734734
request = BooleanRequest(
735-
body1=kwargs["target"].id,
736-
tool_bodies=[other.id for other in kwargs["other"]],
735+
body1=kwargs["target"],
736+
tool_bodies=[other for other in kwargs["other"]],
737737
method=kwargs["method"],
738738
)
739739
if pyansys_geom.USE_TRACKER_TO_UPDATE_DESIGN:

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

Lines changed: 24 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -838,12 +838,16 @@ def scale(self, **kwargs) -> dict: # noqa: D102
838838

839839
@protect_grpc
840840
def mirror(self, **kwargs) -> dict: # noqa: D102
841-
from ansys.api.discovery.v1.operations.edit_pb2 import MirrorRequest
841+
from ansys.api.discovery.v1.operations.edit_pb2 import MirrorRequest, MirrorRequestData
842842

843843
# Create the request - assumes all inputs are valid and of the proper type
844844
request = MirrorRequest(
845-
selection_ids=[build_grpc_id(kwargs["id"])],
846-
plane=from_plane_to_grpc_plane(kwargs["plane"]),
845+
request_data=[
846+
MirrorRequestData(
847+
ids=[build_grpc_id(kwargs["id"])],
848+
mirror_plane=from_plane_to_grpc_plane(kwargs["plane"]),
849+
)
850+
]
847851
)
848852

849853
# Call the gRPC service
@@ -1044,31 +1048,40 @@ def combine(self, **kwargs) -> dict: # noqa: D102
10441048
else:
10451049
raise ValueError(f"Invalid boolean operation type: {type_bool_op}")
10461050

1047-
if not response.success:
1051+
if not response.tracked_command_response.command_response.success:
10481052
raise ValueError(f"Boolean operation failed: {response}")
10491053

10501054
# Return the response - formatted as a dictionary
10511055
return {"complete_command_response": response}
10521056

10531057
@protect_grpc
10541058
def split_body(self, **kwargs) -> dict: # noqa: D102
1055-
from ansys.api.discovery.v1.operations.edit_pb2 import SplitBodyRequest
1059+
from ansys.api.discovery.v1.operations.edit_pb2 import (
1060+
SplitBodyRequest,
1061+
SplitBodyRequestData,
1062+
)
10561063

10571064
# Create the request - assumes all inputs are valid and of the proper type
10581065
request = SplitBodyRequest(
1059-
selection=[build_grpc_id(id) for id in kwargs["body_ids"]],
1060-
split_by_plane=from_plane_to_grpc_plane(kwargs["plane"]) if kwargs["plane"] else None,
1061-
split_by_slicer=[build_grpc_id(id) for id in kwargs["slicer_ids"]],
1062-
split_by_faces=[build_grpc_id(id) for id in kwargs["face_ids"]],
1063-
extend_surfaces=kwargs["extend_surfaces"],
1066+
request_data=[
1067+
SplitBodyRequestData(
1068+
selection_ids=[build_grpc_id(id) for id in kwargs["body_ids"]],
1069+
split_by_plane=(
1070+
from_plane_to_grpc_plane(kwargs["plane"]) if kwargs["plane"] else None
1071+
),
1072+
split_by_slicer_ids=[build_grpc_id(id) for id in kwargs["slicer_ids"]],
1073+
split_by_face_ids=[build_grpc_id(id) for id in kwargs["face_ids"]],
1074+
extend_surfaces=kwargs["extend_surfaces"],
1075+
)
1076+
]
10641077
)
10651078

10661079
# Call the gRPC service
10671080
resp = self.edit_stub.SplitBodies(request=request)
10681081

10691082
# Return the response - formatted as a dictionary
10701083
return {
1071-
"success": resp.success,
1084+
"success": resp.tracked_command_response.command_response.success,
10721085
}
10731086

10741087
@protect_grpc

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

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,20 @@ def create(self, **kwargs) -> dict: # noqa: D102
8989

9090
@protect_grpc
9191
def set_name(self, **kwargs) -> dict: # noqa: D102
92-
from ansys.api.discovery.v1.design.designmessages_pb2 import SetDesignEntityNameRequest
92+
from ansys.api.discovery.v1.design.designmessages_pb2 import (
93+
SetDesignEntityNameRequest,
94+
SetDesignEntityNameRequestData,
95+
)
9396

9497
# Create the request - assumes all inputs are valid and of the proper type
95-
request = SetDesignEntityNameRequest(id=build_grpc_id(kwargs["id"]), name=kwargs["name"])
98+
request = SetDesignEntityNameRequest(
99+
request_data=[
100+
SetDesignEntityNameRequestData(
101+
id=build_grpc_id(kwargs["id"]),
102+
name=kwargs["name"],
103+
)
104+
]
105+
)
96106

97107
# Call the gRPC service
98108
_ = self.stub.SetName(request)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ def get_faces(self, **kwargs) -> dict: # noqa: D102
143143
return {
144144
"faces": [
145145
{
146-
"id": face.id,
146+
"id": face.id.id,
147147
"surface_type": face.surface_type,
148148
"is_reversed": face.is_reversed,
149149
}
@@ -238,8 +238,8 @@ def extrude_edges_up_to(self, **kwargs) -> dict: # noqa: D102
238238
request = ExtrudeEdgesUpToRequest(
239239
request_data=[
240240
ExtrudeEdgesUpToRequestData(
241-
edge_ids=[build_grpc_id(id) for id in kwargs["face_ids"]],
242-
up_to_selection_id=build_grpc_id(kwargs["up_to_selection_id"]),
241+
edge_ids=[build_grpc_id(id) for id in kwargs["edge_ids"]],
242+
up_to_selection_id=build_grpc_id(kwargs["up_to_selection"]),
243243
seed_point=from_point3d_to_grpc_point(kwargs["seed_point"]),
244244
direction=from_unit_vector_to_grpc_direction(kwargs["direction"]),
245245
extrude_type=kwargs["extrude_type"].value,
@@ -248,7 +248,7 @@ def extrude_edges_up_to(self, **kwargs) -> dict: # noqa: D102
248248
)
249249

250250
# Call the gRPC service and serialize the response
251-
response = self.edit_stub.ExtrudeFacesUpTo(request=request)
251+
response = self.edit_stub.ExtrudeEdgesUpTo(request=request)
252252
tracked_response = serialize_tracked_command_response(response.tracked_command_response)
253253

254254
# Return the response - formatted as a dictionary

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -607,7 +607,7 @@ def get_round_info(self, **kwargs) -> dict: # noqa: D102
607607
# Return the response - formatted as a dictionary
608608
return {
609609
"along_u": response.along_u,
610-
"radius": response.radius,
610+
"radius": response.radius.value_in_geometry_units,
611611
}
612612

613613
@protect_grpc
@@ -622,7 +622,7 @@ def offset_faces(self, **kwargs) -> dict: # noqa: D102
622622
request_data=[
623623
OffsetFacesRequestData(
624624
face_ids=[build_grpc_id(id) for id in kwargs["face_ids"]],
625-
offset=from_measurement_to_server_length(kwargs["distance"]),
625+
offset=from_length_to_grpc_quantity(kwargs["distance"]),
626626
direction=from_unit_vector_to_grpc_direction(kwargs["direction"]),
627627
extrude_type=kwargs["extrude_type"].value,
628628
)
@@ -649,8 +649,8 @@ def setup_offset_relationship(self, **kwargs) -> dict: # noqa: D102
649649
request = FaceOffsetRequest(
650650
request_data=[
651651
FaceOffsetRequestData(
652-
face1=build_grpc_id(kwargs["face1_id"]),
653-
face2=build_grpc_id(kwargs["face2_id"]),
652+
id1=build_grpc_id(kwargs["face1_id"]),
653+
id2=build_grpc_id(kwargs["face2_id"]),
654654
set_baselines=kwargs["set_baselines"],
655655
process_adjacent_faces=kwargs["process_adjacent_faces"],
656656
)

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2151,7 +2151,11 @@ def __generic_boolean_op(
21512151
]
21522152

21532153
response = self._template._grpc_client.services.bodies.boolean(
2154-
target=self, other=grpc_other, method=method, err_msg=err_msg, keep_other=keep_other
2154+
target=self.id,
2155+
other=[other.id for other in grpc_other],
2156+
method=method,
2157+
err_msg=err_msg,
2158+
keep_other=keep_other,
21552159
)
21562160

21572161
if not pyansys_geom.USE_TRACKER_TO_UPDATE_DESIGN:

0 commit comments

Comments
 (0)