feat(LLM): 外观专利/货源多行合批 + 读超时抬到 600s,砍请求次数

- 外观专利:商标提取 10 行一批、外观检测 5 行(=5 张图)一批,一个 10 行批次
  从 20 次请求降到 3 次。Gemini 支持多图,无需再逐行单独发图。
- 批量协议:用户文本用「序号<TAB>行」,响应 {"items":[{"i":n,…}]} 一律按序号回填,
  不信数组位置。三道校验门(序号在批内、关键词逐字属于本行原文、状态枚举且理由非空),
  缺行或失真行单发补检一次;传输失败按整批记失败、绝不逐行重发,避免劣化窗口放大成 N 倍。
- 应急开关:llm-title-batch-size / llm-appearance-batch-size 任一设为 1 即退回逐行,无需改代码。
- 货源查询:类目一级/二级合并为一次调用,两级树每批只加载一次(原来每行各问一次、共 2 次)。
- 超时:读 600s、首查 300s(外观专利与货源同步调整)。合批后单请求输出量约为原来 5 倍,
  沿用按单图调出的 60s 会误杀正常慢批次、连带整批白等一轮重试。
- 口径影响:后台 LLM 使用按「次」统计,上线后次数约降到 1/6.7,与历史数据不可横向比较。
This commit is contained in:
2026-09-27 19:47:51 +08:00
parent ace9a784be
commit ed7dd9381b
7 changed files with 988 additions and 191 deletions
@@ -20,14 +20,21 @@ import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.concurrent.CopyOnWriteArrayList;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import org.mockito.Mockito;
@@ -52,10 +59,11 @@ class SimilarAsinLlmServiceTest {
}
private SimilarAsinLlmService service(SimilarAsinLlmClient llmClient) {
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());
return service(llmClient, chainedCategoryService());
}
/** 单链类目树:类目A(1) → 类目B(2) → 类目C(3),供既有测试用。 */
private ProductCategoryService chainedCategoryService() {
ProductCategoryService categoryService = mock(ProductCategoryService.class);
when(categoryService.children(any(), anyLong(), anyLong()))
.thenAnswer(invocation -> {
@@ -71,6 +79,16 @@ class SimilarAsinLlmServiceTest {
}
return emptyCategoryPage();
});
when(categoryService.list()).thenReturn(pageOf(List.of(
cat(1L, null, "类目A"), cat(2L, 1L, "类目B"), cat(3L, 2L, "类目C"))));
return categoryService;
}
private SimilarAsinLlmService service(SimilarAsinLlmClient llmClient, ProductCategoryService categoryService) {
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(),
@@ -255,8 +273,8 @@ class SimilarAsinLlmServiceTest {
@Test
void imageCompareStopsOnStockAndFillsFields() {
// 前 2 次 chat:一级/二级类目匹配返回名称(Java 按名回查候选取真实 ID);第 3 次:合规检查。
SimilarAsinLlmClient client = llmClientStaged("k", List.of("{\"name\":\"类目A\"}", "{\"name\":\"类目B\"}"),
// 第 1 次 chat:合并类目调用一次给出一级+二级名称(Java 按名回查取真实 ID);第 2 次:合规检查。
SimilarAsinLlmClient client = llmClientStaged("k", List.of("{\"first\":\"类目A\",\"second\":\"类目B\"}"),
"{\"asin\":\"B0TEST\",\"is_conform\":\"符合\",\"reason\":\"无\",\"category\":\"类目A->类目B->类目C\"}",
"{\"asin\":\"B0TEST\",\"is_stock\":\"有货\",\"similarity\":\"95%\",\"status\":\"成功\",\"is_conform\":\"符合\",\"category\":\"类目A->类目B->类目C\"}");
SimilarAsinLlmService service = service(client);
@@ -278,4 +296,165 @@ class SimilarAsinLlmServiceTest {
assertEquals("95%", out.getSimilarity());
assertEquals("符合", out.getIsConform());
}
// --- 合并类目判定(一次调用出一级+二级)---
private static ProductCategoryItemVo cat(long id, Long parentId, String name) {
ProductCategoryItemVo item = new ProductCategoryItemVo();
item.setId(id);
item.setParentId(parentId);
item.setName(name);
return item;
}
private static ProductCategoryListVo pageOf(List<ProductCategoryItemVo> items) {
ProductCategoryListVo vo = new ProductCategoryListVo();
vo.setItems(items);
vo.setTree(List.of());
vo.setTotal((long) items.size());
vo.setPage(1L);
vo.setPageSize((long) items.size());
vo.setHasMore(false);
return vo;
}
/**
* 含重名二级的两层树:家具(100)→配件(101)→沙发套(301);数码(200)→配件(201)→手机壳(300)。
* 二级同名用来暴露「二级挂到另一分支」的错误——三级候选里会出现另一个分支的叶子。
*/
private static List<ProductCategoryItemVo> duplicateNameTree() {
return List.of(
cat(100L, null, "家具"),
cat(200L, null, "数码"),
cat(101L, 100L, "配件"),
cat(201L, 200L, "配件"),
cat(301L, 101L, "沙发套"),
cat(300L, 201L, "手机壳"));
}
/** 同一棵树同时喂 list()(新链路整树加载)与 children()(旧链路逐层查),保证 RED 阶段可跑。 */
private ProductCategoryService duplicateTreeCategoryService() {
ProductCategoryService categoryService = mock(ProductCategoryService.class);
List<ProductCategoryItemVo> all = duplicateNameTree();
when(categoryService.list()).thenReturn(pageOf(all));
when(categoryService.children(any(), anyLong(), anyLong()))
.thenAnswer(invocation -> {
Long parentId = invocation.getArgument(0);
return pageOf(all.stream().filter(item -> Objects.equals(item.getParentId(), parentId)).toList());
});
return categoryService;
}
/** 按 userText 前缀区分类目调用与合规调用,并记录全部 chat 调用供断言。 */
private SimilarAsinLlmClient recordingClient(List<String> chatUserTexts, String categoryJson, String conformJson) {
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);
chatUserTexts.add(userText);
return userText.startsWith("产品标题:") ? categoryJson : conformJson;
});
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)));
return client;
}
private static SimilarAsinResultRowDto rowOf(String asin, String title) {
SimilarAsinResultRowDto row = new SimilarAsinResultRowDto();
row.setAsin(asin);
row.setTitle(title);
return row;
}
private static String last(List<String> values) {
return values.get(values.size() - 1);
}
/** 合规 userText 里「三级类目:」之后的候选段,独立于标题断言。 */
private static String thirdCandidatesOf(String conformText) {
int index = conformText.indexOf("三级类目:");
assertTrue(index >= 0, "合规入参缺少三级候选段:" + conformText);
return conformText.substring(index);
}
@Test
void secondLevelResolvesOnlyWithinChosenFirstLevel() {
List<String> chats = new CopyOnWriteArrayList<>();
SimilarAsinLlmService service = service(
recordingClient(chats, "{\"first\":\"家具\",\"second\":\"配件\"}",
"{\"asin\":\"B01\",\"is_conform\":\"不符合\",\"reason\":\"命中违规类目\",\"category\":\"家具->配件->沙发套\"}"),
duplicateTreeCategoryService());
service.inspectRows(List.of(rowOf("B01", "布质防滑罩")), "", "k", false, true);
String thirdSegment = thirdCandidatesOf(last(chats));
assertTrue(thirdSegment.contains("沙发套"), "三级候选应取所选一级之下的二级,实际:" + thirdSegment);
assertFalse(thirdSegment.contains("手机壳"), "禁止挂到另一分支的同名二级,实际:" + thirdSegment);
}
@Test
void categoryResolutionUsesSingleChatCall() {
List<String> chats = new CopyOnWriteArrayList<>();
// 双形状 JSON:旧契约读 name、新契约读 first/second,两边都能解析出「家具」,只比调用次数。
SimilarAsinLlmService service = service(
recordingClient(chats, "{\"name\":\"家具\",\"first\":\"家具\",\"second\":\"配件\"}",
"{\"asin\":\"B01\",\"is_conform\":\"不符合\",\"reason\":\"无\",\"category\":\"家具->配件->沙发套\"}"),
duplicateTreeCategoryService());
service.inspectRows(List.of(rowOf("B01", "亚麻沙发套")), "", "k", false, true);
assertEquals(2, chats.size(), "类目+合规应各 1 次,实际调用:" + chats);
}
@Test
void secondLevelNoMatchKeepsFirstLevel() {
List<String> chats = new CopyOnWriteArrayList<>();
SimilarAsinLlmService service = service(
recordingClient(chats, "{\"first\":\"数码\",\"second\":\"无\"}",
"{\"asin\":\"B01\",\"is_conform\":\"不符合\",\"reason\":\"无\",\"category\":\"数码\"}"),
duplicateTreeCategoryService());
service.inspectRows(List.of(rowOf("B01", "手机支架")), "", "k", false, true);
String conformText = last(chats);
assertTrue(conformText.contains("一级类目:数码"), "二级回「无」不得连带丢掉一级,实际:" + conformText);
assertTrue(conformText.contains("二级类目:无"), "二级应为「无」,实际:" + conformText);
assertFalse(conformText.contains("手机壳"), "二级为「无」时不应给出三级候选,实际:" + conformText);
}
@Test
void unknownSecondLevelDegradesToNoneWithoutFailingRow() {
List<String> chats = new CopyOnWriteArrayList<>();
SimilarAsinLlmService service = service(
recordingClient(chats, "{\"first\":\"家具\",\"second\":\"不存在的类目\"}",
"{\"asin\":\"B01\",\"is_conform\":\"不符合\",\"reason\":\"无\",\"category\":\"家具\"}"),
duplicateTreeCategoryService());
List<SimilarAsinResultRowDto> result = service.inspectRows(List.of(rowOf("B01", "实木餐桌")), "", "k", false, true);
assertEquals("不符合", result.get(0).getIsConform());
assertEquals("成功", result.get(0).getStatus());
String conformText = last(chats);
assertTrue(conformText.contains("一级类目:家具"), "编造的二级不得连带丢掉一级,实际:" + conformText);
assertTrue(conformText.contains("二级类目:无"), "实际:" + conformText);
}
@Test
void categoryTreeIsLoadedOncePerBatch() {
List<String> chats = new CopyOnWriteArrayList<>();
ProductCategoryService categoryService = duplicateTreeCategoryService();
SimilarAsinLlmService service = service(
recordingClient(chats, "{\"first\":\"家具\",\"second\":\"配件\"}",
"{\"asin\":\"B01\",\"is_conform\":\"不符合\",\"reason\":\"无\",\"category\":\"家具->配件->沙发套\"}"),
categoryService);
service.inspectRows(List.of(rowOf("B01", "A"), rowOf("B02", "B"), rowOf("B03", "C")), "", "k", false, true);
verify(categoryService, times(1)).list();
verify(categoryService, never()).children(any(), anyLong(), anyLong());
}
}