Commit 38d23cc5 authored by Wei Shoulin's avatar Wei Shoulin
Browse files

feat(level0): 增加运行 ID 参数并更新相关函数

- 在 update_prc_status 函数中添加 run_id 参数
- 在 generate_prc_msg 函数中添加 level0_id 参数
- 更新相应测试用例以包含新增参数
parent d9ece63c
...@@ -125,20 +125,21 @@ def update_qc0_status(level0_id: str, file_type: str, qc0_status: int, dataset: ...@@ -125,20 +125,21 @@ def update_qc0_status(level0_id: str, file_type: str, qc0_status: int, dataset:
""" """
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}", {'file_type': file_type, 'qc0_status': qc0_status, 'dataset': dataset})
def update_prc_status(level0_id: str, file_type: str, prc_status: int, dataset: str = constants.DEFAULT_DATASET) -> Result: def update_prc_status(level0_id: str, file_type: str, run_id: str, prc_status: int, dataset: str = constants.DEFAULT_DATASET) -> Result:
""" """
更新0级数据的处理状态 更新0级数据的处理状态
Args: Args:
level0_id (str): 0级数据的ID level0_id (str): 0级数据的ID
file_type (str): 文件类型 file_type (str): 文件类型
run_id (str): 运行ID
prc_status (int): 处理状态 prc_status (int): 处理状态
dataset (str): 数据集名称 dataset (str): 数据集名称
Returns: Returns:
Result: 操作结果 Result: 操作结果
""" """
return request.put(f"/api/level0/prc_status/{level0_id}", {'file_type': file_type, 'prc_status': prc_status, 'dataset': dataset}) return request.put(f"/api/level0/prc_status/{level0_id}/{run_id}", {'file_type': file_type, 'prc_status': prc_status, 'dataset': dataset})
def write(local_file: str, def write(local_file: str,
dataset: str = constants.DEFAULT_DATASET, dataset: str = constants.DEFAULT_DATASET,
...@@ -189,6 +190,7 @@ def write_cat(local_file: str, ...@@ -189,6 +190,7 @@ def write_cat(local_file: str,
def generate_prc_msg(module_id: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'], def generate_prc_msg(module_id: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
obs_id: str, obs_id: str,
detector_no: str, detector_no: str,
level0_id: str,
dataset: str = constants.DEFAULT_DATASET, dataset: str = constants.DEFAULT_DATASET,
batch_id: str = constants.DEFAULT_BATCH_ID) -> Result: batch_id: str = constants.DEFAULT_BATCH_ID) -> Result:
""" """
...@@ -198,6 +200,7 @@ def generate_prc_msg(module_id: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'], ...@@ -198,6 +200,7 @@ def generate_prc_msg(module_id: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
module_id (str): 模块ID module_id (str): 模块ID
obs_id (str): 观测ID obs_id (str): 观测ID
detector_no (str): 探测器编号 detector_no (str): 探测器编号
level0_id (str): 0级数据ID
dataset (Optional[str], optional): 数据集名称.. dataset (Optional[str], optional): 数据集名称..
batch_id (Optional[str], optional): 批次ID. Defaults to 'auto'. batch_id (Optional[str], optional): 批次ID. Defaults to 'auto'.
...@@ -210,6 +213,7 @@ def generate_prc_msg(module_id: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'], ...@@ -210,6 +213,7 @@ def generate_prc_msg(module_id: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
'batch_id': batch_id, 'batch_id': batch_id,
'obs_id': obs_id, 'obs_id': obs_id,
'detector_no': detector_no, 'detector_no': detector_no,
"level0_id": level0_id,
} }
return request.put(f"/api/level0/prc/{module_id}", params) return request.put(f"/api/level0/prc/{module_id}", params)
......
...@@ -36,7 +36,8 @@ class Level0TestCase(unittest.TestCase): ...@@ -36,7 +36,8 @@ class Level0TestCase(unittest.TestCase):
self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message) self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message)
def test_update_prc_status(self): def test_update_prc_status(self):
result = level0.update_prc_status(level0_id = "1010910015799127", file_type='SCI', prc_status=3) result = level0.update_prc_status(level0_id = "1010910015799127", file_type='SCI',
run_id="202411071002481234", prc_status=3)
print(result) print(result)
self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message) self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message)
...@@ -49,6 +50,7 @@ class Level0TestCase(unittest.TestCase): ...@@ -49,6 +50,7 @@ class Level0TestCase(unittest.TestCase):
def test_generate_prc_message(self): def test_generate_prc_message(self):
result = level0.generate_prc_msg( result = level0.generate_prc_msg(
module_id='MSC', module_id='MSC',
level0_id="1060940003452930",
obs_id="10609400034529", obs_id="10609400034529",
detector_no="30") detector_no="30")
print(result) print(result)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment