diff --git a/deployment/docker/datamate/docker-compose.yml b/deployment/docker/datamate/docker-compose.yml index 68085ec6..9f3ec006 100644 --- a/deployment/docker/datamate/docker-compose.yml +++ b/deployment/docker/datamate/docker-compose.yml @@ -5,7 +5,7 @@ services: datamate-backend: container_name: datamate-backend - image: ${REGISTRY:-}datamate-backend + image: ${REGISTRY:-}datamate-backend:${VERSION:-latest} restart: on-failure privileged: true environment: @@ -23,7 +23,7 @@ services: datamate-backend-python: container_name: datamate-backend-python - image: ${REGISTRY:-}datamate-backend-python + image: ${REGISTRY:-}datamate-backend-python:${VERSION:-latest} restart: on-failure privileged: true environment: @@ -41,7 +41,7 @@ services: datamate-gateway: container_name: datamate-gateway - image: ${REGISTRY:-}datamate-gateway + image: ${REGISTRY:-}datamate-gateway:${VERSION:-latest} restart: on-failure privileged: true ports: @@ -53,7 +53,7 @@ services: datamate-frontend: container_name: datamate-frontend - image: ${REGISTRY:-}datamate-frontend + image: ${REGISTRY:-}datamate-frontend:${VERSION:-latest} restart: on-failure ports: - "30000:3000" @@ -66,7 +66,7 @@ services: datamate-database: container_name: datamate-database - image: ${REGISTRY:-}datamate-database + image: ${REGISTRY:-}datamate-database:${VERSION:-latest} restart: on-failure environment: - POSTGRES_USER=postgres @@ -80,7 +80,7 @@ services: datamate-runtime: container_name: datamate-runtime - image: ${REGISTRY:-}datamate-runtime + image: ${REGISTRY:-}datamate-runtime:${VERSION:-latest} restart: on-failure environment: RAY_DEDUP_LOGS: "0" diff --git a/runtime/ops/examples/test_operator/metadata.yml b/runtime/ops/examples/test_operator/metadata.yml index feadc9c3..2320c9ed 100644 --- a/runtime/ops/examples/test_operator/metadata.yml +++ b/runtime/ops/examples/test_operator/metadata.yml @@ -20,8 +20,8 @@ metrics: - name: '吞吐量' metric: '20 images/sec' runtime: - memory: 10MB - cpu: 1000m + memory: 10485760 + cpu: 0.05 gpu: 0.1 npu: 0.1 settings: diff --git a/runtime/ops/examples/test_operator/test_operator.tar b/runtime/ops/examples/test_operator/test_operator.tar index 1ab13c11..dc986c1d 100644 Binary files a/runtime/ops/examples/test_operator/test_operator.tar and b/runtime/ops/examples/test_operator/test_operator.tar differ diff --git a/runtime/python-executor/datamate/core/base_op.py b/runtime/python-executor/datamate/core/base_op.py index f87457d7..c0256c17 100644 --- a/runtime/python-executor/datamate/core/base_op.py +++ b/runtime/python-executor/datamate/core/base_op.py @@ -205,7 +205,15 @@ def __call__(self, sample: Dict[str, Any], **kwargs): sample["execute_status"] = execute_status # 加载文件成功执行信息到数据库 if self.is_last_op: - self.save_file_and_db(sample) + # 文件无内容会被过滤 + if sample[self.text_key] == "" and sample[self.data_key] == b"": + task_info = TaskInfoPersistence() + sample[self.filesize_key] = "0" + sample[self.filetype_key] = "" + task_info.update_task_result(sample) + return sample + else: + self.save_file_and_db(sample) return sample def execute(self, sample: Dict[str, Any]) -> Dict[str, Any]: