add_level0_id

csst_dfs_api_cluster/facility/calmerge.py

@@ -51,19 +51,21 @@ class CalMergeApi(object):
     def get(self, **kwargs):
         '''  fetch a record from database
 
-        parameter kwargs:
-            id : [int] 
-
-        return csst_dfs_common.models.Result
+        :param kwargs: Parameter dictionary, key items support:
+            id : [int]
+        
+        :returns: csst_dfs_common.models.Result
         '''
         try:
-            id = get_parameter(kwargs, "id")
+            id = get_parameter(kwargs, "id", 0)
+            cal_id = get_parameter(kwargs, "cal_id", "")
             resp, _ =  self.stub.Get.with_call(calmerge_pb2.GetCalMergeReq(
-                id = id
+                id = id,
+                cal_id = cal_id
             ),metadata = get_auth_headers())
 
             if resp.record.id == 0:
-                return Result.error(message=f"id:{id} not found")  
+                return Result.error(message=f"not found")  
 
             return Result.ok_data(data=CalMergeRecord().from_proto_model(resp.record))
            
@@ -75,16 +77,21 @@ class CalMergeApi(object):
 
         parameter kwargs:
             id : [int],
+            cal_id = cal_id,
             status : [int]
 
         return csst_dfs_common.models.Result
         '''
-        id = get_parameter(kwargs, "id")
+        id = get_parameter(kwargs, "id", 0)
+        cal_id = get_parameter(kwargs, "cal_id", "")
         status = get_parameter(kwargs, "status")
 
         try:
             resp,_ = self.stub.UpdateQc1Status.with_call(
-                calmerge_pb2.UpdateQc1StatusReq(id=id, status=status),
+                calmerge_pb2.UpdateQc1StatusReq(
+                    id = id, 
+                    cal_id = cal_id,
+                    status=status),
                 metadata = get_auth_headers()
             )
             if resp.success:
@@ -99,16 +106,21 @@ class CalMergeApi(object):
 
         parameter kwargs:
             id : [int],
+            cal_id: [str],
             status : [int]
 
         return csst_dfs_common.models.Result
         '''
-        id = get_parameter(kwargs, "id")
+        id = get_parameter(kwargs, "id", 0)
+        cal_id = get_parameter(kwargs, "cal_id", "")
         status = get_parameter(kwargs, "status")
 
         try:
             resp,_ = self.stub.UpdateProcStatus.with_call(
-                calmerge_pb2.UpdateProcStatusReq(id=id, status=status),
+                calmerge_pb2.UpdateProcStatusReq(
+                    id = id,
+                    cal_id = cal_id,
+                    status=status),
                 metadata = get_auth_headers()
             )
             if resp.success:
@@ -122,6 +134,7 @@ class CalMergeApi(object):
         ''' insert a calibration merge record into database
  
         parameter kwargs:
+            cal_id : [str],
             detector_no : [str]
             ref_type : [str]
             obs_time : [str]
@@ -136,6 +149,7 @@ class CalMergeApi(object):
 
         rec = calmerge_pb2.CalMergeRecord(
             id = 0,
+            cal_id = get_parameter(kwargs, "cal_id"),
             detector_no = get_parameter(kwargs, "detector_no"),
             ref_type = get_parameter(kwargs, "ref_type"),
             obs_time = get_parameter(kwargs, "obs_time"),

csst_dfs_api_cluster/facility/level0.py

@@ -17,7 +17,7 @@ class Level0DataApi(object):
         ''' retrieve level0 records from database
 
         parameter kwargs:
-            obs_id: [int]
+            obs_id: [str]
             detector_no: [str]
             obs_type: [str]
             obs_time : (start, end),
@@ -30,7 +30,7 @@ class Level0DataApi(object):
         '''
         try:
             resp, _ =  self.stub.Find.with_call(level0_pb2.FindLevel0DataReq(
-                obs_id = get_parameter(kwargs, "obs_id", 0),
+                obs_id = get_parameter(kwargs, "obs_id"),
                 detector_no = get_parameter(kwargs, "detector_no"),
                 obs_type = get_parameter(kwargs, "obs_type"),
                 exp_time_start = get_parameter(kwargs, "obs_time", [None, None])[0],
@@ -54,18 +54,21 @@ class Level0DataApi(object):
         '''  fetch a record from database
 
         parameter kwargs:
