The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.
TypeScript clickhousemysqlnextjsopen-sourceplanetscaleprismatailwindcsstinybirdtypescriptupstashvercel
Simplify partner search relevance handling
Rafi37d4f298861e
diff --git a/apps/web/lib/api/partners/search/providers/upstash-redis.ts b/apps/web/lib/api/partners/search/providers/upstash-redis.tsindex c0f6da9274..39d830f93a 100644--- a/apps/web/lib/api/partners/search/providers/upstash-redis.ts+++ b/apps/web/lib/api/partners/search/providers/upstash-redis.ts@@ -411,8 +411,6 @@ export function createUpstashRedisPartnerSearchProvider({}return {- mode: "relevance-only",-searchCandidates: findCandidates,async search(query) {diff --git a/apps/web/lib/api/partners/search/providers/upstash-search.ts b/apps/web/lib/api/partners/search/providers/upstash-search.tsindex cab9b859e4..59f9cf3e6c 100644--- a/apps/web/lib/api/partners/search/providers/upstash-search.ts+++ b/apps/web/lib/api/partners/search/providers/upstash-search.ts@@ -548,8 +548,6 @@ export function createUpstashSearchPartnerSearchProvider({}return {- mode: "relevance-only",-async searchCandidates({ programId, query, limit }) {validatePartnerSearchCandidateLimit(limit);const candidates = await findSearchCandidates(diff --git a/apps/web/lib/api/partners/search/types.ts b/apps/web/lib/api/partners/search/types.tsindex d57d40f7ea..be5e7b1c6f 100644--- a/apps/web/lib/api/partners/search/types.ts+++ b/apps/web/lib/api/partners/search/types.ts@@ -135,7 +135,6 @@ export interface PartnerSearchCandidateQuery {}export interface PartnerSearchProvider {- mode?: "full" | "relevance-only";searchCandidates(query: PartnerSearchCandidateQuery,): Promise<PartnerSearchResult>;diff --git a/apps/web/scripts/dev/benchmark-partner-search.ts b/apps/web/scripts/dev/benchmark-partner-search.tsindex ca112d0269..a75652dbd4 100644--- a/apps/web/scripts/dev/benchmark-partner-search.ts+++ b/apps/web/scripts/dev/benchmark-partner-search.ts@@ -1,5 +1,4 @@import { getPartners } from "@/lib/api/partners/get-partners";-import { getPartnersCount } from "@/lib/api/partners/get-partners-count";import {getPartnerSearchProvider,partnerSearchDocumentSelect,@@ -251,7 +250,6 @@ async function main() {}const searchCases = await loadSearchCases(options.programId);- const relevanceOnly = searchProvider.mode === "relevance-only";const runSearch = async (index: number): Promise<BenchmarkResult> => {const searchCase = searchCases[index % searchCases.length];@@ -260,22 +258,15 @@ async function main() {search: searchCase.query,page: 1,pageSize: options.pageSize,- sortBy: relevanceOnly- ? ("relevance" as const)- : ("totalSaleAmount" as const),+ sortBy: "relevance" as const,sortOrder: "desc" as const,};const startedAt = performance.now();try {- const [partners, count] = await Promise.all([- getPartners(filters, { searchProvider }),- relevanceOnly- ? Promise.resolve(null)- : getPartnersCount<number>(filters, { searchProvider }),- ]);-- if (partners.length === 0 || count === 0) {+ const partners = await getPartners(filters, { searchProvider });++ if (partners.length === 0) {throw new Error(`Search case "${searchCase.field}" returned no results for "${searchCase.query}".`,);@@ -301,9 +292,7 @@ async function main() {`${options.requests.toLocaleString()} measured requests, ${options.warmupRequests.toLocaleString()} warm-up requests, concurrency ${options.concurrency}`,);console.log(- relevanceOnly- ? `Each request runs the relevance-ranked partner list path across ${searchCases.length} search cases.`- : `Each request runs the partner list and count paths in parallel across ${searchCases.length} search cases.`,+ `Each request runs the relevance-ranked partner list path across ${searchCases.length} search cases.`,);const warmupResults = await runWithConcurrency(diff --git a/apps/web/scripts/dev/debug-partner-search.ts b/apps/web/scripts/dev/debug-partner-search.tsindex 219aba7ab6..de6d4ca948 100644--- a/apps/web/scripts/dev/debug-partner-search.ts+++ b/apps/web/scripts/dev/debug-partner-search.ts@@ -2,6 +2,7 @@ import {getPartnerSearchableValues,getPartnerSearchProvider,normalizePartnerSearchQuery,+ PARTNER_SEARCH_CANDIDATE_LIMIT,partnerSearchDocumentSelect,serializePartnerSearchDocument,type PartnerSearchDocument,@@ -36,7 +37,6 @@ interface DebugArguments {query: string;limit: number;sortBy: PartnerSearchSortField;- sortOrder: "asc" | "desc";status?: ProgramEnrollmentStatus;}@@ -45,7 +45,6 @@ function parseArguments(args: string[]): DebugArguments {let query: string | undefined;let limit = DEFAULT_LIMIT;let sortBy: PartnerSearchSortField = "totalSaleAmount";- let sortOrder: "asc" | "desc" = "desc";let status: ProgramEnrollmentStatus | undefined;for (const arg of args) {@@ -61,12 +60,6 @@ function parseArguments(args: string[]): DebugArguments {throw new Error(`--sortBy must be one of: ${SORT_FIELDS.join(", ")}.`);}sortBy = value;- } else if (arg.startsWith("--sortOrder=")) {- const value = arg.slice("--sortOrder=".length);- if (value !== "asc" && value !== "desc") {- throw new Error("--sortOrder must be asc or desc.");- }- sortOrder = value;} else if (arg.startsWith("--status=")) {const value = arg.slice("--status=".length) as ProgramEnrollmentStatus;if (!Object.values(ProgramEnrollmentStatus).includes(value)) {@@ -90,13 +83,19 @@ function parseArguments(args: string[]): DebugArguments {throw new Error(`--limit cannot exceed ${MAX_LIMIT}.`);}- return { programId, query, limit, sortBy, sortOrder, status };+ return { programId, query, limit, sortBy, status };}-async function getDatabaseDocuments(hits: PartnerSearchHit[]) {+async function getDatabaseDocuments(+ hits: PartnerSearchHit[],+ status?: ProgramEnrollmentStatus,+) {const documentIds = Array.from(new Set(hits.map(({ id }) => id)));const enrollments = await prisma.programEnrollment.findMany({- where: { id: { in: documentIds } },+ where: {+ id: { in: documentIds },+ ...(status ? { status } : {}),+ },select: partnerSearchDocumentSelect,});@@ -146,7 +145,7 @@ function reportResults({normalizedQuery,),enrollmentId: hit.id,- partnerId: hit.partnerId,+ partnerId: databaseDocument?.partnerId ?? hit.partnerId,name: databaseDocument?.name ?? "missing from database",email: databaseDocument?.email ?? null,company: databaseDocument?.companyName ?? null,@@ -156,7 +155,7 @@ function reportResults({}async function main() {- const { programId, query, limit, sortBy, sortOrder, status } = parseArguments(+ const { programId, query, limit, sortBy, status } = parseArguments(process.argv.slice(2),);const searchProvider = getPartnerSearchProvider();@@ -165,33 +164,24 @@ async function main() {}const providerName = process.env.PARTNER_SEARCH_PROVIDER?.trim();- const filters = status ? { status } : undefined;- const baseQuery = { programId, query, filters };- const relevanceOnly = searchProvider.mode === "relevance-only";const startedAt = performance.now();- // Step 1: Compare relevance ranking with the website's field-sorted query- const relevanceResult = await searchProvider.search({- ...baseQuery,- page: 1,- pageSize: limit,+ // Step 1: Fetch the same relevance candidates used by the website+ const relevanceResult = await searchProvider.searchCandidates({+ programId,+ query,+ limit: PARTNER_SEARCH_CANDIDATE_LIMIT,});- const [matchingDocuments, sortedResult] = relevanceOnly- ? ([null, null] as const)- : await Promise.all([- searchProvider.count(baseQuery),- searchProvider.search({- ...baseQuery,- page: 1,- pageSize: limit,- sort: { field: sortBy, order: sortOrder },- }),- ]);-- const allHits = [...relevanceResult.hits, ...(sortedResult?.hits ?? [])];-- // Step 2: Build the canonical search documents from the database for comparison- const databaseDocuments = await getDatabaseDocuments(allHits);++ // Step 2: Apply the requested status while loading canonical database documents+ const databaseDocuments = await getDatabaseDocuments(+ relevanceResult.hits,+ status,+ );+ const databaseMatchedHits = relevanceResult.hits.filter(({ id }) =>+ databaseDocuments.has(id),+ );+ const filteredHits = databaseMatchedHits.slice(0, limit);console.log("Partner search debug summary");console.table({@@ -200,34 +190,21 @@ async function main() {query,normalizedQuery: normalizePartnerSearchQuery(query),status: status ?? "all",- matchingDocuments: matchingDocuments ?? "not supported",+ candidates: relevanceResult.hits.length,+ databaseMatches: databaseMatchedHits.length,elapsedMs: (performance.now() - startedAt).toFixed(1),});console.log("Provider scores are provider-defined. Compare result order and database values across providers.",);- if (relevanceOnly) {- console.log(- "This provider supports relevance results only, so exact count and explicit field-order comparisons were skipped.",- );- }reportResults({label: "Provider relevance order",- hits: relevanceResult.hits,+ hits: filteredHits,databaseDocuments,sortBy,normalizedQuery: normalizePartnerSearchQuery(query),});- if (sortedResult) {- reportResults({- label: `${sortBy} ${sortOrder} — explicit field order`,- hits: sortedResult.hits,- databaseDocuments,- sortBy,- normalizedQuery: normalizePartnerSearchQuery(query),- });- }}main()diff --git a/apps/web/tests/partners/upstash-redis-partner-search-provider.test.ts b/apps/web/tests/partners/upstash-redis-partner-search-provider.test.tsindex 7ec63a5438..fa4fa83970 100644--- a/apps/web/tests/partners/upstash-redis-partner-search-provider.test.ts+++ b/apps/web/tests/partners/upstash-redis-partner-search-provider.test.ts@@ -155,13 +155,12 @@ describe("Upstash Redis partner search provider", () => {expect(JSON.stringify(filter)).toContain('"emailNgrams":{"$eq":"amp"}');});- it("exposes relevance-only behavior during the transition", async () => {+ it("keeps counts and groups on the database", async () => {const provider = createUpstashRedisPartnerSearchProvider({redisClient: createRedisMock(),indexName: "test-index",});- expect(provider.mode).toBe("relevance-only");await expect(provider.count({ programId: document.programId, query: "rafi" }),).rejects.toThrow("counts must be calculated by the database");diff --git a/apps/web/tests/partners/upstash-search-partner-search-provider.test.ts b/apps/web/tests/partners/upstash-search-partner-search-provider.test.tsindex 8ce6d0fd92..b337fa1b1c 100644--- a/apps/web/tests/partners/upstash-search-partner-search-provider.test.ts+++ b/apps/web/tests/partners/upstash-search-partner-search-provider.test.ts@@ -218,7 +218,6 @@ describe("Upstash Search partner search provider", () => {pageSize: 10,});- expect(provider.mode).toBe("relevance-only");expect(result.hits).toHaveLength(10);expect(result.hits[0]).toEqual(expect.objectContaining({ id: "pge_0", partnerId: "pn_0" }),