data-type->data_model

csst_dfs_client/level1.py

@@ -9,7 +9,7 @@ def find(project_id: Optional[str] = None,
         level0_id: Optional[str] = None,
         instrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'] = 'MSC',
         detector_no: Optional[str] = None,
-        data_type: Optional[str] = None,
+        data_model: Optional[str] = None,
         obs_type: Optional[str] = None,
         filter: Optional[str] = None,
         obs_time: Optional[DateTimeTuple] = None,
@@ -35,7 +35,7 @@ def find(project_id: Optional[str] = None,
         obs_id (Optional[str], optional): 观测ID. 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.
+        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.
         obs_time (Optional[DateTimeTuple], optional): 观测时间范围. Defaults to None.
@@ -65,7 +65,7 @@ def find(project_id: Optional[str] = None,
         'obs_id': obs_id,
         'instrument': instrument,
         'detector_no': detector_no,
-        'data_type': data_type,
+        'data_model': data_model,
         'obs_type': obs_type,
         'filter': filter,
         'qc1_status': qc1_status,
@@ -125,40 +125,42 @@ def find_by_brick_id(brick_id: int) -> Result:
 def sls_find_by_qc1_status(qc1_status: int, limit: int = 1, batch_id: str = constants.DEFAULT_BATCH_ID) -> Result:
     return request.post(f"/api/level1/sls/qc1_status/{qc1_status}", {'limit': limit, 'batch_id': batch_id})
 
-def update_qc1_status(level1_id: str, data_type: str, qc1_status: int, batch_id: str = constants.DEFAULT_BATCH_ID) -> Result:
+def update_qc1_status(level1_id: str, data_model: str, qc1_status: int, batch_id: str = constants.DEFAULT_BATCH_ID) -> Result:
     """
     更新1级数据的QC0状态
     
     Args:
         level1_id (str): 1级数据的ID
-        data_type (str): 文件类型
+        data_model (str): 数据类型
         qc1_status (int): QC0状态
         batch_id (str): 批次ID
     
     Returns:
         Result: 更新结果
     """
-    return request.put(f"/api/level1/qc1_status/{level1_id}", {'data_type': data_type, 'qc1_status': qc1_status, 'batch_id': batch_id})
+    return request.put(f"/api/level1/qc1_status/{level1_id}", {'data_model': data_model, 'qc1_status': qc1_status, 'batch_id': batch_id})
 
-def update_prc_status(level1_id: str, data_type: str, prc_status: int, batch_id: str = constants.DEFAULT_BATCH_ID) -> Result:
+def update_prc_status(level1_id: str, data_model: str, prc_status: int, batch_id: str = constants.DEFAULT_BATCH_ID) -> Result:
     """
     更新1级数据的处理状态
     
     Args:
         level1_id (str): 1级数据的ID
-        data_type (str): 文件类型
+        data_model (str): 数据类型
         prc_status (int): 处理状态
         batch_id (str): 批次ID
     
     Returns:
         Result: 操作结果
     """
-    return request.put(f"/api/level1/prc_status/{level1_id}", {'data_type': data_type, 'prc_status': prc_status, 'batch_id': batch_id})
+    return request.put(f"/api/level1/prc_status/{level1_id}", {'data_model': data_model, 'prc_status': prc_status, 'batch_id': batch_id})
 
 def write(local_file: Union[IO, str], 
         instrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
+        project_id: Optional[str],
+        obs_type: str,
         level1_id: str,
-        data_type: str,
+        data_model: str,
         file_name: str,
         dag_id: str,
         pmapname: str,
@@ -174,9 +176,11 @@ def write(local_file: Union[IO, str],
     Args:
         local_file (Union[IO, str]): 文件路径或文件对象
         instrument ['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC']其中一个，代表: 模块ID
+        project_id (str): 项目ID
+        obs_type (str): 观测类型
         level0_id (Optional[str]): 0级数据的ID默认为 None
         level1_id (str): 1级数据的ID
-        data_type (str): 数据类型
+        data_model (str): 数据类型
         file_name (str): 1级数据文件名
         dag_id (str): 管线ID
         pmapname (str): CCDS pmap名称
@@ -191,9 +195,11 @@ def write(local_file: Union[IO, str],
     '''
     params = {
         'instrument': instrument, 
+        'project_id': project_id,
+        'obs_type': obs_type,
         'level0_id': level0_id, 
         'level1_id': level1_id, 
-        'data_type': data_type, 
+        'data_model': data_model, 
         'file_name': file_name, 
         'dag_id': dag_id, 
         'pmapname': pmapname, 

csst_dfs_client/level2.py

@@ -10,7 +10,7 @@ def find(
         obs_id: Optional[str] = None,
         instrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'] = 'MSC',
         detector_no: Optional[str] = None,
-        data_type: Optional[str] = None,
+        data_model: Optional[str] = None,
         filter: Optional[str] = None,
         obs_time: Optional[DateTimeTuple] = None,
         create_time: Optional[DateTimeTuple] = None,
@@ -30,7 +30,7 @@ def find(
         obs_id (Optional[str], optional): 观测ID. 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.
+        data_model (Optional[str], optional): 数据类型，如'csst-msc-l2-mbi-cat'. Defaults to None.
         filter (Optional[str], optional): 滤光片. Defaults to None.
         obs_time (Optional[DateTimeTuple], optional): 观测时间范围. Defaults to None.
         create_time (Optional[DateTimeTuple], optional): 创建时间范围. Defaults to None.
@@ -53,7 +53,7 @@ def find(
         'obs_id': obs_id,
         'instrument': instrument,
         'detector_no': detector_no,
-        'data_type': data_type,
+        'data_model': data_model,
         'filter': filter,
         'qc2_status': qc2_status,
         'prc_status': prc_status,
@@ -91,33 +91,33 @@ def find_by_level2_id(level2_id: str) -> Result:
     """
     return request.get(f"/api/level2/{level2_id}")
 
-def update_qc2_status(level2_id: str, data_type: str, qc2_status: int, batch_id: str = constants.DEFAULT_BATCH_ID) -> Result:
+def update_qc2_status(level2_id: str, data_model: str, qc2_status: int, batch_id: str = constants.DEFAULT_BATCH_ID) -> Result:
     """
     更新2级数据的QC0状态
     
     Args:
         level2_id (str): 2级数据文件的ID
-        data_type (str): 数据类型，如'csst-msc-l2-mbi-cat'
+        data_model (str): 数据类型，如'csst-msc-l2-mbi-cat'
         qc2_status (int): QC0状态
     
     Returns:
         Result: 更新结果
     """
-    return request.put(f"/api/level2/qc2_status/{level2_id}", {'data_type': data_type, 'qc2_status': qc2_status, 'batch_id': batch_id})
+    return request.put(f"/api/level2/qc2_status/{level2_id}", {'data_model': data_model, 'qc2_status': qc2_status, 'batch_id': batch_id})
 
-def update_prc_status(level2_id: str, data_type: str, prc_status: int, batch_id: str = constants.DEFAULT_BATCH_ID) -> Result:
+def update_prc_status(level2_id: str, data_model: str, prc_status: int, batch_id: str = constants.DEFAULT_BATCH_ID) -> Result:
     """
     更新2级数据的处理状态
     
     Args:
         level2_id (str): 2级数据文件的ID
-        data_type (str): 数据类型，如'csst-msc-l2-mbi-cat'
+        data_model (str): 数据类型，如'csst-msc-l2-mbi-cat'
         prc_status (int): 处理状态
     
     Returns:
         Result: 操作结果
     """
-    return request.put(f"/api/level2/prc_status/{level2_id}", {'data_type': data_type, 'prc_status': prc_status, 'batch_id': batch_id})
+    return request.put(f"/api/level2/prc_status/{level2_id}", {'data_model': data_model, 'prc_status': prc_status, 'batch_id': batch_id})
 
 def update_qc2_status_by_file_name(file_name: str, qc2_status: int, batch_id: str = constants.DEFAULT_BATCH_ID) -> Result:
     """
@@ -148,7 +148,7 @@ def update_prc_status_by_file_name(file_name: str, prc_status: int, batch_id: st
 def write(local_file: Union[IO, str],
         instrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'],
         level2_id: str,
-        data_type: str,
+        data_model: str,
         file_name: str,
         dag_id: str,
         build: int,
@@ -166,7 +166,7 @@ def write(local_file: Union[IO, str],
         local_file (Union[IO, str]): 文件路径 或 文件对象
         instrument ['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC']其中一个，代表: 模块ID
         level2_id (str): 2级数据的ID
-        data_type (str): 数据类型，如'csst-msc-l2-mbi-cat'
+        data_model (str): 数据类型，如'csst-msc-l2-mbi-cat'
         file_name (str): 2级数据文件名
         dag_id (str): 管线ID
         build (int): 构建号
@@ -190,7 +190,7 @@ def write(local_file: Union[IO, str],
         'level2_id': level2_id,
         'brick_id': brick_id,
         'file_name': file_name,
-        'data_type': data_type,
+        'data_model': data_model,
         'dag_id': dag_id,
         'build': build,
         'dataset': dataset,

tests/test_level1.py

@@ -24,12 +24,12 @@ class Level1TestCase(unittest.TestCase):
         self.assertIsNotNone(result.data, "error message: " + result.message)
 
     def test_update_qc1_status(self):
-        result = level1.update_qc1_status(level1_id = "1060940003452925", data_type='csst-msc-l1-mbi', qc1_status=1)
+        result = level1.update_qc1_status(level1_id = "1060940003452925", data_model='csst-msc-l1-mbi', qc1_status=1)
         print(result)
         self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message)
 
     def test_update_prc_status(self):
-        result = level1.update_prc_status(level1_id = "1060940003452925", data_type='csst-msc-l1-mbi', prc_status=3)
+        result = level1.update_prc_status(level1_id = "1060940003452925", data_model='csst-msc-l1-mbi', prc_status=3)
         print(result)
         self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message)
 
@@ -40,13 +40,15 @@ class Level1TestCase(unittest.TestCase):
         #     file_path = BytesIO(file.read())
             
         result = level1.write(local_file = file_path, 
+            project_id="10109100157991",
+            obs_type="WIDE",
             instrument = "MSC",
             level0_id="1010910015799127",
             level1_id = "1010910015799127", 
             dag_id = "csst-msc-l1-mbi",
             file_name= "CSST_MSC_MS_SCI_20240609181116_20240609181347_10109100157991_27_L1_V01.fits",
             pmapname="csst_000128.pmap",
-            data_type='csst-msc-l1-mbi', 
+            data_model='csst-msc-l1-mbi', 
             build=1,
             qc1_status=10,
             prc_status=12)

tests/test_level2.py

@@ -20,12 +20,12 @@ class Level2TestCase(unittest.TestCase):
         self.assertIsNotNone(result.data, "error message: " + result.message)
 
     def test_update_qc2_status(self):
-        result = level2.update_qc2_status(level2_id = "1010940063886712", data_type='csst-msc-l2-mbi-cat', qc2_status=1)
+        result = level2.update_qc2_status(level2_id = "1010940063886712", data_model='csst-msc-l2-mbi-cat', qc2_status=1)
         print(result)
         self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message)
 
     def test_update_prc_status(self):
-        result = level2.update_prc_status(level2_id = "1010940063886712", data_type='csst-msc-l2-mbi-cat', prc_status=3)
+        result = level2.update_prc_status(level2_id = "1010940063886712", data_model='csst-msc-l2-mbi-cat', prc_status=3)
         print(result)
         self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message)
 
@@ -46,7 +46,7 @@ class Level2TestCase(unittest.TestCase):
             level0_id="1010940063886712",
             level1_id = "1010940063886712", 
             level2_id = "1010940063886712", 
-            data_type='csst-msc-l2-mbi-cat', 
+            data_model='csst-msc-l2-mbi-cat', 
             file_name = "CSST_MSC_MS_SCI_20310423084104_20310423084334_10109400638867_12_L2_V01_CATMIX.fits",
             brick_id = 254,
             qc2_status=12,