From b4551bd6aacbb120e3328f01effec348d1bb0657 Mon Sep 17 00:00:00 2001 From: shoulinwei Date: Mon, 28 Apr 2025 11:12:44 +0800 Subject: [PATCH] rm file_type --- csst_dfs_client/level0.py | 13 ++++--------- csst_dfs_client/plan.py | 3 --- tests/test_level0.py | 7 +++---- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/csst_dfs_client/level0.py b/csst_dfs_client/level0.py index 38820c2..76ee370 100644 --- a/csst_dfs_client/level0.py +++ b/csst_dfs_client/level0.py @@ -8,7 +8,6 @@ def find(project_id: Optional[str] = None, obs_id: Optional[str] = None, instrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'] = 'MSC', detector_no: Optional[str] = None, - file_type: Optional[str] = None, obs_type: Optional[str] = None, filter: Optional[str] = None, obs_time: Optional[DateTimeTuple] = None, @@ -31,7 +30,6 @@ def find(project_id: Optional[str] = None, obs_id (Optional[str], optional): 观测ID. Defaults to None. instrument (Optional[str], optional): 设备，如'MSC', 'IFS'. Defaults to 'MSC'. detector_no (Optional[str], optional): 探测器编号. Defaults to None. - file_type (Optional[str], optional): 文件类型，如'SCI'. Defaults to None. obs_type (Optional[str], optional): 观测类型，如'01'. Defaults to None. filter (Optional[str], optional): 滤光片. Defaults to None. obs_time (Optional[DateTimeTuple], optional): 观测时间范围. Defaults to None. @@ -57,7 +55,6 @@ def find(project_id: Optional[str] = None, 'obs_id': obs_id, 'instrument': instrument, 'detector_no': detector_no, - 'file_type': file_type, 'obs_type': obs_type, 'filter': filter, 'qc0_status': qc0_status, @@ -113,28 +110,26 @@ def find_by_level0_id(level0_id: str) -> Result: """ return request.get(f"/api/level0/{level0_id}") -def update_qc0_status(level0_id: str, file_type: str, qc0_status: int, dataset: str = constants.DEFAULT_DATASET) -> Result: +def update_qc0_status(level0_id: str, qc0_status: int, dataset: str = constants.DEFAULT_DATASET) -> Result: """ 更新0级数据的QC0状态 Args: level0_id (str): 0级数据的ID - file_type (str): 文件类型 qc0_status (int): QC0状态 dataset (str): 数据集名称 Returns: Result: 更新结果 """ - return request.put(f"/api/level0/qc0_status/{level0_id}", {'file_type': file_type, 'qc0_status': qc0_status, 'dataset': dataset}) + return request.put(f"/api/level0/qc0_status/{level0_id}", {'qc0_status': qc0_status, 'dataset': dataset}) -def update_prc_status(level0_id: str, file_type: str, dag_run_id: str, prc_status: int, dataset: str = constants.DEFAULT_DATASET) -> Result: +def update_prc_status(level0_id: str, dag_run_id: str, prc_status: int, dataset: str = constants.DEFAULT_DATASET) -> Result: """ 更新0级数据的处理状态 Args: level0_id (str): 0级数据的ID - file_type (str): 文件类型 dag_run_id (str): 运行ID prc_status (int): 处理状态 dataset (str): 数据集名称 @@ -142,7 +137,7 @@ def update_prc_status(level0_id: str, file_type: str, dag_run_id: str, prc_statu Returns: Result: 操作结果 """ - return request.put(f"/api/level0/prc_status/{level0_id}/{dag_run_id}", {'file_type': file_type, 'prc_status': prc_status, 'dataset': dataset}) + return request.put(f"/api/level0/prc_status/{level0_id}/{dag_run_id}", {'prc_status': prc_status, 'dataset': dataset}) def write(local_file: str, dataset: str = constants.DEFAULT_DATASET, diff --git a/csst_dfs_client/plan.py b/csst_dfs_client/plan.py index 556dfaf..c90480b 100644 --- a/csst_dfs_client/plan.py +++ b/csst_dfs_client/plan.py @@ -7,7 +7,6 @@ def find(mode: Optional[str] = None, project_id: Optional[str] = None, obs_id: Optional[str] = None, instrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'] = 'MSC', - file_type: Optional[str] = None, obs_type: Optional[str] = None, object_name: Optional[str] = None, obstime: Optional[DateTimeTuple] = None, @@ -22,7 +21,6 @@ def find(mode: Optional[str] = None, project_id (Optional[str], optional): 项目ID. Defaults to None. obs_id (Optional[str], optional): 观测ID，支持模糊搜索. Defaults to None. instrument (Optional[str], optional): 模块ID，如'MSC', 'IFS'. Defaults to None. - file_type (Optional[str], optional): 文件类型，如'SCI'. Defaults to None. obs_type (Optional[str], optional): 观测类型，如主巡天宽场、TOO观测、定标星场等等. Defaults to None. object_name (Optional[str], optional): 目标名称. Defaults to None. obstime (Optional[DateTimeTuple], optional): 观测时间范围. 如("2021-08-30 00:00:00", "2024-12-30 23:59:59")，Defaults to None. @@ -40,7 +38,6 @@ def find(mode: Optional[str] = None, 'project_id': project_id, 'obs_id': obs_id, 'instrument': instrument, - 'file_type': file_type, 'obs_type': obs_type, 'object_name': object_name, 'obs_time_start': None, diff --git a/tests/test_level0.py b/tests/test_level0.py index 07c0863..95a7fdd 100644 --- a/tests/test_level0.py +++ b/tests/test_level0.py @@ -30,19 +30,18 @@ class Level0TestCase(unittest.TestCase): self.assertIsNotNone(result.data, "error message: " + result.message) def test_update_qc0_status(self): - result = level0.update_qc0_status(level0_id = "1010910015799127", file_type='SCI', qc0_status=1) + result = level0.update_qc0_status(level0_id = "1010910015799127", qc0_status=1) print(result) self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message) def test_update_prc_status(self): - result = level0.update_prc_status(level0_id = "1010910015799127", file_type='SCI', - dag_run_id="202411071002481234", prc_status=3) + result = level0.update_prc_status(level0_id = "1010910015799127", dag_run_id="202411071002481234", prc_status=3) print(result) self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message) def test_write(self): file_path = "/Users/wsl/temp/csst/import/CSST_MSC_MS_SCI_20240609181116_20240609181347_10109100157991_27_L0_V01.fits" - result = level0.write(local_file = file_path) + result = level0.write(local_file = file_path, dataset= 'msc-v093') print(result) self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message) -- GitLab