fix client parsing of SAM cash flow profile

Author: softwareengineerprogrammer

src/geophires_x_client/geophires_x_result.py

@@ -738,11 +738,6 @@ def extract_table_header(lines: list) -> list:
     def _get_sam_cash_flow_profile(self) -> list[Any]:
         profile_name = 'SAM CASH FLOW PROFILE'
 
-        def _get_sam_cash_flow_profile_lines():
-            s1 = f'*  {profile_name}  *'
-            s2 = '-' * 50
-            return ''.join(self._lines).split(s1)[1].split(s2)[0].split(s2)[0]  # [5:]
-
         try:
             s1 = f'*  {profile_name}  *'
             profile_text = ''.join(self._lines).split(s1)[1]
@@ -767,12 +762,12 @@ def _get_sam_cash_flow_profile_entry_display_to_entry_val(entry_display: str) ->
         if entry_display is None:
             return None
 
-        ed_san = entry_display.replace(',', '') if type(entry_display) is str else entry_display
+        ed_san = entry_display.strip().replace(',', '') if type(entry_display) is str else entry_display
         if is_float(ed_san):
             if not math.isnan(float(ed_san)):
-                return float(ed_san) if not is_int(ed_san) else int(ed_san)
+                return float(ed_san) if not is_int(ed_san) else int(float(ed_san))
 
-        return entry_display
+        return entry_display.strip()
 
     def _extract_addons_style_table_data(self, lines: list):
         """TODO consolidate with _get_data_from_profile_lines"""

tests/test_geophires_x_client.py

@@ -592,3 +592,13 @@ def test_parse_economic_model(self):
         result_legacy_em._lines = ['   Economic Model  = BICYCLE']
         em_legacy = result_legacy_em._get_equal_sign_delimited_field('Economic Model')
         self.assertEqual(em_legacy, 'BICYCLE')
+
+    def test_parse_sam_cash_flow_profile(self):
+        result = GeophiresXResult(self._get_test_file_path('examples/example_SAM-single-owner-PPA.out'))
+        em = result.result['ECONOMIC PARAMETERS']['Economic Model']
+        self.assertEqual(em, 'SAM Single Owner PPA')
+        self.assertIn('SAM CASH FLOW PROFILE', result.result)
+
+        cash_flow = result.result['SAM CASH FLOW PROFILE']
+        self.assertIsNotNone(cash_flow)
+        self.assertListEqual([''] + [f'Year {y}' for y in range(21)], cash_flow[0])