refactor: simplify initialization of PptxConvertible subclasses and remove redundant methods

Author: ya7010

src/tppt/pptx/chart/chart.py

@@ -1,4 +1,4 @@
-from typing import Literal, Self, TypedDict, assert_never
+from typing import Literal, TypedDict, assert_never
 
 from pptx.chart.chart import Chart as PptxChart
 from pptx.chart.data import ChartData as PptxChartData
@@ -258,18 +258,5 @@ class ChartData(ChartProps):
 class Chart(PptxConvertible[PptxChart]):
     """Chart data class."""
 
-    def __init__(
-        self,
-        pptx_obj: PptxChart,
-        /,
-    ) -> None:
-        self._pptx = pptx_obj
-
-    def to_pptx(self) -> PptxChart:
-        """Convert to pptx shape."""
-        return self._pptx
-
-    @classmethod
-    def from_pptx(cls, pptx_obj: PptxChart) -> Self:
-        """Create from pptx shape."""
-        return cls(pptx_obj)
+    def __init__(self, pptx_obj: PptxChart, /) -> None:
+        super().__init__(pptx_obj)

src/tppt/pptx/converter.py

@@ -1,13 +1,12 @@
 """Type definitions for pptx wrapper."""
 
 from typing import (
-    Protocol,
+    Generic,
     Self,
     TypeAlias,
     TypeVar,
     assert_never,
     overload,
-    runtime_checkable,
 )
 
 from pptx.dml.color import RGBColor as PptxRGBColor
@@ -34,18 +33,20 @@
 PT = TypeVar("PT")
 
 
-@runtime_checkable
-class PptxConvertible(Protocol[PT]):
+class PptxConvertible(Generic[PT]):
     """Protocol for objects that can be converted to and from pptx objects."""
 
+    def __init__(self, pptx_obj: PT, /) -> None:
+        self._pptx: PT = pptx_obj
+
     def to_pptx(self) -> PT:
         """Convert to pptx object."""
-        ...
+        return self._pptx
 
     @classmethod
     def from_pptx(cls, pptx_obj: PT) -> Self:
         """Create from pptx object."""
-        ...
+        return cls(pptx_obj)
 
 
 @overload

src/tppt/pptx/dml/color.py

@@ -1,4 +1,4 @@
-from typing import Literal, Self, assert_never, cast
+from typing import Literal, assert_never, cast
 
 from lxml.etree import _Element
 from pptx.dml.color import ColorFormat as PptxColorFormat
