fix: 适配文档解析实体重构
- 将文档桥接层切换到 easy-agents document entity 包 - 清理请求工厂中已移除的 PDF 专属字段调用 - 更新桥接映射与测试以保持知识库 PDF 解析链路可用
This commit is contained in:
@@ -1,9 +1,9 @@
|
|||||||
package tech.easyflow.ai.document.model;
|
package tech.easyflow.ai.document.model;
|
||||||
|
|
||||||
import com.easyagents.document.core.model.DocumentBlock;
|
import com.easyagents.document.core.entity.DocumentBlock;
|
||||||
import com.easyagents.document.core.model.DocumentImage;
|
import com.easyagents.document.core.entity.DocumentImage;
|
||||||
import com.easyagents.document.core.model.DocumentPage;
|
import com.easyagents.document.core.entity.DocumentPage;
|
||||||
import com.easyagents.document.core.model.DocumentTable;
|
import com.easyagents.document.core.entity.DocumentTable;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.LinkedHashMap;
|
import java.util.LinkedHashMap;
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
package tech.easyflow.ai.document.service.impl;
|
package tech.easyflow.ai.document.service.impl;
|
||||||
|
|
||||||
import com.easyagents.document.core.DocumentParseService;
|
import com.easyagents.document.core.DocumentParseService;
|
||||||
import com.easyagents.document.core.model.ParseResponse;
|
import com.easyagents.document.core.entity.ParseResponse;
|
||||||
import com.easyagents.document.core.model.ParseResult;
|
import com.easyagents.document.core.entity.ParseResult;
|
||||||
import com.easyagents.document.core.model.ParseTaskInfo;
|
import com.easyagents.document.core.entity.ParseTaskInfo;
|
||||||
import com.easyagents.document.core.model.ParseTaskStatus;
|
import com.easyagents.document.core.entity.ParseTaskStatus;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import org.springframework.lang.Nullable;
|
import org.springframework.lang.Nullable;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
package tech.easyflow.ai.document.support;
|
package tech.easyflow.ai.document.support;
|
||||||
|
|
||||||
import com.easyagents.document.core.model.ParseFile;
|
import com.easyagents.document.core.entity.ParseFile;
|
||||||
import com.easyagents.document.core.model.ParseRequest;
|
import com.easyagents.document.core.entity.ParseRequest;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import tech.easyflow.ai.document.exception.DocumentParseBridgeException;
|
import tech.easyflow.ai.document.exception.DocumentParseBridgeException;
|
||||||
import tech.easyflow.ai.document.model.DocumentParseScenario;
|
import tech.easyflow.ai.document.model.DocumentParseScenario;
|
||||||
@@ -32,10 +32,6 @@ public class DocumentParseRequestFactory {
|
|||||||
throw DocumentParseBridgeException.requestBuildFailed("解析场景不能为空");
|
throw DocumentParseBridgeException.requestBuildFailed("解析场景不能为空");
|
||||||
}
|
}
|
||||||
ParseRequest request = new ParseRequest();
|
ParseRequest request = new ParseRequest();
|
||||||
// 保持为空,交由 easy-agents provider 按环境配置回填默认值。
|
|
||||||
request.setParseMethod(null);
|
|
||||||
request.setFormulaEnabled(null);
|
|
||||||
request.setTableEnabled(null);
|
|
||||||
request.addFile(ParseFile.of(source.getFileName(), source.getContentBytes(), source.getContentType()));
|
request.addFile(ParseFile.of(source.getFileName(), source.getContentBytes(), source.getContentType()));
|
||||||
applyScenario(request, scenario);
|
applyScenario(request, scenario);
|
||||||
return request;
|
return request;
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
package tech.easyflow.ai.document.support;
|
package tech.easyflow.ai.document.support;
|
||||||
|
|
||||||
import com.easyagents.document.core.model.ParseArtifacts;
|
import com.easyagents.document.core.entity.ParseArtifacts;
|
||||||
import com.easyagents.document.core.model.ParseResult;
|
import com.easyagents.document.core.entity.ParseResult;
|
||||||
import com.easyagents.document.core.model.ParseTaskInfo;
|
import com.easyagents.document.core.entity.ParseTaskInfo;
|
||||||
import com.easyagents.document.core.model.ParseTaskStatus;
|
import com.easyagents.document.core.entity.ParseTaskStatus;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import org.springframework.util.StringUtils;
|
import org.springframework.util.StringUtils;
|
||||||
import tech.easyflow.ai.document.model.DocumentParseArtifacts;
|
import tech.easyflow.ai.document.model.DocumentParseArtifacts;
|
||||||
|
|||||||
@@ -1,11 +1,11 @@
|
|||||||
package tech.easyflow.ai.document.service.impl;
|
package tech.easyflow.ai.document.service.impl;
|
||||||
|
|
||||||
import com.easyagents.document.core.DocumentParseService;
|
import com.easyagents.document.core.DocumentParseService;
|
||||||
import com.easyagents.document.core.model.ParseRequest;
|
import com.easyagents.document.core.entity.ParseRequest;
|
||||||
import com.easyagents.document.core.model.ParseResponse;
|
import com.easyagents.document.core.entity.ParseResponse;
|
||||||
import com.easyagents.document.core.model.ParseResult;
|
import com.easyagents.document.core.entity.ParseResult;
|
||||||
import com.easyagents.document.core.model.ParseTaskInfo;
|
import com.easyagents.document.core.entity.ParseTaskInfo;
|
||||||
import com.easyagents.document.core.model.ParseTaskStatus;
|
import com.easyagents.document.core.entity.ParseTaskStatus;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import tech.easyflow.ai.document.exception.DocumentParseBridgeException;
|
import tech.easyflow.ai.document.exception.DocumentParseBridgeException;
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
package tech.easyflow.ai.document.support;
|
package tech.easyflow.ai.document.support;
|
||||||
|
|
||||||
import com.easyagents.document.core.model.ParseRequest;
|
import com.easyagents.document.core.entity.ParseRequest;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import tech.easyflow.ai.document.model.DocumentParseScenario;
|
import tech.easyflow.ai.document.model.DocumentParseScenario;
|
||||||
@@ -22,9 +22,6 @@ public class DocumentParseRequestFactoryTest {
|
|||||||
|
|
||||||
ParseRequest request = factory.build(buildSource(), DocumentParseScenario.WORKFLOW_TEXT);
|
ParseRequest request = factory.build(buildSource(), DocumentParseScenario.WORKFLOW_TEXT);
|
||||||
|
|
||||||
Assert.assertNull(request.getParseMethod());
|
|
||||||
Assert.assertNull(request.getFormulaEnabled());
|
|
||||||
Assert.assertNull(request.getTableEnabled());
|
|
||||||
Assert.assertTrue(request.getReturnMarkdown());
|
Assert.assertTrue(request.getReturnMarkdown());
|
||||||
Assert.assertFalse(request.getReturnMiddleJson());
|
Assert.assertFalse(request.getReturnMiddleJson());
|
||||||
Assert.assertFalse(request.getReturnContentList());
|
Assert.assertFalse(request.getReturnContentList());
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
package tech.easyflow.ai.document.support;
|
package tech.easyflow.ai.document.support;
|
||||||
|
|
||||||
import com.easyagents.document.core.model.ParseArtifacts;
|
import com.easyagents.document.core.entity.ParseArtifacts;
|
||||||
import com.easyagents.document.core.model.ParseResult;
|
import com.easyagents.document.core.entity.ParseResult;
|
||||||
import com.easyagents.document.core.model.ParseResponse;
|
import com.easyagents.document.core.entity.ParseResponse;
|
||||||
import com.easyagents.document.core.model.ParseTaskInfo;
|
import com.easyagents.document.core.entity.ParseTaskInfo;
|
||||||
import org.junit.Assert;
|
import org.junit.Assert;
|
||||||
import org.junit.Test;
|
import org.junit.Test;
|
||||||
import tech.easyflow.ai.document.model.DocumentParseTaskInfo;
|
import tech.easyflow.ai.document.model.DocumentParseTaskInfo;
|
||||||
|
|||||||
Reference in New Issue
Block a user