Expose Constants.non_first_name_prefixes SetManager (#121)

Author: derek73

nameparser/config/__init__.py

@@ -36,7 +36,7 @@
     from typing_extensions import Self
 
 from nameparser.util import lc
-from nameparser.config.prefixes import PREFIXES
+from nameparser.config.prefixes import PREFIXES, NON_FIRST_NAME_PREFIXES
 from nameparser.config.first_name_prefixes import FIRST_NAME_PREFIXES
 from nameparser.config.capitalization import CAPITALIZATION_EXCEPTIONS
 from nameparser.config.conjunctions import CONJUNCTIONS
@@ -264,6 +264,11 @@ class Constants:
         :py:attr:`conjunctions`  wrapped with :py:class:`SetManager`.
     :param set first_name_prefixes:
         :py:attr:`~first_name_prefixes.FIRST_NAME_PREFIXES` wrapped with :py:class:`SetManager`.
+    :param set non_first_name_prefixes:
+        :py:attr:`~prefixes.NON_FIRST_NAME_PREFIXES` wrapped with :py:class:`SetManager`.
+        The subset of prefixes that are never a first name, so a *leading* one
+        marks the whole name as a surname. Must stay disjoint from
+        ``first_name_prefixes``.
     :type capitalization_exceptions: tuple or dict
     :param capitalization_exceptions: 
         :py:attr:`~capitalization.CAPITALIZATION_EXCEPTIONS` wrapped with :py:class:`TupleManager`.
@@ -289,6 +294,7 @@ class Constants:
     first_name_titles: SetManager
     conjunctions: SetManager
     first_name_prefixes: SetManager
+    non_first_name_prefixes: SetManager
     suffix_acronyms_ambiguous: SetManager
     capitalization_exceptions: TupleManager[str]
     regexes: RegexTupleManager
@@ -463,6 +469,7 @@ def __init__(self,
                  first_name_titles: Iterable[str] = FIRST_NAME_TITLES,
                  conjunctions: Iterable[str] = CONJUNCTIONS,
                  first_name_prefixes: Iterable[str] = FIRST_NAME_PREFIXES,
+                 non_first_name_prefixes: Iterable[str] = NON_FIRST_NAME_PREFIXES,
                  capitalization_exceptions: TupleManager[str] | Iterable[tuple[str, str]] = CAPITALIZATION_EXCEPTIONS,
                  regexes: RegexTupleManager | TupleManager[re.Pattern[str]] | Iterable[tuple[str, re.Pattern[str]]] = REGEXES,
                  patronymic_name_order: bool = False,
@@ -478,6 +485,7 @@ def __init__(self,
         self.first_name_titles = SetManager(first_name_titles)
         self.conjunctions = SetManager(conjunctions)
         self.first_name_prefixes = SetManager(first_name_prefixes)
+        self.non_first_name_prefixes = SetManager(non_first_name_prefixes)
         self.suffix_acronyms_ambiguous = SetManager(suffix_acronyms_ambiguous)
         self.capitalization_exceptions = TupleManager(capitalization_exceptions)
         self.regexes = RegexTupleManager(regexes)

tests/conftest.py

@@ -35,6 +35,7 @@
     "first_name_titles",
     "conjunctions",
     "first_name_prefixes",
+    "non_first_name_prefixes",
     "capitalization_exceptions",
     "regexes",
     "nickname_delimiters",

tests/test_prefixes.py

@@ -1,6 +1,7 @@
 import pytest
 
 from nameparser import HumanName
+from nameparser.config import CONSTANTS, Constants
 from nameparser.config.prefixes import PREFIXES, NON_FIRST_NAME_PREFIXES
 from nameparser.config.first_name_prefixes import FIRST_NAME_PREFIXES
 
@@ -184,6 +185,22 @@ def test_non_first_name_prefixes_expected_members(self) -> None:
         self.assertNotIn('van', NON_FIRST_NAME_PREFIXES)
         self.assertNotIn('della', NON_FIRST_NAME_PREFIXES)
 
+    def test_constants_exposes_non_first_name_prefixes(self) -> None:
+        self.assertEqual(set(CONSTANTS.non_first_name_prefixes), NON_FIRST_NAME_PREFIXES)
+
+    def test_non_first_name_prefixes_disjoint_from_titles(self) -> None:
+        # A member that is also a title is consumed as a title before the fold
+        # would run, making it inert (the st/ste footgun). Pin the invariant on
+        # the live default sets.
+        self.assertEqual(
+            set(CONSTANTS.non_first_name_prefixes) & set(CONSTANTS.titles),
+            set(),
+        )
+
+    def test_non_first_name_prefixes_constructor_arg(self) -> None:
+        c = Constants(non_first_name_prefixes={'zzz'})
+        self.assertEqual(set(c.non_first_name_prefixes), {'zzz'})
+
 
 class LastNamePrefixSplitTestCase(HumanNameTestBase):