Merge branch 'main' of https://github.com/ansys/pyansys-geometry into chore/v1_admin_assembly_condition_impl

Author: jacobrkerstetter

SECURITY.md

@@ -28,10 +28,10 @@ SOFTWARE.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| <= 0.7  | :x:                |
-| 0.8.x   | :white_check_mark: |
-| 0.9.x   | :white_check_mark: |
+| <= 0.9  | :x:                |
 | 0.10.x  | :white_check_mark: |
+| 0.11.x  | :white_check_mark: |
+| 0.12.x  | :white_check_mark: |
 | dev     | :white_check_mark: |
 
 ## Reporting a vulnerability

doc/changelog.d/2356.added.md

@@ -0,0 +1 @@
+Add Named Selections query to geometric entities

doc/changelog.d/2383.added.md

@@ -0,0 +1 @@
+Expose enclosure methods

doc/changelog.d/2390.maintenance.md

@@ -0,0 +1 @@
+Update SECURITY.md

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

@@ -83,3 +83,18 @@ def remove_logo(self, **kwargs) -> dict:
     def detect_helixes(self, **kwargs) -> dict:
         """Detect helixes in geometry."""
         pass
+
+    @abstractmethod
+    def create_box_enclosure(self, **kwargs) -> dict:
+        """Create a box enclosure around bodies."""
+        pass
+
+    @abstractmethod
+    def create_cylinder_enclosure(self, **kwargs) -> dict:
+        """Create a cylinder enclosure around bodies."""
+        pass
+
+    @abstractmethod
+    def create_sphere_enclosure(self, **kwargs) -> dict:
+        """Create a sphere enclosure around bodies."""
+        pass

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

@@ -56,6 +56,7 @@
     TrimmedCurve as GRPCTrimmedCurve,
     TrimmedSurface as GRPCTrimmedSurface,
 )
+from ansys.api.geometry.v0.preparetools_pb2 import EnclosureOptions as GRPCEnclosureOptions
 import pint
 
 from ansys.geometry.core.errors import GeometryRuntimeError
@@ -95,6 +96,7 @@
     from ansys.geometry.core.sketch.nurbs import SketchNurbs
     from ansys.geometry.core.sketch.polygon import Polygon
     from ansys.geometry.core.sketch.segment import SketchSegment
+    from ansys.geometry.core.tools.prepare_tools import EnclosureOptions
 
 
 def from_point3d_to_grpc_point(point: "Point3D") -> GRPCPoint:
@@ -1410,3 +1412,27 @@ def serialize_entity_identifier(entity):
             for entity in getattr(response, "deleted_bodies", [])
         ],
     }
+
+
+def from_enclosure_options_to_grpc_enclosure_options(
+    enclosure_options: "EnclosureOptions",
+) -> GRPCEnclosureOptions:
+    """Convert enclosure_options to grpc definition.
+
+    Parameters
+    ----------
+    enclosure_options : EnclosureOptions
+        Definition of the enclosure options.
+
+    Returns
+    -------
+    GRPCEnclosureOptions
+        Grpc converted definition.
+    """
+    frame = enclosure_options.frame
+    return GRPCEnclosureOptions(
+        create_shared_topology=enclosure_options.create_shared_topology,
+        subtract_bodies=enclosure_options.subtract_bodies,
+        frame=from_frame_to_grpc_frame(frame) if frame is not None else None,
+        cushion_proportion=enclosure_options.cushion_proportion,
+    )

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

@@ -429,6 +429,14 @@ def serialize_beam(beam):
                 "cross_section": serialize_beam_cross_section(beam.cross_section),
             }
 
+        def serialize_design_point(design_point):
+            return {
+                "id": design_point.id,
+                "name": design_point.owner_name,
+                "point": from_grpc_point_to_point3d(design_point.points[0]),
+                "parent_id": design_point.parent_id.id,
+            }
+
         parts = getattr(response, "parts", [])
         transformed_parts = getattr(response, "transformed_parts", [])
         bodies = getattr(response, "bodies", [])
@@ -438,6 +446,7 @@ def serialize_beam(beam):
         component_coordinate_systems = getattr(response, "component_coord_systems", [])
         component_shared_topologies = getattr(response, "component_shared_topologies", [])
         beams = getattr(response, "beams", [])
+        design_points = getattr(response, "design_points", [])
         return {
             "parts": [serialize_part(part) for part in parts] if len(parts) > 0 else [],
             "transformed_parts": [serialize_transformed_part(tp) for tp in transformed_parts],
@@ -452,6 +461,7 @@ def serialize_beam(beam):
                 component_shared_topologies
             ),
             "beams": [serialize_beam(beam) for beam in beams],
+            "design_points": [serialize_design_point(dp) for dp in design_points],
         }
 
     @protect_grpc

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

@@ -26,7 +26,7 @@
 from ansys.geometry.core.errors import protect_grpc
 
 from ..base.named_selection import GRPCNamedSelectionService
-from .conversions import build_grpc_id, from_grpc_point_to_point3d
+from .conversions import build_grpc_id
 
 
 class GRPCNamedSelectionServiceV0(GRPCNamedSelectionService):
@@ -64,9 +64,7 @@ def get_named_selection(self, **kwargs):  # noqa: D102
             "faces": [face.id for face in response.faces],
             "edges": [edge.id for edge in response.edges],
             "beams": [beam.id.id for beam in response.beams],
-            "design_points": [
-                (dp.id, from_grpc_point_to_point3d(dp.points[0])) for dp in response.design_points
-            ],
+            "design_points": [dp.id for dp in response.design_points],
             "components": [comp.id for comp in response.components],
             "vertices": [vertex.id.id for vertex in response.vertices],
         }

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

@@ -27,7 +27,11 @@
 
 from ..base.conversions import from_measurement_to_server_length
 from ..base.prepare_tools import GRPCPrepareToolsService
-from .conversions import build_grpc_id
+from .conversions import (
+    build_grpc_id,
+    from_enclosure_options_to_grpc_enclosure_options,
+    serialize_tracker_command_response,
+)
 
 
 class GRPCPrepareToolsServiceV0(GRPCPrepareToolsService):
@@ -295,3 +299,97 @@ def detect_helixes(self, **kwargs) -> dict:  # noqa: D102
                 for helix in response.helixes
             ]
         }
+
+    @protect_grpc
+    def create_box_enclosure(self, **kwargs) -> dict:  # noqa: D102
+        from ansys.api.geometry.v0.models_pb2 import Body as GRPCBody
+        from ansys.api.geometry.v0.preparetools_pb2 import CreateEnclosureBoxRequest
+
+        grpc_enclosure_options = from_enclosure_options_to_grpc_enclosure_options(
+            kwargs["enclosure_options"]
+        )
+
+        # Create the request - assumes all inputs are valid and of the proper type
+        request = CreateEnclosureBoxRequest(
+            bodies=[GRPCBody(id=body.id) for body in kwargs["bodies"]],
+            x_low=from_measurement_to_server_length(kwargs["x_low"]),
+            x_high=from_measurement_to_server_length(kwargs["x_high"]),
+            y_low=from_measurement_to_server_length(kwargs["y_low"]),
+            y_high=from_measurement_to_server_length(kwargs["y_high"]),
+            z_low=from_measurement_to_server_length(kwargs["z_low"]),
+            z_high=from_measurement_to_server_length(kwargs["z_high"]),
+            enclosure_options=grpc_enclosure_options,
+        )
+
+        # Call the gRPC service
+        response = self.stub.CreateEnclosureBox(request)
+
+        # Return the response - formatted as a dictionary
+        serialized_tracker_response = serialize_tracker_command_response(
+            response=response.command_response
+        )
+        return {
+            "success": response.success,
+            "created_bodies": [body.id for body in response.created_bodies],
+            "tracker_response": serialized_tracker_response,
+        }
+
+    @protect_grpc
+    def create_cylinder_enclosure(self, **kwargs) -> dict:  # noqa: D102
+        from ansys.api.geometry.v0.models_pb2 import Body as GRPCBody
+        from ansys.api.geometry.v0.preparetools_pb2 import CreateEnclosureCylinderRequest
+
+        grpc_enclosure_options = from_enclosure_options_to_grpc_enclosure_options(
+            kwargs["enclosure_options"]
+        )
+
+        # Create the request - assumes all inputs are valid and of the proper type
+        request = CreateEnclosureCylinderRequest(
+            bodies=[GRPCBody(id=body.id) for body in kwargs["bodies"]],
+            axial_distance_low=from_measurement_to_server_length(kwargs["axial_distance_low"]),
+            axial_distance_high=from_measurement_to_server_length(kwargs["axial_distance_high"]),
+            radial_distance=from_measurement_to_server_length(kwargs["radial_distance"]),
+            enclosure_options=grpc_enclosure_options,
+        )
+
+        # Call the gRPC service
+        response = self.stub.CreateEnclosureCylinder(request)
+
+        # Return the response - formatted as a dictionary
+        serialized_tracker_response = serialize_tracker_command_response(
+            response=response.command_response
+        )
+        return {
+            "success": response.success,
+            "created_bodies": [body.id for body in response.created_bodies],
+            "tracker_response": serialized_tracker_response,
+        }
+
+    @protect_grpc
+    def create_sphere_enclosure(self, **kwargs) -> dict:  # noqa: D102
+        from ansys.api.geometry.v0.models_pb2 import Body as GRPCBody
+        from ansys.api.geometry.v0.preparetools_pb2 import CreateEnclosureSphereRequest
+
+        grpc_enclosure_options = from_enclosure_options_to_grpc_enclosure_options(
+            kwargs["enclosure_options"]
+        )
+
+        # Create the request - assumes all inputs are valid and of the proper type
+        request = CreateEnclosureSphereRequest(
+            bodies=[GRPCBody(id=body.id) for body in kwargs["bodies"]],
+            radial_distance=from_measurement_to_server_length(kwargs["radial_distance"]),
+            enclosure_options=grpc_enclosure_options,
+        )
+
+        # Call the gRPC service
+        response = self.stub.CreateEnclosureSphere(request)
+
+        # Return the response - formatted as a dictionary
+        serialized_tracker_response = serialize_tracker_command_response(
+            response=response.command_response
+        )
+        return {
+            "success": response.success,
+            "created_bodies": [body.id for body in response.created_bodies],
+            "tracker_response": serialized_tracker_response,
+        }

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

@@ -82,3 +82,15 @@ def remove_logo(self, **kwargs) -> dict:  # noqa: D102
     @protect_grpc
     def detect_helixes(self, **kwargs) -> dict:  # noqa: D102
         raise NotImplementedError
+
+    @protect_grpc
+    def create_box_enclosure(self, **kwargs) -> dict:  # noqa: D102
+        raise NotImplementedError
+
+    @protect_grpc
+    def create_cylinder_enclosure(self, **kwargs) -> dict:  # noqa: D102
+        raise NotImplementedError
+
+    @protect_grpc
+    def create_sphere_enclosure(self, **kwargs) -> dict:  # noqa: D102
+        raise NotImplementedError