task-98: 移除 similar-asin/appearance-patent 模块 Coze,状态机与共享组件改名 LLM
- similarasin/appearancepatent 模块全部 Coze 工作流调用改走 direct-LLM(已确认唯一运行路径) - 共享组件改名:CozeTaskQueueGate→TaskQueueGate、CozeGroupResultPropagator→GroupResultPropagator - 状态机改名:biz_task_scope_state 的 coze_* 列→llm_*、stateJson coze 键→llm(V100 迁移已应用生产) - 删除 biz_coze_credential 表、CozeCredential* 类、SimilarAsinCozeClient、AppearancePatentCozeClient→LlmClient - 前端 brand 页 Coze 文案→LLM;Python 后端删除 cozepy 依赖与死配置 - 修复 TaskResultFileJobWorker 启动失败:TaskFileJobConfig 注册 ResultFileJobHandlerRegistry 与 13 个 handler bean(含 validateCoverage 启动校验)
This commit is contained in:
@@ -1,5 +1,34 @@
|
||||
package com.nanri.aiimage.config;
|
||||
|
||||
import com.nanri.aiimage.modules.appearancepatent.service.AppearancePatentTaskService;
|
||||
import com.nanri.aiimage.modules.brand.service.BrandTaskService;
|
||||
import com.nanri.aiimage.modules.collectdata.service.CollectDataService;
|
||||
import com.nanri.aiimage.modules.deletebrand.service.DeleteBrandRunService;
|
||||
import com.nanri.aiimage.modules.patroldelete.service.PatrolDeleteTaskService;
|
||||
import com.nanri.aiimage.modules.pricetrack.service.PriceTrackTaskService;
|
||||
import com.nanri.aiimage.modules.productrisk.service.ProductRiskTaskService;
|
||||
import com.nanri.aiimage.modules.publish.service.PublishTaskService;
|
||||
import com.nanri.aiimage.modules.queryasin.service.QueryAsinTaskService;
|
||||
import com.nanri.aiimage.modules.shopdatacrawl.service.ShopDataCrawlTaskService;
|
||||
import com.nanri.aiimage.modules.shopmatch.service.ShopMatchTaskService;
|
||||
import com.nanri.aiimage.modules.similarasin.service.SimilarAsinTaskService;
|
||||
import com.nanri.aiimage.modules.task.service.AppearancePatentResultFileJobHandler;
|
||||
import com.nanri.aiimage.modules.task.service.BrandResultFileJobHandler;
|
||||
import com.nanri.aiimage.modules.task.service.CollectDataResultFileJobHandler;
|
||||
import com.nanri.aiimage.modules.task.service.DeleteBrandResultFileJobHandler;
|
||||
import com.nanri.aiimage.modules.task.service.PatrolDeleteResultFileJobHandler;
|
||||
import com.nanri.aiimage.modules.task.service.PriceTrackResultFileJobHandler;
|
||||
import com.nanri.aiimage.modules.task.service.ProductRiskResultFileJobHandler;
|
||||
import com.nanri.aiimage.modules.task.service.PublishResultFileJobHandler;
|
||||
import com.nanri.aiimage.modules.task.service.QueryAsinResultFileJobHandler;
|
||||
import com.nanri.aiimage.modules.task.service.ResultFileJobHandler;
|
||||
import com.nanri.aiimage.modules.task.service.ResultFileJobHandlerRegistry;
|
||||
import com.nanri.aiimage.modules.task.service.ShopDataCrawlResultFileJobHandler;
|
||||
import com.nanri.aiimage.modules.task.service.ShopMatchResultFileJobHandler;
|
||||
import com.nanri.aiimage.modules.task.service.SimilarAsinResultFileJobHandler;
|
||||
import com.nanri.aiimage.modules.task.service.TaskResultPayloadService;
|
||||
import com.nanri.aiimage.modules.task.service.WithdrawResultFileJobHandler;
|
||||
import com.nanri.aiimage.modules.withdraw.service.WithdrawTaskService;
|
||||
import io.micrometer.core.instrument.MeterRegistry;
|
||||
import org.springframework.beans.factory.ObjectProvider;
|
||||
import org.springframework.beans.factory.annotation.Value;
|
||||
@@ -9,6 +38,8 @@ import org.springframework.core.task.TaskExecutor;
|
||||
import org.springframework.scheduling.concurrent.ConcurrentTaskExecutor;
|
||||
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.Semaphore;
|
||||
@@ -16,6 +47,13 @@ import java.util.concurrent.Semaphore;
|
||||
@Configuration
|
||||
public class TaskFileJobConfig {
|
||||
|
||||
/** 结果文件 Job 支持的全部 moduleType(启动校验枚举源,见 ResultFileJobHandlerRegistry.validateCoverage) */
|
||||
public static final Set<String> RESULT_FILE_JOB_MODULE_TYPES = Set.of(
|
||||
"SHOP_MATCH", "PRICE_TRACK", "PRODUCT_RISK_RESOLVE",
|
||||
"PUBLISH", "QUERY_ASIN", "SHOP_DATA_CRAWL", "WITHDRAW",
|
||||
"PATROL_DELETE", "APPEARANCE_PATENT", "SIMILAR_ASIN",
|
||||
"DELETE_BRAND", "BRAND", "COLLECT_DATA");
|
||||
|
||||
@Bean("taskFileJobDispatchExecutor")
|
||||
public TaskExecutor taskFileJobDispatchExecutor(
|
||||
@Value("${aiimage.result-file-job.local-dispatch-pool-size:2}") int poolSize,
|
||||
@@ -33,24 +71,24 @@ public class TaskFileJobConfig {
|
||||
}
|
||||
|
||||
@Bean(destroyMethod = "shutdown")
|
||||
public ExecutorService cozeVirtualThreadExecutor() {
|
||||
public ExecutorService taskQueueVirtualThreadExecutor() {
|
||||
return Executors.newThreadPerTaskExecutor(Thread.ofVirtual()
|
||||
.name("coze-task-", 0)
|
||||
.name("task-queue-", 0)
|
||||
.factory());
|
||||
}
|
||||
|
||||
@Bean("cozeTaskExecutor")
|
||||
public TaskExecutor cozeTaskExecutor(
|
||||
ExecutorService cozeVirtualThreadExecutor,
|
||||
@Bean("taskQueueExecutor")
|
||||
public TaskExecutor taskQueueExecutor(
|
||||
ExecutorService taskQueueVirtualThreadExecutor,
|
||||
@Value("${aiimage.coze-task.max-concurrent:12}") int maxConcurrent,
|
||||
@Value("${aiimage.coze-task.max-waiting:1000}") int maxWaiting,
|
||||
ObjectProvider<MeterRegistry> meterRegistryProvider) {
|
||||
Semaphore semaphore = new Semaphore(Math.max(1, maxConcurrent));
|
||||
TaskExecutor semaphoreLimited = new ConcurrentTaskExecutor(command -> {
|
||||
if (command == null) {
|
||||
throw new IllegalArgumentException("coze 任务不能为 null");
|
||||
throw new IllegalArgumentException("task 不能为 null");
|
||||
}
|
||||
cozeVirtualThreadExecutor.execute(() -> {
|
||||
taskQueueVirtualThreadExecutor.execute(() -> {
|
||||
boolean acquired = false;
|
||||
try {
|
||||
semaphore.acquire();
|
||||
@@ -65,6 +103,87 @@ public class TaskFileJobConfig {
|
||||
}
|
||||
});
|
||||
});
|
||||
return new CozeTaskQueueGate(semaphoreLimited, maxWaiting, meterRegistryProvider);
|
||||
return new TaskQueueGate(semaphoreLimited, maxWaiting, meterRegistryProvider);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public ResultFileJobHandlerRegistry resultFileJobHandlerRegistry(List<ResultFileJobHandler> handlers) {
|
||||
ResultFileJobHandlerRegistry registry = new ResultFileJobHandlerRegistry(handlers);
|
||||
registry.validateCoverage(RESULT_FILE_JOB_MODULE_TYPES);
|
||||
return registry;
|
||||
}
|
||||
|
||||
@Bean
|
||||
public ResultFileJobHandler appearancePatentResultFileJobHandler(
|
||||
AppearancePatentTaskService appearancePatentTaskService) {
|
||||
return new AppearancePatentResultFileJobHandler(appearancePatentTaskService);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public ResultFileJobHandler brandResultFileJobHandler(
|
||||
BrandTaskService brandTaskService, TaskResultPayloadService taskResultPayloadService) {
|
||||
return new BrandResultFileJobHandler(brandTaskService, taskResultPayloadService);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public ResultFileJobHandler collectDataResultFileJobHandler(CollectDataService collectDataService) {
|
||||
return new CollectDataResultFileJobHandler(collectDataService);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public ResultFileJobHandler deleteBrandResultFileJobHandler(DeleteBrandRunService deleteBrandRunService) {
|
||||
return new DeleteBrandResultFileJobHandler(deleteBrandRunService);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public ResultFileJobHandler patrolDeleteResultFileJobHandler(
|
||||
PatrolDeleteTaskService patrolDeleteTaskService, TaskResultPayloadService taskResultPayloadService) {
|
||||
return new PatrolDeleteResultFileJobHandler(patrolDeleteTaskService, taskResultPayloadService);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public ResultFileJobHandler priceTrackResultFileJobHandler(
|
||||
PriceTrackTaskService priceTrackTaskService, TaskResultPayloadService taskResultPayloadService) {
|
||||
return new PriceTrackResultFileJobHandler(priceTrackTaskService, taskResultPayloadService);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public ResultFileJobHandler productRiskResultFileJobHandler(
|
||||
ProductRiskTaskService productRiskTaskService, TaskResultPayloadService taskResultPayloadService) {
|
||||
return new ProductRiskResultFileJobHandler(productRiskTaskService, taskResultPayloadService);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public ResultFileJobHandler publishResultFileJobHandler(PublishTaskService publishTaskService) {
|
||||
return new PublishResultFileJobHandler(publishTaskService);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public ResultFileJobHandler queryAsinResultFileJobHandler(
|
||||
QueryAsinTaskService queryAsinTaskService, TaskResultPayloadService taskResultPayloadService) {
|
||||
return new QueryAsinResultFileJobHandler(queryAsinTaskService, taskResultPayloadService);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public ResultFileJobHandler shopDataCrawlResultFileJobHandler(
|
||||
ShopDataCrawlTaskService shopDataCrawlTaskService, TaskResultPayloadService taskResultPayloadService) {
|
||||
return new ShopDataCrawlResultFileJobHandler(shopDataCrawlTaskService, taskResultPayloadService);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public ResultFileJobHandler shopMatchResultFileJobHandler(
|
||||
ShopMatchTaskService shopMatchTaskService, TaskResultPayloadService taskResultPayloadService) {
|
||||
return new ShopMatchResultFileJobHandler(shopMatchTaskService, taskResultPayloadService);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public ResultFileJobHandler similarAsinResultFileJobHandler(SimilarAsinTaskService similarAsinTaskService) {
|
||||
return new SimilarAsinResultFileJobHandler(similarAsinTaskService);
|
||||
}
|
||||
|
||||
@Bean
|
||||
public ResultFileJobHandler withdrawResultFileJobHandler(
|
||||
WithdrawTaskService withdrawTaskService, TaskResultPayloadService taskResultPayloadService) {
|
||||
return new WithdrawResultFileJobHandler(withdrawTaskService, taskResultPayloadService);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user