diff --git a/csst_dfs_client/level1.py b/csst_dfs_client/level1.py index a71a78e64a49c65323566aab4c1e357417a6a374..b92b01d61a7ad2abec4ac54c090c1f95818ee31b 100644 --- a/csst_dfs_client/level1.py +++ b/csst_dfs_client/level1.py @@ -184,10 +184,6 @@ def write(local_file: Union[IO | str], Returns: Result: 操作的结果对象,包含操作是否成功以及相关的错误信息,成功返回data为1级数据对象 ''' - - if utils.is_valid_filename(file_name): - raise ValueError(f"Incorrect file name [{file_name}], should be *.*") - params = { 'module_id': module_id, 'level0_id': level0_id, @@ -212,8 +208,8 @@ def write(local_file: Union[IO | str], def generate_prc_msg(module_id: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'], level1_id: str, pipeline_id: Optional[str] = '', - dataset: Optional[str] = None, - batch_id: Optional[str] = None) -> Result: + dataset: str = constants.DEFAULT_DATASET, + batch_id: str = constants.DEFAULT_BATCH_ID) -> Result: """ 生成流水线的处理消息 @@ -253,8 +249,8 @@ def process_list(level1_id: str) -> Result: def add_process(level1_id: str, pipeline_id: str, run_id: str, - dataset: Optional[str] = None, - batch_id: Optional[str] = None, + dataset: str = constants.DEFAULT_DATASET, + batch_id: str = constants.DEFAULT_BATCH_ID, prc_time: str = utils.get_current_time(), prc_status: int = -1024, prc_module: str = "", diff --git a/csst_dfs_client/level2.py b/csst_dfs_client/level2.py index 268a4f944193595101d2528fcb8340ecf208820a..b506ae1414482bb9c08f5d26de5ff59d59f8c158 100644 --- a/csst_dfs_client/level2.py +++ b/csst_dfs_client/level2.py @@ -155,8 +155,8 @@ def write(local_file: Union[IO | str], file_name: str, pipeline_id: str, build: int, - dataset: Optional[str] = None, - batch_id: Optional[str] = None, + dataset: str = constants.DEFAULT_DATASET, + batch_id: str = constants.DEFAULT_BATCH_ID, **extra_kwargs) -> Result: """ 将本地的2级数据文件写入到DFS中 @@ -180,8 +180,7 @@ def write(local_file: Union[IO | str], Result: 操作的结果对象,包含操作是否成功以及相关的错误信息,成功返回data为2级数据对象 """ - if utils.is_valid_filename(file_name): - raise ValueError(f"Incorrect file name [{file_name}], should be *.*") + params = { 'module_id': module_id, 'level0_id': level0_id, diff --git a/tests/test_level0.py b/tests/test_level0.py index 2ebeaa210dcdbde2ef741bc21fe1314805e1c420..eff1ea96dcf120ed8cce5f656edf6a1f38a7b33d 100644 --- a/tests/test_level0.py +++ b/tests/test_level0.py @@ -31,12 +31,12 @@ 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 = "1060940003452925", file_type='SCI', qc0_status=1) + result = level0.update_qc0_status(level0_id = "1010910015799127", file_type='SCI', 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 = "1060940003452925", file_type='SCI', prc_status=3) + result = level0.update_prc_status(level0_id = "1010910015799127", file_type='SCI', prc_status=3) print(result) self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message) @@ -59,6 +59,11 @@ class Level0TestCase(unittest.TestCase): print(result) self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message) def test_add_process(self): - result = level0.add_process(level0_id="1060940003452925", pipeline_id="csst-msc-l1-mbi", run_id="202411071002481234", prc_time="2024-11-07 10:24:12", prc_status=1, prc_module="MSC", message="") + result = level0.add_process(level0_id="1060940003452925", + pipeline_id="csst-msc-l1-mbi", + run_id="202411071002481234", + dataset="v93", + batch_id="v930batch", + prc_time="2024-11-07 10:24:12", prc_status=1, prc_module="MSC", message="") print(result) self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message) \ No newline at end of file diff --git a/tests/test_level2.py b/tests/test_level2.py index 11ce8918ea14b2d070a16bf3c0e1f533131d29b3..80b4d7f29a813a056db637244679e13f9247c958 100644 --- a/tests/test_level2.py +++ b/tests/test_level2.py @@ -51,8 +51,7 @@ class Level2TestCase(unittest.TestCase): brick_id = 254, pipeline_id = "csst-msc-l2-mbi", build=1, - run_id="20241107100248", - version="094", + dataset="094", prc_status=1) print(result) self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message)