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

Author: smereu

doc/changelog.d/1725.fixed.md

@@ -0,0 +1 @@
+revert boolean ops logic and hold-off on commands-based implementation (temporarily)

doc/changelog.d/1742.dependencies.md

@@ -0,0 +1 @@
+bump jupytext from 1.16.6 to 1.16.7 in the docs-deps group

doc/changelog.d/1743.dependencies.md

@@ -0,0 +1 @@
+bump ansys-api-geometry from 0.4.36 to 0.4.37

pyproject.toml

@@ -24,7 +24,7 @@ classifiers = [
 ]
 
 dependencies = [
-    "ansys-api-geometry==0.4.36",
+    "ansys-api-geometry==0.4.37",
     "ansys-tools-path>=0.3,<1",
     "ansys-tools-visualization-interface>=0.2.6,<1",
     "attrs!=24.3.0",
@@ -89,7 +89,7 @@ doc = [
     "grpcio-health-checking==1.67.1",
     "ipyvtklink==0.2.3",
     "jupyter_sphinx==0.5.3",
-    "jupytext==1.16.6",
+    "jupytext==1.16.7",
     "myst-parser==4.0.0",
     "nbconvert==7.16.6",
     "nbsphinx==0.9.6",

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

@@ -96,6 +96,13 @@
 
     from ansys.geometry.core.designer.component import Component
 
+# TODO: Temporary fix for boolean operations
+# This is a temporary fix for the boolean operations issue. The issue is that the
+# boolean operations are not working as expected with command-based operations. The
+# goal is to fix this issue in the future.
+# https://github.com/ansys/pyansys-geometry/issues/1733
+__TEMPORARY_BOOL_OPS_FIX__ = (99, 0, 0)
+
 
 @unique
 class MidSurfaceOffsetType(Enum):
@@ -1764,23 +1771,23 @@ def plot(  # noqa: D102
         pl.show(screenshot=screenshot, **plotting_options)
 
     def intersect(self, other: Union["Body", Iterable["Body"]], keep_other: bool = False) -> None:  # noqa: D102
-        if self._template._grpc_client.backend_version < (25, 2, 0):
+        if self._template._grpc_client.backend_version < __TEMPORARY_BOOL_OPS_FIX__:
             self.__generic_boolean_op(other, keep_other, "intersect", "bodies do not intersect")
         else:
             self.__generic_boolean_command(
                 other, keep_other, "intersect", "bodies do not intersect"
             )
 
     def subtract(self, other: Union["Body", Iterable["Body"]], keep_other: bool = False) -> None:  # noqa: D102
-        if self._template._grpc_client.backend_version < (25, 2, 0):
+        if self._template._grpc_client.backend_version < __TEMPORARY_BOOL_OPS_FIX__:
             self.__generic_boolean_op(other, keep_other, "subtract", "empty (complete) subtraction")
         else:
             self.__generic_boolean_command(
                 other, keep_other, "subtract", "empty (complete) subtraction"
             )
 
     def unite(self, other: Union["Body", Iterable["Body"]], keep_other: bool = False) -> None:  # noqa: D102
-        if self._template._grpc_client.backend_version < (25, 2, 0):
+        if self._template._grpc_client.backend_version < __TEMPORARY_BOOL_OPS_FIX__:
             self.__generic_boolean_op(other, keep_other, "unite", "union operation failed")
         else:
             self.__generic_boolean_command(other, False, "unite", "union operation failed")

tests/integration/test_design.py

@@ -1675,20 +1675,20 @@ def test_boolean_body_operations(modeler: Modeler):
     # 1.b.ii
     copy1 = body1.copy(comp1, "Copy1")
     copy1a = body1.copy(comp1, "Copy1a")
-    copy1.subtract(copy1a)
+    with pytest.raises(ValueError):
+        copy1.subtract(copy1a)
 
     assert copy1.is_alive
-    assert not copy1a.is_alive
+    assert copy1a.is_alive
 
     # 1.b.iii
     copy1 = body1.copy(comp1, "Copy1")
     copy3 = body3.copy(comp3, "Copy3")
-    with pytest.raises(ValueError):
-        copy1.subtract(copy3)
+    copy1.subtract(copy3)
 
     assert Accuracy.length_is_equal(copy1.volume.m, 1)
     assert copy1.volume
-    assert copy3.is_alive
+    assert not copy3.is_alive
 
     # 1.c.i.x
     copy1 = body1.copy(comp1, "Copy1")
@@ -1711,10 +1711,9 @@ def test_boolean_body_operations(modeler: Modeler):
     # 1.c.ii
     copy1 = body1.copy(comp1, "Copy1")
     copy3 = body3.copy(comp3, "Copy3")
-    with pytest.raises(ValueError):
-        copy1.unite(copy3)
+    copy1.unite(copy3)
 
-    assert copy3.is_alive
+    assert not copy3.is_alive
     assert body3.is_alive
     assert Accuracy.length_is_equal(copy1.volume.m, 1)
 
@@ -1785,20 +1784,20 @@ def test_boolean_body_operations(modeler: Modeler):
     # 2.b.ii
     copy1 = body1.copy(comp1_i, "Copy1")
     copy1a = body1.copy(comp1_i, "Copy1a")
-    copy1.subtract(copy1a)
+    with pytest.raises(ValueError):
+        copy1.subtract(copy1a)
 
     assert copy1.is_alive
-    assert not copy1a.is_alive
+    assert copy1a.is_alive
 
     # 2.b.iii
     copy1 = body1.copy(comp1_i, "Copy1")
     copy3 = body3.copy(comp3_i, "Copy3")
-    with pytest.raises(ValueError):
-        copy1.subtract(copy3)
+    copy1.subtract(copy3)
 
     assert Accuracy.length_is_equal(copy1.volume.m, 1)
     assert copy1.volume
-    assert copy3.is_alive
+    assert not copy3.is_alive
 
     # 2.c.i.x
     copy1 = body1.copy(comp1_i, "Copy1")
@@ -1821,10 +1820,9 @@ def test_boolean_body_operations(modeler: Modeler):
     # 2.c.ii
     copy1 = body1.copy(comp1_i, "Copy1")
     copy3 = body3.copy(comp3_i, "Copy3")
-    with pytest.raises(ValueError):
-        copy1.unite(copy3)
+    copy1.unite(copy3)
 
-    assert copy3.is_alive
+    assert not copy3.is_alive
     assert body3.is_alive
     assert Accuracy.length_is_equal(copy1.volume.m, 1)
 
@@ -1921,26 +1919,21 @@ def test_bool_operations_with_keep_other(modeler: Modeler):
     assert len(comp3.bodies) == 1
 
     # ---- Verify unite operation ----
-    body1.unite([body2, body3])
+    body1.unite([body2, body3], keep_other=True)
 
-    assert body1.is_alive
-    assert not body2.is_alive
+    assert body2.is_alive
+    assert body3.is_alive
     assert len(comp1.bodies) == 1
-    assert len(comp2.bodies) == 0
-    assert len(comp3.bodies) == 0
+    assert len(comp2.bodies) == 1
+    assert len(comp3.bodies) == 1
 
     # ---- Verify intersect operation ----
-    comp2 = design.add_component("Comp2")
-    comp3 = design.add_component("Comp3")
-    body1 = comp1.extrude_sketch("Body1", Sketch().box(Point2D([0, 0]), 1, 1), 1)
-    body2 = comp2.extrude_sketch("Body2", Sketch().box(Point2D([0.5, 0]), 1, 1), 1)
-    body3 = comp3.extrude_sketch("Body3", Sketch().box(Point2D([5, 0]), 1, 1), 1)
-    body1.intersect([body2, body3], keep_other=True)
+    body1.intersect(body2, keep_other=True)
 
     assert body1.is_alive
     assert body2.is_alive
     assert body3.is_alive
-    assert len(comp1.bodies) == 2
+    assert len(comp1.bodies) == 1
     assert len(comp2.bodies) == 1
     assert len(comp3.bodies) == 1
 

tests/integration/test_issues.py

@@ -24,6 +24,7 @@
 from pathlib import Path
 
 import numpy as np
+import pytest
 
 from ansys.geometry.core.math import (
     UNITVECTOR3D_X,
@@ -139,6 +140,11 @@ def test_issue_1304_arc_sketch_creation():
         DEFAULT_UNITS.LENGTH = UNITS.meter
 
 
+# TODO: Temporary fix for boolean operations
+# Issue had to be skipped due to the fact that the intersect operation is not working as expected
+# when using command-based boolean operations.
+# https://github.com/ansys/pyansys-geometry/issues/1733
+@pytest.mark.skip(reason="This test is not working as expected")
 def test_issue_1192_temp_body_on_empty_intersect(modeler: Modeler):
     """Test demonstrating the issue when intersecting two bodies that do not intersect
     and the empty temporal body that gets created."""
@@ -224,3 +230,46 @@ def test_issue_1309_revolve_operation_with_coincident_origins(modeler: Modeler):
     )
 
     assert revolved_body.name == "toroid"
+
+
+def test_issue_1724_intersect_failures(modeler: Modeler):
+    """Test that intersecting two bodies that overlap does not crash the program.
+
+    For more info see
+    https://github.com/ansys/pyansys-geometry/issues/1724
+    """
+    wx = 10
+    wy = 10
+    wz = 2
+    radius = 1
+    unit = DEFAULT_UNITS.LENGTH
+
+    design = modeler.create_design("Test")
+
+    start_at = Point3D([wx / 2, wy / 2, 0.0], unit=unit)
+
+    plane = Plane(
+        start_at,
+        UNITVECTOR3D_X,
+        UNITVECTOR3D_Y,
+    )
+    box_plane = Sketch(plane)
+    box_plane.box(Point2D([0.0, 0.0], unit=unit), width=wx, height=wy)
+
+    box = design.extrude_sketch("box", box_plane, wz)
+
+    point = Point3D([wx / 2, wx / 2, 0.0], unit=unit)
+    plane = Plane(point, UNITVECTOR3D_X, UNITVECTOR3D_Y)
+    sketch_cylinder = Sketch(plane)
+    sketch_cylinder.circle(Point2D([0.0, 0.0], unit=unit), radius=radius)
+    cylinder = design.extrude_sketch("cylinder", sketch_cylinder, wz - 0.1)
+
+    # Request the intersection
+    cylinder.intersect(box)
+
+    # Only the cylinder should be present
+    assert len(design.bodies) == 1
+    assert design.bodies[0].name == "cylinder"
+
+    # Verify that the volume of the cylinder is the same (the intersect is the same as the cylinder)
+    assert np.isclose(design.bodies[0].volume.m, np.pi * radius**2 * (wz - 0.1))