Merge pull request NREL#150 from malcolm-dsider/main

Update to allow HTML output for HIP-RA-X

Author: malcolm-dsider

.pre-commit-config.yaml

@@ -6,12 +6,12 @@ exclude: '^(\.tox|ci/templates|\.bumpversion\.cfg|src/geophires_x)(/|$)'
 # Note the order is intentional to avoid multiple passes of the hooks
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.1.3
+    rev: v0.3.1
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix, --show-fixes]
   - repo: https://github.com/psf/black
-    rev: 23.10.1
+    rev: 24.2.0
     hooks:
       - id: black
   - repo: https://github.com/pre-commit/pre-commit-hooks

setup.py

@@ -77,6 +77,7 @@ def read(*names, **kwargs):
         'scipy',
         'iapws',
         'coolprop',
+        'rich',
     ],
     extras_require={
         # eg:

src/geophires_x_client/geophires_x_result.py

@@ -310,9 +310,9 @@ def __init__(self, output_file_path, logger_name=None):
 
         try:
             self.result['POWER GENERATION PROFILE'] = self._get_power_generation_profile()
-            self.result[
-                'HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE'
-            ] = self._get_heat_electricity_extraction_generation_profile()
+            self.result['HEAT AND/OR ELECTRICITY EXTRACTION AND GENERATION PROFILE'] = (
+                self._get_heat_electricity_extraction_generation_profile()
+            )
         except Exception as e:
             # FIXME
             self._logger.error(f'Failed to parse power and/or extraction profiles: {e}')

src/hip_ra/__init__.py

@@ -37,9 +37,9 @@ def _parse_fields(self):
             matches = re.findall(pattern, text)
 
             result = {
-                key.strip(): {'value': float(value), 'unit': unit.strip()}
-                if unit
-                else {'value': float(value), 'unit': None}
+                key.strip(): (
+                    {'value': float(value), 'unit': unit.strip()} if unit else {'value': float(value), 'unit': None}
+                )
                 for key, value, unit in matches
             }