V10.401 tighten focused identity boundaries

services/marketplace_product_matcher.py

@@ -2683,6 +2683,21 @@ def _has_pavaruni_20_scent_candle_alignment(left: ProductIdentity, right: Produc
     )
 
 
+def _has_laundrin_tokyo_car_freshener_alignment(left: ProductIdentity, right: ProductIdentity) -> bool:
+    left_text = left.searchable_name
+    right_text = right.searchable_name
+    return (
+        {"laundrin", "朗德林"} & (left.brand_tokens & right.brand_tokens)
+        and "tokyo" in left_text
+        and "tokyo" in right_text
+        and "車用" in left_text
+        and "車用" in right_text
+        and "芳香劑" in left_text
+        and "芳香劑" in right_text
+        and _has_shared_count(left, right, 1, "入")
+    )
+
+
 def _has_shared_count(left: ProductIdentity, right: ProductIdentity, count: int, unit: str) -> bool:
     return (count, unit) in set(left.counts) and (count, unit) in set(right.counts)
 
@@ -2846,16 +2861,7 @@ def _has_focused_low_score_exact_identity_line(left: ProductIdentity, right: Pro
         return "pavaruni_40_scent_oil"
     if _has_pavaruni_20_scent_candle_alignment(left, right):
         return "pavaruni_20_scent_candle"
-    if (
-        {"laundrin", "朗德林"} & (left.brand_tokens & right.brand_tokens)
-        and "tokyo" in left_text
-        and "tokyo" in right_text
-        and "車用" in left_text
-        and "車用" in right_text
-        and "芳香劑" in left_text
-        and "芳香劑" in right_text
-        and _has_shared_count(left, right, 1, "入")
-    ):
+    if _has_laundrin_tokyo_car_freshener_alignment(left, right):
         return "laundrin_tokyo_car_freshener"
     if (
         "好物良品" in (left.brand_tokens & right.brand_tokens)
@@ -2877,7 +2883,7 @@ def _has_focused_low_score_exact_identity_line(left: ProductIdentity, right: Pro
         and "乳霜" in left_text
         and "乳霜" in right_text
         and _has_shared_weight(left, right, 30)
-        and _has_shared_count(left, right, 6, "入")
+        and _has_exact_count_alignment(left, right)
     ):
         return "yuskin_classic_cream_30g_6pack"
     if (
@@ -2950,6 +2956,8 @@ def _has_variant_descriptor_conflict(left: ProductIdentity, right: ProductIdenti
         return False
     if _has_pavaruni_20_scent_candle_alignment(left, right):
         return False
+    if _has_laundrin_tokyo_car_freshener_alignment(left, right):
+        return False
     if _is_relove_private_cleanser_line(left, right):
         return False
     if (