From 67f347aa706bc4f7ea715eacdc45cab18135d278 Mon Sep 17 00:00:00 2001
From: shoulinwei <weishoulin@astrolab.cn>
Date: Mon, 21 Apr 2025 09:56:36 +0800
Subject: [PATCH] fields refactor

---
 csst_dfs_client/plan.py | 31 ++++++++++++++++++++-----------
 tests/test_plan.py      |  4 ++--
 2 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/csst_dfs_client/plan.py b/csst_dfs_client/plan.py
index 45aa544..598ceff 100644
--- a/csst_dfs_client/plan.py
+++ b/csst_dfs_client/plan.py
@@ -5,9 +5,12 @@ from .common import request, Result
 DateTimeTuple = Tuple[str, str]
 
 def find(mode: Optional[str] = None,
-        obsid: Optional[str] = None,
-        backend: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'] = 'MSC', 
-        obstype: Optional[str] = None,
+        project_id: Optional[str] = None,
+        obs_id: Optional[str] = None,
+        instrument: Literal['MSC', 'IFS', 'MCI', 'HSTDM', 'CPIC'] = 'MSC', 
+        file_type: Optional[str] = None,
+        obs_type: Optional[str] = None,
+        object_name: Optional[str] = None,
         obstime: Optional[DateTimeTuple] = None,
         page: int = 1,
         limit: int = 0) -> Result:
@@ -15,10 +18,13 @@ def find(mode: Optional[str] = None,
     根据给定的参数在DFS中搜索编排数据。
     
     Args:
-        mode (Optional[str], optional): 观测模式. Defaults to None.
-        obsid (Optional[str], optional): 观测ID，支持模糊搜索. Defaults to None.
-        backend (Optional[str], optional): 模块ID，如'MSC', 'IFS'. Defaults to None.
-        obstype (Optional[str], optional): 观测类型，如'SCIE'. Defaults to None.
+        mode (Optional[str], optional): 观测模式，如CM1-1、OM1. Defaults to None.
+        project_id (Optional[str], optional): 项目ID. Defaults to None.
+        obs_id (Optional[str], optional): 观测ID，支持模糊搜索. Defaults to None.
+        instrument (Optional[str], optional): 模块ID，如'MSC', 'IFS'. Defaults to None.
+        file_type (Optional[str], optional): 文件类型，如'SCI'. Defaults to None.
+        obs_type (Optional[str], optional): 观测类型，如主巡天宽场、TOO观测、定标星场等等. Defaults to None.
+        object_name (Optional[str], optional): 目标名称. Defaults to None.
         obstime (Optional[DateTimeTuple], optional): 观测时间范围. Defaults to None.
         page (int, optional): 页码. Defaults to 1.
         limit (int, optional): 每页数量. Defaults to 0，不限制.
@@ -30,9 +36,12 @@ def find(mode: Optional[str] = None,
 
     params = {
         'mode': mode,
-        'obsid': obsid,
-        'backend': backend,
-        'obstype': obstype,
+        'project_id': project_id,
+        'obs_id': obs_id,
+        'instrument': instrument,
+        'file_type': file_type,
+        'obs_type': obs_type,
+        'object_name': object_name,
         'obs_time_start': None,
         'obs_time_end': None,
         'create_time_start': None,
@@ -97,7 +106,7 @@ def new(data: dict) -> Result:
     新建编排数据
     
     Args:
-        data (dict): 编排数据的字典表示，如：{'id': 394, 'opid': 'xxx', 'backend': 'MSC', ...}
+        data (dict): 编排数据的字典表示，如：{'id': 394, 'opid': 'xxx', 'instrument': 'MSC', ...}
     
     Returns:
         Result: 成功后，Result.data为写入记录，失败message为失败原因。
diff --git a/tests/test_plan.py b/tests/test_plan.py
index be7d745..5aae493 100644
--- a/tests/test_plan.py
+++ b/tests/test_plan.py
@@ -9,7 +9,7 @@ class PlanTestCase(unittest.TestCase):
 
     def test_find(self):
         start_time = time.time()
-        result = plan.find(obsid = "101000003",
+        result = plan.find(obs_id = "101000003",
                         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']}")
@@ -38,7 +38,7 @@ class PlanTestCase(unittest.TestCase):
         self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message)
 
     def test_new(self):
-        data = {'id':10399, 'opid':'1', 'backend':'MSC', 'obstype': 'SCIE', 'obsid': '1'}
+        data = {'id':10399, 'opid':'1', 'instrument':'MSC', 'obs_type': 'SCIE', 'obs_id': '1'}
         result = plan.new(data = data)
         print(result)
         self.assertEqual(result.code, 200, "error code: " + str(result.code) + ", message: " + result.message)        
-- 
GitLab