refactor: reduce MR diff by reverting some of function split

src/cal_tools/constants.py

@@ -106,28 +106,15 @@ def write_ccv(
     return ccv_group_name
 
 
-def _get_ccv_attributes(ccv_group):
-    return (
-        ccv_group.attrs['proposal'],
-        ccv_group.attrs['runs'],
-        ccv_group.attrs['begin_at'],
-    )
-
-
-def condition_parameters(condition_group):
-    params = []
-
-    # It's really not ideal we're mixing conditionS and condition now.
-    for parameter in condition_group:
-        param_dset = condition_group[parameter]
-        params.append({
-            'parameter_name': param_dset.attrs['database_name'],
-            'value': float(param_dset[()]),
-            'lower_deviation_value': param_dset.attrs['lower_deviation'],
-            'upper_deviation_value': param_dset.attrs['upper_deviation'],
-            'flg_available': True
-        })
-    return params
+def get_condition_dict(
+    name, value, lower_deviation=0.0, upper_deviation=0.0):
+    return {
+        'parameter_name': name,
+        'value': value,
+        'lower_deviation_value': lower_deviation,
+        'upper_deviation_value': upper_deviation,
+        'flg_available': True
+    }
 
 
 def generate_unique_name(detector_type, pdu_name, pdu_uuid, cond_params):
@@ -145,65 +132,12 @@ def generate_unique_name(detector_type, pdu_name, pdu_uuid, cond_params):
     return unique_name[:60]
 
 
-def prepare_injection_payload(
-    ccv_attrs,
-    pdu_attrs,
-    cond_params,
-    const_filename,
-    const_rel_path,
-    unique_name,
-    report_to
-):
-    proposal, runs, begin_at_str = ccv_attrs
-    pdu_name, calibration, detector_type, pdu_uuid = pdu_attrs
-
+def get_raw_data_location(proposal, runs):
     if proposal and len(runs) > 0:
-        raw_data_location = (
+        return (
             f'proposal:{proposal} runs: {" ".join([str(x) for x in runs])}')
     else:
-        pass  # Fallback for non-run based constants
-
-    # Add PDU "UUID" to parameters.
-    cond_params.append({
-        'parameter_name': 'Detector UUID',
-        'value': unpack('d', pack('q', pdu_uuid))[0],
-        'lower_deviation_value': 0.0,
-        'upper_deviation_value': 0.0,
-        'flg_available': True
-    })
-
-    inject_h = {
-        'detector_condition': {
-            'name': unique_name,
-            'parameters': cond_params
-        },
-        'calibration_constant': {
-            'calibration_name': calibration,
-            'detector_type_name': detector_type,
-            'flg_auto_approve': True
-        },
-        'calibration_constant_version': {
-            'raw_data_location': raw_data_location,
-            'file_name': const_filename,
-            'path_to_file': const_rel_path,
-            'data_set_name': f'{pdu_name}/{calibration}/0',
-            'start_idx': '0',
-            'end_idx': '0',
-            'begin_validity_at': begin_at_str,
-            'end_validity_at': '',
-            'begin_at': begin_at_str,
-            'pdu_physical_name': pdu_name,
-            'flg_good_quality': True
-        }
-    }
-
-    if report_to:
-        report_path = Path(report_to).absolute().with_suffix('.pdf')
-        inject_h['report'] = {
-            'name': report_path.stem,
-            'file_path': str(report_path)
-        }
-    return inject_h
+        return ""  # Fallback for non-run based constants
 
 
 def inject_ccv(const_src, ccv_root, report_to=None):
@@ -229,13 +163,23 @@ def inject_ccv(const_src, ccv_root, report_to=None):
         detector_type = pdu_group.attrs['detector_type']
 
         ccv_group = const_file[ccv_root]
-        ccv_attrs = _get_ccv_attributes(ccv_group)
+
         proposal, runs = ccv_group.attrs['proposal'], ccv_group.attrs['runs']
         begin_at_str = ccv_group.attrs['begin_at']
 
         condition_group = ccv_group['operating_condition']
 
-        cond_params = condition_parameters(condition_group)
+        cond_params = []
+
+        # It's really not ideal we're mixing conditionS and condition now.
+        for parameter in condition_group:
+            param_dset = condition_group[parameter]
+            cond_params.append(get_condition_dict(
+                param_dset.attrs['database_name'],
+                float(param_dset[()]),
+                param_dset.attrs['lower_deviation'],
+                param_dset.attrs['upper_deviation'],
+            ))
 
     const_rel_path = f'xfel/cal/{detector_type.lower()}/{pdu_name.lower()}'
     const_filename = f'cal.{time.time()}.h5'
@@ -243,16 +187,46 @@ def inject_ccv(const_src, ccv_root, report_to=None):
     unique_name = generate_unique_name(
         detector_type, pdu_name, pdu_uuid, cond_params)
 
-    pdu_attrs = (pdu_name, calibration, detector_type, pdu_uuid)
-    inject_h = prepare_injection_payload(
-        ccv_attrs,
-        pdu_attrs,
-        cond_params,
-        const_filename,
-        const_rel_path,
-        unique_name,
-        report_to
-    )
+    raw_data_location = get_raw_data_location(proposal, runs)
+
+    # Add PDU "UUID" to parameters.
+    cond_params.append(get_condition_dict(
+        'Detector UUID',
+        unpack('d', pack('q', pdu_uuid))[0]
+    ))
+
+    inject_h = {
+        'detector_condition': {
+            'name': unique_name,
+            'parameters': cond_params
+        },
+        'calibration_constant': {
+            'calibration_name': calibration,
+            'detector_type_name': detector_type,
+            'flg_auto_approve': True
+        },
+        'calibration_constant_version': {
+            'raw_data_location': raw_data_location,
+            'file_name': const_filename,
+            'path_to_file': const_rel_path,
+            'data_set_name': f'{pdu_name}/{calibration}/0',
+            'start_idx': '0',
+            'end_idx': '0',
+            'begin_validity_at': begin_at_str,
+            'end_validity_at': '',
+            'begin_at': begin_at_str,
+            'pdu_physical_name': pdu_name,
+            'flg_good_quality': True
+        }
+    }
+
+    if report_to:
+        report_path = Path(report_to).absolute().with_suffix('.pdf')
+        inject_h['report'] = {
+            'name': report_path.stem,
+            'file_path': str(report_path)
+        }
+
     const_dest = _get_default_caldb_root() / const_rel_path / const_filename
     const_dest.parent.mkdir(parents=True, exist_ok=True)
     copyfile(const_src, const_dest)