Multimethod changes and type checking (#1969)

* Fix free func cone dispatching

* Expose multidispatch via utils

* Fix import

* Fix formatting

* Another black fix

* Use a custom multidispatch implementation

* Disable no impl error code

* Switch Plane to the new implementation

* Convert rest of geom to multidispatch

* Convert even more methods/funcs and fix issues

* Typo fix

* Coverge tweaks

* Enable typechecking of multimethods

* Fix shapes

* Fix sketch

* Fix Workplane

* Apply suggestions from code review

Co-authored-by: Jeremy Wright <wrightjmf@gmail.com>

* Apply suggestion

* Black fix

---------

Co-authored-by: adam-urbanczyk <13981538+adam-urbanczyk@users.noreply.github.com>
Co-authored-by: Jeremy Wright <wrightjmf@gmail.com>

Author: adam-urbanczyk

cadquery/cq.py

@@ -3657,7 +3657,7 @@ def _getFaces(self) -> List[Face]:
 
         for el in self.objects:
             if isinstance(el, Sketch):
-                rv.extend(el)
+                rv.extend(f for f in el if isinstance(f, Face))
             elif isinstance(el, Face):
                 rv.append(el)
             elif isinstance(el, Compound):
@@ -3677,7 +3677,7 @@ def _getFacesVertices(self) -> List[Union[Face, Vertex]]:
 
         for el in self.objects:
             if isinstance(el, Sketch):
-                rv.extend(el)
+                rv.extend(f for f in el if isinstance(f, Face))
             elif isinstance(el, (Face, Vertex)):
                 rv.append(el)
             elif isinstance(el, Compound):

cadquery/occ_impl/exporters/dxf.py

@@ -155,7 +155,7 @@ def add_shape(self, shape: Union[WorkplaneLike, Shape], layer: str = "") -> Self
 
         if isinstance(shape, WorkplaneLike):
             plane = shape.plane
-            shape_ = compound(*shape).transformShape(plane.fG)
+            shape_ = compound(*shape.__iter__()).transformShape(plane.fG)
         else:
             shape_ = shape
 

cadquery/occ_impl/geom.py

@@ -26,10 +26,8 @@
 from OCP.TopLoc import TopLoc_Location
 from OCP.BinTools import BinTools_LocationSet
 
-from multimethod import multidispatch
-
 from ..types import Real
-from ..utils import multimethod
+from ..utils import multidispatch
 
 TOL = 1e-2
 
@@ -606,7 +604,7 @@ def __init__(
         self._setPlaneDir(xDir)
         self.origin = Vector(origin)
 
-    @__init__.register
+    @multidispatch
     def __init__(
         self, loc: "Location",
     ):
@@ -1031,7 +1029,7 @@ class Location(object):
 
     wrapped: TopLoc_Location
 
-    @multimethod
+    @multidispatch
     def __init__(self, t: VectorLike) -> None:
         """Location with translation t with respect to the original location."""
 
@@ -1040,7 +1038,7 @@ def __init__(self, t: VectorLike) -> None:
 
         self.wrapped = TopLoc_Location(T)
 
-    @__init__.register
+    @multidispatch
     def __init__(
         self,
         x: Real = 0,
@@ -1069,7 +1067,7 @@ def __init__(
 
         self.wrapped = loc
 
-    @__init__.register
+    @multidispatch
     def __init__(self, t: Plane) -> None:
         """Location corresponding to the location of the Plane t."""
 
@@ -1079,7 +1077,7 @@ def __init__(self, t: Plane) -> None:
 
         self.wrapped = TopLoc_Location(T)
 
-    @__init__.register
+    @multidispatch
     def __init__(self, t: Plane, v: VectorLike) -> None:
         """Location corresponding to the angular location of the Plane t with translation v."""
 
@@ -1089,19 +1087,19 @@ def __init__(self, t: Plane, v: VectorLike) -> None:
 
         self.wrapped = TopLoc_Location(T)
 
-    @__init__.register
+    @multidispatch
     def __init__(self, T: TopLoc_Location) -> None:
         """Location wrapping the low-level TopLoc_Location object t"""
 
         self.wrapped = T
 
-    @__init__.register
+    @multidispatch
     def __init__(self, T: gp_Trsf) -> None:
         """Location wrapping the low-level gp_Trsf object t"""
 
         self.wrapped = TopLoc_Location(T)
 
-    @__init__.register
+    @multidispatch
     def __init__(self, t: VectorLike, ax: VectorLike, angle: Real) -> None:
         """Location with translation t and rotation around ax by angle
         with respect to the original location."""
@@ -1112,7 +1110,7 @@ def __init__(self, t: VectorLike, ax: VectorLike, angle: Real) -> None:
 
         self.wrapped = TopLoc_Location(T)
 
-    @__init__.register
+    @multidispatch
     def __init__(self, t: VectorLike, angles: Tuple[Real, Real, Real]) -> None:
         """Location with translation t and 3 rotation angles."""