cbpr-usage-rules 0.1.0__tar.gz → 0.1.2__tar.gz

{cbpr_usage_rules-0.1.0 → cbpr_usage_rules-0.1.2}/CHANGELOG.md

@@ -4,7 +4,22 @@ All notable changes to this project are documented here. The format is based on
 [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+## [0.1.2]
+
+### Changed
+- LEI validation is now a single universal `VAL-LEI` rule (every `<LEI>` element,
+  all message types), replacing the per-module `VAL-LEI` checks that were missing
+  for several message types (e.g. pacs.008 2025) and scoped to specific party
+  paths where present. Malformed LEIs in any party position are now caught
+  consistently. `VAL-IBAN` and `VAL-LEI` share one document-wide implementation.
+
+## [0.1.1]
+
+### Fixed
+- IBAN values are now actually validated. The `is_valid_iban` algorithm existed
+  but was wired into no rule, so malformed IBANs passed silently. A universal
+  `VAL-IBAN` check now validates every `<IBAN>` element (mod-97 / ISO 7064)
+  across all message types.
 
 ### Added
 - Initial package: validation engine, wrapper-tolerant loader, public API

{cbpr_usage_rules-0.1.0/src/cbpr_usage_rules.egg-info → cbpr_usage_rules-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cbpr-usage-rules
-Version: 0.1.0
+Version: 0.1.2
 Summary: Validate ISO 20022 CBPR+ XML messages against SWIFT usage (business) rules.
 Author: Pete Houghton
 License: MIT License
@@ -141,7 +141,7 @@ Both `validate_file` and `validate_string` return a dictionary:
   "message_type": "pacs.008",         # the rule set that was applied
   "detected_message_type": "pacs.008",# auto-detected from the Document namespace
   "year": 2025,
-  "rules_evaluated": 84,
+  "rules_evaluated": 86,
   "violations": [
     {
       "rule_number": "pacs.008:R41",   # unique within the message type

{cbpr_usage_rules-0.1.0 → cbpr_usage_rules-0.1.2}/README.md

@@ -86,7 +86,7 @@ Both `validate_file` and `validate_string` return a dictionary:
   "message_type": "pacs.008",         # the rule set that was applied
   "detected_message_type": "pacs.008",# auto-detected from the Document namespace
   "year": 2025,
-  "rules_evaluated": 84,
+  "rules_evaluated": 86,
   "violations": [
     {
       "rule_number": "pacs.008:R41",   # unique within the message type

{cbpr_usage_rules-0.1.0 → cbpr_usage_rules-0.1.2}/src/cbpr_rules/__init__.py

@@ -4,7 +4,7 @@ This package is AI generated. See the README for details and caveats.
 """
 from __future__ import annotations
 
-__version__ = "0.1.0"
+__version__ = "0.1.2"
 
 from .models import Rule, Severity, Violation
 from .engine import validate_file, validate_string, list_rules, available

{cbpr_usage_rules-0.1.0 → cbpr_usage_rules-0.1.2}/src/cbpr_rules/registry.py

@@ -11,6 +11,7 @@ import pkgutil
 from typing import Callable, Dict, List, Tuple
 
 from .models import Rule, Severity, Violation
+from .validators import is_valid_iban, is_valid_lei
 
 # (year, message_type) -> list[Rule]
 _REGISTRY: Dict[Tuple[int, str], List[Rule]] = {}
@@ -97,9 +98,54 @@ def _discover(year: int) -> None:
     _LOADED.add(year)
 
 
+# Cross-cutting datatype validations applied to every message type. In ISO 20022
+# these elements are self-validating datatypes wherever they appear, so a single
+# document-wide scan covers all message types (and all party positions - Debtor,
+# Creditor, Agent, Intermediary) correctly:
+#   <IBAN> is IBAN2007Identifier (ISO 7064 mod-97);
+#   <LEI>  is LEIIdentifier (ISO 17442, 18 alphanumerics + 2 ISO 7064 check digits).
+# (number, element, validator, name, description)
+_UNIVERSAL = [
+    ("VAL-IBAN", "IBAN", is_valid_iban, "CBPR_Valid_IBAN",
+     "Every IBAN must be structurally valid and pass the ISO 7064 mod-97 check."),
+    ("VAL-LEI", "LEI", is_valid_lei, "CBPR_Valid_LEI",
+     "Every LEI must be a structurally valid ISO 17442 identifier with correct check digits."),
+]
+
+
+def _universal_rules(msgtype: str) -> List[Rule]:
+    """Build the cross-cutting datatype rules (IBAN, LEI) for a message type."""
+    rules: List[Rule] = []
+    for number, element, validator, name, description in _UNIVERSAL:
+        rule_id = f"{msgtype}:{number}"
+
+        def check(msg, _el=element, _val=validator, _id=rule_id, _name=name, _desc=description):
+            out: List[Violation] = []
+            for el in msg.iter_local(_el):
+                value = msg.text_of(el)
+                if value and not _val(value):
+                    out.append(
+                        Violation(
+                            rule_number=_id,
+                            name=_name,
+                            description=_desc,
+                            detail=f"invalid {_el}: '{value}'",
+                            found=msg.snippet_of(el),
+                            xpath=msg.xpath_of(el),
+                            line=msg.line_of(el),
+                        )
+                    )
+            return out
+
+        rules.append(Rule(rule_id, name, description, Severity.VIOLATION, check))
+    return rules
+
+
 def load_rules(year: int, msgtype: str) -> List[Rule]:
     _discover(int(year))
-    return list(_REGISTRY.get(_key(year, msgtype), []))
+    rules = list(_REGISTRY.get(_key(year, msgtype), []))
+    rules.extend(_universal_rules(msgtype))
+    return rules
 
 
 def available_message_types(year: int) -> List[str]:

{cbpr_usage_rules-0.1.0 → cbpr_usage_rules-0.1.2}/src/cbpr_rules/rules/y2025/camt_052.py

@@ -11,7 +11,7 @@ rules are surfaced as advisory guidance. Algorithmic field validations
 from __future__ import annotations
 
 from ...registry import advisory, rule
-from ...validators import is_valid_bic, is_valid_country, is_valid_currency, is_valid_lei
+from ...validators import is_valid_bic, is_valid_country, is_valid_currency
 from ...helpers import (
     amount_equals_sum,
     business_msg_id_carries_group_id,
@@ -117,11 +117,6 @@ reg("VAL-BIC", "CBPR_Valid_Agent_BIC",
     _val_bic)
 
 
-reg("VAL-LEI", "CBPR_Valid_LEI",
-    "Account Owner / Account Servicer LEI must be a structurally valid ISO 17442 LEI.",
-    each_value_valid(RPT + "/Acct/Svcr/FinInstnId/LEI", is_valid_lei, "LEI"))
-
-
 def _val_ctry(msg, report):
     for node in msg.find(RPT + "/Acct/Svcr/FinInstnId/PstlAdr/Ctry"):
         val = msg.text_of(node)

{cbpr_usage_rules-0.1.0 → cbpr_usage_rules-0.1.2}/src/cbpr_rules/rules/y2025/camt_054.py

@@ -8,7 +8,7 @@ mechanizable textual rules are enforced, the rest are surfaced as advisories.
 from __future__ import annotations
 
 from ...registry import advisory, rule
-from ...validators import is_valid_bic, is_valid_country, is_valid_currency, is_valid_lei
+from ...validators import is_valid_bic, is_valid_country, is_valid_currency
 from ...helpers import (
     business_msg_id_carries_group_id,
     code_in,
@@ -88,10 +88,6 @@ reg("VAL-BIC", "CBPR_Valid_Account_Servicer_BIC",
     "Account Servicer BICFI must be a structurally valid BIC.",
     each_value_valid(NTFCTN + "/Acct/Svcr/FinInstnId/BICFI", is_valid_bic, "BIC"))
 
-reg("VAL-LEI", "CBPR_Valid_Account_Servicer_LEI",
-    "Account Servicer LEI must be a structurally valid LEI.",
-    each_value_valid(NTFCTN + "/Acct/Svcr/FinInstnId/LEI", is_valid_lei, "LEI"))
-
 reg("VAL-CTRY", "CBPR_Valid_Account_Owner_Country",
     "Account Owner postal address Country must be a valid ISO 3166 code.",
     each_value_valid(NTFCTN + "/Acct/Ownr/PstlAdr/Ctry", is_valid_country, "country"))

{cbpr_usage_rules-0.1.0 → cbpr_usage_rules-0.1.2}/src/cbpr_rules/rules/y2025/pacs_002.py

@@ -12,7 +12,7 @@ Paths are the short ISO 20022 tags from the guideline's XML Path column.
 from __future__ import annotations
 
 from ...registry import advisory, rule
-from ...validators import is_valid_bic, is_valid_country, is_valid_lei
+from ...validators import is_valid_bic, is_valid_country
 from ...helpers import (
     address_hybrid,
     address_lines_max_length,
@@ -172,10 +172,6 @@ reg("VAL-BIC", "CBPR_Valid_Agent_BIC",
     "Instructing/Instructed Agent BICFI must be a structurally valid BIC.",
     each_value_valid(TX + "/InstgAgt/FinInstnId/BICFI", is_valid_bic, "BIC"))
 
-reg("VAL-LEI", "CBPR_Valid_Originator_LEI",
-    "Originator Organisation Identification LEI must be a structurally valid LEI.",
-    each_value_valid(ORGTR + "/Id/OrgId/LEI", is_valid_lei, "LEI"))
-
 reg("VAL-CTRY", "CBPR_Valid_Originator_Country",
     "Originator Postal Address Country must be a valid ISO 3166 country code.",
     each_value_valid(ORGTR + "/PstlAdr/Ctry", is_valid_country, "country"))

{cbpr_usage_rules-0.1.0 → cbpr_usage_rules-0.1.2}/src/cbpr_rules/rules/y2025/pacs_004.py

@@ -12,7 +12,7 @@ from __future__ import annotations
 import re
 
 from ...registry import advisory, rule
-from ...validators import is_valid_bic, is_valid_country, is_valid_currency, is_valid_lei
+from ...validators import is_valid_bic, is_valid_country, is_valid_currency
 from ...helpers import (
     address_hybrid,
     address_lines_max_length,
@@ -715,13 +715,6 @@ reg("VAL-BIC", "CBPR_Valid_Agent_BIC",
         each_value_valid(TX + "/InstdAgt/FinInstnId/BICFI", is_valid_bic, "BIC"),
     ))
 
-reg("VAL-LEI", "CBPR_Valid_Agent_LEI",
-    "Every Agent LEI must be a structurally valid LEI.",
-    _run_all(
-        each_value_valid(TX + "/InstgAgt/FinInstnId/LEI", is_valid_lei, "LEI"),
-        each_value_valid(TX + "/InstdAgt/FinInstnId/LEI", is_valid_lei, "LEI"),
-    ))
-
 reg("VAL-CTRY", "CBPR_Valid_Country",
     "Every Country code must be a valid ISO 3166 country code.",
     _run_all(

{cbpr_usage_rules-0.1.0 → cbpr_usage_rules-0.1.2}/src/cbpr_rules/rules/y2025/pacs_009.py

@@ -11,7 +11,7 @@ Name/PostalAddress follow the *agent* (present-together) rule via FinInstnId.
 from __future__ import annotations
 
 from ...registry import advisory, rule
-from ...validators import is_valid_bic, is_valid_country, is_valid_currency, is_valid_lei
+from ...validators import is_valid_bic, is_valid_country, is_valid_currency
 from ...helpers import (
     address_hybrid,
     address_lines_max_length,
@@ -211,10 +211,6 @@ reg("VAL-BIC", "CBPR_Valid_Agent_BIC",
     "Instructing/Instructed Agent BICFI must be a structurally valid BIC.",
     each_value_valid(TX + "/InstgAgt/FinInstnId/BICFI", is_valid_bic, "BIC"))
 
-reg("VAL-LEI", "CBPR_Valid_Agent_LEI",
-    "Every Financial Institution LEI must be a structurally valid LEI.",
-    each_value_valid(TX + "/DbtrAgt/FinInstnId/LEI", is_valid_lei, "LEI"))
-
 reg("VAL-CTRY", "CBPR_Valid_Postal_Country",
     "Every Postal Address Country must be a valid ISO 3166 country code.",
     each_value_valid(TX + "/CdtrAgt/FinInstnId/PstlAdr/Ctry", is_valid_country, "country"))

{cbpr_usage_rules-0.1.0 → cbpr_usage_rules-0.1.2}/src/cbpr_rules/rules/y2025/pain_001.py

@@ -9,7 +9,7 @@ module (``pacs_008``): combinator-built rules go through ``reg``/``_agent_block`
 from __future__ import annotations
 
 from ...registry import advisory, rule
-from ...validators import is_valid_bic, is_valid_country, is_valid_currency, is_valid_lei
+from ...validators import is_valid_bic, is_valid_country, is_valid_currency
 from ...helpers import (
     address_hybrid,
     address_lines_max_length,
@@ -164,20 +164,6 @@ reg("VAL-BIC", "CBPR_Valid_Agent_BIC",
         if msg.text_of(node) and not is_valid_bic(msg.text_of(node))
     ])
 
-reg("VAL-LEI", "CBPR_Valid_LEI",
-    "Every LEI must be a structurally valid ISO 17442 LEI.",
-    lambda msg, report: [
-        report(node, detail=f"invalid LEI: '{msg.text_of(node)}'")
-        for path in (
-            PMTINF + "/Dbtr/Id/OrgId/LEI",
-            PMTINF + "/DbtrAgt/FinInstnId/LEI",
-            TX + "/Cdtr/Id/OrgId/LEI",
-            TX + "/CdtrAgt/FinInstnId/LEI",
-        )
-        for node in msg.find(path)
-        if msg.text_of(node) and not is_valid_lei(msg.text_of(node))
-    ])
-
 reg("VAL-CTRY", "CBPR_Valid_Country",
     "Every Country must be a valid ISO 3166-1 alpha-2 code.",
     lambda msg, report: [

{cbpr_usage_rules-0.1.0 → cbpr_usage_rules-0.1.2}/src/cbpr_rules/rules/y2026/camt_052.py

@@ -13,7 +13,6 @@ from ...validators import (
     is_valid_bic,
     is_valid_country,
     is_valid_currency,
-    is_valid_lei,
 )
 from ...helpers import (
     amount_equals_sum,
@@ -102,10 +101,6 @@ reg("VAL-BIC", "CBPR_Valid_Account_Servicer_BIC",
     "Account Servicer BICFI must be a structurally valid BIC.",
     each_value_valid(RPT + "/Acct/Svcr/FinInstnId/BICFI", is_valid_bic, "BIC"))
 
-reg("VAL-LEI", "CBPR_Valid_Account_Servicer_LEI",
-    "Account Servicer LEI must be a structurally valid LEI.",
-    each_value_valid(RPT + "/Acct/Svcr/FinInstnId/LEI", is_valid_lei, "LEI"))
-
 reg("VAL-CTRY", "CBPR_Valid_Account_Owner_Country",
     "Account Owner Postal Address Country must be a valid ISO 3166 code.",
     each_value_valid(RPT + "/Acct/Ownr/PstlAdr/Ctry", is_valid_country, "Country"))

{cbpr_usage_rules-0.1.0 → cbpr_usage_rules-0.1.2}/src/cbpr_rules/rules/y2026/camt_054.py

@@ -11,7 +11,7 @@ rules are surfaced via ``advisory``.
 from __future__ import annotations
 
 from ...registry import advisory, rule
-from ...validators import is_valid_bic, is_valid_country, is_valid_currency, is_valid_lei
+from ...validators import is_valid_bic, is_valid_country, is_valid_currency
 from ...helpers import (
     business_msg_id_carries_group_id,
     each_value_valid,
@@ -109,10 +109,6 @@ reg("VAL-BIC", "CBPR_Valid_Account_Servicer_BIC",
     "Account Servicer BICFI must be a structurally valid BIC.",
     each_value_valid(NTFCTN + "/Acct/Svcr/FinInstnId/BICFI", is_valid_bic, "BIC"))
 
-reg("VAL-LEI", "CBPR_Valid_Account_Servicer_LEI",
-    "Account Servicer LEI must be a structurally valid ISO 17442 LEI.",
-    each_value_valid(NTFCTN + "/Acct/Svcr/FinInstnId/LEI", is_valid_lei, "LEI"))
-
 reg("VAL-CTRY", "CBPR_Valid_Account_Servicer_Country",
     "Account Servicer postal address Country must be a valid ISO 3166 code.",
     each_value_valid(NTFCTN + "/Acct/Svcr/FinInstnId/PstlAdr/Ctry",

{cbpr_usage_rules-0.1.0 → cbpr_usage_rules-0.1.2}/src/cbpr_rules/rules/y2026/pacs_004.py

@@ -10,7 +10,7 @@ Structure mirrors the reference module ``y2025/pacs_008.py``.
 from __future__ import annotations
 
 from ...registry import advisory, rule
-from ...validators import is_valid_bic, is_valid_country, is_valid_currency, is_valid_lei
+from ...validators import is_valid_bic, is_valid_country, is_valid_currency
 from ...helpers import (
     bic_presence_exclusive,
     business_msg_id_carries_group_id,
@@ -282,13 +282,6 @@ reg("VAL-BIC", "CBPR_Valid_Agent_BIC",
         each_value_valid(TX + "/InstdAgt/FinInstnId/BICFI", is_valid_bic, "BIC"),
     ))
 
-reg("VAL-LEI", "CBPR_Valid_Agent_LEI",
-    "Every Agent LEI must be a structurally valid LEI.",
-    _run_all(
-        each_value_valid(TX + "/InstgAgt/FinInstnId/LEI", is_valid_lei, "LEI"),
-        each_value_valid(TX + "/InstdAgt/FinInstnId/LEI", is_valid_lei, "LEI"),
-    ))
-
 reg("VAL-CTRY", "CBPR_Valid_Country",
     "Every Country code must be a valid ISO 3166 country code.",
     _run_all(

{cbpr_usage_rules-0.1.0 → cbpr_usage_rules-0.1.2}/src/cbpr_rules/rules/y2026/pacs_008.py

@@ -9,7 +9,7 @@ registered as advisories.
 from __future__ import annotations
 
 from ...registry import advisory, rule
-from ...validators import is_valid_bic, is_valid_country, is_valid_currency, is_valid_lei
+from ...validators import is_valid_bic, is_valid_country, is_valid_currency
 from ...helpers import (
     bic_presence_exclusive,
     business_msg_id_carries_group_id,
@@ -319,10 +319,6 @@ reg("VAL-BIC", "CBPR_Valid_Agent_BIC",
     "Every BICFI in the message must be a structurally valid BIC.",
     each_value_valid(TX + "/InstgAgt/FinInstnId/BICFI", is_valid_bic, "BIC"))
 
-reg("VAL-LEI", "CBPR_Valid_LEI",
-    "Every LEI in the message must be a structurally valid LEI.",
-    each_value_valid(TX + "/Dbtr/Id/OrgId/LEI", is_valid_lei, "LEI"))
-
 reg("VAL-CTRY", "CBPR_Valid_Country",
     "Every Country code must be a valid ISO 3166 code.",
     each_value_valid(TX + "/Dbtr/PstlAdr/Ctry", is_valid_country, "Country"))

{cbpr_usage_rules-0.1.0 → cbpr_usage_rules-0.1.2}/src/cbpr_rules/rules/y2026/pacs_008_stp.py

@@ -11,7 +11,7 @@ from __future__ import annotations
 import re
 
 from ...registry import advisory, rule
-from ...validators import is_valid_bic, is_valid_country, is_valid_currency, is_valid_lei
+from ...validators import is_valid_bic, is_valid_country, is_valid_currency
 from ...helpers import (
     bic_presence_exclusive,
     business_msg_id_carries_group_id,
@@ -321,10 +321,6 @@ reg("VAL-BIC", "CBPR_Valid_Agent_BIC",
     "Instructing/Instructed Agent BICFI must be a structurally valid BIC.",
     each_value_valid(TX + "/InstgAgt/FinInstnId/BICFI", is_valid_bic, "BIC"))
 
-reg("VAL-LEI", "CBPR_Valid_Agent_LEI",
-    "Any Debtor Agent LEI must be a structurally valid LEI.",
-    each_value_valid(TX + "/DbtrAgt/FinInstnId/LEI", is_valid_lei, "LEI"))
-
 reg("VAL-CTRY", "CBPR_Valid_Country",
     "Every PostalAddress Country must be a valid ISO 3166 alpha-2 code.",
     each_value_valid(TX + "/Dbtr/PstlAdr/Ctry", is_valid_country, "country"))

{cbpr_usage_rules-0.1.0 → cbpr_usage_rules-0.1.2/src/cbpr_usage_rules.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cbpr-usage-rules
-Version: 0.1.0
+Version: 0.1.2
 Summary: Validate ISO 20022 CBPR+ XML messages against SWIFT usage (business) rules.
 Author: Pete Houghton
 License: MIT License
@@ -141,7 +141,7 @@ Both `validate_file` and `validate_string` return a dictionary:
   "message_type": "pacs.008",         # the rule set that was applied
   "detected_message_type": "pacs.008",# auto-detected from the Document namespace
   "year": 2025,
-  "rules_evaluated": 84,
+  "rules_evaluated": 86,
   "violations": [
     {
       "rule_number": "pacs.008:R41",   # unique within the message type