feat: 优化mineru构建部署参数，适配310P

Author: hhhhsc701

Makefile

@@ -152,7 +152,7 @@ endef
 # ========== Build Targets ==========
 
 # Valid build targets
-VALID_BUILD_TARGETS := backend database frontend runtime backend-python deer-flow mineru mineru-npu gateway label-studio
+VALID_BUILD_TARGETS := frontend backend gateway database runtime backend-python deer-flow label-studio mineru mineru-910B mineru-910C mineru-310P
 
 # Generic docker build target with service name as parameter
 # Automatically prefixes image names with "datamate-" unless it's deer-flow
@@ -169,6 +169,12 @@ VALID_BUILD_TARGETS := backend database frontend runtime backend-python deer-flo
 	@if [ "$*" = "deer-flow" ]; then \
 		$(call docker-build,deer-flow-backend,deer-flow-backend); \
 		$(call docker-build,deer-flow-frontend,deer-flow-frontend); \
+	elif [ "$*" = "mineru" ] || [ "$*" = "mineru-910B" ]; then \
+		wget -qO - https://gcore.jsdelivr.net/gh/opendatalab/MinerU@master/docker/china/npu.Dockerfile | docker build --network=host -t datamate-mineru -f - .; \
+	elif [ "$*" = "mineru-910C" ]; then \
+		wget -qO - https://gcore.jsdelivr.net/gh/opendatalab/MinerU@master/docker/china/npu.Dockerfile | sed 's/v0.11.0/v0.11.0-a3/g' | docker build --network=host -t datamate-mineru -f - .; \
+	elif [ "$*" = "mineru-310P" ]; then \
+		wget -qO - https://gcore.jsdelivr.net/gh/opendatalab/MinerU@master/docker/china/npu.Dockerfile | sed 's/v0.11.0/v0.10.0rc1-310p/g' | docker build --network=host -t datamate-mineru -f - .; \
 	else \
 		$(call docker-build,$*,datamate-$*); \
 	fi
@@ -235,7 +241,7 @@ endif
 # ========== Docker Install/Uninstall Targets ==========
 
 # Valid service targets for docker install/uninstall
-VALID_SERVICE_TARGETS := datamate backend frontend runtime backend-python database gateway redis mineru deer-flow milvus label-studio data-juicer dj
+VALID_SERVICE_TARGETS := datamate backend frontend runtime backend-python database gateway redis deer-flow milvus label-studio data-juicer mineru mineru-910B mineru-910C mineru-310P
 
 # Generic docker service install target
 .PHONY: %-docker-install
@@ -252,9 +258,11 @@ VALID_SERVICE_TARGETS := datamate backend frontend runtime backend-python databa
 		REGISTRY=$(REGISTRY) docker compose -f deployment/docker/datamate/docker-compose.yml --profile label-studio up -d; \
 	elif [ "$*" = "datamate" ]; then \
 		REGISTRY=$(REGISTRY) docker compose -f deployment/docker/datamate/docker-compose.yml up -d; \
-	elif [ "$*" = "mineru" ]; then \
+	elif [ "$*" = "mineru" ] || [ "$*" = "mineru-910B" ] || [ "$*" = "mineru-910C" ]; then \
 		REGISTRY=$(REGISTRY) docker compose -f deployment/docker/datamate/docker-compose.yml --profile mineru up -d datamate-mineru; \
-	elif [ "$*" = "data-juicer" ] || [ "$*" = "dj" ]; then \
+	elif [ "$*" = "mineru-310P" ]; then \
+		REGISTRY=$(REGISTRY) EXTRA_ARGS="--enforce-eager --dtype float16" docker compose -f deployment/docker/datamate/docker-compose.yml --profile mineru up -d datamate-mineru; \
+	elif [ "$*" = "data-juicer" ]; then \
 		REGISTRY=$(REGISTRY) docker compose -f deployment/docker/datamate/docker-compose.yml --profile data-juicer up -d datamate-data-juicer; \
 	elif [ "$*" = "redis" ]; then \
 		REGISTRY=$(REGISTRY) docker compose -f deployment/docker/datamate/docker-compose.yml --profile redis up -d datamate-redis; \
@@ -281,7 +289,7 @@ VALID_SERVICE_TARGETS := datamate backend frontend runtime backend-python databa
 	fi
 	@if [ "$*" = "label-studio" ]; then \
 		docker compose -f deployment/docker/datamate/docker-compose.yml rm -f -s label-studio; \
