refactor: update exception classes to use AttributeError and improve error messages

Author: ya7010

src/tppt/exception.py

@@ -54,23 +54,22 @@ 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 SlideMasterDoesNotHaveAttributesError(TpptException, ValueError):
+class SlideMasterDoesNotHaveAttributesError(TpptException, AttributeError):
     """Slide master does not have an attribute."""
 
-    def __init__(self, slide_layout: "type") -> 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"
+        return "The slide master does not have an attributes"
 
 
-class SlideMasterAttributeNotFoundError(TpptException, ValueError):
+class SlideMasterAttributeNotFoundError(TpptException, AttributeError):
     """Slide master attribute not found."""
 
-    def __init__(self, slide_layout_name: str) -> None:
-        self.slide_layout_name = slide_layout_name
+    def __init__(self, attribute_name: str) -> None:
+        self.attribute_name = attribute_name
 
     @property
     def message(self) -> str:
-        return f"The slide master does not have an attribute for the {self.slide_layout_name} layout"
+        return (
+            f"The slide master does not have an attribute of the {self.attribute_name}"
+        )

src/tppt/slide_master.py

@@ -21,7 +21,6 @@
     DefaultTitleSlide,
     DefaultTwoContentSlide,
     DefaultVerticalTitleAndTextSlide,
-    Placeholder,
     SlideLayout,
 )
 
@@ -57,10 +56,14 @@ def __getattr__(self, key: str) -> "type[SlideLayout]":
                     return annotation
                 else:
                     return annotation
+            elif (attributes := getattr(self, "__annotations__", None)) and hasattr(
+                attributes, key
+            ):
+                return getattr(attributes, key)
             else:
                 raise SlideMasterAttributeNotFoundError(key)
         else:
-            raise SlideMasterDoesNotHaveAttributesError(self)
+            raise SlideMasterDoesNotHaveAttributesError()
 
 
 @dataclass_transform(
@@ -82,9 +85,6 @@ def __class_getitem__(cls, item: AnyType) -> AnyType:
 
 
 class DefaultSlideMaster(SlideMaster):
-    title: Placeholder[str]
-    text: Placeholder[str]
-
     Title: Layout[DefaultTitleSlide]
     TitleAndContent: Layout[DefaultTitleAndContentSlide]
     SectionHeader: Layout[DefaultSectionHeaderSlide]

tests/test_slide_master.py

@@ -10,13 +10,31 @@
     DefaultTitleSlide,
     DefaultTwoContentSlide,
     DefaultVerticalTitleAndTextSlide,
+    Placeholder,
 )
-from tppt.slide_master import DefaultSlideMaster, get_layouts
+from tppt.slide_master import DefaultSlideMaster, Layout, get_layouts
+
+
+class TestSlideMaster(DefaultSlideMaster):
+    title: Placeholder[str]
+    content: Placeholder[str]
+
+    Title: Layout[DefaultTitleSlide]
+    TitleAndContent: Layout[DefaultTitleAndContentSlide]
+    SectionHeader: Layout[DefaultSectionHeaderSlide]
+    TwoContent: Layout[DefaultTwoContentSlide]
+    Comparison: Layout[DefaultComparisonSlide]
+    TitleOnly: Layout[DefaultTitleOnlySlide]
+    Blank: Layout[DefaultBlankSlide]
+    ContentWithCaption: Layout[DefaultContentWithCaptionSlide]
+    PictureWithCaption: Layout[DefaultPictureWithCaptionSlide]
+    TitleAndVerticalText: Layout[DefaultTitleAndVerticalTextSlide]
+    VerticalTitleAndText: Layout[DefaultVerticalTitleAndTextSlide]
 
 
 def test_get_layouts():
     """Test that get_layouts function correctly retrieves the list of Layouts"""
-    layouts = get_layouts(DefaultSlideMaster)
+    layouts = get_layouts(TestSlideMaster)
 
     # Verify that all Layouts are included
     expected_layouts = [