For scalebox version=2604170059, update the module common code.

L1/dockerfiles/common/Dockerfile

@@ -22,6 +22,7 @@ WORKDIR /work/
 ENV HARBOR_PATH=${HARBOR_PATH}
 ENV MODULE_NAME=${MODULE_NAME}
 ENV TAG=${TAG}
+ENV IS_SINK_MODULE=${IS_SINK_MODULE}
 
 USER csst
 

L1/dockerfiles/common/Makefile

 -include config.env
 $(info MODULE_NAME = $(MODULE_NAME))
 $(info HARBOR_PATH = $(HARBOR_PATH))
-$(info SINK_MODULE = $(SINK_MODULE))
+$(info IS_SINK_MODULE = $(IS_SINK_MODULE))
 # $(info TAG = $(TAG))
 
 IMAGE_NAME:=$(HARBOR_PATH)/cnic/$(MODULE_NAME)
@@ -14,6 +14,7 @@ build:
 		--build-arg MODULE_NAME=$(MODULE_NAME) \
 		--build-arg HARBOR_PATH=$(HARBOR_PATH) \
 		--build-arg TAG=$(TAG) \
+		--build-arg IS_SINK_MODULE=$(IS_SINK_MODULE) \
 		-t $(IMAGE_NAME) .
 push:
 	docker push $(IMAGE_NAME)
@@ -27,7 +28,7 @@ run:
 		-e MODULE_NAME=${MODULE_NAME} \
 		-e HARBOR_PATH=${HARBOR_PATH} \
 		-e TAG=${TAG} \
-		-e SINK_MODULE=${SINK_MODULE} \
+		-e IS_SINK_MODULE=${IS_SINK_MODULE} \
 		--entrypoint bash \
 		${IMAGE_NAME}
 

L1/dockerfiles/common/config.env

-MODULE_NAME=csst-msc-l1-phot
+MODULE_NAME=csst-msc-l1-ast-astrometry
 HARBOR_PATH=csu-harbor.csst.nao:10443
-# SINK_MODULE=0: no sink module; SINK_MODULE=1 : has sink module
-SINK_MODULE=0
+# IS_SINK_MODULE=0: no sink module; IS_SINK_MODULE=1 : has sink module
+IS_SINK_MODULE=1
 
 

L1/dockerfiles/common/run.sh

@@ -6,6 +6,7 @@ headers=$(echo "$2" | sed 's/\\//g')
 
 echo "$headers" | jq '.'
 echo "headers: $headers"
+echo "IS_SINK_MODULE is : $IS_SINK_MODULE"
 
 has_data_list=$(echo "$headers" | jq 'has("data_list")')
 
@@ -47,17 +48,21 @@ echo "dag_run_id:$dag_run_id" >> /work/extra-attributes.txt
 
 if [ $exit_code -eq 0 ]; then  
     # 判断是否有后续模块，有后续模块，则下发给后续模块任务
-    if [ "${SINK_MODULE:-0}" = "1" ]; then
-    # if [ "$SINK_MODULE" = "1" ]; then
-        
+    if [ "${IS_SINK_MODULE:-0}" = "1" ]; then       
         if [ "$has_data_list" = "true" ]; then
             # 提取 data_list 字段的值
-            strdatalist=$(echo "$fixed_data_list" | tr -d '[:space:]')
-            scalebox task add --header sorted_tag=${sorted_tag} --header dag_run_id=${dag_run_id} --header data_list=${strdatalist} --header repeatable=yes --upsert $1
+            str_datalist=$(echo "$fixed_data_list" | tr -d '[:space:]')
+            
+            strdatalist=$(echo "$str_datalist" | sed 's/"/\\"/g')
+            strheaders="{\"sorted_tag\":\"${sorted_tag}\",\"dag_run_id\":\"${dag_run_id}\",\"repeatable\":\"yes\",\"data_list\":\"${strdatalist}\"}"
+            echo "strheaders: "$strheaders
+            scalebox task add --headers "${strheaders}" --conflict-action=OVERWRITE $1
+            
+            #scalebox task add --header sorted_tag=${sorted_tag} --header dag_run_id=${dag_run_id} --header data_list=${strdatalist} --header repeatable=yes --conflict-action=OVERWRITE $1
         else
-            scalebox task add --header sorted_tag=${sorted_tag} --header dag_run_id=${dag_run_id} --header repeatable=yes --upsert ${message}
+            scalebox task add --header sorted_tag=${sorted_tag} --header dag_run_id=${dag_run_id} --header repeatable=yes --conflict-action=OVERWRITE ${message}
         fi
-        echo "finish ${MODULE_NAME}, start sink-job." 
+        echo "finish ${MODULE_NAME}, start sink-module." 
     else
         #没有后续模块直接结束
         echo "finish  ${MODULE_NAME}."