Commit 3d011ac5 authored by Wei Shoulin's avatar Wei Shoulin
Browse files

status-1

parent 790d8712
...@@ -122,7 +122,6 @@ class CalMergeApi(object): ...@@ -122,7 +122,6 @@ class CalMergeApi(object):
''' insert a calibration merge record into database ''' insert a calibration merge record into database
parameter kwargs: parameter kwargs:
id : [int]
detector_no : [str] detector_no : [str]
ref_type : [str] ref_type : [str]
obs_time : [str] obs_time : [str]
...@@ -143,7 +142,7 @@ class CalMergeApi(object): ...@@ -143,7 +142,7 @@ class CalMergeApi(object):
exp_time = get_parameter(kwargs, "exp_time"), exp_time = get_parameter(kwargs, "exp_time"),
filename = get_parameter(kwargs, "filename"), filename = get_parameter(kwargs, "filename"),
file_path = get_parameter(kwargs, "file_path"), 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"), prc_time = get_parameter(kwargs, "prc_time"),
level0_ids = get_parameter(kwargs, "level0_ids", []) level0_ids = get_parameter(kwargs, "level0_ids", [])
) )
......
...@@ -85,7 +85,7 @@ class Level0PrcApi(object): ...@@ -85,7 +85,7 @@ class Level0PrcApi(object):
pipeline_id = get_parameter(kwargs, "pipeline_id"), pipeline_id = get_parameter(kwargs, "pipeline_id"),
prc_module = get_parameter(kwargs, "prc_module"), prc_module = get_parameter(kwargs, "prc_module"),
params_id = get_parameter(kwargs, "params_id"), 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"), prc_time = get_parameter(kwargs, "prc_time"),
file_path = get_parameter(kwargs, "file_path") file_path = get_parameter(kwargs, "file_path")
) )
......
import grpc import grpc
import datetime
from csst_dfs_commons.models import Result from csst_dfs_commons.models import Result
from csst_dfs_commons.models.common import from_proto_model_list from csst_dfs_commons.models.common import from_proto_model_list
...@@ -155,8 +156,8 @@ class Level1DataApi(object): ...@@ -155,8 +156,8 @@ class Level1DataApi(object):
sky_id = get_parameter(kwargs, "sky_id"), sky_id = get_parameter(kwargs, "sky_id"),
filename = get_parameter(kwargs, "filename"), filename = get_parameter(kwargs, "filename"),
file_path = get_parameter(kwargs, "file_path"), 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"), prc_time = get_parameter(kwargs, "prc_time", format_datetime(datetime.datetime.now())),
pipeline_id = get_parameter(kwargs, "pipeline_id") pipeline_id = get_parameter(kwargs, "pipeline_id")
) )
req = level1_pb2.WriteLevel1Req(record = rec) req = level1_pb2.WriteLevel1Req(record = rec)
......
import grpc import grpc
import datetime
from csst_dfs_commons.models import Result from csst_dfs_commons.models import Result
from csst_dfs_commons.models.common import from_proto_model_list from csst_dfs_commons.models.common import from_proto_model_list
...@@ -149,8 +150,8 @@ class Level1DataApi(object): ...@@ -149,8 +150,8 @@ class Level1DataApi(object):
bias_id = get_parameter(kwargs, "bias_id"), bias_id = get_parameter(kwargs, "bias_id"),
filename = get_parameter(kwargs, "filename"), filename = get_parameter(kwargs, "filename"),
file_path = get_parameter(kwargs, "file_path"), 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"), prc_time = get_parameter(kwargs, "prc_time", format_datetime(datetime.datetime.now())),
pipeline_id = get_parameter(kwargs, "pipeline_id") pipeline_id = get_parameter(kwargs, "pipeline_id")
) )
req = level1_pb2.WriteLevel1Req(record = rec) req = level1_pb2.WriteLevel1Req(record = rec)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment