feat: enhance TpptSlideMaster with dynamic attribute retrieval for slide layouts

Author: ya7010

design/slide_master.py

@@ -1,4 +1,4 @@
-from typing import Any, ClassVar, Self, Type, TypeVar, overload
+from typing import Any, ClassVar, Self, overload
 
 from typing_extensions import dataclass_transform
 
@@ -52,11 +52,6 @@ def __get__(self, instance: object | None, objtype: type[Any]) -> type[Self] | S
             return self
 
 
-# 型変数を調整
-TpptSlideMasterType = TypeVar("TpptSlideMasterType", bound=Type[TpptSlideMaster])
-TpptSlideLayoutType = TypeVar("TpptSlideLayoutType", bound=Type[TpptSlideLayout])
-
-
 class MyMasterSlide(TpptSlideLayout):
     def __init__(self, a: int, b: str): ...
 

src/tppt/_pptx/presentation.py

@@ -40,7 +40,7 @@ def tree(self) -> dict[str, Any]:
 
     @classmethod
     def builder(
-        cls, slide_master: GenericTpptSlideMaster | None = None
+        cls, slide_master: "GenericTpptSlideMaster | None" = None
     ) -> "PresentationBuilder[GenericTpptSlideMaster]":
         """Get a builder for the presentation."""
         return PresentationBuilder(slide_master)
@@ -64,7 +64,7 @@ def from_pptx(cls, pptx_obj: PptxPresentation) -> Self:
 class PresentationBuilder(Generic[GenericTpptSlideMaster]):
     """Builder for presentations."""
 
-    def __init__(self, slide_master: GenericTpptSlideMaster | None = None) -> None:
+    def __init__(self, slide_master: "GenericTpptSlideMaster | None" = None) -> None:
         """Initialize the builder."""
         import pptx
 

src/tppt/_tppt/slide_layout.py

@@ -1,16 +1,23 @@
 import datetime
-from abc import ABC
+from typing import Any, Self, overload
 
-from tppt._pptx.slide import SlideBuilder
 
+class TpptSlideLayout:
+    @overload
+    def __get__(self, instance: None, objtype: type[Any]) -> type[Self]: ...
 
-class TttpSlideLayout(ABC):
-    @classmethod
-    def builder(cls) -> "SlideBuilder":
-        raise NotImplementedError("tppt.SlideLayout.builder must be implemented")
+    @overload
+    def __get__(self, instance: object, objtype: type[Any]) -> Self: ...
 
+    def __get__(self, instance: object | None, objtype: type[Any]) -> type[Self] | Self:
+        if instance is None:
+            return type(self)
 
-class TitleSlide(TttpSlideLayout):
+        else:
+            return self
+
+
+class DefaultMasterSlide(TpptSlideLayout):
     def __init__(
         self,
         *,
@@ -25,7 +32,3 @@ def __init__(
         self.date = date
         self.footer = footer
         self.slide_number = slide_number
-
-    @classmethod
-    def builder(cls) -> "SlideBuilder":
-        return SlideBuilder()

src/tppt/_tppt/slide_master.py

@@ -1,7 +1,38 @@
-from typing import TypeVar
+from typing import ClassVar, TypeVar
 
+from typing_extensions import dataclass_transform
 
-class TpptSlideMaster: ...
+from tppt.exception import (
+    SlideMasterAttributeMustBeSlideLayoutError,
+    SlideMasterAttributeNotFoundError,
+)
+
+from .slide_layout import TpptSlideLayout
+
+
+class TpptSlideMasterMeta(type):
+    def __getattr__(self, key: str) -> "type[TpptSlideLayout]":
+        if key in self.__annotations__:
+            annotation = self.__annotations__[key]
+            if issubclass(annotation, TpptSlideLayout):
+                return annotation
+            else:
+                raise SlideMasterAttributeMustBeSlideLayoutError(key)
+
+        raise SlideMasterAttributeNotFoundError(key)
+
+
+@dataclass_transform(
+    eq_default=True,
+    order_default=False,
+    field_specifiers=(),
+)
+class TpptSlideMaster(metaclass=TpptSlideMasterMeta):
+    _template_path: ClassVar[str | None] = None
+
+    @classmethod
+    def get_template_path(cls) -> str | None:
+        return cls._template_path
 
 
 GenericTpptSlideMaster = TypeVar("GenericTpptSlideMaster", bound=TpptSlideMaster)

src/tppt/exception.py

@@ -4,7 +4,7 @@
 from pptx.slide import SlideLayouts as PptxSlideLayouts
 
 
-class tpptException(Exception):
+class TpptException(Exception):
     """Base exception for tppt."""
 
     @property
@@ -19,7 +19,7 @@ def __str__(self) -> str:
         return self.message
 
 
-class ColorInvalidFormatError(tpptException, ValueError):
+class ColorInvalidFormatError(TpptException, ValueError):
     """Color format is invalid."""
 
     def __init__(self, color: str) -> None:
@@ -30,7 +30,7 @@ def message(self) -> str:
         return f"Invalid color format: {self.color}"
 
 
-class SlideLayoutIndexError(tpptException, IndexError):
+class SlideLayoutIndexError(TpptException, IndexError):
     """Slide layout index is out of range."""
 
     def __init__(self, index: int, slide_layouts: PptxSlideLayouts) -> None:
@@ -40,3 +40,25 @@ def __init__(self, index: int, slide_layouts: PptxSlideLayouts) -> None:
     @property
     def message(self) -> str:
         return f"Slide layout index {self.index} is out of range. Available slide layouts: {[layout.name for layout in self.slide_layouts]}"
+
+
+class SlideMasterAttributeMustBeSlideLayoutError(TpptException, ValueError):
+    """Slide master attribute must be a slide layout."""
+
+    def __init__(self, slide_layout_name: str) -> None:
+        self.slide_layout_name = slide_layout_name
+
+    @property
+    def message(self) -> str:
+        return f"The slide master attribute must be a slide layout. The {self.slide_layout_name} layout is not a slide layout."
+
+
+class SlideMasterAttributeNotFoundError(TpptException, ValueError):
+    """Slide master attribute not found."""
+
+    def __init__(self, slide_layout_name: str) -> None:
+        self.slide_layout_name = slide_layout_name
+
+    @property
+    def message(self) -> str:
+        return f"The slide master does not have an attribute for the {self.slide_layout_name} layout"