Skip to content

Commit aa01f52

Browse files
authored
合并拉取请求 #74
* feat: Implement system parameter management with Redis integration
1 parent c5ccc56 commit aa01f52

File tree

30 files changed

+343
-73
lines changed

30 files changed

+343
-73
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
![GitHub Stars](https://img.shields.io/github/stars/ModelEngine-Group/DataMate)
88
![GitHub Forks](https://img.shields.io/github/forks/ModelEngine-Group/DataMate)
99
![GitHub Issues](https://img.shields.io/github/issues/ModelEngine-Group/DataMate)
10-
![GitHub License](https://img.shields.io/github/license/ModelEngine-Group/DataMate)
10+
![GitHub License](https://img.shields.io/github/license/ModelEngine-Group/datamate-docs)
1111

1212
**DataMate is an enterprise-level data processing platform for model fine-tuning and RAG retrieval, supporting core
1313
functions such as data collection, data management, operator marketplace, data cleaning, data synthesis, data

backend/services/main-application/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@
134134
<groupId>org.springframework.boot</groupId>
135135
<artifactId>spring-boot-autoconfigure</artifactId>
136136
</dependency>
137+
<dependency>
138+
<groupId>org.springframework.boot</groupId>
139+
<artifactId>spring-boot-starter-data-redis</artifactId>
140+
</dependency>
137141
</dependencies>
138142

139143
<build>

backend/services/main-application/src/main/java/com/datamate/main/DataMatePlatformApplication.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import org.mybatis.spring.annotation.MapperScan;
44
import org.springframework.boot.SpringApplication;
55
import org.springframework.boot.autoconfigure.SpringBootApplication;
6+
import org.springframework.cache.annotation.EnableCaching;
67
import org.springframework.context.annotation.ComponentScan;
78
import org.springframework.scheduling.annotation.EnableAsync;
89
import org.springframework.scheduling.annotation.EnableScheduling;
@@ -21,6 +22,7 @@
2122
@EnableTransactionManagement
2223
@EnableAsync
2324
@EnableScheduling
25+
@EnableCaching
2426
public class DataMatePlatformApplication {
2527
public static void main(String[] args) {
2628
SpringApplication.run(DataMatePlatformApplication.class, args);

backend/services/main-application/src/main/resources/application.yml

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,6 @@ spring:
2222
idle-timeout: 600000
2323
max-lifetime: 1800000
2424

25-
# Elasticsearch配置
26-
elasticsearch:
27-
uris: ${ES_URIS:http://localhost:9200}
28-
username: ${ES_USERNAME:}
29-
password: ${ES_PASSWORD:}
30-
connection-timeout: 10s
31-
socket-timeout: 30s
32-
3325
# Jackson配置
3426
jackson:
3527
time-zone: Asia/Shanghai
@@ -61,6 +53,21 @@ spring:
6153
- classpath:config/application-datacollection.yml
6254
- classpath:config/application-datamanagement.yml
6355

56+
# Redis配置
57+
data:
58+
redis:
59+
host: datamate-redis
60+
port: 6379
61+
timeout: 2000
62+
password: ${REDIS_PASSWORD:password}
63+
lettuce:
64+
pool:
65+
max-active: 20
66+
max-idle: 10
67+
min-idle: 5
68+
max-wait: 1000ms
69+
70+
6471
# MyBatis配置(需在顶层,不在 spring 下)
6572
mybatis-plus:
6673
configuration:

backend/services/rag-indexer-service/src/main/java/com/datamate/rag/indexer/application/KnowledgeBaseService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public void addFiles(AddFilesReq request) {
9999
return ragFile;
100100
}).toList();
101101
ragFileRepository.saveBatch(ragFiles, 100);
102-
eventPublisher.publishEvent(new DataInsertedEvent(knowledgeBase, request.getProcessType()));
102+
eventPublisher.publishEvent(new DataInsertedEvent(knowledgeBase, request));
103103
}
104104

105105
public PagedResponse<RagFile> listFiles(String knowledgeBaseId, RagFileReq request) {
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package com.datamate.rag.indexer.infrastructure.event;
22

33
import com.datamate.rag.indexer.domain.model.KnowledgeBase;
4-
import com.datamate.rag.indexer.interfaces.dto.ProcessType;
4+
import com.datamate.rag.indexer.interfaces.dto.AddFilesReq;
55

66
/**
77
* 数据插入事件
88
*
99
* @author dallas
1010
* @since 2025-10-29
1111
*/
12-
public record DataInsertedEvent(KnowledgeBase knowledgeBase, ProcessType processType) {
12+
public record DataInsertedEvent(KnowledgeBase knowledgeBase, AddFilesReq addFilesReq) {
1313
}

backend/services/rag-indexer-service/src/main/java/com/datamate/rag/indexer/infrastructure/event/RagEtlService.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.datamate.rag.indexer.infrastructure.event;
22

3-
import com.datamate.common.models.domain.entity.ModelConfig;
4-
import com.datamate.common.models.domain.repository.ModelConfigRepository;
5-
import com.datamate.common.models.infrastructure.client.ModelClient;
3+
import com.datamate.common.setting.domain.entity.ModelConfig;
4+
import com.datamate.common.setting.domain.repository.ModelConfigRepository;
5+
import com.datamate.common.setting.infrastructure.client.ModelClient;
66
import com.datamate.rag.indexer.domain.model.FileStatus;
77
import com.datamate.rag.indexer.domain.model.RagFile;
88
import com.datamate.rag.indexer.domain.repository.RagFileRepository;
@@ -109,7 +109,7 @@ private void processRagFile(RagFile ragFile, DataInsertedEvent event) {
109109
document = new HtmlToTextDocumentTransformer().transform(document);
110110
}
111111
// 使用文档分块器对文档进行分块
112-
DocumentSplitter splitter = documentSplitter(event.processType());
112+
DocumentSplitter splitter = documentSplitter(event.addFilesReq().getProcessType());
113113
List<TextSegment> split = splitter.split(document);
114114

115115
// 更新分块数量

backend/services/rag-indexer-service/src/main/java/com/datamate/rag/indexer/interfaces/dto/AddFilesReq.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
public class AddFilesReq {
1717
private String knowledgeBaseId;
1818
private ProcessType processType;
19+
private Integer chunkSize;
20+
private Integer overlapSize;
21+
private String customSeparator;
1922
private List<FileInfo> files;
2023

2124
public record FileInfo(String id, String name) {

backend/services/rag-query-service/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@
2626
<groupId>org.springframework.boot</groupId>
2727
<artifactId>spring-boot-starter-web</artifactId>
2828
</dependency>
29-
<dependency>
30-
<groupId>org.springframework.boot</groupId>
31-
<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
32-
</dependency>
3329
<dependency>
3430
<groupId>com.mysql</groupId>
3531
<artifactId>mysql-connector-j</artifactId>

backend/shared/domain-common/pom.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,9 @@
3838
<artifactId>langchain4j-open-ai</artifactId>
3939
<version>1.8.0</version>
4040
</dependency>
41+
<dependency>
42+
<groupId>org.springframework.boot</groupId>
43+
<artifactId>spring-boot-starter-data-redis</artifactId>
44+
</dependency>
4145
</dependencies>
4246
</project>

0 commit comments

Comments
 (0)