From 9755912b514f1db982e9d4333c6ddcdfd8c321e2 Mon Sep 17 00:00:00 2001 From: yuhongxiao Date: Mon, 9 Mar 2026 14:58:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=9F=A5=E8=AF=86=E6=A3=80=E7=B4=A2?= =?UTF-8?q?=E5=93=8D=E5=BA=94=E7=BB=93=E6=9E=84=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ai/z/openapi/service/model/ModelData.java | 3 + .../ai/z/openapi/service/model/ToolCalls.java | 6 + .../z/openapi/service/tools/DocReference.java | 24 +++ .../service/tools/KnowledgeV2Result.java | 163 ++++++++++++++++++ 4 files changed, 196 insertions(+) create mode 100644 core/src/main/java/ai/z/openapi/service/tools/DocReference.java create mode 100644 core/src/main/java/ai/z/openapi/service/tools/KnowledgeV2Result.java diff --git a/core/src/main/java/ai/z/openapi/service/model/ModelData.java b/core/src/main/java/ai/z/openapi/service/model/ModelData.java index fc12c85..81ba43f 100644 --- a/core/src/main/java/ai/z/openapi/service/model/ModelData.java +++ b/core/src/main/java/ai/z/openapi/service/model/ModelData.java @@ -1,5 +1,6 @@ package ai.z.openapi.service.model; +import ai.z.openapi.service.tools.KnowledgeV2Result; import com.fasterxml.jackson.annotation.JsonProperty; import ai.z.openapi.service.web_search.WebSearchResp; import lombok.AllArgsConstructor; @@ -54,4 +55,6 @@ public final class ModelData { private String delta; + private KnowledgeV2Result knowledgeV2; + } diff --git a/core/src/main/java/ai/z/openapi/service/model/ToolCalls.java b/core/src/main/java/ai/z/openapi/service/model/ToolCalls.java index 02a7edc..5bd3165 100644 --- a/core/src/main/java/ai/z/openapi/service/model/ToolCalls.java +++ b/core/src/main/java/ai/z/openapi/service/model/ToolCalls.java @@ -1,11 +1,14 @@ package ai.z.openapi.service.model; +import ai.z.openapi.service.tools.DocReference; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + /** * Represents tool calls made by the model during conversation. This class contains * information about function calls including the function details, unique identifier, and @@ -35,4 +38,7 @@ public class ToolCalls { @JsonProperty("mcp") private MCPToolCall mcp; + @JsonProperty("doc_reference") + private List docReferenceList; + } diff --git a/core/src/main/java/ai/z/openapi/service/tools/DocReference.java b/core/src/main/java/ai/z/openapi/service/tools/DocReference.java new file mode 100644 index 0000000..3fa48a9 --- /dev/null +++ b/core/src/main/java/ai/z/openapi/service/tools/DocReference.java @@ -0,0 +1,24 @@ +package ai.z.openapi.service.tools; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import java.io.Serializable; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +@JsonIgnoreProperties(ignoreUnknown = true) +public class DocReference implements Serializable { + + /** 文档索引 */ + private Integer index; + + /** 文档类型 */ + private String doc_type; + + /** 文档名称 */ + private String doc_name; + +} \ No newline at end of file diff --git a/core/src/main/java/ai/z/openapi/service/tools/KnowledgeV2Result.java b/core/src/main/java/ai/z/openapi/service/tools/KnowledgeV2Result.java new file mode 100644 index 0000000..b57d8aa --- /dev/null +++ b/core/src/main/java/ai/z/openapi/service/tools/KnowledgeV2Result.java @@ -0,0 +1,163 @@ +package ai.z.openapi.service.tools; + +import java.io.Serializable; +import java.util.List; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** 知识库检索V2返回结果 */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class KnowledgeV2Result implements Serializable { + + /** 数据来源列表 */ + private List contents; + + /** query重写结果 */ + private RewrittenQuery rewritten_query; + + private String type; + + /** 数据来源 */ + @lombok.Data + @AllArgsConstructor + @NoArgsConstructor + public static class Content { + + /** 切片ID（uuid） */ + private String id; + + /** 模态类型：text、image_url、video_url */ + private String type; + + /** 文本内容 */ + private String text; + + /** 文本中的媒体文件列表 */ + private List medias; + + /** 图像URL对象 */ + private ImageUrl image_url; + + /** 视频URL对象 */ + private VideoUrl video_url; + + /** 召回位次（rankIndex） */ + private Integer index; + + /** 召回分数（rankScore） */ + private Double score; + + /** 重排位次（rerankIndex） */ + private Integer rerank_index; + + /** 重排分数（rerankScore） */ + private Double rerank_score; + + /** 元数据 */ + private Metadata metadata; + + } + + /** 媒体文件 */ + @lombok.Data + @AllArgsConstructor + @NoArgsConstructor + public static class Media { + + /** 图片ID */ + private String id; + + /** 图片URL */ + private String url; + + /** 图片描述 */ + private String description; + + } + + /** 图像URL对象 */ + @lombok.Data + @AllArgsConstructor + @NoArgsConstructor + public static class ImageUrl { + + /** URL */ + private String url; + + } + + /** 视频URL对象 */ + @lombok.Data + @AllArgsConstructor + @NoArgsConstructor + public static class VideoUrl { + + /** URL */ + private String url; + + } + + /** 元数据 */ + @lombok.Data + @AllArgsConstructor + @NoArgsConstructor + public static class Metadata { + + /** 切片ID */ + private String _id; + + /** 知识库ID */ + private String know_id; + + /** 文档ID */ + private String doc_id; + + /** 文档类型（dtype） */ + private String doc_type; + + /** 文档名称（filename） */ + private String doc_name; + + /** 文档URL */ + private String doc_url; + + /** 切片下标 */ + private Integer index; + + /** 文档页码 */ + private Integer page_index; + + /** 视频切片下标 */ + private Integer clip_index; + + /** 首帧时间戳 */ + private Long start_time; + + /** 尾帧时间戳 */ + private Long end_time; + + /** 视频切片时长 */ + private Long duration; + + /** 关键帧列表 */ + private List frames; + + } + + /** query重写结果 */ + @lombok.Data + @AllArgsConstructor + @NoArgsConstructor + public static class RewrittenQuery { + + /** 生效query */ + private String primary_query; + + /** 备选query列表 */ + private List multi_queries; + + } +} From fb4a24eed94e14a25ae5d86c5faf97080f4ae8ef Mon Sep 17 00:00:00 2001 From: yuhongxiao Date: Mon, 9 Mar 2026 15:45:10 +0800 Subject: [PATCH 2/2] code format --- .../z/openapi/service/tools/DocReference.java | 5 ++-- .../service/tools/KnowledgeV2Result.java | 27 ++++++++----------- pom.xml | 2 +- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/core/src/main/java/ai/z/openapi/service/tools/DocReference.java b/core/src/main/java/ai/z/openapi/service/tools/DocReference.java index 3fa48a9..36d8571 100644 --- a/core/src/main/java/ai/z/openapi/service/tools/DocReference.java +++ b/core/src/main/java/ai/z/openapi/service/tools/DocReference.java @@ -1,11 +1,13 @@ package ai.z.openapi.service.tools; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import java.io.Serializable; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; + @Data @NoArgsConstructor @AllArgsConstructor @@ -20,5 +22,4 @@ public class DocReference implements Serializable { /** 文档名称 */ private String doc_name; - } \ No newline at end of file diff --git a/core/src/main/java/ai/z/openapi/service/tools/KnowledgeV2Result.java b/core/src/main/java/ai/z/openapi/service/tools/KnowledgeV2Result.java index b57d8aa..088a914 100644 --- a/core/src/main/java/ai/z/openapi/service/tools/KnowledgeV2Result.java +++ b/core/src/main/java/ai/z/openapi/service/tools/KnowledgeV2Result.java @@ -1,11 +1,12 @@ package ai.z.openapi.service.tools; -import java.io.Serializable; -import java.util.List; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.io.Serializable; +import java.util.List; + /** 知识库检索V2返回结果 */ @Data @AllArgsConstructor @@ -21,7 +22,7 @@ public class KnowledgeV2Result implements Serializable { private String type; /** 数据来源 */ - @lombok.Data + @Data @AllArgsConstructor @NoArgsConstructor public static class Content { @@ -57,12 +58,11 @@ public static class Content { private Double rerank_score; /** 元数据 */ - private Metadata metadata; - + private MetadataDTO metadata; } /** 媒体文件 */ - @lombok.Data + @Data @AllArgsConstructor @NoArgsConstructor public static class Media { @@ -75,36 +75,33 @@ public static class Media { /** 图片描述 */ private String description; - } /** 图像URL对象 */ - @lombok.Data + @Data @AllArgsConstructor @NoArgsConstructor public static class ImageUrl { /** URL */ private String url; - } /** 视频URL对象 */ - @lombok.Data + @Data @AllArgsConstructor @NoArgsConstructor public static class VideoUrl { /** URL */ private String url; - } /** 元数据 */ - @lombok.Data + @Data @AllArgsConstructor @NoArgsConstructor - public static class Metadata { + public static class MetadataDTO { /** 切片ID */ private String _id; @@ -144,11 +141,10 @@ public static class Metadata { /** 关键帧列表 */ private List frames; - } /** query重写结果 */ - @lombok.Data + @Data @AllArgsConstructor @NoArgsConstructor public static class RewrittenQuery { @@ -158,6 +154,5 @@ public static class RewrittenQuery { /** 备选query列表 */ private List multi_queries; - } } diff --git a/pom.xml b/pom.xml index 6d140d5..9456fe6 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ - 0.3.3 + 0.3.3.3 8 UTF-8 UTF-8