Ask instead of guessing when a label fits several products
`"britannia"` is a substring of all 258 Britannia product names, and textScore returned 0.95 for any product whose name contained the label. So every one of them tied, the tie broke alphabetically, and the customer was shown one arbitrary biscuit with "confidence": 0.95 and a price. Lens hands back a bare wordmark often — it is usually the biggest thing printed on a packet — so this was the common case, not an edge one. Found via the example request in the mobile team's own proposal. Scoring now asks both questions. A hit carries `score` (ranks) and `text` (how specifically the label names THIS product: the harmonic mean of how much of the label the product explains and how much of the product's name the label explains, pack sizes dropped from both sides). A brand name scores its products ~0.33 equally instead of 0.95 arbitrarily. The "vector and text agree" bonus is now proportional to the text score, so a weak match can no longer inflate a whole brand. isAmbiguous reads that: the leader is a guess if anything is level with it (margin) or if the label names no one product (specificity), and then the response carries `ambiguous: true` with `candidates` — distinct products, not pack sizes, at most ten, each marked with whether one of the customer's stores has it in stock, available ones first. `match` is nil and `stores` empty on that path: no price for a product nobody chose. Erring towards asking is deliberate — a tap versus the wrong biscuit. To act on a pick, /lookup now accepts `brand` + `catalogueid` instead of a label and skips recognition entirely (also serves deep links and re-order). New: ScanRepository.CatalogueRef, resolving via the brand tables discovered from information_schema, never a name built from the request. Also: scratch/cataloguedims now reports every vector column, not just `embedding` — which is how we learned the catalogue also carries img_vector(1024), filled on 1885 of 2124 rows. SCAN_TO_ORDER.md records why that column stays unread for now and what would change it, alongside why the app is not asked to compute vectors on the phone. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -3,10 +3,13 @@ package services
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"fmt"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"nearle/models"
|
||||
"nearle/repositories"
|
||||
"nearle/utils"
|
||||
)
|
||||
|
||||
/*
|
||||
@@ -30,9 +33,13 @@ type fakeScanRepo struct {
|
||||
options []repositories.StoreOptionRow
|
||||
at map[int]*repositories.StoreOptionRow // productid → row
|
||||
|
||||
ref []repositories.CatalogueHit
|
||||
refErr error
|
||||
|
||||
askedKeys []repositories.CatalogueKey
|
||||
askedNames []string
|
||||
askedLocs []int
|
||||
askedRef string
|
||||
cachedHits map[string][]repositories.CatalogueHit
|
||||
}
|
||||
|
||||
@@ -69,6 +76,10 @@ func (f *fakeScanRepo) TextSearch(context.Context, string, int) ([]repositories.
|
||||
return f.text, nil
|
||||
}
|
||||
func (f *fakeScanRepo) VectorSearchAvailable() bool { return f.hasVec }
|
||||
func (f *fakeScanRepo) CatalogueRef(_ context.Context, brand string, id int64) ([]repositories.CatalogueHit, error) {
|
||||
f.askedRef = fmt.Sprintf("%s#%d", brand, id)
|
||||
return f.ref, f.refErr
|
||||
}
|
||||
func (f *fakeScanRepo) CachedVector(context.Context, string, string) ([]float32, bool) {
|
||||
return nil, false
|
||||
}
|
||||
@@ -423,7 +434,7 @@ func TestCatalogueFamilyGroupsByVariantKeyThenName(t *testing.T) {
|
||||
{CatalogueHit: milkBikis200, score: 0.88},
|
||||
{CatalogueHit: repositories.CatalogueHit{Brand: "parle", ProductName: "Milk Bikis", VariantKey: "milk_bikis"}, score: 0.5},
|
||||
}
|
||||
family := catalogueFamily(hits)
|
||||
family := catalogueFamily(hits, hits[0])
|
||||
if len(family) != 2 || family[1].ID != 8 {
|
||||
t.Fatalf("family should be the two britannia sizes, got %+v", family)
|
||||
}
|
||||
@@ -432,7 +443,217 @@ func TestCatalogueFamilyGroupsByVariantKeyThenName(t *testing.T) {
|
||||
a := scoredHit{CatalogueHit: repositories.CatalogueHit{Brand: "b", ID: 1, ProductName: "Honey"}}
|
||||
b := scoredHit{CatalogueHit: repositories.CatalogueHit{Brand: "b", ID: 2, ProductName: "honey "}}
|
||||
c := scoredHit{CatalogueHit: repositories.CatalogueHit{Brand: "b", ID: 3, ProductName: "Honey Lite"}}
|
||||
if family := catalogueFamily([]scoredHit{a, b, c}); len(family) != 2 {
|
||||
if family := catalogueFamily([]scoredHit{a, b, c}, a); len(family) != 2 {
|
||||
t.Errorf("name match should join 1 and 2 only, got %+v", family)
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
Ambiguity.
|
||||
|
||||
Lens hands back whatever was most legible on the packet, and on a packet that
|
||||
is very often the brand wordmark alone. "britannia" fits 258 catalogue rows
|
||||
equally well, so there is no best one — and the old scoring said otherwise:
|
||||
every product whose name contained the label scored 0.95, the tie broke
|
||||
alphabetically, and the customer was shown one arbitrary biscuit with
|
||||
"confidence": 0.95 and a price. These tests are the contract that it asks
|
||||
instead.
|
||||
*/
|
||||
|
||||
// Three different Britannia products, of which the customer's stores stock
|
||||
// one. Text-only: no embedder, which is also how production runs until the
|
||||
// model is configured.
|
||||
func newBrandLabelFixture() *fakeScanRepo {
|
||||
cashew := repositories.CatalogueHit{Brand: "britannia", ID: 21, ProductName: "Britannia Good Day Cashew Cookies", VariantKey: "good_day_cashew", ImageID: "britannia_good_day_cashew"}
|
||||
butter := repositories.CatalogueHit{Brand: "britannia", ID: 22, ProductName: "Britannia Good Day Butter Cookies", VariantKey: "good_day_butter", ImageID: "britannia_good_day_butter"}
|
||||
marie := repositories.CatalogueHit{Brand: "britannia", ID: 23, ProductName: "Britannia Marie Gold", VariantKey: "marie_gold", ImageID: "britannia_marie_gold"}
|
||||
|
||||
return &fakeScanRepo{
|
||||
exists: true,
|
||||
stores: fixtureStores(),
|
||||
text: []repositories.CatalogueHit{cashew, butter, marie},
|
||||
options: []repositories.StoreOptionRow{
|
||||
{Tenantid: 2, Locationid: 20, Productid: 220, Productname: "Britannia Marie Gold",
|
||||
Productbrand: "britannia", Catalogueid: 23, Imageid: "britannia_marie_gold", Price: 30, Stock: 4},
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func TestABareBrandNameAsksInsteadOfGuessing(t *testing.T) {
|
||||
repo := newBrandLabelFixture()
|
||||
svc := NewScanService(repo, nil)
|
||||
|
||||
resp, err := svc.Lookup(context.Background(), models.ScanLookupRequest{
|
||||
Customerid: 5, Label: "britannia", Latitude: "11.035", Longitude: "77.035",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
|
||||
if !resp.Ambiguous {
|
||||
t.Fatalf("a bare brand name must not resolve to one product, got match %+v", resp.Match)
|
||||
}
|
||||
if resp.Match != nil {
|
||||
t.Errorf("Match must be nil while ambiguous, got %+v", resp.Match)
|
||||
}
|
||||
if len(resp.Stores) != 0 {
|
||||
t.Errorf("no store or price may be quoted for a product the customer has not chosen, got %d offers", len(resp.Stores))
|
||||
}
|
||||
if len(resp.Variants) != 0 {
|
||||
t.Errorf("pack sizes belong to a chosen product, got %+v", resp.Variants)
|
||||
}
|
||||
if len(resp.Candidates) != 3 {
|
||||
t.Fatalf("want the three distinct Britannia products, got %d: %+v", len(resp.Candidates), resp.Candidates)
|
||||
}
|
||||
|
||||
// The one the customer can actually buy is offered first.
|
||||
if !resp.Candidates[0].Available || resp.Candidates[0].Catalogueid != 23 {
|
||||
t.Errorf("the stocked product should lead the list, got %+v", resp.Candidates[0])
|
||||
}
|
||||
for _, c := range resp.Candidates[1:] {
|
||||
if c.Available {
|
||||
t.Errorf("only Marie Gold is stocked, but %s reports available", c.ProductName)
|
||||
}
|
||||
}
|
||||
if resp.Confidence >= 0.55 {
|
||||
t.Errorf("confidence should record how weak the identification was, got %v", resp.Confidence)
|
||||
}
|
||||
if !strings.Contains(resp.Message, "Which one") {
|
||||
t.Errorf("the message should ask, got %q", resp.Message)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAnAmbiguousLabelWithNoStockStillLists(t *testing.T) {
|
||||
repo := newBrandLabelFixture()
|
||||
repo.options = nil
|
||||
svc := NewScanService(repo, nil)
|
||||
|
||||
resp, err := svc.Lookup(context.Background(), models.ScanLookupRequest{Customerid: 5, Label: "britannia"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if !resp.Ambiguous || len(resp.Candidates) != 3 {
|
||||
t.Fatalf("want three candidates, got ambiguous=%v %d", resp.Ambiguous, len(resp.Candidates))
|
||||
}
|
||||
for _, c := range resp.Candidates {
|
||||
if c.Available {
|
||||
t.Errorf("%s cannot be available with no stock anywhere", c.ProductName)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// The other half of the contract: a label that does name a product must not
|
||||
// start asking questions.
|
||||
func TestASpecificLabelStillWinsOutright(t *testing.T) {
|
||||
repo := newBrandLabelFixture()
|
||||
svc := NewScanService(repo, nil)
|
||||
|
||||
resp, err := svc.Lookup(context.Background(), models.ScanLookupRequest{
|
||||
Customerid: 5, Label: "good day cashew",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if resp.Ambiguous {
|
||||
t.Fatalf("a label naming one product should resolve, got candidates %+v", resp.Candidates)
|
||||
}
|
||||
if resp.Match == nil || resp.Match.Catalogueid != 21 {
|
||||
t.Fatalf("want the cashew cookies, got %+v", resp.Match)
|
||||
}
|
||||
if len(resp.Candidates) != 0 {
|
||||
t.Errorf("candidates belong to an ambiguous answer, got %+v", resp.Candidates)
|
||||
}
|
||||
}
|
||||
|
||||
func TestTextScoreRewardsSpecificityNotJustOverlap(t *testing.T) {
|
||||
cashew := repositories.CatalogueHit{ProductName: "Britannia Good Day Cashew Cookies 200g"}
|
||||
butter := repositories.CatalogueHit{ProductName: "Britannia Good Day Butter Cookies 100g"}
|
||||
|
||||
brandOnly := textScore(cashew, "britannia", utils.SearchTokens("britannia"))
|
||||
if brandOnly > 0.45 {
|
||||
t.Errorf("a brand name explains one word of five and must not score as an identification, got %.3f", brandOnly)
|
||||
}
|
||||
if brandOnly != textScore(butter, "britannia", utils.SearchTokens("britannia")) {
|
||||
t.Error("a brand must score its products equally — that tie is what makes the label read as ambiguous")
|
||||
}
|
||||
|
||||
full := textScore(cashew, "Britannia Good Day Cashew Cookies", utils.SearchTokens("Britannia Good Day Cashew Cookies"))
|
||||
if full < 0.95 {
|
||||
t.Errorf("the product's own name should be near-certain, got %.3f", full)
|
||||
}
|
||||
|
||||
// A pack size on either side is not a word the label failed to explain.
|
||||
sized := textScore(repositories.CatalogueHit{ProductName: "Milk Bikis 100g"}, "Milk Bikis", utils.SearchTokens("Milk Bikis"))
|
||||
if sized < 0.95 {
|
||||
t.Errorf("pack sizes must not count against the match, got %.3f", sized)
|
||||
}
|
||||
|
||||
if none := textScore(cashew, "dabur honey", utils.SearchTokens("dabur honey")); none != 0 {
|
||||
t.Errorf("nothing in common should score 0, got %.3f", none)
|
||||
}
|
||||
}
|
||||
|
||||
func TestDistinctProductsCollapsesPackSizes(t *testing.T) {
|
||||
hits := []scoredHit{
|
||||
{CatalogueHit: milkBikis, score: 1},
|
||||
{CatalogueHit: milkBikis200, score: 0.9},
|
||||
{CatalogueHit: goodDay, score: 0.5},
|
||||
}
|
||||
distinct := distinctProducts(hits)
|
||||
if len(distinct) != 2 || distinct[0].ID != 7 || distinct[1].ID != 9 {
|
||||
t.Fatalf("two sizes of one product are one choice, got %+v", distinct)
|
||||
}
|
||||
}
|
||||
|
||||
// Picking a candidate: the app sends the key instead of a description, and
|
||||
// nothing is recognised at all.
|
||||
func TestNamingTheProductSkipsRecognition(t *testing.T) {
|
||||
repo := newLookupFixture()
|
||||
repo.ref = []repositories.CatalogueHit{milkBikis, milkBikis200}
|
||||
// If recognition ran, these would decide the answer instead.
|
||||
repo.text = []repositories.CatalogueHit{goodDay}
|
||||
repo.vector = []repositories.CatalogueHit{goodDay}
|
||||
svc := NewScanService(repo, fakeEmbedder{vec: []float32{0.1}})
|
||||
|
||||
resp, err := svc.Lookup(context.Background(), models.ScanLookupRequest{
|
||||
Customerid: 5, Brand: "britannia", Catalogueid: 7,
|
||||
Latitude: "11.035", Longitude: "77.035",
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if repo.askedRef != "britannia#7" {
|
||||
t.Fatalf("the catalogue should have been asked for that exact product, got %q", repo.askedRef)
|
||||
}
|
||||
if resp.Match == nil || resp.Match.Catalogueid != 7 || resp.Match.Method != "direct" {
|
||||
t.Fatalf("want a direct match on 7, got %+v", resp.Match)
|
||||
}
|
||||
if resp.Ambiguous || resp.Confidence != 1 {
|
||||
t.Errorf("a named product is not a guess: ambiguous=%v confidence=%v", resp.Ambiguous, resp.Confidence)
|
||||
}
|
||||
if len(resp.Variants) != 2 {
|
||||
t.Errorf("its pack sizes should come with it, got %+v", resp.Variants)
|
||||
}
|
||||
if !resp.Available || resp.RecommendedLocationid != 20 {
|
||||
t.Errorf("stores are resolved exactly as for a recognised product, got %+v", resp.Stores)
|
||||
}
|
||||
}
|
||||
|
||||
func TestAMissingCatalogueRefIsNotAMatch(t *testing.T) {
|
||||
repo := newLookupFixture()
|
||||
repo.ref = nil
|
||||
svc := NewScanService(repo, nil)
|
||||
|
||||
resp, err := svc.Lookup(context.Background(), models.ScanLookupRequest{
|
||||
Customerid: 5, Brand: "britannia", Catalogueid: 999,
|
||||
})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if resp.Match != nil || resp.Ambiguous || len(resp.Stores) != 0 {
|
||||
t.Fatalf("a product that is gone is not a match, got %+v", resp)
|
||||
}
|
||||
if !strings.Contains(resp.Message, "no longer") {
|
||||
t.Errorf("the message should say the product is gone, got %q", resp.Message)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user