Hass/xiaozhi-esp32-server
1
0
Fork 0
mirror of https://github.com/xinnan-tech/xiaozhi-esp32-server.git synced 2026-07-26 00:53:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

update：格式调整

Browse Source
This commit is contained in:
rainv123
2025-11-05 09:13:44 +08:00
parent 0008ca6335
commit a82cf6e300
18 changed files with 733 additions and 1003 deletions
Download Patch File Download Diff File Expand all files Collapse all files
main/manager-api/src/main/java/xiaozhi/modules/config/service/impl/ConfigServiceImpl.java
+3 -2
View File
@@ -378,8 +378,9 @@ public class ConfigServiceImpl implements ConfigService {
boolean isCache) { boolean isCache) {
Map<String, String> selectedModule = new HashMap<>(); Map<String, String> selectedModule = new HashMap<>();
String[] modelTypes = { "VAD", "ASR", "TTS", "Memory", "Intent", "LLM", "VLLM","RAG" }; String[] modelTypes = { "VAD", "ASR", "TTS", "Memory", "Intent", "LLM", "VLLM", "RAG" };
String[] modelIds = { vadModelId, asrModelId, ttsModelId, memModelId, intentModelId, llmModelId, vllmModelId, ragModelId }; String[] modelIds = { vadModelId, asrModelId, ttsModelId, memModelId, intentModelId, llmModelId, vllmModelId,
ragModelId };
String intentLLMModelId = null; String intentLLMModelId = null;
String memLocalShortLLMModelId = null; String memLocalShortLLMModelId = null;
main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeBaseController.java
+3 -3
View File
@@ -25,7 +25,6 @@ import xiaozhi.modules.knowledge.dto.KnowledgeBaseDTO;
import xiaozhi.modules.knowledge.service.KnowledgeBaseService; import xiaozhi.modules.knowledge.service.KnowledgeBaseService;
import java.util.Map; import java.util.Map;
@AllArgsConstructor @AllArgsConstructor
@RestController @RestController
@RequestMapping("/api/v1") @RequestMapping("/api/v1")
@@ -47,7 +46,8 @@ public class KnowledgeBaseController {
KnowledgeBaseDTO knowledgeBaseDTO = new KnowledgeBaseDTO(); KnowledgeBaseDTO knowledgeBaseDTO = new KnowledgeBaseDTO();
knowledgeBaseDTO.setName(name); knowledgeBaseDTO.setName(name);
knowledgeBaseDTO.setDatasetId(id); knowledgeBaseDTO.setDatasetId(id);
PageData<KnowledgeBaseDTO> pageData = knowledgeBaseService.getPageList(knowledgeBaseDTO, String.valueOf(page), String.valueOf(page_size)); PageData<KnowledgeBaseDTO> pageData = knowledgeBaseService.getPageList(knowledgeBaseDTO, String.valueOf(page),
String.valueOf(page_size));
return new Result<PageData<KnowledgeBaseDTO>>().ok(pageData); return new Result<PageData<KnowledgeBaseDTO>>().ok(pageData);
} }
@@ -71,7 +71,7 @@ public class KnowledgeBaseController {
@Operation(summary = "更新知识库") @Operation(summary = "更新知识库")
@RequiresPermissions("sys:role:normal") @RequiresPermissions("sys:role:normal")
public Result<KnowledgeBaseDTO> update(@PathVariable("dataset_id") String datasetId, public Result<KnowledgeBaseDTO> update(@PathVariable("dataset_id") String datasetId,
@RequestBody @Validated KnowledgeBaseDTO knowledgeBaseDTO) { @RequestBody @Validated KnowledgeBaseDTO knowledgeBaseDTO) {
knowledgeBaseDTO.setDatasetId(datasetId); knowledgeBaseDTO.setDatasetId(datasetId);
KnowledgeBaseDTO resp = knowledgeBaseService.update(knowledgeBaseDTO); KnowledgeBaseDTO resp = knowledgeBaseService.update(knowledgeBaseDTO);
return new Result<KnowledgeBaseDTO>().ok(resp); return new Result<KnowledgeBaseDTO>().ok(resp);
main/manager-api/src/main/java/xiaozhi/modules/knowledge/controller/KnowledgeFilesController.java
+22 -20
View File
@@ -55,9 +55,9 @@ public class KnowledgeFilesController {
@RequestParam(required = false) String parserConfig) { @RequestParam(required = false) String parserConfig) {
KnowledgeFilesDTO resp = knowledgeFilesService.uploadDocument(datasetId, file, name, KnowledgeFilesDTO resp = knowledgeFilesService.uploadDocument(datasetId, file, name,
metaFields != null ? parseJsonMap(metaFields) : null, metaFields != null ? parseJsonMap(metaFields) : null,
chunkMethod, chunkMethod,
parserConfig != null ? parseJsonMap(parserConfig) : null); parserConfig != null ? parseJsonMap(parserConfig) : null);
return new Result<KnowledgeFilesDTO>().ok(resp); return new Result<KnowledgeFilesDTO>().ok(resp);
} }
@@ -66,7 +66,7 @@ public class KnowledgeFilesController {
@Parameter(name = "document_id", description = "文档ID", required = true) @Parameter(name = "document_id", description = "文档ID", required = true)
@RequiresPermissions("sys:role:normal") @RequiresPermissions("sys:role:normal")
public Result<Void> delete(@PathVariable("dataset_id") String datasetId, public Result<Void> delete(@PathVariable("dataset_id") String datasetId,
@PathVariable("document_id") String documentId) { @PathVariable("document_id") String documentId) {
knowledgeFilesService.deleteByDocumentId(documentId, datasetId); knowledgeFilesService.deleteByDocumentId(documentId, datasetId);
return new Result<>(); return new Result<>();
} }
@@ -75,7 +75,7 @@ public class KnowledgeFilesController {
@Operation(summary = "批量解析文档（切块）") @Operation(summary = "批量解析文档（切块）")
@RequiresPermissions("sys:role:normal") @RequiresPermissions("sys:role:normal")
public Result<Void> parseDocuments(@PathVariable("dataset_id") String datasetId, public Result<Void> parseDocuments(@PathVariable("dataset_id") String datasetId,
@RequestBody Map<String, List<String>> requestBody) { @RequestBody Map<String, List<String>> requestBody) {
List<String> documentIds = requestBody.get("document_ids"); List<String> documentIds = requestBody.get("document_ids");
if (documentIds == null || documentIds.isEmpty()) { if (documentIds == null || documentIds.isEmpty()) {
return new Result<Void>().error("document_ids参数不能为空"); return new Result<Void>().error("document_ids参数不能为空");
@@ -93,7 +93,7 @@ public class KnowledgeFilesController {
@Operation(summary = "解析单个文档（切块）") @Operation(summary = "解析单个文档（切块）")
@RequiresPermissions("sys:role:normal") @RequiresPermissions("sys:role:normal")
public Result<Void> parseDocument(@PathVariable("dataset_id") String datasetId, public Result<Void> parseDocument(@PathVariable("dataset_id") String datasetId,
@PathVariable("document_id") String documentId) { @PathVariable("document_id") String documentId) {
List<String> documentIds = java.util.Arrays.asList(documentId); List<String> documentIds = java.util.Arrays.asList(documentId);
boolean success = knowledgeFilesService.parseDocuments(datasetId, documentIds); boolean success = knowledgeFilesService.parseDocuments(datasetId, documentIds);
@@ -108,13 +108,14 @@ public class KnowledgeFilesController {
@Operation(summary = "添加切片到指定文档") @Operation(summary = "添加切片到指定文档")
@RequiresPermissions("sys:role:normal") @RequiresPermissions("sys:role:normal")
public Result<Map<String, Object>> addChunk(@PathVariable("dataset_id") String datasetId, public Result<Map<String, Object>> addChunk(@PathVariable("dataset_id") String datasetId,
@PathVariable("document_id") String documentId, @PathVariable("document_id") String documentId,
@RequestBody Map<String, Object> requestBody) { @RequestBody Map<String, Object> requestBody) {
String content = (String) requestBody.get("content"); String content = (String) requestBody.get("content");
List<String> importantKeywords = (List<String>) requestBody.get("important_keywords"); List<String> importantKeywords = (List<String>) requestBody.get("important_keywords");
List<String> questions = (List<String>) requestBody.get("questions"); List<String> questions = (List<String>) requestBody.get("questions");
Map<String, Object> result = knowledgeFilesService.addChunk(datasetId, documentId, content, importantKeywords, questions); Map<String, Object> result = knowledgeFilesService.addChunk(datasetId, documentId, content, importantKeywords,
questions);
return new Result<Map<String, Object>>().ok(result); return new Result<Map<String, Object>>().ok(result);
} }
@@ -122,12 +123,13 @@ public class KnowledgeFilesController {
@Operation(summary = "列出指定文档的切片") @Operation(summary = "列出指定文档的切片")
@RequiresPermissions("sys:role:normal") @RequiresPermissions("sys:role:normal")
public Result<Map<String, Object>> listChunks(@PathVariable("dataset_id") String datasetId, public Result<Map<String, Object>> listChunks(@PathVariable("dataset_id") String datasetId,
@PathVariable("document_id") String documentId, @PathVariable("document_id") String documentId,
@RequestParam(required = false) String keywords, @RequestParam(required = false) String keywords,
@RequestParam(required = false, defaultValue = "1") Integer page, @RequestParam(required = false, defaultValue = "1") Integer page,
@RequestParam(required = false, defaultValue = "1024") Integer page_size, @RequestParam(required = false, defaultValue = "1024") Integer page_size,
@RequestParam(required = false) String id) { @RequestParam(required = false) String id) {
Map<String, Object> result = knowledgeFilesService.listChunks(datasetId, documentId, keywords, page, page_size, id); Map<String, Object> result = knowledgeFilesService.listChunks(datasetId, documentId, keywords, page, page_size,
id);
return new Result<Map<String, Object>>().ok(result); return new Result<Map<String, Object>>().ok(result);
} }
@@ -138,7 +140,7 @@ public class KnowledgeFilesController {
@Operation(summary = "召回测试") @Operation(summary = "召回测试")
@RequiresPermissions("sys:role:normal") @RequiresPermissions("sys:role:normal")
public Result<Map<String, Object>> retrievalTest(@PathVariable("dataset_id") String datasetId, public Result<Map<String, Object>> retrievalTest(@PathVariable("dataset_id") String datasetId,
@RequestBody Map<String, Object> params) { @RequestBody Map<String, Object> params) {
try { try {
// 提取参数 // 提取参数
String question = (String) params.get("question"); String question = (String) params.get("question");
@@ -165,9 +167,8 @@ public class KnowledgeFilesController {
} }
Map<String, Object> result = knowledgeFilesService.retrievalTest( Map<String, Object> result = knowledgeFilesService.retrievalTest(
question, datasetIds, documentIds, page, pageSize, similarityThreshold, question, datasetIds, documentIds, page, pageSize, similarityThreshold,
vectorSimilarityWeight, topK, rerankId, keyword, highlight, crossLanguages, metadataCondition vectorSimilarityWeight, topK, rerankId, keyword, highlight, crossLanguages, metadataCondition);
);
return new Result<Map<String, Object>>().ok(result); return new Result<Map<String, Object>>().ok(result);
} catch (Exception e) { } catch (Exception e) {
@@ -181,7 +182,8 @@ public class KnowledgeFilesController {
private Map<String, Object> parseJsonMap(String jsonString) { private Map<String, Object> parseJsonMap(String jsonString) {
try { try {
ObjectMapper objectMapper = new ObjectMapper(); ObjectMapper objectMapper = new ObjectMapper();
return objectMapper.readValue(jsonString, new TypeReference<Map<String, Object>>() {}); return objectMapper.readValue(jsonString, new TypeReference<Map<String, Object>>() {
});
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException("解析JSON字符串失败: " + jsonString, e); throw new RuntimeException("解析JSON字符串失败: " + jsonString, e);
} }
main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/KnowledgeBaseService.java
+2 -2
View File
@@ -16,8 +16,8 @@ public interface KnowledgeBaseService extends BaseService<KnowledgeBaseEntity> {
* 分页查询知识库列表 * 分页查询知识库列表
* *
* @param knowledgeBaseDTO 查询条件 * @param knowledgeBaseDTO 查询条件
* @param page 页码 * @param page 页码
* @param limit 每页数量 * @param limit 每页数量
* @return 分页数据 * @return 分页数据
*/ */
PageData<KnowledgeBaseDTO> getPageList(KnowledgeBaseDTO knowledgeBaseDTO, String page, String limit); PageData<KnowledgeBaseDTO> getPageList(KnowledgeBaseDTO knowledgeBaseDTO, String page, String limit);
main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/KnowledgeFilesService.java
+107 -108
View File
@@ -13,121 +13,120 @@ import xiaozhi.modules.knowledge.dto.KnowledgeFilesDTO;
*/ */
public interface KnowledgeFilesService { public interface KnowledgeFilesService {
/** /**
* 分页查询文档列表 * 分页查询文档列表
* *
* @param knowledgeFilesDTO 查询条件 * @param knowledgeFilesDTO 查询条件
* @param page 页码 * @param page 页码
* @param limit 每页数量 * @param limit 每页数量
* @return 分页数据 * @return 分页数据
*/ */
PageData<KnowledgeFilesDTO> getPageList(KnowledgeFilesDTO knowledgeFilesDTO, Integer page, Integer limit); PageData<KnowledgeFilesDTO> getPageList(KnowledgeFilesDTO knowledgeFilesDTO, Integer page, Integer limit);
/** /**
* 根据文档ID和知识库ID获取文档详情 * 根据文档ID和知识库ID获取文档详情
* *
* @param documentId 文档ID * @param documentId 文档ID
* @param datasetId 知识库ID * @param datasetId 知识库ID
* @return 文档详情 * @return 文档详情
*/ */
KnowledgeFilesDTO getByDocumentId(String documentId, String datasetId); KnowledgeFilesDTO getByDocumentId(String documentId, String datasetId);
/** /**
* 上传文档到知识库 * 上传文档到知识库
* *
* @param datasetId 知识库ID * @param datasetId 知识库ID
* @param file 上传的文件 * @param file 上传的文件
* @param name 文档名称 * @param name 文档名称
* @param metaFields 元数据字段 * @param metaFields 元数据字段
* @param chunkMethod 分块方法 * @param chunkMethod 分块方法
* @param parserConfig 解析器配置 * @param parserConfig 解析器配置
* @return 上传的文档信息 * @return 上传的文档信息
*/ */
KnowledgeFilesDTO uploadDocument(String datasetId, MultipartFile file, String name, KnowledgeFilesDTO uploadDocument(String datasetId, MultipartFile file, String name,
Map<String, Object> metaFields, String chunkMethod, Map<String, Object> metaFields, String chunkMethod,
Map<String, Object> parserConfig); Map<String, Object> parserConfig);
/** /**
* 根据文档ID和知识库ID删除文档 * 根据文档ID和知识库ID删除文档
* *
* @param documentId 文档ID * @param documentId 文档ID
* @param datasetId 知识库ID * @param datasetId 知识库ID
*/ */
void deleteByDocumentId(String documentId, String datasetId); void deleteByDocumentId(String documentId, String datasetId);
/**
* 获取RAG配置信息
*
* @param ragModelId RAG模型配置ID
* @return RAG配置信息
*/
Map<String, Object> getRAGConfig(String ragModelId);
/** /**
* 获取RAG配置信息 * 获取默认RAG配置信息
* *
* @param ragModelId RAG模型配置ID * @return 默认RAG配置信息
* @return RAG配置信息 */
*/ Map<String, Object> getDefaultRAGConfig();
Map<String, Object> getRAGConfig(String ragModelId);
/** /**
* 获取默认RAG配置信息 * 解析文档（切块）
* *
* @return 默认RAG配置信息 * @param datasetId 知识库ID
*/ * @param documentIds 文档ID列表
Map<String, Object> getDefaultRAGConfig(); * @return 解析结果
*/
boolean parseDocuments(String datasetId, List<String> documentIds);
/** /**
* 解析文档（切块） * 添加切片到指定文档
* *
* @param datasetId 知识库ID * @param datasetId 知识库ID
* @param documentIds 文档ID列表 * @param documentId 文档ID
* @return 解析结果 * @param content 切片内容
*/ * @param importantKeywords 重要关键词列表
boolean parseDocuments(String datasetId, List<String> documentIds); * @param questions 问题列表
* @return 添加的切片信息
*/
Map<String, Object> addChunk(String datasetId, String documentId, String content,
List<String> importantKeywords, List<String> questions);
/** /**
* 添加切片到指定文档 * 列出指定文档的切片
* *
* @param datasetId 知识库ID * @param datasetId 知识库ID
* @param documentId 文档ID * @param documentId 文档ID
* @param content 切片内容 * @param keywords 关键词过滤
* @param importantKeywords 重要关键词列表 * @param page 页码
* @param questions 问题列表 * @param pageSize 每页数量
* @return 添加的切片信息 * @param chunkId 切片ID
*/ * @return 切片列表信息
Map<String, Object> addChunk(String datasetId, String documentId, String content, */
List<String> importantKeywords, List<String> questions); Map<String, Object> listChunks(String datasetId, String documentId, String keywords,
Integer page, Integer pageSize, String chunkId);
/** /**
* 列出指定文档的切片 * 召回测试 - 从指定数据集或文档中检索相关切片
* *
* @param datasetId 知识库ID * @param question 用户查询或查询关键词
* @param documentId 文档ID * @param datasetIds 数据集ID列表
* @param keywords 关键词过滤 * @param documentIds 文档ID列表
* @param page 页码 * @param page 页码
* @param pageSize 每页数量 * @param pageSize 每页数量
* @param chunkId 切片ID * @param similarityThreshold 最小相似度阈值
* @return 切片列表信息 * @param vectorSimilarityWeight 向量相似度权重
*/ * @param topK 参与向量余弦计算的切片数量
Map<String, Object> listChunks(String datasetId, String documentId, String keywords, * @param rerankId 重排模型ID
Integer page, Integer pageSize, String chunkId); * @param keyword 是否启用关键词匹配
* @param highlight 是否启用高亮显示
/** * @param crossLanguages 跨语言翻译列表
* 召回测试 - 从指定数据集或文档中检索相关切片 * @param metadataCondition 元数据过滤条件
* * @return 召回测试结果
* @param question 用户查询或查询关键词 */
* @param datasetIds 数据集ID列表 Map<String, Object> retrievalTest(String question, List<String> datasetIds, List<String> documentIds,
* @param documentIds 文档ID列表 Integer page, Integer pageSize, Float similarityThreshold,
* @param page 页码 Float vectorSimilarityWeight, Integer topK, String rerankId,
* @param pageSize 每页数量 Boolean keyword, Boolean highlight, List<String> crossLanguages,
* @param similarityThreshold 最小相似度阈值 Map<String, Object> metadataCondition);
* @param vectorSimilarityWeight 向量相似度权重
* @param topK 参与向量余弦计算的切片数量
* @param rerankId 重排模型ID
* @param keyword 是否启用关键词匹配
* @param highlight 是否启用高亮显示
* @param crossLanguages 跨语言翻译列表
* @param metadataCondition 元数据过滤条件
* @return 召回测试结果
*/
Map<String, Object> retrievalTest(String question, List<String> datasetIds, List<String> documentIds,
Integer page, Integer pageSize, Float similarityThreshold,
Float vectorSimilarityWeight, Integer topK, String rerankId,
Boolean keyword, Boolean highlight, List<String> crossLanguages,
Map<String, Object> metadataCondition);
} }
main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java
+46 -47
View File
@@ -37,15 +37,14 @@ import xiaozhi.modules.model.service.ModelConfigService;
@Service @Service
@AllArgsConstructor @AllArgsConstructor
@Slf4j @Slf4j
public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao, KnowledgeBaseEntity> implements KnowledgeBaseService { public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao, KnowledgeBaseEntity>
implements KnowledgeBaseService {
private final KnowledgeBaseDao knowledgeBaseDao; private final KnowledgeBaseDao knowledgeBaseDao;
private final ModelConfigService modelConfigService; private final ModelConfigService modelConfigService;
private final ModelConfigDao modelConfigDao; private final ModelConfigDao modelConfigDao;
private RestTemplate restTemplate = new RestTemplate(); private RestTemplate restTemplate = new RestTemplate();
@Override @Override
public PageData<KnowledgeBaseDTO> getPageList(KnowledgeBaseDTO knowledgeBaseDTO, String page, String limit) { public PageData<KnowledgeBaseDTO> getPageList(KnowledgeBaseDTO knowledgeBaseDTO, String page, String limit) {
long curPage = Long.parseLong(page); long curPage = Long.parseLong(page);
@@ -57,7 +56,7 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
// 添加查询条件 // 添加查询条件
if (knowledgeBaseDTO != null) { if (knowledgeBaseDTO != null) {
queryWrapper.like(StringUtils.isNotBlank(knowledgeBaseDTO.getName()), "name", knowledgeBaseDTO.getName()) queryWrapper.like(StringUtils.isNotBlank(knowledgeBaseDTO.getName()), "name", knowledgeBaseDTO.getName())
.eq(knowledgeBaseDTO.getStatus() != null, "status", knowledgeBaseDTO.getStatus()); .eq(knowledgeBaseDTO.getStatus() != null, "status", knowledgeBaseDTO.getStatus());
} }
// 添加排序规则：按创建时间降序 // 添加排序规则：按创建时间降序
@@ -72,7 +71,8 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
if (pageData != null && pageData.getList() != null) { if (pageData != null && pageData.getList() != null) {
for (KnowledgeBaseDTO knowledgeBase : pageData.getList()) { for (KnowledgeBaseDTO knowledgeBase : pageData.getList()) {
try { try {
Integer documentCount = getDocumentCountFromRAGFlow(knowledgeBase.getDatasetId(), knowledgeBase.getRagModelId()); Integer documentCount = getDocumentCountFromRAGFlow(knowledgeBase.getDatasetId(),
knowledgeBase.getRagModelId());
knowledgeBase.setDocumentCount(documentCount); knowledgeBase.setDocumentCount(documentCount);
} catch (Exception e) { } catch (Exception e) {
log.warn("获取知识库 {} 的文档数量失败: {}", knowledgeBase.getDatasetId(), e.getMessage()); log.warn("获取知识库 {} 的文档数量失败: {}", knowledgeBase.getDatasetId(), e.getMessage());
@@ -109,10 +109,9 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
try { try {
Map<String, Object> ragConfig = getValidatedRAGConfig(knowledgeBaseDTO.getRagModelId()); Map<String, Object> ragConfig = getValidatedRAGConfig(knowledgeBaseDTO.getRagModelId());
datasetId = createDatasetInRAGFlow( datasetId = createDatasetInRAGFlow(
knowledgeBaseDTO.getName(), knowledgeBaseDTO.getName(),
knowledgeBaseDTO.getDescription(), knowledgeBaseDTO.getDescription(),
ragConfig ragConfig);
);
} catch (Exception e) { } catch (Exception e) {
// 如果RAG API调用失败，直接抛出异常，无需回滚（因为还没有插入本地数据库） // 如果RAG API调用失败，直接抛出异常，无需回滚（因为还没有插入本地数据库）
throw e; throw e;
@@ -120,8 +119,7 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
// 验证数据集ID是否已存在 // 验证数据集ID是否已存在
KnowledgeBaseEntity existingEntity = knowledgeBaseDao.selectOne( KnowledgeBaseEntity existingEntity = knowledgeBaseDao.selectOne(
new QueryWrapper<KnowledgeBaseEntity>().eq("dataset_id", datasetId) new QueryWrapper<KnowledgeBaseEntity>().eq("dataset_id", datasetId));
);
if (existingEntity != null) { if (existingEntity != null) {
// 如果datasetId已存在，删除RAGFlow中的数据集并抛出异常 // 如果datasetId已存在，删除RAGFlow中的数据集并抛出异常
try { try {
@@ -156,10 +154,9 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
// 验证数据集ID是否与其他记录冲突 // 验证数据集ID是否与其他记录冲突
if (StringUtils.isNotBlank(knowledgeBaseDTO.getDatasetId())) { if (StringUtils.isNotBlank(knowledgeBaseDTO.getDatasetId())) {
KnowledgeBaseEntity conflictEntity = knowledgeBaseDao.selectOne( KnowledgeBaseEntity conflictEntity = knowledgeBaseDao.selectOne(
new QueryWrapper<KnowledgeBaseEntity>() new QueryWrapper<KnowledgeBaseEntity>()
.eq("dataset_id", knowledgeBaseDTO.getDatasetId()) .eq("dataset_id", knowledgeBaseDTO.getDatasetId())
.ne("id", knowledgeBaseDTO.getId()) .ne("id", knowledgeBaseDTO.getId()));
);
if (conflictEntity != null) { if (conflictEntity != null) {
throw new RenException(ErrorCode.DB_RECORD_EXISTS); throw new RenException(ErrorCode.DB_RECORD_EXISTS);
} }
@@ -173,11 +170,10 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
try { try {
Map<String, Object> ragConfig = getValidatedRAGConfig(knowledgeBaseDTO.getRagModelId()); Map<String, Object> ragConfig = getValidatedRAGConfig(knowledgeBaseDTO.getRagModelId());
updateDatasetInRAGFlow( updateDatasetInRAGFlow(
knowledgeBaseDTO.getDatasetId(), knowledgeBaseDTO.getDatasetId(),
knowledgeBaseDTO.getName(), knowledgeBaseDTO.getName(),
knowledgeBaseDTO.getDescription(), knowledgeBaseDTO.getDescription(),
ragConfig ragConfig);
);
} catch (Exception e) { } catch (Exception e) {
// 如果RAG API调用失败，回滚本地数据库操作 // 如果RAG API调用失败，回滚本地数据库操作
knowledgeBaseDao.updateById(existingEntity); knowledgeBaseDao.updateById(existingEntity);
@@ -204,7 +200,7 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
} }
log.info("找到记录: ID={}, datasetId={}, ragModelId={}", log.info("找到记录: ID={}, datasetId={}, ragModelId={}",
entity.getId(), entity.getDatasetId(), entity.getRagModelId()); entity.getId(), entity.getDatasetId(), entity.getRagModelId());
// 先调用RAGFlow API删除数据集 // 先调用RAGFlow API删除数据集
boolean apiDeleteSuccess = false; boolean apiDeleteSuccess = false;
@@ -240,8 +236,7 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
} }
KnowledgeBaseEntity entity = knowledgeBaseDao.selectOne( KnowledgeBaseEntity entity = knowledgeBaseDao.selectOne(
new QueryWrapper<KnowledgeBaseEntity>().eq("dataset_id", datasetId) new QueryWrapper<KnowledgeBaseEntity>().eq("dataset_id", datasetId));
);
if (entity == null) { if (entity == null) {
throw new RenException(ErrorCode.Knowledge_Base_RECORD_NOT_EXISTS); throw new RenException(ErrorCode.Knowledge_Base_RECORD_NOT_EXISTS);
@@ -260,8 +255,7 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
log.info("删除datasetId: {}", datasetId); log.info("删除datasetId: {}", datasetId);
KnowledgeBaseEntity entity = knowledgeBaseDao.selectOne( KnowledgeBaseEntity entity = knowledgeBaseDao.selectOne(
new QueryWrapper<KnowledgeBaseEntity>().eq("dataset_id", datasetId) new QueryWrapper<KnowledgeBaseEntity>().eq("dataset_id", datasetId));
);
if (entity == null) { if (entity == null) {
log.warn("记录不存在，datasetId: {}", datasetId); log.warn("记录不存在，datasetId: {}", datasetId);
@@ -269,7 +263,7 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
} }
log.info("找到记录: ID={}, datasetId={}, ragModelId={}", log.info("找到记录: ID={}, datasetId={}, ragModelId={}",
entity.getId(), entity.getDatasetId(), entity.getRagModelId()); entity.getId(), entity.getDatasetId(), entity.getRagModelId());
// 先删除本地数据库记录 // 先删除本地数据库记录
int deleteCount = knowledgeBaseDao.deleteById(entity.getId()); int deleteCount = knowledgeBaseDao.deleteById(entity.getId());
@@ -323,8 +317,8 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
// 获取默认RAG模型配置 // 获取默认RAG模型配置
QueryWrapper<ModelConfigEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<ModelConfigEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("model_type", Constant.RAG_CONFIG_TYPE) queryWrapper.eq("model_type", Constant.RAG_CONFIG_TYPE)
.eq("is_default", 1) .eq("is_default", 1)
.eq("is_enabled", 1); .eq("is_enabled", 1);
List<ModelConfigEntity> modelConfigs = modelConfigDao.selectList(queryWrapper); List<ModelConfigEntity> modelConfigs = modelConfigDao.selectList(queryWrapper);
if (modelConfigs == null || modelConfigs.isEmpty()) { if (modelConfigs == null || modelConfigs.isEmpty()) {
@@ -453,12 +447,14 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
} catch (HttpClientErrorException e) { } catch (HttpClientErrorException e) {
log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_CREATE_FAILED, "创建RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString()); throw new RenException(ErrorCode.RAG_API_CREATE_FAILED,
"创建RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
} catch (HttpServerErrorException e) { } catch (HttpServerErrorException e) {
log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_CREATE_FAILED, "创建RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString()); throw new RenException(ErrorCode.RAG_API_CREATE_FAILED,
"创建RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
} catch (ResourceAccessException e) { } catch (ResourceAccessException e) {
log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e); log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
throw new RenException(ErrorCode.RAG_API_CREATE_FAILED, "创建RAGFlow数据集失败: 网络连接错误 - " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_CREATE_FAILED, "创建RAGFlow数据集失败: 网络连接错误 - " + e.getMessage());
@@ -472,7 +468,8 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
/** /**
* 调用RAGFlow API更新数据集 * 调用RAGFlow API更新数据集
*/ */
private void updateDatasetInRAGFlow(String datasetId, String name, String description, Map<String, Object> ragConfig) { private void updateDatasetInRAGFlow(String datasetId, String name, String description,
Map<String, Object> ragConfig) {
try { try {
String baseUrl = (String) ragConfig.get("base_url"); String baseUrl = (String) ragConfig.get("base_url");
String apiKey = (String) ragConfig.get("api_key"); String apiKey = (String) ragConfig.get("api_key");
@@ -516,12 +513,14 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
} catch (HttpClientErrorException e) { } catch (HttpClientErrorException e) {
log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_UPDATE_FAILED, "更新RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString()); throw new RenException(ErrorCode.RAG_API_UPDATE_FAILED,
"更新RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
} catch (HttpServerErrorException e) { } catch (HttpServerErrorException e) {
log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_UPDATE_FAILED, "更新RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString()); throw new RenException(ErrorCode.RAG_API_UPDATE_FAILED,
"更新RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
} catch (ResourceAccessException e) { } catch (ResourceAccessException e) {
log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e); log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
throw new RenException(ErrorCode.RAG_API_UPDATE_FAILED, "更新RAGFlow数据集失败: 网络连接错误 - " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_UPDATE_FAILED, "更新RAGFlow数据集失败: 网络连接错误 - " + e.getMessage());
@@ -560,7 +559,8 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
// 发送DELETE请求 // 发送DELETE请求
log.info("发送DELETE请求到RAGFlow API..."); log.info("发送DELETE请求到RAGFlow API...");
ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.DELETE, requestEntity, String.class); ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.DELETE, requestEntity,
String.class);
log.info("RAGFlow API响应状态码: {}", response.getStatusCode()); log.info("RAGFlow API响应状态码: {}", response.getStatusCode());
log.debug("RAGFlow API响应内容: {}", response.getBody()); log.debug("RAGFlow API响应内容: {}", response.getBody());
@@ -574,12 +574,14 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
} catch (HttpClientErrorException e) { } catch (HttpClientErrorException e) {
log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_DELETE_FAILED, "删除RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString()); throw new RenException(ErrorCode.RAG_API_DELETE_FAILED,
"删除RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
} catch (HttpServerErrorException e) { } catch (HttpServerErrorException e) {
log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_DELETE_FAILED, "删除RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString()); throw new RenException(ErrorCode.RAG_API_DELETE_FAILED,
"删除RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
} catch (ResourceAccessException e) { } catch (ResourceAccessException e) {
log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e); log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
throw new RenException(ErrorCode.RAG_API_DELETE_FAILED, "删除RAGFlow数据集失败: 网络连接错误 - " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_DELETE_FAILED, "删除RAGFlow数据集失败: 网络连接错误 - " + e.getMessage());
@@ -670,10 +672,10 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
log.error("解析RAGFlow API响应失败: {}", e.getMessage(), e); log.error("解析RAGFlow API响应失败: {}", e.getMessage(), e);
} catch (HttpClientErrorException e) { } catch (HttpClientErrorException e) {
log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
} catch (HttpServerErrorException e) { } catch (HttpServerErrorException e) {
log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
} catch (ResourceAccessException e) { } catch (ResourceAccessException e) {
log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e); log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
} catch (Exception e) { } catch (Exception e) {
@@ -683,7 +685,4 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
return 0; return 0;
} }
} }
main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeFilesServiceImpl.java
+76 -63
View File
@@ -125,11 +125,11 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
throw new RenException(ErrorCode.RAG_API_QUERY_FAILED, "解析RAGFlow响应失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_QUERY_FAILED, "解析RAGFlow响应失败: " + e.getMessage());
} catch (HttpClientErrorException e) { } catch (HttpClientErrorException e) {
log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_QUERY_FAILED, "获取RAGFlow文档列表失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_QUERY_FAILED, "获取RAGFlow文档列表失败: " + e.getMessage());
} catch (HttpServerErrorException e) { } catch (HttpServerErrorException e) {
log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_QUERY_FAILED, "获取RAGFlow文档列表失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_QUERY_FAILED, "获取RAGFlow文档列表失败: " + e.getMessage());
} catch (ResourceAccessException e) { } catch (ResourceAccessException e) {
log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e); log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
@@ -157,7 +157,7 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
Object documentsObj = null; Object documentsObj = null;
// 支持多种可能的文档列表字段名 // 支持多种可能的文档列表字段名
String[] possibleDocumentFields = {"docs", "documents", "items", "list", "data"}; String[] possibleDocumentFields = { "docs", "documents", "items", "list", "data" };
for (String fieldName : possibleDocumentFields) { for (String fieldName : possibleDocumentFields) {
if (dataMap.containsKey(fieldName) && dataMap.get(fieldName) instanceof List) { if (dataMap.containsKey(fieldName) && dataMap.get(fieldName) instanceof List) {
@@ -194,7 +194,7 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
// 解析总数 - 支持多种可能的字段名 // 解析总数 - 支持多种可能的字段名
Object totalObj = null; Object totalObj = null;
String[] possibleTotalFields = {"total", "totalCount", "total_count", "count"}; String[] possibleTotalFields = { "total", "totalCount", "total_count", "count" };
for (String fieldName : possibleTotalFields) { for (String fieldName : possibleTotalFields) {
if (dataMap.containsKey(fieldName)) { if (dataMap.containsKey(fieldName)) {
@@ -234,7 +234,8 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
*/ */
private KnowledgeFilesDTO convertRAGDocumentToDTO(Map<String, Object> docMap) { private KnowledgeFilesDTO convertRAGDocumentToDTO(Map<String, Object> docMap) {
try { try {
if (docMap == null) return null; if (docMap == null)
return null;
KnowledgeFilesDTO dto = new KnowledgeFilesDTO(); KnowledgeFilesDTO dto = new KnowledgeFilesDTO();
@@ -275,7 +276,8 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
dto.setMetaFields((Map<String, Object>) metaFieldsObj); dto.setMetaFields((Map<String, Object>) metaFieldsObj);
} }
Object parserConfigObj = getValueFromMultipleKeys(docMap, "parser_config", "parser", "parse_config", "config"); Object parserConfigObj = getValueFromMultipleKeys(docMap, "parser_config", "parser", "parse_config",
"config");
if (parserConfigObj instanceof Map) { if (parserConfigObj instanceof Map) {
dto.setParserConfig((Map<String, Object>) parserConfigObj); dto.setParserConfig((Map<String, Object>) parserConfigObj);
} }
@@ -283,7 +285,8 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
dto.setChunkMethod(getStringValueFromMultipleKeys(docMap, "chunk_method", "chunking", "chunk_strategy")); dto.setChunkMethod(getStringValueFromMultipleKeys(docMap, "chunk_method", "chunking", "chunk_strategy"));
// 设置时间信息 - 支持多种可能的字段名 // 设置时间信息 - 支持多种可能的字段名
Object createTimeObj = getValueFromMultipleKeys(docMap, "create_time", "created_at", "creation_time", "created"); Object createTimeObj = getValueFromMultipleKeys(docMap, "create_time", "created_at", "creation_time",
"created");
if (createTimeObj instanceof Long) { if (createTimeObj instanceof Long) {
dto.setCreatedAt(new Date((Long) createTimeObj)); dto.setCreatedAt(new Date((Long) createTimeObj));
} else if (createTimeObj instanceof String) { } else if (createTimeObj instanceof String) {
@@ -296,7 +299,8 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
} }
} }
Object updateTimeObj = getValueFromMultipleKeys(docMap, "update_time", "updated_at", "modified_time", "modified"); Object updateTimeObj = getValueFromMultipleKeys(docMap, "update_time", "updated_at", "modified_time",
"modified");
if (updateTimeObj instanceof Long) { if (updateTimeObj instanceof Long) {
dto.setUpdatedAt(new Date((Long) updateTimeObj)); dto.setUpdatedAt(new Date((Long) updateTimeObj));
} else if (updateTimeObj instanceof String) { } else if (updateTimeObj instanceof String) {
@@ -319,7 +323,8 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
* 转换RAGFlow状态到本地状态 * 转换RAGFlow状态到本地状态
*/ */
private Integer convertRAGStatusToLocal(String ragStatus) { private Integer convertRAGStatusToLocal(String ragStatus) {
if (ragStatus == null) return 0; if (ragStatus == null)
return 0;
switch (ragStatus.toLowerCase()) { switch (ragStatus.toLowerCase()) {
case "pending": case "pending":
@@ -430,11 +435,11 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
throw new RenException(ErrorCode.Knowledge_Base_RECORD_NOT_EXISTS); throw new RenException(ErrorCode.Knowledge_Base_RECORD_NOT_EXISTS);
} }
log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_QUERY_FAILED, "获取RAGFlow文档失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_QUERY_FAILED, "获取RAGFlow文档失败: " + e.getMessage());
} catch (HttpServerErrorException e) { } catch (HttpServerErrorException e) {
log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_QUERY_FAILED, "获取RAGFlow文档失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_QUERY_FAILED, "获取RAGFlow文档失败: " + e.getMessage());
} catch (ResourceAccessException e) { } catch (ResourceAccessException e) {
log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e); log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
@@ -449,8 +454,8 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
@Override @Override
public KnowledgeFilesDTO uploadDocument(String datasetId, MultipartFile file, String name, public KnowledgeFilesDTO uploadDocument(String datasetId, MultipartFile file, String name,
Map<String, Object> metaFields, String chunkMethod, Map<String, Object> metaFields, String chunkMethod,
Map<String, Object> parserConfig) { Map<String, Object> parserConfig) {
if (StringUtils.isBlank(datasetId) || file == null || file.isEmpty()) { if (StringUtils.isBlank(datasetId) || file == null || file.isEmpty()) {
throw new RenException(ErrorCode.PARAMS_GET_ERROR); throw new RenException(ErrorCode.PARAMS_GET_ERROR);
} }
@@ -509,7 +514,6 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
} }
} }
@Override @Override
public void deleteByDocumentId(String documentId, String datasetId) { public void deleteByDocumentId(String documentId, String datasetId) {
if (StringUtils.isBlank(documentId) || StringUtils.isBlank(datasetId)) { if (StringUtils.isBlank(documentId) || StringUtils.isBlank(datasetId)) {
@@ -549,10 +553,10 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
String extension = fileName.substring(lastDotIndex + 1).toLowerCase(); String extension = fileName.substring(lastDotIndex + 1).toLowerCase();
// 支持RAGFlow四种文档格式类型 // 支持RAGFlow四种文档格式类型
String[] documentTypes = {"pdf", "doc", "docx", "txt", "md", "mdx"}; String[] documentTypes = { "pdf", "doc", "docx", "txt", "md", "mdx" };
String[] spreadsheetTypes = {"csv", "xls", "xlsx"}; String[] spreadsheetTypes = { "csv", "xls", "xlsx" };
String[] imageTypes = {"jpeg", "jpg", "png", "tif", "gif"}; String[] imageTypes = { "jpeg", "jpg", "png", "tif", "gif" };
String[] presentationTypes = {"ppt", "pptx"}; String[] presentationTypes = { "ppt", "pptx" };
// 检查文档类型 // 检查文档类型
for (String type : documentTypes) { for (String type : documentTypes) {
@@ -623,8 +627,8 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
// 获取默认RAG模型配置 // 获取默认RAG模型配置
QueryWrapper<ModelConfigEntity> queryWrapper = new QueryWrapper<>(); QueryWrapper<ModelConfigEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("model_type", Constant.RAG_CONFIG_TYPE) queryWrapper.eq("model_type", Constant.RAG_CONFIG_TYPE)
.eq("is_default", 1) .eq("is_default", 1)
.eq("is_enabled", 1); .eq("is_enabled", 1);
List<ModelConfigEntity> modelConfigs = modelConfigDao.selectList(queryWrapper); List<ModelConfigEntity> modelConfigs = modelConfigDao.selectList(queryWrapper);
if (modelConfigs == null || modelConfigs.isEmpty()) { if (modelConfigs == null || modelConfigs.isEmpty()) {
@@ -666,8 +670,8 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
* 调用RAGFlow API上传文档 - 流式上传版本 * 调用RAGFlow API上传文档 - 流式上传版本
*/ */
private String uploadDocumentToRAGFlow(String datasetId, MultipartFile file, String name, private String uploadDocumentToRAGFlow(String datasetId, MultipartFile file, String name,
Map<String, Object> metaFields, String chunkMethod, Map<String, Object> metaFields, String chunkMethod,
Map<String, Object> parserConfig) { Map<String, Object> parserConfig) {
try { try {
// 获取RAG配置 // 获取RAG配置
Map<String, Object> ragConfig = getDefaultRAGConfig(); Map<String, Object> ragConfig = getDefaultRAGConfig();
@@ -780,12 +784,14 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
} catch (HttpClientErrorException e) { } catch (HttpClientErrorException e) {
log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_CREATE_FAILED, "上传RAGFlow文档失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString()); throw new RenException(ErrorCode.RAG_API_CREATE_FAILED,
"上传RAGFlow文档失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
} catch (HttpServerErrorException e) { } catch (HttpServerErrorException e) {
log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_CREATE_FAILED, "上传RAGFlow文档失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString()); throw new RenException(ErrorCode.RAG_API_CREATE_FAILED,
"上传RAGFlow文档失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
} catch (ResourceAccessException e) { } catch (ResourceAccessException e) {
log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e); log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
throw new RenException(ErrorCode.RAG_API_CREATE_FAILED, "上传RAGFlow文档失败: 网络连接错误 - " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_CREATE_FAILED, "上传RAGFlow文档失败: 网络连接错误 - " + e.getMessage());
@@ -821,10 +827,11 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
* 从Map中提取documentId，支持多种可能的字段名 * 从Map中提取documentId，支持多种可能的字段名
*/ */
private String extractDocumentIdFromMap(Map<String, Object> map) { private String extractDocumentIdFromMap(Map<String, Object> map) {
if (map == null) return null; if (map == null)
return null;
// 尝试多种可能的字段名 // 尝试多种可能的字段名
String[] possibleFieldNames = {"id", "document_id", "documentId", "doc_id", "documentId"}; String[] possibleFieldNames = { "id", "document_id", "documentId", "doc_id", "documentId" };
for (String fieldName : possibleFieldNames) { for (String fieldName : possibleFieldNames) {
Object value = map.get(fieldName); Object value = map.get(fieldName);
@@ -840,10 +847,11 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
* 从根级别响应中提取documentId * 从根级别响应中提取documentId
*/ */
private String extractDocumentIdFromRoot(Map<String, Object> responseMap) { private String extractDocumentIdFromRoot(Map<String, Object> responseMap) {
if (responseMap == null) return null; if (responseMap == null)
return null;
// 尝试从根级别提取 // 尝试从根级别提取
String[] possibleFieldNames = {"id", "document_id", "documentId", "doc_id", "documentId"}; String[] possibleFieldNames = { "id", "document_id", "documentId", "doc_id", "documentId" };
for (String fieldName : possibleFieldNames) { for (String fieldName : possibleFieldNames) {
Object value = responseMap.get(fieldName); Object value = responseMap.get(fieldName);
@@ -859,7 +867,7 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
* 调用RAGFlow API更新文档配置 * 调用RAGFlow API更新文档配置
*/ */
private void updateDocumentInRAGFlow(String documentId, String name, Map<String, Object> metaFields, private void updateDocumentInRAGFlow(String documentId, String name, Map<String, Object> metaFields,
String chunkMethod, Map<String, Object> parserConfig) { String chunkMethod, Map<String, Object> parserConfig) {
try { try {
// 获取RAG配置 // 获取RAG配置
Map<String, Object> ragConfig = getDefaultRAGConfig(); Map<String, Object> ragConfig = getDefaultRAGConfig();
@@ -915,12 +923,14 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
} catch (HttpClientErrorException e) { } catch (HttpClientErrorException e) {
log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_UPDATE_FAILED, "更新RAGFlow文档配置失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString()); throw new RenException(ErrorCode.RAG_API_UPDATE_FAILED,
"更新RAGFlow文档配置失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
} catch (HttpServerErrorException e) { } catch (HttpServerErrorException e) {
log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_UPDATE_FAILED, "更新RAGFlow文档配置失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString()); throw new RenException(ErrorCode.RAG_API_UPDATE_FAILED,
"更新RAGFlow文档配置失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
} catch (ResourceAccessException e) { } catch (ResourceAccessException e) {
log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e); log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
throw new RenException(ErrorCode.RAG_API_UPDATE_FAILED, "更新RAGFlow文档配置失败: 网络连接错误 - " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_UPDATE_FAILED, "更新RAGFlow文档配置失败: 网络连接错误 - " + e.getMessage());
@@ -961,7 +971,8 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
// 发送DELETE请求 // 发送DELETE请求
log.info("发送DELETE请求到RAGFlow API..."); log.info("发送DELETE请求到RAGFlow API...");
ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.DELETE, requestEntity, String.class); ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.DELETE, requestEntity,
String.class);
log.info("RAGFlow API响应状态码: {}", response.getStatusCode()); log.info("RAGFlow API响应状态码: {}", response.getStatusCode());
log.debug("RAGFlow API响应内容: {}", response.getBody()); log.debug("RAGFlow API响应内容: {}", response.getBody());
@@ -999,12 +1010,14 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
} catch (HttpClientErrorException e) { } catch (HttpClientErrorException e) {
log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_DELETE_FAILED, "删除RAGFlow文档失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString()); throw new RenException(ErrorCode.RAG_API_DELETE_FAILED,
"删除RAGFlow文档失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
} catch (HttpServerErrorException e) { } catch (HttpServerErrorException e) {
log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_DELETE_FAILED, "删除RAGFlow文档失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString()); throw new RenException(ErrorCode.RAG_API_DELETE_FAILED,
"删除RAGFlow文档失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
} catch (ResourceAccessException e) { } catch (ResourceAccessException e) {
log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e); log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
throw new RenException(ErrorCode.RAG_API_DELETE_FAILED, "删除RAGFlow文档失败: 网络连接错误 - " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_DELETE_FAILED, "删除RAGFlow文档失败: 网络连接错误 - " + e.getMessage());
@@ -1115,11 +1128,11 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
throw new RenException(ErrorCode.RAG_API_PARSE_FAILED, "解析RAGFlow响应失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_PARSE_FAILED, "解析RAGFlow响应失败: " + e.getMessage());
} catch (HttpClientErrorException e) { } catch (HttpClientErrorException e) {
log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_PARSE_FAILED, "解析RAGFlow文档失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_PARSE_FAILED, "解析RAGFlow文档失败: " + e.getMessage());
} catch (HttpServerErrorException e) { } catch (HttpServerErrorException e) {
log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_PARSE_FAILED, "解析RAGFlow文档失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_PARSE_FAILED, "解析RAGFlow文档失败: " + e.getMessage());
} catch (ResourceAccessException e) { } catch (ResourceAccessException e) {
log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e); log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
@@ -1134,7 +1147,7 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
@Override @Override
public Map<String, Object> addChunk(String datasetId, String documentId, String content, public Map<String, Object> addChunk(String datasetId, String documentId, String content,
List<String> importantKeywords, List<String> questions) { List<String> importantKeywords, List<String> questions) {
if (StringUtils.isBlank(datasetId) || StringUtils.isBlank(documentId) || StringUtils.isBlank(content)) { if (StringUtils.isBlank(datasetId) || StringUtils.isBlank(documentId) || StringUtils.isBlank(content)) {
throw new RenException(ErrorCode.PARAMS_GET_ERROR, "datasetId、documentId和content不能为空"); throw new RenException(ErrorCode.PARAMS_GET_ERROR, "datasetId、documentId和content不能为空");
} }
@@ -1205,11 +1218,11 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
throw new RenException(ErrorCode.RAG_API_OPERATION_FAILED, "解析RAGFlow响应失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_OPERATION_FAILED, "解析RAGFlow响应失败: " + e.getMessage());
} catch (HttpClientErrorException e) { } catch (HttpClientErrorException e) {
log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_OPERATION_FAILED, "添加切片失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_OPERATION_FAILED, "添加切片失败: " + e.getMessage());
} catch (HttpServerErrorException e) { } catch (HttpServerErrorException e) {
log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_OPERATION_FAILED, "添加切片失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_OPERATION_FAILED, "添加切片失败: " + e.getMessage());
} catch (ResourceAccessException e) { } catch (ResourceAccessException e) {
log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e); log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
@@ -1224,7 +1237,7 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
@Override @Override
public Map<String, Object> listChunks(String datasetId, String documentId, String keywords, public Map<String, Object> listChunks(String datasetId, String documentId, String keywords,
Integer page, Integer pageSize, String chunkId) { Integer page, Integer pageSize, String chunkId) {
if (StringUtils.isBlank(datasetId) || StringUtils.isBlank(documentId)) { if (StringUtils.isBlank(datasetId) || StringUtils.isBlank(documentId)) {
throw new RenException(ErrorCode.PARAMS_GET_ERROR, "datasetId和documentId不能为空"); throw new RenException(ErrorCode.PARAMS_GET_ERROR, "datasetId和documentId不能为空");
} }
@@ -1242,7 +1255,7 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
// 构建请求URL - 根据RAGFlow API文档，列出切片的接口 // 构建请求URL - 根据RAGFlow API文档，列出切片的接口
StringBuilder urlBuilder = new StringBuilder(); StringBuilder urlBuilder = new StringBuilder();
urlBuilder.append(baseUrl).append("/api/v1/datasets/").append(datasetId) urlBuilder.append(baseUrl).append("/api/v1/datasets/").append(datasetId)
.append("/documents/").append(documentId).append("/chunks"); .append("/documents/").append(documentId).append("/chunks");
// 添加查询参数 // 添加查询参数
List<String> params = new ArrayList<>(); List<String> params = new ArrayList<>();
@@ -1311,11 +1324,11 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
throw new RenException(ErrorCode.RAG_API_OPERATION_FAILED, "解析RAGFlow响应失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_OPERATION_FAILED, "解析RAGFlow响应失败: " + e.getMessage());
} catch (HttpClientErrorException e) { } catch (HttpClientErrorException e) {
log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_OPERATION_FAILED, "列出切片失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_OPERATION_FAILED, "列出切片失败: " + e.getMessage());
} catch (HttpServerErrorException e) { } catch (HttpServerErrorException e) {
log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_OPERATION_FAILED, "列出切片失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_OPERATION_FAILED, "列出切片失败: " + e.getMessage());
} catch (ResourceAccessException e) { } catch (ResourceAccessException e) {
log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e); log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
@@ -1346,7 +1359,7 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
Object chunksObj = null; Object chunksObj = null;
// 支持多种可能的切片列表字段名 // 支持多种可能的切片列表字段名
String[] possibleChunkFields = {"chunks", "items", "list", "data", "docs"}; String[] possibleChunkFields = { "chunks", "items", "list", "data", "docs" };
for (String fieldName : possibleChunkFields) { for (String fieldName : possibleChunkFields) {
if (dataMap.containsKey(fieldName) && dataMap.get(fieldName) instanceof List) { if (dataMap.containsKey(fieldName) && dataMap.get(fieldName) instanceof List) {
@@ -1383,7 +1396,7 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
// 解析总数 - 支持多种可能的字段名 // 解析总数 - 支持多种可能的字段名
Object totalObj = null; Object totalObj = null;
String[] possibleTotalFields = {"total", "totalCount", "total_count", "count"}; String[] possibleTotalFields = { "total", "totalCount", "total_count", "count" };
for (String fieldName : possibleTotalFields) { for (String fieldName : possibleTotalFields) {
if (dataMap.containsKey(fieldName)) { if (dataMap.containsKey(fieldName)) {
@@ -1414,7 +1427,7 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
// 如果没有data字段，尝试直接解析响应 // 如果没有data字段，尝试直接解析响应
Object chunksObj = null; Object chunksObj = null;
String[] possibleChunkFields = {"chunks", "items", "list", "data", "docs"}; String[] possibleChunkFields = { "chunks", "items", "list", "data", "docs" };
for (String fieldName : possibleChunkFields) { for (String fieldName : possibleChunkFields) {
if (responseMap.containsKey(fieldName) && responseMap.get(fieldName) instanceof List) { if (responseMap.containsKey(fieldName) && responseMap.get(fieldName) instanceof List) {
@@ -1506,7 +1519,7 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
* 提取切片ID * 提取切片ID
*/ */
private String extractChunkId(Map<String, Object> chunkMap) { private String extractChunkId(Map<String, Object> chunkMap) {
String[] possibleIdFields = {"id", "chunk_id", "chunkId", "chunkId"}; String[] possibleIdFields = { "id", "chunk_id", "chunkId", "chunkId" };
for (String fieldName : possibleIdFields) { for (String fieldName : possibleIdFields) {
Object value = chunkMap.get(fieldName); Object value = chunkMap.get(fieldName);
@@ -1522,7 +1535,7 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
* 提取切片内容 * 提取切片内容
*/ */
private String extractChunkContent(Map<String, Object> chunkMap) { private String extractChunkContent(Map<String, Object> chunkMap) {
String[] possibleContentFields = {"content", "text", "chunk_content", "chunkContent"}; String[] possibleContentFields = { "content", "text", "chunk_content", "chunkContent" };
for (String fieldName : possibleContentFields) { for (String fieldName : possibleContentFields) {
Object value = chunkMap.get(fieldName); Object value = chunkMap.get(fieldName);
@@ -1538,7 +1551,7 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
* 提取重要关键词 * 提取重要关键词
*/ */
private List<String> extractImportantKeywords(Map<String, Object> chunkMap) { private List<String> extractImportantKeywords(Map<String, Object> chunkMap) {
String[] possibleKeywordFields = {"important_keywords", "keywords", "importantKeywords", "key_words"}; String[] possibleKeywordFields = { "important_keywords", "keywords", "importantKeywords", "key_words" };
for (String fieldName : possibleKeywordFields) { for (String fieldName : possibleKeywordFields) {
Object value = chunkMap.get(fieldName); Object value = chunkMap.get(fieldName);
@@ -1572,7 +1585,7 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
* 提取问题列表 * 提取问题列表
*/ */
private List<String> extractQuestions(Map<String, Object> chunkMap) { private List<String> extractQuestions(Map<String, Object> chunkMap) {
String[] possibleQuestionFields = {"questions", "question_list", "questionList", "qas"}; String[] possibleQuestionFields = { "questions", "question_list", "questionList", "qas" };
for (String fieldName : possibleQuestionFields) { for (String fieldName : possibleQuestionFields) {
Object value = chunkMap.get(fieldName); Object value = chunkMap.get(fieldName);
@@ -1606,7 +1619,7 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
* 提取创建时间 * 提取创建时间
*/ */
private String extractCreateTime(Map<String, Object> chunkMap) { private String extractCreateTime(Map<String, Object> chunkMap) {
String[] possibleTimeFields = {"create_time", "created_at", "createTime", "timestamp"}; String[] possibleTimeFields = { "create_time", "created_at", "createTime", "timestamp" };
for (String fieldName : possibleTimeFields) { for (String fieldName : possibleTimeFields) {
Object value = chunkMap.get(fieldName); Object value = chunkMap.get(fieldName);
@@ -1625,10 +1638,10 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
@Override @Override
public Map<String, Object> retrievalTest(String question, List<String> datasetIds, List<String> documentIds, public Map<String, Object> retrievalTest(String question, List<String> datasetIds, List<String> documentIds,
Integer page, Integer pageSize, Float similarityThreshold, Integer page, Integer pageSize, Float similarityThreshold,
Float vectorSimilarityWeight, Integer topK, String rerankId, Float vectorSimilarityWeight, Integer topK, String rerankId,
Boolean keyword, Boolean highlight, List<String> crossLanguages, Boolean keyword, Boolean highlight, List<String> crossLanguages,
Map<String, Object> metadataCondition) { Map<String, Object> metadataCondition) {
log.info("=== 开始召回测试 ==="); log.info("=== 开始召回测试 ===");
log.info("问题: {}, 数据集ID: {}, 文档ID: {}, 页码: {}, 每页数量: {}", log.info("问题: {}, 数据集ID: {}, 文档ID: {}, 页码: {}, 每页数量: {}",
@@ -1744,11 +1757,11 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
throw new RenException(ErrorCode.RAG_API_QUERY_FAILED, "解析RAGFlow响应失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_QUERY_FAILED, "解析RAGFlow响应失败: " + e.getMessage());
} catch (HttpClientErrorException e) { } catch (HttpClientErrorException e) {
log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_QUERY_FAILED, "召回测试失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_QUERY_FAILED, "召回测试失败: " + e.getMessage());
} catch (HttpServerErrorException e) { } catch (HttpServerErrorException e) {
log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}", log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e); e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
throw new RenException(ErrorCode.RAG_API_QUERY_FAILED, "召回测试失败: " + e.getMessage()); throw new RenException(ErrorCode.RAG_API_QUERY_FAILED, "召回测试失败: " + e.getMessage());
} catch (ResourceAccessException e) { } catch (ResourceAccessException e) {
log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e); log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
main/manager-web/src/apis/module/knowledgeBase.js
+163 -264
View File
@@ -8,6 +8,54 @@ function getAuthToken() {
return localStorage.getItem('token') || ''; return localStorage.getItem('token') || '';
} }
/**
* 通用API请求包装器
* @param {Object} config - 请求配置
* @param {string} config.url - 请求URL
* @param {string} config.method - 请求方法
* @param {Object} [config.data] - 请求数据
* @param {Object} [config.headers] - 额外请求头
* @param {Function} config.callback - 成功回调
* @param {Function} [config.errorCallback] - 错误回调
* @param {string} [config.errorMessage] - 错误消息
* @param {Function} [config.retryFunction] - 重试函数
*/
function makeApiRequest(config) {
const token = getAuthToken();
const { url, method, data, headers, callback, errorCallback, errorMessage, retryFunction } = config;
const requestBuilder = RequestService.sendRequest()
.url(url)
.method(method)
.header({
'Authorization': `Bearer ${token}`,
...headers
});
if (data) {
requestBuilder.data(data);
}
requestBuilder
.success((res) => {
RequestService.clearRequestTime();
callback(res);
})
.fail((err) => {
console.error(errorMessage || '操作失败', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
if (retryFunction) {
RequestService.reAjaxFun(() => {
retryFunction();
});
}
}).send();
}
/** /**
* 知识库管理相关API * 知识库管理相关API
*/ */
@@ -19,33 +67,20 @@ export default {
* @param {Function} errorCallback - 错误回调 * @param {Function} errorCallback - 错误回调
*/ */
getKnowledgeBaseList(params, callback, errorCallback) { getKnowledgeBaseList(params, callback, errorCallback) {
const token = getAuthToken();
const queryParams = new URLSearchParams({ const queryParams = new URLSearchParams({
page: params.page, page: params.page,
page_size: params.page_size, page_size: params.page_size,
name: params.name || '' name: params.name || ''
}).toString(); }).toString();
RequestService.sendRequest() makeApiRequest({
.url(`${getServiceUrl()}/api/v1/datasets?${queryParams}`) url: `${getServiceUrl()}/api/v1/datasets?${queryParams}`,
.method('GET') method: 'GET',
.header({ 'Authorization': `Bearer ${token}` }) callback: callback,
.success((res) => { errorCallback: errorCallback,
RequestService.clearRequestTime(); errorMessage: '获取知识库列表失败',
callback(res); retryFunction: () => this.getKnowledgeBaseList(params, callback, errorCallback)
}) });
.fail((err) => {
console.error('获取知识库列表失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.getKnowledgeBaseList(params, callback, errorCallback);
});
}).send();
}, },
/** /**
@@ -56,20 +91,18 @@ export default {
*/ */
createKnowledgeBase(data, callback, errorCallback) { createKnowledgeBase(data, callback, errorCallback) {
console.log('createKnowledgeBase called with data:', data); console.log('createKnowledgeBase called with data:', data);
const token = getAuthToken();
console.log('Token exists:', !!token);
console.log('API URL:', `${getServiceUrl()}/api/v1/datasets`); console.log('API URL:', `${getServiceUrl()}/api/v1/datasets`);
RequestService.sendRequest()
.url(`${getServiceUrl()}/api/v1/datasets`) makeApiRequest({
.method('POST') url: `${getServiceUrl()}/api/v1/datasets`,
.data(data) method: 'POST',
.header({ 'Authorization': `Bearer ${token}` }) data: data,
.success((res) => { headers: { 'Content-Type': 'application/json' },
callback: (res) => {
console.log('createKnowledgeBase success response:', res); console.log('createKnowledgeBase success response:', res);
RequestService.clearRequestTime();
callback(res); callback(res);
}) },
.fail((err) => { errorCallback: (err) => {
console.error('创建知识库失败:', err); console.error('创建知识库失败:', err);
if (err.response) { if (err.response) {
console.error('Error response data:', err.response.data); console.error('Error response data:', err.response.data);
@@ -78,14 +111,10 @@ export default {
if (errorCallback) { if (errorCallback) {
errorCallback(err); errorCallback(err);
} }
}) },
.networkFail(() => { errorMessage: '创建知识库失败',
console.log('Network failure, retrying...'); retryFunction: () => this.createKnowledgeBase(data, callback, errorCallback)
const self = this; });
RequestService.reAjaxFun(() => {
self.createKnowledgeBase(data, callback, errorCallback);
});
}).send();
}, },
/** /**
@@ -97,30 +126,18 @@ export default {
*/ */
updateKnowledgeBase(datasetId, data, callback, errorCallback) { updateKnowledgeBase(datasetId, data, callback, errorCallback) {
console.log('updateKnowledgeBase called with datasetId:', datasetId, 'data:', data); console.log('updateKnowledgeBase called with datasetId:', datasetId, 'data:', data);
const token = getAuthToken();
console.log('Token exists:', !!token);
console.log('API URL:', `${getServiceUrl()}/api/v1/datasets/${datasetId}`); console.log('API URL:', `${getServiceUrl()}/api/v1/datasets/${datasetId}`);
RequestService.sendRequest()
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}`) makeApiRequest({
.method('PUT') url: `${getServiceUrl()}/api/v1/datasets/${datasetId}`,
.data(data) method: 'PUT',
.header({ 'Authorization': `Bearer ${token}` }) data: data,
.success((res) => { headers: { 'Content-Type': 'application/json' },
RequestService.clearRequestTime(); callback: callback,
callback(res); errorCallback: errorCallback,
}) errorMessage: '更新知识库失败',
.fail((err) => { retryFunction: () => this.updateKnowledgeBase(datasetId, data, callback, errorCallback)
console.error('更新知识库失败:', err); });
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.updateKnowledgeBase(datasetId, data, callback, errorCallback);
});
}).send();
}, },
/** /**
@@ -131,29 +148,16 @@ export default {
*/ */
deleteKnowledgeBase(datasetId, callback, errorCallback) { deleteKnowledgeBase(datasetId, callback, errorCallback) {
console.log('deleteKnowledgeBase called with datasetId:', datasetId); console.log('deleteKnowledgeBase called with datasetId:', datasetId);
const token = getAuthToken();
console.log('Token exists:', !!token);
console.log('API URL:', `${getServiceUrl()}/api/v1/datasets/${datasetId}`); console.log('API URL:', `${getServiceUrl()}/api/v1/datasets/${datasetId}`);
RequestService.sendRequest()
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}`) makeApiRequest({
.method('DELETE') url: `${getServiceUrl()}/api/v1/datasets/${datasetId}`,
.header({ 'Authorization': `Bearer ${token}` }) method: 'DELETE',
.success((res) => { callback: callback,
RequestService.clearRequestTime(); errorCallback: errorCallback,
callback(res); errorMessage: '删除知识库失败',
}) retryFunction: () => this.deleteKnowledgeBase(datasetId, callback, errorCallback)
.fail((err) => { });
console.error('删除知识库失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.deleteKnowledgeBase(datasetId, callback, errorCallback);
});
}).send();
}, },
/** /**
@@ -163,29 +167,17 @@ export default {
* @param {Function} errorCallback - 错误回调 * @param {Function} errorCallback - 错误回调
*/ */
deleteKnowledgeBases(ids, callback, errorCallback) { deleteKnowledgeBases(ids, callback, errorCallback) {
const token = getAuthToken();
// 确保ids是正确格式的字符串 // 确保ids是正确格式的字符串
const idsStr = Array.isArray(ids) ? ids.join(',') : ids; const idsStr = Array.isArray(ids) ? ids.join(',') : ids;
RequestService.sendRequest()
.url(`${getServiceUrl()}/api/v1/datasets/batch?ids=${idsStr}`) makeApiRequest({
.method('DELETE') url: `${getServiceUrl()}/api/v1/datasets/batch?ids=${idsStr}`,
.header({ 'Authorization': `Bearer ${token}` }) method: 'DELETE',
.success((res) => { callback: callback,
RequestService.clearRequestTime(); errorCallback: errorCallback,
callback(res); errorMessage: '批量删除知识库失败',
}) retryFunction: () => this.deleteKnowledgeBases(ids, callback, errorCallback)
.fail((err) => { });
console.error('批量删除知识库失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.deleteKnowledgeBases(ids, callback, errorCallback);
});
}).send();
}, },
/** /**
@@ -196,33 +188,20 @@ export default {
* @param {Function} errorCallback - 错误回调 * @param {Function} errorCallback - 错误回调
*/ */
getDocumentList(datasetId, params, callback, errorCallback) { getDocumentList(datasetId, params, callback, errorCallback) {
const token = getAuthToken();
const queryParams = new URLSearchParams({ const queryParams = new URLSearchParams({
page: params.page, page: params.page,
page_size: params.page_size, page_size: params.page_size,
name: params.name || '' name: params.name || ''
}).toString(); }).toString();
RequestService.sendRequest() makeApiRequest({
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}/documents?${queryParams}`) url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/documents?${queryParams}`,
.method('GET') method: 'GET',
.header({ 'Authorization': `Bearer ${token}` }) callback: callback,
.success((res) => { errorCallback: errorCallback,
RequestService.clearRequestTime(); errorMessage: '获取文档列表失败',
callback(res); retryFunction: () => this.getDocumentList(datasetId, params, callback, errorCallback)
}) });
.fail((err) => {
console.error('获取文档列表失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.getDocumentList(datasetId, params, callback, errorCallback);
});
}).send();
}, },
/** /**
@@ -233,31 +212,16 @@ export default {
* @param {Function} errorCallback - 错误回调 * @param {Function} errorCallback - 错误回调
*/ */
uploadDocument(datasetId, formData, callback, errorCallback) { uploadDocument(datasetId, formData, callback, errorCallback) {
const token = getAuthToken(); makeApiRequest({
RequestService.sendRequest() url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/documents`,
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}/documents`) method: 'POST',
.method('POST') data: formData,
.data(formData) headers: { 'Content-Type': 'multipart/form-data' },
.header({ callback: callback,
'Authorization': `Bearer ${token}`, errorCallback: errorCallback,
'Content-Type': 'multipart/form-data' errorMessage: '上传文档失败',
}) retryFunction: () => this.uploadDocument(datasetId, formData, callback, errorCallback)
.success((res) => { });
RequestService.clearRequestTime();
callback(res);
})
.fail((err) => {
console.error('上传文档失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.uploadDocument(datasetId, formData, callback, errorCallback);
});
}).send();
}, },
/** /**
@@ -268,35 +232,20 @@ export default {
* @param {Function} errorCallback - 错误回调 * @param {Function} errorCallback - 错误回调
*/ */
parseDocument(datasetId, documentId, callback, errorCallback) { parseDocument(datasetId, documentId, callback, errorCallback) {
const token = getAuthToken();
const requestBody = { const requestBody = {
document_ids: [documentId] document_ids: [documentId]
}; };
RequestService.sendRequest() makeApiRequest({
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}/chunks`) url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/chunks`,
.method('POST') method: 'POST',
.data(requestBody) data: requestBody,
.header({ headers: { 'Content-Type': 'application/json' },
'Authorization': `Bearer ${token}`, callback: callback,
'Content-Type': 'application/json' errorCallback: errorCallback,
}) errorMessage: '解析文档失败',
.success((res) => { retryFunction: () => this.parseDocument(datasetId, documentId, callback, errorCallback)
RequestService.clearRequestTime(); });
callback(res);
})
.fail((err) => {
console.error('解析文档失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.parseDocument(datasetId, documentId, callback, errorCallback);
});
}).send();
}, },
/** /**
@@ -307,27 +256,14 @@ export default {
* @param {Function} errorCallback - 错误回调 * @param {Function} errorCallback - 错误回调
*/ */
deleteDocument(datasetId, documentId, callback, errorCallback) { deleteDocument(datasetId, documentId, callback, errorCallback) {
const token = getAuthToken(); makeApiRequest({
RequestService.sendRequest() url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/documents/${documentId}`,
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}/documents/${documentId}`) method: 'DELETE',
.method('DELETE') callback: callback,
.header({ 'Authorization': `Bearer ${token}` }) errorCallback: errorCallback,
.success((res) => { errorMessage: '删除文档失败',
RequestService.clearRequestTime(); retryFunction: () => this.deleteDocument(datasetId, documentId, callback, errorCallback)
callback(res); });
})
.fail((err) => {
console.error('删除文档失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.deleteDocument(datasetId, documentId, callback, errorCallback);
});
}).send();
}, },
/** /**
@@ -339,8 +275,7 @@ export default {
* @param {Function} errorCallback - 错误回调 * @param {Function} errorCallback - 错误回调
*/ */
listChunks(datasetId, documentId, params, callback, errorCallback) { listChunks(datasetId, documentId, params, callback, errorCallback) {
const token = getAuthToken(); let queryParams = new URLSearchParams({
const queryParams = new URLSearchParams({
page: params.page || 1, page: params.page || 1,
page_size: params.page_size || 10 page_size: params.page_size || 10
}).toString(); }).toString();
@@ -350,26 +285,14 @@ export default {
queryParams += `&keywords=${encodeURIComponent(params.keywords)}`; queryParams += `&keywords=${encodeURIComponent(params.keywords)}`;
} }
RequestService.sendRequest() makeApiRequest({
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}/documents/${documentId}/chunks?${queryParams}`) url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/documents/${documentId}/chunks?${queryParams}`,
.method('GET') method: 'GET',
.header({ 'Authorization': `Bearer ${token}` }) callback: callback,
.success((res) => { errorCallback: errorCallback,
RequestService.clearRequestTime(); errorMessage: '获取切片列表失败',
callback(res); retryFunction: () => this.listChunks(datasetId, documentId, params, callback, errorCallback)
}) });
.fail((err) => {
console.error('获取切片列表失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.listChunks(datasetId, documentId, params, callback, errorCallback);
});
}).send();
}, },
/** /**
@@ -381,28 +304,16 @@ export default {
* @param {Function} errorCallback - 错误回调 * @param {Function} errorCallback - 错误回调
*/ */
addChunk(datasetId, documentId, data, callback, errorCallback) { addChunk(datasetId, documentId, data, callback, errorCallback) {
const token = getAuthToken(); makeApiRequest({
RequestService.sendRequest() url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/documents/${documentId}/chunks`,
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}/documents/${documentId}/chunks`) method: 'POST',
.method('POST') data: data,
.data(data) headers: { 'Content-Type': 'application/json' },
.header({ 'Authorization': `Bearer ${token}` }) callback: callback,
.success((res) => { errorCallback: errorCallback,
RequestService.clearRequestTime(); errorMessage: '添加切片失败',
callback(res); retryFunction: () => this.addChunk(datasetId, documentId, data, callback, errorCallback)
}) });
.fail((err) => {
console.error('添加切片失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.addChunk(datasetId, documentId, data, callback, errorCallback);
});
}).send();
}, },
/** /**
@@ -413,28 +324,16 @@ export default {
* @param {Function} errorCallback - 错误回调 * @param {Function} errorCallback - 错误回调
*/ */
retrievalTest(datasetId, data, callback, errorCallback) { retrievalTest(datasetId, data, callback, errorCallback) {
const token = getAuthToken(); makeApiRequest({
RequestService.sendRequest() url: `${getServiceUrl()}/api/v1/datasets/${datasetId}/retrieval-test`,
.url(`${getServiceUrl()}/api/v1/datasets/${datasetId}/retrieval-test`) method: 'POST',
.method('POST') data: data,
.data(data) headers: { 'Content-Type': 'application/json' },
.header({ 'Authorization': `Bearer ${token}` }) callback: callback,
.success((res) => { errorCallback: errorCallback,
RequestService.clearRequestTime(); errorMessage: '召回测试失败',
callback(res); retryFunction: () => this.retrievalTest(datasetId, data, callback, errorCallback)
}) });
.fail((err) => {
console.error('召回测试失败:', err);
if (errorCallback) {
errorCallback(err);
}
})
.networkFail(() => {
const self = this;
RequestService.reAjaxFun(() => {
self.retrievalTest(datasetId, data, callback, errorCallback);
});
}).send();
} }
}; };
main/manager-web/src/i18n/en.js
+1 -1
View File
@@ -1206,7 +1206,7 @@ export default {
'knowledgeFileUpload.documentNamePlaceholder': 'Please enter document name', 'knowledgeFileUpload.documentNamePlaceholder': 'Please enter document name',
'knowledgeFileUpload.file': 'File', 'knowledgeFileUpload.file': 'File',
'knowledgeFileUpload.clickToUpload': 'Click to upload', 'knowledgeFileUpload.clickToUpload': 'Click to upload',
'knowledgeFileUpload.uploadTip': 'Only pdf, doc, docx, txt files are supported, and file size should not exceed 10MB', 'knowledgeFileUpload.uploadTip': 'Supported file types: PDF, DOC, DOCX, TXT, MD, CSV, XLS, XLSX, PPT, PPTX. Maximum 32 files per upload, each file size up to 10MB',
'knowledgeFileUpload.dragOrClick': 'Drag file here, or click to upload', 'knowledgeFileUpload.dragOrClick': 'Drag file here, or click to upload',
'knowledgeFileUpload.cancel': 'Cancel', 'knowledgeFileUpload.cancel': 'Cancel',
'knowledgeFileUpload.confirm': 'Confirm', 'knowledgeFileUpload.confirm': 'Confirm',
main/manager-web/src/i18n/zh_CN.js
+1 -1
View File
@@ -1206,7 +1206,7 @@ export default {
'knowledgeFileUpload.documentNamePlaceholder': '请输入文档名称', 'knowledgeFileUpload.documentNamePlaceholder': '请输入文档名称',
'knowledgeFileUpload.file': '文件', 'knowledgeFileUpload.file': '文件',
'knowledgeFileUpload.clickToUpload': '点击上传', 'knowledgeFileUpload.clickToUpload': '点击上传',
'knowledgeFileUpload.uploadTip': '只能上传pdf、doc、docx、txt文件，且不超过10MB', 'knowledgeFileUpload.uploadTip': '支持的文档类型：PDF、DOC、DOCX、TXT、MD、CSV、XLS、XLSX、PPT、PPTX，单次批量上传文件数不超过 32 个',
'knowledgeFileUpload.dragOrClick': '将文件拖到此处，或点击上传', 'knowledgeFileUpload.dragOrClick': '将文件拖到此处，或点击上传',
'knowledgeFileUpload.cancel': '取消', 'knowledgeFileUpload.cancel': '取消',
'knowledgeFileUpload.confirm': '确定', 'knowledgeFileUpload.confirm': '确定',
main/manager-web/src/i18n/zh_TW.js
+1 -1
View File
@@ -1206,7 +1206,7 @@ export default {
'knowledgeFileUpload.documentNamePlaceholder': '請輸入文檔名稱', 'knowledgeFileUpload.documentNamePlaceholder': '請輸入文檔名稱',
'knowledgeFileUpload.file': '文件', 'knowledgeFileUpload.file': '文件',
'knowledgeFileUpload.clickToUpload': '點擊上傳', 'knowledgeFileUpload.clickToUpload': '點擊上傳',
'knowledgeFileUpload.uploadTip': '只能上傳pdf、doc、docx、txt文件，且不超過10MB', 'knowledgeFileUpload.uploadTip': '支持的文件類型：PDF、DOC、DOCX、TXT、MD、CSV、XLS、XLSX、PPT、PPTX，单次批量上傳文件數不超過 32 個，每個文件大小不超過 10MB',
'knowledgeFileUpload.dragOrClick': '將文件拖到此處，或點擊上傳', 'knowledgeFileUpload.dragOrClick': '將文件拖到此處，或點擊上傳',
'knowledgeFileUpload.cancel': '取消', 'knowledgeFileUpload.cancel': '取消',
'knowledgeFileUpload.confirm': '確定', 'knowledgeFileUpload.confirm': '確定',
main/manager-web/src/views/KnowledgeBaseManagement.vue
+1 -1
View File
@@ -15,7 +15,7 @@
<div class="content-panel"> <div class="content-panel">
<div class="content-area"> <div class="content-area">
<el-card class="params-card" shadow="never"> <el-card class="params-card" shadow="never">
<div class="table-wrapper"> <div>
<el-table ref="paramsTable" :data="knowledgeBaseList" class="transparent-table" v-loading="loading" <el-table ref="paramsTable" :data="knowledgeBaseList" class="transparent-table" v-loading="loading"
:element-loading-text="$t('common.loading')" element-loading-spinner="el-icon-loading" :element-loading-text="$t('common.loading')" element-loading-spinner="el-icon-loading"
element-loading-background="rgba(255, 255, 255, 0.7)" element-loading-background="rgba(255, 255, 255, 0.7)"
main/manager-web/src/views/KnowledgeFileUpload.vue
+3 -186
View File
@@ -310,7 +310,6 @@ export default {
uploadDialogVisible: false, uploadDialogVisible: false,
uploading: false, uploading: false,
uploadForm: { uploadForm: {
name: '',
file: null file: null
}, },
uploadUrl: '', uploadUrl: '',
@@ -323,7 +322,6 @@ export default {
currentDocumentName: '', currentDocumentName: '',
sliceList: [], sliceList: [],
sliceLoading: false, sliceLoading: false,
sliceSearchKeyword: '',
sliceCurrentPage: 1, sliceCurrentPage: 1,
slicePageSize: 10, slicePageSize: 10,
sliceTotal: 0, sliceTotal: 0,
@@ -977,17 +975,6 @@ export default {
this.fetchSlices(); this.fetchSlices();
}, },
handleSliceDialogClose: function(done) {
this.sliceDialogVisible = false;
this.currentDocumentId = null;
this.currentDocumentName = '';
this.sliceList = [];
this.sliceTotal = 0;
if (done) {
done();
}
},
// 跳转到切片管理第一页 // 跳转到切片管理第一页
goToSliceFirstPage: function() { goToSliceFirstPage: function() {
if (this.sliceCurrentPage !== 1) { if (this.sliceCurrentPage !== 1) {
@@ -1433,9 +1420,9 @@ export default {
/* 拖拽上传区域样式 */ /* 拖拽上传区域样式 */
.document-uploader { .document-uploader {
:deep(.el-upload-dragger) { :deep(.el-upload-dragger) {
width: 100%; width: 600px;
height: 200px; height: 300px;
min-height: 200px; min-height: 300px;
border: 2px dashed #c0c4cc; border: 2px dashed #c0c4cc;
border-radius: 16px; border-radius: 16px;
cursor: pointer; cursor: pointer;
@@ -1993,10 +1980,6 @@ export default {
gap: 10px; gap: 10px;
} }
.slice-table {
margin-bottom: 20px;
}
.slice-pagination { .slice-pagination {
text-align: right; text-align: right;
margin-top: 20px; margin-top: 20px;
@@ -2007,172 +1990,6 @@ export default {
justify-content: flex-end; justify-content: flex-end;
gap: 5px; gap: 5px;
} }
:deep(.el-pagination) {
display: flex;
align-items: center;
justify-content: flex-end;
gap: 8px;
.el-pagination__sizes {
margin-right: 8px;
.el-input__inner {
height: 32px;
line-height: 32px;
border-radius: 4px;
border: 1px solid #e4e7ed;
background: #dee7ff;
color: #606266;
font-size: 14px;
}
.el-input__suffix {
right: 6px;
width: 15px;
height: 20px;
display: flex;
justify-content: center;
align-items: center;
top: 6px;
border-radius: 4px;
}
.el-input__suffix-inner {
display: flex;
align-items: center;
justify-content: center;
width: 100%;
}
.el-icon-arrow-up:before {
content: "";
display: inline-block;
border-left: 6px solid transparent;
border-right: 6px solid transparent;
border-top: 9px solid #606266;
position: relative;
transform: rotate(0deg);
transition: transform 0.3s;
}
}
.btn-prev, .btn-next {
min-width: 60px;
height: 32px;
padding: 0 12px;
border-radius: 4px;
border: 1px solid #e4e7ed;
background: #dee7ff;
color: #606266;
font-size: 14px;
cursor: pointer;
transition: all 0.3s ease;
&:hover {
background: #d7dce6;
}
&:disabled {
opacity: 0.6;
cursor: not-allowed;
}
}
.el-pager {
display: flex;
gap: 4px;
.number {
min-width: 28px;
height: 32px;
padding: 0;
border-radius: 4px;
border: 1px solid transparent;
background: transparent;
color: #606266;
font-size: 14px;
cursor: pointer;
transition: all 0.3s ease;
&:hover {
background: rgba(245, 247, 250, 0.3);
}
&.active {
background: #5f70f3 !important;
color: #ffffff !important;
border-color: #5f70f3 !important;
&:hover {
background: #6d7cf5 !important;
}
}
}
}
.el-pagination__jump {
margin-left: 8px;
color: #606266;
font-size: 14px;
.el-pagination__editor {
width: 50px;
margin: 0 8px;
.el-input__inner {
height: 32px;
line-height: 32px;
border-radius: 4px;
border: 1px solid #e4e7ed;
background: #dee7ff;
color: #606266;
font-size: 14px;
}
}
}
.el-pagination__total {
margin-right: 8px;
color: #606266;
font-size: 14px;
}
}
}
.slice-content {
max-height: 300px;
min-height: 60px;
overflow-y: auto;
word-break: break-all;
line-height: 1.4;
padding: 8px 12px;
border: 1px solid #e4e7ed;
border-radius: 4px;
background-color: #f8f9fa;
white-space: pre-wrap;
}
.slice-keywords, .slice-questions {
max-height: 60px;
overflow-y: auto;
}
.slice-tag {
margin: 2px;
}
.add-slice-form {
padding: 20px 0;
}
.form-item {
margin-bottom: 20px;
}
.form-actions {
text-align: right;
margin-top: 20px;
} }
@media (min-width: 1144px) { @media (min-width: 1144px) {