-	elif [ "$*" = "mineru" ]; then \
+	elif [ "$*" = "mineru" ] || [ "$*" = "mineru-910B" ] || [ "$*" = "mineru-910C" ] || [ "$*" = "mineru-310P" ]; then \
 		docker compose -f deployment/docker/datamate/docker-compose.yml rm -f -s datamate-mineru; \
 	elif [ "$*" = "data-juicer" ] || [ "$*" = "dj" ]; then \
 		docker compose -f deployment/docker/datamate/docker-compose.yml rm -f -s datamate-data-juicer; \
@@ -304,7 +312,7 @@ VALID_SERVICE_TARGETS := datamate backend frontend runtime backend-python databa
 # ========== Kubernetes Install/Uninstall Targets ==========
 
 # Valid k8s targets
-VALID_K8S_TARGETS := mineru datamate deer-flow milvus label-studio data-juicer dj
+VALID_K8S_TARGETS := datamate deer-flow milvus label-studio data-juicer mineru mineru-910B mineru-910C mineru-310P
 
 # Generic k8s install target
 .PHONY: %-k8s-install
@@ -319,8 +327,10 @@ VALID_K8S_TARGETS := mineru datamate deer-flow milvus label-studio data-juicer d
 	fi
 	@if [ "$*" = "label-studio" ]; then \
      	helm upgrade label-studio deployment/helm/label-studio/ -n $(NAMESPACE) --install; \
-    elif [ "$*" = "mineru" ]; then \
-		kubectl apply -f deployment/kubernetes/mineru/deploy.yaml -n $(NAMESPACE); \
+    elif [ "$*" = "mineru" ] || [ "$*" = "mineru-910B" ] || [ "$*" = "mineru-910C" ]; then \
+		kubectl apply -f deployment/kubernetes/mineru/deploy-910.yaml -n $(NAMESPACE); \
+	elif [ "$*" = "mineru-310P" ]; then \
+		kubectl apply -f deployment/kubernetes/mineru/deploy-310.yaml -n $(NAMESPACE); \
 	elif [ "$*" = "datamate" ]; then \
 		helm upgrade datamate deployment/helm/datamate/ -n $(NAMESPACE) --install --set global.image.repository=$(REGISTRY); \
 	elif [ "$*" = "deer-flow" ]; then \
@@ -346,8 +356,10 @@ VALID_K8S_TARGETS := mineru datamate deer-flow milvus label-studio data-juicer d
 		done; \
 		exit 1; \
 	fi
-	@if [ "$*" = "mineru" ]; then \
-		kubectl delete -f deployment/kubernetes/mineru/deploy.yaml -n $(NAMESPACE); \
+	@if [ "$*" = "mineru" ] || [ "$*" = "mineru-910B" ] || [ "$*" = "mineru-910C" ]; then \
+		kubectl delete -f deployment/kubernetes/mineru/deploy-910.yaml -n $(NAMESPACE); \
+	elif [ "$*" = "mineru-310P" ]; then \
+		kubectl delete -f deployment/kubernetes/mineru/deploy-310.yaml -n $(NAMESPACE); \
 	elif [ "$*" = "datamate" ]; then \
 		helm uninstall datamate -n $(NAMESPACE) --ignore-not-found; \
 	elif [ "$*" = "deer-flow" ]; then \
@@ -360,26 +372,6 @@ VALID_K8S_TARGETS := mineru datamate deer-flow milvus label-studio data-juicer d
 		kubectl delete -f deployment/kubernetes/data-juicer/deploy.yaml -n $(NAMESPACE); \
 	fi
 
-# ========== Upgrade Targets ==========
-
-# Valid upgrade targets
-VALID_UPGRADE_TARGETS := datamate
-
-# Generic docker upgrade target
-.PHONY: %-docker-upgrade
-%-docker-upgrade:
-	@if ! echo " $(VALID_UPGRADE_TARGETS) " | grep -q " $* "; then \
-		echo "Error: Unknown upgrade target '$*'"; \
-		echo "Valid upgrade targets are:"; \
-		for target in $(VALID_UPGRADE_TARGETS); do \
-			echo "  - $$target"; \
-		done; \
-		exit 1; \
-	fi
-	@if [ "$*" = "datamate" ]; then \
-		docker compose -f deployment/docker/datamate/docker-compose.yml --profile mineru up -d --force-recreate --remove-orphans; \
-	fi
-
 # ========== Download Targets ==========
 
 # List of all images to download

deployment/docker/datamate/docker-compose.yml

@@ -42,6 +42,8 @@ services:
     image: ${REGISTRY:-}datamate-gateway
     restart: on-failure
     privileged: true
+    ports:
+      - '8080:8080'
     environment:
       - JWT_SECRET=default-insecure-key-change-in-production
     networks: [ datamate ]
