Typing improvements

Author: sethfischer

cadquery/occ_impl/exporters/dxf.py

@@ -7,14 +7,17 @@
 from ezdxf.entities import factory
 from OCP.GeomConvert import GeomConvert
 from OCP.gp import gp_Dir
+from typing_extensions import Self
 
 from ...cq import Face, Plane, Workplane
 from ...units import RAD2DEG
 from ..shapes import Edge
 from .utils import toCompound
 
 ApproxOptions = Literal["spline", "arc"]
-DxfEntityAttributes = Tuple[str, Dict[str, Any]]
+DxfEntityAttributes = Tuple[
+    Literal["ARC", "CIRCLE", "ELLIPSE", "SPLINE",], Dict[str, Any]
+]
 
 
 class DxfDocument:
@@ -64,7 +67,7 @@ def __init__(
         metadata: Union[Dict[str, str], None] = None,
         approx: Optional[ApproxOptions] = None,
         tolerance: float = 1e-3,
-    ) -> None:
+    ):
         """Initialize DXF document.
 
         :param dxfversion: :attr:`DXF version specifier <ezdxf-stable:ezdxf.document.Drawing.dxfversion>`
@@ -106,7 +109,7 @@ def __init__(
 
     def add_layer(
         self, name: str, *, color: int = 1, linetype: str = "CONTINUOUS"
-    ) -> "DxfDocument":
+    ) -> Self:
         """Create a layer definition
 
         Refer to :ref:`ezdxf layers <ezdxf-stable:layer_concept>` and
@@ -120,7 +123,7 @@ def add_layer(
 
         return self
 
-    def add_shape(self, workplane: Workplane, layer: str = "") -> "DxfDocument":
+    def add_shape(self, workplane: Workplane, layer: str = "") -> Self:
         """Add CadQuery shape to a DXF layer.
 
         :param workplane: CadQuery Workplane