-            fits_id : [int] 
+            id : [int],
+            level0_id: [str]
 
         return csst_dfs_common.models.Result
         '''
         try:
-            fits_id = get_parameter(kwargs, "fits_id")
+            id = get_parameter(kwargs, "id")
+            level0_id = get_parameter(kwargs, "level0_id")
             resp, _ =  self.stub.Get.with_call(level0_pb2.GetLevel0DataReq(
-                id = fits_id
+                id = id,
+                level0_id = level0_id
             ),metadata = get_auth_headers())
 
             if resp.record is None or resp.record.id == 0:
-                return Result.error(message=f"fits_id:{fits_id} not found")  
+                return Result.error(message=f"not found")  
 
             return Result.ok_data(data = Level0Record().from_proto_model(resp.record))
            
@@ -76,16 +79,21 @@ class Level0DataApi(object):
         ''' update the status of reduction
 
         parameter kwargs:
-            fits_id : [int],
+            id : [int],
+            level0_id: [str],
             status : [int]
 
         return csst_dfs_common.models.Result
         '''
-        fits_id = get_parameter(kwargs, "fits_id")
+        id = get_parameter(kwargs, "id")
+        level0_id = get_parameter(kwargs, "level0_id")
         status = get_parameter(kwargs, "status")
         try:
             resp,_ = self.stub.UpdateProcStatus.with_call(
-                level0_pb2.UpdateProcStatusReq(id=fits_id, status=status),
+                level0_pb2.UpdateProcStatusReq(
+                    id=id,
+                    level0_id = level0_id,
+                    status=status),
                 metadata = get_auth_headers()
             )
             if resp.success:
@@ -99,14 +107,19 @@ class Level0DataApi(object):
         ''' update the status of QC0
         
         parameter kwargs:
-            fits_id : [int],
+            id : [int],
+            level0_id: [str],
             status : [int]
         '''        
-        fits_id = get_parameter(kwargs, "fits_id")
+        id = get_parameter(kwargs, "id")
+        level0_id = get_parameter(kwargs, "level0_id")
         status = get_parameter(kwargs, "status")
         try:
             resp,_ = self.stub.UpdateQc0Status.with_call(
-                level0_pb2.UpdateQc0StatusReq(id=fits_id, status=status),
+                level0_pb2.UpdateQc0StatusReq( 
+                    id=id,
+                    level0_id = level0_id,
+                    status=status),
                 metadata = get_auth_headers()
             )
             if resp.success:
@@ -120,7 +133,7 @@ class Level0DataApi(object):
         ''' insert a level0 data record into database
  
         parameter kwargs:
-            obs_id = [int]
+            obs_id = [str]
             detector_no = [str]
             obs_type = [str]        
             obs_time = [str]

csst_dfs_api_cluster/facility/level0prc.py

@@ -17,7 +17,7 @@ class Level0PrcApi(object):
         ''' retrieve level0 procedure records from database
 
         parameter kwargs:
-            level0_id: [int]
+            level0_id: [str]
             pipeline_id: [str]
             prc_module: [str]
             prc_status : [int]
@@ -69,13 +69,13 @@ class Level0PrcApi(object):
         ''' insert a level0 procedure record into database
  
         parameter kwargs:
-            level0_id : [int]
+            level0_id : [str]
             pipeline_id : [str]
             prc_module : [str]
-            params_id : [str]
+            params_file_path : [str]
             prc_status : [int]
             prc_time : [str]
-            file_path : [str]
+            result_file_path : [str]
         return csst_dfs_common.models.Result
         '''   
 
@@ -84,10 +84,10 @@ class Level0PrcApi(object):
             level0_id = get_parameter(kwargs, "level0_id"),
             pipeline_id = get_parameter(kwargs, "pipeline_id"),
             prc_module = get_parameter(kwargs, "prc_module"),
-            params_id = get_parameter(kwargs, "params_id"),
+            params_file_path = get_parameter(kwargs, "params_file_path"),
             prc_status = get_parameter(kwargs, "prc_status", -1),
             prc_time = get_parameter(kwargs, "prc_time"),
-            file_path = get_parameter(kwargs, "file_path")
+            result_file_path = get_parameter(kwargs, "result_file_path")
         )
         req = level0prc_pb2.WriteLevel0PrcReq(record = rec)
         try:

csst_dfs_api_cluster/facility/observation.py

@@ -54,18 +54,21 @@ class ObservationApi(object):
         '''  fetch a record from database
 
         parameter kwargs:
