Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 33 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ build: backend-docker-build frontend-docker-build runtime-docker-build

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

.PHONY: install-%
install-%:
Expand Down Expand Up @@ -73,37 +73,61 @@ runtime-docker-build:
label-studio-adapter-docker-build:
docker build -t label-studio-adapter:$(VERSION) . -f scripts/images/label-studio-adapter/Dockerfile

.PHONY: deer-flow-docker-build
deer-flow-docker-build:
@if [ -d "../deer-flow/.git" ]; then \
cd ../deer-flow && git pull; \
else \
git clone git@github.com:bytedance/deer-flow.git ../deer-flow; \
fi
sed -i "s/dark/light/g" "../deer-flow/web/src/components/deer-flow/theme-provider-wrapper.tsx"
cp deployment/docker/deer-flow/.env.example ../deer-flow/.env
cp deployment/docker/deer-flow/conf.yaml.example ../deer-flow/conf.yaml
cd ../deer-flow && docker compose build

.PHONY: backend-docker-install
backend-docker-install:
cd deployment/docker/datamate && docker-compose up -d backend
cd deployment/docker/datamate && docker compose up -d backend

.PHONY: backend-docker-uninstall
backend-docker-uninstall:
cd deployment/docker/datamate && docker-compose down backend
cd deployment/docker/datamate && docker compose down backend

.PHONY: frontend-docker-install
frontend-docker-install:
cd deployment/docker/datamate && docker-compose up -d frontend
cd deployment/docker/datamate && docker compose up -d frontend

.PHONY: frontend-docker-uninstall
frontend-docker-uninstall:
cd deployment/docker/datamate && docker-compose down frontend
cd deployment/docker/datamate && docker compose down frontend

.PHONY: runtime-docker-install
runtime-docker-install:
cd deployment/docker/datamate && docker-compose up -d runtime
cd deployment/docker/datamate && docker compose up -d runtime

.PHONY: runtime-docker-uninstall
runtime-docker-uninstall:
cd deployment/docker/datamate && docker-compose down runtime
cd deployment/docker/datamate && docker compose down runtime

.PHONY: datamate-docker-install
datamate-docker-install:
cd deployment/docker/datamate && docker-compose up -d
cd deployment/docker/datamate && cp .env.example .env && docker compose -f docker-compose.yml up -d

.PHONY: datamate-docker-uninstall
datamate-docker-uninstall:
cd deployment/docker/datamate && docker-compose down
cd deployment/docker/datamate && docker compose -f docker-compose.yml down

.PHONY: deer-flow-docker-install
deer-flow-docker-install:
cd deployment/docker/datamate && cp .env.deer-flow.example .env && docker compose -f docker-compose.yml up -d
cd deployment/docker/deer-flow && cp .env.example .env && cp conf.yaml.example conf.yaml && docker compose -f docker-compose.yml up -d

.PHONY: deer-flow-docker-uninstall
deer-flow-docker-uninstall:
@if docker compose ls --filter name=datamate | grep -q datamate; then \
cd deployment/docker/datamate && docker compose -f docker-compose.yml up -d; \
fi
cd deployment/docker/deer-flow && docker compose -f docker-compose.yml down

.PHONY: datamate-k8s-install
datamate-k8s-install: create-namespace
Expand Down
11 changes: 9 additions & 2 deletions backend/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@

<spring-boot.version>3.5.6</spring-boot.version>
<spring-cloud.version>2025.0.0</spring-cloud.version>
<spring-ai.version>1.0.0-RC1</spring-ai.version>
<mysql.version>8.0.33</mysql.version>
<postgresql.version>42.6.0</postgresql.version>
<redis.version>3.2.0</redis.version>
Expand Down Expand Up @@ -126,8 +127,8 @@
</dependency>

<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql.version}</version>
</dependency>

Expand Down Expand Up @@ -164,6 +165,12 @@
</exclusions>
</dependency>

