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

spell correct

parent 60bcbf12
Pipeline #8205 failed with stages
in 0 seconds
Hide whitespace changes
Inline Side-by-side
csst_dfs_client/level0.py
View file @ fe778337
......@@ -6,7 +6,7 @@ DateTimeTuple = Tuple[str, str]
def find(project_id: Optional[str] = None,
obs_id: Optional[str] = None,
intrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'] = 'MSC',
instrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'] = 'MSC',
detector_no: Optional[str] = None,
file_type: Optional[str] = None,
obs_type: Optional[str] = None,
......@@ -29,7 +29,7 @@ def find(project_id: Optional[str] = None,
Args:
project_id (Optional[str], optional): 项目ID. Defaults to None.
obs_id (Optional[str], optional): 观测ID. Defaults to None.
intrument (Optional[str], optional): 设备，如'MSC', 'IFS'. Defaults to 'MSC'.
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.
......@@ -55,7 +55,7 @@ def find(project_id: Optional[str] = None,
params = {
'project_id': project_id,
'obs_id': obs_id,
'intrument': intrument,
'instrument': instrument,
'detector_no': detector_no,
'file_type': file_type,
'obs_type': obs_type,
......@@ -190,7 +190,7 @@ def write_cat(local_file: str,
raise FileNotFoundError(local_file)
return request.post_file("/api/level0/cat/file", local_file, params)
def generate_prc_msg(intrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
def generate_prc_msg(instrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
obs_id: str,
detector_no: str,
level0_id: str,
......@@ -200,7 +200,7 @@ def generate_prc_msg(intrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
生成流水线的处理消息
Args:
intrument (str): 模块ID
instrument (str): 模块ID
obs_id (str): 观测ID
detector_no (str): 探测器编号
level0_id (str): 0级数据ID
......@@ -219,7 +219,7 @@ def generate_prc_msg(intrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
"level0_id": level0_id,
}
return request.put(f"/api/level0/prc/{intrument}", params)
return request.put(f"/api/level0/prc/{instrument}", params)
def process_list(level0_id: str) -> Result:
"""
......
csst_dfs_client/level1.py
View file @ fe778337
......@@ -7,7 +7,7 @@ DateTimeTuple = Tuple[str, str]
def find(project_id: Optional[str] = None,
obs_id: Optional[str] = None,
level0_id: Optional[str] = None,
intrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'] = 'MSC',
instrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'] = 'MSC',
detector_no: Optional[str] = None,
data_type: Optional[str] = None,
obs_type: Optional[str] = None,
......@@ -33,7 +33,7 @@ def find(project_id: Optional[str] = None,
Args:
project_id (Optional[str], optional): 项目ID. Defaults to None.
obs_id (Optional[str], optional): 观测ID. Defaults to None.
intrument (Optional[str], optional): 模块ID，如'MSC', 'IFS'. Defaults to None.
instrument (Optional[str], optional): 模块ID，如'MSC', 'IFS'. Defaults to None.
detector_no (Optional[str], optional): 探测器编号. Defaults to None.
data_type (Optional[str], optional): 数据类型，如'csst-msc-l1-mbi'. Defaults to None.
obs_type (Optional[str], optional): 观测类型，如'01'. Defaults to None.
......@@ -63,7 +63,7 @@ def find(project_id: Optional[str] = None,
'project_id': project_id,
'level0_id': level0_id,
'obs_id': obs_id,
'intrument': intrument,
'instrument': instrument,
'detector_no': detector_no,
'data_type': data_type,
'obs_type': obs_type,
......@@ -156,7 +156,7 @@ def update_prc_status(level1_id: str, data_type: str, prc_status: int, batch_id:
return request.put(f"/api/level1/prc_status/{level1_id}", {'data_type': data_type, 'prc_status': prc_status, 'batch_id': batch_id})
def write(local_file: Union[IO, str],
intrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
instrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
level1_id: str,
data_type: str,
file_name: str,
......@@ -173,7 +173,7 @@ def write(local_file: Union[IO, str],
Args:
local_file (Union[IO, str]): 文件路径或文件对象
intrument ['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC']其中一个，代表: 模块ID
instrument ['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC']其中一个，代表: 模块ID
level0_id (Optional[str]): 0级数据的ID默认为 None
level1_id (str): 1级数据的ID
data_type (str): 数据类型
......@@ -190,7 +190,7 @@ def write(local_file: Union[IO, str],
Result: 操作的结果对象，包含操作是否成功以及相关的错误信息，成功返回data为1级数据对象
'''
params = {
'intrument': intrument,
'instrument': instrument,
'level0_id': level0_id,
'level1_id': level1_id,
'data_type': data_type,
......@@ -213,7 +213,7 @@ def write(local_file: Union[IO, str],
return request.post_file("/api/level1/file", local_file, params)
return request.post_bytesio("/api/level1/file", local_file, params)
def generate_prc_msg(intrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
def generate_prc_msg(instrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
level1_id: str,
dataset: str = constants.DEFAULT_DATASET,
batch_id: str = constants.DEFAULT_BATCH_ID) -> Result:
......@@ -221,7 +221,7 @@ def generate_prc_msg(intrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
生成流水线的处理消息
Args:
intrument (str): 模块ID
instrument (str): 模块ID
level1_id (str): 1级数据的ID
dag_id (str): 流水管线ID，默认为空字符串
dataset (str): 数据集
......@@ -237,7 +237,7 @@ def generate_prc_msg(intrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
'level1_id': level1_id,
}
return request.put(f"/api/level1/prc/{intrument}", params)
return request.put(f"/api/level1/prc/{instrument}", params)
def process_list(level1_id: str) -> Result:
"""
......
csst_dfs_client/level2.py
View file @ fe778337
......@@ -8,7 +8,7 @@ DateTimeTuple = Tuple[str, str]
def find(
project_id: Optional[str] = None,
obs_id: Optional[str] = None,
intrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'] = 'MSC',
instrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'] = 'MSC',
detector_no: Optional[str] = None,
data_type: Optional[str] = None,
filter: Optional[str] = None,
......@@ -28,7 +28,7 @@ def find(
Args:
project_id (Optional[str], optional): 项目ID. Defaults to None.
obs_id (Optional[str], optional): 观测ID. Defaults to None.
intrument (Optional[str], optional): 模块ID，如'MSC', 'IFS'. Defaults to None.
instrument (Optional[str], optional): 模块ID，如'MSC', 'IFS'. Defaults to None.
detector_no (Optional[str], optional): 探测器编号. Defaults to None.
data_type (Optional[str], optional): 文件类型，如'csst-msc-l2-mbi-cat'. Defaults to None.
filter (Optional[str], optional): 滤光片. Defaults to None.
......@@ -51,7 +51,7 @@ def find(
params = {
'project_id': project_id,
'obs_id': obs_id,
'intrument': intrument,
'instrument': instrument,
'detector_no': detector_no,
'data_type': data_type,
'filter': filter,
......@@ -146,7 +146,7 @@ def update_prc_status_by_file_name(file_name: str, prc_status: int, batch_id: st
return request.put(f"/api/level2/prc_status/file/{file_name}", {'prc_status': prc_status, 'batch_id': batch_id})
def write(local_file: Union[IO, str],
intrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
instrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
level2_id: str,
data_type: str,
file_name: str,
......@@ -164,7 +164,7 @@ def write(local_file: Union[IO, str],
Args:
local_file (Union[IO, str]): 文件路径 或 文件对象
intrument ['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC']其中一个，代表: 模块ID
instrument ['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC']其中一个，代表: 模块ID
level2_id (str): 2级数据的ID
data_type (str): 数据类型，如'csst-msc-l2-mbi-cat'
file_name (str): 2级数据文件名
......@@ -184,7 +184,7 @@ def write(local_file: Union[IO, str],
"""
params = {
'intrument': intrument,
'instrument': instrument,
'level0_id': level0_id,
'level1_id': level1_id,
'level2_id': level2_id,
......
tests/test_level0.py
View file @ fe778337
......@@ -9,10 +9,10 @@ class Level0TestCase(unittest.TestCase):
def test_find(self):
start_time = time.time()
result = level0.find(intrument='MSC', dataset="msc-v093")
result = level0.find(instrument='MSC', dataset="msc-v093")
print(f"1操作执行时间: {time.time() - start_time} 秒")
start_time = time.time()
result = level0.find(intrument='MSC',
result = level0.find(instrument='MSC',
ra_obj = 170,
dec_obj = -24,
radius = 1)
......@@ -48,7 +48,7 @@ class Level0TestCase(unittest.TestCase):
def test_generate_prc_message(self):
result = level0.generate_prc_msg(
intrument='MSC',
instrument='MSC',
level0_id="1060940003452930",
obs_id="10609400034529",
detector_no="30")
......
tests/test_level1.py
View file @ fe778337
......@@ -8,7 +8,7 @@ class Level1TestCase(unittest.TestCase):
pass
def test_find(self):
result = level1.find(intrument='MSC', obs_time=("2024-01-01 12:12:12", "2024-06-30 12:12:12"), dataset='msc-v093')
result = level1.find(instrument='MSC', obs_time=("2024-01-01 12:12:12", "2024-06-30 12:12:12"), dataset='msc-v093')
print(result)
self.assertEqual(result.code, 200, "error code: " + str(result.code))
self.assertIsNotNone(result.data, "error message: " + result.message)
......@@ -40,7 +40,7 @@ class Level1TestCase(unittest.TestCase):
# file_path = BytesIO(file.read())
result = level1.write(local_file = file_path,
intrument = "MSC",
instrument = "MSC",
level0_id="1010910015799127",
level1_id = "1010910015799127",
dag_id = "csst-msc-l1-mbi",
......
tests/test_level2.py
View file @ fe778337
......@@ -42,7 +42,7 @@ class Level2TestCase(unittest.TestCase):
def test_write(self):
file_path = "/Users/wsl/temp/csst/import/CSST_MSC_MS_SCI_20310423084104_20310423084334_10109400638867_12_L2_V01_CATMIX.fits"
result = level2.write(local_file = file_path,
intrument = "MSC",
instrument = "MSC",
level0_id="1010940063886712",
level1_id = "1010940063886712",
level2_id = "1010940063886712",
......
tests/test_plan.py
View file @ fe778337
......@@ -9,7 +9,7 @@ class PlanTestCase(unittest.TestCase):
def test_find(self):
start_time = time.time()
result = plan.find(obs_id = "101000003",
result = plan.find(obs_id = "101000100412",
obstime = ("2021-08-30 00:00:00", "2024-12-30 23:59:59"))
if result.success:
print(f"time used: {time.time() - start_time} 's, count: {result['total_count']}")
......@@ -20,7 +20,7 @@ class PlanTestCase(unittest.TestCase):
self.assertIsNotNone(result.data, "error message: " + result.message)
def test_find_by_opid(self):
result = plan.find_by_opid(opid = "101000000373")
result = plan.find_by_opid(opid = "101000100412")
print(result)
self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message)
self.assertIsNotNone(result.data, "error message: " + result.message)
......@@ -32,7 +32,7 @@ class PlanTestCase(unittest.TestCase):
self.assertIsNotNone(result.data, "error message: " + result.message)
def test_write(self):
file_path = "/Users/wsl/temp/csst/import/plan_test.json"
file_path = "/Users/wsl/temp/csst/import/plan_test1.json"
result = plan.write_file(local_file = file_path)
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