fix: 商标查询失败自动重试、货源结果图切回Excel内嵌防WPS #REF、外观专利标题模型改gemini-3.8-flash
- brand-check: 单品牌商标查询失败(异常/空响应/query_faild_data 非空)自动重试, 次数与间隔可配(retry-times 默认3含首次 / retry-interval-millis 1000),命中侵权不重试; collectdata 品牌过滤与外观专利商标核验两侧同时受益 - similarasin: 货源结果Excel图片由WPS DISPIMG 切回 Excel 365 richData 单元格内嵌, 修复 WPS 打开 DISPIMG 显示 #REF 的兼容回归;下载失败单元格回退为URL文本 - appearance-patent: 标题商标提取模型由 deepseek-v4-flash 切 gemini-3.8-flash
This commit is contained in:
+14
-13
@@ -63,22 +63,23 @@ class AppearancePatentLlmClientHttpTest {
|
||||
String model = String.valueOf(request.get("model"));
|
||||
callCounts.computeIfAbsent(model, ignored -> new AtomicInteger()).incrementAndGet();
|
||||
|
||||
// 标题提取与外观检测现同用 gemini-3.8-flash,按请求是否带 image_url 区分两路:
|
||||
// 外观检测消息带 image_url parts,标题商标提取仅纯文本。
|
||||
String content;
|
||||
if (model.contains("deepseek")) {
|
||||
// 商标提取:按标题内容返回品牌词或"无"
|
||||
String messages = String.valueOf(request.get("messages"));
|
||||
if (messages.contains("Apple")) {
|
||||
content = "Apple,Apple";
|
||||
} else {
|
||||
content = "无";
|
||||
}
|
||||
} else {
|
||||
if (body.contains("\"type\":\"image_url\"")) {
|
||||
// 外观检测:返回 JSON(带 ```json 包裹与换行,模拟脏输出)
|
||||
if (messagesBodyContains(exchange, "原创个性杯")) {
|
||||
if (body.contains("原创个性杯")) {
|
||||
content = "```json\n{\"appearance_status\": \"侵权\", \"appearance_reason\": \"【视觉拆解】:特殊造型\\n【判定依据】:高度相似知名设计\"}\n```";
|
||||
} else {
|
||||
content = "{\"appearance_status\": \"无侵权\", \"appearance_reason\": \"【视觉拆解】:普通直筒杯。\\n【对比评估】:行业通用基础形状。\\n【判定依据】:无侵权。\"}";
|
||||
}
|
||||
} else {
|
||||
// 商标提取:按标题内容返回品牌词或"无"
|
||||
if (String.valueOf(request.get("messages")).contains("Apple")) {
|
||||
content = "Apple,Apple";
|
||||
} else {
|
||||
content = "无";
|
||||
}
|
||||
}
|
||||
String response = objectMapper.writeValueAsString(Map.of(
|
||||
"model", model,
|
||||
@@ -125,8 +126,8 @@ class AppearancePatentLlmClientHttpTest {
|
||||
assertThat(result.getAppearanceRisk()).isEqualTo("无侵权");
|
||||
assertThat(result.getAppearanceReason()).contains("视觉拆解");
|
||||
assertThat(result.getTitleReason()).contains("Apple");
|
||||
assertThat(callCounts.get("deepseek-v4-flash")).hasValue(1);
|
||||
assertThat(callCounts.get("gemini-3.8-flash")).hasValue(1);
|
||||
assertThat(callCounts.get("gemini-3.8-flash")).hasValue(2);
|
||||
assertThat(callCounts.get("deepseek-v4-flash")).isNull();
|
||||
}
|
||||
|
||||
@Test
|
||||
@@ -182,7 +183,7 @@ class AppearancePatentLlmClientHttpTest {
|
||||
client.inspectRows(List.of(row("6", "B006", "普通数据线", "", "https://img.example.com/6.jpg")), null, "test-key");
|
||||
|
||||
String appearanceBody = capturedBodies.stream()
|
||||
.filter(b -> b.contains("gemini-3.8-flash"))
|
||||
.filter(b -> b.contains("\"type\":\"image_url\""))
|
||||
.findFirst()
|
||||
.orElseThrow();
|
||||
assertThat(appearanceBody).contains("https://img.example.com/6.jpg");
|
||||
|
||||
Reference in New Issue
Block a user