From e581edb239cd21d3fc7fcdf4afa761d2e0ce732d Mon Sep 17 00:00:00 2001 From: jack ning Date: Tue, 29 Apr 2025 16:22:28 +0800 Subject: [PATCH] update modules/kbase: add 13 mod 16 files --- .../com/bytedesk/kbase/faq/package-info.java | 4 + .../bytedesk/kbase/kbase/package-info.java | 4 + .../{SplitEntity.java => ChunkEntity.java} | 14 ++-- ...Listener.java => ChunkEntityListener.java} | 32 +++---- ...tListener.java => ChunkEventListener.java} | 2 +- .../{SplitExcel.java => ChunkExcel.java} | 4 +- ...Permissions.java => ChunkPermissions.java} | 4 +- ...itRepository.java => ChunkRepository.java} | 8 +- .../{SplitRequest.java => ChunkRequest.java} | 2 +- ...{SplitResponse.java => ChunkResponse.java} | 2 +- ...ntroller.java => ChunkRestController.java} | 44 +++++----- ...RestService.java => ChunkRestService.java} | 84 +++++++++---------- ...ification.java => ChunkSpecification.java} | 4 +- ...itStatusEnum.java => ChunkStatusEnum.java} | 2 +- ...{SplitTypeEnum.java => ChunkTypeEnum.java} | 2 +- ...CreateEvent.java => ChunkCreateEvent.java} | 12 +-- ...DeleteEvent.java => ChunkDeleteEvent.java} | 12 +-- ...DocEvent.java => ChunkUpdateDocEvent.java} | 12 +-- ...UpdateEvent.java => ChunkUpdateEvent.java} | 12 +-- .../bytedesk/kbase/llm_file/FileEntity.java | 30 +++---- .../kbase/llm_file/FileEventListener.java | 4 +- .../bytedesk/kbase/llm_file/FileRequest.java | 22 ++--- .../kbase/llm_file/FileUploadExtra.java | 8 +- .../bytedesk/kbase/llm_file/package-info.java | 5 ++ .../bytedesk/kbase/llm_text/TextEntity.java | 28 +++---- .../bytedesk/kbase/llm_text/TextRequest.java | 20 ++--- .../bytedesk/kbase/llm_text/TextResponse.java | 22 ++--- .../bytedesk/kbase/llm_text/package-info.java | 5 ++ .../kbase/llm_website/WebsiteEntity.java | 30 +++---- .../kbase/llm_website/package-info.java | 5 ++ .../kbase/quick_reply/package-info.java | 5 ++ .../controller/PageRouteController.java | 4 +- 32 files changed, 238 insertions(+), 210 deletions(-) create mode 100644 modules/kbase/src/main/java/com/bytedesk/kbase/faq/package-info.java create mode 100644 modules/kbase/src/main/java/com/bytedesk/kbase/kbase/package-info.java rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/{SplitEntity.java => ChunkEntity.java} (89%) rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/{SplitEntityListener.java => ChunkEntityListener.java} (59%) rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/{SplitEventListener.java => ChunkEventListener.java} (97%) rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/{SplitExcel.java => ChunkExcel.java} (97%) rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/{SplitPermissions.java => ChunkPermissions.java} (95%) rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/{SplitRepository.java => ChunkRepository.java} (77%) rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/{SplitRequest.java => ChunkRequest.java} (97%) rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/{SplitResponse.java => ChunkResponse.java} (97%) rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/{SplitRestController.java => ChunkRestController.java} (62%) rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/{SplitRestService.java => ChunkRestService.java} (72%) rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/{SplitSpecification.java => ChunkSpecification.java} (96%) rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/{SplitStatusEnum.java => ChunkStatusEnum.java} (96%) rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/{SplitTypeEnum.java => ChunkTypeEnum.java} (96%) rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/{SplitCreateEvent.java => ChunkCreateEvent.java} (79%) rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/{SplitDeleteEvent.java => ChunkDeleteEvent.java} (79%) rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/{SplitUpdateDocEvent.java => ChunkUpdateDocEvent.java} (78%) rename modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/{SplitUpdateEvent.java => ChunkUpdateEvent.java} (79%) create mode 100644 modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/package-info.java create mode 100644 modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/package-info.java create mode 100644 modules/kbase/src/main/java/com/bytedesk/kbase/llm_website/package-info.java create mode 100644 modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/package-info.java diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/faq/package-info.java b/modules/kbase/src/main/java/com/bytedesk/kbase/faq/package-info.java new file mode 100644 index 0000000000..3d4381b54e --- /dev/null +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/faq/package-info.java @@ -0,0 +1,4 @@ +@NonNullApi +package com.bytedesk.kbase.faq; + +import org.springframework.lang.NonNullApi; diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/kbase/package-info.java b/modules/kbase/src/main/java/com/bytedesk/kbase/kbase/package-info.java new file mode 100644 index 0000000000..64c3189b68 --- /dev/null +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/kbase/package-info.java @@ -0,0 +1,4 @@ +@NonNullApi +package com.bytedesk.kbase.kbase; + +import org.springframework.lang.NonNullApi; diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitEntity.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkEntity.java similarity index 89% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitEntity.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkEntity.java index 682cec028f..c9633ee46f 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitEntity.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkEntity.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-05-11 18:14:28 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-04-29 08:36:42 + * @LastEditTime: 2025-04-29 16:19:26 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -49,19 +49,19 @@ import lombok.experimental.SuperBuilder; @EqualsAndHashCode(callSuper = true) @AllArgsConstructor @NoArgsConstructor -@EntityListeners({SplitEntityListener.class}) -@Table(name = "bytedesk_kbase_llm_split") -public class SplitEntity extends BaseEntity { +@EntityListeners({ChunkEntityListener.class}) +@Table(name = "bytedesk_kbase_llm_chunk") +public class ChunkEntity extends BaseEntity { private String name; - // split 之后可能不需要这么长的 content，待优化 + // chunk 之后可能不需要这么长的 content，待优化 @Column(columnDefinition = TypeConsts.COLUMN_TYPE_TEXT) private String content; @Builder.Default - @Column(name = "split_type") - private String type = SplitTypeEnum.TEXT.name(); + @Column(name = "chunk_type") + private String type = ChunkTypeEnum.TEXT.name(); @Builder.Default @Convert(converter = StringListConverter.class) diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitEntityListener.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkEntityListener.java similarity index 59% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitEntityListener.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkEntityListener.java index 40e2124502..761296c423 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitEntityListener.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkEntityListener.java @@ -18,9 +18,9 @@ import org.springframework.util.SerializationUtils; import com.bytedesk.core.config.BytedeskEventPublisher; import com.bytedesk.core.utils.ApplicationContextHolder; -import com.bytedesk.kbase.llm_chunk.event.SplitCreateEvent; -import com.bytedesk.kbase.llm_chunk.event.SplitDeleteEvent; -import com.bytedesk.kbase.llm_chunk.event.SplitUpdateEvent; +import com.bytedesk.kbase.llm_chunk.event.ChunkCreateEvent; +import com.bytedesk.kbase.llm_chunk.event.ChunkDeleteEvent; +import com.bytedesk.kbase.llm_chunk.event.ChunkUpdateEvent; import jakarta.persistence.PostPersist; import jakarta.persistence.PostUpdate; @@ -28,29 +28,29 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Component -public class SplitEntityListener { +public class ChunkEntityListener { @PostPersist - public void onPostPersist(SplitEntity split) { - log.info("SplitEntityListener onPostPersist: {}", split.getName()); - SplitEntity clonedSplit = SerializationUtils.clone(split); + public void onPostPersist(ChunkEntity chunk) { + log.info("ChunkEntityListener onPostPersist: {}", chunk.getName()); + ChunkEntity clonedChunk = SerializationUtils.clone(chunk); // BytedeskEventPublisher publisher = ApplicationContextHolder.getBean(BytedeskEventPublisher.class); - publisher.publishEvent(new SplitCreateEvent(clonedSplit)); + publisher.publishEvent(new ChunkCreateEvent(clonedChunk)); } @PostUpdate - public void onPostUpdate(SplitEntity split) { - log.info("SplitEntityListener onPostUpdate: {}", split.getName()); - SplitEntity clonedSplit = SerializationUtils.clone(split); + public void onPostUpdate(ChunkEntity chunk) { + log.info("ChunkEntityListener onPostUpdate: {}", chunk.getName()); + ChunkEntity clonedChunk = SerializationUtils.clone(chunk); // BytedeskEventPublisher publisher = ApplicationContextHolder.getBean(BytedeskEventPublisher.class); - if (split.isDeleted()) { - log.info("SplitEntityListener onPostUpdate: Split is deleted"); - publisher.publishEvent(new SplitDeleteEvent(clonedSplit)); + if (chunk.isDeleted()) { + log.info("ChunkEntityListener onPostUpdate: Chunk is deleted"); + publisher.publishEvent(new ChunkDeleteEvent(clonedChunk)); }else { - log.info("SplitEntityListener onPostUpdate: Split is update"); - publisher.publishEvent(new SplitUpdateEvent(clonedSplit)); + log.info("ChunkEntityListener onPostUpdate: Chunk is update"); + publisher.publishEvent(new ChunkUpdateEvent(clonedChunk)); } } } diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitEventListener.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkEventListener.java similarity index 97% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitEventListener.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkEventListener.java index e4b3105e7f..8b5ec6cc73 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitEventListener.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkEventListener.java @@ -21,7 +21,7 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Component @AllArgsConstructor -public class SplitEventListener { +public class ChunkEventListener { // @EventListener // public void onFileCreateEvent(FileCreateEvent event) { diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitExcel.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkExcel.java similarity index 97% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitExcel.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkExcel.java index 3420726b40..cd502c60f3 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitExcel.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkExcel.java @@ -19,10 +19,10 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; /** - * Split导出Excel实体类 + * Chunk导出Excel实体类 */ @Data -public class SplitExcel { +public class ChunkExcel { @ExcelProperty(value = "名称") @ColumnWidth(30) diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitPermissions.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkPermissions.java similarity index 95% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitPermissions.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkPermissions.java index 61ad5b219a..068d349057 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitPermissions.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkPermissions.java @@ -13,10 +13,10 @@ */ package com.bytedesk.kbase.llm_chunk; -public class SplitPermissions { +public class ChunkPermissions { public static final String SPLIT_PREFIX = "SPLIT_"; - // Split permissions + // Chunk permissions public static final String SPLIT_CREATE = "hasAuthority('SPLIT_CREATE')"; public static final String SPLIT_READ = "hasAuthority('SPLIT_READ')"; public static final String SPLIT_UPDATE = "hasAuthority('SPLIT_UPDATE')"; diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitRepository.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkRepository.java similarity index 77% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitRepository.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkRepository.java index ec30ba96d5..13e791f0cc 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitRepository.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkRepository.java @@ -19,13 +19,13 @@ import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -public interface SplitRepository extends JpaRepository, JpaSpecificationExecutor { +public interface ChunkRepository extends JpaRepository, JpaSpecificationExecutor { - Optional findByUid(String uid); + Optional findByUid(String uid); - Optional findByDocId(String docId); + Optional findByDocId(String docId); // Boolean existsByPlatform(String platform); - List findByKbase_Uid(String kbUid); + List findByKbase_Uid(String kbUid); } diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitRequest.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkRequest.java similarity index 97% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitRequest.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkRequest.java index 7758ae0af2..5a2b2744b1 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitRequest.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkRequest.java @@ -32,7 +32,7 @@ import lombok.experimental.SuperBuilder; @EqualsAndHashCode(callSuper = false) @AllArgsConstructor @NoArgsConstructor -public class SplitRequest extends BaseRequest { +public class ChunkRequest extends BaseRequest { private String name; diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitResponse.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkResponse.java similarity index 97% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitResponse.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkResponse.java index ce0fc8541f..ebabc988a6 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitResponse.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkResponse.java @@ -31,7 +31,7 @@ import lombok.experimental.Accessors; @EqualsAndHashCode(callSuper = true) @AllArgsConstructor @NoArgsConstructor -public class SplitResponse extends BaseResponse { +public class ChunkResponse extends BaseResponse { private String name; diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitRestController.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkRestController.java similarity index 62% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitRestController.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkRestController.java index c9ae960060..4d969a772f 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitRestController.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkRestController.java @@ -26,74 +26,74 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.AllArgsConstructor; @RestController -@RequestMapping("/api/v1/llm/split") +@RequestMapping("/api/v1/llm/chunk") @AllArgsConstructor -public class SplitRestController extends BaseRestController { +public class ChunkRestController extends BaseRestController { - private final SplitRestService splitRestService; + private final ChunkRestService chunkRestService; @PreAuthorize("hasAuthority('KBASE_READ')") @Override - public ResponseEntity queryByOrg(SplitRequest request) { + public ResponseEntity queryByOrg(ChunkRequest request) { - Page splits = splitRestService.queryByOrg(request); + Page chunks = chunkRestService.queryByOrg(request); - return ResponseEntity.ok(JsonResult.success(splits)); + return ResponseEntity.ok(JsonResult.success(chunks)); } @PreAuthorize("hasAuthority('KBASE_READ')") @Override - public ResponseEntity queryByUser(SplitRequest request) { + public ResponseEntity queryByUser(ChunkRequest request) { - Page splits = splitRestService.queryByUser(request); + Page chunks = chunkRestService.queryByUser(request); - return ResponseEntity.ok(JsonResult.success(splits)); + return ResponseEntity.ok(JsonResult.success(chunks)); } @PreAuthorize("hasAuthority('KBASE_READ')") @Override - public ResponseEntity queryByUid(SplitRequest request) { + public ResponseEntity queryByUid(ChunkRequest request) { // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'queryByUid'"); } @PreAuthorize("hasAuthority('KBASE_CREATE')") @Override - public ResponseEntity create(SplitRequest request) { + public ResponseEntity create(ChunkRequest request) { - SplitResponse split = splitRestService.create(request); + ChunkResponse chunk = chunkRestService.create(request); - return ResponseEntity.ok(JsonResult.success(split)); + return ResponseEntity.ok(JsonResult.success(chunk)); } @PreAuthorize("hasAuthority('KBASE_UPDATE')") @Override - public ResponseEntity update(SplitRequest request) { + public ResponseEntity update(ChunkRequest request) { - SplitResponse split = splitRestService.update(request); + ChunkResponse chunk = chunkRestService.update(request); - return ResponseEntity.ok(JsonResult.success(split)); + return ResponseEntity.ok(JsonResult.success(chunk)); } @PreAuthorize("hasAuthority('KBASE_DELETE')") @Override - public ResponseEntity delete(SplitRequest request) { + public ResponseEntity delete(ChunkRequest request) { - splitRestService.delete(request); + chunkRestService.delete(request); return ResponseEntity.ok(JsonResult.success()); } @PreAuthorize("hasAuthority('KBASE_EXPORT')") @Override - public Object export(SplitRequest request, HttpServletResponse response) { + public Object export(ChunkRequest request, HttpServletResponse response) { return exportTemplate( request, response, - splitRestService, - SplitExcel.class, + chunkRestService, + ChunkExcel.class, "分词", - "split" + "chunk" ); } } \ No newline at end of file diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitRestService.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkRestService.java similarity index 72% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitRestService.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkRestService.java index 80245260e4..04d860b85c 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitRestService.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkRestService.java @@ -37,9 +37,9 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Service @RequiredArgsConstructor -public class SplitRestService extends BaseRestServiceWithExcel { +public class ChunkRestService extends BaseRestServiceWithExcel { - private final SplitRepository splitRepository; + private final ChunkRepository chunkRepository; private final ModelMapper modelMapper; @@ -50,20 +50,20 @@ public class SplitRestService extends BaseRestServiceWithExcel queryByOrgEntity(SplitRequest request) { + public Page queryByOrgEntity(ChunkRequest request) { Pageable pageable = request.getPageable(); - Specification spec = SplitSpecification.search(request); - return splitRepository.findAll(spec, pageable); + Specification spec = ChunkSpecification.search(request); + return chunkRepository.findAll(spec, pageable); } @Override - public Page queryByOrg(SplitRequest request) { - Page page = queryByOrgEntity(request); + public Page queryByOrg(ChunkRequest request) { + Page page = queryByOrgEntity(request); return page.map(this::convertToResponse); } @Override - public Page queryByUser(SplitRequest request) { + public Page queryByUser(ChunkRequest request) { UserEntity user = authService.getUser(); if (user == null) { throw new RuntimeException("User not found"); @@ -73,16 +73,16 @@ public class SplitRestService extends BaseRestServiceWithExcel findByUid(String uid) { - return splitRepository.findByUid(uid); + public Optional findByUid(String uid) { + return chunkRepository.findByUid(uid); } @Override - public SplitResponse create(SplitRequest request) { - // log.info("SplitRestService create: {}", request); - SplitEntity entity = SplitEntity.builder() + public ChunkResponse create(ChunkRequest request) { + // log.info("ChunkRestService create: {}", request); + ChunkEntity entity = ChunkEntity.builder() .uid(uidUtils.getUid()) .name(request.getName()) .content(request.getContent()) @@ -113,19 +113,19 @@ public class SplitRestService extends BaseRestServiceWithExcel optional = splitRepository.findByUid(request.getUid()); + Optional optional = chunkRepository.findByUid(request.getUid()); if (optional.isPresent()) { - SplitEntity entity = optional.get(); + ChunkEntity entity = optional.get(); // modelMapper.map(request, entity); entity.setName(request.getName()); entity.setContent(request.getContent()); @@ -139,18 +139,18 @@ public class SplitRestService extends BaseRestServiceWithExcel latest = splitRepository.findByUid(entity.getUid()); + Optional latest = chunkRepository.findByUid(entity.getUid()); if (latest.isPresent()) { - SplitEntity latestEntity = latest.get(); + ChunkEntity latestEntity = latest.get(); // 合并需要保留的数据 latestEntity.setName(entity.getName()); latestEntity.setContent(entity.getContent()); @@ -185,7 +185,7 @@ public class SplitRestService extends BaseRestServiceWithExcel docIdList) { // 遍历 docIdList for (String docId : docIdList) { - // 查找 docId 对应的所有 split - Optional splitList = splitRepository.findByDocId(docId); + // 查找 docId 对应的所有 chunk + Optional chunkList = chunkRepository.findByDocId(docId); // 删除 - splitList.ifPresent(split -> { - split.setDeleted(true); - save(split); + chunkList.ifPresent(chunk -> { + chunk.setDeleted(true); + save(chunk); }); } } @Override public void deleteByUid(String uid) { - Optional optional = splitRepository.findByUid(uid); + Optional optional = chunkRepository.findByUid(uid); if (optional.isPresent()) { optional.get().setDeleted(true); save(optional.get()); } else { - throw new RuntimeException("Split not found"); + throw new RuntimeException("Chunk not found"); } } @Override - public void delete(SplitRequest request) { + public void delete(ChunkRequest request) { deleteByUid(request.getUid()); } @Override - public SplitResponse convertToResponse(SplitEntity entity) { - return modelMapper.map(entity, SplitResponse.class); + public ChunkResponse convertToResponse(ChunkEntity entity) { + return modelMapper.map(entity, ChunkResponse.class); } @Override - public SplitExcel convertToExcel(SplitEntity split) { - return modelMapper.map(split, SplitExcel.class); + public ChunkExcel convertToExcel(ChunkEntity chunk) { + return modelMapper.map(chunk, ChunkExcel.class); } } diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitSpecification.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkSpecification.java similarity index 96% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitSpecification.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkSpecification.java index cf13373095..b2de7701c3 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitSpecification.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkSpecification.java @@ -25,9 +25,9 @@ import jakarta.persistence.criteria.Predicate; import lombok.extern.slf4j.Slf4j; @Slf4j -public class SplitSpecification extends BaseSpecification { +public class ChunkSpecification extends BaseSpecification { - public static Specification search(SplitRequest request) { + public static Specification search(ChunkRequest request) { log.info("request: {}", request); return (root, query, criteriaBuilder) -> { List predicates = new ArrayList<>(); diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitStatusEnum.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkStatusEnum.java similarity index 96% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitStatusEnum.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkStatusEnum.java index 6c8da3a4f8..7df8c162dd 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitStatusEnum.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkStatusEnum.java @@ -13,7 +13,7 @@ */ package com.bytedesk.kbase.llm_chunk; -public enum SplitStatusEnum { +public enum ChunkStatusEnum { NEW, PROCESSING, SUCCESS, diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitTypeEnum.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkTypeEnum.java similarity index 96% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitTypeEnum.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkTypeEnum.java index 410ff528b9..e54604a3b2 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/SplitTypeEnum.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/ChunkTypeEnum.java @@ -13,7 +13,7 @@ */ package com.bytedesk.kbase.llm_chunk; -public enum SplitTypeEnum { +public enum ChunkTypeEnum { TEXT, FILE, WEBSITE, diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/SplitCreateEvent.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/ChunkCreateEvent.java similarity index 79% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/SplitCreateEvent.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/ChunkCreateEvent.java index 0fd57ae20c..aa699f71aa 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/SplitCreateEvent.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/ChunkCreateEvent.java @@ -15,22 +15,22 @@ package com.bytedesk.kbase.llm_chunk.event; import org.springframework.context.ApplicationEvent; -import com.bytedesk.kbase.llm_chunk.SplitEntity; +import com.bytedesk.kbase.llm_chunk.ChunkEntity; import lombok.Data; import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) -public class SplitCreateEvent extends ApplicationEvent { +public class ChunkCreateEvent extends ApplicationEvent { private static final long serialVersionUID = 1L; - private SplitEntity split; + private ChunkEntity chunk; - public SplitCreateEvent(SplitEntity split) { - super(split); - this.split = split; + public ChunkCreateEvent(ChunkEntity chunk) { + super(chunk); + this.chunk = chunk; } } diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/SplitDeleteEvent.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/ChunkDeleteEvent.java similarity index 79% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/SplitDeleteEvent.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/ChunkDeleteEvent.java index 5670c98281..56a04c037e 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/SplitDeleteEvent.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/ChunkDeleteEvent.java @@ -15,21 +15,21 @@ package com.bytedesk.kbase.llm_chunk.event; import org.springframework.context.ApplicationEvent; -import com.bytedesk.kbase.llm_chunk.SplitEntity; +import com.bytedesk.kbase.llm_chunk.ChunkEntity; import lombok.Data; import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) -public class SplitDeleteEvent extends ApplicationEvent { +public class ChunkDeleteEvent extends ApplicationEvent { private static final long serialVersionUID = 1L; - private SplitEntity split; + private ChunkEntity chunk; - public SplitDeleteEvent(SplitEntity split) { - super(split); - this.split = split; + public ChunkDeleteEvent(ChunkEntity chunk) { + super(chunk); + this.chunk = chunk; } } diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/SplitUpdateDocEvent.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/ChunkUpdateDocEvent.java similarity index 78% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/SplitUpdateDocEvent.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/ChunkUpdateDocEvent.java index deabb5f5ac..665080290e 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/SplitUpdateDocEvent.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/ChunkUpdateDocEvent.java @@ -15,22 +15,22 @@ package com.bytedesk.kbase.llm_chunk.event; import org.springframework.context.ApplicationEvent; -import com.bytedesk.kbase.llm_chunk.SplitEntity; +import com.bytedesk.kbase.llm_chunk.ChunkEntity; import lombok.Data; import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) -public class SplitUpdateDocEvent extends ApplicationEvent { +public class ChunkUpdateDocEvent extends ApplicationEvent { private static final long serialVersionUID = 1L; - private SplitEntity split; + private ChunkEntity chunk; - public SplitUpdateDocEvent(SplitEntity split) { - super(split); - this.split = split; + public ChunkUpdateDocEvent(ChunkEntity chunk) { + super(chunk); + this.chunk = chunk; } } diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/SplitUpdateEvent.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/ChunkUpdateEvent.java similarity index 79% rename from modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/SplitUpdateEvent.java rename to modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/ChunkUpdateEvent.java index 07e9969323..bc7b419d63 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/SplitUpdateEvent.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_chunk/event/ChunkUpdateEvent.java @@ -15,22 +15,22 @@ package com.bytedesk.kbase.llm_chunk.event; import org.springframework.context.ApplicationEvent; -import com.bytedesk.kbase.llm_chunk.SplitEntity; +import com.bytedesk.kbase.llm_chunk.ChunkEntity; import lombok.Data; import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = false) -public class SplitUpdateEvent extends ApplicationEvent { +public class ChunkUpdateEvent extends ApplicationEvent { private static final long serialVersionUID = 1L; - private SplitEntity split; + private ChunkEntity chunk; - public SplitUpdateEvent(SplitEntity split) { - super(split); - this.split = split; + public ChunkUpdateEvent(ChunkEntity chunk) { + super(chunk); + this.chunk = chunk; } } diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/FileEntity.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/FileEntity.java index 267dabbbe6..1f909942a0 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/FileEntity.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/FileEntity.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-05-11 18:14:28 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-04-23 18:24:21 + * @LastEditTime: 2025-04-29 16:20:13 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -22,7 +22,7 @@ import com.bytedesk.core.constant.TypeConsts; import com.bytedesk.core.converter.StringListConverter; import com.bytedesk.core.upload.UploadEntity; import com.bytedesk.kbase.kbase.KbaseEntity; -import com.bytedesk.kbase.llm_chunk.SplitStatusEnum; +import com.bytedesk.kbase.llm_chunk.ChunkStatusEnum; import jakarta.persistence.Column; import jakarta.persistence.Convert; @@ -88,25 +88,25 @@ public class FileEntity extends BaseEntity { @Column(name = "is_llm_qa_deleted") private boolean llmQaDeleted = false; - // 是否开启自动llm split切块 + // 是否开启自动llm Chunk切块 @Builder.Default - @Column(name = "is_auto_llm_split") - private boolean autoLlmSplit = false; + @Column(name = "is_auto_llm_Chunk") + private boolean autoLlmChunk = false; - // 是否已经自动llm split切块 + // 是否已经自动llm Chunk切块 @Builder.Default - @Column(name = "is_llm_splitted") - private boolean llmSplitted = false; + @Column(name = "is_llm_Chunkted") + private boolean llmChunkted = false; - // 是否开启自动删除llm split切块 + // 是否开启自动删除llm Chunk切块 @Builder.Default - @Column(name = "is_auto_delete_llm_split") - private boolean autoDeleteLlmSplit = false; + @Column(name = "is_auto_delete_llm_Chunk") + private boolean autoDeleteLlmChunk = false; - // 是否已经删除llm split切块 + // 是否已经删除llm Chunk切块 @Builder.Default - @Column(name = "is_llm_split_deleted") - private boolean llmSplitDeleted = false; + @Column(name = "is_llm_Chunk_deleted") + private boolean llmChunkDeleted = false; // 有效开始日期 @Builder.Default @@ -118,7 +118,7 @@ public class FileEntity extends BaseEntity { private LocalDateTime endDate = LocalDateTime.now().plusYears(100); @Builder.Default - private String status = SplitStatusEnum.NEW.name(); + private String status = ChunkStatusEnum.NEW.name(); private String categoryUid; // 所属分类 diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/FileEventListener.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/FileEventListener.java index 3ebc2faed5..8521dc3db0 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/FileEventListener.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/FileEventListener.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2025-02-25 09:44:18 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-04-23 18:04:53 + * @LastEditTime: 2025-04-29 16:20:45 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -48,7 +48,7 @@ public class FileEventListener { .fileName(upload.getFileName()) .fileUrl(upload.getFileUrl()) .autoGenerateLlmQa(extra.isAutoGenerateLlmQa()) - .autoLlmSplit(extra.isAutoLlmSplit()) + .autoLlmChunk(extra.isAutoLlmChunk()) .categoryUid(upload.getCategoryUid()) .kbUid(upload.getKbUid()) .userUid(userProtobuf.getUid()) diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/FileRequest.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/FileRequest.java index b0c7a6f479..455708b184 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/FileRequest.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/FileRequest.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-05-11 18:26:04 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-04-23 18:22:29 + * @LastEditTime: 2025-04-29 16:20:17 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -18,7 +18,7 @@ import java.util.List; import java.util.ArrayList; import com.bytedesk.core.base.BaseRequest; -import com.bytedesk.kbase.llm_chunk.SplitStatusEnum; +import com.bytedesk.kbase.llm_chunk.ChunkStatusEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -63,21 +63,21 @@ public class FileRequest extends BaseRequest { @Builder.Default private Boolean llmQaDeleted = false; - // 是否开启自动llm split切块 + // 是否开启自动llm Chunk切块 @Builder.Default - private Boolean autoLlmSplit = false; + private Boolean autoLlmChunk = false; - // 是否已经自动llm split切块 + // 是否已经自动llm Chunk切块 @Builder.Default - private Boolean llmSplitted = false; + private Boolean llmChunkted = false; - // 是否开启自动删除llm split切块 + // 是否开启自动删除llm Chunk切块 @Builder.Default - private Boolean autoDeleteLlmSplit = false; + private Boolean autoDeleteLlmChunk = false; - // 是否已经删除llm split切块 + // 是否已经删除llm Chunk切块 @Builder.Default - private Boolean llmSplitDeleted = false; + private Boolean llmChunkDeleted = false; // 有效开始日期 @Builder.Default @@ -89,7 +89,7 @@ public class FileRequest extends BaseRequest { private LocalDateTime endDate = LocalDateTime.now().plusYears(100); @Builder.Default - private String status = SplitStatusEnum.NEW.name(); + private String status = ChunkStatusEnum.NEW.name(); // 所属分类 private String categoryUid; diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/FileUploadExtra.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/FileUploadExtra.java index e11c54254e..02b3a9e917 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/FileUploadExtra.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/FileUploadExtra.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2025-04-23 16:59:08 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-04-23 17:02:46 + * @LastEditTime: 2025-04-29 16:21:02 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -33,7 +33,7 @@ public class FileUploadExtra implements Serializable { private String autoGenerateLlmQa; // 使用 "true" 或 "false" 来表示布尔值 - private String autoLlmSplit; + private String autoLlmChunk; // 转换为布尔值 public boolean isAutoGenerateLlmQa() { @@ -41,8 +41,8 @@ public class FileUploadExtra implements Serializable { } // 转换为布尔值 - public boolean isAutoLlmSplit() { - return Boolean.parseBoolean(autoLlmSplit); + public boolean isAutoLlmChunk() { + return Boolean.parseBoolean(autoLlmChunk); } // fromJson diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/package-info.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/package-info.java new file mode 100644 index 0000000000..6a859ce9e4 --- /dev/null +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_file/package-info.java @@ -0,0 +1,5 @@ + +@NonNullApi +package com.bytedesk.kbase.llm_file; + +import org.springframework.lang.NonNullApi; diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextEntity.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextEntity.java index e7f02a8843..93410b0154 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextEntity.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextEntity.java @@ -21,7 +21,7 @@ import com.bytedesk.core.base.BaseEntity; import com.bytedesk.core.constant.TypeConsts; import com.bytedesk.core.converter.StringListConverter; import com.bytedesk.kbase.kbase.KbaseEntity; -import com.bytedesk.kbase.llm_chunk.SplitStatusEnum; +import com.bytedesk.kbase.llm_chunk.ChunkStatusEnum; import com.bytedesk.core.message.MessageTypeEnum; import jakarta.persistence.Column; @@ -61,7 +61,7 @@ public class TextEntity extends BaseEntity { private String type = MessageTypeEnum.TEXT.name(); @Builder.Default - private String status = SplitStatusEnum.NEW.name(); + private String status = ChunkStatusEnum.NEW.name(); @Builder.Default @Convert(converter = StringListConverter.class) @@ -93,25 +93,25 @@ public class TextEntity extends BaseEntity { @Column(name = "is_llm_qa_deleted") private boolean llmQaDeleted = false; - // 是否开启自动llm split切块 + // 是否开启自动llm Chunk切块 @Builder.Default - @Column(name = "is_auto_llm_split") - private boolean autoLlmSplit = false; + @Column(name = "is_auto_llm_Chunk") + private boolean autoLlmChunk = false; - // 是否已经自动llm split切块 + // 是否已经自动llm Chunk切块 @Builder.Default - @Column(name = "is_llm_splitted") - private boolean llmSplitted = false; + @Column(name = "is_llm_Chunkted") + private boolean llmChunkted = false; - // is auto delete llm split + // is auto delete llm Chunk @Builder.Default - @Column(name = "is_auto_delete_llm_split") - private boolean autoDeleteLlmSplit = false; + @Column(name = "is_auto_delete_llm_Chunk") + private boolean autoDeleteLlmChunk = false; - // 是否已经删除llm split切块 + // 是否已经删除llm Chunk切块 @Builder.Default - @Column(name = "is_llm_split_deleted") - private boolean llmSplitDeleted = false; + @Column(name = "is_llm_Chunk_deleted") + private boolean llmChunkDeleted = false; // 有效开始日期 @Builder.Default diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextRequest.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextRequest.java index 1273903687..0e3c6a5821 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextRequest.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextRequest.java @@ -18,7 +18,7 @@ import java.util.List; import java.util.ArrayList; import com.bytedesk.core.base.BaseRequest; -import com.bytedesk.kbase.llm_chunk.SplitStatusEnum; +import com.bytedesk.kbase.llm_chunk.ChunkStatusEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -66,21 +66,21 @@ public class TextRequest extends BaseRequest { @Builder.Default private Boolean llmQaDeleted = false; - // 是否开启自动llm split切块 + // 是否开启自动llm Chunk切块 @Builder.Default - private Boolean autoLlmSplit = false; + private Boolean autoLlmChunk = false; - // 是否已经自动llm split切块 + // 是否已经自动llm Chunk切块 @Builder.Default - private Boolean llmSplitted = false; + private Boolean llmChunkted = false; - // 是否开启自动删除llm split切块 + // 是否开启自动删除llm Chunk切块 @Builder.Default - private Boolean autoDeleteLlmSplit = false; + private Boolean autoDeleteLlmChunk = false; - // 是否已经删除llm split切块 + // 是否已经删除llm Chunk切块 @Builder.Default - private Boolean llmSplitDeleted = false; + private Boolean llmChunkDeleted = false; // 有效开始日期 @Builder.Default @@ -92,7 +92,7 @@ public class TextRequest extends BaseRequest { private LocalDateTime endDate = LocalDateTime.now().plusYears(100); @Builder.Default - private String status = SplitStatusEnum.NEW.name(); + private String status = ChunkStatusEnum.NEW.name(); private String categoryUid; // 所属分类 diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextResponse.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextResponse.java index 6d16057491..968f6ad9d7 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextResponse.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/TextResponse.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-05-11 18:26:12 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-04-23 17:13:45 + * @LastEditTime: 2025-04-29 16:20:27 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; import com.bytedesk.core.base.BaseResponse; -import com.bytedesk.kbase.llm_chunk.SplitStatusEnum; +import com.bytedesk.kbase.llm_chunk.ChunkStatusEnum; import lombok.AllArgsConstructor; import lombok.Builder; @@ -61,20 +61,20 @@ public class TextResponse extends BaseResponse { // 是否已经删除llm问答 private Boolean llmQaDeleted; - // 是否开启自动llm split切块 - private Boolean autoLlmSplit; + // 是否开启自动llm Chunk切块 + private Boolean autoLlmChunk; - // 是否已经自动llm split切块 - private Boolean llmSplitted; + // 是否已经自动llm Chunk切块 + private Boolean llmChunkted; - // 是否开启自动删除llm split切块 - private Boolean autoDeleteLlmSplit; + // 是否开启自动删除llm Chunk切块 + private Boolean autoDeleteLlmChunk; - // 是否已经删除llm split切块 - private Boolean llmSplittedDeleted; + // 是否已经删除llm Chunk切块 + private Boolean llmChunktedDeleted; @Builder.Default - private String status = SplitStatusEnum.NEW.name(); + private String status = ChunkStatusEnum.NEW.name(); private String categoryUid; // 所属分类 diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/package-info.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/package-info.java new file mode 100644 index 0000000000..c8d1b56551 --- /dev/null +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_text/package-info.java @@ -0,0 +1,5 @@ + +@NonNullApi +package com.bytedesk.kbase.llm_text; + +import org.springframework.lang.NonNullApi; diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_website/WebsiteEntity.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_website/WebsiteEntity.java index f9cf31c107..ebc786e63d 100644 --- a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_website/WebsiteEntity.java +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_website/WebsiteEntity.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-05-11 18:14:28 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-04-23 18:32:26 + * @LastEditTime: 2025-04-29 16:20:31 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -21,7 +21,7 @@ import com.bytedesk.core.base.BaseEntity; import com.bytedesk.core.constant.TypeConsts; import com.bytedesk.core.converter.StringListConverter; import com.bytedesk.kbase.kbase.KbaseEntity; -import com.bytedesk.kbase.llm_chunk.SplitStatusEnum; +import com.bytedesk.kbase.llm_chunk.ChunkStatusEnum; import jakarta.persistence.Column; import jakarta.persistence.Convert; @@ -67,7 +67,7 @@ public class WebsiteEntity extends BaseEntity { // private String type = MessageTypeEnum.TEXT.name(); @Builder.Default - private String status = SplitStatusEnum.NEW.name(); + private String status = ChunkStatusEnum.NEW.name(); @Builder.Default @Convert(converter = StringListConverter.class) @@ -99,25 +99,25 @@ public class WebsiteEntity extends BaseEntity { @Column(name = "is_llm_qa_deleted") private boolean llmQaDeleted = false; - // 是否开启自动llm split切块 + // 是否开启自动llm Chunk切块 @Builder.Default - @Column(name = "is_auto_llm_split") - private boolean autoLlmSplit = false; + @Column(name = "is_auto_llm_Chunk") + private boolean autoLlmChunk = false; - // 是否已经自动llm split切块 + // 是否已经自动llm Chunk切块 @Builder.Default - @Column(name = "is_llm_splitted") - private boolean llmSplitted = false; + @Column(name = "is_llm_Chunkted") + private boolean llmChunkted = false; - // is auto delete llm split + // is auto delete llm Chunk @Builder.Default - @Column(name = "is_auto_delete_llm_split") - private boolean autoDeleteLlmSplit = false; + @Column(name = "is_auto_delete_llm_Chunk") + private boolean autoDeleteLlmChunk = false; - // 是否已经删除llm split切块 + // 是否已经删除llm Chunk切块 @Builder.Default - @Column(name = "is_llm_split_deleted") - private boolean llmSplitDeleted = false; + @Column(name = "is_llm_Chunk_deleted") + private boolean llmChunkDeleted = false; // 有效开始日期 @Builder.Default diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/llm_website/package-info.java b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_website/package-info.java new file mode 100644 index 0000000000..e8acc85a2e --- /dev/null +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/llm_website/package-info.java @@ -0,0 +1,5 @@ + +@NonNullApi +package com.bytedesk.kbase.llm_website; + +import org.springframework.lang.NonNullApi; diff --git a/modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/package-info.java b/modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/package-info.java new file mode 100644 index 0000000000..3b16e4c326 --- /dev/null +++ b/modules/kbase/src/main/java/com/bytedesk/kbase/quick_reply/package-info.java @@ -0,0 +1,5 @@ + +@NonNullApi +package com.bytedesk.kbase.quick_reply; + +import org.springframework.lang.NonNullApi; diff --git a/starter/src/main/java/com/bytedesk/starter/controller/PageRouteController.java b/starter/src/main/java/com/bytedesk/starter/controller/PageRouteController.java index 3e8a2608b0..0e1feaad9a 100644 --- a/starter/src/main/java/com/bytedesk/starter/controller/PageRouteController.java +++ b/starter/src/main/java/com/bytedesk/starter/controller/PageRouteController.java @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-01-29 16:17:36 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-04-16 18:09:49 + * @LastEditTime: 2025-04-29 15:52:59 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -240,7 +240,7 @@ public class PageRouteController { /** * visitor * 访客对话窗口 - * http://127.0.0.1:9003/chat + * http://127.0.0.1:9003/chat/ */ @GetMapping({ "/chat",