From 96b3dfd88599a82fb807ef3727ca09ab5606a67a Mon Sep 17 00:00:00 2001 From: shoulinwei Date: Sat, 5 Nov 2022 22:57:37 +0800 Subject: [PATCH] add pipeline_id --- csst_dfs_api_cluster/common/catalog.py | 2 +- csst_dfs_api_cluster/facility/brick.py | 10 +- csst_dfs_api_cluster/facility/detector.py | 16 +- .../facility/level2producer.py | 28 +-- csst_dfs_api_cluster/facility/observation.py | 10 +- csst_dfs_api_cluster/ifs/calmerge.py | 12 +- csst_dfs_api_cluster/ifs/level0.py | 10 +- csst_dfs_api_cluster/ifs/level0prc.py | 6 +- csst_dfs_api_cluster/ifs/level1.py | 10 +- csst_dfs_api_cluster/ifs/level1prc.py | 6 +- csst_dfs_api_cluster/msc/calmerge.py | 12 +- csst_dfs_api_cluster/msc/level0.py | 10 +- csst_dfs_api_cluster/msc/level0prc.py | 6 +- csst_dfs_api_cluster/msc/level1.py | 10 +- csst_dfs_api_cluster/msc/level1prc.py | 6 +- csst_dfs_api_cluster/msc/level2.py | 15 +- csst_dfs_api_cluster/msc/level2co.py | 201 ++++++++++++++++++ csst_dfs_api_cluster/sls/calmerge.py | 12 +- csst_dfs_api_cluster/sls/level0.py | 10 +- csst_dfs_api_cluster/sls/level0prc.py | 6 +- csst_dfs_api_cluster/sls/level1.py | 10 +- csst_dfs_api_cluster/sls/level1prc.py | 6 +- csst_dfs_api_cluster/sls/level2spectra.py | 10 +- 23 files changed, 313 insertions(+), 111 deletions(-) create mode 100644 csst_dfs_api_cluster/msc/level2co.py diff --git a/csst_dfs_api_cluster/common/catalog.py b/csst_dfs_api_cluster/common/catalog.py index a2f4068..78d6719 100644 --- a/csst_dfs_api_cluster/common/catalog.py +++ b/csst_dfs_api_cluster/common/catalog.py @@ -41,5 +41,5 @@ class CatalogApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/facility/brick.py b/csst_dfs_api_cluster/facility/brick.py index b827ec9..9c1c84c 100644 --- a/csst_dfs_api_cluster/facility/brick.py +++ b/csst_dfs_api_cluster/facility/brick.py @@ -37,7 +37,7 @@ class BrickApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get(self, **kwargs): ''' fetch a record from database @@ -59,7 +59,7 @@ class BrickApi(object): return Result.ok_data(data=Brick().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a brickal record into database @@ -86,7 +86,7 @@ class BrickApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def find_obs_status(self, **kwargs): ''' find observation status of bricks @@ -111,7 +111,7 @@ class BrickApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def find_level1_data(self, **kwargs): ''' find level1 data @@ -138,4 +138,4 @@ class BrickApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/facility/detector.py b/csst_dfs_api_cluster/facility/detector.py index 4c0684c..5d08b6f 100644 --- a/csst_dfs_api_cluster/facility/detector.py +++ b/csst_dfs_api_cluster/facility/detector.py @@ -34,7 +34,7 @@ class DetectorApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get(self, **kwargs): ''' fetch a record from database @@ -56,7 +56,7 @@ class DetectorApi(object): return Result.ok_data(data=Detector().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update(self, **kwargs): ''' update a detector by no @@ -90,7 +90,7 @@ class DetectorApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def delete(self, **kwargs): ''' delete a detector by no @@ -112,7 +112,7 @@ class DetectorApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a detector record into database @@ -139,7 +139,7 @@ class DetectorApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def find_status(self, **kwargs): ''' retrieve a detector status's from database @@ -165,7 +165,7 @@ class DetectorApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get_status(self, **kwargs): ''' fetch a record from database @@ -187,7 +187,7 @@ class DetectorApi(object): return Result.ok_data(data=DetectorStatus().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write_status(self, **kwargs): ''' insert a detector status into database @@ -213,4 +213,4 @@ class DetectorApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) \ No newline at end of file + return Result.error(message="%s:%s" % (e.code().value, e.details())) \ No newline at end of file diff --git a/csst_dfs_api_cluster/facility/level2producer.py b/csst_dfs_api_cluster/facility/level2producer.py index ec50721..0374b5a 100644 --- a/csst_dfs_api_cluster/facility/level2producer.py +++ b/csst_dfs_api_cluster/facility/level2producer.py @@ -46,7 +46,7 @@ class Level2ProducerApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def find(self, **kwargs): ''' retrieve Level2Producer records from database @@ -68,7 +68,7 @@ class Level2ProducerApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get(self, **kwargs): ''' fetch a record from database @@ -90,7 +90,7 @@ class Level2ProducerApi(object): return Result.ok_data(data=Level2Producer().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def find_nexts(self, **kwargs): ''' retrieve Level2Producer records from database @@ -111,7 +111,7 @@ class Level2ProducerApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def find_start(self, **kwargs): ''' retrieve Level2Producer records from database @@ -133,7 +133,7 @@ class Level2ProducerApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update(self, **kwargs): ''' update a Level2Producer @@ -166,7 +166,7 @@ class Level2ProducerApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def delete(self, **kwargs): ''' delete a Level2Producer data @@ -187,7 +187,7 @@ class Level2ProducerApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def new_job(self, **kwargs): ''' new a Level2Producer Job @@ -211,7 +211,7 @@ class Level2ProducerApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get_job(self, **kwargs): ''' fetch a record from database @@ -233,7 +233,7 @@ class Level2ProducerApi(object): return Result.ok_data(data=Level2Job().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_job(self, **kwargs): ''' update a Level2Producer Job @@ -260,7 +260,7 @@ class Level2ProducerApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def new_running(self, **kwargs): ''' insert a Level2ProducerRuningRecord data @@ -294,7 +294,7 @@ class Level2ProducerApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get_running(self, **kwargs): ''' fetch a record from database @@ -316,7 +316,7 @@ class Level2ProducerApi(object): return Result.ok_data(data=Level2ProducerRuning().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_running(self, **kwargs): ''' udpate a Level2ProducerRuningRecord data @@ -352,7 +352,7 @@ class Level2ProducerApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def find_running(self, **kwargs): ''' find Level2ProducerRuningRecord data @@ -384,4 +384,4 @@ class Level2ProducerApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) \ No newline at end of file + return Result.error(message="%s:%s" % (e.code().value, e.details())) \ No newline at end of file diff --git a/csst_dfs_api_cluster/facility/observation.py b/csst_dfs_api_cluster/facility/observation.py index 8c2fe8b..3fc6494 100644 --- a/csst_dfs_api_cluster/facility/observation.py +++ b/csst_dfs_api_cluster/facility/observation.py @@ -48,7 +48,7 @@ class ObservationApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get(self, **kwargs): ''' fetch a record from database @@ -73,7 +73,7 @@ class ObservationApi(object): return Result.ok_data(data=Observation().from_proto_model(resp.observation)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -101,7 +101,7 @@ class ObservationApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_qc0_status(self, **kwargs): ''' update the status of QC0 @@ -127,7 +127,7 @@ class ObservationApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a observational record into database @@ -163,7 +163,7 @@ class ObservationApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/ifs/calmerge.py b/csst_dfs_api_cluster/ifs/calmerge.py index c1be1d6..7ed78fa 100644 --- a/csst_dfs_api_cluster/ifs/calmerge.py +++ b/csst_dfs_api_cluster/ifs/calmerge.py @@ -34,7 +34,7 @@ class CalMergeApi(object): return Result.ok_data(data=CalMergeRecord().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def find(self, **kwargs): ''' retrieve calibration merge records from database @@ -69,7 +69,7 @@ class CalMergeApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get(self, **kwargs): ''' fetch a record from database @@ -93,7 +93,7 @@ class CalMergeApi(object): return Result.ok_data(data=CalMergeRecord().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_qc1_status(self, **kwargs): ''' update the status of reduction @@ -122,7 +122,7 @@ class CalMergeApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -151,7 +151,7 @@ class CalMergeApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a calibration merge record into database @@ -191,5 +191,5 @@ class CalMergeApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/ifs/level0.py b/csst_dfs_api_cluster/ifs/level0.py index 9155683..84fe6d8 100644 --- a/csst_dfs_api_cluster/ifs/level0.py +++ b/csst_dfs_api_cluster/ifs/level0.py @@ -59,7 +59,7 @@ class Level0DataApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get(self, **kwargs): ''' fetch a record from database @@ -84,7 +84,7 @@ class Level0DataApi(object): return Result.ok_data(data = Level0Record().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -112,7 +112,7 @@ class Level0DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_qc0_status(self, **kwargs): ''' update the status of QC0 @@ -138,7 +138,7 @@ class Level0DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a level0 data record into database @@ -173,6 +173,6 @@ class Level0DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/ifs/level0prc.py b/csst_dfs_api_cluster/ifs/level0prc.py index 28f7d2e..451dee7 100644 --- a/csst_dfs_api_cluster/ifs/level0prc.py +++ b/csst_dfs_api_cluster/ifs/level0prc.py @@ -39,7 +39,7 @@ class Level0PrcApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -63,7 +63,7 @@ class Level0PrcApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a level0 procedure record into database @@ -97,7 +97,7 @@ class Level0PrcApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/ifs/level1.py b/csst_dfs_api_cluster/ifs/level1.py index 28ea984..77108c0 100644 --- a/csst_dfs_api_cluster/ifs/level1.py +++ b/csst_dfs_api_cluster/ifs/level1.py @@ -51,7 +51,7 @@ class Level1DataApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get(self, **kwargs): ''' fetch a record from database @@ -74,7 +74,7 @@ class Level1DataApi(object): return Result.ok_data(data=Level1Record().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -97,7 +97,7 @@ class Level1DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_qc1_status(self, **kwargs): ''' update the status of QC0 @@ -118,7 +118,7 @@ class Level1DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a level1 record into database @@ -173,4 +173,4 @@ class Level1DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/ifs/level1prc.py b/csst_dfs_api_cluster/ifs/level1prc.py index 55c6692..4ffc678 100644 --- a/csst_dfs_api_cluster/ifs/level1prc.py +++ b/csst_dfs_api_cluster/ifs/level1prc.py @@ -39,7 +39,7 @@ class Level1PrcApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -63,7 +63,7 @@ class Level1PrcApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a level1 procedure record into database @@ -97,7 +97,7 @@ class Level1PrcApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/msc/calmerge.py b/csst_dfs_api_cluster/msc/calmerge.py index b6ede6c..a38350d 100644 --- a/csst_dfs_api_cluster/msc/calmerge.py +++ b/csst_dfs_api_cluster/msc/calmerge.py @@ -34,7 +34,7 @@ class CalMergeApi(object): return Result.ok_data(data=CalMergeRecord().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def find(self, **kwargs): ''' retrieve calibration merge records from database @@ -69,7 +69,7 @@ class CalMergeApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get(self, **kwargs): ''' fetch a record from database @@ -93,7 +93,7 @@ class CalMergeApi(object): return Result.ok_data(data=CalMergeRecord().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_qc1_status(self, **kwargs): ''' update the status of reduction @@ -122,7 +122,7 @@ class CalMergeApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -151,7 +151,7 @@ class CalMergeApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a calibration merge record into database @@ -191,5 +191,5 @@ class CalMergeApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/msc/level0.py b/csst_dfs_api_cluster/msc/level0.py index 3586146..9185fa8 100644 --- a/csst_dfs_api_cluster/msc/level0.py +++ b/csst_dfs_api_cluster/msc/level0.py @@ -48,7 +48,7 @@ class Level0DataApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get(self, **kwargs): ''' fetch a record from database @@ -73,7 +73,7 @@ class Level0DataApi(object): return Result.ok_data(data = Level0Record().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -101,7 +101,7 @@ class Level0DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_qc0_status(self, **kwargs): ''' update the status of QC0 @@ -127,7 +127,7 @@ class Level0DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a level0 data record into database @@ -162,6 +162,6 @@ class Level0DataApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/msc/level0prc.py b/csst_dfs_api_cluster/msc/level0prc.py index 814b155..4a87b70 100644 --- a/csst_dfs_api_cluster/msc/level0prc.py +++ b/csst_dfs_api_cluster/msc/level0prc.py @@ -39,7 +39,7 @@ class Level0PrcApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -63,7 +63,7 @@ class Level0PrcApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a level0 procedure record into database @@ -97,7 +97,7 @@ class Level0PrcApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/msc/level1.py b/csst_dfs_api_cluster/msc/level1.py index 6a7618e..1571760 100644 --- a/csst_dfs_api_cluster/msc/level1.py +++ b/csst_dfs_api_cluster/msc/level1.py @@ -51,7 +51,7 @@ class Level1DataApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get(self, **kwargs): ''' fetch a record from database @@ -74,7 +74,7 @@ class Level1DataApi(object): return Result.ok_data(data = Level1Record().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -97,7 +97,7 @@ class Level1DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_qc1_status(self, **kwargs): ''' update the status of QC0 @@ -118,7 +118,7 @@ class Level1DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a level1 record into database @@ -172,4 +172,4 @@ class Level1DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/msc/level1prc.py b/csst_dfs_api_cluster/msc/level1prc.py index b401fd9..8b7d0f8 100644 --- a/csst_dfs_api_cluster/msc/level1prc.py +++ b/csst_dfs_api_cluster/msc/level1prc.py @@ -39,7 +39,7 @@ class Level1PrcApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -63,7 +63,7 @@ class Level1PrcApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a level1 procedure record into database @@ -97,7 +97,7 @@ class Level1PrcApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/msc/level2.py b/csst_dfs_api_cluster/msc/level2.py index 255670d..d5e93cb 100644 --- a/csst_dfs_api_cluster/msc/level2.py +++ b/csst_dfs_api_cluster/msc/level2.py @@ -51,7 +51,7 @@ class Level2DataApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def catalog_query(self, **kwargs): ''' retrieve level2catalog records from database @@ -89,7 +89,7 @@ class Level2DataApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get(self, **kwargs): ''' fetch a record from database @@ -110,7 +110,7 @@ class Level2DataApi(object): return Result.ok_data(data = Level2Record().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -133,7 +133,7 @@ class Level2DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_qc2_status(self, **kwargs): ''' update the status of QC0 @@ -154,7 +154,7 @@ class Level2DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a level2 record into database @@ -177,7 +177,8 @@ class Level2DataApi(object): filename = get_parameter(kwargs, "filename", ""), file_path = get_parameter(kwargs, "file_path", ""), prc_status = get_parameter(kwargs, "prc_status", -1), - prc_time = get_parameter(kwargs, "prc_time", format_datetime(datetime.now())) + prc_time = get_parameter(kwargs, "prc_time", format_datetime(datetime.now())), + pipeline_id = get_parameter(kwargs, "pipeline_id", "") ) def stream(rec): with open(rec.file_path, 'rb') as f: @@ -200,4 +201,4 @@ class Level2DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/msc/level2co.py b/csst_dfs_api_cluster/msc/level2co.py new file mode 100644 index 0000000..8d70391 --- /dev/null +++ b/csst_dfs_api_cluster/msc/level2co.py @@ -0,0 +1,201 @@ +import os +import grpc +import datetime + +from csst_dfs_commons.models import Result +from csst_dfs_commons.models.common import from_proto_model_list +from csst_dfs_commons.models.msc import Level2CoRecord,Level2CoCatalogRecord +from csst_dfs_commons.models.constants import UPLOAD_CHUNK_SIZE +from csst_dfs_proto.msc.level2co import level2co_pb2, level2co_pb2_grpc + +from ..common.service import ServiceProxy +from ..common.utils import * + +class Level2CoApi(object): + """ + Level2 Merge Catalog Operation Class + """ + def __init__(self): + self.stub = level2co_pb2_grpc.Level2CoSrvStub(ServiceProxy().channel()) + + def find(self, **kwargs): + ''' retrieve level2 records from database + + parameter kwargs: + level0_id: [str] + data_type: [str] + create_time : (start, end), + qc2_status : [int], + prc_status : [int], + filename: [str] + limit: limits returns the number of records,default 0:no-limit + + return: csst_dfs_common.models.Result + ''' + try: + resp, _ = self.stub.Find.with_call(level2co_pb2.FindLevel2CoReq( + data_type = get_parameter(kwargs, "data_type"), + create_time_start = get_parameter(kwargs, "create_time", [None, None])[0], + create_time_end = get_parameter(kwargs, "create_time", [None, None])[1], + qc2_status = get_parameter(kwargs, "qc2_status"), + prc_status = get_parameter(kwargs, "prc_status"), + filename = get_parameter(kwargs, "filename"), + limit = get_parameter(kwargs, "limit", 0), + other_conditions = {"test":"cnlab.test"} + ),metadata = get_auth_headers()) + + if resp.success: + return Result.ok_data(data=from_proto_model_list(Level2CoRecord, resp.records)).append("totalCount", resp.totalCount) + else: + return Result.error(message = str(resp.error.detail)) + + except grpc.RpcError as e: + return Result.error(message="%s:%s" % (e.code().value, e.details())) + + def catalog_query(self, **kwargs): + ''' retrieve level2catalog records from database + + parameter kwargs: + obs_id: [str] + detector_no: [str] + ra: [float] in deg + dec: [float] in deg + radius: [float] in deg + min_mag: [float] + max_mag: [float] + obs_time: (start, end), + limit: limits returns the number of records,default 0:no-limit + + return: csst_dfs_common.models.Result + ''' + try: + resp, _ = self.stub.FindCatalog.with_call(level2co_pb2.FindLevel2CoCatalogReq( + obs_id = get_parameter(kwargs, "obs_id"), + detector_no = get_parameter(kwargs, "detector_no"), + obs_time_start = get_parameter(kwargs, "obs_time", [None, None])[0], + obs_time_end = get_parameter(kwargs, "obs_time", [None, None])[1], + ra = get_parameter(kwargs, "ra"), + dec = get_parameter(kwargs, "dec"), + radius = get_parameter(kwargs, "radius"), + minMag = get_parameter(kwargs, "min_mag"), + maxMag = get_parameter(kwargs, "max_mag"), + limit = get_parameter(kwargs, "limit", 0) + ),metadata = get_auth_headers()) + + if resp.success: + return Result.ok_data(data=from_proto_model_list(Level2CoCatalogRecord, resp.records)).append("totalCount", resp.totalCount) + else: + return Result.error(message = str(resp.error.detail)) + + except grpc.RpcError as e: + return Result.error(message="%s:%s" % (e.code().value, e.details())) + + def get(self, **kwargs): + ''' fetch a record from database + + parameter kwargs: + id : [int] + + return csst_dfs_common.models.Result + ''' + try: + resp, _ = self.stub.Get.with_call(level2co_pb2.GetLevel2CoReq( + id = get_parameter(kwargs, "id") + ),metadata = get_auth_headers()) + + if resp.record is None or resp.record.id == 0: + return Result.error(message=f"data not found") + + return Result.ok_data(data = Level2CoRecord().from_proto_model(resp.record)) + + except grpc.RpcError as e: + return Result.error(message="%s:%s" % (e.code().value, e.details())) + + def update_proc_status(self, **kwargs): + ''' update the status of reduction + + parameter kwargs: + id : [int], + status : [int] + + return csst_dfs_common.models.Result + ''' + fits_id = get_parameter(kwargs, "id") + status = get_parameter(kwargs, "status") + try: + resp,_ = self.stub.UpdateProcStatus.with_call( + level2co_pb2.UpdateProcStatusReq(id=fits_id, status=status), + metadata = get_auth_headers() + ) + if resp.success: + return Result.ok_data() + else: + return Result.error(message = str(resp.error.detail)) + except grpc.RpcError as e: + return Result.error(message="%s:%s" % (e.code().value, e.details())) + + def update_qc2_status(self, **kwargs): + ''' update the status of QC0 + + parameter kwargs: + id : [int], + status : [int] + ''' + fits_id = get_parameter(kwargs, "id") + status = get_parameter(kwargs, "status") + try: + resp,_ = self.stub.UpdateQc2Status.with_call( + level2co_pb2.UpdateQc2StatusReq(id=fits_id, status=status), + metadata = get_auth_headers() + ) + if resp.success: + return Result.ok_data() + else: + return Result.error(message = str(resp.error.detail)) + except grpc.RpcError as e: + return Result.error(message="%s:%s" % (e.code().value, e.details())) + + def write(self, **kwargs): + ''' insert a level2 record into database + + parameter kwargs: + data_type : [str] + filename : [str] + file_path : [str] + prc_status : [int] + prc_time : [str] + + return csst_dfs_common.models.Result + ''' + + rec = level2co_pb2.Level2CoRecord( + id = 0, + data_type = get_parameter(kwargs, "data_type"), + filename = get_parameter(kwargs, "filename", ""), + file_path = get_parameter(kwargs, "file_path", ""), + prc_status = get_parameter(kwargs, "prc_status", -1), + prc_time = get_parameter(kwargs, "prc_time", format_datetime(datetime.now())), + pipeline_id = get_parameter(kwargs, "pipeline_id", "") + ) + def stream(rec): + with open(rec.file_path, 'rb') as f: + while True: + data = f.read(UPLOAD_CHUNK_SIZE) + if not data: + break + yield level2co_pb2.WriteLevel2CoReq(record = rec, data = data) + try: + if not rec.file_path: + return Result.error(message="file_path is blank") + if not os.path.exists(rec.file_path): + return Result.error(message="the file [%s] not existed" % (rec.file_path, )) + if not rec.filename: + rec.filename = os.path.basename(rec.file_path) + + resp,_ = self.stub.Write.with_call(stream(rec),metadata = get_auth_headers()) + if resp.success: + return Result.ok_data(data=Level2CoRecord().from_proto_model(resp.record)) + else: + return Result.error(message = str(resp.error.detail)) + except grpc.RpcError as e: + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/sls/calmerge.py b/csst_dfs_api_cluster/sls/calmerge.py index 8e946bb..ac8c948 100644 --- a/csst_dfs_api_cluster/sls/calmerge.py +++ b/csst_dfs_api_cluster/sls/calmerge.py @@ -34,7 +34,7 @@ class CalMergeApi(object): return Result.ok_data(data=CalMergeRecord().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def find(self, **kwargs): ''' retrieve calibration merge records from database @@ -69,7 +69,7 @@ class CalMergeApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get(self, **kwargs): ''' fetch a record from database @@ -93,7 +93,7 @@ class CalMergeApi(object): return Result.ok_data(data=CalMergeRecord().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_qc1_status(self, **kwargs): ''' update the status of reduction @@ -122,7 +122,7 @@ class CalMergeApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -151,7 +151,7 @@ class CalMergeApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a calibration merge record into database @@ -191,5 +191,5 @@ class CalMergeApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/sls/level0.py b/csst_dfs_api_cluster/sls/level0.py index 4b5ccaf..1117e17 100644 --- a/csst_dfs_api_cluster/sls/level0.py +++ b/csst_dfs_api_cluster/sls/level0.py @@ -48,7 +48,7 @@ class Level0DataApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get(self, **kwargs): ''' fetch a record from database @@ -73,7 +73,7 @@ class Level0DataApi(object): return Result.ok_data(data = Level0Record().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -101,7 +101,7 @@ class Level0DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_qc0_status(self, **kwargs): ''' update the status of QC0 @@ -127,7 +127,7 @@ class Level0DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a level0 data record into database @@ -162,6 +162,6 @@ class Level0DataApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/sls/level0prc.py b/csst_dfs_api_cluster/sls/level0prc.py index 5bbdca9..38d0a90 100644 --- a/csst_dfs_api_cluster/sls/level0prc.py +++ b/csst_dfs_api_cluster/sls/level0prc.py @@ -39,7 +39,7 @@ class Level0PrcApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -63,7 +63,7 @@ class Level0PrcApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a level0 procedure record into database @@ -97,7 +97,7 @@ class Level0PrcApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/sls/level1.py b/csst_dfs_api_cluster/sls/level1.py index be7fc22..6583ef3 100644 --- a/csst_dfs_api_cluster/sls/level1.py +++ b/csst_dfs_api_cluster/sls/level1.py @@ -51,7 +51,7 @@ class Level1DataApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get(self, **kwargs): ''' fetch a record from database @@ -74,7 +74,7 @@ class Level1DataApi(object): return Result.ok_data(data = Level1Record().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -97,7 +97,7 @@ class Level1DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_qc1_status(self, **kwargs): ''' update the status of QC0 @@ -118,7 +118,7 @@ class Level1DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a level1 record into database @@ -170,4 +170,4 @@ class Level1DataApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/sls/level1prc.py b/csst_dfs_api_cluster/sls/level1prc.py index 2afc510..7954330 100644 --- a/csst_dfs_api_cluster/sls/level1prc.py +++ b/csst_dfs_api_cluster/sls/level1prc.py @@ -39,7 +39,7 @@ class Level1PrcApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -63,7 +63,7 @@ class Level1PrcApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a level1 procedure record into database @@ -97,7 +97,7 @@ class Level1PrcApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) diff --git a/csst_dfs_api_cluster/sls/level2spectra.py b/csst_dfs_api_cluster/sls/level2spectra.py index 0de6bbe..c3db3fb 100644 --- a/csst_dfs_api_cluster/sls/level2spectra.py +++ b/csst_dfs_api_cluster/sls/level2spectra.py @@ -51,7 +51,7 @@ class Level2SpectraApi(object): return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def get(self, **kwargs): ''' fetch a record from database @@ -73,7 +73,7 @@ class Level2SpectraApi(object): return Result.ok_data(data = Level2Spectra().from_proto_model(resp.record)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_proc_status(self, **kwargs): ''' update the status of reduction @@ -96,7 +96,7 @@ class Level2SpectraApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def update_qc1_status(self, **kwargs): ''' update the status of QC0 @@ -117,7 +117,7 @@ class Level2SpectraApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) def write(self, **kwargs): ''' insert a level2spectra record into database @@ -168,4 +168,4 @@ class Level2SpectraApi(object): else: return Result.error(message = str(resp.error.detail)) except grpc.RpcError as e: - return Result.error(message="%s:%s" % (e.code().value, e.details)) + return Result.error(message="%s:%s" % (e.code().value, e.details())) -- GitLab