From 3d011ac5fb5456c897247bed1c8824484a875538 Mon Sep 17 00:00:00 2001 From: shoulinwei Date: Thu, 10 Jun 2021 12:55:34 +0800 Subject: [PATCH] status-1 --- csst_dfs_api_cluster/facility/calmerge.py | 3 +-- csst_dfs_api_cluster/facility/level0prc.py | 2 +- csst_dfs_api_cluster/ifs/level1.py | 5 +++-- csst_dfs_api_cluster/msc/level1.py | 5 +++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/csst_dfs_api_cluster/facility/calmerge.py b/csst_dfs_api_cluster/facility/calmerge.py index d0b116b..994e59c 100644 --- a/csst_dfs_api_cluster/facility/calmerge.py +++ b/csst_dfs_api_cluster/facility/calmerge.py @@ -122,7 +122,6 @@ class CalMergeApi(object): ''' insert a calibration merge record into database parameter kwargs: - id : [int] detector_no : [str] ref_type : [str] obs_time : [str] @@ -143,7 +142,7 @@ class CalMergeApi(object): exp_time = get_parameter(kwargs, "exp_time"), filename = get_parameter(kwargs, "filename"), file_path = get_parameter(kwargs, "file_path"), - prc_status = get_parameter(kwargs, "prc_status"), + prc_status = get_parameter(kwargs, "prc_status",-1), prc_time = get_parameter(kwargs, "prc_time"), level0_ids = get_parameter(kwargs, "level0_ids", []) ) diff --git a/csst_dfs_api_cluster/facility/level0prc.py b/csst_dfs_api_cluster/facility/level0prc.py index 8d99310..73e30ea 100644 --- a/csst_dfs_api_cluster/facility/level0prc.py +++ b/csst_dfs_api_cluster/facility/level0prc.py @@ -85,7 +85,7 @@ class Level0PrcApi(object): pipeline_id = get_parameter(kwargs, "pipeline_id"), prc_module = get_parameter(kwargs, "prc_module"), params_id = get_parameter(kwargs, "params_id"), - prc_status = get_parameter(kwargs, "prc_status"), + prc_status = get_parameter(kwargs, "prc_status", -1), prc_time = get_parameter(kwargs, "prc_time"), file_path = get_parameter(kwargs, "file_path") ) diff --git a/csst_dfs_api_cluster/ifs/level1.py b/csst_dfs_api_cluster/ifs/level1.py index 1558d74..38a6bc2 100644 --- a/csst_dfs_api_cluster/ifs/level1.py +++ b/csst_dfs_api_cluster/ifs/level1.py @@ -1,4 +1,5 @@ import grpc +import datetime from csst_dfs_commons.models import Result from csst_dfs_commons.models.common import from_proto_model_list @@ -155,8 +156,8 @@ class Level1DataApi(object): sky_id = get_parameter(kwargs, "sky_id"), filename = get_parameter(kwargs, "filename"), file_path = get_parameter(kwargs, "file_path"), - prc_status = get_parameter(kwargs, "prc_status"), - prc_time = get_parameter(kwargs, "prc_time"), + prc_status = get_parameter(kwargs, "prc_status", -1), + prc_time = get_parameter(kwargs, "prc_time", format_datetime(datetime.datetime.now())), pipeline_id = get_parameter(kwargs, "pipeline_id") ) req = level1_pb2.WriteLevel1Req(record = rec) diff --git a/csst_dfs_api_cluster/msc/level1.py b/csst_dfs_api_cluster/msc/level1.py index d8cd7cc..4100fb9 100644 --- a/csst_dfs_api_cluster/msc/level1.py +++ b/csst_dfs_api_cluster/msc/level1.py @@ -1,4 +1,5 @@ import grpc +import datetime from csst_dfs_commons.models import Result from csst_dfs_commons.models.common import from_proto_model_list @@ -149,8 +150,8 @@ class Level1DataApi(object): bias_id = get_parameter(kwargs, "bias_id"), filename = get_parameter(kwargs, "filename"), file_path = get_parameter(kwargs, "file_path"), - prc_status = get_parameter(kwargs, "prc_status"), - prc_time = get_parameter(kwargs, "prc_time"), + prc_status = get_parameter(kwargs, "prc_status", -1), + prc_time = get_parameter(kwargs, "prc_time", format_datetime(datetime.datetime.now())), pipeline_id = get_parameter(kwargs, "pipeline_id") ) req = level1_pb2.WriteLevel1Req(record = rec) -- GitLab