Merge branch 'feat/commands_for_merge_and_intersect' of https://github.com/ansys/pyansys-geometry into feat/commands_for_merge_and_intersect

Author: smereu

doc/changelog.d/1633.added.md

@@ -0,0 +1 @@
+interference repair tool

doc/changelog.d/1673.added.md

@@ -0,0 +1 @@
+shell methods

doc/changelog.d/1675.added.md

@@ -0,0 +1 @@
+implementation of NURBS curves

doc/changelog.d/1683.test.md

@@ -0,0 +1 @@
+add unit tests for 3 repair tools

doc/changelog.d/1684.added.md

@@ -0,0 +1 @@
+get assigned material

doc/changelog.d/1685.fixed.md

@@ -0,0 +1 @@
+filter set export id to only CoreService based backends

doc/changelog.d/1690.fixed.md

@@ -0,0 +1 @@
+cleanup unsupported module

pyproject.toml

@@ -29,6 +29,7 @@ dependencies = [
     "ansys-tools-visualization-interface>=0.2.6,<1",
     "attrs!=24.3.0",
     "beartype>=0.11.0,<0.20",
+    "geomdl>=5,<6",
     "grpcio>=1.35.0,<1.68",
     "grpcio-health-checking>=1.45.0,<1.68",
     "numpy>=1.20.3,<3",
@@ -54,6 +55,7 @@ tests = [
     "ansys-tools-visualization-interface==0.8.1",
     "beartype==0.19.0",
     "docker==7.1.0",
+    "geomdl==5.3.1",
     "grpcio==1.67.1",
     "grpcio-health-checking==1.67.1",
     "numpy==2.2.1",
@@ -82,6 +84,7 @@ doc = [
     "ansys-tools-visualization-interface==0.8.1",
     "beartype==0.19.0",
     "docker==7.1.0",
+    "geomdl==5.3.1",
     "grpcio==1.67.1",
     "grpcio-health-checking==1.67.1",
     "ipyvtklink==0.2.3",

src/ansys/geometry/core/connection/conversions.py

@@ -23,6 +23,8 @@
 
 from typing import TYPE_CHECKING
 
+from pint import Quantity, UndefinedUnitError
+
 from ansys.api.geometry.v0.models_pb2 import (
     Arc as GRPCArc,
     Circle as GRPCCircle,
@@ -32,6 +34,8 @@
     Frame as GRPCFrame,
     Geometries as GRPCGeometries,
     Line as GRPCLine,
+    Material as GRPCMaterial,
+    MaterialProperty as GRPCMaterialProperty,
     Matrix as GRPCMatrix,
     Plane as GRPCPlane,
     Point as GRPCPoint,
@@ -42,12 +46,17 @@
     TrimmedCurve as GRPCTrimmedCurve,
     TrimmedSurface as GRPCTrimmedSurface,
 )
+from ansys.geometry.core.materials.material import (
+    Material,
+    MaterialProperty,
+    MaterialPropertyType,
+)
 from ansys.geometry.core.math.frame import Frame
 from ansys.geometry.core.math.matrix import Matrix44
 from ansys.geometry.core.math.plane import Plane
 from ansys.geometry.core.math.point import Point2D, Point3D
 from ansys.geometry.core.math.vector import UnitVector3D
-from ansys.geometry.core.misc.measurements import DEFAULT_UNITS
+from ansys.geometry.core.misc.measurements import DEFAULT_UNITS, UNITS
 from ansys.geometry.core.shapes.curves.circle import Circle
 from ansys.geometry.core.shapes.curves.curve import Curve
 from ansys.geometry.core.shapes.curves.ellipse import Ellipse
@@ -680,3 +689,37 @@ def line_to_grpc_line(line: Line) -> GRPCLine:
     start = line.origin
     end = line.origin + line.direction
     return GRPCLine(start=point3d_to_grpc_point(start), end=point3d_to_grpc_point(end))
+
+
+def grpc_material_to_material(material: GRPCMaterial) -> Material:
+    """Convert a material gRPC message to a ``Material`` class."""
+    properties = []
+    density = Quantity(0, UNITS.kg / UNITS.m**3)
+    for property in material.material_properties:
+        mp = grpc_material_property_to_material_property(property)
+        properties.append(mp)
+        if mp.type == MaterialPropertyType.DENSITY:
+            density = mp.quantity
+
+    return Material(material.name, density, properties)
+
+
+def grpc_material_property_to_material_property(
+    material_property: GRPCMaterialProperty,
+) -> MaterialProperty:
+    """Convert a material property gRPC message to a ``MaterialProperty`` class."""
+    try:
+        mp_type = MaterialPropertyType.from_id(material_property.id)
+    except ValueError:
+        mp_type = material_property.id
+
+    try:
+        mp_quantity = Quantity(material_property.value, material_property.units)
+    except (
+        UndefinedUnitError,
+        TypeError,
+    ):
+        mp_quantity = material_property.value
+
+    mp = MaterialProperty(mp_type, material_property.display_name, mp_quantity)
+    return mp

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

@@ -55,11 +55,14 @@
     CombineMergeBodiesRequest,
     ImprintCurvesRequest,
     ProjectCurvesRequest,
+    RemoveFacesRequest,
+    ShellRequest,
 )
 from ansys.api.geometry.v0.commands_pb2_grpc import CommandsStub
 from ansys.geometry.core.connection.client import GrpcClient
 from ansys.geometry.core.connection.conversions import (
     frame_to_grpc_frame,
+    grpc_material_to_material,
     plane_to_grpc_plane,
     point3d_to_grpc_point,
     sketch_shapes_to_grpc_geometries,
@@ -79,6 +82,7 @@
 from ansys.geometry.core.misc.auxiliary import get_design_from_body
 from ansys.geometry.core.misc.checks import (
     check_type,
+    check_type_all_elements_in_iterable,
     ensure_design_is_active,
     min_backend_version,
 )
@@ -254,6 +258,17 @@ def assign_material(self, material: Material) -> None:
         """
         return
 
+    @abstractmethod
+    def get_assigned_material(self) -> Material:
+        """Get the assigned material of the body.
+
+        Returns
+        -------
+        Material
+            Material assigned to the body.
+        """
+        return
+
     @abstractmethod
     def add_midsurface_thickness(self, thickness: Quantity) -> None:
         """Add a mid-surface thickness to a surface body.
@@ -555,6 +570,39 @@ def tessellate(self, merge: bool = False) -> Union["PolyData", "MultiBlock"]:
         """
         return
 
+    @abstractmethod
+    def shell_body(self, offset: Real) -> bool:
+        """Shell the body to the thickness specified.
+
+        Parameters
+        ----------
+        offset : Real
+            Shell thickness.
+
+        Returns
+        -------
+        bool
+            ``True`` when successful, ``False`` when failed.
+        """
+        return
+
+    @abstractmethod
+    def remove_faces(self, selection: Union["Face", list["Face"]], offset: Real) -> bool:
+        """Shell by removing a given set of faces.
+
+        Parameters
+        ----------
+        selection : Face | List[Face]
+            Face or faces to be removed.
+        offset : Real
+            Shell thickness.
+
+        Returns
+        -------
+        bool
+            ``True`` when successful, ``False`` when failed.
+        """
+
     @abstractmethod
     def plot(
         self,
@@ -871,6 +919,13 @@ def assign_material(self, material: Material) -> None:  # noqa: D102
             SetAssignedMaterialRequest(id=self._id, material=material.name)
         )
 
+    @property
+    @protect_grpc
+    def get_assigned_material(self) -> Material:  # noqa: D102
+        self._grpc_client.log.debug(f"Retrieving assigned material for body {self.id}.")
+        material_response = self._bodies_stub.GetAssignedMaterial(self._grpc_id)
+        return grpc_material_to_material(material_response)
+
     @protect_grpc
     @check_input_types
     def add_midsurface_thickness(self, thickness: Quantity) -> None:  # noqa: D102
@@ -1161,6 +1216,43 @@ def tessellate(  # noqa: D102
         else:
             return comp
 
+    @protect_grpc
+    @check_input_types
+    def shell_body(self, offset: Real) -> bool:  # noqa: D102
+        self._grpc_client.log.debug(f"Shelling body {self.id} to offset {offset}.")
+
+        result = self._commands_stub.Shell(
+            ShellRequest(
+                selection=self._grpc_id,
+                offset=offset,
+            )
+        )
+
+        return result.success
+
+    @protect_grpc
+    @reset_tessellation_cache
+    @check_input_types
+    def remove_faces(self, selection: Union["Face", list["Face"]], offset: Real) -> bool:  # noqa: D102
+        selection: list[Face] = selection if isinstance(selection, list) else [selection]
+        check_type_all_elements_in_iterable(selection, Face)
+
+        # check if faces belong to this body
+        for face in selection:
+            if face.body.id != self.id:
+                raise ValueError(f"Face {face.id} does not belong to body {self.id}.")
+
+        self._grpc_client.log.debug(f"Removing faces to shell body {self.id}.")
+
+        result = self._commands_stub.RemoveFaces(
+            RemoveFacesRequest(
+                selection=[face._grpc_id for face in selection],
+                offset=offset,
+            )
+        )
+
+        return result.success
+
     def plot(  # noqa: D102
         self,
         merge: bool = True,
@@ -1389,6 +1481,11 @@ def volume(self) -> Quantity:  # noqa: D102
     def assign_material(self, material: Material) -> None:  # noqa: D102
         self._template.assign_material(material)
 
+    @property
+    @ensure_design_is_active
+    def get_assigned_material(self) -> Material:  # noqa: D102
+        return self._template.get_assigned_material
+
     @ensure_design_is_active
     def add_midsurface_thickness(self, thickness: Quantity) -> None:  # noqa: D102
         self._template.add_midsurface_thickness(thickness)
@@ -1578,6 +1675,14 @@ def tessellate(  # noqa: D102
     ) -> Union["PolyData", "MultiBlock"]:
         return self._template.tessellate(merge, self.parent_component.get_world_transform())
 
+    @ensure_design_is_active
+    def shell_body(self, offset: Real) -> bool:  # noqa: D102
+        return self._template.shell_body(offset)
+
+    @ensure_design_is_active
+    def remove_faces(self, selection: Union["Face", list["Face"]], offset: Real) -> bool:  # noqa: D102
+        return self._template.remove_faces(selection, offset)
+
     def plot(  # noqa: D102
         self,
         merge: bool = True,