-            obs_id : [int] 
+            id : [int],
+            obs_id = [str]
 
         return csst_dfs_common.models.Result
         '''
         try:
+            id = get_parameter(kwargs, "id")
             obs_id = get_parameter(kwargs, "obs_id")
             resp, _ =  self.stub.Get.with_call(observation_pb2.GetObservationReq(
+                id = id,
                 obs_id = obs_id
             ),metadata = get_auth_headers())
 
             if resp.observation is None or resp.observation.id == 0:
-                return Result.error(message=f"obs_id:{obs_id} not found")  
+                return Result.error(message=f"not found")  
 
             return Result.ok_data(data=Observation().from_proto_model(resp.observation))
            
@@ -76,16 +79,21 @@ class ObservationApi(object):
         ''' update the status of reduction
 
         parameter kwargs:
-            obs_id : [int],
+            id : [int],
+            obs_id = [str],
             status : [int]
 
         return csst_dfs_common.models.Result
         '''
+        id = get_parameter(kwargs, "id")
         obs_id = get_parameter(kwargs, "obs_id")
         status = get_parameter(kwargs, "status")
         try:
             resp,_ = self.stub.UpdateProcStatus.with_call(
-                observation_pb2.UpdateProcStatusReq(obs_id=obs_id, status=status),
+                observation_pb2.UpdateProcStatusReq(
+                    id = id,
+                    obs_id = obs_id,
+                    status = status),
                 metadata = get_auth_headers()
             )
             if resp.success:
@@ -99,14 +107,19 @@ class ObservationApi(object):
         ''' update the status of QC0
         
         parameter kwargs:
-            obs_id : [int],
+            id : [int],
+            obs_id = [str],
             status : [int]
         '''        
+        id = get_parameter(kwargs, "id")
         obs_id = get_parameter(kwargs, "obs_id")
         status = get_parameter(kwargs, "status")
         try:
             resp,_ = self.stub.UpdateQc0Status.with_call(
-                observation_pb2.UpdateQc0StatusReq(obs_id=obs_id, status=status),
+                observation_pb2.UpdateQc0StatusReq(
+                    id = id,
+                    obs_id = obs_id,
+                    status=status),
                 metadata = get_auth_headers()
             )
             if resp.success:
@@ -120,7 +133,8 @@ class ObservationApi(object):
         ''' insert a observational record into database
  
         parameter kwargs:
-            obs_id = [int]
+            id = [id]
+            obs_id = [str]
             obs_time = [str]
             exp_time = [int]
             module_id = [str]
@@ -131,7 +145,8 @@ class ObservationApi(object):
         '''   
 
         rec = observation_pb2.Observation(
-            id = get_parameter(kwargs, "obs_id", 0),
+            id = get_parameter(kwargs, "id", 0),
+            obs_id = get_parameter(kwargs, "obs_id", ""),
             obs_time = get_parameter(kwargs, "obs_time"),
             exp_time = get_parameter(kwargs, "exp_time"),
             module_id = get_parameter(kwargs, "module_id"),

csst_dfs_api_cluster/ifs/level1.py

@@ -21,7 +21,7 @@ class Level1DataApi(object):
         ''' retrieve level1 records from database
 
         parameter kwargs:
-            raw_id: [int]
+            level0_id: [str]
             data_type: [str]
             obs_type: [str]
             create_time : (start, end),
@@ -34,7 +34,7 @@ class Level1DataApi(object):
         '''
         try:
             resp, _ =  self.stub.Find.with_call(level1_pb2.FindLevel1Req(
-                raw_id = get_parameter(kwargs, "raw_id"),
+                level0_id = get_parameter(kwargs, "level0_id"),
                 data_type = get_parameter(kwargs, "data_type"),
                 create_time_start = get_parameter(kwargs, "create_time", [None, None])[0],
                 create_time_end = get_parameter(kwargs, "create_time", [None, None])[1],
@@ -123,7 +123,7 @@ class Level1DataApi(object):
         ''' insert a level1 record into database
  
         parameter kwargs:
-            raw_id : [int]
+            level0_id : [str]
             data_type : [str]
             cor_sci_id : [int]
             prc_params : [str]
