diff --git a/qiming-backend/app-platform-modules/app-platform-file/app-platform-file-application/src/main/java/com/xspaceagi/file/application/service/impl/FileAccessServiceImpl.java b/qiming-backend/app-platform-modules/app-platform-file/app-platform-file-application/src/main/java/com/xspaceagi/file/application/service/impl/FileAccessServiceImpl.java index d36da2dd..e5053f82 100644 --- a/qiming-backend/app-platform-modules/app-platform-file/app-platform-file-application/src/main/java/com/xspaceagi/file/application/service/impl/FileAccessServiceImpl.java +++ b/qiming-backend/app-platform-modules/app-platform-file/app-platform-file-application/src/main/java/com/xspaceagi/file/application/service/impl/FileAccessServiceImpl.java @@ -12,8 +12,11 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; +import java.io.IOException; +import java.io.InputStream; import java.net.MalformedURLException; import java.net.URL; +import java.net.URLConnection; import java.util.Objects; import java.util.UUID; @@ -150,6 +153,26 @@ public class FileAccessServiceImpl implements IFileAccessService { } } + @Override + public InputStream openFileStream(String fileUrl) throws IOException { + String fileKey = extractFileKeyFromUrl(fileUrl); + if (StringUtils.isNotBlank(fileKey)) { + FileRecordDomain fileRecord = fileManagementService.getFileByKey(fileKey); + if (fileRecord != null) { + try { + return fileManagementService.downloadFile(fileKey); + } catch (RuntimeException e) { + throw new IOException("Failed to open stored file: " + fileKey, e); + } + } + } + + URLConnection connection = new URL(fileUrl).openConnection(); + connection.setConnectTimeout(5000); + connection.setReadTimeout(30000); + return connection.getInputStream(); + } + private static String getUrlPath(String fileUrl) throws MalformedURLException { URL url; url = new URL(fileUrl); @@ -172,4 +195,20 @@ public class FileAccessServiceImpl implements IFileAccessService { return null; } + + private String extractFileKeyFromUrl(String fileUrl) { + if (StringUtils.isBlank(fileUrl)) { + return null; + } + int apiIndex = fileUrl.indexOf("/api/f/"); + if (apiIndex < 0) { + return null; + } + String fileKey = fileUrl.substring(apiIndex + "/api/f/".length()); + int queryIndex = fileKey.indexOf('?'); + if (queryIndex >= 0) { + fileKey = fileKey.substring(0, queryIndex); + } + return StringUtils.isBlank(fileKey) ? null : fileKey; + } } diff --git a/qiming-backend/app-platform-modules/app-platform-file/app-platform-file-sdk/src/main/java/com/xspaceagi/file/sdk/IFileAccessService.java b/qiming-backend/app-platform-modules/app-platform-file/app-platform-file-sdk/src/main/java/com/xspaceagi/file/sdk/IFileAccessService.java index e3ba92b3..a2c878f5 100644 --- a/qiming-backend/app-platform-modules/app-platform-file/app-platform-file-sdk/src/main/java/com/xspaceagi/file/sdk/IFileAccessService.java +++ b/qiming-backend/app-platform-modules/app-platform-file/app-platform-file-sdk/src/main/java/com/xspaceagi/file/sdk/IFileAccessService.java @@ -1,5 +1,8 @@ package com.xspaceagi.file.sdk; +import java.io.IOException; +import java.io.InputStream; + public interface IFileAccessService { String getFileUrlWithAk(String fileUrl); @@ -9,4 +12,6 @@ public interface IFileAccessService { void checkFileUrlAk(String uri, String ak); void checkFileUrlAk0(String uri, String ak); + + InputStream openFileStream(String fileUrl) throws IOException; } diff --git a/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-application/src/main/java/com/xspaceagi/knowledge/core/application/service/impl/KnowledgeDocumentApplicationService.java b/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-application/src/main/java/com/xspaceagi/knowledge/core/application/service/impl/KnowledgeDocumentApplicationService.java index 88a95730..307fbaa2 100644 --- a/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-application/src/main/java/com/xspaceagi/knowledge/core/application/service/impl/KnowledgeDocumentApplicationService.java +++ b/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-application/src/main/java/com/xspaceagi/knowledge/core/application/service/impl/KnowledgeDocumentApplicationService.java @@ -267,16 +267,12 @@ public class KnowledgeDocumentApplicationService implements IKnowledgeDocumentAp var kbId = existObj.getKbId(); this.vectorDBService.removeDoc(kbId, docId); - // 同步删除全文检索数据（在事务内） - // 注意：重试时需要删除全文检索数据，但这里是在 Application 层，不要直接调用 Domain 层服务 - // 建议：这个方法应该移到 Domain 层，或者使用 Application 层的 fullTextSyncService + // 全文检索是外部索引，删除失败不应阻断文档重试。 try { fullTextSyncService.deleteDocumentFromQuickwit(docId, kbId, userContext); log.info("文档重试时删除全文检索数据成功: docId={}, kbId={}", docId, kbId); } catch (Exception e) { - log.error("文档重试时删除全文检索数据失败: docId={}, kbId={}", docId, kbId, e); - // 抛出异常，触发事务回滚 - throw KnowledgeException.build(BizExceptionCodeEnum.knowledgeDeleteDocFulltextFailed, e); + log.warn("文档重试时删除全文检索数据失败，已忽略: docId={}, kbId={}", docId, kbId, e); } // 删除重试任务 diff --git a/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/JSONParser.java b/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/JSONParser.java index 84f8f550..4ce077d8 100644 --- a/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/JSONParser.java +++ b/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/JSONParser.java @@ -3,6 +3,7 @@ package com.xspaceagi.knowledge.domain.docparser.impl; import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONObject; +import com.xspaceagi.file.sdk.IFileAccessService; import com.xspaceagi.knowledge.core.spec.utils.Constants; import com.xspaceagi.knowledge.domain.docparser.parse.DocParser; import com.xspaceagi.knowledge.domain.model.KnowledgeDocumentModel; @@ -16,7 +17,6 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import java.io.InputStream; -import java.net.URL; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; @@ -28,9 +28,12 @@ public class JSONParser implements DocParser { @Resource private IKnowledgeRawSegmentRepository knowledgeRawSegmentRepository; + @Resource + private IFileAccessService fileAccessService; + @Override public void chunk(KnowledgeDocumentModel documentDto, UserContext userContext) { - try (InputStream inputStream = new URL(documentDto.getDocUrl()).openStream()) { + try (InputStream inputStream = fileAccessService.openFileStream(documentDto.getDocUrl())) { String jsonContent = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8); Object parsed = JSON.parse(jsonContent); diff --git a/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/PDFParser.java b/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/PDFParser.java index 0532a5a0..e61128ef 100644 --- a/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/PDFParser.java +++ b/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/PDFParser.java @@ -1,5 +1,6 @@ package com.xspaceagi.knowledge.domain.docparser.impl; +import com.xspaceagi.file.sdk.IFileAccessService; import com.xspaceagi.knowledge.domain.docparser.FileParseRequest; import com.xspaceagi.knowledge.domain.docparser.FileParseService; import com.xspaceagi.knowledge.domain.docparser.parse.DocParser; @@ -15,8 +16,6 @@ import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.text.PDFTextStripper; import org.springframework.stereotype.Service; -import java.net.URI; - @Slf4j @Service public class PDFParser implements DocParser { @@ -25,12 +24,14 @@ public class PDFParser implements DocParser { @Resource private FileParseService fileParseService; + @Resource + private IFileAccessService fileAccessService; + @Override public void chunk(KnowledgeDocumentModel documentDto, UserContext userContext) { try (PDDocument doc = Loader.loadPDF(RandomAccessReadBuffer.createBufferFromStream( - new URI(documentDto.getDocUrl()) - .toURL().openStream()))) { + fileAccessService.openFileStream(documentDto.getDocUrl())))) { PDFTextStripper stripper = new PDFTextStripper(); String content = stripper.getText(doc); diff --git a/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/TXTParser.java b/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/TXTParser.java index 75fa36e4..3215b901 100644 --- a/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/TXTParser.java +++ b/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/TXTParser.java @@ -1,5 +1,6 @@ package com.xspaceagi.knowledge.domain.docparser.impl; +import com.xspaceagi.file.sdk.IFileAccessService; import com.xspaceagi.knowledge.core.spec.enums.KnowledgeDataTypeEnum; import com.xspaceagi.knowledge.domain.docparser.FileParseRequest; import com.xspaceagi.knowledge.domain.docparser.FileParseService; @@ -14,7 +15,6 @@ import org.springframework.stereotype.Service; import java.io.BufferedReader; import java.io.InputStreamReader; -import java.net.URL; import java.util.Objects; @Slf4j @@ -24,6 +24,9 @@ public class TXTParser implements DocParser { @Resource private FileParseService fileParseService; + @Resource + private IFileAccessService fileAccessService; + @Override public void chunk(KnowledgeDocumentModel documentDto, UserContext userContext) { @@ -38,7 +41,7 @@ public class TXTParser implements DocParser { case URL_FILE -> { StringBuilder content = new StringBuilder(); try (BufferedReader reader = - new BufferedReader(new InputStreamReader(new URL(documentDto.getDocUrl()).openStream()))) { + new BufferedReader(new InputStreamReader(fileAccessService.openFileStream(documentDto.getDocUrl())))) { content.append(reader.lines() .toList()); diff --git a/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/TikaParser.java b/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/TikaParser.java index 02eb7c92..3a0220b9 100644 --- a/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/TikaParser.java +++ b/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/TikaParser.java @@ -8,6 +8,7 @@ import com.xspaceagi.agent.core.infra.component.agent.AgentContext; import com.xspaceagi.agent.core.infra.component.workflow.WorkflowContext; import com.xspaceagi.agent.core.infra.component.workflow.WorkflowExecutor; import com.xspaceagi.agent.core.spec.enums.DataTypeEnum; +import com.xspaceagi.file.sdk.IFileAccessService; import com.xspaceagi.knowledge.core.spec.enums.KnowledgeDataTypeEnum; import com.xspaceagi.knowledge.domain.docparser.FileParseRequest; import com.xspaceagi.knowledge.domain.docparser.FileParseService; @@ -62,6 +63,9 @@ public class TikaParser implements DocParser { @Resource private WorkflowExecutor workflowExecutor; + @Resource + private IFileAccessService fileAccessService; + @Override public void chunk( KnowledgeDocumentModel documentDto, @@ -103,10 +107,7 @@ public class TikaParser implements DocParser { return; } - // 下载文件 - URL url = new URL(docUrl); - URLConnection connection = url.openConnection(); - try (InputStream stream = connection.getInputStream()) { + try (InputStream stream = fileAccessService.openFileStream(docUrl)) { // 使用 Apache Tika 解析文件内容 Parser parser = new AutoDetectParser(); BodyContentHandler handler = new BodyContentHandler(-1); diff --git a/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/WordParser.java b/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/WordParser.java index 33b75562..2ce51c05 100644 --- a/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/WordParser.java +++ b/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/docparser/impl/WordParser.java @@ -1,11 +1,10 @@ package com.xspaceagi.knowledge.domain.docparser.impl; -import java.net.URL; - import org.apache.poi.xwpf.extractor.XWPFWordExtractor; import org.apache.poi.xwpf.usermodel.XWPFDocument; import org.springframework.stereotype.Service; +import com.xspaceagi.file.sdk.IFileAccessService; import com.xspaceagi.knowledge.domain.docparser.FileParseRequest; import com.xspaceagi.knowledge.domain.docparser.FileParseService; import com.xspaceagi.knowledge.domain.docparser.parse.DocParser; @@ -24,10 +23,13 @@ public class WordParser implements DocParser { @Resource private FileParseService fileParseService; + @Resource + private IFileAccessService fileAccessService; + @Override public void chunk(KnowledgeDocumentModel documentDto, UserContext userContext) { - try (XWPFDocument document = new XWPFDocument(new URL(documentDto.getDocUrl()).openStream()); + try (XWPFDocument document = new XWPFDocument(fileAccessService.openFileStream(documentDto.getDocUrl())); XWPFWordExtractor extractor = new XWPFWordExtractor(document)) { String content = extractor.getText(); FileParseRequest fileParseRequest = FileParseRequest.builder() diff --git a/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/service/impl/KnowledgeDocumentDomainService.java b/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/service/impl/KnowledgeDocumentDomainService.java index f82a4fc3..1eaebdf7 100644 --- a/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/service/impl/KnowledgeDocumentDomainService.java +++ b/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-domain/src/main/java/com/xspaceagi/knowledge/domain/service/impl/KnowledgeDocumentDomainService.java @@ -8,6 +8,7 @@ import com.xspaceagi.file.sdk.IFileAccessService; import com.xspaceagi.knowledge.core.adapter.client.dto.PushResult; import com.xspaceagi.knowledge.core.spec.enums.FulltextSyncStatusEnum; import com.xspaceagi.knowledge.core.spec.enums.KnowledgeTaskRunTypeEnum; +import com.xspaceagi.knowledge.core.spec.enums.KnowledgeTaskStageStatusEnum; import com.xspaceagi.knowledge.core.spec.enums.QaStatusEnum; import com.xspaceagi.knowledge.core.spec.enums.RawTextFulltextSyncStatusEnum; import com.xspaceagi.knowledge.core.spec.utils.Constants; @@ -129,14 +130,12 @@ public class KnowledgeDocumentDomainService implements IKnowledgeDocumentDomainS var kbId = existObj.getKbId(); this.vectorDBService.removeDoc(kbId, id); - // 删除全文检索数据（在事务内，保证一致性） + // 全文检索是外部索引，删除失败不应阻断业务数据删除。 try { fullTextSearchDomainService.deleteByDocId(id, kbId, userContext.getTenantId()); log.info("Delete doc full-text OK: docId={}, kbId={}", id, kbId); } catch (Exception e) { - log.error("Delete doc full-text failed: docId={}, kbId={}", id, kbId, e); - // 抛出异常，触发事务回滚 - throw KnowledgeException.build(BizExceptionCodeEnum.knowledgeDeleteDocFulltextFailed, e); + log.warn("Delete doc full-text failed, ignored: docId={}, kbId={}", id, kbId, e); } // 更新知识库最后操作时间 @@ -277,21 +276,26 @@ public class KnowledgeDocumentDomainService implements IKnowledgeDocumentDomainS public void workRunTaskForDocument(KnowledgeDocumentModel model, UserContext userContext, Long docId) { log.debug("Vector task submit start, docId={}", docId); - // 1. 执行文档分段 - this.self.workRunTaskForRawSegment(model, userContext, docId); - log.info("Segment task done: kbId={}, docId={}", model.getKbId(), docId); + try { + // 1. 执行文档分段 + this.self.workRunTaskForRawSegment(model, userContext, docId); + log.info("Segment task done: kbId={}, docId={}", model.getKbId(), docId); - // 2. 同步执行全文检索同步 - this.self.workRunTaskForFullTextSync(model, userContext, docId); - log.info("FTS sync done, async QA+embedding: kbId={}, docId={}", model.getKbId(), docId); + // 2. 同步执行全文检索同步 + this.self.workRunTaskForFullTextSync(model, userContext, docId); + log.info("FTS sync done, async QA+embedding: kbId={}, docId={}", model.getKbId(), docId); - // 3. 异步执行 QA 和 Embedding - TenantRunnable tenantRunnable = new TenantRunnable(() -> { - // 开始生成QA,生成每个问答后,会开始向量化 - this.self.workRunTaskForQaAndEmbedding(model, userContext, docId); - }); + // 3. 异步执行 QA 和 Embedding + TenantRunnable tenantRunnable = new TenantRunnable(() -> { + // 开始生成QA,生成每个问答后,会开始向量化 + this.self.workRunTaskForQaAndEmbedding(model, userContext, docId); + }); - threadTenantUtil.obtainCommonExecutor().execute(tenantRunnable); + threadTenantUtil.obtainCommonExecutor().execute(tenantRunnable); + } catch (Exception e) { + markTaskWaitRetry(model, userContext, docId, e); + throw e; + } } @@ -330,39 +334,77 @@ public class KnowledgeDocumentDomainService implements IKnowledgeDocumentDomainS public void workRetryRunTaskForDocument(KnowledgeTaskRunTypeEnum runTypeEnum, KnowledgeDocumentModel model, UserContext userContext, Long docId) { - switch (runTypeEnum) { - case SEGMENT -> { - // 文档分段,全文检索,问答,向量化,全部走重试 - this.self.workRunTaskForRawSegment(model, userContext, docId); - this.self.workRunTaskForFullTextSync(model, userContext, docId); - this.self.workRunTaskForQaAndEmbedding(model, userContext, docId); - } - case FULLTEXT_SYNC -> { - // 全文检索同步阶段失败，重新执行同步，并继续后续流程 - this.self.workRunTaskForFullTextSync(model, userContext, docId); - this.self.workRunTaskForQaAndEmbedding(model, userContext, docId); - } - case QA -> { - // 开始生成QA,生成每个问答后,会开始向量化 - this.self.workRunTaskForQaAndEmbedding(model, userContext, docId); + try { + switch (runTypeEnum) { + case SEGMENT -> { + // 文档分段,全文检索,问答,向量化,全部走重试 + this.self.workRunTaskForRawSegment(model, userContext, docId); + this.self.workRunTaskForFullTextSync(model, userContext, docId); + this.self.workRunTaskForQaAndEmbedding(model, userContext, docId); + } + case FULLTEXT_SYNC -> { + // 全文检索同步阶段失败，重新执行同步，并继续后续流程 + this.self.workRunTaskForFullTextSync(model, userContext, docId); + this.self.workRunTaskForQaAndEmbedding(model, userContext, docId); + } + case QA -> { + // 开始生成QA,生成每个问答后,会开始向量化 + this.self.workRunTaskForQaAndEmbedding(model, userContext, docId); - } - case EMBEDDING -> { - // 开始生成QA的向量化 - this.self.generateEmbeddings(docId, userContext); - log.info("Vector task submit OK, docId={}", docId); + } + case EMBEDDING -> { + // 开始生成QA的向量化 + this.self.generateEmbeddings(docId, userContext); + log.info("Vector task submit OK, docId={}", docId); - // 判断任务是否完毕,还是有向量化的问答 - this.self.updateDocumentEmbeddingStatus(docId, userContext); + // 判断任务是否完毕,还是有向量化的问答 + this.self.updateDocumentEmbeddingStatus(docId, userContext); + } + default -> { + log.info("No retry needed, docId={}", docId); + } } - default -> { - log.info("No retry needed, docId={}", docId); - } + } catch (Exception e) { + markTaskWaitRetry(model, userContext, docId, e); + throw e; } } + private void markTaskWaitRetry(KnowledgeDocumentModel model, UserContext userContext, Long docId, Exception e) { + try { + KnowledgeTaskModel task = this.knowledgeTaskRepository.queryOneByDocId(docId); + if (Objects.isNull(task)) { + task = KnowledgeTaskModel.createEmptyTaskModel(docId, KnowledgeTaskRunTypeEnum.SEGMENT, userContext); + task.setKbId(model.getKbId()); + task.setSpaceId(model.getSpaceId()); + } + task.setStatus(KnowledgeTaskStageStatusEnum.WAIT_RETRY.getStatus()); + task.setResult(buildTaskFailureMessage(e)); + + if (Objects.isNull(task.getId())) { + this.knowledgeTaskRepository.addInfo(task, userContext); + } else { + this.knowledgeTaskRepository.updateInfo(task, userContext); + } + } catch (Exception markException) { + log.error("Failed to mark knowledge task as wait retry, docId={}", docId, markException); + } + } + + private String buildTaskFailureMessage(Throwable throwable) { + Throwable root = throwable; + while (root.getCause() != null) { + root = root.getCause(); + } + String message = root.getMessage(); + if (StringUtils.isBlank(message)) { + message = root.getClass().getSimpleName(); + } + return StringUtils.abbreviate(message, 500); + } + @Override public void generateForQa(Long docId, UserContext userContext) { var docModel = this.knowledgeDocumentRepository.queryOneInfoById(docId); diff --git a/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-infra/src/main/java/com/xspaceagi/knowledge/core/infra/respository/KnowledgeDocumentRepository.java b/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-infra/src/main/java/com/xspaceagi/knowledge/core/infra/respository/KnowledgeDocumentRepository.java index 4364b18f..6bf6296f 100644 --- a/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-infra/src/main/java/com/xspaceagi/knowledge/core/infra/respository/KnowledgeDocumentRepository.java +++ b/qiming-backend/app-platform-modules/app-platform-knowledge/app-platform-knowledge-core-infra/src/main/java/com/xspaceagi/knowledge/core/infra/respository/KnowledgeDocumentRepository.java @@ -24,6 +24,7 @@ import com.xspaceagi.knowledge.core.infra.translator.IKnowledgeDocumentTranslato import com.xspaceagi.knowledge.sdk.enums.KnowledgeDocStatueEnum; import com.xspaceagi.knowledge.sdk.enums.KnowledgePubStatusEnum; import com.xspaceagi.knowledge.core.spec.enums.KnowledgeTaskRunTypeEnum; +import com.xspaceagi.knowledge.core.spec.enums.KnowledgeTaskStageStatusEnum; import com.xspaceagi.knowledge.core.spec.enums.QaStatusEnum; import com.xspaceagi.knowledge.core.spec.utils.CaffeineCacheUtil; import com.xspaceagi.knowledge.core.spec.utils.ThreadTenantUtil; @@ -36,6 +37,7 @@ import com.xspaceagi.system.spec.tenant.thread.TenantRunnable; import jakarta.annotation.Resource; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; @Slf4j @Repository @@ -201,6 +203,17 @@ public class KnowledgeDocumentRepository implements IKnowledgeDocumentRepository log.warn("Document {} analysis failed due to max retry count reached", document.getId()); return true; } + KnowledgeTaskStageStatusEnum taskStatus = Objects.nonNull(retryTask.getStatus()) + ? KnowledgeTaskStageStatusEnum.getByStatus(retryTask.getStatus()) + : null; + if (KnowledgeTaskStageStatusEnum.WAIT_RETRY == taskStatus + || KnowledgeTaskStageStatusEnum.RETRY_FAIL == taskStatus + || KnowledgeTaskStageStatusEnum.FORBID_RETRY == taskStatus) { + document.setDocStatus(KnowledgeDocStatueEnum.ANALYZE_FAILED); + document.setDocStatusReason(buildTaskFailureReason(retryTask, taskStatus)); + log.warn("Document {} analysis failed, taskStatus={}", document.getId(), taskStatus); + return true; + } //如果重试状态是成功,则认为是成功了 if (Objects.nonNull(retryTask.getType()) && KnowledgeTaskRunTypeEnum.SUCCESS.getType() == retryTask.getType()) { document.setDocStatus(KnowledgeDocStatueEnum.ANALYZED); @@ -246,6 +259,14 @@ public class KnowledgeDocumentRepository implements IKnowledgeDocumentRepository return false; } + private String buildTaskFailureReason(KnowledgeTask retryTask, KnowledgeTaskStageStatusEnum taskStatus) { + String result = retryTask.getResult(); + if (StringUtils.isBlank(result)) { + return taskStatus.getDesc(); + } + return taskStatus.getDesc() + "：" + result; + } + /** * 检查向量化状态 */