perf(货源): 分类匹配批量分块,类目树文本整批只随一次请求发送
分类判定按 llmCategoryBatchSize(默认10)分块、每块一次 LLM 调用:formatTwoLevels 的两层类目树此前随每行请求重复发送,是分类链路最大的 token 开销(10 行/块省约九成)。块内缺编号/坏编号的行、整块调用失败的行回退逐行单调用,行级失败语义不变。env: AIIMAGE_SIMILAR_ASIN_LLM_CATEGORY_BATCH_SIZE,设 0/1 回退旧行为。
This commit is contained in:
+150
-1
@@ -346,6 +346,12 @@ class SimilarAsinLlmServiceTest {
|
||||
|
||||
/** 按 userText 前缀区分类目调用与合规调用,并记录全部 chat 调用供断言。 */
|
||||
private SimilarAsinLlmClient recordingClient(List<String> chatUserTexts, String categoryJson, String conformJson) {
|
||||
return recordingClient(chatUserTexts, null, categoryJson, conformJson);
|
||||
}
|
||||
|
||||
/** 同上,另支持批量分类文本(含"待分类商品"标记)——batchCategoryJson 为 null 时批量调用视为意外。 */
|
||||
private SimilarAsinLlmClient recordingClient(List<String> chatUserTexts, String batchCategoryJson,
|
||||
String categoryJson, String conformJson) {
|
||||
SimilarAsinLlmClient client = mock(SimilarAsinLlmClient.class);
|
||||
when(client.resolveApiKey(anyString())).thenReturn("k");
|
||||
when(client.hasApiKey(anyString())).thenReturn(true);
|
||||
@@ -353,6 +359,12 @@ class SimilarAsinLlmServiceTest {
|
||||
.thenAnswer(invocation -> {
|
||||
String userText = invocation.getArgument(2);
|
||||
chatUserTexts.add(userText);
|
||||
if (userText.contains("待分类商品")) {
|
||||
if (batchCategoryJson == null) {
|
||||
throw new IllegalStateException("unexpected category batch call: " + userText);
|
||||
}
|
||||
return batchCategoryJson;
|
||||
}
|
||||
return userText.startsWith("产品标题:") ? categoryJson : conformJson;
|
||||
});
|
||||
when(client.invokeChatWithImages(anyString(), anyString(), anyString(), any(), anyString()))
|
||||
@@ -447,7 +459,11 @@ class SimilarAsinLlmServiceTest {
|
||||
List<String> chats = new CopyOnWriteArrayList<>();
|
||||
ProductCategoryService categoryService = duplicateTreeCategoryService();
|
||||
SimilarAsinLlmService service = service(
|
||||
recordingClient(chats, "{\"first\":\"家具\",\"second\":\"配件\"}",
|
||||
recordingClient(chats,
|
||||
"{\"items\":[{\"i\":1,\"first\":\"家具\",\"second\":\"配件\"},"
|
||||
+ "{\"i\":2,\"first\":\"数码\",\"second\":\"配件\"},"
|
||||
+ "{\"i\":3,\"first\":\"数码\",\"second\":\"无\"}]}",
|
||||
"{\"first\":\"家具\",\"second\":\"配件\"}",
|
||||
"{\"asin\":\"B01\",\"is_conform\":\"不符合\",\"reason\":\"无\",\"category\":\"家具->配件->沙发套\"}"),
|
||||
categoryService);
|
||||
|
||||
@@ -456,4 +472,137 @@ class SimilarAsinLlmServiceTest {
|
||||
verify(categoryService, times(1)).list();
|
||||
verify(categoryService, never()).children(any(), anyLong(), anyLong());
|
||||
}
|
||||
|
||||
// --- 批量分类(2026-10-02):类目树文本整批只随一次请求发送 ---
|
||||
|
||||
private SimilarAsinLlmService service(SimilarAsinLlmClient llmClient, ProductCategoryService categoryService,
|
||||
SimilarAsinProperties properties) {
|
||||
OssStorageService ossStorage = mock(OssStorageService.class);
|
||||
when(ossStorage.getPublicUrl(anyString())).thenAnswer(invocation -> "https://oss.aishufu.top/nanri-ai-images/" + invocation.getArgument(0));
|
||||
PuzzleImageMerger merger = mock(PuzzleImageMerger.class);
|
||||
when(merger.merge(anyList(), Mockito.<SimilarAsinResultRowDto>any())).thenReturn(jpegBytes());
|
||||
SimilarAsinLlmService svc = new SimilarAsinLlmService(
|
||||
llmClient,
|
||||
properties,
|
||||
mock(OssProperties.class),
|
||||
categoryService,
|
||||
merger,
|
||||
ossStorage,
|
||||
mock(SimilarAsinImageEmbedder.class));
|
||||
svc.setDownloadHttpClientForTest(mockHttpClient());
|
||||
return svc;
|
||||
}
|
||||
|
||||
private static long countTreeTexts(List<String> chats) {
|
||||
return chats.stream().filter(text -> text.contains("备选类目列表")).count();
|
||||
}
|
||||
|
||||
private static final String CONFORM_JSON =
|
||||
"{\"asin\":\"B01\",\"is_conform\":\"不符合\",\"reason\":\"无\",\"category\":\"家具->配件->沙发套\"}";
|
||||
|
||||
@Test
|
||||
void categoryBatchAmortizesTreeTextAcrossRows() {
|
||||
List<String> chats = new CopyOnWriteArrayList<>();
|
||||
SimilarAsinLlmService service = service(
|
||||
recordingClient(chats,
|
||||
"{\"items\":[{\"i\":1,\"first\":\"家具\",\"second\":\"配件\"},"
|
||||
+ "{\"i\":2,\"first\":\"家具\",\"second\":\"无\"},"
|
||||
+ "{\"i\":3,\"first\":\"数码\",\"second\":\"配件\"}]}",
|
||||
"{\"first\":\"家具\",\"second\":\"配件\"}",
|
||||
CONFORM_JSON),
|
||||
duplicateTreeCategoryService());
|
||||
|
||||
List<SimilarAsinResultRowDto> result = service.inspectRows(
|
||||
List.of(rowOf("B01", "布质防滑罩"), rowOf("B02", "亚麻沙发套"), rowOf("B03", "手机支架")),
|
||||
"", "k", false, true);
|
||||
|
||||
// 1 次批量分类 + 3 次合规;树文本只在批量请求里出现一次(逐行模式会出现 3 次)
|
||||
assertEquals(4, chats.size(), "实际调用:" + chats);
|
||||
assertEquals(1, countTreeTexts(chats));
|
||||
String batchText = chats.get(0);
|
||||
assertTrue(batchText.contains("布质防滑罩") && batchText.contains("亚麻沙发套") && batchText.contains("手机支架"),
|
||||
"批量请求应包含整块全部行:" + batchText);
|
||||
// 批量判定的行级语义与单行一致:i=2 second=无 → 合规入参二级为"无"且无三级候选
|
||||
assertTrue(result.get(1).getIsConform() != null, "每行都要完成合规判定");
|
||||
String conformTexts = chats.stream().filter(text -> text.contains("三级类目:"))
|
||||
.filter(text -> text.contains("一级类目:家具") && text.contains("二级类目:无"))
|
||||
.findFirst().orElse("");
|
||||
assertTrue(!conformTexts.isEmpty(), "i=2 的判定应保留一级、二级为无:" + chats);
|
||||
assertFalse(conformTexts.contains("手机壳"), "二级为无时不应给出三级候选");
|
||||
}
|
||||
|
||||
@Test
|
||||
void categoryBatchMissingItemFallsBackToSingleRowCall() {
|
||||
List<String> chats = new CopyOnWriteArrayList<>();
|
||||
// 批量结果只回了 i=1、i=3,i=2 缺失 → 该行回退逐行单调用补齐
|
||||
SimilarAsinLlmService service = service(
|
||||
recordingClient(chats,
|
||||
"{\"items\":[{\"i\":1,\"first\":\"家具\",\"second\":\"配件\"},"
|
||||
+ "{\"i\":3,\"first\":\"数码\",\"second\":\"配件\"}]}",
|
||||
"{\"first\":\"家具\",\"second\":\"配件\"}",
|
||||
CONFORM_JSON),
|
||||
duplicateTreeCategoryService());
|
||||
|
||||
service.inspectRows(
|
||||
List.of(rowOf("B01", "布质防滑罩"), rowOf("B02", "亚麻沙发套"), rowOf("B03", "手机支架")),
|
||||
"", "k", false, true);
|
||||
|
||||
long batchCalls = chats.stream().filter(text -> text.contains("待分类商品")).count();
|
||||
long singleCategoryCalls = chats.stream().filter(text -> text.startsWith("产品标题:")).count();
|
||||
assertEquals(1, batchCalls);
|
||||
assertEquals(1, singleCategoryCalls, "缺失行要回退单行分类调用:" + chats);
|
||||
assertEquals(3, chats.size() - batchCalls - singleCategoryCalls, "3 行都要有合规调用:" + chats);
|
||||
}
|
||||
|
||||
@Test
|
||||
void categoryBatchTransportErrorFallsBackForWholeChunk() {
|
||||
List<String> chats = new CopyOnWriteArrayList<>();
|
||||
SimilarAsinLlmClient client = mock(SimilarAsinLlmClient.class);
|
||||
when(client.resolveApiKey(anyString())).thenReturn("k");
|
||||
when(client.hasApiKey(anyString())).thenReturn(true);
|
||||
when(client.invokeChat(anyString(), anyString(), anyString(), anyString()))
|
||||
.thenAnswer(invocation -> {
|
||||
String userText = invocation.getArgument(2);
|
||||
chats.add(userText);
|
||||
if (userText.contains("待分类商品")) {
|
||||
throw new IllegalStateException("LLM gateway 502");
|
||||
}
|
||||
return userText.startsWith("产品标题:") ? "{\"first\":\"家具\",\"second\":\"配件\"}" : CONFORM_JSON;
|
||||
});
|
||||
when(client.invokeChatWithImages(anyString(), anyString(), anyString(), any(), anyString()))
|
||||
.thenReturn("{\"asin\":\"B01\",\"is_stock\":\"没有货\",\"similarity\":\"10%\",\"status\":\"成功\"}");
|
||||
when(client.parseJsonContent(anyString()))
|
||||
.thenAnswer(invocation -> parseJson(invocation.getArgument(0)));
|
||||
SimilarAsinLlmService service = service(client, duplicateTreeCategoryService());
|
||||
|
||||
List<SimilarAsinResultRowDto> result = service.inspectRows(
|
||||
List.of(rowOf("B01", "A"), rowOf("B02", "B"), rowOf("B03", "C")), "", "k", false, true);
|
||||
|
||||
long batchCalls = chats.stream().filter(text -> text.contains("待分类商品")).count();
|
||||
assertEquals(1, batchCalls, "批量调用发生一次");
|
||||
assertEquals(3, chats.stream().filter(text -> text.startsWith("产品标题:")).count(),
|
||||
"整块失败后 3 行都回退单行分类调用:" + chats);
|
||||
for (SimilarAsinResultRowDto row : result) {
|
||||
assertEquals("不符合", row.getIsConform(), "回退后行级结果照常产出");
|
||||
}
|
||||
}
|
||||
|
||||
@Test
|
||||
void categoryBatchDisabledWhenBatchSizeOne() {
|
||||
List<String> chats = new CopyOnWriteArrayList<>();
|
||||
SimilarAsinProperties properties = properties();
|
||||
properties.setLlmCategoryBatchSize(1);
|
||||
SimilarAsinLlmService service = service(
|
||||
recordingClient(chats, "{\"first\":\"家具\",\"second\":\"配件\"}", CONFORM_JSON),
|
||||
duplicateTreeCategoryService(),
|
||||
properties);
|
||||
|
||||
service.inspectRows(List.of(rowOf("B01", "A"), rowOf("B02", "B"), rowOf("B03", "C")), "", "k", false, true);
|
||||
|
||||
assertEquals(0, chats.stream().filter(text -> text.contains("待分类商品")).count(),
|
||||
"批量关闭时不得发起批量调用");
|
||||
// 单行模式:每行的分类请求各带一次树文本(树内容以一级类目的 ID 标注为标记)
|
||||
assertEquals(3, chats.stream().filter(text -> text.contains("ID:100")).count(), "3 次分类各带一棵树");
|
||||
assertEquals(6, chats.size(), "3 次分类 + 3 次合规");
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user