format SAM cash flow profile with commas

Author: softwareengineerprogrammer

src/geophires_x/EconomicsSam.py

@@ -3,6 +3,7 @@
 import json
 import os
 from functools import lru_cache
+from math import isnan
 from pathlib import Path
 from typing import Any
 
@@ -25,6 +26,7 @@
 
 from geophires_x import Model as Model
 from geophires_x.EconomicsSamCashFlow import _calculate_sam_economics_cash_flow
+from geophires_x.GeoPHIRESUtils import is_float, is_int
 from geophires_x.Parameter import Parameter
 from geophires_x.Units import convertible_unit
 
@@ -98,13 +100,26 @@ def get_sam_cash_flow_profile_tabulated_output(model: Model, **tabulate_kw_args)
     # fmt:off
     _tabulate_kw_args = {
         'tablefmt': 'tsv',
-        'floatfmt': '.2f',
-        'intfmt': ',',
+        'floatfmt': ',.2f',
+        # 'floatfmt': ':,',
         **tabulate_kw_args
     }
+
     # fmt:on
 
-    return tabulate(model.economics.sam_economics.value[_SAM_CASH_FLOW_PROFILE_KEY], **_tabulate_kw_args)
+    def get_entry_display(entry: Any) -> str:
+        if is_float(entry):
+            if not isnan(float(entry)):
+                entry_display = f'{entry:,.2f}' if not is_int(entry) else f'{entry:,}'
+                return entry_display
+        return entry
+
+    profile_display = model.economics.sam_economics.value[_SAM_CASH_FLOW_PROFILE_KEY].copy()
+    for i in range(len(profile_display)):
+        for j in range(len(profile_display[i])):
+            profile_display[i][j] = get_entry_display(profile_display[i][j])
+
+    return tabulate(profile_display, **_tabulate_kw_args)
 
 
 def _get_utility_rate_parameters(model: Model) -> dict[str, Any]:
@@ -182,7 +197,7 @@ def _get_average_net_generation_MW(model: Model) -> float:
     return np.average(model.surfaceplant.NetElectricityProduced.value)
 
 
-def _sig_figs(val: float, num_sig_figs: int) -> float:
+def _sig_figs(val: float | list | tuple, num_sig_figs: int) -> float:
     """
     TODO move to utilities, probably
     """

src/geophires_x/GeoPHIRESUtils.py

@@ -637,5 +637,7 @@ def is_float(o: Any) -> bool:
         float(o)
     except ValueError:
         return False
+    except TypeError:
+        return False
     else:
         return True

src/geophires_x/sam_economics/.gitignore

@@ -1,2 +1,8 @@
 ssc*
 !single-owner-output-properties.json
+
+# scratch files
+draft_issue.md
+sam-cash-flow-table-comparison.csv
+sam-cash-flow-table-saved.csv
+

src/geophires_x_client/geophires_x_result.py

@@ -751,26 +751,29 @@ def _get_sam_cash_flow_profile_lines():
             profile_lines = []
             for row in rd:
                 row_clean = []
-                for entry in row:
-                    entry_val = entry.rstrip()
-                    if is_int(entry_val):
-                        entry_val = int(float(entry_val))
-
-                    if is_float(entry_val):
-                        entry_val_float = float(entry_val)
-                        if math.isnan(entry_val_float):
-                            entry_val = math.nan
-                        else:
-                            entry_val = entry_val_float
-
-                    row_clean.append(entry_val)
+                for entry_display in row:
+                    row_clean.append(
+                        GeophiresXResult._get_sam_cash_flow_profile_entry_display_to_entry_val(entry_display)
+                    )
                 profile_lines.append(row_clean)
 
             return profile_lines
         except BaseException as e:
             self._logger.debug(f'Failed to get SAM cash flow profile: {e}')
             return None
 
+    @staticmethod
+    def _get_sam_cash_flow_profile_entry_display_to_entry_val(entry_display: str) -> Any:
+        if entry_display is None:
+            return None
+
+        ed_san = entry_display.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 entry_display
+
     def _extract_addons_style_table_data(self, lines: list):
         """TODO consolidate with _get_data_from_profile_lines"""