remove 0-hit rules

Author: davidhuser

src/mail_sovereignty/classifier.py

@@ -74,9 +74,7 @@ class _Rule(NamedTuple):
     _Rule("ad_spf_tenant",  frozenset({_S.AUTODISCOVER, _S.SPF, _S.TENANT}),   False,   0.95),
     _Rule("mx_spf",         frozenset({_S.MX, _S.SPF}),                        False,   0.90),
     _Rule("spf_tenant_gw",  frozenset({_S.SPF, _S.TENANT}),                    True,    0.90),
-    _Rule("ad_spf",         frozenset({_S.AUTODISCOVER, _S.SPF}),              False,   0.90),
     _Rule("mx_tenant",      frozenset({_S.MX, _S.TENANT}),                     False,   0.85),
-    _Rule("mx_ad",          frozenset({_S.MX, _S.AUTODISCOVER}),               False,   0.85),
     _Rule("spf_tenant",     frozenset({_S.SPF, _S.TENANT}),                    False,   0.80),
     _Rule("spf_gw",         frozenset({_S.SPF}),                               True,    0.70),
     _Rule("mx_only",        frozenset({_S.MX}),                                False,   0.80),
@@ -96,9 +94,8 @@ class _Rule(NamedTuple):
 )
 # fmt: on
 
-_ALL_RULE_NAMES: tuple[str, ...] = (
-    tuple(r.name for r in _PROVIDER_RULES)
-    + tuple(name for name, _ in _INDEPENDENT_RULES)
+_ALL_RULE_NAMES: tuple[str, ...] = tuple(r.name for r in _PROVIDER_RULES) + tuple(
+    name for name, _ in _INDEPENDENT_RULES
 )
 
 

tests/test_classifier.py

@@ -414,34 +414,34 @@ def test_autodiscover_spf_tenant(self):
         assert result.confidence == pytest.approx(0.95)
 
     def test_autodiscover_spf(self):
-        """R6: AD + SPF → 0.90 (gateway hides MX but SPF+AD confirm)."""
+        """AD + SPF → falls to spf_only (0.50) + AD boost."""
         evidence = [
             _ev(SignalKind.AUTODISCOVER, Provider.MS365),
             _ev(SignalKind.SPF, Provider.MS365),
         ]
         result, _ = _aggregate(evidence)
         assert result.provider == Provider.MS365
-        assert result.confidence == pytest.approx(0.90)
+        assert result.confidence == pytest.approx(0.52)
 
     def test_mx_autodiscover(self):
-        """R8: MX + AD → 0.85."""
+        """MX + AD → falls to mx_only (0.80) + AD boost."""
         evidence = [
             _ev(SignalKind.MX, Provider.MS365),
             _ev(SignalKind.AUTODISCOVER, Provider.MS365),
         ]
         result, _ = _aggregate(evidence)
         assert result.provider == Provider.MS365
-        assert result.confidence == pytest.approx(0.85)
+        assert result.confidence == pytest.approx(0.82)
 
     def test_autodiscover_spf_gateway(self):
-        """AD + SPF + GW → 0.90 (matches R6, gateway doesn't boost)."""
+        """AD + SPF + GW → falls to spf_gw (0.70) + AD boost."""
         evidence = [
             _ev(SignalKind.AUTODISCOVER, Provider.MS365),
             _ev(SignalKind.SPF, Provider.MS365),
         ]
         result, _ = _aggregate(evidence, gateway="barracuda")
         assert result.provider == Provider.MS365
-        assert result.confidence == pytest.approx(0.90)
+        assert result.confidence == pytest.approx(0.72)
 
     def test_independent_with_mx_and_spf_full_confidence(self):
         """Independent domain with MX + SPF → 90% base confidence."""