NREL-reV 0.14.1__py3-none-any.whl → 0.14.2__py3-none-any.whl

{nrel_rev-0.14.1.dist-info → nrel_rev-0.14.2.dist-info}/METADATA

@@ -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.dist-info → nrel_rev-0.14.2.dist-info}/RECORD

@@ -1,7 +1,7 @@
-nrel_rev-0.14.1.dist-info/licenses/LICENSE,sha256=hDwoTANtan2ZpufBlXm5C3W_PJ-mCqItvlcobgjxL7k,1526
+nrel_rev-0.14.2.dist-info/licenses/LICENSE,sha256=hDwoTANtan2ZpufBlXm5C3W_PJ-mCqItvlcobgjxL7k,1526
 reV/__init__.py,sha256=tXTpWu_qVo3uotfSw_TJ-gNbidGaIPPfUTwBlpCMJ-g,856
 reV/cli.py,sha256=u7G5M5moA7q8fCgC_1MB30Z7R14GNcngVf6eVNkfQU8,1682
-reV/version.py,sha256=en0eHrVgai6A_9JZVnfZf8ZSffqqCeB8YJG-3yS393g,51
+reV/version.py,sha256=iZ2NEm6j_ZMkwjscuehf0I9OUwsEHrSS3xbfjV9LCbM,51
 reV/SAM/SAM.py,sha256=3NK9rRaJzqH6wz7CU_5XguKCRhmoilOpDdFFsFgOaxQ,33163
 reV/SAM/__init__.py,sha256=LJqoncyKDY5ZP5WA4kboh561bce11F9Ge645Izah0EY,240
 reV/SAM/defaults.py,sha256=JQMJomX7wsbMzxKjx_IMnA_9QFsV2yWCyl_JToDVSJo,6703
@@ -75,9 +75,9 @@ reV/rep_profiles/cli_rep_profiles.py,sha256=i3fRolT7HTzTQePXpNLDyxwgpRa7FEfHO1mO
 reV/rep_profiles/rep_profiles.py,sha256=dJ2jcklbelYYNS3IUXIYHg8E0poXLOWrwdqeBBnqYIE,48271
 reV/supply_curve/__init__.py,sha256=dbf0cO0qmt1VhV8dnDddztrcpnwua9T2HBhM6tLKaP8,274
 reV/supply_curve/aggregation.py,sha256=DvIUmj0PbZ8NxgOSmpXvzn9wJnOiQO2Xm2w_WCRVK-U,40908
-reV/supply_curve/cli_sc_aggregation.py,sha256=qGfJyZjg4tFARG2dl-wAlHv9KjEp2u4wg1Boxz18Gf0,3347
+reV/supply_curve/cli_sc_aggregation.py,sha256=iDBHlUUPg-Ce4N4Rqb4scn8A_Ygq2q4i9v_ypbH-krs,3387
 reV/supply_curve/cli_supply_curve.py,sha256=e-XrHQIe4OqWTL6u-TUAyHrw7Alk7vkXQ2HoLbE3zTM,2163
-reV/supply_curve/cli_tech_mapping.py,sha256=ztNJhgk3WlSD5Gn7Rh3qBLMvX_pFkjuQT7qUK4s0P2w,1731
+reV/supply_curve/cli_tech_mapping.py,sha256=Dirn4JOmu_3BIP7WgcRLAepsreKqmDhChHLPEUqcDAo,1735
 reV/supply_curve/competitive_wind_farms.py,sha256=eOjM72-4oWtsqxB7Wh2gnB2zVAt4LY3iPE_DqWdXbQ4,15795
 reV/supply_curve/exclusions.py,sha256=4-ZxTO5Vlu03vie0V_74uvdajQfCuC8FE96Pg8I4U_c,42950
 reV/supply_curve/extent.py,sha256=a31po753hXSxQ8lfcCvpE8hoKc4bY7MmYq0NO0jtdqA,17414
@@ -92,8 +92,8 @@ reV/utilities/curtailment.py,sha256=As902-2aLGnCiVEutYfAFIOwuV--_rCQhxGNOY9RB-4,
 reV/utilities/exceptions.py,sha256=f7sRGsbFLpmL6Caq_H1cD4GfVhnLMyvYUsLPA1UVDDE,3974
 reV/utilities/pytest_utils.py,sha256=spCw9yQ8KEYOkQZpCi9IEmaWIvIqHqbUPDXXNQJJ68U,3241
 reV/utilities/slots.py,sha256=xsw-JuUVZ0YeoCNuwP_HxGNxFMA4xRs1tuImXHIJqaU,2618
-nrel_rev-0.14.1.dist-info/METADATA,sha256=0EADVsx-loQXOEowljo4an8-FB9ZjXBm9XBC_Ie0edA,10733
-nrel_rev-0.14.1.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-nrel_rev-0.14.1.dist-info/entry_points.txt,sha256=4IfJtZm2iMJwrbC8J0Or7VjZWnFpvCaHYVpvSWfIwDA,616
-nrel_rev-0.14.1.dist-info/top_level.txt,sha256=S6YF2ZYgXUB6n28SY0K2H8YB9tMJdXQ9CyQbo6VC89M,4
-nrel_rev-0.14.1.dist-info/RECORD,,
+nrel_rev-0.14.2.dist-info/METADATA,sha256=lIgkZ3PQLu5YOtLYAP62nRtNVAhxkwRuHGqS_2mSwDY,10733
+nrel_rev-0.14.2.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+nrel_rev-0.14.2.dist-info/entry_points.txt,sha256=4IfJtZm2iMJwrbC8J0Or7VjZWnFpvCaHYVpvSWfIwDA,616
+nrel_rev-0.14.2.dist-info/top_level.txt,sha256=S6YF2ZYgXUB6n28SY0K2H8YB9tMJdXQ9CyQbo6VC89M,4
+nrel_rev-0.14.2.dist-info/RECORD,,

{nrel_rev-0.14.1.dist-info → nrel_rev-0.14.2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

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"]

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

reV/version.py

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