@@ -142,9 +142,9 @@ class Level1DataApi(object):
         return csst_dfs_common.models.Result
         '''   
 
-        rec = level1_pb2.Detector(
+        rec = level1_pb2.Level1Record(
             id = 0,
-            raw_id = get_parameter(kwargs, "raw_id"),
+            level0_id = get_parameter(kwargs, "level0_id"),
             data_type = get_parameter(kwargs, "data_type"),
             cor_sci_id = get_parameter(kwargs, "cor_sci_id"),
             prc_params = get_parameter(kwargs, "prc_params"),
@@ -157,7 +157,7 @@ class Level1DataApi(object):
             filename = get_parameter(kwargs, "filename"),
             file_path = get_parameter(kwargs, "file_path"),
             prc_status = get_parameter(kwargs, "prc_status", -1),
-            prc_time = get_parameter(kwargs, "prc_time", format_datetime(datetime.datetime.now())),
+            prc_time = get_parameter(kwargs, "prc_time", format_datetime(datetime.now())),
             pipeline_id = get_parameter(kwargs, "pipeline_id")
         )
         req = level1_pb2.WriteLevel1Req(record = rec)

csst_dfs_api_cluster/msc/level1.py

@@ -21,7 +21,7 @@ class Level1DataApi(object):
         ''' retrieve level1 records from database
 
         parameter kwargs:
-            raw_id: [int]
+            level0_id: [str]
             data_type: [str]
             obs_type: [str]
             create_time : (start, end),
@@ -34,7 +34,7 @@ class Level1DataApi(object):
         '''
         try:
             resp, _ =  self.stub.Find.with_call(level1_pb2.FindLevel1Req(
-                raw_id = get_parameter(kwargs, "raw_id"),
+                level0_id = get_parameter(kwargs, "level0_id"),
                 data_type = get_parameter(kwargs, "data_type"),
                 create_time_start = get_parameter(kwargs, "create_time", [None, None])[0],
                 create_time_end = get_parameter(kwargs, "create_time", [None, None])[1],
@@ -123,7 +123,7 @@ class Level1DataApi(object):
         ''' insert a level1 record into database
  
         parameter kwargs:
-            raw_id : [int]
+            level0_id : [str]
             data_type : [str]
             cor_sci_id : [int]
             prc_params : [str]
@@ -141,7 +141,7 @@ class Level1DataApi(object):
 
         rec = level1_pb2.Level1Record(
             id = 0,
-            raw_id = get_parameter(kwargs, "raw_id"),
+            level0_id = get_parameter(kwargs, "level0_id"),
             data_type = get_parameter(kwargs, "data_type"),
             cor_sci_id = get_parameter(kwargs, "cor_sci_id"),
             prc_params = get_parameter(kwargs, "prc_params"),
@@ -151,7 +151,7 @@ class Level1DataApi(object):
             filename = get_parameter(kwargs, "filename"),
             file_path = get_parameter(kwargs, "file_path"),
             prc_status = get_parameter(kwargs, "prc_status", -1),
-            prc_time = get_parameter(kwargs, "prc_time", format_datetime(datetime.datetime.now())),
+            prc_time = get_parameter(kwargs, "prc_time", format_datetime(datetime.now())),
             pipeline_id = get_parameter(kwargs, "pipeline_id")
         )
         req = level1_pb2.WriteLevel1Req(record = rec)

tests/test_facility_cal_merge.py

@@ -16,19 +16,21 @@ class CalMergeApiTestCase(unittest.TestCase):
         print('find:', recs)
 
     def test_get(self):
-        rec = self.api.get(id = 3)
+        rec = self.api.get(id = 4)
         print('get:', rec)
 
     def test_update_proc_status(self):
-        rec = self.api.update_proc_status(id = 3, status = 1)
+        rec = self.api.update_proc_status(id = 3, status = -1)
         print('update_proc_status:', rec)
 
     def test_update_qc1_status(self):
-        rec = self.api.update_qc1_status(id = 3, status = 2)
+        rec = self.api.update_qc1_status(id = 3, status = -1)
         print('update_qc1_status:', rec)    
 
     def test_write(self):
-        rec = self.api.write(detector_no='CCD01', 
+        rec = self.api.write(
+            cal_id = "10000X01",
+            detector_no='01', 
             ref_type = "bias",
             obs_time = "2021-06-04 11:12:13",
             exp_time = 150,
@@ -36,5 +38,5 @@ class CalMergeApiTestCase(unittest.TestCase):
             file_path = "/opt/dddasd.fits",
             prc_status = 3,
             prc_time = '2021-06-04 11:12:13',
-            level0_ids = [1,2,3,4])
+            level0_ids = ['1','2','3','4'])
         print('write:', rec)
\ No newline at end of file

tests/test_facility_level0.py

@@ -10,25 +10,25 @@ class Level0DataTestCase(unittest.TestCase):
         self.api = Level0DataApi()
 
     def test_find(self):
-        recs = self.api.find(obs_id = 9, obs_type = 'sci', limit = 0)
+        recs = self.api.find(obs_id = '9', obs_type = 'sci', limit = 0)
         print('find:', recs)
 
     def test_get(self):
