diff --git a/csst_dfs_api_cluster/ifs/level1.py b/csst_dfs_api_cluster/ifs/level1.py index 8c4380cd97d3359218e58a8d9cee5200f4b636d2..28ea984dcc8681782af9bb61acd1781e8db9a3d3 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 45ea553d5c52e9b65530139c4e9abf755f7f3cc8..6a7618e8435b99e2e1f097105fd777f87d88281c 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 0c4e1d1cda55257def16ee432ecc465ca2e1a463..be7fc22653c7d44bb3fa7ee0890d635cdba0c693 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))