<dependency>
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-starter-mcp-server-webmvc</artifactId>
<version>${spring-ai.version}</version>
</dependency>

<dependency>
<groupId>com.baomidou</groupId>
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
Expand Down
4 changes: 2 additions & 2 deletions backend/services/data-annotation-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<artifactId>spring-boot-starter-websocket</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql.version}</version>
</dependency>
<!-- OpenAPI Dependencies -->
Expand Down
4 changes: 2 additions & 2 deletions backend/services/data-cleaning-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@
<artifactId>mybatis-plus-spring-boot3-starter</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
Expand Down
4 changes: 2 additions & 2 deletions backend/services/data-collection-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@

<!-- Database -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>8.0.33</version>
<scope>runtime</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions backend/services/data-evaluation-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql.version}</version>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions backend/services/data-management-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql.version}</version>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions backend/services/data-synthesis-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql.version}</version>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions backend/services/execution-engine-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql.version}</version>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions backend/services/main-application/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -118,8 +118,8 @@

<!-- Database -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>8.0.33</version>
<scope>runtime</scope>
</dependency>
Expand Down
4 changes: 2 additions & 2 deletions backend/services/operator-market-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
Expand Down
4 changes: 2 additions & 2 deletions backend/services/pipeline-orchestration-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql.version}</version>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions backend/services/rag-indexer-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql.version}</version>
</dependency>
<dependency>
Expand Down
4 changes: 2 additions & 2 deletions backend/services/rag-query-service/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
<artifactId>spring-boot-starter-data-elasticsearch</artifactId>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
<version>${mysql.version}</version>
</dependency>
<dependency>
Expand Down
1 change: 1 addition & 0 deletions deployment/docker/datamate/.env.deer-flow.example
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NGINX_CONF=./backend-with-deer-flow.conf
1 change: 1 addition & 0 deletions deployment/docker/datamate/.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
NGINX_CONF=./backend.conf
49 changes: 49 additions & 0 deletions deployment/docker/datamate/backend-with-deer-flow.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
server {
listen 80;
server_name 0.0.0.0;

access_log /var/log/datamate/frontend/access.log main;
error_log /var/log/datamate/frontend/error.log notice;

client_max_body_size 1024M;

add_header Set-Cookie "NEXT_LOCALE=zh";

location /api/ {
proxy_pass http://datamate-backend:8080/api/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}

location /chat {
proxy_pass http://deer-flow-frontend:3000/chat;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}

location /_next {
proxy_pass http://deer-flow-frontend:3000/_next;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}

location /deer-flow-backend/ {
proxy_pass http://deer-flow-backend:8000/api/;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}

location / {
if ($query_string ~* "_rsc=pmmii") {
proxy_pass http://deer-flow-frontend:3000;
break;
}

root /opt/frontend;
try_files $uri $uri/ /index.html;
}
}
7 changes: 1 addition & 6 deletions deployment/docker/datamate/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,6 @@ services:
image: datamate-backend
restart: on-failure
privileged: true
ports:
- "8080"
volumes:
- dataset_volume:/dataset
- flow_volume:/flow
Expand All @@ -24,6 +22,7 @@ services:
- "30000:80" # nodePort → hostPort
volumes:
- frontend_log_volume:/var/log/datamate/frontend
- $NGINX_CONF:/etc/nginx/conf.d/backend.conf
networks: [ datamate ]
depends_on:
- datamate-backend
Expand All @@ -35,8 +34,6 @@ services:
restart: on-failure
environment:
MYSQL_ROOT_PASSWORD: password
ports:
- "3306"
command: |
sh -c "
chown mysql:mysql /var/log/datamate/database &&
Expand All @@ -63,8 +60,6 @@ services:
MYSQL_USER: "root"
MYSQL_PASSWORD: "password"
MYSQL_DATABASE: "datamate"
ports:
- "8081"
command:
- python
- /opt/runtime/datamate/operator_runtime.py
Expand Down
Loading