Skip to content
GitLab
Commit 29b293b7 authored by Wei Shoulin's avatar Wei Shoulin
Browse files

refactor(level0): rename date_obs parameter to obs_date 

- Changed date_obs to obs_date in find function signature
- Updated date_obs_start and date_obs_end keys to obs_date_start and obs_date_end
- Modified prc_time parameter to prc_date in find_process and add_process functions
- Adjusted related logic to use obs_date and prc_date consistently
- Updated test cases to reflect the parameter name changes
parent adb4eaa3
Hide whitespace changes
Inline Side-by-side
csst_dfs_client/level0.py
View file @ 29b293b7
......@@ -12,7 +12,7 @@ def find(
detector: Optional[str] = None,
obs_type: Optional[str] = None,
filter: Optional[str] = None,
date_obs: Optional[DateTimeTuple] = None,
obs_date: Optional[DateTimeTuple] = None,
create_time: Optional[DateTimeTuple] = None,
qc_status: Optional[int] = None,
prc_status: Optional[int] = None,
......@@ -33,7 +33,7 @@ def find(
detector (Optional[str], optional): 探测器. Defaults to None.
obs_type (Optional[str], optional): 观测类型，如'01'. Defaults to None.
filter (Optional[str], optional): 滤光片. Defaults to None.
date_obs (Optional[DateTimeTuple], optional): 观测时间范围. Defaults to None.
obs_date (Optional[DateTimeTuple], optional): 观测时间范围. Defaults to None.
create_time (Optional[DateTimeTuple], optional): 创建时间范围. Defaults to None.
qc_status (Optional[int], optional): QC0状态. Defaults to None.
prc_status (Optional[int], optional): 处理状态. Defaults to None.
......@@ -65,8 +65,8 @@ def find(
'dec_obj': dec_obj,
'radius': radius,
'object_name': object_name,
'date_obs_start': None,
'date_obs_end': None,
'obs_date_start': None,
'obs_date_end': None,
'create_time_start': None,
'create_time_end': None,
'dataset': dataset,
......@@ -74,11 +74,11 @@ def find(
'limit': limit,
}
if date_obs is not None:
params['date_obs_start'], params['date_obs_end'] = date_obs
if params['date_obs_start'] and utils.is_valid_datetime_format(params['date_obs_start']):
if obs_date is not None:
params['obs_date_start'], params['obs_date_end'] = obs_date
if params['obs_date_start'] and utils.is_valid_datetime_format(params['obs_date_start']):
pass
if params['date_obs_end'] and utils.is_valid_datetime_format(params['date_obs_end']):
if params['obs_date_end'] and utils.is_valid_datetime_format(params['obs_date_end']):
pass
if create_time is not None:
params['create_time_start'], params['create_time_end'] = create_time
......@@ -219,7 +219,7 @@ def find_process(dag: Optional[str] = None,
dataset: Optional[str] = None,
prc_module: Optional[str] = None,
prc_status: Optional[int] = None,
prc_time: Optional[DateTimeTuple] = None,
prc_date: Optional[DateTimeTuple] = None,
page: int = 1,
limit: int = 0) -> Result:
"""
......@@ -233,7 +233,7 @@ def find_process(dag: Optional[str] = None,
dataset (str): 数据集
prc_module (str): 处理模块
prc_status (int): 处理状态
prc_time (DateTimeTuple): 处理时间范围
prc_date (DateTimeTuple): 处理时间范围
page (int): 页码，默认为1
limit (int): 每页数量 0: 不限制
......@@ -249,16 +249,16 @@ def find_process(dag: Optional[str] = None,
'dataset': dataset,
'prc_module': prc_module,
'prc_status': prc_status,
'prc_time_start': None,
'prc_time_end': None,
'prc_date_start': None,
'prc_date_end': None,
'page': page,
'limit': limit
}
if prc_time is not None:
params['prc_time_start'], params['prc_time_end'] = prc_time
if params['prc_time_start'] and utils.is_valid_datetime_format(params['prc_time_start']):
if prc_date is not None:
params['prc_date_start'], params['prc_date_end'] = prc_date
if params['prc_date_start'] and utils.is_valid_datetime_format(params['prc_date_start']):
pass
if params['prc_time_end'] and utils.is_valid_datetime_format(params['prc_time_end']):
if params['prc_date_end'] and utils.is_valid_datetime_format(params['prc_date_end']):
pass
return request.post("/api/level0/process", params)
......@@ -268,7 +268,7 @@ def add_process(level0_id: str,
batch_id: Optional[str] = None,
dataset: str = constants.DEFAULT_DATASET,
prc_status: int = -1024,
prc_time: str = utils.get_current_time(),
prc_date: str = utils.get_current_time(),
prc_module: str = "",
message: str = "") -> Result:
"""
......@@ -280,7 +280,7 @@ def add_process(level0_id: str,
dag_run (str): DAG运行标识
dataset (str): 数据集
batch_id (str): 批次ID
prc_time (str): 处理时间,格式为"YYYY-MM-DD HH:MM:SS"
prc_date (str): 处理时间,格式为"YYYY-MM-DD HH:MM:SS"
prc_status (int): 处理状态
prc_module (str): 处理模块
message (str): 处理消息
......@@ -295,12 +295,12 @@ def add_process(level0_id: str,
'dag_run': dag_run,
'dataset': dataset,
'batch_id': batch_id,
'prc_time': prc_time,
'prc_date': prc_date,
'prc_status': prc_status,
'prc_module': prc_module,
'message': message,
}
utils.is_valid_datetime_format(prc_time)
utils.is_valid_datetime_format(prc_date)
return request.post("/api/level0/prc", params)
def new(data: dict) -> Result:
......
csst_dfs_client/level1.py
View file @ 29b293b7
......@@ -15,7 +15,7 @@ def find(
data_model: Optional[str] = None,
obs_type: Optional[str] = None,
filter: Optional[str] = None,
date_obs: Optional[DateTimeTuple] = None,
obs_date: Optional[DateTimeTuple] = None,
create_time: Optional[DateTimeTuple] = None,
qc_status: Optional[int] = None,
prc_status: Optional[int] = None,
......@@ -41,7 +41,7 @@ def find(
data_model (Optional[str], optional): 数据类型，如'csst-msc-l1-mbi'. Defaults to None.
obs_type (Optional[str], optional): 观测类型，如'01'. Defaults to None.
filter (Optional[str], optional): 滤光片. Defaults to None.
date_obs (Optional[DateTimeTuple], optional): 观测时间范围. Defaults to None.
obs_date (Optional[DateTimeTuple], optional): 观测时间范围. Defaults to None.
create_time (Optional[DateTimeTuple], optional): 创建时间范围. Defaults to None.
qc_status (Optional[int], optional): QC1状态. Defaults to None.
prc_status (Optional[int], optional): 处理状态. Defaults to None.
......@@ -80,8 +80,8 @@ def find(
'dec_cen': dec_cen,
'radius': radius,
'object_name': object_name,
'date_obs_start': None,
'date_obs_end': None,
'obs_date_start': None,
'obs_date_end': None,
'create_time_start': None,
'create_time_end': None,
'rss_id': rss_id,
......@@ -94,9 +94,9 @@ def find(
'limit': limit,
}
if date_obs is not None:
params['date_obs_start'], params['date_obs_end'] = date_obs
utils.is_valid_datetime_format(params['date_obs_start']) or not utils.is_valid_datetime_format(params['date_obs_end'])
if obs_date is not None:
params['obs_date_start'], params['obs_date_end'] = obs_date
utils.is_valid_datetime_format(params['obs_date_start']) or not utils.is_valid_datetime_format(params['obs_date_end'])
if create_time is not None:
params['create_time_start'], params['create_time_end'] = create_time
utils.is_valid_datetime_format(params['create_time_start']) or utils.is_valid_datetime_format(params['create_time_end'])
......@@ -259,7 +259,7 @@ def find_process(dag: Optional[str] = None,
dataset: Optional[str] = None,
prc_module: Optional[str] = None,
prc_status: Optional[int] = None,
prc_time: Optional[DateTimeTuple] = None,
prc_date: Optional[DateTimeTuple] = None,
page: int = 1,
limit: int = 0) -> Result:
"""
......@@ -273,7 +273,7 @@ def find_process(dag: Optional[str] = None,
dataset (str): 数据集
prc_module (str): 处理模块
prc_status (int): 处理状态
prc_time (DateTimeTuple): 处理时间范围
prc_date (DateTimeTuple): 处理时间范围
page (int): 页码，默认为1
limit (int): 每页数量 0: 不限制
......@@ -289,16 +289,16 @@ def find_process(dag: Optional[str] = None,
'dataset': dataset,
'prc_module': prc_module,
'prc_status': prc_status,
'prc_time_start': None,
'prc_time_end': None,
'prc_date_start': None,
'prc_date_end': None,
'page': page,
'limit': limit
}
if prc_time is not None:
params['prc_time_start'], params['prc_time_end'] = prc_time
if params['prc_time_start'] and utils.is_valid_datetime_format(params['prc_time_start']):
if prc_date is not None:
params['prc_date_start'], params['prc_date_end'] = prc_date
if params['prc_date_start'] and utils.is_valid_datetime_format(params['prc_date_start']):
pass
if params['prc_time_end'] and utils.is_valid_datetime_format(params['prc_time_end']):
if params['prc_date_end'] and utils.is_valid_datetime_format(params['prc_date_end']):
pass
return request.post("/api/level1/process", params)
......@@ -307,7 +307,7 @@ def add_process(level1_id: str,
dag_run: str,
dataset: str = constants.DEFAULT_DATASET,
batch_id: str = constants.DEFAULT_BATCH_ID,
prc_time: str = utils.get_current_time(),
prc_date: str = utils.get_current_time(),
prc_status: int = -1024,
prc_module: str = "",
message: str = "") -> Result:
......@@ -320,7 +320,7 @@ def add_process(level1_id: str,
dag_run (str): DAG运行标识
dataset (str): 数据集
batch_id (str): 批次ID
prc_time (str): 处理时间,格式为"YYYY-MM-DD HH:MM:SS"
prc_date (str): 处理时间,格式为"YYYY-MM-DD HH:MM:SS"
prc_status (int): 处理状态
prc_module (str): 处理模块
message (str): 处理消息
......@@ -335,10 +335,10 @@ def add_process(level1_id: str,
'dag_run': dag_run,
'dataset': dataset,
'batch_id': batch_id,
'prc_time': prc_time,
'prc_date': prc_date,
'prc_status': prc_status,
'prc_module': prc_module,
'message': message,
}
utils.is_valid_datetime_format(prc_time)
utils.is_valid_datetime_format(prc_date)
return request.post("/api/level1/prc", params)
\ No newline at end of file
tests/test_level0.py
View file @ 29b293b7
......@@ -65,6 +65,6 @@ class Level0TestCase(unittest.TestCase):
# dag_run="202411071002481234",
# dataset="v93",
# batch_id="v930batch",
# prc_time="2024-11-07 10:24:12", prc_status=1, prc_module="MSC", message="")
# prc_date="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
tests/test_level1.py
View file @ 29b293b7
......@@ -34,7 +34,7 @@ class Level1TestCase(unittest.TestCase):
# 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_L1_V01.fits"
file_path = "/Users/wsl/temp/csst/L1/MSC/CSST_MSC_MS_WIDE_20230413214557_20230413214827_10100070335_13_L1_V01.fits"
# from io import BytesIO
# with open(file_path, "rb") as file:
# file_path = BytesIO(file.read())
......@@ -46,7 +46,7 @@ class Level1TestCase(unittest.TestCase):
level0_id="1010910015799127",
level1_id = "1010910015799127",
dag = "csst-msc-l1-mbi",
file_name= "CSST_MSC_MS_SCI_20240609181116_20240609181347_10109100157991_27_L1_V01.fits",
file_name= "CSST_MSC_MS_WIDE_20230413214557_20230413214827_10100070335_13_L1_V01.fits",
pmapname="csst_000128.pmap",
data_model='csst-msc-l1-mbi',
build=1,
......@@ -61,7 +61,7 @@ class Level1TestCase(unittest.TestCase):
# print(result)
# self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message)
# def test_add_process(self):
# result = level1.add_process(level1_id="1060940003452925", dag="csst-msc-l1-mbi", dag_run="202411071002481234", prc_time="2024-11-07 10:24:12", prc_status=1, prc_module="MSC", message="")
# result = level1.add_process(level1_id="1060940003452925", dag="csst-msc-l1-mbi", dag_run="202411071002481234", prc_date="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)
......
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