Do not change toCAF signature

Author: lorenzncode

cadquery/occ_impl/assembly.py

@@ -10,6 +10,11 @@
 from OCP.TDF import TDF_Label
 from OCP.TopLoc import TopLoc_Location
 from OCP.Quantity import Quantity_ColorRGBA
+from OCP.XCAFPrs import (
+    XCAFPrs_DocumentExplorer,
+    XCAFPrs_DocumentExplorerFlags_None,
+    XCAFPrs_Style,
+)
 
 from vtkmodules.vtkRenderingCore import (
     vtkActor,
@@ -140,7 +145,7 @@ def toCAF(
     mesh: bool = False,
     tolerance: float = 1e-3,
     angularTolerance: float = 0.1,
-) -> TDocStd_Document:
+) -> Tuple[TDF_Label, TDocStd_Document]:
 
     # prepare a doc
     app = XCAFApp_Application.GetApplication_s()
@@ -211,8 +216,14 @@ def _toCAF(el, ancestor, color):
     _toCAF(assy, None, None)
 
     tool.UpdateAssemblies()
-
-    return doc
+    return (
+        XCAFPrs_DocumentExplorer(
+            doc, XCAFPrs_DocumentExplorerFlags_None, XCAFPrs_Style()
+        )
+        .Current()
+        .Label,
+        doc,
+    )
 
 
 def toVTK(

cadquery/occ_impl/exporters/assembly.py

@@ -50,7 +50,7 @@ def exportAssembly(assy: AssemblyProtocol, path: str, **kwargs) -> bool:
         pcurves = 0
     precision_mode = kwargs["precision_mode"] if "precision_mode" in kwargs else 0
 
-    doc = toCAF(assy, True)
+    _, doc = toCAF(assy, True)
 
     session = XSControl_WorkSession()
     writer = STEPCAFControl_Writer(session, False)
@@ -75,7 +75,7 @@ def exportCAF(assy: AssemblyProtocol, path: str) -> bool:
     name, ext = os.path.splitext(fname)
     ext = ext[1:] if ext[0] == "." else ext
 
-    doc = toCAF(assy)
+    _, doc = toCAF(assy)
     app = XCAFApp_Application.GetApplication_s()
 
     store = XmlDrivers_DocumentStorageDriver(
@@ -167,7 +167,7 @@ def exportGLTF(
     orig_loc = assy.loc
     assy.loc *= Location((0, 0, 0), (1, 0, 0), -90)
 
-    doc = toCAF(assy, True, True, tolerance, angularTolerance)
+    _, doc = toCAF(assy, True, True, tolerance, angularTolerance)
 
     writer = RWGltf_CafWriter(TCollection_AsciiString(path), binary)
     result = writer.Perform(

tests/test_assembly.py

@@ -484,7 +484,7 @@ def test_assembly(simple_assy, nested_assy):
 )
 def test_assy_root_name(assy_fixture, root_name, request):
     assy = request.getfixturevalue(assy_fixture)
-    doc = toCAF(assy, True)
+    _, doc = toCAF(assy, True)
     root = get_doc_nodes(doc, False)[0]
     if root_name:
         assert root["name"] == root_name
@@ -615,7 +615,7 @@ def test_save_raises(nested_assy):
 def test_leaf_node_count(assy_fixture, count, request):
 
     assy = request.getfixturevalue(assy_fixture)
-    doc = toCAF(assy, True)
+    _, doc = toCAF(assy, True)
 
     assert len(get_doc_nodes(doc, True)) == count
 
@@ -674,7 +674,7 @@ def check_nodes(doc, expected):
                     assert pytest.approx(n[k], abs=1e-3) == v
 
     assy = request.getfixturevalue(assy_fixture)
-    doc = toCAF(assy, False)
+    _, doc = toCAF(assy, False)
     check_nodes(doc, expected)
 
 
@@ -822,7 +822,7 @@ def check_nodes(doc, expected, is_STEP=False):
                     assert pytest.approx(n[k], abs=1e-3) == v
 
     assy = request.getfixturevalue(assy_fixture)
-    doc = toCAF(assy, True)
+    _, doc = toCAF(assy, True)
     check_nodes(doc, expected)
 
     # repeat color check again - after STEP export round trip