-        rec = self.api.get(fits_id = 100)
+        rec = self.api.get(id = 100)
         print('get:', rec)
 
     def test_update_proc_status(self):
-        rec = self.api.update_proc_status(fits_id = 100, status = 6)
+        rec = self.api.update_proc_status(id = 100, status = 6)
         print('update_proc_status:', rec)
 
     def test_update_qc0_status(self):
-        rec = self.api.update_qc0_status(fits_id = 100, status = 7)
+        rec = self.api.update_qc0_status(id = 100, status = 7)
         print('update_qc0_status:', rec)
 
     def test_write(self):
         rec = self.api.write(
-            obs_id = 13,
-            detector_no = "CCD01",
+            obs_id = '00013',
+            detector_no = "01",
             obs_type = "sci",            
             obs_time = "2021-06-06 11:12:13",
             exp_time = 150,

tests/test_facility_level0_prc.py

@@ -10,7 +10,7 @@ class Level0PrcTestCase(unittest.TestCase):
         self.api = Level0PrcApi()
 
     def test_find(self):
-        recs = self.api.find(level0_id=134)
+        recs = self.api.find(level0_id='134')
         print('find:', recs)
 
     def test_update_proc_status(self):
@@ -18,11 +18,11 @@ class Level0PrcTestCase(unittest.TestCase):
         print('update_proc_status:', rec)
 
     def test_write(self):
-        rec = self.api.write(level0_id=134, 
+        rec = self.api.write(level0_id='134', 
             pipeline_id = "P1",
             prc_module = "QC0",
-            params_id = "/opt/dddasd.params",
+            params_file_path = "/opt/dddasd.params",
             prc_status = 3,
             prc_time = '2021-06-04 11:12:13',
-            file_path = "/opt/dddasd.header")
+            result_file_path = "/opt/dddasd.header")
         print('write:', rec)
\ No newline at end of file

tests/test_facility_observation.py

@@ -14,19 +14,20 @@ class FacilityObservationTestCase(unittest.TestCase):
         print('find:', recs)
 
     def test_get(self):
-        rec = self.api.get(obs_id=9)
+        rec = self.api.get(obs_id='00009')
         print('get:', rec)
 
     def test_update_proc_status(self):
-        rec = self.api.update_proc_status(obs_id = 9, status = 3, )
+        rec = self.api.update_proc_status(obs_id='00009', status = 3, )
         print('update_proc_status:', rec)
 
     def test_update_qc0_status(self):
-        rec = self.api.update_qc0_status(obs_id = 9, status = 3, )
+        rec = self.api.update_qc0_status(obs_id='00009', status = 3, )
         print('update_qc0_status:', rec)        
 
     def test_write(self):
         rec = self.api.write(
+            obs_id='00009',
             obs_time = "2021-06-06 11:12:13",
             exp_time = 150,
             module_id = "MSC",

tests/test_ifs_level1.py

@@ -10,7 +10,8 @@ class IFSLevel1DataTestCase(unittest.TestCase):
         self.api = Level1DataApi()
 
     def test_find(self):
-        recs = self.api.find(raw_id=1,
+        recs = self.api.find(
+            level0_id='1',
             create_time = ("2021-06-01 11:12:13","2021-06-08 11:12:13"))
         print('find:', recs)
 
@@ -27,7 +28,8 @@ class IFSLevel1DataTestCase(unittest.TestCase):
         print('update_qc1_status:', rec)
 
     def test_write(self):
-        rec = self.api.write(raw_id=11, 
+        rec = self.api.write(
+            level0_id='11', 
             data_type = "sci",
             cor_sci_id = 2,
             prc_params = "/opt/dddasd.params",

tests/test_msc_level1.py

@@ -10,7 +10,8 @@ class MSCLevel1DataTestCase(unittest.TestCase):
         self.api = Level1DataApi()
 
     def test_find(self):
-        recs = self.api.find(raw_id=1,
+        recs = self.api.find(
+            level0_id='1',
             create_time = ("2021-06-01 11:12:13","2021-06-08 11:12:13"))
         print('find:', recs)
 
@@ -27,7 +28,8 @@ class MSCLevel1DataTestCase(unittest.TestCase):
         print('update_qc1_status:', rec)
 
     def test_write(self):
-        rec = self.api.write(raw_id=1, 
+        rec = self.api.write(
+            level0_id='1', 
             data_type = "sci",
             cor_sci_id = 1,
             prc_params = "/opt/dddasd.params",