fix: restore reliable authenticated live recognition
This commit is contained in:
parent
0e23425ef0
commit
934615b593
40 changed files with 2556 additions and 820 deletions
|
|
@ -25,11 +25,126 @@ def relative_confidence(top_score: float, runner_up_score: float) -> float:
|
|||
return round(min(1.0, top_score / max(1.0, (top_score + runner_up_score * 0.5))), 4)
|
||||
|
||||
|
||||
# The gallery's scale is a cosine similarity, where same-product pairs sit above 0.6
|
||||
# and different products below 0.5 - not an inlier count, which has no such meaning.
|
||||
# Cosine scale (gallery). Same-product pairs were measured above 0.6 and
|
||||
# different products below 0.5. These are not a new calibration.
|
||||
COSINE_ACCEPT = 0.60
|
||||
COSINE_AMBIGUOUS = 0.50
|
||||
COSINE_MARGIN = 0.04
|
||||
VOTE_CAP = 3
|
||||
|
||||
|
||||
def _finite(value: Any) -> Optional[float]:
|
||||
try:
|
||||
number = float(value)
|
||||
except (TypeError, ValueError):
|
||||
return None
|
||||
if number != number or number in (float("inf"), float("-inf")):
|
||||
return None
|
||||
return number
|
||||
|
||||
|
||||
def aggregate_votes(
|
||||
observations: Sequence[Dict[str, float]],
|
||||
*,
|
||||
cap: int = VOTE_CAP,
|
||||
) -> Dict[str, float]:
|
||||
"""Mean of the newest observations, at most `cap`.
|
||||
|
||||
Older frames are dropped, not averaged in. An empty observation still
|
||||
counts, so a later miss can outvote an earlier weak hit. Inlier and
|
||||
cosine scores must not be mixed in one list.
|
||||
"""
|
||||
window = list(observations)[-max(1, int(cap)):]
|
||||
if not window:
|
||||
return {}
|
||||
totals: Dict[str, float] = {}
|
||||
for scores in window:
|
||||
for sku_id, score in (scores or {}).items():
|
||||
number = _finite(score)
|
||||
if number is None:
|
||||
continue
|
||||
totals[str(sku_id)] = totals.get(str(sku_id), 0.0) + number
|
||||
count = len(window)
|
||||
return {sku_id: total / count for sku_id, total in totals.items()}
|
||||
|
||||
|
||||
def _cosine_decision(
|
||||
sorted_candidates: List[Tuple[str, float]],
|
||||
*,
|
||||
method: str,
|
||||
details: Optional[Dict[str, Any]],
|
||||
accept: float,
|
||||
ambiguous: float,
|
||||
margin_min: float,
|
||||
) -> Dict[str, Any]:
|
||||
top_sku, top_score = sorted_candidates[0]
|
||||
runner_score = sorted_candidates[1][1] if len(sorted_candidates) > 1 else 0.0
|
||||
margin = top_score - runner_score
|
||||
if top_score >= accept and margin >= margin_min:
|
||||
level = IDENTITY_ACCEPTED
|
||||
elif top_score >= ambiguous:
|
||||
level = IDENTITY_AMBIGUOUS
|
||||
else:
|
||||
level = IDENTITY_REJECTED
|
||||
return {
|
||||
"status": level,
|
||||
"method": method,
|
||||
"best_sku": top_sku if level == IDENTITY_ACCEPTED else None,
|
||||
"score": float(top_score),
|
||||
"confidence": float(top_score),
|
||||
"identity_level": level,
|
||||
"ranked_candidates": [
|
||||
{"sku_id": sku, "score": float(value)} for sku, value in sorted_candidates[:3]
|
||||
],
|
||||
"details": details or {},
|
||||
"message": None,
|
||||
}
|
||||
|
||||
|
||||
def decision_for_match(
|
||||
match: Any,
|
||||
*,
|
||||
method: str = "gallery",
|
||||
margin: float = COSINE_MARGIN,
|
||||
) -> Dict[str, Any]:
|
||||
"""Rank one gallery match. Rejection is the gallery's, not a second threshold.
|
||||
|
||||
`match()` already applied the raw 0.55 line or the head's 0.40 line. Re-ranking
|
||||
those scores against COSINE_ACCEPT (0.60) would refuse a head match the gallery
|
||||
accepted. The only extra gate here is the published cosine margin.
|
||||
"""
|
||||
similarity = _finite(getattr(match, "similarity", 0.0)) or 0.0
|
||||
if match is None or getattr(match, "rejected", False) or not getattr(match, "sku_id", None):
|
||||
return {
|
||||
"status": IDENTITY_REJECTED,
|
||||
"method": method,
|
||||
"best_sku": None,
|
||||
"score": similarity,
|
||||
"confidence": similarity,
|
||||
"identity_level": IDENTITY_REJECTED,
|
||||
"ranked_candidates": [],
|
||||
"details": {},
|
||||
"message": "no enrolled product is close enough",
|
||||
}
|
||||
runner = getattr(match, "runner_up", None)
|
||||
runner_score = _finite(getattr(match, "runner_up_similarity", 0.0)) or 0.0
|
||||
gap = similarity - runner_score
|
||||
close = bool(runner) and gap < margin
|
||||
level = IDENTITY_AMBIGUOUS if close else IDENTITY_ACCEPTED
|
||||
ranked = [{"sku_id": str(match.sku_id), "score": similarity}]
|
||||
if runner:
|
||||
ranked.append({"sku_id": str(runner), "score": runner_score})
|
||||
return {
|
||||
"status": level,
|
||||
"method": method,
|
||||
"best_sku": None if close else str(match.sku_id),
|
||||
"score": similarity,
|
||||
"confidence": similarity,
|
||||
"identity_level": level,
|
||||
"ranked_candidates": ranked,
|
||||
"details": {},
|
||||
"message": None,
|
||||
}
|
||||
|
||||
|
||||
def decide_identity(
|
||||
|
|
@ -48,7 +163,20 @@ def decide_identity(
|
|||
unknown. Two close scores are ambiguous. Only a unique, above-threshold
|
||||
score is accepted.
|
||||
"""
|
||||
if not scores:
|
||||
if scale == "cosine":
|
||||
if min_score == DEFAULT_MIN_SCORE:
|
||||
min_score = COSINE_ACCEPT
|
||||
if min_margin == DEFAULT_MIN_MARGIN:
|
||||
min_margin = COSINE_MARGIN
|
||||
if min_confidence == DEFAULT_MIN_CONFIDENCE:
|
||||
min_confidence = COSINE_AMBIGUOUS
|
||||
cleaned: Dict[str, float] = {}
|
||||
for sku_id, score in (scores or {}).items():
|
||||
number = _finite(score)
|
||||
if number is None:
|
||||
continue
|
||||
cleaned[str(sku_id)] = number
|
||||
if not cleaned:
|
||||
return {
|
||||
"status": IDENTITY_REJECTED,
|
||||
"method": method,
|
||||
|
|
@ -62,32 +190,17 @@ def decide_identity(
|
|||
}
|
||||
|
||||
sorted_candidates: List[Tuple[str, float]] = sorted(
|
||||
scores.items(), key=lambda x: x[1], reverse=True
|
||||
cleaned.items(), key=lambda item: item[1], reverse=True
|
||||
)
|
||||
if scale == "cosine":
|
||||
# Thresholds that mean something on a similarity scale.
|
||||
top_sku, top_score = sorted_candidates[0]
|
||||
runner_score = sorted_candidates[1][1] if len(sorted_candidates) > 1 else 0.0
|
||||
margin = top_score - runner_score
|
||||
if top_score >= COSINE_ACCEPT and margin >= COSINE_MARGIN:
|
||||
level = IDENTITY_ACCEPTED
|
||||
elif top_score >= COSINE_AMBIGUOUS:
|
||||
level = IDENTITY_AMBIGUOUS
|
||||
else:
|
||||
level = IDENTITY_REJECTED
|
||||
return {
|
||||
"status": level,
|
||||
"method": method,
|
||||
"best_sku": top_sku if level == IDENTITY_ACCEPTED else None,
|
||||
"score": float(top_score),
|
||||
"confidence": float(top_score),
|
||||
"identity_level": level,
|
||||
"ranked_candidates": [
|
||||
{"sku_id": sku, "score": float(value)} for sku, value in sorted_candidates[:3]
|
||||
],
|
||||
"details": details or {},
|
||||
"message": None,
|
||||
}
|
||||
return _cosine_decision(
|
||||
sorted_candidates,
|
||||
method=method,
|
||||
details=details,
|
||||
accept=min_score,
|
||||
ambiguous=min_confidence,
|
||||
margin_min=min_margin,
|
||||
)
|
||||
top_sku, top_score = sorted_candidates[0]
|
||||
runner_up_sku, runner_up_score = (
|
||||
sorted_candidates[1] if len(sorted_candidates) > 1 else (None, 0.0)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue