From 67f28c5b4f4ca35dc716b2316701e7b5d5301106 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Sun, 27 Sep 2026 11:27:27 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E9=98=9F=E5=88=97):=20coze=20?= =?UTF-8?q?=E6=AE=8B=E7=95=99=E6=94=B9=E5=90=8D=E5=88=B0=20task-queue=20/?= =?UTF-8?q?=20LLM=EF=BC=8C=E7=9B=B4=E8=BF=9E=E6=94=B9=E9=80=A0=E5=90=8E?= =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=87=BA=E7=8E=B0=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 货源查询与外观专利早已改成直连 LLM,但配置键、指标名、类名与注释里的 "coze" 还留着, 排查线上问题时按平台名 grep 到的是已经不参与调用的历史命名。 对外可见的两处改名(运维需同步): - 配置键 aiimage.coze-task.{max-concurrent,max-waiting} -> aiimage.task-queue.* - 指标 aiimage.coze-task.submit.rejected.total / .execution.duration / .queue.wait.duration -> aiimage.task-queue.* (Grafana 面板与告警表达式要一起改,否则曲线断流) SimilarAsinTaskServiceCozeBufferScopeTest 随之改名(git 识别为 R)。 OSS 签名域名测试改用 example-cdn.com 占位,不再依赖真实 coze.cn 域名形态。 SimilarAsinTaskServiceTest 补上 result.notice 两条口径的测试:缺必填字段的行显示「未检测」 而不是留白(28551:790/1000 行空白仍报成功),404 行优先显示「ASIN未找到」。 --- .../aiimage/config/LlmHttpConfigResolver.java | 2 +- .../aiimage/config/TaskFileJobConfig.java | 4 +- .../nanri/aiimage/config/TaskQueueGate.java | 6 +-- .../config/HttpClientConnectionReuseTest.java | 2 +- .../aiimage/config/TaskQueueGateTest.java | 6 +-- .../service/object/FaultInjectionTest.java | 4 +- .../service/oss/OssStorageServiceTest.java | 2 +- ...larAsinTaskServiceLlmBufferScopeTest.java} | 6 +-- ...imilarAsinTaskServiceRowKeyDedupeTest.java | 4 +- .../service/SimilarAsinTaskServiceTest.java | 51 +++++++++++++++++-- .../TaskResultFileJobWorkerOffloadTest.java | 2 +- 11 files changed, 66 insertions(+), 23 deletions(-) rename backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/{SimilarAsinTaskServiceCozeBufferScopeTest.java => SimilarAsinTaskServiceLlmBufferScopeTest.java} (98%) diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/LlmHttpConfigResolver.java b/backend-java/src/main/java/com/nanri/aiimage/config/LlmHttpConfigResolver.java index fe4df61a8..75a78afbe 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/config/LlmHttpConfigResolver.java +++ b/backend-java/src/main/java/com/nanri/aiimage/config/LlmHttpConfigResolver.java @@ -4,7 +4,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; /** - * LLM 客户端统一配置解析(task-168,Coze 已改直连 LLM)。 + * LLM 客户端统一配置解析(task-168)。 * * 从 aiimage.http-client.* 命名空间读取 LLM 客户端超时/重试,默认值与现状一致 * (connect 10s / read 60s / call 90s / retry 3);非法值钳制。模块级显式配置 diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/TaskFileJobConfig.java b/backend-java/src/main/java/com/nanri/aiimage/config/TaskFileJobConfig.java index 47e4f02b4..e9ab61000 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/config/TaskFileJobConfig.java +++ b/backend-java/src/main/java/com/nanri/aiimage/config/TaskFileJobConfig.java @@ -106,8 +106,8 @@ public class TaskFileJobConfig { @Bean("taskQueueExecutor") public TaskExecutor taskQueueExecutor( @Qualifier("taskQueueVirtualThreadExecutor") ExecutorService taskQueueVirtualThreadExecutor, - @Value("${aiimage.coze-task.max-concurrent:12}") int maxConcurrent, - @Value("${aiimage.coze-task.max-waiting:1000}") int maxWaiting, + @Value("${aiimage.task-queue.max-concurrent:12}") int maxConcurrent, + @Value("${aiimage.task-queue.max-waiting:1000}") int maxWaiting, ObjectProvider meterRegistryProvider) { Semaphore semaphore = new Semaphore(Math.max(1, maxConcurrent)); TaskExecutor semaphoreLimited = new ConcurrentTaskExecutor(command -> { diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/TaskQueueGate.java b/backend-java/src/main/java/com/nanri/aiimage/config/TaskQueueGate.java index 6e7b4fcf6..ef795ba2f 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/config/TaskQueueGate.java +++ b/backend-java/src/main/java/com/nanri/aiimage/config/TaskQueueGate.java @@ -101,14 +101,14 @@ public class TaskQueueGate implements TaskExecutor { private void recordRejected(String reason) { MeterRegistry registry = meterRegistry(); if (registry != null) { - registry.counter("aiimage.coze-task.submit.rejected.total", "reason", reason).increment(); + registry.counter("aiimage.task-queue.submit.rejected.total", "reason", reason).increment(); } } private void recordQueueWait(long waitNanos) { MeterRegistry registry = meterRegistry(); if (registry != null && waitNanos >= 0L) { - Timer.builder("aiimage.coze-task.queue.wait.duration") + Timer.builder("aiimage.task-queue.queue.wait.duration") .register(registry) .record(waitNanos, TimeUnit.NANOSECONDS); } @@ -117,7 +117,7 @@ public class TaskQueueGate implements TaskExecutor { private void recordExecution(long durationNanos) { MeterRegistry registry = meterRegistry(); if (registry != null && durationNanos >= 0L) { - Timer.builder("aiimage.coze-task.execution.duration") + Timer.builder("aiimage.task-queue.execution.duration") .register(registry) .record(durationNanos, TimeUnit.NANOSECONDS); } diff --git a/backend-java/src/test/java/com/nanri/aiimage/config/HttpClientConnectionReuseTest.java b/backend-java/src/test/java/com/nanri/aiimage/config/HttpClientConnectionReuseTest.java index 9af4014ae..0185123da 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/config/HttpClientConnectionReuseTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/config/HttpClientConnectionReuseTest.java @@ -107,7 +107,7 @@ class HttpClientConnectionReuseTest { @Test void test_task_077_brand_normal_multiple_items() throws Exception { - // 批量场景:Coze/品牌/紫鸟三个客户端各自持有独立 RestClient, + // 批量场景:LLM/品牌/紫鸟三个客户端各自持有独立 RestClient, // 但底层连接池共用同一 HttpClient 实例,不重复创建。 SimilarAsinLlmClient llm = new SimilarAsinLlmClient(new SimilarAsinProperties(), new ObjectMapper(), null, null); BrandCheckClient brand = new BrandCheckClient(new BrandCheckProperties(), null); diff --git a/backend-java/src/test/java/com/nanri/aiimage/config/TaskQueueGateTest.java b/backend-java/src/test/java/com/nanri/aiimage/config/TaskQueueGateTest.java index 0247fc664..d007905ec 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/config/TaskQueueGateTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/config/TaskQueueGateTest.java @@ -49,18 +49,18 @@ class TaskQueueGateTest { } private long rejectedCount(String reason) { - Counter counter = registry.find("aiimage.coze-task.submit.rejected.total") + Counter counter = registry.find("aiimage.task-queue.submit.rejected.total") .tag("reason", reason).counter(); return counter == null ? 0 : (long) counter.count(); } private long executionCount() { - Timer timer = registry.find("aiimage.coze-task.execution.duration").timer(); + Timer timer = registry.find("aiimage.task-queue.execution.duration").timer(); return timer == null ? 0 : timer.count(); } private long waitCount() { - Timer timer = registry.find("aiimage.coze-task.queue.wait.duration").timer(); + Timer timer = registry.find("aiimage.task-queue.queue.wait.duration").timer(); return timer == null ? 0 : timer.count(); } diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/file/service/object/FaultInjectionTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/file/service/object/FaultInjectionTest.java index d50dd86fb..376a8d346 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/file/service/object/FaultInjectionTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/file/service/object/FaultInjectionTest.java @@ -38,7 +38,7 @@ import static org.mockito.Mockito.when; /** * Task 79:为对象存储(RustFS/MinIO)、数据库(任务文件作业表)和队列 - * (Coze 执行队列)增加故障注入测试。全部通过 mock 依赖注入故障,验证 + * (任务执行队列)增加故障注入测试。全部通过 mock 依赖注入故障,验证 * 错误可恢复、重试有界、信号量/等待槽释放、非法输入不创建无效资源。 */ class FaultInjectionTest { @@ -236,7 +236,7 @@ class FaultInjectionTest { // 第一次提交被执行器拒绝:等待槽释放、拒绝指标记录 assertThrows(TaskRejectedException.class, () -> gate.execute(task)); assertEquals(0, gate.waiting(), "执行器拒绝后等待槽必须释放"); - assertTrue(registry.counter("aiimage.coze-task.submit.rejected.total", "reason", "delegate-rejected").count() > 0); + assertTrue(registry.counter("aiimage.task-queue.submit.rejected.total", "reason", "delegate-rejected").count() > 0); // 第二次提交恢复成功:等待槽正常占用并释放 gate.execute(task); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/file/service/oss/OssStorageServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/file/service/oss/OssStorageServiceTest.java index 267aeac82..dba5d0ded 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/file/service/oss/OssStorageServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/file/service/oss/OssStorageServiceTest.java @@ -78,7 +78,7 @@ class OssStorageServiceTest { List externalUrls = List.of( "https://m.media-amazon.com/nanri-ai-images/main.jpg?size=large", "https://cbu01.alicdn.com/img/ibank/main.jpg", - "https://lf9-bot-platform-tos-sign.coze.cn/file.jpg?x-expires=1&x-signature=abc", + "https://lf9-tos-sign.example-cdn.com/file.jpg?x-expires=1&x-signature=abc", "https://nanri-ai-images.evil.example/supply_images/main.jpg"); for (String url : externalUrls) { diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceCozeBufferScopeTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceLlmBufferScopeTest.java similarity index 98% rename from backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceCozeBufferScopeTest.java rename to backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceLlmBufferScopeTest.java index 846920042..93c7d6014 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceCozeBufferScopeTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceLlmBufferScopeTest.java @@ -55,7 +55,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; /** - * Task 12:扩展 Coze 结果缓冲覆盖范围,减少频繁读写完整 chunk payload。 + * Task 12:扩展 LLM 结果缓冲覆盖范围,减少频繁读写完整 chunk payload。 * P0-3 缓冲只覆盖"poll DONE 且 batchTotal>1";Task 12 扩展为: * 1) poll DONE 结果去掉 batchTotal 限制,单 batch 也走缓冲; * 2) retry 提交同步 immediate DONE 结果也走缓冲(原立即 merge); @@ -63,7 +63,7 @@ import static org.mockito.Mockito.when; * flushLlmBufferedResults 在 finalize 前一次性合并,全任务收敛为一次 chunk 读写。 */ @ExtendWith(MockitoExtension.class) -class SimilarAsinTaskServiceCozeBufferScopeTest { +class SimilarAsinTaskServiceLlmBufferScopeTest { private static final AtomicLong NEXT_ID = new AtomicLong(71000); private static final String MODULE = SimilarAsinTaskService.MODULE_TYPE; @@ -133,7 +133,7 @@ class SimilarAsinTaskServiceCozeBufferScopeTest { lenient().when(fileResultMapper.selectList(any())).thenReturn(List.of()); lenient().when(transientPayloadStorageService.storeParsedPayloadEntry( eq(MODULE), any(), anyString(), anyString(), anyString(), eq(true))) - .thenAnswer(invocation -> "rustfs:coze-result/" + NEXT_ID.incrementAndGet()); + .thenAnswer(invocation -> "rustfs:llm-result/" + NEXT_ID.incrementAndGet()); } @AfterEach diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceRowKeyDedupeTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceRowKeyDedupeTest.java index 4ec576b12..f5fa30534 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceRowKeyDedupeTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceRowKeyDedupeTest.java @@ -48,9 +48,9 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; /** - * Task 11:Coze 结果合并的重复检测从 O(n²) 改为 HashSet/稳定 row key。 + * Task 11:LLM 结果合并的重复检测从 O(n²) 改为 HashSet/稳定 row key。 * dedupeRowsByRowKey 用 HashSet 按稳定 rowKey 一次性去重(保留顺序), - * mergeCozeRowsIntoChunk 合并前先去重,消除重复行逐行重复处理。 + * mergeLlmRowsIntoChunk 合并前先去重,消除重复行逐行重复处理。 */ @ExtendWith(MockitoExtension.class) class SimilarAsinTaskServiceRowKeyDedupeTest { diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceTest.java index 431294675..65f80d4f7 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/similarasin/service/SimilarAsinTaskServiceTest.java @@ -13,6 +13,7 @@ import java.util.List; 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; class SimilarAsinTaskServiceTest { @@ -34,7 +35,7 @@ class SimilarAsinTaskServiceTest { } @Test - void resultStatusUsesReturnedCozeDataAndImages() { + void resultStatusUsesReturnedLlmDataAndImages() { assertEquals("\u5931\u8d25", SimilarAsinResultTextSupport.resolveResultStatus(null)); SimilarAsinResultRowDto empty = new SimilarAsinResultRowDto(); @@ -45,9 +46,9 @@ class SimilarAsinTaskServiceTest { withImage.setMainUrl("https://example.com/main.jpg"); assertEquals("\u6210\u529f", SimilarAsinResultTextSupport.resolveResultStatus(withImage)); - SimilarAsinResultRowDto withCozeStatus = new SimilarAsinResultRowDto(); - withCozeStatus.setStatus("success"); - assertEquals("\u6210\u529f", SimilarAsinResultTextSupport.resolveResultStatus(withCozeStatus)); + SimilarAsinResultRowDto withLlmStatus = new SimilarAsinResultRowDto(); + withLlmStatus.setStatus("success"); + assertEquals("\u6210\u529f", SimilarAsinResultTextSupport.resolveResultStatus(withLlmStatus)); SimilarAsinResultRowDto failedStatus = new SimilarAsinResultRowDto(); failedStatus.setStatus("FAILED"); @@ -79,6 +80,48 @@ class SimilarAsinTaskServiceTest { assertEquals("\u5931\u8d25", SimilarAsinResultTextSupport.resolveResultStatus(llmFailure)); } + @Test + void resultStatusMarksMissingRequiredFieldRowsAsNotDetected() { + // 缺必填字段(无图/无 ASIN/无标题)的行:Python 端根本没采到货源数据, + // 状态列必须显示"未检测",不能整格留白—— 2026-09-20 任务 28551 的 + // 790/1000 行空白就是这样来的,任务还报成功。 + SimilarAsinResultRowDto missing = new SimilarAsinResultRowDto(); + missing.setError("required field missing (asin/title/url), skip LLM"); + missing.setReason("required field missing (asin/title/url), skip LLM"); + missing.setConclusion("required field missing (asin/title/url), skip LLM"); + missing.setStatus("FAILED"); + assertEquals("未检测", + SimilarAsinResultTextSupport.resolveResultStatus(missing)); + + // 404 行优先报"ASIN未找到":它的 reason 里带的也是同一句缺字段文案, + // 不能被"未检测"抢走(判定顺序敏感) + SimilarAsinResultRowDto notFound = new SimilarAsinResultRowDto(); + notFound.setError("404 Not Found"); + notFound.setReason("required field missing (asin/title/url), skip LLM"); + notFound.setStatus("FAILED"); + assertEquals("ASIN未找到", + SimilarAsinResultTextSupport.resolveResultStatus(notFound)); + } + + @Test + void incompleteRowsMessageOnlyWhenRowsAreMissing() { + // 行数齐了必须返回 null:正常任务不能被挂上"仅完成 N/M 行" + assertNull(SimilarAsinResultTextSupport.incompleteRowsMessage(1000, 1000)); + assertNull(SimilarAsinResultTextSupport.incompleteRowsMessage(1001, 1000)); + + // 少一行也要提示(宁可多提示,不能让用户以为跑全了) + assertEquals("仅完成 999/1000 行,其余 1 行未采到数据(未检测)", + SimilarAsinResultTextSupport.incompleteRowsMessage(999, 1000)); + + // 28551 的实际比例:1000 行只跑出 210 行 + assertEquals("仅完成 210/1000 行,其余 790 行未采到数据(未检测)", + SimilarAsinResultTextSupport.incompleteRowsMessage(210, 1000)); + + // 一行没跑成同样要提示,不能静默 + assertEquals("仅完成 0/1000 行,其余 1000 行未采到数据(未检测)", + SimilarAsinResultTextSupport.incompleteRowsMessage(0, 1000)); + } + @Test void asinNotFoundDetectionMatchesPythonErrors() { assertTrue(SimilarAsinResultTextSupport.isAsinNotFound("404 Not Found")); diff --git a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskResultFileJobWorkerOffloadTest.java b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskResultFileJobWorkerOffloadTest.java index 5b09e5e3b..20b2d3b6f 100644 --- a/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskResultFileJobWorkerOffloadTest.java +++ b/backend-java/src/test/java/com/nanri/aiimage/modules/task/service/TaskResultFileJobWorkerOffloadTest.java @@ -53,7 +53,7 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; /** - * TaskResultFileJobWorker.process coze offload 判定注册表改造测试(任务 76)。 + * TaskResultFileJobWorker.process LLM offload 判定注册表改造测试(任务 76)。 * 行为等价基线:改造前对现有实现断言 GREEN;改造后(handler.supportsAsyncOffload 委托)仍 GREEN; * 其中"无 offload 模块硬编码"为静态检查,改造前 RED、改造后 GREEN。 */