Replace Asserter with module-level assertion functions

betty/app/__init__.py

@@ -65,8 +65,10 @@
     AssertionFailed,
     Fields,
     OptionalField,
-    Asserter,
     AssertionChain,
+    assert_record,
+    assert_setattr,
+    assert_str,
 )
 from betty.warnings import deprecate
 
@@ -158,13 +160,12 @@ def load(
     ) -> Self:
         if configuration is None:
             configuration = cls()
-        asserter = Asserter()
-        asserter.assert_record(
+        assert_record(
             Fields(
                 OptionalField(
                     "locale",
-                    AssertionChain(asserter.assert_str())
-                    | asserter.assert_setattr(configuration, "locale"),
+                    AssertionChain(assert_str())
+                    | assert_setattr(configuration, "locale"),
                 ),
             ),
         )(dump)

betty/config.py

@@ -41,7 +41,7 @@
 from betty.serde.dump import Dumpable, Dump, minimize, VoidableDump, Void
 from betty.serde.error import SerdeErrorCollection
 from betty.serde.format import FormatRepository
-from betty.serde.load import Asserter, Assertion
+from betty.serde.load import Assertion, assert_dict, assert_mapping, assert_sequence
 
 if TYPE_CHECKING:
     from _weakref import ReferenceType
@@ -58,7 +58,6 @@ class Configuration(Dumpable):
 
     def __init__(self, *args: Any, **kwargs: Any):
         super().__init__(*args, **kwargs)
-        self._asserter = Asserter()
         self._on_change_listeners: MutableSequence[
             ReferenceType[_ConfigurationListener]
         ] = []
@@ -503,9 +502,8 @@ def load(
             configuration = cls()
         else:
             configuration._clear_without_dispatch()
-        asserter = Asserter()
         with SerdeErrorCollection().assert_valid():
-            configuration.append(*asserter.assert_sequence(cls._item_type().load)(dump))
+            configuration.append(*assert_sequence(cls._item_type().load)(dump))
         return configuration
 
     @override
@@ -658,9 +656,8 @@ def load(
     ) -> Self:
         if configuration is None:
             configuration = cls()
-        asserter = Asserter()
-        dict_dump = asserter.assert_dict()(dump)
-        mapping = asserter.assert_mapping(cls._item_type().load)(
+        dict_dump = assert_dict()(dump)
+        mapping = assert_mapping(cls._item_type().load)(
             {key: cls._load_key(value, key) for key, value in dict_dump.items()}
         )
         configuration.replace(*mapping.values())

betty/extension/cotton_candy/__init__.py

@@ -40,8 +40,11 @@
     AssertionFailed,
     Fields,
     OptionalField,
-    Asserter,
     AssertionChain,
+    assert_str,
+    assert_record,
+    assert_path,
+    assert_setattr,
 )
 
 if TYPE_CHECKING:
@@ -95,8 +98,7 @@ def load(
         dump: Dump,
         configuration: Self | None = None,
     ) -> Self:
-        asserter = Asserter()
-        hex_value = asserter.assert_str()(dump)
+        hex_value = assert_str()(dump)
         if configuration is None:
             configuration = cls(hex_value)
         else:
@@ -201,8 +203,7 @@ def load(
     ) -> Self:
         if configuration is None:
             configuration = cls()
-        asserter = Asserter()
-        asserter.assert_record(
+        assert_record(
             Fields(
                 OptionalField(
                     "featured_entities",
@@ -236,8 +237,8 @@ def load(
                 ),
                 OptionalField(
                     "logo",
-                    AssertionChain(asserter.assert_path())
-                    | asserter.assert_setattr(configuration, "logo"),
+                    AssertionChain(assert_path())
+                    | assert_setattr(configuration, "logo"),
                 ),
             )
         )(dump)

betty/extension/gramps/config.py

@@ -11,11 +11,13 @@
 from betty.config import Configuration, ConfigurationSequence
 from betty.serde.dump import minimize, Dump, VoidableDump
 from betty.serde.load import (
-    Asserter,
     Fields,
     RequiredField,
     OptionalField,
     AssertionChain,
+    assert_record,
+    assert_path,
+    assert_setattr,
 )
 
 if TYPE_CHECKING:
@@ -61,13 +63,12 @@ def load(
     ) -> Self:
         if configuration is None:
             configuration = cls()
-        asserter = Asserter()
-        asserter.assert_record(
+        assert_record(
             Fields(
                 RequiredField(
                     "file",
-                    AssertionChain(asserter.assert_path())
-                    | asserter.assert_setattr(configuration, "file_path"),
+                    AssertionChain(assert_path())
+                    | assert_setattr(configuration, "file_path"),
                 ),
             )
         )(dump)
@@ -128,8 +129,7 @@ def load(
     ) -> Self:
         if configuration is None:
             configuration = cls()
-        asserter = Asserter()
-        asserter.assert_record(
+        assert_record(
             Fields(
                 OptionalField(
                     "family_trees",

betty/extension/nginx/config.py

@@ -6,7 +6,17 @@
 
 from betty.config import Configuration
 from betty.serde.dump import Dump, VoidableDump, minimize, Void, VoidableDictDump
-from betty.serde.load import Asserter, Fields, OptionalField, AssertionChain
+from betty.serde.load import (
+    Fields,
+    OptionalField,
+    AssertionChain,
+    assert_record,
+    assert_or,
+    assert_bool,
+    assert_none,
+    assert_setattr,
+    assert_str,
+)
 
 
 class NginxConfiguration(Configuration):
@@ -66,22 +76,17 @@ def load(
     ) -> Self:
         if configuration is None:
             configuration = cls()
-        asserter = Asserter()
-        asserter.assert_record(
+        assert_record(
             Fields(
                 OptionalField(
                     "https",
-                    AssertionChain(
-                        asserter.assert_or(
-                            asserter.assert_bool(), asserter.assert_none()
-                        )
-                    )
-                    | asserter.assert_setattr(configuration, "https"),
+                    AssertionChain(assert_or(assert_bool(), assert_none()))
+                    | assert_setattr(configuration, "https"),
                 ),
                 OptionalField(
                     "www_directory_path",
-                    AssertionChain(asserter.assert_str())
-                    | asserter.assert_setattr(configuration, "www_directory_path"),
+                    AssertionChain(assert_str())
+                    | assert_setattr(configuration, "www_directory_path"),
                 ),
             )
         )(dump)

betty/extension/wikipedia/config.py

@@ -8,7 +8,14 @@
 
 from betty.config import Configuration
 from betty.serde.dump import Dump, VoidableDump, minimize, VoidableDictDump
-from betty.serde.load import Asserter, Fields, OptionalField, AssertionChain
+from betty.serde.load import (
+    Fields,
+    OptionalField,
+    AssertionChain,
+    assert_record,
+    assert_bool,
+    assert_setattr,
+)
 
 
 class WikipediaConfiguration(Configuration):
@@ -45,13 +52,12 @@ def load(
     ) -> Self:
         if configuration is None:
             configuration = cls()
-        asserter = Asserter()
-        asserter.assert_record(
+        assert_record(
             Fields(
                 OptionalField(
                     "populate_images",
-                    AssertionChain(asserter.assert_bool())
-                    | asserter.assert_setattr(configuration, "populate_images"),
+                    AssertionChain(assert_bool())
+                    | assert_setattr(configuration, "populate_images"),
                 ),
             )
         )(dump)