@@ -79,8 +79,8 @@ def to_pptx_theme_color(
 
 
 class ColorFormat(PptxConvertible[PptxColorFormat]):
-    def __init__(self, pptx_obj: PptxColorFormat) -> None:
-        self._pptx = pptx_obj
+    def __init__(self, pptx_obj: PptxColorFormat, /) -> None:
+        super().__init__(pptx_obj)
 
     @property
     def brightness(self) -> float:
@@ -136,10 +136,3 @@ def theme_color(self) -> MSO_THEME_COLOR | None:
     @theme_color.setter
     def theme_color(self, value: LiteralThemeColor | MSO_THEME_COLOR | None) -> None:
         self._pptx.theme_color = to_pptx_theme_color(value)
-
-    def to_pptx(self) -> PptxColorFormat:
-        return self._pptx
-
-    @classmethod
-    def from_pptx(cls, pptx_obj: PptxColorFormat) -> Self:
-        return cls(pptx_obj)

src/tppt/pptx/dml/fill.py

@@ -1,6 +1,7 @@
-from typing import Self, cast
+from typing import TypeVar, cast
 
 from pptx.dml.fill import FillFormat as PptxFillFormat
+from pptx.dml.fill import _Fill as PptxFill
 from pptx.dml.fill import _GradFill as PptxGradFill
 from pptx.dml.fill import _GradientStop as PptxGradientStop
 from pptx.dml.fill import _GradientStops as PptxGradientStops
@@ -11,14 +12,15 @@
 
 from tppt.pptx.converter import PptxConvertible, to_pptx_angle, to_tppt_angle
 from tppt.pptx.dml.color import ColorFormat
+from tppt.pptx.enum.dml import LiteralPatternType, to_pptx_pattern_type
 from tppt.types._angle import Angle
 
 
 class FillFormat(PptxConvertible[PptxFillFormat]):
     """Fill format."""
 
-    def __init__(self, pptx_obj: PptxFillFormat) -> None:
-        self._pptx = pptx_obj
+    def __init__(self, pptx_obj: PptxFillFormat, /) -> None:
+        super().__init__(pptx_obj)
 
     @property
     def fore_color(self) -> ColorFormat:
@@ -59,70 +61,17 @@ def gradient(self) -> "GradFill":
         self._pptx.gradient()
         return GradFill(cast(PptxGradFill, self._pptx._fill))
 
-    def to_pptx(self) -> PptxFillFormat:
-        """Convert to pptx fill format."""
-        return self._pptx
 
-    @classmethod
-    def from_pptx(cls, pptx_obj: PptxFillFormat) -> Self:
-        """Create from pptx fill format."""
-        return cls(pptx_obj)
+_GenericPptxFill = TypeVar("_GenericPptxFill", bound=PptxFill)
 
 
-class NoFill(PptxConvertible[PptxNoFill]):
-    """No fill."""
-
-    def __init__(self, pptx_obj: PptxNoFill) -> None:
-        self._pptx = pptx_obj
-
-    def to_pptx(self) -> PptxNoFill:
-        """Convert to pptx no fill."""
-        return self._pptx
-
-    @classmethod
-    def from_pptx(cls, pptx_obj: PptxNoFill) -> Self:
-        """Create from pptx no fill."""
-        return cls(pptx_obj)
-
-
-class PattFill(PptxConvertible[PptxPattFill]):
-    """Pattern fill."""
-
-    def __init__(self, pptx_obj: PptxPattFill) -> None:
-        self._pptx = pptx_obj
-
-    def to_pptx(self) -> PptxPattFill:
-        """Convert to pptx pattern fill."""
-        return self._pptx
-
-    @classmethod
-    def from_pptx(cls, pptx_obj: PptxPattFill) -> Self:
-        """Create from pptx pattern fill."""
-        return cls(pptx_obj)
-
-
-class SolidFill(PptxConvertible[PptxSolidFill]):
-    """Solid fill."""
+class Fill(PptxConvertible[_GenericPptxFill]):
+    pass
 
-    def __init__(self, pptx_obj: PptxSolidFill) -> None:
-        self._pptx = pptx_obj
 
-    def to_pptx(self) -> PptxSolidFill:
-        """Convert to pptx solid fill."""
-        return self._pptx
-
-    @classmethod
-    def from_pptx(cls, pptx_obj: PptxSolidFill) -> Self:
-        """Create from pptx solid fill."""
-        return cls(pptx_obj)
-
-
-class GradFill(PptxConvertible[PptxGradFill]):
+class GradFill(Fill[PptxGradFill]):
     """Gradient fill."""
 
-    def __init__(self, pptx_obj: PptxGradFill) -> None:
-        self._pptx = pptx_obj
-
     @property
     def gradient_angle(self) -> Angle | None:
         """Angle in float degrees of line of a linear gradient."""
@@ -137,44 +86,59 @@ def gradient_stops(self) -> "GradientStops":
         """Gradient stops."""
         return GradientStops(self._pptx.gradient_stops)
 
-    def to_pptx(self) -> PptxGradFill:
-        """Convert to pptx gradient fill."""
-        return self._pptx
 
-    @classmethod
-    def from_pptx(cls, pptx_obj: PptxGradFill) -> Self:
-        """Create from pptx gradient fill."""
-        return cls(pptx_obj)
+class NoFill(Fill[PptxNoFill]):
+    """No fill."""
+
+    def __init__(self, pptx_obj: PptxNoFill) -> None:
+        super().__init__(pptx_obj)
+
+
+class PattFill(Fill[PptxPattFill]):
+    """Pattern fill."""
+
+    @property
+    def back_color(self) -> ColorFormat:
+        """Back color."""
+        return ColorFormat(self._pptx.back_color)
+
+    @property
+    def fore_color(self) -> ColorFormat:
+        """Fore color."""
+        return ColorFormat(self._pptx.fore_color)
+
+    @property
+    def pattern(self) -> MSO_PATTERN_TYPE:
+        """Pattern."""
+        return self._pptx.pattern
+
+    @pattern.setter
+    def pattern(self, value: LiteralPatternType | MSO_PATTERN_TYPE) -> None:
+        self._pptx.pattern = to_pptx_pattern_type(value)
+
+
+class SolidFill(Fill[PptxSolidFill]):
+    """Solid fill."""
+
+    @property
+    def fore_color(self) -> ColorFormat:
+        """Fore color."""
+        return ColorFormat(self._pptx.fore_color)
 
 
 class GradientStops(PptxConvertible[PptxGradientStops]):
     """Gradient stops."""
 
-    def __init__(self, pptx_obj: PptxGradientStops) -> None:
-        self._pptx = pptx_obj
-
     def __getitem__(self, idx: int) -> "GradientStop":
         return GradientStop(self._pptx[idx])
 
     def __len__(self) -> int:
         return len(self._pptx)
 
-    def to_pptx(self) -> PptxGradientStops:
-        """Convert to pptx gradient stops."""
-        return self._pptx
-
-    @classmethod
-    def from_pptx(cls, pptx_obj: PptxGradientStops) -> Self:
-        """Create from pptx gradient stops."""
-        return cls(pptx_obj)
-
 
 class GradientStop(PptxConvertible[PptxGradientStop]):
     """Gradient stop."""
 
-    def __init__(self, pptx_obj: PptxGradientStop) -> None:
-        self._pptx = pptx_obj
-
     @property
     def color(self) -> ColorFormat:
         """Color."""
@@ -194,12 +158,3 @@ def position(self) -> float:
     @position.setter
     def position(self, value: float) -> None:
         self._pptx.position = value
-
-    def to_pptx(self) -> PptxGradientStop:
-        """Convert to pptx gradient stop."""
-        return self._pptx
-
-    @classmethod
-    def from_pptx(cls, pptx_obj: PptxGradientStop) -> Self:
-        """Create from pptx gradient stop."""
-        return cls(pptx_obj)