@@ -111,14 +113,14 @@ services:
       MINERU_DEVICE_MODE: npu
       VLLM_WORKER_MULTIPROC_METHOD: spawn
     privileged: true
-    entrypoint: mineru-openai-server
-    command:
+    entrypoint: /bin/sh -c
+    command: >
+      "exec mineru-openai-server
       --engine vllm
       --host 0.0.0.0
       --port 8000
+      ${EXTRA_ARGS:-}"
     volumes:
-      - dataset_volume:/dataset
-      - mineru_log_volume:/var/log/datamate/mineru
       - /var/log/npu/:/usr/slog
       - /usr/local/dcmi:/usr/local/dcmi
       - /usr/local/bin/npu-smi:/usr/local/bin/npu-smi
@@ -334,8 +336,6 @@ volumes:
     name: datamate-operator-runtime-volume
   operator-packages-volume:
     name: datamate-operator-packages-volume
-  mineru_log_volume:
-    name: datamate-mineru_log_volume
   graph_data_volume:
     name: datamate-graph-data-volume
 

deployment/kubernetes/mineru/deploy-310.yaml

@@ -0,0 +1,71 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: datamate-mineru
+  labels:
+    app: datamate
+    tier: mineru
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app: datamate
+      tier: mineru
+  template:
+    metadata:
+      labels:
+        app: datamate
+        tier: mineru
+    spec:
+      containers:
+        - name: mineru
+          image: datamate-mineru
+          imagePullPolicy: IfNotPresent
+          command:
+            - mineru-openai-server
+          args:
+            - --engine
+            - vllm
+            - --host
+            - 0.0.0.0
+            - --port
+            - "8000"
+            - --enforce-eager
+            - --dtype
+            - float16
+          env:
+            - name: MINERU_MODEL_SOURCE
+              value: local
+            - name: MINERU_DEVICE_MODE
+              value: npu
+            - name: VLLM_WORKER_MULTIPROC_METHOD
+              value: spawn
+          ports:
+            - containerPort: 8000
+          resources:
+            limits:
+              cpu: 8
+              memory: 32Gi
+              huawei.com/Ascend310P: 1
+            requests:
+              cpu: 100m
+              memory: 100Mi
+              huawei.com/Ascend310P: 1
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: datamate-mineru
+  labels:
+    app: datamate
+    tier: mineru
+spec:
+  type: ClusterIP
+  ports:
+    - port: 8000
+      targetPort: 8000
+      protocol: TCP
+  selector:
+    app: datamate
+    tier: mineru

deployment/kubernetes/mineru/deploy.yaml …oyment/kubernetes/mineru/deploy-910.yamldeployment/kubernetes/mineru/deploy.yaml renamed to deployment/kubernetes/mineru/deploy-910.yaml deployment/kubernetes/mineru/deploy.yaml renamed to deployment/kubernetes/mineru/deploy-910.yaml

@@ -48,19 +48,6 @@ spec:
               cpu: 100m
               memory: 100Mi
               huawei.com/Ascend910: 1
-          volumeMounts:
-            - name: dataset-volume
-              mountPath: /dataset
-            - name: log-volume
-              mountPath: /var/log/datamate/mineru
-              subPath: mineru
-      volumes:
-        - name: dataset-volume
-          persistentVolumeClaim:
-            claimName: datamate-dataset-pvc
-        - name: log-volume
-          persistentVolumeClaim:
-            claimName: datamate-log-pvc
 
 ---
 apiVersion: v1

runtime/mineru/mineru_api.py

@@ -15,6 +15,12 @@ effect:
 inputs: 'text'
 outputs: 'text'
 settings:
+  mineruApi:
+    name: 'Mineru Api地址'
+    description: '指定mineru服务的api地址，默认为本地同一集群内地址。'
+    type: 'input'
+    defaultVal: 'http://datamate-mineru:8000'
+    required: false
   exportType:
     name: '导出类型'
     description: '指定清洗结果文件类型。若指定为md且后续存在其他清洗算子，可能导致文件格式错乱。'

runtime/ops/formatter/mineru_formatter/metadata.yml

@@ -27,7 +27,7 @@ class MineruFormatter(Mapper):
 
     def __init__(self, *args, **kwargs):
         super(MineruFormatter, self).__init__(*args, **kwargs)
-        self.server_url = "http://datamate-mineru:8000"
+        self.server_url = kwargs.get("mineruApi", "http://datamate-mineru:8000")
         self.backend = "vlm-http-client"
         self.output_dir = "/dataset/outputs"
         self.max_retries = 3