fix(uyap): shared-Esas card location by KAYIT NO + genuine identity by KAYIT NO

Bulk run on all 13 Ankara sold cards produced 5 RECONCILIATION_FAILED, all on shared-Esas files (2026/12 x3, 2026/94, 2026/1). Root cause: find_target_record_card/_locate_card_control located the card by Esas (file_id) only; for a file with multiple auctions they grabbed the WRONG card's documents, so the collected docs' asset didn't match the target -> the reconciliation guard correctly rejected them (no silent bad admission).

Fix A (card location): threaded target_record_ref (KAYIT NO) through _collect_documents -> find_target_record_card + _locate_card_control (and bulk _acquire/process_sold_auction/diagnose_documents pass kayit_no). find_target_record_card now selects, among same-Esas cards, the one whose KAYIT NO matches (visible text OR class 'incelenen-li {NO}'); if none match it returns None (never grabs the wrong card). _locate_card_control scopes the live card by KAYIT NO (text filter, then class-attribute ancestor fallback). No record_ref -> original Esas-only behavior (pilot backward-compatible).

Fix B (genuine identity): build_genuine_record public_record_id now uses the KAYIT NO (candidate.kayit_no) not the Esas file_id. This matches the existing 7 genuine records (11-digit KAYIT NO ids) AND prevents distinct shared-Esas auctions from collapsing to one record on admission (idempotent dedup is per KAYIT NO). Province still filled from bulk label; card 'Satış Tutarı' never used.

Tests: shared-Esas card selection (by KAYIT NO; no-match -> None; no-ref -> backward compat), genuine public_record_id = KAYIT NO (distinct per auction). 529 uyap/extract/reconcile/model/pilot/admit tests pass.

Author: onatozmenn

src/sold/ingestion/uyap/admit.py

