Merge branch 'gumyr:dev' into dev

Author: 42sol-eu

src/build123d/operations_sketch.py

@@ -146,4 +146,5 @@ def trace(
         context._add_to_context(*new_faces, mode=mode)
         context.pending_edges = ShapeList()
 
-    return Sketch(Compound.make_compound(new_faces).wrapped)
+    combined_faces = Face.fuse(*new_faces) if len(new_faces) > 1 else new_faces[0]
+    return Sketch(combined_faces.wrapped)

src/build123d/topology.py

@@ -1286,7 +1286,13 @@ def offset_3d(
         )
         offset_builder.Build()
 
-        offset_occt_solid = offset_builder.Shape()
+        try:
+            offset_occt_solid = offset_builder.Shape()
+        except (StdFail_NotDone, Standard_Failure) as err:
+            raise RuntimeError(
+                "offset Error, an alternative kind may resolve this error"
+            ) from err
+
         offset_solid = self.__class__(offset_occt_solid)
 
         # The Solid can be inverted, if so reverse

tests/test_build_generic.py

@@ -594,28 +594,37 @@ def test_offset_algebra_wire(self):
     def test_offset_face_with_inner_wire(self):
         # offset amount causes the inner wire to have zero length
         b = Rectangle(1, 1)
-        b -= RegularPolygon(.25, 3)
+        b -= RegularPolygon(0.25, 3)
         b = offset(b, amount=0.125)
-        self.assertAlmostEqual(b.area, 1 ** 2 + 2 * 0.125 * 2 + pi * 0.125 ** 2, 5)
+        self.assertAlmostEqual(b.area, 1**2 + 2 * 0.125 * 2 + pi * 0.125**2, 5)
         self.assertEqual(len(b.face().inner_wires()), 0)
 
     def test_offset_face_with_min_length(self):
-        c = Circle(.5)
+        c = Circle(0.5)
         c = offset(c, amount=0.125, min_edge_length=0.1)
         self.assertAlmostEqual(c.area, pi * (0.5 + 0.125) ** 2, 5)
-    
+
     def test_offset_face_with_min_length_and_inner(self):
         # offset amount causes the inner wire to have zero length
-        c = Circle(.5)
-        c -= RegularPolygon(.25, 3)
+        c = Circle(0.5)
+        c -= RegularPolygon(0.25, 3)
         c = offset(c, amount=0.125, min_edge_length=0.1)
         self.assertAlmostEqual(c.area, pi * (0.5 + 0.125) ** 2, 5)
         self.assertEqual(len(c.face().inner_wires()), 0)
-    
+
     def test_offset_bad_type(self):
         with self.assertRaises(TypeError):
             offset(Vertex(), amount=1)
 
+    def test_offset_failure(self):
+        with BuildPart() as cup:
+            with BuildSketch():
+                Circle(35)
+            extrude(amount=50, taper=-3)
+            topf = cup.faces().sort_by(Axis.Z)[-1]
+            with self.assertRaises(RuntimeError):
+                offset(amount=-2, openings=topf)
+
 
 class PolarLocationsTests(unittest.TestCase):
     def test_errors(self):

tests/test_build_sketch.py

@@ -387,7 +387,7 @@ def test_trapezoid(self):
                 Trapezoid(6, 2, 150)
 
         with BuildSketch() as test:
-            t = Trapezoid(12,8,135,90)
+            t = Trapezoid(12, 8, 135, 90)
         self.assertEqual(t.width, 12)
         self.assertEqual(t.trapezoid_height, 8)
         self.assertEqual(t.left_side_angle, 135)
@@ -462,6 +462,12 @@ def test_trace(self):
         with self.assertRaises(ValueError):
             trace()
 
+        line = Polyline((0, 0), (10, 10), (20, 10))
+        test = trace(line, 4)
+        self.assertEqual(len(test.faces()), 3)
+        test = trace(line, 4).clean()
+        self.assertEqual(len(test.faces()), 1)
+
 
 if __name__ == "__main__":
     unittest.main(failfast=True)