From 254f81bdbd22340781e64e24a027dc991d589da0 Mon Sep 17 00:00:00 2001 From: shoulinwei Date: Fri, 7 Jan 2022 12:15:32 +0800 Subject: [PATCH] level1 get --- csst_dfs_api_cluster/ifs/level1.py | 7 ++++--- csst_dfs_api_cluster/msc/level1.py | 7 ++++--- csst_dfs_api_cluster/sls/level1.py | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/csst_dfs_api_cluster/ifs/level1.py b/csst_dfs_api_cluster/ifs/level1.py index 8c4380c..28ea984 100644 --- a/csst_dfs_api_cluster/ifs/level1.py +++ b/csst_dfs_api_cluster/ifs/level1.py @@ -62,13 +62,14 @@ class Level1DataApi(object): return csst_dfs_common.models.Result ''' try: - fits_id = get_parameter(kwargs, "id") resp, _ = self.stub.Get.with_call(level1_pb2.GetLevel1Req( - id = fits_id + id = get_parameter(kwargs, "id"), + level0_id = get_parameter(kwargs, "level0_id"), + data_type = get_parameter(kwargs, "data_type") ),metadata = get_auth_headers()) if resp.record is None or resp.record.id == 0: - return Result.error(message=f"id:{fits_id} not found") + return Result.error(message=f"data not found") return Result.ok_data(data=Level1Record().from_proto_model(resp.record)) diff --git a/csst_dfs_api_cluster/msc/level1.py b/csst_dfs_api_cluster/msc/level1.py index 45ea553..6a7618e 100644 --- a/csst_dfs_api_cluster/msc/level1.py +++ b/csst_dfs_api_cluster/msc/level1.py @@ -62,13 +62,14 @@ class Level1DataApi(object): return csst_dfs_common.models.Result ''' try: - fits_id = get_parameter(kwargs, "id") resp, _ = self.stub.Get.with_call(level1_pb2.GetLevel1Req( - id = fits_id + id = get_parameter(kwargs, "id"), + level0_id = get_parameter(kwargs, "level0_id"), + data_type = get_parameter(kwargs, "data_type") ),metadata = get_auth_headers()) if resp.record is None or resp.record.id == 0: - return Result.error(message=f"id:{fits_id} not found") + return Result.error(message=f"data not found") return Result.ok_data(data = Level1Record().from_proto_model(resp.record)) diff --git a/csst_dfs_api_cluster/sls/level1.py b/csst_dfs_api_cluster/sls/level1.py index 0c4e1d1..be7fc22 100644 --- a/csst_dfs_api_cluster/sls/level1.py +++ b/csst_dfs_api_cluster/sls/level1.py @@ -62,13 +62,14 @@ class Level1DataApi(object): return csst_dfs_common.models.Result ''' try: - fits_id = get_parameter(kwargs, "id") resp, _ = self.stub.Get.with_call(level1_pb2.GetLevel1Req( - id = fits_id + id = get_parameter(kwargs, "id"), + level0_id = get_parameter(kwargs, "level0_id"), + data_type = get_parameter(kwargs, "data_type") ),metadata = get_auth_headers()) if resp.record is None or resp.record.id == 0: - return Result.error(message=f"id:{fits_id} not found") + return Result.error(message=f"data not found") return Result.ok_data(data = Level1Record().from_proto_model(resp.record)) -- GitLab