@@ -67,7 +67,8 @@ def build_genuine_record(candidate: dict) -> dict:
         f"domain=uyap, sale_mechanism=auction, reference_price_type=appraisal -> excluded from asking_to_closing_labels()."
     )
     return {
-        "public_record_id": candidate.get("file_id"),
+        "public_record_id": (candidate.get("kayit_no") or (candidate.get("bulk") or {}).get("kayit_no")
+                             or candidate.get("file_id")),
         "auction_date": _iso_date(ev.get("completion_datetime")),
         "province": ev.get("province") or _bulk_province(candidate),
         "district": ev.get("district"),

src/sold/ingestion/uyap/bulk.py

@@ -782,7 +782,7 @@ def process_sold_auction(
 
     # 3) ÇALIŞAN belge-edinim yolunu yeniden kullan (yeni bir parser DEĞİL).
     try:
-        artifacts, patterns, diag = acquire_documents(file_id, institution)
+        artifacts, patterns, diag = acquire_documents(file_id, institution, record_ref=kayit_no)
     except Exception as exc:  # edinim hatası kaydı; sonraki açık artırmanın kimliğini BOZMAZ
         existing.setdefault("bulk", {})["last_acquisition_error"] = str(exc)[:160]
         store.log_event(existing, "bulk_acquisition_failed", str(exc)[:160])
@@ -958,7 +958,7 @@ def diagnose_documents(self, province, date_from, date_to,
                 target = next((c for c in cards if c.get("sold")), None)
             fid = target.get("file_id") if target else None
             pre_tabs = [self._safe_ref(p.url) for p in context.pages]
-            docs, patterns, diag = collector._collect_documents(page, context, fid, province, native_only=True)
+            docs, patterns, diag = collector._collect_documents(page, context, fid, province, native_only=True, target_record_ref=target_kayit_no)
             post_tabs = [self._safe_ref(p.url) for p in context.pages]
             keys = ("page_state", "document_entry_path", "target_record_card_found",
                     "document_list_control_found", "document_list_control_kind", "document_list_opened",
@@ -1051,8 +1051,9 @@ def run(
                     "Önce UYAP e-Satış → İhaleler → Geçmiş İlanlar sayfasını elle açın."
                 )
 
-            def _acquire(file_id, institution):
-                return collector._collect_documents(page, context, file_id, institution, native_only=True)
+            def _acquire(file_id, institution, record_ref=None):
+                return collector._collect_documents(page, context, file_id, institution,
+                                                    native_only=True, target_record_ref=record_ref)
 
             state = load_bulk_state(self.store_dir)
             for w in windows:

src/sold/ingestion/uyap/collect.py

@@ -1419,11 +1419,31 @@ def _card_control_labels(card_html: str) -> list[str]:
         return []
 
 
-def find_target_record_card(html: str, target_file_id: str, institution: str | None = None) -> dict | None:
+def _card_matches_record_ref(card_el, record_ref: str | None) -> bool:
+    """Kart, KAYIT NO'yu (record_ref) içeriyor mu — görünür metinde YA DA class/id niteliğinde
+    (UYAP 'incelenen-li {NO}'). PAYLAŞILAN-Esas'ta DOĞRU açık artırma kartını seçmek için."""
+    ref = re.sub(r"\D", "", str(record_ref or ""))
+    if not ref:
+        return False
+    if ref in re.sub(r"\D", "", card_el.get_text(" ", strip=True)):
+        return True
+    for el in [card_el] + card_el.find_all(True):
+        cls = el.get("class") or []
+        if isinstance(cls, str):
+            cls = [cls]
+        for token in list(cls) + [el.get("id") or ""]:
+            if ref in re.sub(r"\D", "", str(token)):
+                return True
+    return False
+
+
+def find_target_record_card(html: str, target_file_id: str, institution: str | None = None,
+                            target_record_ref: str | None = None) -> dict | None:
     """Listeleme sayfasında HEDEF kaydı resmî dosya kimliğiyle bulur (fiyat/P/Q/nth DEĞİL).
 
-    Aynı dosya kimliğine sahip TEK kartı döndürür; birden çok distinkt dosya no içeren container
-    (tüm-liste) satır/kart SAYILMAZ. İlk-global-kart ya da nth-kart seçilmez. OFFLINE testable.
+    ``target_record_ref`` (KAYIT NO) verilmişse aynı Esas'ı paylaşan kartlar arasından o KAYIT NO'lu
+    kartı seçer (PAYLAŞILAN-Esas'ta yanlış-kart edinimini önler; eşleşen kart yoksa dürüstçe None);
+    verilmemişse aynı dosya kimliğine sahip TEK kartı döndürür. Çok-kayıtlı container SAYILMAZ. OFFLINE testable.
     """
     try:
         from bs4 import BeautifulSoup
@@ -1446,16 +1466,25 @@ def find_target_record_card(html: str, target_file_id: str, institution: str | N
                 inst_tok = _ascii_lower(institution).split()
                 if inst_tok and inst_tok[0] in _ascii_lower(text):
                     match_fields.append("institution")
-            matches.append((c, re.sub(r"\s+", " ", text), match_fields))
-        if len(matches) >= 1:
-            c, text, match_fields = matches[0]
-            return {
-                "html": str(c),
-                "file_text": text[:120],
-                "match_fields": match_fields,
-                "control_labels": _card_control_labels(str(c)),
-                "target_file": tnum,
-            }
+            ref_match = _card_matches_record_ref(c, target_record_ref)
+            matches.append((c, re.sub(r"\s+", " ", text), match_fields, ref_match))
+        if not matches:
+            continue
+        if target_record_ref:
+            ref_hits = [m for m in matches if m[3]]
+            if not ref_hits:
+                continue  # bu selector'da KAYIT NO eşleşen kart YOK → yanlış kartı ALMA, sonrakini dene
+            c, text, match_fields, _ = ref_hits[0]
+            match_fields = match_fields + ["record_ref"]
+        else:
+            c, text, match_fields, _ = matches[0]
+        return {
+            "html": str(c),
+            "file_text": text[:120],
+            "match_fields": match_fields,
+            "control_labels": _card_control_labels(str(c)),
+            "target_file": tnum,
+        }
     return None
 
 
@@ -1798,7 +1827,7 @@ def _select_target_page(self, context, target_file_id=None):  # pragma: no cover
         page = context.pages[idx] if 0 <= idx < len(context.pages) else context.pages[0]
         return page, sel
 
-    def _collect_documents(self, page, context, target_file_id=None, target_institution=None, native_only=False) -> tuple:  # pragma: no cover - canlı DOM/olay gerektirir
+    def _collect_documents(self, page, context, target_file_id=None, target_institution=None, native_only=False, target_record_ref=None) -> tuple:  # pragma: no cover - canlı DOM/olay gerektirir
         """SAYFA-DURUMU FARKINDA, HEDEF-KAYIT-KAPSAMLI belge girişi (iki gerçek gözlenen yol).
 
         ``search_listing`` → HEDEF kayıt kartı dosya kimliğiyle bulunur (fiyat/nth DEĞİL) →
@@ -1851,7 +1880,7 @@ def _collect_documents(self, page, context, target_file_id=None, target_institut
                 diag["document_collection_attempts"].append({"stage": "target_card", "blocking_reason": "no_target_file_id_provided"})
                 diag["document_collection_failures"] += 1
                 return documents, patterns, diag
-            card = find_target_record_card(html, target_file_id, target_institution)
+            card = find_target_record_card(html, target_file_id, target_institution, target_record_ref)
             if card is None:
                 diag["document_collection_attempts"].append({"stage": "target_card", "blocking_reason": "target_record_card_not_found_on_listing"})
                 diag["document_collection_failures"] += 1
@@ -1869,7 +1898,7 @@ def _collect_documents(self, page, context, target_file_id=None, target_institut
                 return documents, patterns, diag
             # Kart-yerel kontrolü CANLI DOM'da HEDEF kart kapsamında bul (global text locator DEĞİL —
             # üçüncü canlı hatanın kök nedeni buydu).
-            control = self._locate_card_control(page, target_file_id)
+            control = self._locate_card_control(page, target_file_id, target_record_ref)
         elif page_state == "record_detail":
             if target_file_id and not file_identity_matches(html, target_file_id):
                 diag["document_collection_attempts"].append({"stage": "detail_identity", "blocking_reason": "detail_page_does_not_match_target_file_id"})
@@ -1982,32 +2011,72 @@ def _collect_documents(self, page, context, target_file_id=None, target_institut
         patterns += p2
         return documents, patterns, diag
 
-    def _locate_card_control(self, page, target_file_id):  # pragma: no cover - canlı DOM
-        """HEDEF kaydın CANLI kartını dosya kimliğiyle bulur; kart-yerel "İhale Evrak Listesi"
-        kontrolünü döner (global metin locator DEĞİL — kart kapsamı zorunlu)."""
+    def _locate_card_control(self, page, target_file_id, target_record_ref=None):  # pragma: no cover - canlı DOM
+        """HEDEF kaydın CANLI kartını bulur; kart-yerel "İhale Evrak Listesi" kontrolünü döner.
+
+        ``target_record_ref`` (KAYIT NO) verilmişse PAYLAŞILAN-Esas'ta kart o KAYIT NO ile daraltılır
+        (yalnız Esas ile filtreleme çok-açık-artırmalı dosyada YANLIŞ kartı seçerdi → RECONCILIATION_FAILED).
+        KAYIT NO görünür metinde YA DA class ('incelenen-li {NO}') olabilir; eşleşen kart yoksa None (yanlış
+        kartı ALMA). Global metin locator DEĞİL — kart kapsamı zorunlu."""
         import re as _re
 
         tnum = normalize_file_identity(target_file_id)
         key = _re.escape(tnum).replace("/", r"\s*/\s*")
-        for csel in ("[class*=card]", "[class*=sonuc]", "[class*=result]", "[class*=ilan]", "li", "tr"):
-            try:
-                cards = page.locator(csel).filter(has_text=_re.compile(key, _re.I))
-                if cards.count() == 0:
-                    continue
-                card = cards.first
-                for name in ("button", "link"):
-                    try:
-                        act = card.get_by_role(name, name=_re.compile("evrak listesi", _re.I))
-                        if act.count() > 0:
-                            return act.first
-                    except Exception:
-                        continue
+        ref = _re.sub(r"\D", "", str(target_record_ref or ""))
+        card_selectors = ("[class*=card]", "[class*=sonuc]", "[class*=result]", "[class*=ilan]", "li", "tr")
+
+        def _control_in(card):
+            for name in ("button", "link"):
                 try:
-                    act = card.get_by_text(_re.compile("evrak listesi", _re.I))
+                    act = card.get_by_role(name, name=_re.compile("evrak listesi", _re.I))
                     if act.count() > 0:
                         return act.first
                 except Exception:
-                    pass
+                    continue
+            try:
+                act = card.get_by_text(_re.compile("evrak listesi", _re.I))
+                if act.count() > 0:
+                    return act.first
+            except Exception:
+                pass
+            return None
+
+        if ref:
+            # (a) KAYIT NO görünür metinde: Esas + KAYIT NO ile daralt
+            for csel in card_selectors:
+                try:
+                    cc = page.locator(csel).filter(has_text=_re.compile(key, _re.I)).filter(has_text=_re.compile(ref))
+                    if cc.count() > 0:
+                        ctrl = _control_in(cc.first)
+                        if ctrl is not None:
+                            return ctrl
+                except Exception:
+                    continue
+            # (b) KAYIT NO class niteliğinde ('incelenen-li {NO}'): o elemanın evrak-kontrolü içeren kart atası
+            try:
+                holder = page.locator(f'[class*="{ref}"]')
+                if holder.count() > 0:
+                    for xp in ('xpath=ancestor-or-self::*[.//*[contains(@id,"detailButton")]][1]',
+                               'xpath=ancestor-or-self::*[.//a or .//button][1]'):
+                        try:
+                            ctrl = _control_in(holder.first.locator(xp))
+                            if ctrl is not None:
+                                return ctrl
+                        except Exception:
+                            continue
+            except Exception:
+                pass
+            return None  # KAYIT NO verildi ama DOĞRU kart bulunamadı → yanlış kartı ALMA (dürüst)
+
+        # KAYIT NO yok → orijinal Esas-yalnız davranış (pilot geriye-uyumlu)
+        for csel in card_selectors:
+            try:
+                cards = page.locator(csel).filter(has_text=_re.compile(key, _re.I))
+                if cards.count() == 0:
+                    continue
+                ctrl = _control_in(cards.first)
+                if ctrl is not None:
+                    return ctrl
             except Exception:
                 continue
         return None

tests/test_uyap_bulk.py

@@ -271,7 +271,7 @@ def _sold_card(fid="2026/263", kayit="16701234"):
     }
 
 
-def _fake_acquire_ok(file_id, institution):
+def _fake_acquire_ok(file_id, institution, record_ref=None):
     text = (
         "Artırma Sonuç Tutanağı İhale Bedeli 5.715.000,00 TL "
         "Muhammen Bedel 6.800.000,00 TL Satıldı Satış İşlemleri Tamamlandı "
@@ -281,7 +281,7 @@ def _fake_acquire_ok(file_id, institution):
     return arts, [{"label": "auction_result", "pattern": "native_udf"}], {"ok": True}
 
 
-def _fake_acquire_fail(file_id, institution):
+def _fake_acquire_fail(file_id, institution, record_ref=None):
     raise RuntimeError("same_row_download_control_not_located_uniquely")
 
 
@@ -378,7 +378,7 @@ def test_force_reacquires_known_candidate_but_not_admitted(tmp_path):
     # force ile → edinici GERÇEKTEN yeniden çağrılır ve yeniden edinilir
     calls = {"n": 0}
 
-    def _counting_acquire(file_id, institution):
+    def _counting_acquire(file_id, institution, record_ref=None):
         calls["n"] += 1
         return _fake_acquire_ok(file_id, institution)
 
@@ -398,6 +398,24 @@ def _counting_acquire(file_id, institution):
     assert guarded["outcome"] == "skipped_already_acquired"
 
 
+def test_genuine_public_record_id_uses_kayit_no_not_esas():
+    # PAYLAŞILAN-Esas: genuine kimlik KAYIT NO olmalı (mevcut 7 kayıt 11-haneli KAYIT NO kullanır);
+    # public_record_id=Esas olsaydı aynı Esas'ın farklı açık artırmaları admitte TEK kayda ÇÖKERdi.
+    from sold.ingestion.uyap.admit import build_genuine_record
+    from sold.ingestion.uyap.models import ADMISSIBLE_COMPLETED_SALE
+    cand = {
+        "file_id": "2026/12", "kayit_no": "16760703981",
+        "extracted": {"property_type": "konut", "completion_datetime": "16.06.2026"},
+        "audit": {"decision": ADMISSIBLE_COMPLETED_SALE, "appraisal_value": 2000000.0, "auction_price": 1800000.0},
+        "bulk": {"province_label": "ANKARA", "kayit_no": "16760703981"},
+    }
+    rec = build_genuine_record(cand)
+    assert rec["public_record_id"] == "16760703981"          # KAYIT NO, Esas değil
+    assert rec["province"] == "Ankara"
+    cand2 = dict(cand, kayit_no="16760703976", bulk={"province_label": "ANKARA", "kayit_no": "16760703976"})
+    assert build_genuine_record(cand2)["public_record_id"] == "16760703976"   # aynı Esas, farklı kayıt → çökmez
+
+
 # --------------------------------------------------------------------------- #
 # 9) Modal hatası — bir açık artırmanın hatası sonrakinin kimliğini/durumunu bozmaz.
 # --------------------------------------------------------------------------- #

tests/test_uyap_live_fix3.py

@@ -149,6 +149,33 @@ def test_multiple_fake_cards_choose_correct_target():
     assert "2025/100" not in card["file_text"] and "2024/99" not in card["file_text"]
 
 
+def _listing_page_shared_esas():
+    """PAYLAŞILAN-Esas: aynı Esas (2026/12) iki farklı açık artırma (KAYIT NO class 'incelenen-li {NO}')."""
+    return (
+        '<html><body><div class="results-list">'
+        '<div class="ilan-card"><span class="incelenen-li 16760703976"></span>'
+        'Ankara İcra Dairesi 2026/12 İcra Muhammen Bedel 1.000.000,00 TL '
+        '<button>İncele</button><button>İhale Evrak Listesi</button></div>'
+        '<div class="ilan-card"><span class="incelenen-li 16760703981"></span>'
+        'Ankara İcra Dairesi 2026/12 İcra Muhammen Bedel 2.000.000,00 TL '
+        '<button>İncele</button><button>İhale Evrak Listesi</button></div>'
+        '</div></body></html>'
+    )
+
+
+def test_shared_esas_selects_card_by_kayit_no():
+    html = _listing_page_shared_esas()
+    # KAYIT NO olmadan → ilk kart (geriye-uyumlu; record_ref eşleşmesi yok)
+    c0 = find_target_record_card(html, "2026/12")
+    assert c0 is not None and "record_ref" not in c0["match_fields"]
+    # KAYIT NO ile → DOĞRU kart (paylaşılan-Esas'ta yanlış-kart edinimini önler)
+    c1 = find_target_record_card(html, "2026/12", target_record_ref="16760703981")
+    assert c1 is not None and "record_ref" in c1["match_fields"]
+    assert "16760703981" in c1["html"] and "16760703976" not in c1["html"]
+    # eşleşmeyen KAYIT NO → yanlış kartı ALMA (dürüstçe None)
+    assert find_target_record_card(html, "2026/12", target_record_ref="99999999999") is None
+
+
 def test_generic_page_level_evrak_text_not_treated_as_target():
     # Hedef kayıt olmayan sayfada genel 'İhale Evrak Listesi' başlığı → hedef kart YOK
     assert find_target_record_card(_listing_page_no_target(), TARGET, INSTITUTION) is None