parse_units_and_comments working impl + test_csv_with_input_parameters_parse_units_and_comments

Author: softwareengineerprogrammer

src/geophires_x_client/geophires_input_parameters.py

@@ -251,22 +251,34 @@ def _row_entries(param_name: str, param_value_raw: str) -> list[str]:
             if parse_units_and_comments:
                 # TODO consolidate with other codebase parameter parsing logic...
                 param_schema = request_schema['properties'].get(param_name, {param_name: {}})
+                is_array_type = param_schema.get('type') == 'array'
 
                 value_non_value_split = (
-                    value_entry.split(' ', maxsplit=1)
-                    if not param_schema.get('type') == 'array'
-                    else value_entry.split(', --', maxsplit=1)
-                )
-                value_entry = value_non_value_split[0]
-                unit_and_comment_split = (
-                    value_non_value_split[1].split(' --', maxsplit=1) if len(value_non_value_split) > 1 else ['', '']
+                    value_entry.split(' ', maxsplit=1) if not is_array_type else value_entry.split(', --', maxsplit=1)
                 )
+                value_entry = value_non_value_split[0].rstrip(',').rstrip()
+                remainder = value_non_value_split[1] if len(value_non_value_split) > 1 else ''
 
                 default_units_for_param = param_schema.get('units', '')
-                units_entry = unit_and_comment_split[0] if unit_and_comment_split[0] != '' else default_units_for_param
 
-                if len(unit_and_comment_split) > 1:
-                    comment_entry = unit_and_comment_split[1]
+                if is_array_type:
+                    # For array-type params, the ', --' split already consumed the comment delimiter;
+                    # whatever remains is the comment (no units possible from the value string).
+                    comment_entry = remainder.lstrip() if remainder else ''
+                    units_entry = default_units_for_param
+                else:
+                    # For scalar params, remainder is either "<units>" or "-- <comment>"
+                    # (optionally "<units> -- <comment>").
+                    unit_and_comment_split = remainder.split(' --', maxsplit=1) if remainder else ['']
+                    units_part = unit_and_comment_split[0]
+                    if units_part.lstrip().startswith('--'):
+                        # No units, just an inline comment introduced by '-- '.
+                        comment_entry = units_part.lstrip()[2:].lstrip()
+                        units_entry = default_units_for_param
+                    else:
+                        units_entry = units_part if units_part != '' else default_units_for_param
+                        if len(unit_and_comment_split) > 1:
+                            comment_entry = unit_and_comment_split[1].lstrip()
 
             return [
                 'INPUT PARAMETERS',

tests/input-parameters-with-parsed-units-and-comments.csv

@@ -0,0 +1,5 @@
+INPUT PARAMETERS,Reservoir Depth,,3000,m,
+INPUT PARAMETERS,Gradient 1,,50,degC/km,
+INPUT PARAMETERS,End-Use Option,,1,,Direct-Use Heat
+INPUT PARAMETERS,Construction CAPEX Schedule,,"0.014,0.027,0.139,0.431,0.389",,
+INPUT PARAMETERS,Drawdown Parameter Schedule,,"0.003,0.001,0.0 * 10,0.001 * 3,0.002 * 3,0.003 * 3,0.004 * 3,0.005 * 4,0.006",1/year,"No drawdown for first 10 years, then 0.005/year"

tests/test_geophires_x_client.py

@@ -684,4 +684,7 @@ def test_csv_with_input_parameters_parse_units_and_comments(self):
         with open(result_file, 'w', newline='', encoding='utf-8') as rf:
             rf.write(csv_input_with_units_and_comments)
 
-        self.assertIsNotNone(csv_input_with_units_and_comments)  # FIXME WIP
+        self.assertIsNotNone(csv_input_with_units_and_comments)
+        self.assertCsvFileContentsEqual(
+            self._get_test_file_path('input-parameters-with-parsed-units-and-comments.csv'), result_file
+        )