NREL-reV 0.14.1__tar.gz → 0.14.2__tar.gz

{nrel_rev-0.14.1 → nrel_rev-0.14.2/NREL_reV.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NREL-reV
-Version: 0.14.1
+Version: 0.14.2
 Summary: National Renewable Energy Laboratory's (NREL's) Renewable Energy Potential(V) Model: reV
 Author-email: Galen Maclaurin <galen.maclaurin@nrel.gov>
 Maintainer-email: Grant Buster <gbuster@nrel.gov>, Paul Pinchuk <ppinchuk@nrel.gov>
@@ -23,7 +23,7 @@ License-File: LICENSE
 Requires-Dist: NREL-gaps<0.9,>=0.8.0
 Requires-Dist: NREL-NRWAL<0.1,>=0.0.11
 Requires-Dist: NREL-PySAM~=7.0.0
-Requires-Dist: NREL-rex<0.4,>=0.3.2
+Requires-Dist: NREL-rex<0.4,>=0.3.5
 Requires-Dist: numpy<3,>=2.0.2
 Requires-Dist: packaging<25,>=24.2
 Requires-Dist: plotly<7,>=6.0.1

{nrel_rev-0.14.1 → nrel_rev-0.14.2}/NREL_reV.egg-info/requires.txt

@@ -1,7 +1,7 @@
 NREL-gaps<0.9,>=0.8.0
 NREL-NRWAL<0.1,>=0.0.11
 NREL-PySAM~=7.0.0
-NREL-rex<0.4,>=0.3.2
+NREL-rex<0.4,>=0.3.5
 numpy<3,>=2.0.2
 packaging<25,>=24.2
 plotly<7,>=6.0.1

{nrel_rev-0.14.1/NREL_reV.egg-info → nrel_rev-0.14.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: NREL-reV
-Version: 0.14.1
+Version: 0.14.2
 Summary: National Renewable Energy Laboratory's (NREL's) Renewable Energy Potential(V) Model: reV
 Author-email: Galen Maclaurin <galen.maclaurin@nrel.gov>
 Maintainer-email: Grant Buster <gbuster@nrel.gov>, Paul Pinchuk <ppinchuk@nrel.gov>
@@ -23,7 +23,7 @@ License-File: LICENSE
 Requires-Dist: NREL-gaps<0.9,>=0.8.0
 Requires-Dist: NREL-NRWAL<0.1,>=0.0.11
 Requires-Dist: NREL-PySAM~=7.0.0
-Requires-Dist: NREL-rex<0.4,>=0.3.2
+Requires-Dist: NREL-rex<0.4,>=0.3.5
 Requires-Dist: numpy<3,>=2.0.2
 Requires-Dist: packaging<25,>=24.2
 Requires-Dist: plotly<7,>=6.0.1

{nrel_rev-0.14.1 → nrel_rev-0.14.2}/pyproject.toml

@@ -34,7 +34,7 @@ dependencies = [
   "NREL-gaps>=0.8.0,<0.9",
   "NREL-NRWAL>=0.0.11,<0.1",
   "NREL-PySAM~=7.0.0",
-  "NREL-rex>=0.3.2,<0.4",
+  "NREL-rex>=0.3.5,<0.4",
   "numpy>=2.0.2,<3",
   "packaging>=24.2,<25",
   "plotly>=6.0.1,<7",

{nrel_rev-0.14.1 → nrel_rev-0.14.2}/reV/supply_curve/cli_sc_aggregation.py

@@ -6,6 +6,7 @@ import os
 import logging
 
 from rex.multi_file_resource import MultiFileResource
+from rex.utilities.utilities import check_res_file
 from gaps.cli import as_click_command, CLICommandFromClass
 
 from reV.supply_curve.sc_aggregation import SupplyCurveAggregation
@@ -32,7 +33,7 @@ def _preprocessor(config, out_dir):
     dict
         Updated config file.
     """
-    config = _format_res_fpath(config)
+    config = _validate_res_fpath(config)
     _validate_tm(config)
 
     key_to_modules = {"gen_fpath": [ModuleName.MULTI_YEAR,
@@ -47,32 +48,37 @@ def _preprocessor(config, out_dir):
     return config
 
 
-def _format_res_fpath(config):
-    """Format res_fpath with year, if need be. """
+def _validate_res_fpath(config):
+    """Format res_fpath with year (if needed) and check for file existence"""
     res_fpath = config.setdefault("res_fpath", None)
-    if isinstance(res_fpath, str):
-        if '{}' in res_fpath:
-            for year in range(1950, 2100):
-                if os.path.exists(res_fpath.format(year)):
-                    break
-            else:
-                msg = ("Could not find any files that match the pattern"
-                       "{!r}".format(res_fpath.format("<year>")))
-                logger.error(msg)
-                raise FileNotFoundError(msg)
-
-            res_fpath = res_fpath.format(year)
-
-        elif not os.path.exists(res_fpath):
-            msg = "Could not find resource file: {!r}".format(res_fpath)
-            logger.error(msg)
-            raise FileNotFoundError(msg)
-
-        config["res_fpath"] = res_fpath
+    if not isinstance(res_fpath, str):
+        return config
+
+    if '{}' in res_fpath:
+        config["res_fpath"] = _get_filepath_with_year(res_fpath)
+    else:
+        check_res_file(res_fpath)
 
     return config
 
 
+def _get_filepath_with_year(res_fpath):
+    """Find first file that exists on disk with year filled in"""
+
+    for year in range(1950, 2100):
+        fp = res_fpath.format(year)
+        try:
+            check_res_file(fp)
+        except FileNotFoundError:
+            continue
+        return fp
+
+    msg = ("Could not find any files that match the pattern"
+           "{!r}".format(res_fpath.format("<year>")))
+    logger.error(msg)
+    raise FileNotFoundError(msg)
+
+
 def _validate_tm(config):
     """Check that tm_dset exists or that res_fpath is given (to generate tm)"""
     paths = config["excl_fpath"]

{nrel_rev-0.14.1 → nrel_rev-0.14.2}/reV/supply_curve/cli_tech_mapping.py

@@ -9,7 +9,7 @@ from gaps.cli import as_click_command, CLICommandFromClass
 from reV.supply_curve.tech_mapping import TechMapping
 from reV.utilities import ModuleName
 from reV.utilities.exceptions import ConfigError
-from reV.supply_curve.cli_sc_aggregation import _format_res_fpath
+from reV.supply_curve.cli_sc_aggregation import _validate_res_fpath
 
 logger = logging.getLogger(__name__)
 
@@ -28,7 +28,7 @@ def _preprocessor(config):
         Updated config file.
     """
     _validate_excl_fpath(config)
-    config = _format_res_fpath(config)
+    config = _validate_res_fpath(config)
     _validate_dset(config)
 
     return config

{nrel_rev-0.14.1 → nrel_rev-0.14.2}/reV/version.py

@@ -2,4 +2,4 @@
 reV Version number
 """
 
-__version__ = "0.14.1"
+__version__ = "0.14.2"