Skip to content

Commit 67eb571

Browse files
hhhhsc701hhhhsc701
authored
feature: 对接deer-flow (#27)
feature: 对接deer-flow
2 parents fad76e7 + 4f5a9a9 commit 67eb571

File tree

28 files changed

+356
-79
lines changed

28 files changed

+356
-79
lines changed

‎Makefile‎

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ build: backend-docker-build frontend-docker-build runtime-docker-build
1212

1313
.PHONY: create-namespace
1414
create-namespace:
15-
@kubectl get namespace $(NAMESPACE) > /dev/null 2>&1 || kubectl create namespace $(NAMESPACE)
15+
kubectl get namespace $(NAMESPACE) > /dev/null 2>&1 || kubectl create namespace $(NAMESPACE)
1616

1717
.PHONY: install-%
1818
install-%:
@@ -73,37 +73,61 @@ runtime-docker-build:
7373
label-studio-adapter-docker-build:
7474
docker build -t label-studio-adapter:$(VERSION) . -f scripts/images/label-studio-adapter/Dockerfile
7575

76+
.PHONY: deer-flow-docker-build
77+
deer-flow-docker-build:
78+
@if [ -d "../deer-flow/.git" ]; then \
79+
cd ../deer-flow && git pull; \
80+
else \
81+
git clone [email protected]:bytedance/deer-flow.git ../deer-flow; \
82+
fi
83+
sed -i "s/dark/light/g" "../deer-flow/web/src/components/deer-flow/theme-provider-wrapper.tsx"
84+
cp deployment/docker/deer-flow/.env.example ../deer-flow/.env
85+
cp deployment/docker/deer-flow/conf.yaml.example ../deer-flow/conf.yaml
86+
cd ../deer-flow && docker compose build
87+
7688
.PHONY: backend-docker-install
7789
backend-docker-install:
78-
cd deployment/docker/datamate && docker-compose up -d backend
90+
cd deployment/docker/datamate && docker compose up -d backend
7991

8092
.PHONY: backend-docker-uninstall
8193
backend-docker-uninstall:
82-
cd deployment/docker/datamate && docker-compose down backend
94+
cd deployment/docker/datamate && docker compose down backend
8395

8496
.PHONY: frontend-docker-install
8597
frontend-docker-install:
86-
cd deployment/docker/datamate && docker-compose up -d frontend
98+
cd deployment/docker/datamate && docker compose up -d frontend
8799

88100
.PHONY: frontend-docker-uninstall
89101
frontend-docker-uninstall:
90-
cd deployment/docker/datamate && docker-compose down frontend
102+
cd deployment/docker/datamate && docker compose down frontend
91103

92104
.PHONY: runtime-docker-install
93105
runtime-docker-install:
94-
cd deployment/docker/datamate && docker-compose up -d runtime
106+
cd deployment/docker/datamate && docker compose up -d runtime
95107

96108
.PHONY: runtime-docker-uninstall
97109
runtime-docker-uninstall:
98-
cd deployment/docker/datamate && docker-compose down runtime
110+
cd deployment/docker/datamate && docker compose down runtime
99111

100112
.PHONY: datamate-docker-install
101113
datamate-docker-install:
102-
cd deployment/docker/datamate && docker-compose up -d
114+
cd deployment/docker/datamate && cp .env.example .env && docker compose -f docker-compose.yml up -d
103115

104116
.PHONY: datamate-docker-uninstall
105117
datamate-docker-uninstall:
106-
cd deployment/docker/datamate && docker-compose down
118+
cd deployment/docker/datamate && docker compose -f docker-compose.yml down
119+
120+
.PHONY: deer-flow-docker-install
121+
deer-flow-docker-install:
122+
cd deployment/docker/datamate && cp .env.deer-flow.example .env && docker compose -f docker-compose.yml up -d
123+
cd deployment/docker/deer-flow && cp .env.example .env && cp conf.yaml.example conf.yaml && docker compose -f docker-compose.yml up -d
124+
125+
.PHONY: deer-flow-docker-uninstall
126+
deer-flow-docker-uninstall:
127+
@if docker compose ls --filter name=datamate | grep -q datamate; then \
128+
cd deployment/docker/datamate && docker compose -f docker-compose.yml up -d; \
129+
fi
130+
cd deployment/docker/deer-flow && docker compose -f docker-compose.yml down
107131

108132
.PHONY: datamate-k8s-install
109133
datamate-k8s-install: create-namespace

‎backend/pom.xml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
<spring-boot.version>3.5.6</spring-boot.version>
2222
<spring-cloud.version>2025.0.0</spring-cloud.version>
23+
<spring-ai.version>1.0.0-RC1</spring-ai.version>
2324
<mysql.version>8.0.33</mysql.version>
2425
<postgresql.version>42.6.0</postgresql.version>
2526
<redis.version>3.2.0</redis.version>
@@ -126,8 +127,8 @@
126127
</dependency>
127128

128129
<dependency>
129-
<groupId>mysql</groupId>
130-
<artifactId>mysql-connector-java</artifactId>
130+
<groupId>com.mysql</groupId>
131+
<artifactId>mysql-connector-j</artifactId>
131132
<version>${mysql.version}</version>
132133
</dependency>
133134

@@ -164,6 +165,12 @@
164165
</exclusions>
165166
</dependency>
166167

168+
<dependency>
169+
<groupId>org.springframework.ai</groupId>
170+
<artifactId>spring-ai-starter-mcp-server-webmvc</artifactId>
171+
<version>${spring-ai.version}</version>
172+
</dependency>
173+
167174
<dependency>
168175
<groupId>com.baomidou</groupId>
169176
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>

‎backend/services/data-annotation-service/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<artifactId>spring-boot-starter-websocket</artifactId>
3232
</dependency>
3333
<dependency>
34-
<groupId>mysql</groupId>
35-
<artifactId>mysql-connector-java</artifactId>
34+
<groupId>com.mysql</groupId>
35+
<artifactId>mysql-connector-j</artifactId>
3636
<version>${mysql.version}</version>
3737
</dependency>
3838
<!-- OpenAPI Dependencies -->

‎backend/services/data-cleaning-service/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
5454
</dependency>
5555
<dependency>
56-
<groupId>mysql</groupId>
57-
<artifactId>mysql-connector-java</artifactId>
56+
<groupId>com.mysql</groupId>
57+
<artifactId>mysql-connector-j</artifactId>
5858
</dependency>
5959
<dependency>
6060
<groupId>org.apache.commons</groupId>

‎backend/services/data-collection-service/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939

4040
<!-- Database -->
4141
<dependency>
42-
<groupId>mysql</groupId>
43-
<artifactId>mysql-connector-java</artifactId>
42+
<groupId>com.mysql</groupId>
43+
<artifactId>mysql-connector-j</artifactId>
4444
<version>8.0.33</version>
4545
<scope>runtime</scope>
4646
</dependency>

‎backend/services/data-evaluation-service/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
<artifactId>spring-boot-starter-web</artifactId>
2828
</dependency>
2929
<dependency>
30-
<groupId>mysql</groupId>
31-
<artifactId>mysql-connector-java</artifactId>
30+
<groupId>com.mysql</groupId>
31+
<artifactId>mysql-connector-j</artifactId>
3232
<version>${mysql.version}</version>
3333
</dependency>
3434
<dependency>

‎backend/services/data-management-service/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<artifactId>spring-boot-starter-data-redis</artifactId>
3636
</dependency>
3737
<dependency>
38-
<groupId>mysql</groupId>
39-
<artifactId>mysql-connector-java</artifactId>
38+
<groupId>com.mysql</groupId>
39+
<artifactId>mysql-connector-j</artifactId>
4040
<version>${mysql.version}</version>
4141
</dependency>
4242
<dependency>

‎backend/services/data-synthesis-service/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
<artifactId>spring-boot-starter-web</artifactId>
2828
</dependency>
2929
<dependency>
30-
<groupId>mysql</groupId>
31-
<artifactId>mysql-connector-java</artifactId>
30+
<groupId>com.mysql</groupId>
31+
<artifactId>mysql-connector-j</artifactId>
3232
<version>${mysql.version}</version>
3333
</dependency>
3434
<dependency>

‎backend/services/execution-engine-service/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
<artifactId>spring-boot-starter-data-redis</artifactId>
3232
</dependency>
3333
<dependency>
34-
<groupId>mysql</groupId>
35-
<artifactId>mysql-connector-java</artifactId>
34+
<groupId>com.mysql</groupId>
35+
<artifactId>mysql-connector-j</artifactId>
3636
<version>${mysql.version}</version>
3737
</dependency>
3838
<dependency>

‎backend/services/main-application/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@
118118

119119
<!-- Database -->
120120
<dependency>
121-
<groupId>mysql</groupId>
122-
<artifactId>mysql-connector-java</artifactId>
121+
<groupId>com.mysql</groupId>
122+
<artifactId>mysql-connector-j</artifactId>
123123
<version>8.0.33</version>
124124
<scope>runtime</scope>
125125
</dependency>

0 commit comments

Comments
 (0)